Merge master into staging-next

2020-01-10 10:34:04 +01:00
parent eb1369670b 773494d0ea
commit 5ad16cb27f
141 changed files with 1935 additions and 876 deletions
@@ -271,4 +271,6 @@ in {
  ) super.ocaml-ng;

  python27 = super.python27.override { static = true; };
+
+  libev = super.libev.override { static = true; };
 }