From ca235391cf0209ae0d61ba6cf191e43723349230 Mon Sep 17 00:00:00 2001
From: Emil Thorsoe <jekarlson@gmail.com>
Date: Fri, 25 Oct 2024 20:23:39 +0300
Subject: [PATCH 1/2] python3Packages.py3dns: 3.2.1 -> 4.0.2

---
 pkgs/development/python-modules/py3dns/default.nix | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/py3dns/default.nix b/pkgs/development/python-modules/py3dns/default.nix
index 14ad16771655..a036ba2707cf 100644
--- a/pkgs/development/python-modules/py3dns/default.nix
+++ b/pkgs/development/python-modules/py3dns/default.nix
@@ -2,24 +2,20 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  flit-core,
 }:
 
 buildPythonPackage rec {
   pname = "py3dns";
-  version = "3.2.1";
-  format = "setuptools";
+  version = "4.0.2";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1r25f0ys5p37bhld7m7n4gb0lrysaym3w318w2f8bncq7r3d81qz";
+    hash = "sha256-mGUugOzsFDxg948OazQWMcqadWDt2N3fyGTAKQJhijk=";
   };
 
-  preConfigure = ''
-    sed -i \
-      -e '/import DNS/d' \
-      -e 's/DNS.__version__/"${version}"/g' \
-      setup.py
-  '';
+  build-system = [ flit-core ];
 
   doCheck = false;
 

From 6a06432e6d3d02595b25a4e5cf7a4e919d0951ad Mon Sep 17 00:00:00 2001
From: Emil Thorsoe <jekarlson@gmail.com>
Date: Fri, 25 Oct 2024 20:29:05 +0300
Subject: [PATCH 2/2] python3Packages.py3dns: rename package attribute from
 pydns to py3dns

---
 pkgs/development/python-modules/pymilter/default.nix | 4 ++--
 pkgs/development/python-modules/pyspf/default.nix    | 4 ++--
 pkgs/tools/security/trustymail/default.nix           | 2 +-
 pkgs/top-level/python-aliases.nix                    | 1 +
 pkgs/top-level/python-packages.nix                   | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/pymilter/default.nix b/pkgs/development/python-modules/pymilter/default.nix
index 6f0c4291d4d5..634f437b810f 100644
--- a/pkgs/development/python-modules/pymilter/default.nix
+++ b/pkgs/development/python-modules/pymilter/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   libmilter,
   berkeleydb,
-  pydns,
+  py3dns,
   iana-etc,
   libredirect,
   pyasyncore,
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [ pyasyncore ];
   dependencies = [
     berkeleydb
-    pydns
+    py3dns
   ];
 
   preBuild = ''
diff --git a/pkgs/development/python-modules/pyspf/default.nix b/pkgs/development/python-modules/pyspf/default.nix
index 8e69a942665f..cdedf35b93a5 100644
--- a/pkgs/development/python-modules/pyspf/default.nix
+++ b/pkgs/development/python-modules/pyspf/default.nix
@@ -2,7 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pydns,
+  py3dns,
 }:
 
 buildPythonPackage rec {
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     sha256 = "0bmimlmwrq9glnjc4i6pwch30n3y5wyqmkjfyayxqxkfrixqwydi";
   };
 
-  propagatedBuildInputs = [ pydns ];
+  propagatedBuildInputs = [ py3dns ];
 
   # requires /etc/resolv.conf to exist
   doCheck = false;
diff --git a/pkgs/tools/security/trustymail/default.nix b/pkgs/tools/security/trustymail/default.nix
index 8c54cbf05047..f032691e3455 100644
--- a/pkgs/tools/security/trustymail/default.nix
+++ b/pkgs/tools/security/trustymail/default.nix
@@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec {
       dnspython
       docopt
       publicsuffixlist
-      pydns
+      py3dns
       pyspf
       requests
     ]
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 505af5eab26e..fe6df345dd67 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -439,6 +439,7 @@ mapAliases ({
   pyblake2 = throw "pyblake2 is deprecated in favor of hashlib"; # added 2023-04-23
   pyblock = throw "pyblock has been removed, since it is abandoned and broken"; # added 2023-06-20
   pycontracts = throw "pycontracts has been removed, since upstream is no longer active and it is broken on modern Python versions."; # added 2024-08-09
+  pydns = py3dns; # added 2024-10-25
   pydrive = throw "pydrive is broken and deprecated and has been replaced with pydrive2."; # added 2022-06-01
   pyjet = throw "pyjet is deprecated, use fastjet instead"; # added 2023-05-10
   pygame_sdl2 = pygame-sdl2; # added 2024-01-07
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8e9a1128b354..1369424beddf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11224,7 +11224,7 @@ self: super: with self; {
 
   pydmd = callPackage ../development/python-modules/pydmd { };
 
-  pydns = callPackage ../development/python-modules/py3dns { };
+  py3dns = callPackage ../development/python-modules/py3dns { };
 
   pydocstyle = callPackage ../development/python-modules/pydocstyle { };