Merge master into staging-next

2018-11-19 09:55:32 +01:00
parent 5f575e7339 c4cad8cfa7
commit e343a85cfb
116 changed files with 2864 additions and 2274 deletions
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2444,7 +2444,10 @@ in {

  google_cloud_speech = callPackage ../development/python-modules/google_cloud_speech { };

-  gpgme = toPythonModule (pkgs.gpgme.override { pythonSupport=true; });
+  gpgme = toPythonModule (pkgs.gpgme.override {
+    pythonSupport = true;
+    inherit (self) python;
+  });

  gphoto2 = callPackage ../development/python-modules/gphoto2 {
    inherit (pkgs) pkgconfig;