From a202a07e2381b71531f22ae43b23a37faffec249 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 May 2023 09:55:48 +0200 Subject: [PATCH 1/2] python310Packages.mscerts: init at 2023.4.26 --- .../python-modules/mscerts/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/mscerts/default.nix diff --git a/pkgs/development/python-modules/mscerts/default.nix b/pkgs/development/python-modules/mscerts/default.nix new file mode 100644 index 000000000000..095d8dad3c55 --- /dev/null +++ b/pkgs/development/python-modules/mscerts/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "mscerts"; + version = "2023.4.26"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "ralphje"; + repo = "mscerts"; + rev = "refs/tags/${version}"; + hash = "sha256-7aiSFMZsUtuSqXQ1jJ3OhyBhzAH70ZX5+NqOtrpRmmw="; + }; + + # extras_require contains signify -> circular dependency + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "mscerts" + ]; + + meta = with lib; { + description = "Makes the Microsoft Trusted Root Program's Certificate Trust Lists available in Python"; + homepage = "https://github.com/ralphje/mscerts"; + license = with licenses; [ mpl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 348b9e913e3d..e407279277bf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6397,6 +6397,8 @@ self: super: with self; { msal-extensions = callPackage ../development/python-modules/msal-extensions { }; + mscerts = callPackage ../development/python-modules/mscerts { }; + msgpack = callPackage ../development/python-modules/msgpack { }; msgpack-numpy = callPackage ../development/python-modules/msgpack-numpy { }; From 17ee454293c565fc8681cb6eaf0e6f590d4b0fce Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 May 2023 10:08:08 +0200 Subject: [PATCH 2/2] python311Packages.signify: 0.4.0 -> 0.5.2, mark as broken --- .../python-modules/signify/default.nix | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/signify/default.nix b/pkgs/development/python-modules/signify/default.nix index 9d6ce6c7db45..85e4d4668e5b 100644 --- a/pkgs/development/python-modules/signify/default.nix +++ b/pkgs/development/python-modules/signify/default.nix @@ -1,31 +1,34 @@ { lib -, buildPythonPackage -, pythonOlder -, fetchFromGitHub , asn1crypto +, buildPythonPackage , certvalidator +, fetchFromGitHub +, mscerts , oscrypto , pyasn1 , pyasn1-modules , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "signify"; - version = "0.4.0"; - disabled = pythonOlder "3.6"; + version = "0.5.2"; format = "setuptools"; + disabled = pythonOlder "3.6"; + src = fetchFromGitHub { owner = "ralphje"; repo = pname; - rev = "v${version}"; - hash = "sha256-YJc9RIqkEL7dd1ahE4IbxyyZgsZWBDqbXZAvI/nK24M="; + rev = "refs/tags/v${version}"; + hash = "sha256-+UhZF+QYuv8pq/sTu7GDPUrlPNNixFgVZL+L0ulj/ko="; }; propagatedBuildInputs = [ asn1crypto certvalidator + mscerts oscrypto pyasn1 pyasn1-modules @@ -46,9 +49,12 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://github.com/ralphje/signify"; description = "library that verifies PE Authenticode-signed binaries"; + homepage = "https://github.com/ralphje/signify"; license = licenses.mit; maintainers = with maintainers; [ baloo ]; + # No support for pyasn1 > 0.5 + # https://github.com/ralphje/signify/issues/37 + broken = true; }; }