diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2017-12-10 15:44:25 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-10 15:44:25 +0100 |
commit | b459c8475c58f7c8d529ebeadcbebbfe00ddf6eb (patch) | |
tree | 264d8af4941a800708629c981e859465432dd675 /pkgs/applications | |
parent | 8168671385b619860e8ffeb206adc5944f5d2ccb (diff) | |
parent | 491bc4cfedfdbbced12f01d0f722e04393b72854 (diff) | |
download | nixlib-b459c8475c58f7c8d529ebeadcbebbfe00ddf6eb.tar nixlib-b459c8475c58f7c8d529ebeadcbebbfe00ddf6eb.tar.gz nixlib-b459c8475c58f7c8d529ebeadcbebbfe00ddf6eb.tar.bz2 nixlib-b459c8475c58f7c8d529ebeadcbebbfe00ddf6eb.tar.lz nixlib-b459c8475c58f7c8d529ebeadcbebbfe00ddf6eb.tar.xz nixlib-b459c8475c58f7c8d529ebeadcbebbfe00ddf6eb.tar.zst nixlib-b459c8475c58f7c8d529ebeadcbebbfe00ddf6eb.zip |
Merge pull request #32541 from rnhmjoj/dnspython
pythonPackages: rename dns -> dnspython (round 2)
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/misc/calibre/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/electron-cash/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/electrum-dash/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/electrum-ltc/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/electrum/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/networking/errbot/default.nix | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index e548b944a8d4..b406f38613d5 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 56c1a8168a82..5b4cb82277a7 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 e7a5a1be1979..bde8d5b81e3e 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 bb41f8665e57..58844500195e 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 abe8d0dde84b..8de837991aab 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 7d815c8fad08..611d7904991a 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 ]; |