Merge staging-next into staging

2021-04-30 00:52:06 +00:00
parent 5c80c7ce86 f62eaaa779
commit b4766e97ee
71 changed files with 455 additions and 254 deletions
@@ -78,5 +78,6 @@ stdenv.mkDerivation rec {
    platforms = platforms.linux ++ platforms.darwin;
    maintainers = with maintainers; [ erictapen ];
    license = licenses.asl20;
+    mainProgram = "magick";
  };
 }