pyrox.dev
lol
python3Packages.tpm2-pytss: enable tests
Signed-off-by: Arthur Gautier <baloo@superbaloo.net>
+31
-4
+19
-4
pkgs/development/python-modules/tpm2-pytss/default.nix
+19
-4
pkgs/development/python-modules/tpm2-pytss/default.nix
···
6
6
, asn1crypto
7
7
, cffi
8
8
, cryptography
9
-
, ibm-sw-tpm2
10
9
, pkgconfig # see nativeBuildInputs
11
10
, pkg-config # see nativeBuildInputs
12
11
, pycparser
···
15
14
, pyyaml
16
15
, setuptools-scm
17
16
, tpm2-tss
17
+
, tpm2-tools
18
+
, swtpm
18
19
}:
19
20
20
21
buildPythonPackage rec {
···
40
41
url = "https://github.com/baloo/tpm2-pytss/commit/099c069f28cfcd0a3019adebfeafa976f9395221.patch";
41
42
sha256 = "sha256-wU2WfLYFDmkhGzYornZ386tB3zb3GYfGOTc+/QOFb1o=";
42
43
})
44
+
45
+
# Lookup tcti via getinfo not system's ld_library_path
46
+
# https://github.com/tpm2-software/tpm2-pytss/pull/525
47
+
(fetchpatch {
48
+
url = "https://github.com/tpm2-software/tpm2-pytss/commit/97289a08ddf44f7bdccdd122d6055c69e12dc584.patch";
49
+
sha256 = "sha256-VFq3Hv4I8U8ifP/aSjyu0BiW/4jfPlRDKqRcqUGw6UQ=";
50
+
})
51
+
52
+
# Fix hardcoded `fapi-config.json` configuration path
53
+
./fapi-config.patch
43
54
];
55
+
56
+
postPatch = ''
57
+
sed -i "s#@TPM2_TSS@#${tpm2-tss.out}#" src/tpm2_pytss/FAPI.py
58
+
'';
44
59
45
60
nativeBuildInputs = [
46
61
cffi
···
60
75
pyyaml
61
76
];
62
77
63
-
# https://github.com/tpm2-software/tpm2-pytss/issues/341
64
-
doCheck = false;
78
+
doCheck = true;
65
79
66
80
nativeCheckInputs = [
67
-
ibm-sw-tpm2
68
81
pytestCheckHook
82
+
tpm2-tools
83
+
swtpm
69
84
];
70
85
71
86
pythonImportsCheck = [
+12
pkgs/development/python-modules/tpm2-pytss/fapi-config.patch
+12
pkgs/development/python-modules/tpm2-pytss/fapi-config.patch
···
1
+
diff --git a/src/tpm2_pytss/FAPI.py b/src/tpm2_pytss/FAPI.py
2
+
index 916eda6..1afba3f 100644
3
+
--- a/src/tpm2_pytss/FAPI.py
4
+
+++ b/src/tpm2_pytss/FAPI.py
5
+
@@ -23,6 +23,7 @@ logger = logging.getLogger(__name__)
6
+
7
+
FAPI_CONFIG_ENV = "TSS2_FAPICONF"
8
+
FAPI_CONFIG_PATHS = [
9
+
+ "@TPM2_TSS@/etc/tpm2-tss/fapi-config.json",
10
+
"/etc/tpm2-tss/fapi-config.json",
11
+
"/usr/local/etc/tpm2-tss/fapi-config.json",
12
+
]