Merge branch 'master' into staging

This commit is contained in:
Vladimír Čunát
2020-07-29 18:40:28 +02:00
377 changed files with 9647 additions and 7355 deletions
+16
View File
@@ -1504,6 +1504,8 @@ in {
pyvoro = callPackage ../development/python-modules/pyvoro { };
radish-bdd = callPackage ../development/python-modules/radish-bdd { };
relatorio = callPackage ../development/python-modules/relatorio { };
reproject = callPackage ../development/python-modules/reproject { };
@@ -1643,6 +1645,8 @@ in {
hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; };
};
tag-expressions = callPackage ../development/python-modules/tag-expressions { };
tableaudocumentapi = callPackage ../development/python-modules/tableaudocumentapi { };
tesserocr = callPackage ../development/python-modules/tesserocr { };
@@ -1709,6 +1713,8 @@ in {
webapp2 = callPackage ../development/python-modules/webapp2 { };
webdavclient3 = callPackage ../development/python-modules/webdavclient3 { };
wordcloud = callPackage ../development/python-modules/wordcloud { };
wrf-python = callPackage ../development/python-modules/wrf-python { };
@@ -2090,6 +2096,8 @@ in {
colorclass = callPackage ../development/python-modules/colorclass {};
colorful = callPackage ../development/python-modules/colorful {};
colorlog = callPackage ../development/python-modules/colorlog { };
colorspacious = callPackage ../development/python-modules/colorspacious { };
@@ -2150,6 +2158,8 @@ in {
dataclasses = callPackage ../development/python-modules/dataclasses { };
dataclasses-json = callPackage ../development/python-modules/dataclasses-json { };
debian = callPackage ../development/python-modules/debian {};
defusedxml = callPackage ../development/python-modules/defusedxml {};
@@ -2309,6 +2319,8 @@ in {
cheetah = callPackage ../development/python-modules/cheetah { };
cheetah3 = callPackage ../development/python-modules/cheetah3 { };
cherrypy = if isPy3k then
callPackage ../development/python-modules/cherrypy { }
else
@@ -2540,6 +2552,8 @@ in {
PyLD = callPackage ../development/python-modules/PyLD { };
pysingleton = callPackage ../development/python-modules/pysingleton { };
python-jose = callPackage ../development/python-modules/python-jose {};
python-json-logger = callPackage ../development/python-modules/python-json-logger { };
@@ -5897,6 +5911,8 @@ in {
typing-extensions = callPackage ../development/python-modules/typing-extensions { };
typing-inspect = callPackage ../development/python-modules/typing-inspect { };
typeguard = callPackage ../development/python-modules/typeguard { };
typesentry = callPackage ../development/python-modules/typesentry { };