cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

cryptsetup: 2.4.3 -> 2.5.0 (#186249)

Browse source
This commit is contained in:
Yuka 2022-08-14 11:40:43 +02:00 committed by GitHub
parent 53b36c9c5b
commit ad0cd6e56a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/os-specific/linux/cryptsetup/default.nix
View file

@ -1,21 +1,18 @@
{ lib, stdenv, fetchurl, lvm2, json_c { lib, stdenv, fetchurl, lvm2, json_c, asciidoctor
, openssl, libuuid, pkg-config, popt }: , openssl, libuuid, pkg-config, popt }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cryptsetup"; pname = "cryptsetup";
version = "2.4.3"; version = "2.5.0";
outputs = [ "bin" "out" "dev" "man" ]; outputs = [ "bin" "out" "dev" "man" ];
separateDebugInfo = true; separateDebugInfo = true;
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/utils/cryptsetup/v2.4/${pname}-${version}.tar.xz"; url = "mirror://kernel/linux/utils/cryptsetup/v2.5/${pname}-${version}.tar.xz";
sha256 = "sha256-/A35RRiBciZOxb8dC9oIJk+tyKP4VtR+upHzH+NUtQc="; sha256 = "sha256-kYSm672c5+shEVLn90GmyC8tHMDiSoTsnFKTnu4PBUI=";
}; };
# Disable 4 test cases that fail in a sandbox
patches = [ ./disable-failing-tests.patch ];
postPatch = '' postPatch = ''
patchShebangs tests patchShebangs tests
@ -39,7 +36,7 @@ stdenv.mkDerivation rec {
"--with-luks2-external-tokens-path=/" "--with-luks2-external-tokens-path=/"
]; ];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config asciidoctor ];
buildInputs = [ lvm2 json_c openssl libuuid popt ]; buildInputs = [ lvm2 json_c openssl libuuid popt ];
# The test [7] header backup in compat-test fails with a mysterious # The test [7] header backup in compat-test fails with a mysterious

19
pkgs/os-specific/linux/cryptsetup/disable-failing-tests.patch
View file

@ -1,19 +0,0 @@
diff -ur a/tests/blockwise-compat b/tests/blockwise-compat
--- a/tests/blockwise-compat 2018-09-08 12:23:11.706555098 +0200
+++ b/tests/blockwise-compat 2018-09-08 12:24:24.444393460 +0200
@@ -148,15 +148,11 @@
# device/file fn_name length
RUN "P" $1 read_buffer $BSIZE
RUN "P" $1 read_buffer $((2*BSIZE))
- RUN "F" $1 read_buffer $((BSIZE-1))
- RUN "F" $1 read_buffer $((BSIZE+1))
RUN "P" $1 read_buffer 0
RUN "P" $1 write_buffer $BSIZE
RUN "P" $1 write_buffer $((2*BSIZE))
- RUN "F" $1 write_buffer $((BSIZE-1))
- RUN "F" $1 write_buffer $((BSIZE+1))
RUN "F" $1 write_buffer 0
# basic blockwise functions