diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2024-03-15 13:43:16 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-15 13:43:16 +0100 |
commit | d54ef183c7c793ddfe7da60f7e8547fb55a4a24f (patch) | |
tree | 2f9cd6d1b8c2007ffff1bfd45b933b2580a5709f /pkgs | |
parent | 77ebb870bfed28361e1b33b01a4fa12dd7b4ea93 (diff) | |
parent | ad4a973a56c80df2dff8fb117c7146dbd389df85 (diff) |
Merge pull request #288186 from baloo/baloo/tpm2-pytss/2.2.0
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/python-modules/tpm2-pytss/default.nix | 38 |
1 files changed, 2 insertions, 36 deletions
diff --git a/pkgs/development/python-modules/tpm2-pytss/default.nix b/pkgs/development/python-modules/tpm2-pytss/default.nix index b6f43516f3a37..484f3dc2d16e3 100644 --- a/pkgs/development/python-modules/tpm2-pytss/default.nix +++ b/pkgs/development/python-modules/tpm2-pytss/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , pythonOlder , asn1crypto , cffi @@ -20,50 +19,17 @@ buildPythonPackage rec { pname = "tpm2-pytss"; - version = "2.1.0"; + version = "2.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-W1tLFFb9wa7vPSw5cL6qB4yPfyZIyXppvPYMWi+VyJc="; + hash = "sha256-uPFUc0IvN39ZxyF9zRR5FlzOYt+jOTTsl2oni68unv4="; }; patches = [ - # This patches the call to the C preprocessor not to include types - # pycparser does not handle. - # `hardeningDisable = [ "fortify" ]` would have the same effect but - # would also disable hardening from generated FFI objects. - # - # backport of https://github.com/tpm2-software/tpm2-pytss/pull/523 - (fetchpatch { - url = "https://github.com/baloo/tpm2-pytss/commit/099c069f28cfcd0a3019adebfeafa976f9395221.patch"; - sha256 = "sha256-wU2WfLYFDmkhGzYornZ386tB3zb3GYfGOTc+/QOFb1o="; - }) - - # Lookup tcti via getinfo not system's ld_library_path - # https://github.com/tpm2-software/tpm2-pytss/pull/525 - (fetchpatch { - url = "https://github.com/tpm2-software/tpm2-pytss/commit/97289a08ddf44f7bdccdd122d6055c69e12dc584.patch"; - sha256 = "sha256-VFq3Hv4I8U8ifP/aSjyu0BiW/4jfPlRDKqRcqUGw6UQ="; - }) - - (fetchpatch { - name = "test-new-cryptography.patch"; - url = "https://github.com/tpm2-software/tpm2-pytss/commit/e4006e6066c015d9ed55befa9b98247fbdcafd7d.diff"; - sha256 = "sha256-Wxe9u7Cvv2vKMGTcK3X8W1Mq/nCt70zrzWUKA+83Sas="; - }) - - # Inheritance in newer cryptography is not possible anymore - # for `RSAPrivateNumbers` because of a Rust implementation. - # https://github.com/tpm2-software/tpm2-pytss/pull/562 - (fetchpatch { - name = "fix-newer-cryptography-42-0-1-support.patch"; - url = "https://github.com/tpm2-software/tpm2-pytss/commit/0fbb9d099370c0a7031dd13990986538f586836a.patch"; - sha256 = "sha256-xnQIr4/iJra0+rn5estVqSvG8pXcuwWykmmayBpCzgw="; - }) - # Fix hardcoded `fapi-config.json` configuration path ./fapi-config.patch ]; |