Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2019-01-06 09:36:23 +01:00
55 changed files with 500 additions and 1342 deletions

View File

@@ -1732,7 +1732,11 @@ in {
gateone = callPackage ../development/python-modules/gateone { };
gcutil = callPackage ../development/python-modules/gcutil { };
# TODO: Remove after 19.03 is branched off:
gcutil = throw ''
pythonPackages.gcutil is deprecated and can be replaced with "gcloud
compute" from the package google-cloud-sdk.
'';
GeoIP = callPackage ../development/python-modules/GeoIP { };
@@ -2295,6 +2299,8 @@ in {
dtopt = callPackage ../development/python-modules/dtopt { };
easywatch = callPackage ../development/python-modules/easywatch { };
ecdsa = callPackage ../development/python-modules/ecdsa { };
effect = callPackage ../development/python-modules/effect {};
@@ -4000,6 +4006,8 @@ in {
sqlalchemy_migrate = callPackage ../development/python-modules/sqlalchemy-migrate { };
staticjinja = callPackage ../development/python-modules/staticjinja { };
statsmodels = callPackage ../development/python-modules/statsmodels { };
structlog = callPackage ../development/python-modules/structlog { };