Merge branch 'master' into staging-next

2020-08-06 11:41:44 +02:00
parent 834e04c474 056bb77adb
commit 4fee273dda
62 changed files with 1371 additions and 1041 deletions
@@ -730,6 +730,8 @@ in {

  diff-match-patch = callPackage ../development/python-modules/diff-match-patch { };

+  eliot = callPackage ../development/python-modules/eliot {};
+
  entrance = callPackage ../development/python-modules/entrance { routerFeatures = false; };

  entrance-with-router-features = callPackage ../development/python-modules/entrance { routerFeatures = true; };