Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk
2020-05-29 17:06:01 +02:00
73 changed files with 2595 additions and 1982 deletions
@@ -13,8 +13,8 @@ let
else throw "ImageMagick is not supported on this platform.";
cfg = {
version = "7.0.9-0";
sha256 = "1w7ci7v5qlayd7a5z69px94fz3fshvn1diqw7k1ymsyvz5888d39";
version = "7.0.10-14";
sha256 = "1qcsq5884iqis1adpfbx3cwki8v4q9wwh70fpcaqnwwmznmqfq4j";
patches = [];
};
in