diff --git a/pkgs/tools/graphics/scour/default.nix b/pkgs/development/python-modules/scour/default.nix similarity index 73% rename from pkgs/tools/graphics/scour/default.nix rename to pkgs/development/python-modules/scour/default.nix index 11932aabe0b..7c198519331 100644 --- a/pkgs/tools/graphics/scour/default.nix +++ b/pkgs/development/python-modules/scour/default.nix @@ -1,8 +1,6 @@ -{ stdenv, python3 }: +{ lib, buildPythonPackage, fetchPypi, six }: -with python3.pkgs; - -buildPythonApplication rec { +buildPythonPackage rec { pname = "scour"; version = "0.37"; @@ -13,11 +11,13 @@ buildPythonApplication rec { propagatedBuildInputs = [ six ]; - meta = with stdenv.lib; { + # No tests included in archive + doCheck = false; + + meta = with lib; { description = "An SVG Optimizer / Cleaner "; homepage = https://github.com/scour-project/scour; license = licenses.asl20; maintainers = with maintainers; [ worldofpeace ]; - platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed395ea8d4a..1808dcf281e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1585,7 +1585,7 @@ with pkgs; parallel-rust = callPackage ../tools/misc/parallel-rust { }; - scour = callPackage ../tools/graphics/scour { }; + scour = with python3Packages; toPythonApplication scour; s2png = callPackage ../tools/graphics/s2png { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 33ac0b0bb69..f817cb3d061 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11076,6 +11076,8 @@ EOF inherit python; })).python; + scour = callPackage ../development/python-modules/scour { }; + }); in fix' (extends overrides packages)