swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 12:29:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #288186 from baloo/baloo/tpm2-pytss/2.2.0

Browse source
This commit is contained in:
Sandro 2024-03-15 13:43:16 +01:00 committed by GitHub
parent 77ebb870bf ad4a973a56
commit d54ef183c7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
pkgs/development/python-modules/tpm2-pytss/default.nix
View file

@ -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
];