From d2e09b534bea27f0ae313449ef74ad72a7e1c134 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 29 Dec 2023 04:20:00 +0000 Subject: [PATCH] python311Packages.pdfminer-six: 20221105 -> 20231228 Diff: https://github.com/pdfminer/pdfminer.six/compare/20221105...20231228 Changelog: https://github.com/pdfminer/pdfminer.six/releases/tag/20231228 --- .../python-modules/pdfminer-six/default.nix | 31 +++++++++++++------ .../disable-setuptools-git-versioning.patch | 14 +++++++++ 2 files changed, 35 insertions(+), 10 deletions(-) create mode 100644 pkgs/development/python-modules/pdfminer-six/disable-setuptools-git-versioning.patch diff --git a/pkgs/development/python-modules/pdfminer-six/default.nix b/pkgs/development/python-modules/pdfminer-six/default.nix index cd378941b151..bc182442af4f 100644 --- a/pkgs/development/python-modules/pdfminer-six/default.nix +++ b/pkgs/development/python-modules/pdfminer-six/default.nix @@ -1,19 +1,22 @@ { lib , buildPythonPackage , fetchFromGitHub +, importlib-metadata , isPy3k , cryptography , charset-normalizer , pythonOlder , typing-extensions , pytestCheckHook +, setuptools +, substituteAll , ocrmypdf }: buildPythonPackage rec { pname = "pdfminer-six"; - version = "20221105"; - format = "setuptools"; + version = "20231228"; + pyproject = true; disabled = !isPy3k; @@ -21,13 +24,27 @@ buildPythonPackage rec { owner = "pdfminer"; repo = "pdfminer.six"; rev = version; - hash = "sha256-OyEeQBuYfj4iEcRt2/daSaUfTOjCVSCyHW2qffal+Bk="; + hash = "sha256-LXPECQQojD3IY9zRkrDBufy4A8XUuYiRpryqUx/I3qo="; }; + patches = [ + (substituteAll { + src = ./disable-setuptools-git-versioning.patch; + inherit version; + }) + ]; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ charset-normalizer cryptography - ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + typing-extensions + ]; postInstall = '' for file in $out/bin/*.py; do @@ -35,12 +52,6 @@ buildPythonPackage rec { done ''; - postPatch = '' - # Version is not stored in repo, gets added by a GitHub action after tag is created - # https://github.com/pdfminer/pdfminer.six/pull/727 - substituteInPlace pdfminer/__init__.py --replace "__VERSION__" ${version} - ''; - pythonImportsCheck = [ "pdfminer" "pdfminer.high_level" diff --git a/pkgs/development/python-modules/pdfminer-six/disable-setuptools-git-versioning.patch b/pkgs/development/python-modules/pdfminer-six/disable-setuptools-git-versioning.patch new file mode 100644 index 000000000000..2dec0e147b9f --- /dev/null +++ b/pkgs/development/python-modules/pdfminer-six/disable-setuptools-git-versioning.patch @@ -0,0 +1,14 @@ +--- a/setup.py ++++ b/setup.py +@@ -7,10 +7,7 @@ + + setup( + name="pdfminer.six", +- setuptools_git_versioning={ +- "enabled": True, +- }, +- setup_requires=["setuptools-git-versioning<2"], ++ version="@version@", + packages=["pdfminer"], + package_data={"pdfminer": ["cmap/*.pickle.gz", "py.typed"]}, + install_requires=[