From 46db40a5006fbe3f6cf464d28b8a608f239b334a Mon Sep 17 00:00:00 2001 From: Marcel Date: Sat, 15 Feb 2025 21:11:22 +0100 Subject: [PATCH] python312Packages.django-allauth-2fa: drop django-allauth-2fa was unused, incompatible with the currently packaged django-allauth version and django-allauth now supports 2fa itself. > and the release notes encourage to switch to allauth https://github.com/valohai/django-allauth-2fa/issues/189#issuecomment-2594667805 --- .../django-allauth-2fa/default.nix | 45 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 pkgs/development/python-modules/django-allauth-2fa/default.nix diff --git a/pkgs/development/python-modules/django-allauth-2fa/default.nix b/pkgs/development/python-modules/django-allauth-2fa/default.nix deleted file mode 100644 index 09eb74e709e58b..00000000000000 --- a/pkgs/development/python-modules/django-allauth-2fa/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - lib, - buildPythonPackage, - django, - django-allauth, - django-otp, - fetchFromGitHub, - pythonOlder, - qrcode, - hatchling, -}: - -buildPythonPackage rec { - pname = "django-allauth-2fa"; - version = "0.12.0"; - format = "pyproject"; - - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "valohai"; - repo = "django-allauth-2fa"; - tag = "v${version}"; - hash = "sha256-hVPIqy3vpRXTYTGRXEE5wg0oPyhLlm37fM9wn7xRYys="; - }; - - nativeBuildInputs = [ hatchling ]; - - propagatedBuildInputs = [ - django - django-allauth - django-otp - qrcode - ]; - - pythonImportsCheck = [ "allauth_2fa" ]; - - meta = with lib; { - description = "django-allauth-2fa adds two-factor authentication to django-allauth"; - homepage = "https://github.com/valohai/django-allauth-2fa"; - changelog = "https://github.com/valohai/django-allauth-2fa/releases/tag/${src.tag}"; - license = licenses.asl20; - maintainers = with maintainers; [ derdennisop ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 50f9db2d05777e..88938bf765ed37 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -160,6 +160,7 @@ mapAliases ({ distutils_extra = distutils-extra; # added 2023-10-12 digital-ocean = python-digitalocean; # addad 2024-04-12 djangorestframework-jwt = drf-jwt; # added 2021-07-20 + django-allauth-2fa = throw "django-allauth-2fa was removed because it was unused and django-allauth now contains 2fa logic itself."; # added 2025-02-15 django-sampledatahelper = throw "django-sampledatahelper was removed because it is no longer compatible to latest Django version"; # added 2022-07-18 django_2 = throw "Django 2 has reached it's projected EOL in 2022/04 and has therefore been removed."; # added 2022-03-05 django_appconf = django-appconf; # added 2022-03-03 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d1a719fac07cbf..51bc0c6ba10586 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3416,8 +3416,6 @@ self: super: with self; { django-allauth = callPackage ../development/python-modules/django-allauth { }; - django-allauth-2fa = callPackage ../development/python-modules/django-allauth-2fa { }; - django-anymail = callPackage ../development/python-modules/django-anymail { }; django-annoying = callPackage ../development/python-modules/django-annoying { };