summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorRobert Schütz <dev@schuetz-co.de>2021-06-22 23:38:50 +0200
committerRobert Schütz <dev@schuetz-co.de>2021-06-23 11:48:22 +0200
commitb128806d993a2280533f1ae91b878ffd2781ebf2 (patch)
tree7f97abd9cc57b0a0bcd2d2036868c01bf7742f84 /pkgs
parenta68aefeb0525543ea4f093d0da1d3cdc07f751aa (diff)
downloadnixpkgs-b128806d993a2280533f1ae91b878ffd2781ebf2.tar
nixpkgs-b128806d993a2280533f1ae91b878ffd2781ebf2.tar.gz
nixpkgs-b128806d993a2280533f1ae91b878ffd2781ebf2.tar.bz2
nixpkgs-b128806d993a2280533f1ae91b878ffd2781ebf2.tar.lz
nixpkgs-b128806d993a2280533f1ae91b878ffd2781ebf2.tar.xz
nixpkgs-b128806d993a2280533f1ae91b878ffd2781ebf2.tar.zst
nixpkgs-b128806d993a2280533f1ae91b878ffd2781ebf2.zip
pythonPackages.dns: move alias to python-aliases.nix
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/python-modules/sleekxmpp/default.nix4
-rw-r--r--pkgs/servers/sql/patroni/default.nix2
-rw-r--r--pkgs/tools/misc/ntfy/default.nix2
-rw-r--r--pkgs/tools/security/fierce/default.nix2
-rw-r--r--pkgs/tools/security/theharvester/default.nix2
-rw-r--r--pkgs/top-level/python-aliases.nix1
-rw-r--r--pkgs/top-level/python-packages.nix2
7 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/development/python-modules/sleekxmpp/default.nix b/pkgs/development/python-modules/sleekxmpp/default.nix
index 07be197f276..d93d1174dec 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 e02d386126a..846e61a5b46 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 23d4fd57f62..e2bb64ef529 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 797a2db211b..95be0dcaedd 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 02e83296c69..2fae6c465d5 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 5d9e8b1b124..b796d9ac442 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 b6c5058a874..3b760be0fd6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2106,8 +2106,6 @@ in {
 
   dnspython = callPackage ../development/python-modules/dnspython { };
 
-  dns = self.dnspython; # Alias for compatibility, 2017-12-10
-
   doc8 = callPackage ../development/python-modules/doc8 { };
 
   docker = callPackage ../development/python-modules/docker { };