diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cfd8a8918db..a5338d5155b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4375,16 +4375,6 @@ githubId = 41924494; name = "Ivar"; }; - ivegotasthma = { - email = "ivegotasthma@protonmail.com"; - github = "ivegotasthma"; - githubId = 2437675; - name = "John Doe"; - keys = [{ - longkeyid = "rsa4096/09AC52AEA87817A4"; - fingerprint = "4008 2A5B 56A4 79B9 83CB 95FD 09AC 52AE A878 17A4"; - }]; - }; ixmatus = { email = "parnell@digitalmentat.com"; github = "ixmatus"; diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix index 28b6fccfca9..7e1c8f5a583 100644 --- a/pkgs/development/python-modules/braintree/default.nix +++ b/pkgs/development/python-modules/braintree/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { description = "Python library for integration with Braintree"; homepage = "https://github.com/braintree/braintree_python"; license = licenses.mit; - maintainers = [ maintainers.ivegotasthma ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/coreapi/default.nix b/pkgs/development/python-modules/coreapi/default.nix index 8b957fee4f6..ad9fd3d7ef7 100644 --- a/pkgs/development/python-modules/coreapi/default.nix +++ b/pkgs/development/python-modules/coreapi/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { description = "Python client library for Core API"; homepage = "https://github.com/core-api/python-client"; license = licenses.bsd3; - maintainers = with maintainers; [ ivegotasthma ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/coreschema/default.nix b/pkgs/development/python-modules/coreschema/default.nix index 65bdee5a8da..d22e7f4ecd9 100644 --- a/pkgs/development/python-modules/coreschema/default.nix +++ b/pkgs/development/python-modules/coreschema/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Python client library for Core Schema"; homepage = "https://github.com/ivegotasthma/python-coreschema"; license = licenses.bsd3; - maintainers = with maintainers; [ ivegotasthma ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/django-anymail/default.nix b/pkgs/development/python-modules/django-anymail/default.nix index 6f1d81c9287..9b5c8e1d00b 100644 --- a/pkgs/development/python-modules/django-anymail/default.nix +++ b/pkgs/development/python-modules/django-anymail/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { description = "Django email backends and webhooks for Mailgun"; homepage = "https://github.com/anymail/django-anymail"; license = licenses.bsd3; - maintainers = with maintainers; [ ivegotasthma ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/django-cors-headers/default.nix b/pkgs/development/python-modules/django-cors-headers/default.nix index 1bc9153d006..ace1dc4f2de 100644 --- a/pkgs/development/python-modules/django-cors-headers/default.nix +++ b/pkgs/development/python-modules/django-cors-headers/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Django app for handling server Cross-Origin Resource Sharing (CORS) headers"; homepage = "https://github.com/OttoYiu/django-cors-headers"; license = licenses.mit; - maintainers = [ maintainers.ivegotasthma ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/django-rest-auth/default.nix b/pkgs/development/python-modules/django-rest-auth/default.nix index 9e11c2b6a03..e04581b3574 100644 --- a/pkgs/development/python-modules/django-rest-auth/default.nix +++ b/pkgs/development/python-modules/django-rest-auth/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { description = "Django app that makes registration and authentication easy"; homepage = "https://github.com/Tivix/django-rest-auth"; license = licenses.mit; - maintainers = [ maintainers.ivegotasthma ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/djangorestframework-jwt/default.nix b/pkgs/development/python-modules/djangorestframework-jwt/default.nix deleted file mode 100644 index 643218242d7..00000000000 --- a/pkgs/development/python-modules/djangorestframework-jwt/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, fetchPypi -, django -, pyjwt -, djangorestframework -, buildPythonPackage -}: - -buildPythonPackage rec { - pname = "djangorestframework-jwt"; - version = "1.11.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "19rng6v1sw14mbjp5cplnrgxjnhlj8faalfw02iihi9s5w1k7zjy"; - }; - - propagatedBuildInputs = [ pyjwt django djangorestframework ]; - - # ./runtests.py fails because the project must be tested against a django - # installation, there are missing database tables for User, that don't exist. - doCheck = false; - - meta = with lib; { - description = "JSON Web Token Authentication support for Django REST Framework"; - homepage = "https://github.com/GetBlimp/django-rest-framework-jwt"; - license = licenses.mit; - maintainers = [ maintainers.ivegotasthma ]; - }; -} diff --git a/pkgs/development/python-modules/drf-jwt/default.nix b/pkgs/development/python-modules/drf-jwt/default.nix new file mode 100644 index 00000000000..ad3edc59246 --- /dev/null +++ b/pkgs/development/python-modules/drf-jwt/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyjwt +, djangorestframework +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "drf-jwt"; + version = "1.19.0"; + + src = fetchFromGitHub { + owner = "Styria-Digital"; + repo = "django-rest-framework-jwt"; + rev = version; + sha256 = "012rmm25w5gvkzi4lyyhn47y1n6g68q9gasga2mkv9i6mn8n4kp7"; + }; + + propagatedBuildInputs = [ + pyjwt + djangorestframework + ]; + + # requires setting up a django instance + doCheck = false; + + pythonImportsCheck = [ + "rest_framework_jwt" + "rest_framework_jwt.blacklist" + # require setting DJANGO_SETTINGS_MODULE + # "rest_framework_jwt.authentication" + # "rest_framework_jwt.blacklist.views" + # "rest_framework_jwt.settings" + # "rest_framework_jwt.utils" + # "rest_framework_jwt.views" + ]; + + meta = with lib; { + description = "JSON Web Token based authentication for Django REST framework"; + homepage = "https://github.com/Styria-Digital/django-rest-framework-jwt"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/drf-yasg/default.nix b/pkgs/development/python-modules/drf-yasg/default.nix index ab1d551fea3..5342ff8da83 100644 --- a/pkgs/development/python-modules/drf-yasg/default.nix +++ b/pkgs/development/python-modules/drf-yasg/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Generation of Swagger/OpenAPI schemas for Django REST Framework"; homepage = "https://github.com/axnsan12/drf-yasg"; - maintainers = with maintainers; [ ivegotasthma ]; + maintainers = with maintainers; [ ]; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/itypes/default.nix b/pkgs/development/python-modules/itypes/default.nix index 1b684547240..36581bf2db5 100644 --- a/pkgs/development/python-modules/itypes/default.nix +++ b/pkgs/development/python-modules/itypes/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { description = "Simple immutable types for python"; homepage = "https://github.com/tomchristie/itypes"; license = licenses.bsd3; - maintainers = with maintainers; [ ivegotasthma ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f331e80124b..55b29f6df92 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1978,7 +1978,7 @@ in { djangorestframework = callPackage ../development/python-modules/djangorestframework { }; - djangorestframework-jwt = callPackage ../development/python-modules/djangorestframework-jwt { }; + djangorestframework-jwt = self.drf-jwt; djangorestframework-simplejwt = callPackage ../development/python-modules/djangorestframework-simplejwt { }; @@ -2096,6 +2096,8 @@ in { dpkt = callPackage ../development/python-modules/dpkt { }; + drf-jwt = callPackage ../development/python-modules/drf-jwt { }; + drf-nested-routers = callPackage ../development/python-modules/drf-nested-routers { }; drf-yasg = callPackage ../development/python-modules/drf-yasg { };