Merge staging-next into staging

2020-06-15 08:29:05 +02:00
parent fd4dcae884 33983aaa23
commit 384bc1a861
33 changed files with 353 additions and 79 deletions
@@ -6845,7 +6845,9 @@ in {

  jenkins-job-builder = callPackage ../development/python-modules/jenkins-job-builder { };

-  dot2tex = callPackage ../development/python-modules/dot2tex { };
+  dot2tex = callPackage ../development/python-modules/dot2tex {
+    inherit (pkgs) graphviz;
+  };

  poezio = callPackage ../applications/networking/instant-messengers/poezio {
    inherit (pkgs) pkgconfig;