Merge master into staging-next

2021-03-03 06:17:25 +00:00
parent 6153dce703 394bc6c138
commit c74f8ccc55
36 changed files with 194 additions and 152 deletions
@@ -8667,6 +8667,10 @@ in {

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

+  zeek = disabledIf (!isPy3k) (toPythonModule (pkgs.zeek.override {
+    python3 = python;
+  })).py;
+
  zeep = callPackage ../development/python-modules/zeep { };

  zeitgeist = (toPythonModule (pkgs.zeitgeist.override { python3 = python; })).py;