Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2018-11-22 09:57:08 +01:00
122 changed files with 2802 additions and 902 deletions
+75 -4
View File
@@ -422,6 +422,8 @@ in {
monty = callPackage ../development/python-modules/monty { };
mininet-python = (toPythonModule (pkgs.mininet.override{ inherit python; })).py;
mpi4py = callPackage ../development/python-modules/mpi4py {
mpi = pkgs.openmpi;
};
@@ -716,6 +718,8 @@ in {
vidstab = callPackage ../development/python-modules/vidstab { };
webapp2 = callPackage ../development/python-modules/webapp2 { };
pyunbound = callPackage ../tools/networking/unbound/python.nix { };
WazeRouteCalculator = callPackage ../development/python-modules/WazeRouteCalculator { };
@@ -2445,14 +2449,77 @@ in {
google_auth = callPackage ../development/python-modules/google_auth { };
google_cloud_asset = callPackage ../development/python-modules/google_cloud_asset { };
google_cloud_automl = callPackage ../development/python-modules/google_cloud_automl { };
google_cloud_core = callPackage ../development/python-modules/google_cloud_core { };
google_cloud_bigquery = callPackage ../development/python-modules/google_cloud_bigquery { };
google_cloud_bigquery_datatransfer = callPackage ../development/python-modules/google_cloud_bigquery_datatransfer { };
google_cloud_bigtable = callPackage ../development/python-modules/google_cloud_bigtable { };
google_cloud_container = callPackage ../development/python-modules/google_cloud_container { };
google_cloud_dataproc = callPackage ../development/python-modules/google_cloud_dataproc { };
google_cloud_datastore = callPackage ../development/python-modules/google_cloud_datastore { };
google_cloud_dlp = callPackage ../development/python-modules/google_cloud_dlp { };
google_cloud_dns = callPackage ../development/python-modules/google_cloud_dns { };
google_cloud_error_reporting = callPackage ../development/python-modules/google_cloud_error_reporting { };
google_cloud_firestore = callPackage ../development/python-modules/google_cloud_firestore { };
google_cloud_iot = callPackage ../development/python-modules/google_cloud_iot { };
google_cloud_kms = callPackage ../development/python-modules/google_cloud_kms { };
google_cloud_language = callPackage ../development/python-modules/google_cloud_language { };
google_cloud_logging = callPackage ../development/python-modules/google_cloud_logging { };
google_cloud_monitoring = callPackage ../development/python-modules/google_cloud_monitoring { };
google_cloud_pubsub = callPackage ../development/python-modules/google_cloud_pubsub { };
google_cloud_redis = callPackage ../development/python-modules/google_cloud_redis { };
google_cloud_resource_manager = callPackage ../development/python-modules/google_cloud_resource_manager { };
google_cloud_runtimeconfig = callPackage ../development/python-modules/google_cloud_runtimeconfig { };
google_cloud_securitycenter = callPackage ../development/python-modules/google_cloud_securitycenter { };
google_cloud_spanner = callPackage ../development/python-modules/google_cloud_spanner { };
google_cloud_storage = callPackage ../development/python-modules/google_cloud_storage { };
google_cloud_speech = callPackage ../development/python-modules/google_cloud_speech { };
gpgme = toPythonModule (pkgs.gpgme.override {
pythonSupport = true;
inherit (self) python;
});
google_cloud_tasks = callPackage ../development/python-modules/google_cloud_tasks { };
google_cloud_testutils = callPackage ../development/python-modules/google_cloud_testutils { };
google_cloud_texttospeech = callPackage ../development/python-modules/google_cloud_texttospeech { };
google_cloud_trace = callPackage ../development/python-modules/google_cloud_trace { };
google_cloud_translate = callPackage ../development/python-modules/google_cloud_translate { };
google_cloud_videointelligence = callPackage ../development/python-modules/google_cloud_videointelligence { };
google_cloud_vision = callPackage ../development/python-modules/google_cloud_vision { };
google_cloud_websecurityscanner = callPackage ../development/python-modules/google_cloud_websecurityscanner { };
google_resumable_media = callPackage ../development/python-modules/google_resumable_media { };
gpgme = toPythonModule (pkgs.gpgme.override { pythonSupport=true; });
gphoto2 = callPackage ../development/python-modules/gphoto2 {
inherit (pkgs) pkgconfig;
@@ -2472,6 +2539,10 @@ in {
grpcio-tools = callPackage ../development/python-modules/grpcio-tools { };
grpcio-gcp = callPackage ../development/python-modules/grpcio-gcp { };
grpc_google_iam_v1 = callPackage ../development/python-modules/grpc_google_iam_v1 { };
gspread = callPackage ../development/python-modules/gspread { };
gyp = callPackage ../development/python-modules/gyp { };