diff options
| -rw-r--r-- | gnu/packages/cryptsetup.scm | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm index 3bdc68ae5a6..3cb669206ab 100644 --- a/gnu/packages/cryptsetup.scm +++ b/gnu/packages/cryptsetup.scm | |||
| @@ -30,12 +30,13 @@ | |||
| 30 | #:use-module (gnu packages pkg-config) | 30 | #:use-module (gnu packages pkg-config) |
| 31 | #:use-module (gnu packages popt) | 31 | #:use-module (gnu packages popt) |
| 32 | #:use-module (gnu packages linux) | 32 | #:use-module (gnu packages linux) |
| 33 | #:use-module (gnu packages ruby) | ||
| 33 | #:use-module (gnu packages web)) | 34 | #:use-module (gnu packages web)) |
| 34 | 35 | ||
| 35 | (define-public cryptsetup | 36 | (define-public cryptsetup |
| 36 | (package | 37 | (package |
| 37 | (name "cryptsetup") | 38 | (name "cryptsetup") |
| 38 | (version "2.3.7") | 39 | (version "2.6.1") |
| 39 | (source (origin | 40 | (source (origin |
| 40 | (method url-fetch) | 41 | (method url-fetch) |
| 41 | (uri (string-append "mirror://kernel.org/linux/utils/cryptsetup/v" | 42 | (uri (string-append "mirror://kernel.org/linux/utils/cryptsetup/v" |
| @@ -43,7 +44,7 @@ | |||
| 43 | "/cryptsetup-" version ".tar.xz")) | 44 | "/cryptsetup-" version ".tar.xz")) |
| 44 | (sha256 | 45 | (sha256 |
| 45 | (base32 | 46 | (base32 |
| 46 | "1a97rvi6arsj8dikh1qsvixx9rizm89k155q2ypifqlqllr530v1")))) | 47 | "14s6vbb9llpgnhmv0badxxzhi73jp4vyvp8swk4bjah7l5jys3a1")))) |
| 47 | (build-system gnu-build-system) | 48 | (build-system gnu-build-system) |
| 48 | (arguments | 49 | (arguments |
| 49 | `(#:configure-flags | 50 | `(#:configure-flags |
| @@ -54,12 +55,16 @@ | |||
| 54 | "--with-crypto_backend=gcrypt" | 55 | "--with-crypto_backend=gcrypt" |
| 55 | ;; GRUB 2.06 supports LUKS2, but does it reliably support all set-ups…? | 56 | ;; GRUB 2.06 supports LUKS2, but does it reliably support all set-ups…? |
| 56 | "--with-default-luks-format=LUKS1" | 57 | "--with-default-luks-format=LUKS1" |
| 58 | ;; External tokens would need an env variable to work on Guix, and we | ||
| 59 | ;; don't have users for it yet. | ||
| 60 | "--disable-external-tokens" | ||
| 61 | "--disable-ssh-token" | ||
| 57 | ;; libgcrypt is not found otherwise when cross-compiling. | 62 | ;; libgcrypt is not found otherwise when cross-compiling. |
| 58 | ;; <https://issues.guix.gnu.org/63864> | 63 | ;; <https://issues.guix.gnu.org/63864> |
| 59 | (string-append "--with-libgcrypt-prefix=" | 64 | (string-append "--with-libgcrypt-prefix=" |
| 60 | (assoc-ref %build-inputs "libgcrypt"))))) | 65 | (assoc-ref %build-inputs "libgcrypt"))))) |
| 61 | (native-inputs | 66 | (native-inputs |
| 62 | (list pkg-config)) | 67 | (list pkg-config ruby-asciidoctor)) |
| 63 | (inputs | 68 | (inputs |
| 64 | (list argon2 | 69 | (list argon2 |
| 65 | json-c | 70 | json-c |
