Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 46d919f5788f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0b68f2ef09fc
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Apr 1, 2020

  1. python3Packages.pdfminer: 20191020 -> 20200402

    @marsam
    marsam committed Apr 1, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    rasendubi Oleksii Shmalko
    GPG key ID: DCEF7BCCEB3066C3
    Verified
    Learn about vigilant mode
    Copy the full SHA
    899c35c View commit details

Commits on Apr 2, 2020

  1. Merge pull request #84066 from marsam/update-pdfminer 

    python3Packages.pdfminer: 20191020 -> 20200402
    @marsam
    marsam authored Apr 2, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0b68f2e View commit details
Showing with 17 additions and 7 deletions.
  1. +17 −7 pkgs/development/python-modules/pdfminer_six/default.nix
24 changes: 17 additions & 7 deletions pkgs/development/python-modules/pdfminer_six/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,38 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, six, pycryptodome, chardet, nose, sortedcontainers }:
{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, pycryptodome, chardet, nose, sortedcontainers, fetchpatch }:

buildPythonPackage rec {
pname = "pdfminer_six";
version = "20191020";
version = "20200402";

disabled = !isPy3k;

# No tests in PyPi Tarball
src = fetchFromGitHub {
owner = "pdfminer";
repo = "pdfminer.six";
rev = version;
sha256 = "1fqn4ilcscvw6ws9a1yqiprha9d3rgw3d0280clkbk6s4l26wm9h";
sha256 = "1wl64r3ifpwi7mm5pcxc0ji7w380nxcq3zrv66n95lglm4zqkf26";
};

propagatedBuildInputs = [ six pycryptodome sortedcontainers ]
++ stdenv.lib.optionals isPy3k [ chardet ];
patches = [
# Add shebang line to scripts. See: https://github.com/pdfminer/pdfminer.six/pull/408
(fetchpatch {
url = "https://github.com/pdfminer/pdfminer.six/commit/0c2f44b6de064d9a3cea99bde5b8e9c6a525a69c.patch";
sha256 = "1vml66grnvg4g26mya24kiyxsz809d4mr7wz8qmawjbn4ss65y21";
excludes = [ "CHANGELOG.md" ];
})
];

propagatedBuildInputs = [ chardet pycryptodome sortedcontainers ];

checkInputs = [ nose ];
checkPhase = ''
nosetests
'';

meta = with stdenv.lib; {
description = "fork of PDFMiner using six for Python 2+3 compatibility";
homepage = https://github.com/pdfminer/pdfminer.six;
description = "PDF parser and analyzer";
homepage = "https://github.com/pdfminer/pdfminer.six";
license = licenses.mit;
maintainers = with maintainers; [ psyanticy marsam ];
};