From 491bc4cfedfdbbced12f01d0f722e04393b72854 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 10 Dec 2017 15:27:06 +0100 Subject: [PATCH] pythonPackages: rename dns -> dnspython --- pkgs/applications/misc/calibre/default.nix | 2 +- pkgs/applications/misc/electron-cash/default.nix | 2 +- pkgs/applications/misc/electrum-dash/default.nix | 2 +- pkgs/applications/misc/electrum-ltc/default.nix | 2 +- pkgs/applications/misc/electrum/default.nix | 2 +- pkgs/applications/networking/errbot/default.nix | 2 +- pkgs/development/python-modules/salmon/default.nix | 4 ++-- pkgs/servers/mail/mailman/default.nix | 2 +- pkgs/tools/admin/ansible/2.1.nix | 2 +- pkgs/tools/admin/ansible/2.2.nix | 2 +- pkgs/tools/admin/ansible/2.3.nix | 2 +- pkgs/tools/admin/ansible/2.4.nix | 2 +- pkgs/tools/admin/cli53/default.nix | 2 +- pkgs/tools/security/hash-slinger/default.nix | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index e548b944a8d..b406f38613d 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { poppler_utils libpng imagemagick libjpeg fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils wrapGAppsHook ] ++ (with python2Packages; [ - apsw cssselect cssutils dateutil dns html5-parser lxml mechanize netifaces pillow + apsw cssselect cssutils dateutil dnspython html5-parser lxml mechanize netifaces pillow python pyqt5 sip regex msgpack # the following are distributed with calibre, but we use upstream instead diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index 56c1a8168a8..5b4cb82277a 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -12,7 +12,7 @@ python2Packages.buildPythonApplication rec { }; propagatedBuildInputs = with python2Packages; [ - dns + dnspython ecdsa jsonrpclib pbkdf2 diff --git a/pkgs/applications/misc/electrum-dash/default.nix b/pkgs/applications/misc/electrum-dash/default.nix index e7a5a1be197..bde8d5b81e3 100644 --- a/pkgs/applications/misc/electrum-dash/default.nix +++ b/pkgs/applications/misc/electrum-dash/default.nix @@ -10,7 +10,7 @@ python2Packages.buildPythonApplication rec { }; propagatedBuildInputs = with python2Packages; [ - dns + dnspython ecdsa pbkdf2 protobuf diff --git a/pkgs/applications/misc/electrum-ltc/default.nix b/pkgs/applications/misc/electrum-ltc/default.nix index bb41f8665e5..58844500195 100644 --- a/pkgs/applications/misc/electrum-ltc/default.nix +++ b/pkgs/applications/misc/electrum-ltc/default.nix @@ -21,7 +21,7 @@ python2Packages.buildPythonApplication rec { qrcode ltc_scrypt protobuf - dns + dnspython jsonrpclib ]; diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index abe8d0dde84..8de837991aa 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -10,7 +10,7 @@ python2Packages.buildPythonApplication rec { }; propagatedBuildInputs = with python2Packages; [ - dns + dnspython ecdsa jsonrpclib matplotlib diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix index 7d815c8fad0..611d7904991 100644 --- a/pkgs/applications/networking/errbot/default.nix +++ b/pkgs/applications/networking/errbot/default.nix @@ -24,7 +24,7 @@ pythonPackages.buildPythonApplication rec { buildInputs = [ glibcLocales ]; propagatedBuildInputs = with pythonPackages; [ webtest bottle threadpool rocket-errbot requests jinja2 - pyopenssl colorlog Yapsy markdown ansi pygments dns pep8 + pyopenssl colorlog Yapsy markdown ansi pygments dnspython pep8 daemonize pygments-markdown-lexer telegram irc slackclient sleekxmpp hypchat pytest ]; diff --git a/pkgs/development/python-modules/salmon/default.nix b/pkgs/development/python-modules/salmon/default.nix index 2169689f3d4..f9d7f79164a 100644 --- a/pkgs/development/python-modules/salmon/default.nix +++ b/pkgs/development/python-modules/salmon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, nose, dns +{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, nose, dnspython , chardet, lmtpd, pythondaemon, six, jinja2, mock }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { }; checkInputs = [ nose jinja2 mock ]; - propagatedBuildInputs = [ chardet dns lmtpd pythondaemon six ]; + propagatedBuildInputs = [ chardet dnspython lmtpd pythondaemon six ]; meta = with stdenv.lib; { homepage = http://salmon-mail.readthedocs.org/; diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix index d64e41f3007..8ff20869b94 100644 --- a/pkgs/servers/mail/mailman/default.nix +++ b/pkgs/servers/mail/mailman/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1r6sjapjmbav45xibjzc2a8y1xf4ikz09470ma1kw7iz174wn8z7"; }; - buildInputs = [ python pythonPackages.dns ]; + buildInputs = [ python pythonPackages.dnspython ]; patches = [ ./fix-var-prefix.patch ]; diff --git a/pkgs/tools/admin/ansible/2.1.nix b/pkgs/tools/admin/ansible/2.1.nix index 6232e4ad95b..d4a349c5e47 100644 --- a/pkgs/tools/admin/ansible/2.1.nix +++ b/pkgs/tools/admin/ansible/2.1.nix @@ -36,7 +36,7 @@ in buildPythonPackage rec { dontPatchShebangs = false; propagatedBuildInputs = [ - pycrypto paramiko jinja pyyaml httplib2 boto six netaddr dns + pycrypto paramiko jinja pyyaml httplib2 boto six netaddr dnspython ] ++ stdenv.lib.optional windowsSupport pywinrm; meta = with stdenv.lib; { diff --git a/pkgs/tools/admin/ansible/2.2.nix b/pkgs/tools/admin/ansible/2.2.nix index 02392d7ac89..4ef35fa5d9e 100644 --- a/pkgs/tools/admin/ansible/2.2.nix +++ b/pkgs/tools/admin/ansible/2.2.nix @@ -38,7 +38,7 @@ in buildPythonPackage rec { dontPatchShebangs = false; propagatedBuildInputs = [ - pycrypto paramiko jinja pyyaml httplib2 boto six netaddr dns + pycrypto paramiko jinja pyyaml httplib2 boto six netaddr dnspython ] ++ stdenv.lib.optional windowsSupport pywinrm; meta = with stdenv.lib; { diff --git a/pkgs/tools/admin/ansible/2.3.nix b/pkgs/tools/admin/ansible/2.3.nix index 7330b7d0858..b827bdcc9c3 100644 --- a/pkgs/tools/admin/ansible/2.3.nix +++ b/pkgs/tools/admin/ansible/2.3.nix @@ -24,7 +24,7 @@ pythonPackages.buildPythonPackage rec { dontPatchShebangs = false; propagatedBuildInputs = with pythonPackages; [ - pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dns + pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dnspython ] ++ stdenv.lib.optional windowsSupport pywinrm; meta = with stdenv.lib; { diff --git a/pkgs/tools/admin/ansible/2.4.nix b/pkgs/tools/admin/ansible/2.4.nix index 9c8df647e59..4f90e80202e 100644 --- a/pkgs/tools/admin/ansible/2.4.nix +++ b/pkgs/tools/admin/ansible/2.4.nix @@ -24,7 +24,7 @@ pythonPackages.buildPythonPackage rec { dontPatchShebangs = false; propagatedBuildInputs = with pythonPackages; [ - pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dns + pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dnspython ] ++ stdenv.lib.optional windowsSupport pywinrm; meta = with stdenv.lib; { diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/tools/admin/cli53/default.nix index b9852ed587c..e70a7ba9b50 100644 --- a/pkgs/tools/admin/cli53/default.nix +++ b/pkgs/tools/admin/cli53/default.nix @@ -23,7 +23,7 @@ python2.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python2.pkgs; [ argparse boto - dns + dnspython ]; meta = with lib; { diff --git a/pkgs/tools/security/hash-slinger/default.nix b/pkgs/tools/security/hash-slinger/default.nix index 4d60b11f977..fd78d9b2efb 100644 --- a/pkgs/tools/security/hash-slinger/default.nix +++ b/pkgs/tools/security/hash-slinger/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { sha256 = "05wn744ydclpnpyah6yfjqlfjlasrrhzj48lqmm5a91nyps5yqyn"; }; - pythonPath = with pythonPackages; [ dns m2crypto ipaddr python-gnupg + pythonPath = with pythonPackages; [ dnspython m2crypto ipaddr python-gnupg pyunbound ]; buildInputs = [ pythonPackages.wrapPython ];