Merge branch 'master' into staging-next

2021-03-18 19:24:39 +01:00
parent 0136206b12 94bcca22ff
commit 2445e9a681
91 changed files with 982 additions and 256 deletions
@@ -2,8 +2,6 @@
 , yacc, libtool, fontconfig, pango, gd, libwebp
 }:

-assert libpng != null && libjpeg != null && expat != null;
-
 stdenv.mkDerivation rec {
  name = "graphviz-2.0";