diff options
| author | Janneke Nieuwenhuizen <janneke@gnu.org> | 2024-12-11 18:01:50 +0100 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2025-07-18 20:17:14 +0200 |
| commit | 8c96567d3b1c1ca3af5b225d74e9ca207c445464 (patch) | |
| tree | 9be3c5a6d9cdcbefeb44391c9140dbbe99bf8a65 | |
| parent | fb0c5e9f93a0bedcca0bb6372f69ab782a29aaa8 (diff) | |
gnu: Add cryptsetup-minimal.
The ruby-asciidoctor/minimal dependency pulls-in pandoc, 316 ghc packages, and
204 ruby packages, for documentation only.
* gnu/packages/cryptsetup.scm (cryptsetup): Rename to...
(cryptsetup-minimal): ...this.
[native-inputs]: Remove optional ruby-asciidoctor/minimal.
(cryptsetup): New variable. Inherit from cryptsetup-minimal.
[native-inputs]: Add ruby-asciidoctor/minimal if available.
Change-Id: I1d4d2160e1fd64057a188afa3c9cbf037610727a
| -rw-r--r-- | gnu/packages/cryptsetup.scm | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm index 65ec5a099b..b78713f44d 100644 --- a/gnu/packages/cryptsetup.scm +++ b/gnu/packages/cryptsetup.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2019–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2024 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2025 Antoine Côté <antoine.cote@posteo.net> +;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,9 +37,9 @@ #:use-module (gnu packages ruby-check) #:use-module (gnu packages web)) -(define-public cryptsetup +(define-public cryptsetup-minimal (package - (name "cryptsetup") + (name "cryptsetup-minimal") (version "2.8.0") (source (origin (method url-fetch) @@ -71,10 +72,7 @@ (string-append "--with-libgcrypt-prefix=" (assoc-ref %build-inputs "libgcrypt")))))) (native-inputs - (append (list pkg-config) - (if (supported-package? ruby-asciidoctor/minimal) - (list ruby-asciidoctor/minimal) - '()))) + (list pkg-config)) (inputs (list argon2 json-c @@ -101,6 +99,14 @@ block integrity kernel modules.") (license license:gpl2) (home-page "https://gitlab.com/cryptsetup/cryptsetup"))) +(define-public cryptsetup + (package/inherit cryptsetup-minimal + (name "cryptsetup") + (native-inputs `(,(if (supported-package? ruby-asciidoctor/minimal) + `("ruby-asciidoctor" ,ruby-asciidoctor/minimal) + '()) + ,@(package-native-inputs cryptsetup-minimal))))) + (define-public (libcryptsetup-propagated-inputs) (list argon2 json-c @@ -123,10 +129,10 @@ files). This assumes LIBRARY uses Libtool." (define-public cryptsetup-static ;; Stripped-down statically-linked 'cryptsetup' command for use in initrds. (package - (inherit cryptsetup) + (inherit cryptsetup-minimal) (name "cryptsetup-static") (arguments - (substitute-keyword-arguments (package-arguments cryptsetup) + (substitute-keyword-arguments (package-arguments cryptsetup-minimal) ((#:configure-flags flags ''()) `(cons* "--disable-shared" "--enable-static-cryptsetup" |