diff --git a/pkgs/applications/graphics/PythonMagick/default.nix b/pkgs/development/python-modules/pythonmagick/default.nix similarity index 51% rename from pkgs/applications/graphics/PythonMagick/default.nix rename to pkgs/development/python-modules/pythonmagick/default.nix index 487648d07ca..a647fa1005b 100644 --- a/pkgs/applications/graphics/PythonMagick/default.nix +++ b/pkgs/development/python-modules/pythonmagick/default.nix @@ -1,10 +1,19 @@ -# This expression provides Python bindings to ImageMagick. Python libraries are supposed to be called via `python-packages.nix`. +{ lib +, buildPythonPackage +, fetchurl +, python +, pkg-config +, imagemagick +, autoreconfHook +, boost +, isPy3k +, pythonImportsCheckHook +}: -{ stdenv, fetchurl, python, pkgconfig, imagemagick, autoreconfHook }: - -stdenv.mkDerivation rec { +buildPythonPackage rec { pname = "pythonmagick"; version = "0.9.16"; + format = "other"; src = fetchurl { url = "mirror://imagemagick/python/releases/PythonMagick-${version}.tar.xz"; @@ -15,12 +24,18 @@ stdenv.mkDerivation rec { rm configure ''; - configureFlags = [ "--with-boost=${python.pkgs.boost}" ]; + configureFlags = [ "--with-boost=${boost}" ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; - buildInputs = [ python python.pkgs.boost imagemagick ]; + nativeBuildInputs = [ pkg-config autoreconfHook pythonImportsCheckHook ]; + buildInputs = [ python boost imagemagick ]; - meta = with stdenv.lib; { + pythonImportsCheck = [ + "PythonMagick" + ]; + + disabled = isPy3k; + + meta = with lib; { homepage = "http://www.imagemagick.org/script/api.php"; license = licenses.imagemagick; description = "PythonMagick provides object oriented bindings for the ImageMagick Library."; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7f5bd5485b..78a6dc298fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21614,8 +21614,6 @@ in pybitmessage = callPackage ../applications/networking/instant-messengers/pybitmessage { }; - pythonmagick = callPackage ../applications/graphics/PythonMagick { }; - qbittorrent = libsForQt5.callPackage ../applications/networking/p2p/qbittorrent { }; qbittorrent-nox = qbittorrent.override { guiSupport = false; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 885622b9be9..26af65dd1aa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1367,6 +1367,8 @@ in { pytmx = callPackage ../development/python-modules/pytmx { }; + pythonmagick = callPackage ../development/python-modules/pythonmagick { }; + python-binance = callPackage ../development/python-modules/python-binance { }; python-dbusmock = callPackage ../development/python-modules/python-dbusmock { };