From 7de4ded03b7dae65f4898dc35dbfc1d4633558da Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 9 Dec 2021 18:47:28 -0800
Subject: [PATCH] python3Packages.pyjwt1: move to privacyidea overlay

---
 .../applications/misc/privacyidea/default.nix | 12 +++++-
 pkgs/development/python-modules/pyjwt/1.nix   | 38 -------------------
 pkgs/top-level/python-packages.nix            |  2 -
 pkgs/top-level/python2-packages.nix           |  2 -
 4 files changed, 11 insertions(+), 43 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pyjwt/1.nix

diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/applications/misc/privacyidea/default.nix
index 6757cd3f7fa0..912cb9b94b1b 100644
--- a/pkgs/applications/misc/privacyidea/default.nix
+++ b/pkgs/applications/misc/privacyidea/default.nix
@@ -25,6 +25,16 @@ let
       sqlsoup = super.sqlsoup.overrideAttrs ({ meta ? {}, ... }: {
         meta = meta // { broken = false; };
       });
+      pyjwt = super.pyjwt.overridePythonAttrs (oldAttrs: rec {
+        version = "1.7.1";
+        src = python3.pkgs.fetchPypi {
+          pname = "PyJWT";
+          inherit version;
+          sha256 = "sha256-jVmpdvt3Pz5qOchWNjV8Tw4kJwc5TK2t2YFPXLqiDpY=";
+        };
+        # requires different testing dependencies, and privacyIDEA will test this as well
+        doCheck = false;
+      });
     };
   };
 in
@@ -42,7 +52,7 @@ python3'.pkgs.buildPythonPackage rec {
 
   propagatedBuildInputs = with python3'.pkgs; [
     cryptography pyrad pymysql python-dateutil flask-versioned flask_script
-    defusedxml croniter flask_migrate pyjwt1 configobj sqlsoup pillow
+    defusedxml croniter flask_migrate pyjwt configobj sqlsoup pillow
     python-gnupg passlib pyopenssl beautifulsoup4 smpplib flask-babel
     ldap3 huey pyyaml qrcode oauth2client requests lxml cbor2 psycopg2
     pydash ecdsa google-auth importlib-metadata
diff --git a/pkgs/development/python-modules/pyjwt/1.nix b/pkgs/development/python-modules/pyjwt/1.nix
deleted file mode 100644
index 285e5e2e7600..000000000000
--- a/pkgs/development/python-modules/pyjwt/1.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, cryptography
-, pytestCheckHook
-}:
-
-buildPythonPackage rec {
-  pname = "PyJWT";
-  version = "1.7.1";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "15hflax5qkw1v6nssk1r0wkj83jgghskcmn875m3wgvpzdvajncd";
-  };
-
-  postPatch = ''
-    substituteInPlace setup.py --replace "pytest>=4.0.1,<5.0.0" "pytest"
-
-    # drop coverage
-    sed -i '/pytest-cov/d' setup.py
-    sed -i '/--cov/d' setup.cfg
-  '';
-
-  propagatedBuildInputs = [
-    cryptography
-  ];
-
-  checkInputs = [
-    pytestCheckHook
-  ];
-
-  meta = with lib; {
-    description = "JSON Web Token implementation in Python";
-    homepage = "https://github.com/jpadilla/pyjwt";
-    license = licenses.mit;
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6a654ba00757..29655c95ce4c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6100,8 +6100,6 @@ in {
 
   privacyidea-ldap-proxy = callPackage ../development/python-modules/privacyidea-ldap-proxy { };
 
-  pyjwt1 = callPackage ../development/python-modules/pyjwt/1.nix { };
-
   proboscis = callPackage ../development/python-modules/proboscis { };
 
   process-tests = callPackage ../development/python-modules/process-tests { };
diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix
index 59afe1064168..7e485bdf3bfb 100644
--- a/pkgs/top-level/python2-packages.nix
+++ b/pkgs/top-level/python2-packages.nix
@@ -457,8 +457,6 @@ with self; with super; {
 
   pyhamcrest = callPackage ../development/python-modules/pyhamcrest/1.nix { };
 
-  pyjwt = callPackage ../development/python-modules/pyjwt/1.nix { };
-
   pykickstart = callPackage ../development/python-modules/pykickstart { };
 
   pylibacl = callPackage ../development/python-modules/pylibacl/0.5.nix { };