Merge master into staging-next

2020-05-24 10:03:22 +02:00
parent b34551384a bcb05f050e
commit c778596f56
74 changed files with 1073 additions and 521 deletions
@@ -3038,6 +3038,10 @@ in {

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

+  kicad = disabledIf isPy27 (toPythonModule (pkgs.kicad.override {
+    python3 = python;
+  }).src);
+
  latexcodec = callPackage ../development/python-modules/latexcodec {};

  libmodulemd = pipe pkgs.libmodulemd [