From 807a91eb8a8bf6fc49c1b45d1a94ced569fefe91 Mon Sep 17 00:00:00 2001
From: Sylvain Fankhauser <sephi@fhtagn.top>
Date: Tue, 27 Dec 2022 09:37:17 +0100
Subject: [PATCH 01/16] maintainers: add sephi

---
 maintainers/maintainer-list.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2f0eb281950b..4ca78001eae2 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -12634,6 +12634,15 @@
     githubId = 893474;
     name = "Stefan Wiehler";
   };
+  sephi = {
+    name = "Sylvain Fankhauser";
+    email = "sephi@fhtagn.top";
+    github = "sephii";
+    githubId = 754333;
+    keys = [{
+      fingerprint = "2A9D 8E76 5EE2 237D 7B6B  A2A5 4228 AB9E C061 2ADA";
+    }];
+  };
   sepi = {
     email = "raffael@mancini.lu";
     github = "sepi";

From 348e485608705007d639a609e91d6882000fdbd9 Mon Sep 17 00:00:00 2001
From: Sylvain Fankhauser <sephi@fhtagn.top>
Date: Tue, 27 Dec 2022 09:38:15 +0100
Subject: [PATCH 02/16] python3Packages.django-rest-registration: init at 0.7.3

---
 .../django-rest-registration/default.nix      | 42 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/development/python-modules/django-rest-registration/default.nix

diff --git a/pkgs/development/python-modules/django-rest-registration/default.nix b/pkgs/development/python-modules/django-rest-registration/default.nix
new file mode 100644
index 000000000000..5abdd284f49e
--- /dev/null
+++ b/pkgs/development/python-modules/django-rest-registration/default.nix
@@ -0,0 +1,42 @@
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, python
+, pytestCheckHook
+, django
+, djangorestframework
+, pytest-django
+}:
+
+buildPythonPackage rec {
+  pname = "django-rest-registration";
+  version = "0.7.3";
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "apragacz";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-JoIeVjl5s60ilq9kU28Jo+GaYRKU61hoqy1GzYmMdZQ=";
+  };
+
+  propagatedBuildInputs = [ django djangorestframework ];
+
+  checkInputs = [ pytestCheckHook pytest-django ];
+
+  pythonImportsCheck = [ "rest_registration" ];
+
+  disabledTests = [
+    # This test fails on Python 3.10
+    "test_convert_html_to_text_fails"
+    # This test is broken and was removed after 0.7.3. Remove this line once version > 0.7.3
+    "test_coreapi_autoschema_success"
+  ];
+
+  meta = with lib; {
+    description = "User-related REST API based on the awesome Django REST Framework";
+    homepage = "https://github.com/apragacz/django-rest-registration/";
+    license = licenses.mit;
+    maintainers = with maintainers; [ sephi ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 405b9de1c9db..179b1e026cf3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2598,6 +2598,8 @@ self: super: with self; {
 
   django-rest-polymorphic = callPackage ../development/python-modules/django-rest-polymorphic { };
 
+  django-rest-registration = callPackage ../development/python-modules/django-rest-registration { };
+
   django-rq = callPackage ../development/python-modules/django-rq { };
 
   djangorestframework = callPackage ../development/python-modules/djangorestframework { };

From 8820ea8fc570fe6fe144efe247084c5b6bc12d85 Mon Sep 17 00:00:00 2001
From: Sylvain Fankhauser <sephi@fhtagn.top>
Date: Thu, 22 Dec 2022 15:04:23 +0100
Subject: [PATCH 03/16] python3Packages.django-phonenumber-field: init at 6.4.0

---
 .../django-phonenumber-field/default.nix      | 44 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/development/python-modules/django-phonenumber-field/default.nix

diff --git a/pkgs/development/python-modules/django-phonenumber-field/default.nix b/pkgs/development/python-modules/django-phonenumber-field/default.nix
new file mode 100644
index 000000000000..b8091acd659a
--- /dev/null
+++ b/pkgs/development/python-modules/django-phonenumber-field/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, python
+, babel
+, django
+, djangorestframework
+, phonenumbers
+, setuptools-scm
+}:
+
+buildPythonPackage rec {
+  pname = "django-phonenumber-field";
+  version = "6.4.0";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "stefanfoulis";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-rrJTCWn1mFV4QQu8wyLDxheHkZQ/FIE7mRC/9nXNSaM=";
+  };
+
+  nativeBuildInputs = [ setuptools-scm ];
+
+  propagatedBuildInputs = [ django phonenumbers babel ];
+
+  checkInputs = [ djangorestframework ];
+
+  pythonImportsCheck = [ "phonenumber_field" ];
+
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+  checkPhase = ''
+    ${python.interpreter} -m django test --settings tests.settings
+  '';
+
+  meta = with lib; {
+    description = "A django model and form field for normalised phone numbers using python-phonenumbers";
+    homepage = "https://github.com/stefanfoulis/django-phonenumber-field/";
+    license = licenses.mit;
+    maintainers = with maintainers; [ sephi ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 179b1e026cf3..ab37b9476ddc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2574,6 +2574,8 @@ self: super: with self; {
 
   django-pglocks = callPackage ../development/python-modules/django-pglocks { };
 
+  django-phonenumber-field = callPackage ../development/python-modules/django-phonenumber-field { };
+
   django-picklefield = callPackage ../development/python-modules/django-picklefield { };
 
   django-polymorphic = callPackage ../development/python-modules/django-polymorphic { };

From e7b618f61fb1036b7755edfdaa105854dedde8f8 Mon Sep 17 00:00:00 2001
From: Sylvain Fankhauser <sephi@fhtagn.top>
Date: Thu, 22 Dec 2022 15:31:53 +0100
Subject: [PATCH 04/16] python3Packages.django-import-export: init at 2.8.0

---
 .../django-import-export/default.nix          | 42 +++++++++++++++++++
 .../python-modules/markuppy/default.nix       | 24 +++++++++++
 .../python-modules/tablib/default.nix         |  5 ++-
 pkgs/top-level/python-packages.nix            |  4 ++
 4 files changed, 73 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/python-modules/django-import-export/default.nix
 create mode 100644 pkgs/development/python-modules/markuppy/default.nix

diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix
new file mode 100644
index 000000000000..8ff91dfbbdfc
--- /dev/null
+++ b/pkgs/development/python-modules/django-import-export/default.nix
@@ -0,0 +1,42 @@
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, python
+, chardet
+, django
+, diff-match-patch
+, pytz
+, tablib
+}:
+
+buildPythonPackage rec {
+  pname = "django-import-export";
+  version = "2.8.0";
+
+  src = fetchFromGitHub {
+    owner = "django-import-export";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-km6TQq4OZZtx9/lgBzS3tEifAYjkkUX//9FRATDLX/0=";
+  };
+
+  propagatedBuildInputs = [ diff-match-patch django tablib ]
+    ++ (with tablib.optional-dependencies; html ++ ods ++ xls ++ xlsx ++ yaml);
+
+  checkInputs = [ chardet pytz ];
+
+  checkPhase = ''
+    runHook preCheck
+    ${python.interpreter} tests/manage.py test core --settings=settings
+    runHook postCheck
+  '';
+
+  pythonImportsCheck = [ "import_export" ];
+
+  meta = with lib; {
+    description = "Django application and library for importing and exporting data with admin integration";
+    homepage = "https://github.com/django-import-export/django-import-export";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ sephi ];
+  };
+}
diff --git a/pkgs/development/python-modules/markuppy/default.nix b/pkgs/development/python-modules/markuppy/default.nix
new file mode 100644
index 000000000000..e10b7b4bb1d3
--- /dev/null
+++ b/pkgs/development/python-modules/markuppy/default.nix
@@ -0,0 +1,24 @@
+{ lib, fetchPypi, buildPythonPackage }:
+
+buildPythonPackage rec {
+  pname = "markuppy";
+  version = "1.14";
+
+  src = fetchPypi {
+    pname = "MarkupPy";
+    inherit version;
+    sha256 = "sha256-Gt7iwKVCrzeP6EVI/29rAWjzy39Ca0aWEDiivPqtDV8=";
+  };
+
+  # has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "MarkupPy" ];
+
+  meta = with lib; {
+    description = "An HTML/XML generator";
+    homepage = "https://github.com/tylerbakke/MarkupPy";
+    license = licenses.mit;
+    maintainers = with maintainers; [ sephi ];
+  };
+}
diff --git a/pkgs/development/python-modules/tablib/default.nix b/pkgs/development/python-modules/tablib/default.nix
index f07691abdca7..468d8c7c54e6 100644
--- a/pkgs/development/python-modules/tablib/default.nix
+++ b/pkgs/development/python-modules/tablib/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, markuppy
 , odfpy
 , openpyxl
 , pandas
@@ -37,7 +38,7 @@ buildPythonPackage rec {
 
   passthru.optional-dependencies = {
     all = [
-      # markuppy
+      markuppy
       odfpy
       openpyxl
       pandas
@@ -50,7 +51,7 @@ buildPythonPackage rec {
       tabulate
     ];
     html = [
-      # markuppy
+      markuppy
     ];
     ods = [
       odfpy
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ab37b9476ddc..63c854e268d7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2542,6 +2542,8 @@ self: super: with self; {
   django_hijack = callPackage ../development/python-modules/django-hijack { };
   # This package may need an older version of Django. Override the package set and set e.g. `django = super.django_1_9`. See the Nixpkgs manual for examples on how to override the package set.
 
+  django-import-export = callPackage ../development/python-modules/django-import-export { };
+
   django-ipware = callPackage ../development/python-modules/django-ipware { };
 
   django-jinja = callPackage ../development/python-modules/django-jinja2 { };
@@ -5595,6 +5597,8 @@ self: super: with self; {
 
   markupsafe = callPackage ../development/python-modules/markupsafe { };
 
+  markuppy = callPackage ../development/python-modules/markuppy { };
+
   markups = callPackage ../development/python-modules/markups { };
 
   marshmallow = callPackage ../development/python-modules/marshmallow { };

From 663fa914f6b7b937d2bf832948d630c3fa359610 Mon Sep 17 00:00:00 2001
From: Sylvain Fankhauser <sephi@fhtagn.top>
Date: Thu, 22 Dec 2022 15:36:37 +0100
Subject: [PATCH 05/16] python3Packages.django-vite: init at 2.0.2

---
 .../python-modules/django-vite/default.nix    | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/python-modules/django-vite/default.nix

diff --git a/pkgs/development/python-modules/django-vite/default.nix b/pkgs/development/python-modules/django-vite/default.nix
new file mode 100644
index 000000000000..551eaf640d6e
--- /dev/null
+++ b/pkgs/development/python-modules/django-vite/default.nix
@@ -0,0 +1,27 @@
+{ lib, fetchFromGitHub, buildPythonPackage, django }:
+
+buildPythonPackage rec {
+  pname = "django-vite";
+  version = "2.0.2";
+
+  src = fetchFromGitHub {
+    owner = "MrBin99";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-lYRFNHTIQBn7CDnWFxSzXELzqEtQcbwHedSZnR7ZtbE=";
+  };
+
+  propagatedBuildInputs = [ django ];
+
+  # Package doesn’t have any tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "django_vite" ];
+
+  meta = with lib; {
+    description = " Integration of ViteJS in a Django project.";
+    homepage = "https://github.com/MrBin99/django-vite";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ sephi ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 63c854e268d7..cba43113dc2f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2652,6 +2652,8 @@ self: super: with self; {
 
   django-versatileimagefield = callPackage ../development/python-modules/django-versatileimagefield { };
 
+  django-vite = callPackage ../development/python-modules/django-vite { };
+
   django-webpack-loader = callPackage ../development/python-modules/django-webpack-loader { };
 
   django-widget-tweaks = callPackage ../development/python-modules/django-widget-tweaks { };

From efc99b074cb9d90c4f1f7535f47336492be3664b Mon Sep 17 00:00:00 2001
From: Sylvain Fankhauser <sephi@fhtagn.top>
Date: Fri, 23 Dec 2022 14:28:44 +0100
Subject: [PATCH 06/16] python3Packages.playwright: fix Python package version
 information

---
 pkgs/development/python-modules/playwright/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix
index 66a249a3d351..e57655c2227c 100644
--- a/pkgs/development/python-modules/playwright/default.nix
+++ b/pkgs/development/python-modules/playwright/default.nix
@@ -193,6 +193,8 @@ buildPythonPackage rec {
     ln -s ${driver} $out/${python.sitePackages}/playwright/driver
   '';
 
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
   # Skip tests because they require network access.
   doCheck = false;
 

From 44b991df661494de6be6c45dba73637548c060de Mon Sep 17 00:00:00 2001
From: Sylvain Fankhauser <sephi@fhtagn.top>
Date: Fri, 23 Dec 2022 14:30:12 +0100
Subject: [PATCH 07/16] python3Packages.pytest-base-url: init at 2.0.0

---
 .../pytest-base-url/default.nix               | 41 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/python-modules/pytest-base-url/default.nix

diff --git a/pkgs/development/python-modules/pytest-base-url/default.nix b/pkgs/development/python-modules/pytest-base-url/default.nix
new file mode 100644
index 000000000000..02b90f742097
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-base-url/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, poetry-core
+, pytest
+, pytest-localserver
+, requests
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "pytest-base-url";
+  version = "2.0.0";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "pytest-dev";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-v6pLejWNeb9Do6x2EJqmLKj8DNqcMtmYIs+7iDYsbjk=";
+  };
+
+  nativeBuildInputs = [ poetry-core ];
+
+  buildInputs = [ pytest ];
+
+  propagatedBuildInputs = [ requests ];
+
+  checkInputs = [ pytestCheckHook pytest-localserver ];
+
+  pytestFlagsArray = [ "tests" ];
+
+  pythonImportsCheck = [ "pytest_base_url" ];
+
+  meta = with lib; {
+    description = "pytest plugin for URL based tests";
+    homepage = "https://github.com/pytest-dev/pytest-base-url";
+    license = licenses.mpl20;
+    maintainers = with maintainers; [ sephi ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cba43113dc2f..2cb9f5396f70 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8824,6 +8824,8 @@ self: super: with self; {
   pytest-cache = self.pytestcache; # added 2021-01-04
   pytestcache = callPackage ../development/python-modules/pytestcache { };
 
+  pytest-base-url = callPackage ../development/python-modules/pytest-base-url { };
+
   pytest-cases = callPackage ../development/python-modules/pytest-cases{ };
 
   pytest-catchlog = callPackage ../development/python-modules/pytest-catchlog { };

From 195eb9e77836b894667571c5bedd67c4c2d30989 Mon Sep 17 00:00:00 2001
From: Sylvain Fankhauser <sephi@fhtagn.top>
Date: Fri, 23 Dec 2022 14:31:22 +0100
Subject: [PATCH 08/16] python3Packages.pytest-playwright: init at 0.3.0

---
 .../pytest-playwright/default.nix             | 51 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/development/python-modules/pytest-playwright/default.nix

diff --git a/pkgs/development/python-modules/pytest-playwright/default.nix b/pkgs/development/python-modules/pytest-playwright/default.nix
new file mode 100644
index 000000000000..033205af05b4
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-playwright/default.nix
@@ -0,0 +1,51 @@
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, playwright
+, pytest
+, pytest-base-url
+, pytestCheckHook
+, python-slugify
+, pythonOlder
+, setuptools-scm
+, python
+, django
+}:
+
+buildPythonPackage rec {
+  pname = "pytest-playwright";
+  version = "0.3.0";
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "microsoft";
+    repo = "playwright-pytest";
+    rev = "v${version}";
+    hash = "sha256-fHzQxbQBSEkCFu/ualjzSmIt3SiEa2ktTvIJKPZLT9Q=";
+  };
+
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+  nativeBuildInputs = [ setuptools-scm ];
+
+  buildInputs = [ pytest ];
+
+  propagatedBuildInputs = [ playwright pytest-base-url python-slugify ];
+
+  # Most of the tests rely on network access, or on unavailable browsers such as
+  # msedge, chrome or webkit
+  doCheck = false;
+
+  preCheck = ''
+    export PLAYWRIGHT_BROWSERS_PATH=${playwright.browsers}
+  '';
+
+  pythonImportsCheck = [ "pytest_playwright" ];
+
+  meta = with lib; {
+    description = "Pytest plugin to write end-to-end browser tests with Playwright";
+    homepage = "https://github.com/microsoft/playwright-pytest";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ sephi ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2cb9f5396f70..38103581da5a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8924,6 +8924,8 @@ self: super: with self; {
 
   pytest-param-files = callPackage ../development/python-modules/pytest-param-files { };
 
+  pytest-playwright = callPackage ../development/python-modules/pytest-playwright {};
+
   pytest-plt = callPackage ../development/python-modules/pytest-plt { };
 
   pytest-pylint = callPackage ../development/python-modules/pytest-pylint { };

From 840fdc7c70e2ee7851a26ba5e147b7d89e514eaa Mon Sep 17 00:00:00 2001
From: Sylvain Fankhauser <sephi@fhtagn.top>
Date: Fri, 23 Dec 2022 14:35:47 +0100
Subject: [PATCH 09/16] python3Packages.django-admin-sortable2: init at 2.1.4

---
 .../django-admin-sortable2/default.nix        | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/python-modules/django-admin-sortable2/default.nix

diff --git a/pkgs/development/python-modules/django-admin-sortable2/default.nix b/pkgs/development/python-modules/django-admin-sortable2/default.nix
new file mode 100644
index 000000000000..7f53c238d5d5
--- /dev/null
+++ b/pkgs/development/python-modules/django-admin-sortable2/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildPythonPackage, django_4, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "django-admin-sortable2";
+  version = "2.1.4";
+
+  src = fetchPypi {
+    inherit version pname;
+    sha256 = "sha256-fcCP8PvOWFlQL4CdEIwElfOw2UYJJp6u27EjfgMISss=";
+  };
+
+  propagatedBuildInputs = [ django_4 ];
+
+  pythonImportsCheck = [ "adminsortable2" ];
+
+  # Tests are very slow (end-to-end with playwright)
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Generic drag-and-drop ordering for objects in the Django admin interface";
+    homepage = "https://github.com/jrief/django-admin-sortable2";
+    license = licenses.mit;
+    maintainers = with maintainers; [ sephi ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 38103581da5a..c5f77a0f6576 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2469,6 +2469,8 @@ self: super: with self; {
   # Current latest
   django_4 = callPackage ../development/python-modules/django/4.nix { };
 
+  django-admin-sortable2 = callPackage ../development/python-modules/django-admin-sortable2 { };
+
   django-allauth = callPackage ../development/python-modules/django-allauth { };
 
   django-anymail = callPackage ../development/python-modules/django-anymail { };

From 3f3607724fbe3adbcc7a4142f3224bef73357eed Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Jan 2023 14:12:20 +0100
Subject: [PATCH 10/16] python3Packages.django-rest-registration: add changelog
 to meta

---
 .../django-rest-registration/default.nix      | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/django-rest-registration/default.nix b/pkgs/development/python-modules/django-rest-registration/default.nix
index 5abdd284f49e..c1605a93d39e 100644
--- a/pkgs/development/python-modules/django-rest-registration/default.nix
+++ b/pkgs/development/python-modules/django-rest-registration/default.nix
@@ -1,11 +1,11 @@
 { lib
-, fetchFromGitHub
 , buildPythonPackage
-, python
-, pytestCheckHook
 , django
 , djangorestframework
+, fetchFromGitHub
 , pytest-django
+, pytestCheckHook
+, pythonOlder
 }:
 
 buildPythonPackage rec {
@@ -13,18 +13,28 @@ buildPythonPackage rec {
   version = "0.7.3";
   format = "setuptools";
 
+  disabled = pythonOlder "3.7";
+
   src = fetchFromGitHub {
     owner = "apragacz";
     repo = pname;
-    rev = version;
-    sha256 = "sha256-JoIeVjl5s60ilq9kU28Jo+GaYRKU61hoqy1GzYmMdZQ=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-JoIeVjl5s60ilq9kU28Jo+GaYRKU61hoqy1GzYmMdZQ=";
   };
 
-  propagatedBuildInputs = [ django djangorestframework ];
+  propagatedBuildInputs = [
+    django
+    djangorestframework
+  ];
 
-  checkInputs = [ pytestCheckHook pytest-django ];
+  checkInputs = [
+    pytestCheckHook
+    pytest-django
+  ];
 
-  pythonImportsCheck = [ "rest_registration" ];
+  pythonImportsCheck = [
+    "rest_registration"
+  ];
 
   disabledTests = [
     # This test fails on Python 3.10
@@ -36,6 +46,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "User-related REST API based on the awesome Django REST Framework";
     homepage = "https://github.com/apragacz/django-rest-registration/";
+    changelog = "https://github.com/apragacz/django-rest-registration/releases/tag/${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ sephi ];
   };

From 38334be6a955bc9d8908543b608d43257d48e89e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Jan 2023 14:15:25 +0100
Subject: [PATCH 11/16] python310Packages.django-vite: add changelog to meta

---
 .../python-modules/django-vite/default.nix    | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/django-vite/default.nix b/pkgs/development/python-modules/django-vite/default.nix
index 551eaf640d6e..9a8a7c5e4617 100644
--- a/pkgs/development/python-modules/django-vite/default.nix
+++ b/pkgs/development/python-modules/django-vite/default.nix
@@ -1,26 +1,39 @@
-{ lib, fetchFromGitHub, buildPythonPackage, django }:
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, django
+, pythonOlder
+}:
 
 buildPythonPackage rec {
   pname = "django-vite";
   version = "2.0.2";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "MrBin99";
     repo = pname;
-    rev = version;
-    sha256 = "sha256-lYRFNHTIQBn7CDnWFxSzXELzqEtQcbwHedSZnR7ZtbE=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-lYRFNHTIQBn7CDnWFxSzXELzqEtQcbwHedSZnR7ZtbE=";
   };
 
-  propagatedBuildInputs = [ django ];
+  propagatedBuildInputs = [
+    django
+  ];
 
   # Package doesn’t have any tests
   doCheck = false;
 
-  pythonImportsCheck = [ "django_vite" ];
+  pythonImportsCheck = [
+    "django_vite"
+  ];
 
   meta = with lib; {
-    description = " Integration of ViteJS in a Django project.";
+    description = "Integration of ViteJS in a Django project";
     homepage = "https://github.com/MrBin99/django-vite";
+    changelog = "https://github.com/MrBin99/django-vite/releases/tag/${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ sephi ];
   };

From 71a7045b3bf34713c9a18268995ddcc16ad32065 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Jan 2023 14:18:47 +0100
Subject: [PATCH 12/16] python3Packages.django-admin-sortable2: add changelog
 to meta

---
 .../django-admin-sortable2/default.nix        | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/django-admin-sortable2/default.nix b/pkgs/development/python-modules/django-admin-sortable2/default.nix
index 7f53c238d5d5..6301348e60ec 100644
--- a/pkgs/development/python-modules/django-admin-sortable2/default.nix
+++ b/pkgs/development/python-modules/django-admin-sortable2/default.nix
@@ -1,17 +1,29 @@
-{ lib, buildPythonPackage, django_4, fetchPypi }:
+{ lib
+, buildPythonPackage
+, django_4
+, fetchPypi
+, pythonOlder
+}:
 
 buildPythonPackage rec {
   pname = "django-admin-sortable2";
   version = "2.1.4";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit version pname;
     sha256 = "sha256-fcCP8PvOWFlQL4CdEIwElfOw2UYJJp6u27EjfgMISss=";
   };
 
-  propagatedBuildInputs = [ django_4 ];
+  propagatedBuildInputs = [
+    django_4
+  ];
 
-  pythonImportsCheck = [ "adminsortable2" ];
+  pythonImportsCheck = [
+    "adminsortable2"
+  ];
 
   # Tests are very slow (end-to-end with playwright)
   doCheck = false;
@@ -19,6 +31,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Generic drag-and-drop ordering for objects in the Django admin interface";
     homepage = "https://github.com/jrief/django-admin-sortable2";
+    changelog = "https://github.com/jrief/django-admin-sortable2/blob/${version}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ sephi ];
   };

From 342848bb592289e71aa30c97b0f2e2da229a5344 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Jan 2023 14:22:49 +0100
Subject: [PATCH 13/16] python3Packages.pytest-playwright: add changelog to
 meta

---
 .../pytest-playwright/default.nix             | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-playwright/default.nix b/pkgs/development/python-modules/pytest-playwright/default.nix
index 033205af05b4..9e620a6210a4 100644
--- a/pkgs/development/python-modules/pytest-playwright/default.nix
+++ b/pkgs/development/python-modules/pytest-playwright/default.nix
@@ -8,29 +8,38 @@
 , python-slugify
 , pythonOlder
 , setuptools-scm
-, python
 , django
 }:
 
 buildPythonPackage rec {
   pname = "pytest-playwright";
   version = "0.3.0";
+  format = "setuptools";
+
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "playwright-pytest";
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
     hash = "sha256-fHzQxbQBSEkCFu/ualjzSmIt3SiEa2ktTvIJKPZLT9Q=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
 
-  nativeBuildInputs = [ setuptools-scm ];
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
 
-  buildInputs = [ pytest ];
+  buildInputs = [
+    pytest
+  ];
 
-  propagatedBuildInputs = [ playwright pytest-base-url python-slugify ];
+  propagatedBuildInputs = [
+    playwright
+    pytest-base-url
+    python-slugify
+  ];
 
   # Most of the tests rely on network access, or on unavailable browsers such as
   # msedge, chrome or webkit
@@ -40,11 +49,14 @@ buildPythonPackage rec {
     export PLAYWRIGHT_BROWSERS_PATH=${playwright.browsers}
   '';
 
-  pythonImportsCheck = [ "pytest_playwright" ];
+  pythonImportsCheck = [
+    "pytest_playwright"
+  ];
 
   meta = with lib; {
     description = "Pytest plugin to write end-to-end browser tests with Playwright";
     homepage = "https://github.com/microsoft/playwright-pytest";
+    changelog = "https://github.com/microsoft/playwright-pytest/releases/tag/v${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ sephi ];
   };

From 7e5d00e0ec5ec4e516c4357aa769d4412612df5a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Jan 2023 14:26:33 +0100
Subject: [PATCH 14/16] python310Packages.pytest-base-url: add changelog to
 meta

---
 .../pytest-base-url/default.nix               | 33 ++++++++++++++-----
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-base-url/default.nix b/pkgs/development/python-modules/pytest-base-url/default.nix
index 02b90f742097..d388c840a008 100644
--- a/pkgs/development/python-modules/pytest-base-url/default.nix
+++ b/pkgs/development/python-modules/pytest-base-url/default.nix
@@ -6,6 +6,7 @@
 , pytest-localserver
 , requests
 , pytestCheckHook
+, pythonOlder
 }:
 
 buildPythonPackage rec {
@@ -13,28 +14,44 @@ buildPythonPackage rec {
   version = "2.0.0";
   format = "pyproject";
 
+  disabled = pythonOlder "3.7";
+
   src = fetchFromGitHub {
     owner = "pytest-dev";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-v6pLejWNeb9Do6x2EJqmLKj8DNqcMtmYIs+7iDYsbjk=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-v6pLejWNeb9Do6x2EJqmLKj8DNqcMtmYIs+7iDYsbjk=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  nativeBuildInputs = [
+    poetry-core
+  ];
 
-  buildInputs = [ pytest ];
+  buildInputs = [
+    pytest
+  ];
 
-  propagatedBuildInputs = [ requests ];
+  propagatedBuildInputs = [
+    requests
+  ];
 
-  checkInputs = [ pytestCheckHook pytest-localserver ];
+  checkInputs = [
+    pytestCheckHook
+    pytest-localserver
+  ];
 
-  pytestFlagsArray = [ "tests" ];
+  pytestFlagsArray = [
+    "tests"
+  ];
 
-  pythonImportsCheck = [ "pytest_base_url" ];
+  pythonImportsCheck = [
+    "pytest_base_url"
+  ];
 
   meta = with lib; {
     description = "pytest plugin for URL based tests";
     homepage = "https://github.com/pytest-dev/pytest-base-url";
+    changelog = "https://github.com/pytest-dev/pytest-base-url/blob/v${version}/CHANGES.rst";
     license = licenses.mpl20;
     maintainers = with maintainers; [ sephi ];
   };

From 9086b530ff84990bb73ac7341f10219ffb4dff47 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Jan 2023 14:32:27 +0100
Subject: [PATCH 15/16] python310Packages.django-phonenumber-field: add
 changelog to meta

---
 .../django-phonenumber-field/default.nix      | 40 +++++++++++++------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/django-phonenumber-field/default.nix b/pkgs/development/python-modules/django-phonenumber-field/default.nix
index b8091acd659a..8af5e8fee892 100644
--- a/pkgs/development/python-modules/django-phonenumber-field/default.nix
+++ b/pkgs/development/python-modules/django-phonenumber-field/default.nix
@@ -1,11 +1,12 @@
 { lib
-, fetchFromGitHub
-, buildPythonPackage
-, python
 , babel
+, buildPythonPackage
 , django
 , djangorestframework
+, fetchFromGitHub
 , phonenumbers
+, python
+, pythonOlder
 , setuptools-scm
 }:
 
@@ -14,23 +15,35 @@ buildPythonPackage rec {
   version = "6.4.0";
   format = "pyproject";
 
+  disabled = pythonOlder "3.7";
+
   src = fetchFromGitHub {
     owner = "stefanfoulis";
     repo = pname;
-    rev = version;
-    sha256 = "sha256-rrJTCWn1mFV4QQu8wyLDxheHkZQ/FIE7mRC/9nXNSaM=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-rrJTCWn1mFV4QQu8wyLDxheHkZQ/FIE7mRC/9nXNSaM=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
-
-  propagatedBuildInputs = [ django phonenumbers babel ];
-
-  checkInputs = [ djangorestframework ];
-
-  pythonImportsCheck = [ "phonenumber_field" ];
-
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
 
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
+
+  propagatedBuildInputs = [
+    django
+    phonenumbers
+    babel
+  ];
+
+  checkInputs = [
+    djangorestframework
+  ];
+
+  pythonImportsCheck = [
+    "phonenumber_field"
+  ];
+
   checkPhase = ''
     ${python.interpreter} -m django test --settings tests.settings
   '';
@@ -38,6 +51,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "A django model and form field for normalised phone numbers using python-phonenumbers";
     homepage = "https://github.com/stefanfoulis/django-phonenumber-field/";
+    changelog = "https://github.com/stefanfoulis/django-phonenumber-field/releases/tag/${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ sephi ];
   };

From 9c9c1bc9a91da132c9fb3bfbc9c49d821f8eb75c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Jan 2023 14:43:31 +0100
Subject: [PATCH 16/16] python3Packages.django-import-export: add changelog to
 meta

---
 .../django-import-export/default.nix          | 31 +++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix
index 8ff91dfbbdfc..8c0fbf647b24 100644
--- a/pkgs/development/python-modules/django-import-export/default.nix
+++ b/pkgs/development/python-modules/django-import-export/default.nix
@@ -1,10 +1,11 @@
 { lib
-, fetchFromGitHub
 , buildPythonPackage
-, python
 , chardet
-, django
 , diff-match-patch
+, django
+, fetchFromGitHub
+, python
+, pythonOlder
 , pytz
 , tablib
 }:
@@ -12,18 +13,27 @@
 buildPythonPackage rec {
   pname = "django-import-export";
   version = "2.8.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "django-import-export";
     repo = pname;
-    rev = version;
-    sha256 = "sha256-km6TQq4OZZtx9/lgBzS3tEifAYjkkUX//9FRATDLX/0=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-km6TQq4OZZtx9/lgBzS3tEifAYjkkUX//9FRATDLX/0=";
   };
 
-  propagatedBuildInputs = [ diff-match-patch django tablib ]
-    ++ (with tablib.optional-dependencies; html ++ ods ++ xls ++ xlsx ++ yaml);
+  propagatedBuildInputs = [
+    diff-match-patch
+    django
+    tablib
+  ] ++ (with tablib.optional-dependencies; html ++ ods ++ xls ++ xlsx ++ yaml);
 
-  checkInputs = [ chardet pytz ];
+  checkInputs = [
+    chardet
+    pytz
+  ];
 
   checkPhase = ''
     runHook preCheck
@@ -31,11 +41,14 @@ buildPythonPackage rec {
     runHook postCheck
   '';
 
-  pythonImportsCheck = [ "import_export" ];
+  pythonImportsCheck = [
+    "import_export"
+  ];
 
   meta = with lib; {
     description = "Django application and library for importing and exporting data with admin integration";
     homepage = "https://github.com/django-import-export/django-import-export";
+    changelog = "https://github.com/django-import-export/django-import-export/blob/${version}/docs/changelog.rst";
     license = licenses.bsd2;
     maintainers = with maintainers; [ sephi ];
   };