Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2018-11-29 08:12:56 +01:00
177 changed files with 4259 additions and 2087 deletions
+36
View File
@@ -398,6 +398,8 @@ in {
inherit python;
});
hopcroftkarp = callPackage ../development/python-modules/hopcroftkarp { };
httpsig = callPackage ../development/python-modules/httpsig { };
i3ipc = callPackage ../development/python-modules/i3ipc { };
@@ -422,6 +424,8 @@ in {
markerlib = callPackage ../development/python-modules/markerlib { };
matchpy = callPackage ../development/python-modules/matchpy { };
monty = callPackage ../development/python-modules/monty { };
mininet-python = (toPythonModule (pkgs.mininet.override{ inherit python; })).py;
@@ -430,10 +434,14 @@ in {
mpi = pkgs.openmpi;
};
multiset = callPackage ../development/python-modules/multiset { };
mwclient = callPackage ../development/python-modules/mwclient { };
mwoauth = callPackage ../development/python-modules/mwoauth { };
nbval = callPackage ../development/python-modules/nbval { };
nest-asyncio = callPackage ../development/python-modules/nest-asyncio { };
neuron = pkgs.neuron.override {
@@ -480,6 +488,8 @@ in {
pdfx = callPackage ../development/python-modules/pdfx { };
perf = callPackage ../development/python-modules/perf { };
phonopy = callPackage ../development/python-modules/phonopy { };
pims = callPackage ../development/python-modules/pims { };
@@ -613,6 +623,8 @@ in {
pytesseract = callPackage ../development/python-modules/pytesseract { };
pytest-mypy = callPackage ../development/python-modules/pytest-mypy { };
pytest-tornado = callPackage ../development/python-modules/pytest-tornado { };
python-binance = callPackage ../development/python-modules/python-binance { };
@@ -744,6 +756,8 @@ in {
adal = callPackage ../development/python-modules/adal { };
affine = callPackage ../development/python-modules/affine { };
aioconsole = callPackage ../development/python-modules/aioconsole { };
aiodns = callPackage ../development/python-modules/aiodns { };
@@ -995,6 +1009,8 @@ in {
colour = callPackage ../development/python-modules/colour {};
configshell = callPackage ../development/python-modules/configshell { };
constantly = callPackage ../development/python-modules/constantly { };
cornice = callPackage ../development/python-modules/cornice { };
@@ -1051,6 +1067,8 @@ in {
pyechonest = callPackage ../development/python-modules/pyechonest { };
pyepsg = callPackage ../development/python-modules/pyepsg { };
pyezminc = callPackage ../development/python-modules/pyezminc { };
billiard = callPackage ../development/python-modules/billiard { };
@@ -1132,6 +1150,8 @@ in {
carrot = callPackage ../development/python-modules/carrot {};
cartopy = callPackage ../development/python-modules/cartopy {};
case = callPackage ../development/python-modules/case {};
cassandra-driver = callPackage ../development/python-modules/cassandra-driver { };
@@ -2413,6 +2433,8 @@ in {
genshi = callPackage ../development/python-modules/genshi { };
gentools = callPackage ../development/python-modules/gentools { };
gevent = callPackage ../development/python-modules/gevent { };
geventhttpclient = callPackage ../development/python-modules/geventhttpclient { };
@@ -2744,6 +2766,8 @@ in {
fs = callPackage ../development/python-modules/fs { };
fs-s3fs = callPackage ../development/python-modules/fs-s3fs { };
libcloud = callPackage ../development/python-modules/libcloud { };
libgpuarray = callPackage ../development/python-modules/libgpuarray {
@@ -3484,6 +3508,8 @@ in {
pyspread = callPackage ../development/python-modules/pyspread { };
pyupdate = callPackage ../development/python-modules/pyupdate {};
pyx = callPackage ../development/python-modules/pyx { };
mmpython = callPackage ../development/python-modules/mmpython { };
@@ -3653,6 +3679,8 @@ in {
rabbitpy = callPackage ../development/python-modules/rabbitpy { };
rasterio = callPackage ../development/python-modules/rasterio { };
radicale_infcloud = callPackage ../development/python-modules/radicale_infcloud {};
recaptcha_client = callPackage ../development/python-modules/recaptcha_client { };
@@ -3781,6 +3809,8 @@ in {
rpy2 = callPackage ../development/python-modules/rpy2 {};
rtslib = callPackage ../development/python-modules/rtslib {};
Rtree = callPackage ../development/python-modules/Rtree { inherit (pkgs) libspatialindex; };
typing = callPackage ../development/python-modules/typing { };
@@ -3835,6 +3865,10 @@ in {
snowballstemmer = callPackage ../development/python-modules/snowballstemmer { };
snug = callPackage ../development/python-modules/snug { };
snuggs = callPackage ../development/python-modules/snuggs { };
spake2 = callPackage ../development/python-modules/spake2 { };
sphfile = callPackage ../development/python-modules/sphfile { };
@@ -3948,6 +3982,8 @@ in {
ua-parser = callPackage ../development/python-modules/ua-parser { };
uarray = callPackage ../development/python-modules/uarray { };
ukpostcodeparser = callPackage ../development/python-modules/ukpostcodeparser { };
umemcache = callPackage ../development/python-modules/umemcache {};