From ee58a9b468de929958fde5b08b4accc7f0ca8df1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 24 Nov 2022 10:24:49 -0800
Subject: [PATCH] python310Packages.pgpy: 0.5.4 -> 0.6.0

https://github.com/SecurityInnovation/PGPy/blob/v0.6.0/docs/source/changelog.rst
---
 .../python-modules/pgpy/default.nix           | 37 ++++++-------------
 1 file changed, 12 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/python-modules/pgpy/default.nix b/pkgs/development/python-modules/pgpy/default.nix
index 336d077f2aa..2b548e7f474 100644
--- a/pkgs/development/python-modules/pgpy/default.nix
+++ b/pkgs/development/python-modules/pgpy/default.nix
@@ -1,10 +1,8 @@
 { lib
 , pythonOlder
 , fetchFromGitHub
-, fetchpatch
 , buildPythonPackage
-, six
-, enum34
+, setuptools
 , pyasn1
 , cryptography
 , pytestCheckHook
@@ -12,49 +10,38 @@
 
 buildPythonPackage rec {
   pname = "pgpy";
-  version = "0.5.4";
+  version = "0.6.0";
+
+  disabled = pythonOlder "3.6";
+
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "SecurityInnovation";
     repo = "PGPy";
     rev = "v${version}";
-    hash = "sha256-iuga6vZ7eOl/wNVuLnhDVeUPJPibGm8iiyTC4dOA7A4=";
+    hash = "sha256-47YiHNxmjyCOYHHUV3Zyhs3Att9HZtCXYfbN34ooTxU=";
   };
 
-  patches = [
-    # Fixes the issue in https://github.com/SecurityInnovation/PGPy/issues/402.
-    # by pulling in https://github.com/SecurityInnovation/PGPy/pull/403.
-    (fetchpatch {
-      name = "crytography-38-support.patch";
-      url = "https://github.com/SecurityInnovation/PGPy/commit/d84597eb8417a482433ff51dc6b13060d4b2e686.patch";
-      hash = "sha256-dviXCSGtPguROHVZ1bt/eEfpATjehm8jZ5BeVjxdb8U=";
-    })
+  nativeBuildInputs = [
+    setuptools
   ];
 
   propagatedBuildInputs = [
-    six
     pyasn1
     cryptography
-  ] ++ lib.optionals (pythonOlder "3.4") [
-    enum34
   ];
 
   checkInputs = [
     pytestCheckHook
   ];
 
-  disabledTests = [
-    # assertions contains extra: IDEA has been deprecated
-    "test_encrypt_bad_cipher"
-  ];
-
   meta = with lib; {
     homepage = "https://github.com/SecurityInnovation/PGPy";
-    description = "Pretty Good Privacy for Python 2 and 3";
+    description = "Pretty Good Privacy for Python";
     longDescription = ''
-      PGPy is a Python (2 and 3) library for implementing Pretty Good Privacy
-      into Python programs, conforming to the OpenPGP specification per RFC
-      4880.
+      PGPy is a Python library for implementing Pretty Good Privacy into Python
+      programs, conforming to the OpenPGP specification per RFC 4880.
     '';
     license = licenses.bsd3;
     maintainers = with maintainers; [ eadwu dotlambda ];