Merge pull request #32541 from rnhmjoj/dnspython

pythonPackages: rename dns -> dnspython (round 2)
This commit is contained in:
Frederik Rietdijk 2017-12-10 15:44:25 +01:00 committed by GitHub
commit b459c8475c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 15 additions and 15 deletions

View file

@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
poppler_utils libpng imagemagick libjpeg poppler_utils libpng imagemagick libjpeg
fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils wrapGAppsHook fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils wrapGAppsHook
] ++ (with python2Packages; [ ] ++ (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 python pyqt5 sip
regex msgpack regex msgpack
# the following are distributed with calibre, but we use upstream instead # the following are distributed with calibre, but we use upstream instead

View file

@ -12,7 +12,7 @@ python2Packages.buildPythonApplication rec {
}; };
propagatedBuildInputs = with python2Packages; [ propagatedBuildInputs = with python2Packages; [
dns dnspython
ecdsa ecdsa
jsonrpclib jsonrpclib
pbkdf2 pbkdf2

View file

@ -10,7 +10,7 @@ python2Packages.buildPythonApplication rec {
}; };
propagatedBuildInputs = with python2Packages; [ propagatedBuildInputs = with python2Packages; [
dns dnspython
ecdsa ecdsa
pbkdf2 pbkdf2
protobuf protobuf

View file

@ -21,7 +21,7 @@ python2Packages.buildPythonApplication rec {
qrcode qrcode
ltc_scrypt ltc_scrypt
protobuf protobuf
dns dnspython
jsonrpclib jsonrpclib
]; ];

View file

@ -10,7 +10,7 @@ python2Packages.buildPythonApplication rec {
}; };
propagatedBuildInputs = with python2Packages; [ propagatedBuildInputs = with python2Packages; [
dns dnspython
ecdsa ecdsa
jsonrpclib jsonrpclib
matplotlib matplotlib

View file

@ -24,7 +24,7 @@ pythonPackages.buildPythonApplication rec {
buildInputs = [ glibcLocales ]; buildInputs = [ glibcLocales ];
propagatedBuildInputs = with pythonPackages; [ propagatedBuildInputs = with pythonPackages; [
webtest bottle threadpool rocket-errbot requests jinja2 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 daemonize pygments-markdown-lexer telegram irc slackclient
sleekxmpp hypchat pytest sleekxmpp hypchat pytest
]; ];

View file

@ -1,4 +1,4 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, nose, dns { stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, nose, dnspython
, chardet, lmtpd, pythondaemon, six, jinja2, mock }: , chardet, lmtpd, pythondaemon, six, jinja2, mock }:
buildPythonPackage rec { buildPythonPackage rec {
@ -18,7 +18,7 @@ buildPythonPackage rec {
}; };
checkInputs = [ nose jinja2 mock ]; checkInputs = [ nose jinja2 mock ];
propagatedBuildInputs = [ chardet dns lmtpd pythondaemon six ]; propagatedBuildInputs = [ chardet dnspython lmtpd pythondaemon six ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://salmon-mail.readthedocs.org/; homepage = http://salmon-mail.readthedocs.org/;

View file

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1r6sjapjmbav45xibjzc2a8y1xf4ikz09470ma1kw7iz174wn8z7"; sha256 = "1r6sjapjmbav45xibjzc2a8y1xf4ikz09470ma1kw7iz174wn8z7";
}; };
buildInputs = [ python pythonPackages.dns ]; buildInputs = [ python pythonPackages.dnspython ];
patches = [ ./fix-var-prefix.patch ]; patches = [ ./fix-var-prefix.patch ];

View file

@ -36,7 +36,7 @@ in buildPythonPackage rec {
dontPatchShebangs = false; dontPatchShebangs = false;
propagatedBuildInputs = [ propagatedBuildInputs = [
pycrypto paramiko jinja pyyaml httplib2 boto six netaddr dns pycrypto paramiko jinja pyyaml httplib2 boto six netaddr dnspython
] ++ stdenv.lib.optional windowsSupport pywinrm; ] ++ stdenv.lib.optional windowsSupport pywinrm;
meta = with stdenv.lib; { meta = with stdenv.lib; {

View file

@ -38,7 +38,7 @@ in buildPythonPackage rec {
dontPatchShebangs = false; dontPatchShebangs = false;
propagatedBuildInputs = [ propagatedBuildInputs = [
pycrypto paramiko jinja pyyaml httplib2 boto six netaddr dns pycrypto paramiko jinja pyyaml httplib2 boto six netaddr dnspython
] ++ stdenv.lib.optional windowsSupport pywinrm; ] ++ stdenv.lib.optional windowsSupport pywinrm;
meta = with stdenv.lib; { meta = with stdenv.lib; {

View file

@ -24,7 +24,7 @@ pythonPackages.buildPythonPackage rec {
dontPatchShebangs = false; dontPatchShebangs = false;
propagatedBuildInputs = with pythonPackages; [ 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; ] ++ stdenv.lib.optional windowsSupport pywinrm;
meta = with stdenv.lib; { meta = with stdenv.lib; {

View file

@ -24,7 +24,7 @@ pythonPackages.buildPythonPackage rec {
dontPatchShebangs = false; dontPatchShebangs = false;
propagatedBuildInputs = with pythonPackages; [ 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; ] ++ stdenv.lib.optional windowsSupport pywinrm;
meta = with stdenv.lib; { meta = with stdenv.lib; {

View file

@ -23,7 +23,7 @@ python2.pkgs.buildPythonApplication rec {
propagatedBuildInputs = with python2.pkgs; [ propagatedBuildInputs = with python2.pkgs; [
argparse argparse
boto boto
dns dnspython
]; ];
meta = with lib; { meta = with lib; {

View file

@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
sha256 = "05wn744ydclpnpyah6yfjqlfjlasrrhzj48lqmm5a91nyps5yqyn"; sha256 = "05wn744ydclpnpyah6yfjqlfjlasrrhzj48lqmm5a91nyps5yqyn";
}; };
pythonPath = with pythonPackages; [ dns m2crypto ipaddr python-gnupg pythonPath = with pythonPackages; [ dnspython m2crypto ipaddr python-gnupg
pyunbound ]; pyunbound ];
buildInputs = [ pythonPackages.wrapPython ]; buildInputs = [ pythonPackages.wrapPython ];