Merge branch 'master' into add-missing-licenses

Conflicts:
	pkgs/development/libraries/exiv2/default.nix
        Set license to gpl2Plus

pkgs/tools/graphics/oxipng/default.nix

@@ -1,22 +1,26 @@
 { stdenv, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
-  version = "1.0.1";
+  version = "2.1.0";
   name = "oxipng-${version}";
 
   src = fetchFromGitHub {
     owner = "shssoichiro";
     repo = "oxipng";
     rev = "v${version}";
-    sha256 = "0w39f0dhq9cxk25vy0wh8vicxyckvj1vmglx5va4550i3q0hsrws";
+    sha256 = "13rzkfb025y4i9dj66fgc74whgs90gyw861dccsj16cpfl6kh5z0";
   };
 
-  cargoSha256 = "00nbx6n73yl4ax05pqkmim1vhy0pymgz5la1cc4y18gjbjjj9w4h";
+  cargoSha256 = "0l6ad8rnifd5hkv6x2cr0frdddsfwm1xd1v56imlglsjkgz56cva";
 
   meta = with stdenv.lib; {
     homepage = https://github.com/shssoichiro/oxipng;
     description = "A lossless PNG compression optimizer";
     license = licenses.mit;
+    maintainers = with maintainers; [ dywedir ];
     platforms = platforms.all;
+
+    # macro is_arm_feature_detected! is unstable
+    broken = stdenv.isAarch64;
   };
 }

pkgs/tools/graphics/pdfredacttools/default.nix

@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, pythonPackages, imagemagick, exiftool, file, ghostscript }:
+{ stdenv, fetchFromGitHub, python2Packages, imagemagick, exiftool, file, ghostscript }:
 
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
   pname = "pdf-redact-tools";
   version = "0.1.2";
 

pkgs/tools/graphics/scour/default.nix

@@ -0,0 +1,23 @@
+{ stdenv, python3 }:
+
+with python3.pkgs;
+
+buildPythonApplication rec {
+  pname = "scour";
+  version = "0.37";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "05k1f8i8v7sp5v39lian865vwvapq05a6vmvk7fwnxv8kivi6ccn";
+  };
+
+  propagatedBuildInputs = [ six ];
+
+  meta = with stdenv.lib; {
+    description = "An SVG Optimizer / Cleaner ";
+    homepage    = https://github.com/scour-project/scour;
+    license     = licenses.asl20;
+    maintainers = with maintainers; [ worldofpeace ];
+    platforms   = platforms.unix;
+  };
+}