diff options
author | Janneke Nieuwenhuizen <janneke@gnu.org> | 2024-12-11 18:07:05 +0100 |
---|---|---|
committer | Andreas Enge <andreas@enge.fr> | 2025-07-18 20:17:14 +0200 |
commit | d4f2e2ae37fcce3283b0ee7b7add15301c53dce4 (patch) | |
tree | 349ae62985e7de4b8509717305bfd787cdc902a7 | |
parent | 8c96567d3b1c1ca3af5b225d74e9ca207c445464 (diff) |
gnu: Use cryptsetup-minimal instead of cryptsetup.
* gnu/packages/admin.scm (pam-mount)[inputs]: Use cryptsetup-minimal instead
of cryptsetup.
* gnu/packages/crypto.scm (tomb)[inputs]: Likewise.
* gnu/packages/linux.scm (ecryptfs-utils)[inputs]: Likewise.
* gnu/packages/password-utils.scm (bruteforce-luks)[inputs]: Likewise.
* gnu/packages/storage.scm (ceph)[inputs]: Likewise.
* gnu/packages/virtualization.scm (ganeti-instance-guix)[inputs]: Likewise.
* gnu/packages/disk.scm (volume-key)[inputs]: Likewise.
(libblockdev)[inputs]: Likewise.
* gnu/packages/freedesktop.scm (udisks)[inputs]: Likewise.
* gnu/system/install.scm (%installer-disk-utilities)[inputs]: Likewise.
Change-Id: Ib48ae1b45f6c63edd620a932241f2aa57567a350
-rw-r--r-- | gnu/packages/admin.scm | 2 | ||||
-rw-r--r-- | gnu/packages/crypto.scm | 2 | ||||
-rw-r--r-- | gnu/packages/disk.scm | 6 | ||||
-rw-r--r-- | gnu/packages/freedesktop.scm | 2 | ||||
-rw-r--r-- | gnu/packages/linux.scm | 2 | ||||
-rw-r--r-- | gnu/packages/password-utils.scm | 3 | ||||
-rw-r--r-- | gnu/packages/storage.scm | 3 | ||||
-rw-r--r-- | gnu/packages/virtualization.scm | 2 |
8 files changed, 12 insertions, 10 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index f5324c8231..4d7e8ab111 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -5306,7 +5306,7 @@ tcpdump and snoop.") (list perl pkg-config)) (inputs (append - (cons cryptsetup (libcryptsetup-propagated-inputs)) + (cons cryptsetup-minimal (libcryptsetup-propagated-inputs)) (list libhx libxml2 linux-pam diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 3a517011b1..d35006ae59 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -514,7 +514,7 @@ total number of shares generated.") (inputs (list argon2 bash-minimal - cryptsetup + cryptsetup-minimal e2fsprogs ; for mkfs.ext4 gettext-minimal ; used at runtime gnupg diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index c47226c453..965b82ca34 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2016, 2018–2022 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016, 2019-2021, 2023, 2025 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2016, 2023 Janneke Nieuwenhuizen <janneke@gnu.org> +;;; Copyright © 2016, 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016 Roel Janssen <roel@gnu.org> ;;; Copyright © 2016, 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com> @@ -1183,7 +1183,7 @@ and its highly optimized now for efficient performance.") (list pkg-config swig python-3)) ; used to generate the Python bindings (inputs (append - (cons cryptsetup (libcryptsetup-propagated-inputs)) + (cons cryptsetup-minimal (libcryptsetup-propagated-inputs)) (cons lvm2 (libdevmapper-propagated-inputs)) (list nss (list util-linux "lib") @@ -1361,7 +1361,7 @@ to create devices with respective mappings for the ATARAID sets discovered.") python-wrapper)) (inputs (append - (cons cryptsetup (libcryptsetup-propagated-inputs)) + (cons cryptsetup-minimal (libcryptsetup-propagated-inputs)) (if (supported-package? multipath-tools) (list multipath-tools) '()) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 8dbdcce9a9..b42e945692 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1977,7 +1977,7 @@ Analysis and Reporting Technology) functionality.") (inputs (list acl bash-minimal - cryptsetup + cryptsetup-minimal kmod libatasmart libblockdev diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b99f7d3634..d1d8c5d389 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -8017,7 +8017,7 @@ graphically visualizing a @file{perf.data} file.") pkg-config)) (inputs (list coreutils - cryptsetup + cryptsetup-minimal findutils gawk grep diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 0353590c68..1646f1d2a9 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -41,6 +41,7 @@ ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com> ;;; Copyright © 2023 Christian Miller <christian.miller@dadoes.de> ;;; Copyright © 2024, 2025 John Kehayias <john.kehayias@protonmail.com> +;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1840,7 +1841,7 @@ HTTP.") (native-inputs (list autoconf automake)) (inputs - (list cryptsetup)) + (list cryptsetup-minimal)) (synopsis "LUKS encrypted volume cracker") (description "This is a cracker for LUKS encrypted volumes. It can be used either in diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm index 8268723078..c7b1d2e2fd 100644 --- a/gnu/packages/storage.scm +++ b/gnu/packages/storage.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2020, 2022 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2021 Greg Hogan <code@greghogan.com> ;;; Copyright © 2022 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -240,7 +241,7 @@ bash-minimal boost curl - cryptsetup + cryptsetup-minimal eudev expat fcgi diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 5ce6133669..c600f8ca97 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1128,7 +1128,7 @@ commodity hardware.") (list autoconf automake jq)) (inputs (list btrfs-progs - cryptsetup + cryptsetup-minimal e2fsprogs f2fs-tools lvm2 |