Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-04-24 06:05:30 +00:00
committed by GitHub
46 changed files with 453 additions and 127 deletions
+6
View File
@@ -2584,6 +2584,8 @@ in {
gcovr = callPackage ../development/python-modules/gcovr { };
gcsfs = callPackage ../development/python-modules/gcsfs { };
gdal = toPythonModule (pkgs.gdal.override { pythonPackages = self; });
gdata = callPackage ../development/python-modules/gdata { };
@@ -4363,6 +4365,8 @@ in {
ncclient = callPackage ../development/python-modules/ncclient { };
nclib = callPackage ../development/python-modules/nclib { };
ndg-httpsclient = callPackage ../development/python-modules/ndg-httpsclient { };
ndjson = callPackage ../development/python-modules/ndjson { };
@@ -7607,6 +7611,8 @@ in {
sphinx_rtd_theme = callPackage ../development/python-modules/sphinx_rtd_theme { };
sphinx-serve = callPackage ../development/python-modules/sphinx-serve { };
sphinx-testing = callPackage ../development/python-modules/sphinx-testing { };
spidev = callPackage ../development/python-modules/spidev { };