diff options
Diffstat (limited to 'pkgs/os-specific/linux/cryptsetup/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/cryptsetup/default.nix | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index be819802394..62f3f0c4db1 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -1,21 +1,18 @@ -{ lib, stdenv, fetchurl, lvm2, json_c +{ lib, stdenv, fetchurl, lvm2, json_c, asciidoctor , openssl, libuuid, pkg-config, popt }: stdenv.mkDerivation rec { pname = "cryptsetup"; - version = "2.4.3"; + version = "2.5.0"; outputs = [ "bin" "out" "dev" "man" ]; separateDebugInfo = true; src = fetchurl { - url = "mirror://kernel/linux/utils/cryptsetup/v2.4/${pname}-${version}.tar.xz"; - sha256 = "sha256-/A35RRiBciZOxb8dC9oIJk+tyKP4VtR+upHzH+NUtQc="; + url = "mirror://kernel/linux/utils/cryptsetup/v2.5/${pname}-${version}.tar.xz"; + sha256 = "sha256-kYSm672c5+shEVLn90GmyC8tHMDiSoTsnFKTnu4PBUI="; }; - # Disable 4 test cases that fail in a sandbox - patches = [ ./disable-failing-tests.patch ]; - postPatch = '' patchShebangs tests @@ -39,10 +36,13 @@ stdenv.mkDerivation rec { "--with-luks2-external-tokens-path=/" ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config asciidoctor ]; buildInputs = [ lvm2 json_c openssl libuuid popt ]; - doCheck = true; + # The test [7] header backup in compat-test fails with a mysterious + # "out of memory" error, even though tons of memory is available. + # Issue filed upstream: https://gitlab.com/cryptsetup/cryptsetup/-/issues/763 + doCheck = !stdenv.hostPlatform.isMusl; meta = { homepage = "https://gitlab.com/cryptsetup/cryptsetup/"; |