about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRobert Schütz <nix@dotlambda.de>2024-02-21 05:43:50 +0000
committerGitHub <noreply@github.com>2024-02-21 05:43:50 +0000
commit30447f49798575663118d374b108845178fe4039 (patch)
tree5723e12eb530bcfb71c2ce39951215ff239f9552
parent6c76b7c9f3020e1ee0bb46a1f6c40669d2f34839 (diff)
parentd2eceeb2b8e9bd911589971f51d2dd33207bcd8c (diff)
downloadnixlib-30447f49798575663118d374b108845178fe4039.tar
nixlib-30447f49798575663118d374b108845178fe4039.tar.gz
nixlib-30447f49798575663118d374b108845178fe4039.tar.bz2
nixlib-30447f49798575663118d374b108845178fe4039.tar.lz
nixlib-30447f49798575663118d374b108845178fe4039.tar.xz
nixlib-30447f49798575663118d374b108845178fe4039.tar.zst
nixlib-30447f49798575663118d374b108845178fe4039.zip
Merge pull request #290036 from dotlambda/signify-unbreak
python311Packages.signify: relax pyasn1 constraint
-rw-r--r--pkgs/development/python-modules/signify/default.nix28
1 files changed, 17 insertions, 11 deletions
diff --git a/pkgs/development/python-modules/signify/default.nix b/pkgs/development/python-modules/signify/default.nix
index 85e4d4668e5b..a1924902fe8e 100644
--- a/pkgs/development/python-modules/signify/default.nix
+++ b/pkgs/development/python-modules/signify/default.nix
@@ -3,28 +3,42 @@
 , buildPythonPackage
 , certvalidator
 , fetchFromGitHub
+, fetchpatch2
 , mscerts
 , oscrypto
 , pyasn1
 , pyasn1-modules
 , pytestCheckHook
 , pythonOlder
+, setuptools
 }:
 
 buildPythonPackage rec {
   pname = "signify";
   version = "0.5.2";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "ralphje";
-    repo = pname;
+    repo = "signify";
     rev = "refs/tags/v${version}";
     hash = "sha256-+UhZF+QYuv8pq/sTu7GDPUrlPNNixFgVZL+L0ulj/ko=";
   };
 
+  patches = [
+    # https://github.com/ralphje/signify/pull/42
+    (fetchpatch2 {
+      url = "https://github.com/ralphje/signify/commit/38cad57bf86f7498259b47bfef1354aec27c0955.patch";
+      hash = "sha256-dLmHSlj2Cj6jbbrZStgK2Rh/H5vOaIbi5lut5RAbd+s=";
+    })
+  ];
+
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [
     asn1crypto
     certvalidator
@@ -42,19 +56,11 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTests = [
-    # chain doesn't validate because end-entitys certificate expired
-    # https://github.com/ralphje/signify/issues/27
-    "test_revoked_certificate"
-  ];
-
   meta = with lib; {
+    changelog = "https://github.com/ralphje/signify/blob/${src.rev}/docs/changelog.rst";
     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;
   };
 }