Merge master into staging-next

2021-02-12 00:36:19 +00:00
parent 402b752521 9704f74645
commit 344456f66a
39 changed files with 2402 additions and 1404 deletions
@@ -64,8 +64,6 @@ stdenv.mkDerivation rec {
    (fetchurl { url = "${p}/weed.at"; sha256 = "1101xakhc99f5gb9cs3mmydn43ayli7b270pzbvh7f9rbvh0d0nh"; })
  ];

-  NIX_CFLAGS_COMPILE = "-L${libmysqlclient}/lib/mysql -I${libmysqlclient}/include/mysql";
-
  checkInputs = [ dejagnu ];
  doCheck = false; # fails 1 out of a bunch of tests, looks like a bug
  doInstallCheck = false; # fails