From b37cb1de2b6051a3b65fb14e22ca10a30fb5955d Mon Sep 17 00:00:00 2001 From: "nagato.pain" Date: Mon, 28 May 2018 17:15:40 -0700 Subject: [PATCH 1/2] pythonPackages.pdfminer_six: init at 20170720 --- .../python-modules/pdfminer_six/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/pdfminer_six/default.nix diff --git a/pkgs/development/python-modules/pdfminer_six/default.nix b/pkgs/development/python-modules/pdfminer_six/default.nix new file mode 100644 index 00000000000..462c4d55856 --- /dev/null +++ b/pkgs/development/python-modules/pdfminer_six/default.nix @@ -0,0 +1,34 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, six, pycryptodome, chardet, nose, pytest }: + +buildPythonPackage rec { + pname = "pdfminer_six"; + version = "20170720"; + + src = fetchFromGitHub { + owner = "pdfminer"; + repo = "pdfminer.six"; + rev = "${version}"; + sha256 = "0vax5k0a8qn8x86ybpzqydk7x3hajsk8b6xf3y610j19mgag6wvs"; + }; + + propagatedBuildInputs = [ six pycryptodome chardet ]; + + checkInputs = [ nose pytest ]; + checkPhase = '' + # some crappy hack to ensure the test do not fail for python3 + # for some reason importing from the folder tools fails :\ + cp tools/dumppdf.py tests/ + cp tools/pdf2txt.py tests/ + sed -i '/from tools import dumppdf/c\ import dumppdf' tests/test_tools_dumppdf.py + sed -i '/import tools.pdf2txt as pdf2txt/c\import pdf2txt as pdf2txt' tests/test_tools_pdf2txt.py + pytest + ''; + + meta = with stdenv.lib; { + description = "fork of PDFMiner using six for Python 2+3 compatibility"; + homepage = https://github.com/pdfminer/pdfminer.six; + license = licenses.mit; + maintainers = with maintainers; [ psyanticy ]; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 42f5f6c1711..4d926cb2289 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -311,6 +311,8 @@ in { outcome = callPackage ../development/python-modules/outcome {}; + pdfminer_six = callPackage ../development/python-modules/pdfminer_six { }; + plantuml = callPackage ../tools/misc/plantuml { }; Pmw = callPackage ../development/python-modules/Pmw { }; From a3caa7bd05f7a5070a02efa49eb7fd806b73b549 Mon Sep 17 00:00:00 2001 From: Assassinkin Date: Tue, 29 May 2018 13:30:41 +0100 Subject: [PATCH 2/2] pythonPackages.pdfminer: replacing pdfminer with pdfminer_six --- .../python-modules/pdfminer_six/default.nix | 10 ++------ pkgs/top-level/python-packages.nix | 24 +------------------ 2 files changed, 3 insertions(+), 31 deletions(-) diff --git a/pkgs/development/python-modules/pdfminer_six/default.nix b/pkgs/development/python-modules/pdfminer_six/default.nix index 462c4d55856..71d439d4c20 100644 --- a/pkgs/development/python-modules/pdfminer_six/default.nix +++ b/pkgs/development/python-modules/pdfminer_six/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, six, pycryptodome, chardet, nose, pytest }: +{ stdenv, buildPythonPackage, python, fetchFromGitHub, six, pycryptodome, chardet, nose, pytest }: buildPythonPackage rec { pname = "pdfminer_six"; @@ -15,13 +15,7 @@ buildPythonPackage rec { checkInputs = [ nose pytest ]; checkPhase = '' - # some crappy hack to ensure the test do not fail for python3 - # for some reason importing from the folder tools fails :\ - cp tools/dumppdf.py tests/ - cp tools/pdf2txt.py tests/ - sed -i '/from tools import dumppdf/c\ import dumppdf' tests/test_tools_dumppdf.py - sed -i '/import tools.pdf2txt as pdf2txt/c\import pdf2txt as pdf2txt' tests/test_tools_pdf2txt.py - pytest + ${python.interpreter} -m pytest ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4d926cb2289..f02a44d925a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -311,7 +311,7 @@ in { outcome = callPackage ../development/python-modules/outcome {}; - pdfminer_six = callPackage ../development/python-modules/pdfminer_six { }; + pdfminer = callPackage ../development/python-modules/pdfminer_six { }; plantuml = callPackage ../tools/misc/plantuml { }; @@ -3784,28 +3784,6 @@ in { }; }; - - pdfminer = buildPythonPackage rec { - version = "20140328"; - name = "pdfminer-${version}"; - - disabled = ! isPy27; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pdfminer/pdfminer-${version}.tar.gz"; - sha256 = "0qpjv4b776dwvpf5a7v19g41qsz97bv0qqsyvm7a31k50n9pn65s"; - }; - - propagatedBuildInputs = with self; [ ]; - - meta = { - description = "Tool for extracting information from PDF documents"; - homepage = http://euske.github.io/pdfminer/index.html; - license = licenses.mit; - maintainers = with maintainers; [ ]; - }; - }; - peppercorn = buildPythonPackage rec { name = "peppercorn-0.5";