From 293d7c393355f58f884459ddd40e7464526e2398 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Thu, 16 Jul 2020 12:00:00 +0000 Subject: img2pdf: make a python package --- pkgs/applications/misc/img2pdf/default.nix | 25 ---------------------- .../development/python-modules/img2pdf/default.nix | 24 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 ++ 4 files changed, 27 insertions(+), 26 deletions(-) delete mode 100644 pkgs/applications/misc/img2pdf/default.nix create mode 100644 pkgs/development/python-modules/img2pdf/default.nix diff --git a/pkgs/applications/misc/img2pdf/default.nix b/pkgs/applications/misc/img2pdf/default.nix deleted file mode 100644 index b9c06d5122ca7..0000000000000 --- a/pkgs/applications/misc/img2pdf/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, python3Packages }: - -with python3Packages; - -buildPythonApplication rec { - pname = "img2pdf"; - version = "0.3.6"; - - src = fetchPypi { - inherit pname version; - sha256 = "1yx0ljbg7phpix507wq584qvspp2jgax7flpp1148pxpc2d51mcc"; - }; - - propagatedBuildInputs = [ - pillow - ]; - - meta = with stdenv.lib; { - description = "Convert images to PDF via direct JPEG inclusion"; - homepage = "https://gitlab.mister-muffin.de/josch/img2pdf"; - license = licenses.lgpl2; - platforms = platforms.unix; - maintainers = [ maintainers.veprbl ]; - }; -} diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix new file mode 100644 index 0000000000000..2fa46c2ed9d4d --- /dev/null +++ b/pkgs/development/python-modules/img2pdf/default.nix @@ -0,0 +1,24 @@ +{ lib, pillow, fetchPypi, buildPythonPackage, isPy27 }: + +buildPythonPackage rec { + pname = "img2pdf"; + version = "0.3.6"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "1yx0ljbg7phpix507wq584qvspp2jgax7flpp1148pxpc2d51mcc"; + }; + + propagatedBuildInputs = [ + pillow + ]; + + meta = with lib; { + description = "Convert images to PDF via direct JPEG inclusion"; + homepage = "https://gitlab.mister-muffin.de/josch/img2pdf"; + license = licenses.lgpl2; + platforms = platforms.unix; + maintainers = [ maintainers.veprbl ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8587ee041891b..20c2ed3cacd6a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20590,7 +20590,7 @@ in inherit (nodePackages) imapnotify; - img2pdf = callPackage ../applications/misc/img2pdf { }; + img2pdf = with python3Packages; toPythonApplication img2pdf; imgcat = callPackage ../applications/graphics/imgcat { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 62e79e83d6c95..ebf2585bfffeb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2433,6 +2433,8 @@ in { impacket = callPackage ../development/python-modules/impacket { }; + img2pdf = callPackage ../development/python-modules/img2pdf { }; + jsonlines = callPackage ../development/python-modules/jsonlines { }; json-merge-patch = callPackage ../development/python-modules/json-merge-patch { }; -- cgit 1.4.1