janneke pushed a commit to branch core-packages-team-old in repository guix.
commit c7fc1addc5bb85700d3170d1c1046cc9f025a0e5 Author: Janneke Nieuwenhuizen <[email protected]> AuthorDate: Wed Dec 11 18:07:05 2024 +0100 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 --- gnu/packages/admin.scm | 2 +- gnu/packages/crypto.scm | 2 +- gnu/packages/disk.scm | 6 +++--- gnu/packages/freedesktop.scm | 2 +- gnu/packages/linux.scm | 2 +- gnu/packages/password-utils.scm | 3 ++- gnu/packages/storage.scm | 3 ++- 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 078787061f..79095389c1 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -5016,7 +5016,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 9ef1a53fa6..149f03b750 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -494,7 +494,7 @@ total number of shares generated.") `(("bash" ,bash-minimal) ; for wrap-program ("zsh" ,zsh) ("gnupg" ,gnupg) - ("cryptsetup" ,cryptsetup) + ("cryptsetup" ,cryptsetup-minimal) ("e2fsprogs" ,e2fsprogs) ;for mkfs.ext4 ("gettext" ,gettext-minimal) ;used at runtime ("lsof" ,lsof) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 00674016a4..da762c5abe 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015 Mark H Weaver <[email protected]> ;;; Copyright © 2016, 2018–2022 Tobias Geerinckx-Rice <[email protected]> ;;; Copyright © 2016, 2019-2021, 2023 Efraim Flashner <[email protected]> -;;; Copyright © 2016, 2023 Janneke Nieuwenhuizen <[email protected]> +;;; Copyright © 2016, 2023, 2024 Janneke Nieuwenhuizen <[email protected]> ;;; Copyright © 2016 Roel Janssen <[email protected]> ;;; Copyright © 2016, 2017 Marius Bakke <[email protected]> ;;; Copyright © 2017 Hartmut Goebel <[email protected]> @@ -1043,7 +1043,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") @@ -1217,7 +1217,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)) (list bcache-tools btrfs-progs dosfstools diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 72a9349640..b60c9aeb21 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1824,7 +1824,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 59a6424bd7..addbd2bdf1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -7533,7 +7533,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 2820fa60d0..110f059dfb 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -41,6 +41,7 @@ ;;; Copyright © 2022 Petr Hodina <[email protected]> ;;; Copyright © 2023 Christian Miller <[email protected]> ;;; Copyright © 2024 John Kehayias <[email protected]> +;;; Copyright © 2024 Janneke Nieuwenhuizen <[email protected]> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1592,7 +1593,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 919b72736b..e1bbc0ffa9 100644 --- a/gnu/packages/storage.scm +++ b/gnu/packages/storage.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2020, 2022 Tobias Geerinckx-Rice <[email protected]> ;;; Copyright © 2021 Greg Hogan <[email protected]> ;;; Copyright © 2022 Ricardo Wurmus <[email protected]> +;;; Copyright © 2024 Janneke Nieuwenhuizen <[email protected]> ;;; ;;; This file is part of GNU Guix. ;;; @@ -220,7 +221,7 @@ bash-minimal boost curl - cryptsetup + cryptsetup-minimal eudev expat fcgi diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 9dff421341..7b1b4a3285 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1127,7 +1127,7 @@ commodity hardware.") (list autoconf automake jq)) (inputs (list btrfs-progs - cryptsetup + cryptsetup-minimal e2fsprogs f2fs-tools lvm2
