pyrox.dev
Merge pull request #288186 from baloo/baloo/tpm2-pytss/2.2.0
+2
-36
pkgs/development/python-modules/tpm2-pytss/default.nix
+2
-36
pkgs/development/python-modules/tpm2-pytss/default.nix
···
1
1
{ lib
2
2
, buildPythonPackage
3
3
, fetchPypi
4
-
, fetchpatch
5
4
, pythonOlder
6
5
, asn1crypto
7
6
, cffi
···
20
19
21
20
buildPythonPackage rec {
22
21
pname = "tpm2-pytss";
23
-
version = "2.1.0";
22
+
version = "2.2.1";
24
23
format = "setuptools";
25
24
26
25
disabled = pythonOlder "3.7";
27
26
28
27
src = fetchPypi {
29
28
inherit pname version;
30
-
hash = "sha256-W1tLFFb9wa7vPSw5cL6qB4yPfyZIyXppvPYMWi+VyJc=";
29
+
hash = "sha256-uPFUc0IvN39ZxyF9zRR5FlzOYt+jOTTsl2oni68unv4=";
31
30
};
32
31
33
32
patches = [
34
-
# This patches the call to the C preprocessor not to include types
35
-
# pycparser does not handle.
36
-
# `hardeningDisable = [ "fortify" ]` would have the same effect but
37
-
# would also disable hardening from generated FFI objects.
38
-
#
39
-
# backport of https://github.com/tpm2-software/tpm2-pytss/pull/523
40
-
(fetchpatch {
41
-
url = "https://github.com/baloo/tpm2-pytss/commit/099c069f28cfcd0a3019adebfeafa976f9395221.patch";
42
-
sha256 = "sha256-wU2WfLYFDmkhGzYornZ386tB3zb3GYfGOTc+/QOFb1o=";
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
-
(fetchpatch {
53
-
name = "test-new-cryptography.patch";
54
-
url = "https://github.com/tpm2-software/tpm2-pytss/commit/e4006e6066c015d9ed55befa9b98247fbdcafd7d.diff";
55
-
sha256 = "sha256-Wxe9u7Cvv2vKMGTcK3X8W1Mq/nCt70zrzWUKA+83Sas=";
56
-
})
57
-
58
-
# Inheritance in newer cryptography is not possible anymore
59
-
# for `RSAPrivateNumbers` because of a Rust implementation.
60
-
# https://github.com/tpm2-software/tpm2-pytss/pull/562
61
-
(fetchpatch {
62
-
name = "fix-newer-cryptography-42-0-1-support.patch";
63
-
url = "https://github.com/tpm2-software/tpm2-pytss/commit/0fbb9d099370c0a7031dd13990986538f586836a.patch";
64
-
sha256 = "sha256-xnQIr4/iJra0+rn5estVqSvG8pXcuwWykmmayBpCzgw=";
65
-
})
66
-
67
33
# Fix hardcoded `fapi-config.json` configuration path
68
34
./fapi-config.patch
69
35
];