pyrox.dev
clevis: 18 -> 19
Diff: https://github.com/latchset/clevis/compare/refs/tags/v18...v19
Changelog: https://github.com/latchset/clevis/releases/tag/v19
+33
-24
pkgs/tools/security/clevis/default.nix
+33
-24
pkgs/tools/security/clevis/default.nix
···
1
1
{ lib
2
2
, stdenv
3
+
, asciidoc
4
+
, coreutils
5
+
, cryptsetup
6
+
, curl
3
7
, fetchFromGitHub
4
-
, fetchurl
5
-
, meson
6
-
, ninja
7
-
, pkg-config
8
-
, asciidoc
9
-
, makeWrapper
8
+
, gnugrep
9
+
, gnused
10
10
, jansson
11
11
, jose
12
-
, cryptsetup
13
-
, curl
14
12
, libpwquality
15
13
, luksmeta
16
-
, coreutils
14
+
, makeWrapper
15
+
, meson
16
+
, ninja
17
+
, pkg-config
17
18
, tpm2-tools
18
-
, gnugrep
19
-
, gnused
20
19
}:
21
20
22
21
stdenv.mkDerivation rec {
23
22
pname = "clevis";
24
-
version = "18";
23
+
version = "19";
25
24
26
25
src = fetchFromGitHub {
27
26
owner = "latchset";
28
27
repo = pname;
29
28
rev = "refs/tags/v${version}";
30
-
hash = "sha256-m1UhyjD5ydSgCTBu6sECLlxFx0rnQxFnBA7frbdUqU8=";
29
+
hash = "sha256-3J3ti/jRiv+p3eVvJD7u0ko28rPd8Gte0mCJaVaqyOs=";
31
30
};
32
31
33
-
patches = [
34
-
# sss: use BN_set_word(x, 0) instead of BN_zero(), fixes build issue with different versions of openssl
35
-
(fetchurl {
36
-
url = "https://github.com/latchset/clevis/commit/ee1dfedb9baca107e66a0fec76693c9d479dcfd9.patch";
37
-
sha256 = "sha256-GeklrWWlAMALDLdnn6+0Bi0l+bXrIbYkgIyI94WEybM=";
38
-
})
39
-
];
40
-
41
32
postPatch = ''
42
33
for f in $(find src/ -type f); do
43
34
grep -q "/bin/cat" "$f" && substituteInPlace "$f" \
···
51
42
--prefix PATH ':' "${lib.makeBinPath [tpm2-tools jose cryptsetup libpwquality luksmeta gnugrep gnused coreutils]}:${placeholder "out"}/bin"
52
43
'';
53
44
54
-
nativeBuildInputs = [ meson ninja pkg-config asciidoc makeWrapper ];
55
-
buildInputs = [ jansson jose cryptsetup curl libpwquality luksmeta tpm2-tools ];
45
+
nativeBuildInputs = [
46
+
meson
47
+
ninja
48
+
pkg-config
49
+
asciidoc
50
+
makeWrapper
51
+
];
56
52
57
-
outputs = [ "out" "man" ];
53
+
buildInputs = [
54
+
jansson
55
+
jose
56
+
cryptsetup
57
+
curl
58
+
libpwquality
59
+
luksmeta
60
+
tpm2-tools
61
+
];
62
+
63
+
outputs = [
64
+
"out"
65
+
"man"
66
+
];
58
67
59
68
meta = with lib; {
60
69
description = "Automated Encryption Framework";