mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-31 23:06:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Add cryptsetup-minimal.

Browse source 
The ruby-asciidoctor 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.
(cryptsetup): New variable.  Inherit from cryptsetup-minimal.
[native-inputs]: Add ruby-asciidoctor if available.

Change-Id: I1d4d2160e1fd64057a188afa3c9cbf037610727a
This commit is contained in:
Janneke Nieuwenhuizen 2024-12-11 18:01:50 +01:00
parent c7897707af
commit dd931add27
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
gnu/packages/cryptsetup.scm
View file

@ -3,6 +3,7 @@
;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2019–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -35,9 +36,9 @@ (define-module (gnu packages cryptsetup)
#:use-module (gnu packages ruby)
#:use-module (gnu packages web))
(define-public cryptsetup
(define-public cryptsetup-minimal
(package
(name "cryptsetup")
(name "cryptsetup-minimal")
(version "2.6.1")
(source (origin
(method url-fetch)
@ -69,11 +70,7 @@ (define-public cryptsetup
;; <https://issues.guix.gnu.org/63864>
(string-append "--with-libgcrypt-prefix="
(assoc-ref %build-inputs "libgcrypt"))))))
(native-inputs
(append (list pkg-config)
(if (supported-package? ruby-asciidoctor)
(list ruby-asciidoctor)
'())))
(native-inputs (list pkg-config))
(inputs
(list argon2
json-c
@ -100,6 +97,14 @@ (define-public cryptsetup
(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)
`("ruby-asciidoctor" ,ruby-asciidoctor)
'())
,@(package-native-inputs cryptsetup-minimal)))))
(define-public (libcryptsetup-propagated-inputs)
(list argon2
json-c
@ -122,10 +127,10 @@ (define (static-library library)
(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"