[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
49/74: gnu: Use cryptsetup-minimal instead of cryptsetup.
From: |
guix-commits |
Subject: |
49/74: gnu: Use cryptsetup-minimal instead of cryptsetup. |
Date: |
Wed, 18 Dec 2024 08:07:09 -0500 (EST) |
janneke pushed a commit to branch core-packages-team
in repository guix.
commit 6fb05a27cdec8a952f11dfa1b3fb9a8bca955762
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
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 66d0bf30d8..1b5ff60687 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -5025,7 +5025,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 fd9cb8a45e..00a8618380 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 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>
@@ -1046,7 +1046,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")
@@ -1220,7 +1220,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 4682e55630..ba3542b7c2 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1826,7 +1826,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 53b10afe22..204818a142 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 <phodina@protonmail.com>
;;; Copyright © 2023 Christian Miller <christian.miller@dadoes.de>
;;; Copyright © 2024 John Kehayias <john.kehayias@protonmail.com>
+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;;
;;; 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 <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.
;;;
@@ -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
- 42/74: gnu: gamin: Fix build with gcc-14., (continued)
- 42/74: gnu: gamin: Fix build with gcc-14., guix-commits, 2024/12/18
- 45/74: gnu: openldap: Update to 2.6.9; fixes build with gcc-14., guix-commits, 2024/12/18
- 58/74: gnu: netdde: Use -Wno-error=., guix-commits, 2024/12/18
- 56/74: gnu: flex: Use -Wno-error= for cross-build., guix-commits, 2024/12/18
- 67/74: bash-minimal: Use gcc-14 hurd/x86-linux build fix for all platforms., guix-commits, 2024/12/18
- 65/74: gnu: bootstrap: %bootstrap-glibc: Fix linking on armhf-linux., guix-commits, 2024/12/18
- 57/74: gnu: hurd: Use -Wno-error=., guix-commits, 2024/12/18
- 16/74: gnu: Re-Add automake-1.16.5., guix-commits, 2024/12/18
- 21/74: gnu: torsocks: Fix build with gcc-14., guix-commits, 2024/12/18
- 38/74: gnu: epson-inkjet-printer-escpr: Fix build with gcc-14., guix-commits, 2024/12/18
- 49/74: gnu: Use cryptsetup-minimal instead of cryptsetup.,
guix-commits <=
- 66/74: gnu: gcc-4.7: Add gcc-wrapper from gcc-final., guix-commits, 2024/12/18
- 51/74: gnu: python-numpy: Update to 1.26.4 and fix build with gcc-14., guix-commits, 2024/12/18
- 63/74: gnu: git: Use -Wno-error= for Hurd cross-build., guix-commits, 2024/12/18
- 48/74: gnu: Add cryptsetup-minimal., guix-commits, 2024/12/18
- 74/74: gnu: clang-runtime: Remove gcc-12,13,14 from native-ipnuts., guix-commits, 2024/12/18
- 73/74: DRAFT gnu: gcc: Update gcc, gcc-toolchain, libgccjit to 14., guix-commits, 2024/12/18
- 47/74: gnu: tdb: Update to 1.4.12; fixes build with gcc-14., guix-commits, 2024/12/18
- 62/74: gnu: texinfo-4: Use -Wno-error= for Hurd cross-build., guix-commits, 2024/12/18
- 68/74: gnu: gcc-11: Update to 11.5.0; fixes build with gcc-14., guix-commits, 2024/12/18
- 54/74: gnu: tevent: Update to 0.16.1; fixes build with gcc-14., guix-commits, 2024/12/18