Merge branch 'staging-next-21.05' into staging-21.05

This commit is contained in:
Jonathan Ringer
2021-06-25 00:15:49 -07:00
160 changed files with 3797 additions and 2413 deletions
@@ -16,13 +16,13 @@ in
stdenv.mkDerivation rec {
pname = "imagemagick";
version = "6.9.12-12";
version = "6.9.12-16";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick6";
rev = version;
sha256 = "sha256-yqMYuayQjPlTqi3+CtwP5CdsAGud/fHR0I2LwUPIq00=";
sha256 = "sha256-kg8vt88G6huRbJlVYztKxHiFPhGz/QHuNKtbhmai790=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big