public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-01-15 16:59:03 +01:00
parent 1f0467005d ab8e72b7bb
commit 42d276c6b8
167 changed files with 6971 additions and 4962 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/top-level/python-packages.nix
View File

@@ -704,6 +704,8 @@ in {
pyxml = disabledIf isPy3k (callPackage ../development/python-modules/pyxml{ });
pyvcd = callPackage ../development/python-modules/pyvcd { };
pyvoro = callPackage ../development/python-modules/pyvoro { };
relatorio = callPackage ../development/python-modules/relatorio { };
@@ -790,6 +792,8 @@ in {
WazeRouteCalculator = callPackage ../development/python-modules/WazeRouteCalculator { };
yarg = callPackage ../development/python-modules/yarg { };
# packages defined here
aafigure = callPackage ../development/python-modules/aafigure { };
@@ -1525,6 +1529,8 @@ in {
cssutils = callPackage ../development/python-modules/cssutils { };
css-parser = callPackage ../development/python-modules/css-parser { };
darcsver = callPackage ../development/python-modules/darcsver { };
dask = callPackage ../development/python-modules/dask { };
@@ -3159,7 +3165,9 @@ in {
sleekxmpp = callPackage ../development/python-modules/sleekxmpp { };
slixmpp = callPackage ../development/python-modules/slixmpp { };
slixmpp = callPackage ../development/python-modules/slixmpp {
inherit (pkgs) gnupg;
};
netaddr = callPackage ../development/python-modules/netaddr { };
@@ -3526,7 +3534,9 @@ in {
pysam = callPackage ../development/python-modules/pysam { };
pysaml2 = callPackage ../development/python-modules/pysaml2 { };
pysaml2 = callPackage ../development/python-modules/pysaml2 {
inherit (pkgs) xmlsec;
};
python-pushover = callPackage ../development/python-modules/pushover {};
@@ -3606,6 +3616,8 @@ in {
pygpgme = callPackage ../development/python-modules/pygpgme { };
pyment = callPackage ../development/python-modules/pyment { };
pylint = if isPy3k then callPackage ../development/python-modules/pylint { }
else callPackage ../development/python-modules/pylint/1.9.nix { };