From 6a750fbfafaad115d9b6b4b99962dcc0bf4494fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 31 Aug 2025 16:02:50 +0200 Subject: [PATCH] build-self: Remove 2018-era fallback for guile-gcrypt. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * build-aux/build-self.scm (guile-gcrypt): Remove fallback case for when the host Guix lacks ‘guile-gcrypt’. Change-Id: I840333a72a45f8582bb26271d41e3fadf1c59f3e --- build-aux/build-self.scm | 47 ++-------------------------------------- 1 file changed, 2 insertions(+), 45 deletions(-) diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm index d9299b9af25..ad2aeea6323 100644 --- a/build-aux/build-self.scm +++ b/build-aux/build-self.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès +;;; Copyright © 2014, 2016-2021, 2025 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,7 +22,6 @@ #:use-module (guix ui) #:use-module (guix config) #:use-module (guix modules) - #:use-module (guix build-system gnu) #:use-module (srfi srfi-1) #:use-module (srfi srfi-19) #:use-module (srfi srfi-34) @@ -192,50 +191,8 @@ person's version identifier." (date->string (current-date 0) "~Y~m~d.~H")) (define guile-gcrypt - ;; The host Guix may or may not have 'guile-gcrypt', which was introduced in - ;; August 2018. If it has it, it's at least version 0.1.0, which is good - ;; enough. If it doesn't, specify our own package because the target Guix - ;; requires it. + ;; The 'guile-gcrypt' package from the host Guix. (match (find-best-packages-by-name "guile-gcrypt" #f) - (() - (package - (name "guile-gcrypt") - (version "0.1.0") - (home-page "https://notabug.org/cwebber/guile-gcrypt") - (source (origin - (method url-fetch) - (uri (string-append home-page "/archive/v" version ".tar.gz")) - (sha256 - (base32 - "1gir7ifknbmbvjlql5j6wzk7bkb5lnmq80q59ngz43hhpclrk5k3")) - (file-name (string-append name "-" version ".tar.gz")))) - (build-system gnu-build-system) - (arguments - ;; The 'bootstrap' phase appeared in 'core-updates', which was merged - ;; into 'master' ca. June 2018. - '(#:phases (modify-phases %standard-phases - (delete 'bootstrap) - (add-before 'configure 'bootstrap - (lambda _ - (unless (zero? (system* "autoreconf" "-vfi")) - (error "autoreconf failed")) - #t))))) - (native-inputs - `(("pkg-config" ,(specification->package "pkg-config")) - ("autoconf" ,(specification->package "autoconf")) - ("automake" ,(specification->package "automake")) - ("texinfo" ,(specification->package "texinfo")))) - (inputs - `(("guile" ,(specification->package "guile")) - ("libgcrypt" ,(specification->package "libgcrypt")))) - (synopsis "Cryptography library for Guile using Libgcrypt") - (description - "Guile-Gcrypt provides a Guile 2.x interface to a subset of the -GNU Libgcrypt crytographic library. It provides modules for cryptographic -hash functions, message authentication codes (MAC), public-key cryptography, -strong randomness, and more. It is implemented using the foreign function -interface (FFI) of Guile.") - (license #f))) ;license:gpl3+ ((package . _) package)))