46/63: gnu: Add cryptsetup-minimal.

[guix-commits]

janneke pushed a commit to branch core-packages-team-old
in repository guix.

commit a69cf3ee57ba420c76b4ab119aaa2e0abf59fef1
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Wed Dec 11 18:01:50 2024 +0100

    gnu: Add cryptsetup-minimal.
    
    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
---
 gnu/packages/cryptsetup.scm | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm
index 44f9c77984..2b6cc635ee 100644
--- a/gnu/packages/cryptsetup.scm
+++ b/gnu/packages/cryptsetup.scm
@@ -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 @@
   #: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 @@
           ;; <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 @@ 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)
+                          `("ruby-asciidoctor" ,ruby-asciidoctor)
+                          '())
+                     ,@(package-native-inputs cryptsetup-minimal)))))
+
 (define-public (libcryptsetup-propagated-inputs)
   (list argon2
         json-c
@@ -122,10 +127,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"