272/300: fixup! gnu: Use cryptsetup-minimal instead of cryptsetup.

[guix-commits]

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

commit 3d37134ad6e6edac0a95ee1761ce0cfcad4bc7c9
Author: Zheng Junjie <z572@z572.online>
AuthorDate: Mon Feb 24 10:53:03 2025 +0800

    fixup! gnu: Use cryptsetup-minimal instead of cryptsetup.
    
    Change-Id: Iae2ea55f2f974760867037f3991734477a9cd02a
---
 gnu/packages/disk.scm | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index 9319897f45..c0e1c7fb2f 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -1248,14 +1248,10 @@ to create devices with respective mappings for the 
ATARAID sets discovered.")
            python-wrapper))
     (inputs
      (append
-<<<<<<< HEAD
-      (cons cryptsetup (libcryptsetup-propagated-inputs))
+      (cons cryptsetup-minimal (libcryptsetup-propagated-inputs))
       (if (supported-package? multipath-tools)
           (list multipath-tools)
           '())
-=======
-      (cons cryptsetup-minimal (libcryptsetup-propagated-inputs))
->>>>>>> f2f5bb5271 (gnu: Use cryptsetup-minimal instead of cryptsetup.)
       (list bcache-tools
             btrfs-progs
             dosfstools