diff options
author | Symphorien Gibol <symphorien+git@xlumurb.eu> | 2020-07-16 12:00:00 +0000 |
---|---|---|
committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-07-18 12:04:18 -0400 |
commit | 293d7c393355f58f884459ddd40e7464526e2398 (patch) | |
tree | 6283a6ad1d15f43e72695171823d4ac357c22fa5 | |
parent | ba4f0c63e4851a12f0322a1ad9105e9195af0ad2 (diff) | |
download | nixpkgs-293d7c393355f58f884459ddd40e7464526e2398.tar nixpkgs-293d7c393355f58f884459ddd40e7464526e2398.tar.gz nixpkgs-293d7c393355f58f884459ddd40e7464526e2398.tar.bz2 nixpkgs-293d7c393355f58f884459ddd40e7464526e2398.tar.lz nixpkgs-293d7c393355f58f884459ddd40e7464526e2398.tar.xz nixpkgs-293d7c393355f58f884459ddd40e7464526e2398.tar.zst nixpkgs-293d7c393355f58f884459ddd40e7464526e2398.zip |
img2pdf: make a python package
-rw-r--r-- | pkgs/development/python-modules/img2pdf/default.nix (renamed from pkgs/applications/misc/img2pdf/default.nix) | 9 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/misc/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix index b9c06d5122c..2fa46c2ed9d 100644 --- a/pkgs/applications/misc/img2pdf/default.nix +++ b/pkgs/development/python-modules/img2pdf/default.nix @@ -1,10 +1,9 @@ -{ stdenv, python3Packages }: +{ lib, pillow, fetchPypi, buildPythonPackage, isPy27 }: -with python3Packages; - -buildPythonApplication rec { +buildPythonPackage rec { pname = "img2pdf"; version = "0.3.6"; + disabled = isPy27; src = fetchPypi { inherit pname version; @@ -15,7 +14,7 @@ buildPythonApplication rec { pillow ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Convert images to PDF via direct JPEG inclusion"; homepage = "https://gitlab.mister-muffin.de/josch/img2pdf"; license = licenses.lgpl2; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8587ee04189..20c2ed3cacd 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 62e79e83d6c..ebf2585bfff 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 { }; |