Merge pull request #127834 from dotlambda/dnspython_1-drop

9 files changed, 25 insertions, 16 deletions

diff --git a/pkgs/applications/networking/powerdns-admin/default.nix b/pkgs/applications/networking/powerdns-admin/default.nix
index 4ef89e261635..9dba30e3d884 100644
--- a/pkgs/applications/networking/powerdns-admin/default.nix
+++ b/pkgs/applications/networking/powerdns-admin/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, mkYarnPackage, writeText, python3Packages }:
+{ lib, stdenv, fetchFromGitHub, mkYarnPackage, writeText, python3 }:
 
 let
   version = "0.2.3";
@@ -9,10 +9,22 @@ let
     sha256 = "16faz57d77mxkflkvwyi8gb9wvnq2vhw79b84v1fmqvxri1yaphw";
   };
 
-  pythonDeps = with python3Packages; [
+  python = python3.override {
+    packageOverrides = self: super: {
+      dnspython = super.dnspython.overridePythonAttrs (oldAttrs: rec {
+        version = "1.16.0";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01";
+        };
+      });
+    };
+  };
+
+  pythonDeps = with python.pkgs; [
     flask flask_assets flask_login flask_sqlalchemy flask_migrate flask-seasurf flask_mail flask-sslify
     mysqlclient sqlalchemy
-    configobj bcrypt requests ldap pyotp qrcode dnspython_1
+    configobj bcrypt requests ldap pyotp qrcode dnspython
     gunicorn python3-saml pyopenssl pytz cssmin jsmin authlib bravado-core
     lima pytimeparse pyyaml
   ];
@@ -64,7 +76,7 @@ in stdenv.mkDerivation rec {
 
   inherit src version;
 
-  nativeBuildInputs = [ python3Packages.wrapPython ];
+  nativeBuildInputs = [ python.pkgs.wrapPython ];
 
   pythonPath = pythonDeps;
 
@@ -96,7 +108,7 @@ in stdenv.mkDerivation rec {
     echo "$gunicornScript" > $out/bin/powerdns-admin
     chmod +x $out/bin/powerdns-admin
     wrapProgram $out/bin/powerdns-admin \
-      --set PATH ${python3Packages.python}/bin \
+      --set PATH ${python.pkgs.python}/bin \
       --set PYTHONPATH $out/share:$program_PYTHONPATH
 
     runHook postInstall
diff --git a/pkgs/development/python-modules/sleekxmpp/default.nix b/pkgs/development/python-modules/sleekxmpp/default.nix
index 07be197f276c..d93d1174dec5 100644
--- a/pkgs/development/python-modules/sleekxmpp/default.nix
+++ b/pkgs/development/python-modules/sleekxmpp/default.nix
@@ -1,10 +1,10 @@
-{ lib, fetchPypi, buildPythonPackage, dns, pyasn1 }:
+{ lib, fetchPypi, buildPythonPackage, dnspython, pyasn1 }:
 
 buildPythonPackage rec {
   pname = "sleekxmpp";
   version = "1.3.3";
 
-  propagatedBuildInputs = [ dns pyasn1 ];
+  propagatedBuildInputs = [ dnspython pyasn1 ];
 
   patches = [
     ./dnspython-ip6.patch
diff --git a/pkgs/servers/sql/patroni/default.nix b/pkgs/servers/sql/patroni/default.nix
index e02d386126ae..846e61a5b464 100644
--- a/pkgs/servers/sql/patroni/default.nix
+++ b/pkgs/servers/sql/patroni/default.nix
@@ -25,7 +25,7 @@ pythonPackages.buildPythonApplication rec {
     boto
     click
     consul
-    dns
+    dnspython
     kazoo
     kubernetes
     prettytable
diff --git a/pkgs/tools/misc/ntfy/default.nix b/pkgs/tools/misc/ntfy/default.nix
index 23d4fd57f620..e2bb64ef5291 100644
--- a/pkgs/tools/misc/ntfy/default.nix
+++ b/pkgs/tools/misc/ntfy/default.nix
@@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec {
 
   propagatedBuildInputs = with python3Packages; [
     requests ruamel_yaml appdirs
-    sleekxmpp dns
+    sleekxmpp dnspython
     emoji
     psutil
     matrix-client
diff --git a/pkgs/tools/security/fierce/default.nix b/pkgs/tools/security/fierce/default.nix
index 797a2db211b2..95be0dcaedde 100644
--- a/pkgs/tools/security/fierce/default.nix
+++ b/pkgs/tools/security/fierce/default.nix
@@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec {
     substituteInPlace requirements.txt --replace 'dnspython==1.16.0' 'dnspython'
   '';
 
-  propagatedBuildInputs = [ python3.pkgs.dns ];
+  propagatedBuildInputs = [ python3.pkgs.dnspython ];
 
   # tests require network access
   doCheck = false;
diff --git a/pkgs/tools/security/theharvester/default.nix b/pkgs/tools/security/theharvester/default.nix
index 02e83296c69f..2fae6c465d59 100644
--- a/pkgs/tools/security/theharvester/default.nix
+++ b/pkgs/tools/security/theharvester/default.nix
@@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication rec {
     beautifulsoup4
     censys
     certifi
-    dns
+    dnspython
     gevent
     grequests
     lxml
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 5d9e8b1b124a..b796d9ac4427 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -36,6 +36,7 @@ mapAliases ({
   blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # Added 2020-11-29
   bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27
   detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04
+  dns = dnspython; # Alias for compatibility, 2017-12-10
   faulthandler = throw "faulthandler is built into ${python.executable}";
   gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14
   glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 98899e4d2ce7..a61f1273190b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2104,10 +2104,6 @@ in {
 
   dnspython = callPackage ../development/python-modules/dnspython { };
 
-  dnspython_1 = callPackage ../development/python-modules/dnspython/1.nix { };
-
-  dns = self.dnspython; # Alias for compatibility, 2017-12-10
-
   doc8 = callPackage ../development/python-modules/doc8 { };
 
   docker = callPackage ../development/python-modules/docker { };
diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix
index 2a1fd9417b58..e9ac9fbfeb27 100644
--- a/pkgs/top-level/python2-packages.nix
+++ b/pkgs/top-level/python2-packages.nix
@@ -80,7 +80,7 @@ with self; with super; {
 
   django_evolution = callPackage ../development/python-modules/django_evolution { };
 
-  dnspython = super.dnspython_1;
+  dnspython = callPackage ../development/python-modules/dnspython/1.nix { };
 
   docker-py = disabled super.docker-py;