Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2020-02-10 12:55:47 +01:00
154 changed files with 3373 additions and 1173 deletions
+12
View File
@@ -678,6 +678,8 @@ in {
firetv = callPackage ../development/python-modules/firetv { };
flower = callPackage ../development/python-modules/flower { };
flufl_bounce = callPackage ../development/python-modules/flufl/bounce.nix { };
flufl_i18n = callPackage ../development/python-modules/flufl/i18n.nix { };
@@ -1000,6 +1002,8 @@ in {
pymupdf = callPackage ../development/python-modules/pymupdf { };
pynamecheap = callPackage ../development/python-modules/pynamecheap { };
Pmw = callPackage ../development/python-modules/Pmw { };
py_stringmatching = callPackage ../development/python-modules/py_stringmatching { };
@@ -1400,6 +1404,8 @@ in {
usePython = true;
});
softlayer = callPackage ../development/python-modules/softlayer { };
sparse = callPackage ../development/python-modules/sparse { };
spglib = callPackage ../development/python-modules/spglib { };
@@ -4341,6 +4347,8 @@ in {
names = callPackage ../development/python-modules/names { };
nbconflux = callPackage ../development/python-modules/nbconflux { };
nbconvert = callPackage ../development/python-modules/nbconvert { };
nbformat = if isPy3k then
@@ -6800,6 +6808,8 @@ in {
tldextract = callPackage ../development/python-modules/tldextract { };
transip = callPackage ../development/python-modules/transip { };
pyemd = callPackage ../development/python-modules/pyemd { };
pulp = callPackage ../development/python-modules/pulp { };
@@ -6900,6 +6910,8 @@ in {
inherit python;
})).python;
localzone = callPackage ../development/python-modules/localzone { };
scour = callPackage ../development/python-modules/scour { };
pymssql = callPackage ../development/python-modules/pymssql { };