From 4307907d725fce04207f7f092d43c7481e3f7ec0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 25 May 2022 04:20:00 +0000 Subject: [PATCH] python39Packages.pdfminer-six: add alias to pdfminer --- pkgs/applications/editors/setzer/default.nix | 2 +- pkgs/applications/misc/visidata/default.nix | 4 ++-- pkgs/applications/office/paperless-ngx/default.nix | 2 +- pkgs/development/python-modules/ocrmypdf/default.nix | 4 ++-- .../python-modules/{pdfminer_six => pdfminer-six}/default.nix | 2 +- pkgs/development/python-modules/pdfx/default.nix | 4 ++-- pkgs/development/python-modules/typecode/default.nix | 4 ++-- pkgs/development/python-modules/weboob/default.nix | 4 ++-- pkgs/development/python-modules/woob/default.nix | 4 ++-- pkgs/tools/misc/diffoscope/default.nix | 2 +- pkgs/tools/text/invoice2data/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 14 files changed, 20 insertions(+), 19 deletions(-) rename pkgs/development/python-modules/{pdfminer_six => pdfminer-six}/default.nix (97%) diff --git a/pkgs/applications/editors/setzer/default.nix b/pkgs/applications/editors/setzer/default.nix index cc1d08cc3f9b..10fb4e0a97e6 100644 --- a/pkgs/applications/editors/setzer/default.nix +++ b/pkgs/applications/editors/setzer/default.nix @@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ pygobject3 pyxdg - pdfminer + pdfminer-six pycairo pexpect ]; diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index 99657d60bd70..e73c6e7b5dc3 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -14,7 +14,7 @@ , pyshp , fonttools , pyyaml -, pdfminer +, pdfminer-six , vobject , tabulate , wcwidth @@ -55,7 +55,7 @@ buildPythonApplication rec { pyyaml #namestand #datapackage - pdfminer + pdfminer-six #tabula vobject tabulate diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 358b66fb589a..2b07b9bd47b3 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -92,7 +92,7 @@ py.pkgs.pythonPackages.buildPythonApplication rec { numpy ocrmypdf pathvalidate - pdfminer + pdfminer-six pikepdf pillow pluggy diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index 168777594aef..1a427dc379fd 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -7,7 +7,7 @@ , importlib-metadata , importlib-resources , jbig2enc -, pdfminer +, pdfminer-six , pikepdf , pillow , pluggy @@ -63,7 +63,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ coloredlogs img2pdf - pdfminer + pdfminer-six pikepdf pillow pluggy diff --git a/pkgs/development/python-modules/pdfminer_six/default.nix b/pkgs/development/python-modules/pdfminer-six/default.nix similarity index 97% rename from pkgs/development/python-modules/pdfminer_six/default.nix rename to pkgs/development/python-modules/pdfminer-six/default.nix index a2470bf12d69..3911794b89cb 100644 --- a/pkgs/development/python-modules/pdfminer_six/default.nix +++ b/pkgs/development/python-modules/pdfminer-six/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { - pname = "pdfminer_six"; + pname = "pdfminer-six"; version = "20220524"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/pdfx/default.nix b/pkgs/development/python-modules/pdfx/default.nix index 25efc4418bf9..aaffa0f93818 100644 --- a/pkgs/development/python-modules/pdfx/default.nix +++ b/pkgs/development/python-modules/pdfx/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pdfminer, chardet, pytestCheckHook }: +{ lib, buildPythonPackage, fetchFromGitHub, pdfminer-six, chardet, pytestCheckHook }: buildPythonPackage rec { pname = "pdfx"; @@ -17,7 +17,7 @@ buildPythonPackage rec { --replace "pdfminer.six==20201018" "pdfminer.six" ''; - propagatedBuildInputs = [ pdfminer chardet ]; + propagatedBuildInputs = [ pdfminer-six chardet ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/typecode/default.nix b/pkgs/development/python-modules/typecode/default.nix index 7b3a01a53a8a..a177b845b4b3 100644 --- a/pkgs/development/python-modules/typecode/default.nix +++ b/pkgs/development/python-modules/typecode/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , setuptools-scm , attrs -, pdfminer +, pdfminer-six , commoncode , plugincode , binaryornot @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ attrs - pdfminer + pdfminer-six commoncode plugincode binaryornot diff --git a/pkgs/development/python-modules/weboob/default.nix b/pkgs/development/python-modules/weboob/default.nix index 094dcb3bfbdf..6ceefbaa20ce 100644 --- a/pkgs/development/python-modules/weboob/default.nix +++ b/pkgs/development/python-modules/weboob/default.nix @@ -12,7 +12,7 @@ , lxml , mechanize , nose -, pdfminer +, pdfminer-six , pillow , prettytable , pyqt5 @@ -54,7 +54,7 @@ buildPythonPackage rec { libyaml lxml mechanize - pdfminer + pdfminer-six pillow prettytable pyqt5 diff --git a/pkgs/development/python-modules/woob/default.nix b/pkgs/development/python-modules/woob/default.nix index a681b523a32e..e9f5ec19d1d1 100644 --- a/pkgs/development/python-modules/woob/default.nix +++ b/pkgs/development/python-modules/woob/default.nix @@ -13,7 +13,7 @@ , lxml , mechanize , nose -, pdfminer +, pdfminer-six , pillow , prettytable , pyqt5 @@ -57,7 +57,7 @@ buildPythonPackage rec { libyaml lxml mechanize - pdfminer + pdfminer-six pillow prettytable pyqt5 diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 6bac37c98e75..d2ab1a9ba44f 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -57,7 +57,7 @@ python3Packages.buildPythonApplication rec { ++ lib.optionals enableBloat ([ abootimg apksigner apktool cbfstool colord enjarify ffmpeg fpc ghc ghostscriptX giflib gnupg gnumeric hdf5 imagemagick libcaca llvm jdk mono ocaml odt2txt oggvideotools openssh pdftk poppler_utils procyon qemu R tcpdump ubootTools wabt radare2 xmlbeans - ] ++ (with python3Packages; [ androguard binwalk guestfs h5py pdfminer ])); + ] ++ (with python3Packages; [ androguard binwalk guestfs h5py pdfminer-six ])); checkInputs = with python3Packages; [ pytestCheckHook ] ++ pythonPath; diff --git a/pkgs/tools/text/invoice2data/default.nix b/pkgs/tools/text/invoice2data/default.nix index 941f2d6f4938..d23486159013 100644 --- a/pkgs/tools/text/invoice2data/default.nix +++ b/pkgs/tools/text/invoice2data/default.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ chardet dateparser - pdfminer + pdfminer-six pillow pyyaml unidecode diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index acfc1e60707a..bb090dad3979 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9283,7 +9283,7 @@ with pkgs; pdftoipe = callPackage ../tools/graphics/pdftoipe { }; - pdfminer = with python3Packages; toPythonApplication pdfminer; + pdfminer = with python3Packages; toPythonApplication pdfminer-six; pdf-quench = callPackage ../applications/misc/pdf-quench { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 325b5e69b0c7..003f9a516f36 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -97,6 +97,7 @@ mapAliases ({ pam = python-pam; # added 2020-09-07. PasteDeploy = pastedeploy; # added 2021-10-07 pathpy = path; # added 2022-04-12 + pdfminer = pdfminer-six; # added 2022-05-25 pep257 = pydocstyle; # added 2022-04-12 postorius = throw "Please use pkgs.mailmanPackages.postorius"; # added 2022-04-29 powerlineMemSegment = powerline-mem-segment; # added 2021-10-08 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0f10b43dfd67..1c2c95a02eed 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6256,7 +6256,7 @@ in { pdfkit = callPackage ../development/python-modules/pdfkit { }; - pdfminer = callPackage ../development/python-modules/pdfminer_six { }; + pdfminer-six = callPackage ../development/python-modules/pdfminer-six { }; pdfposter = callPackage ../development/python-modules/pdfposter { };