From cad27dd109f40ea474ea3acdda9d5fd8faedd0ea Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Thu, 1 Dec 2022 09:47:55 -0800
Subject: [PATCH 1/4] python310Packages.django-postgresql-netfields: 1.2.2 ->
 1.3.0

---
 .../python-modules/django-postgresql-netfields/default.nix  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/django-postgresql-netfields/default.nix b/pkgs/development/python-modules/django-postgresql-netfields/default.nix
index 141a46f53154..2e440ed4f063 100644
--- a/pkgs/development/python-modules/django-postgresql-netfields/default.nix
+++ b/pkgs/development/python-modules/django-postgresql-netfields/default.nix
@@ -7,18 +7,17 @@
 # required for tests
 #, djangorestframework
 #, psycopg2
-#, unittest2
 }:
 
 buildPythonPackage rec {
-  version = "1.2.2";
+  version = "1.3.0";
   pname = "django-postgresql-netfields";
 
   src = fetchFromGitHub {
     owner = "jimfunk";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1rrh38f3zl3jk5ijs6g75dxxvxygf4lczbgc7ahrgzf58g4a48lm";
+    hash = "sha256-I+X4yfadtiiZlW7QhfwVbK1qyWn/khH9fWXszCo9uro=";
   };
 
   # tests need a postgres database
@@ -32,7 +31,6 @@ buildPythonPackage rec {
   # buildInputs = [
     # djangorestframework
     # psycopg2
-    # unittest2
   # ];
 
   propagatedBuildInputs = [

From 2210841466d2d45d073bf6d43ab18bdee4d74ae9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 2 Dec 2022 08:55:14 +0100
Subject: [PATCH 2/4] python310Packages.django-postgresql-netfields: add
 changelog to meta

- disable on unsupported Python releases
- add pythonImportsCheck
---
 .../django-postgresql-netfields/default.nix   | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/django-postgresql-netfields/default.nix b/pkgs/development/python-modules/django-postgresql-netfields/default.nix
index 2e440ed4f063..a78d45a236d1 100644
--- a/pkgs/development/python-modules/django-postgresql-netfields/default.nix
+++ b/pkgs/development/python-modules/django-postgresql-netfields/default.nix
@@ -10,8 +10,11 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.3.0";
   pname = "django-postgresql-netfields";
+  version = "1.3.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "jimfunk";
@@ -20,6 +23,12 @@ buildPythonPackage rec {
     hash = "sha256-I+X4yfadtiiZlW7QhfwVbK1qyWn/khH9fWXszCo9uro=";
   };
 
+  propagatedBuildInputs = [
+    django
+    netaddr
+    six
+  ];
+
   # tests need a postgres database
   doCheck = false;
 
@@ -33,15 +42,15 @@ buildPythonPackage rec {
     # psycopg2
   # ];
 
-  propagatedBuildInputs = [
-    django
-    netaddr
-    six
+  pythonImportsCheck = [
+    "netfields"
   ];
 
   meta = with lib; {
     description = "Django PostgreSQL netfields implementation";
     homepage = "https://github.com/jimfunk/django-postgresql-netfields";
+    changelog = "https://github.com/jimfunk/django-postgresql-netfields/blob/v${version}/CHANGELOG";
     license = licenses.bsd2;
+    maintainers = with maintainers; [ ];
   };
 }

From 9b0ce02247af67139374e07de60b10658f3625ae Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 2 Dec 2022 08:57:31 +0100
Subject: [PATCH 3/4] python310Packages.django-postgresql-netfields: add
 missing input

---
 .../python-modules/django-postgresql-netfields/default.nix       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/django-postgresql-netfields/default.nix b/pkgs/development/python-modules/django-postgresql-netfields/default.nix
index a78d45a236d1..657d68c1195e 100644
--- a/pkgs/development/python-modules/django-postgresql-netfields/default.nix
+++ b/pkgs/development/python-modules/django-postgresql-netfields/default.nix
@@ -4,6 +4,7 @@
 , netaddr
 , six
 , fetchFromGitHub
+, pythonOlder
 # required for tests
 #, djangorestframework
 #, psycopg2

From 3f12b7e27287d65d2242d12e21adb861be41ad6c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 2 Dec 2022 10:06:01 +0100
Subject: [PATCH 4/4] python310Packages.django-postgresql-netfields: disable
 pythonImportsCheck

---
 .../python-modules/django-postgresql-netfields/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/django-postgresql-netfields/default.nix b/pkgs/development/python-modules/django-postgresql-netfields/default.nix
index 657d68c1195e..5564e0f6de22 100644
--- a/pkgs/development/python-modules/django-postgresql-netfields/default.nix
+++ b/pkgs/development/python-modules/django-postgresql-netfields/default.nix
@@ -43,9 +43,10 @@ buildPythonPackage rec {
     # psycopg2
   # ];
 
-  pythonImportsCheck = [
-    "netfields"
-  ];
+  # Requires psycopg2
+  # pythonImportsCheck = [
+  #   "netfields"
+  # ];
 
   meta = with lib; {
     description = "Django PostgreSQL netfields implementation";