diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2025-08-31 16:02:50 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2025-09-11 22:31:59 +0200 |
| commit | 6a750fbfafaad115d9b6b4b99962dcc0bf4494fe (patch) | |
| tree | 0a89d28dbdebcb659df1e6591b6be733ad18580c | |
| parent | a5ac56f8830928205ce5424082486d509f898dc7 (diff) | |
build-self: Remove 2018-era fallback for guile-gcrypt.
* build-aux/build-self.scm (guile-gcrypt): Remove fallback case for when the
host Guix lacks ‘guile-gcrypt’.
Change-Id: I840333a72a45f8582bb26271d41e3fadf1c59f3e
| -rw-r--r-- | build-aux/build-self.scm | 47 |
1 files 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 @@ | |||
| 1 | ;;; GNU Guix --- Functional package management for GNU | 1 | ;;; GNU Guix --- Functional package management for GNU |
| 2 | ;;; Copyright © 2014, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> | 2 | ;;; Copyright © 2014, 2016-2021, 2025 Ludovic Courtès <ludo@gnu.org> |
| 3 | ;;; | 3 | ;;; |
| 4 | ;;; This file is part of GNU Guix. | 4 | ;;; This file is part of GNU Guix. |
| 5 | ;;; | 5 | ;;; |
| @@ -22,7 +22,6 @@ | |||
| 22 | #:use-module (guix ui) | 22 | #:use-module (guix ui) |
| 23 | #:use-module (guix config) | 23 | #:use-module (guix config) |
| 24 | #:use-module (guix modules) | 24 | #:use-module (guix modules) |
| 25 | #:use-module (guix build-system gnu) | ||
| 26 | #:use-module (srfi srfi-1) | 25 | #:use-module (srfi srfi-1) |
| 27 | #:use-module (srfi srfi-19) | 26 | #:use-module (srfi srfi-19) |
| 28 | #:use-module (srfi srfi-34) | 27 | #:use-module (srfi srfi-34) |
| @@ -192,50 +191,8 @@ person's version identifier." | |||
| 192 | (date->string (current-date 0) "~Y~m~d.~H")) | 191 | (date->string (current-date 0) "~Y~m~d.~H")) |
| 193 | 192 | ||
| 194 | (define guile-gcrypt | 193 | (define guile-gcrypt |
| 195 | ;; The host Guix may or may not have 'guile-gcrypt', which was introduced in | 194 | ;; The 'guile-gcrypt' package from the host Guix. |
| 196 | ;; August 2018. If it has it, it's at least version 0.1.0, which is good | ||
| 197 | ;; enough. If it doesn't, specify our own package because the target Guix | ||
| 198 | ;; requires it. | ||
| 199 | (match (find-best-packages-by-name "guile-gcrypt" #f) | 195 | (match (find-best-packages-by-name "guile-gcrypt" #f) |
| 200 | (() | ||
| 201 | (package | ||
| 202 | (name "guile-gcrypt") | ||
| 203 | (version "0.1.0") | ||
| 204 | (home-page "https://notabug.org/cwebber/guile-gcrypt") | ||
| 205 | (source (origin | ||
| 206 | (method url-fetch) | ||
| 207 | (uri (string-append home-page "/archive/v" version ".tar.gz")) | ||
| 208 | (sha256 | ||
| 209 | (base32 | ||
| 210 | "1gir7ifknbmbvjlql5j6wzk7bkb5lnmq80q59ngz43hhpclrk5k3")) | ||
| 211 | (file-name (string-append name "-" version ".tar.gz")))) | ||
| 212 | (build-system gnu-build-system) | ||
| 213 | (arguments | ||
| 214 | ;; The 'bootstrap' phase appeared in 'core-updates', which was merged | ||
| 215 | ;; into 'master' ca. June 2018. | ||
| 216 | '(#:phases (modify-phases %standard-phases | ||
| 217 | (delete 'bootstrap) | ||
| 218 | (add-before 'configure 'bootstrap | ||
| 219 | (lambda _ | ||
| 220 | (unless (zero? (system* "autoreconf" "-vfi")) | ||
| 221 | (error "autoreconf failed")) | ||
| 222 | #t))))) | ||
| 223 | (native-inputs | ||
| 224 | `(("pkg-config" ,(specification->package "pkg-config")) | ||
| 225 | ("autoconf" ,(specification->package "autoconf")) | ||
| 226 | ("automake" ,(specification->package "automake")) | ||
| 227 | ("texinfo" ,(specification->package "texinfo")))) | ||
| 228 | (inputs | ||
| 229 | `(("guile" ,(specification->package "guile")) | ||
| 230 | ("libgcrypt" ,(specification->package "libgcrypt")))) | ||
| 231 | (synopsis "Cryptography library for Guile using Libgcrypt") | ||
| 232 | (description | ||
| 233 | "Guile-Gcrypt provides a Guile 2.x interface to a subset of the | ||
| 234 | GNU Libgcrypt crytographic library. It provides modules for cryptographic | ||
| 235 | hash functions, message authentication codes (MAC), public-key cryptography, | ||
| 236 | strong randomness, and more. It is implemented using the foreign function | ||
| 237 | interface (FFI) of Guile.") | ||
| 238 | (license #f))) ;license:gpl3+ | ||
| 239 | ((package . _) | 196 | ((package . _) |
| 240 | package))) | 197 | package))) |
| 241 | 198 | ||
