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: 54d7b36a9ed5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4b18e4cef6a8
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jul 9, 2020

  1. colorlogs: 10.0 -> 14.0

    @bachp
    bachp committed Jul 9, 2020
    Copy the full SHA
    98ba751 View commit details

Commits on Jul 11, 2020

  1. ocrmypdf: 9.8.2 -> 10.2.0

    @bachp
    bachp committed Jul 11, 2020
    Copy the full SHA
    8076db3 View commit details

  2. Merge pull request #92789 from bachp/ocrmypdf-10.2.0 

    ocrmypdf: 9.8.2 -> 10.2.0
    @flokli
    flokli authored Jul 11, 2020
    Copy the full SHA
    4b18e4c View commit details
Showing with 7 additions and 24 deletions.
  1. +2 −2 pkgs/development/python-modules/coloredlogs/default.nix
  2. +5 −22 pkgs/tools/text/ocrmypdf/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/coloredlogs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

buildPythonPackage rec {
pname = "coloredlogs";
version = "10.0";
version = "14.0";

src = fetchFromGitHub {
owner = "xolox";
repo = "python-coloredlogs";
rev = version;
sha256 = "0rdvp4dfvzhx7z7s2jdl3fv7x1hazgpy5gc7bcf05bnbv2iia54a";
sha256 = "0rnmxwrim4razlv4vi3krxk5lc5ksck6h5374j8avqwplika7q2x";
};

# patch by risicle
27 changes: 5 additions & 22 deletions pkgs/tools/text/ocrmypdf/default.nix
View file
Original file line number Diff line number Diff line change
@@ -29,14 +29,14 @@ let
in
buildPythonApplication rec {
pname = "ocrmypdf";
version = "9.8.2";
version = "10.2.0";
disabled = ! python3Packages.isPy3k;

src = fetchFromGitHub {
owner = "jbarlow83";
repo = "OCRmyPDF";
rev = "v${version}";
sha256 = "0zff9gsbfaf72p8zbjamn6513czpr7papyh1jy0fz1z2a9h7ya0g";
sha256 = "1dkxhy3bjl48948jj2k6d684sd76xw1q427qc4hmxncr0wxj0ljp";
};

nativeBuildInputs = with python3Packages; [
@@ -49,8 +49,10 @@ buildPythonApplication rec {
propagatedBuildInputs = with python3Packages; [
cffi
chardet
coloredlogs
img2pdf
pdfminer
pluggy
pikepdf
pillow
reportlab
@@ -66,7 +68,7 @@ buildPythonApplication rec {
pytestcov
pytestrunner
python-xmp-toolkit
setuptools
pytestCheckHook
] ++ runtimeDeps;

patches = [
@@ -76,25 +78,6 @@ buildPythonApplication rec {
})
];

# The tests take potentially 20+ minutes, depending on machine
doCheck = false;

# These tests fail and it might be upstream problem... or packaging. :)
# development is happening on macos and the pinned test versions are
# significantly newer than nixpkgs has. Program still works...
# (to the extent I've used it) -- Kiwi
checkPhase = ''
export HOME=$TMPDIR
pytest -k 'not test_force_ocr_on_pdf_with_no_images \
and not test_tesseract_crash \
and not test_tesseract_crash_autorotate \
and not test_ghostscript_pdfa_failure \
and not test_gs_render_failure \
and not test_gs_raster_failure \
and not test_bad_utf8 \
and not test_old_unpaper'
'';

makeWrapperArgs = [ "--prefix PATH : ${stdenv.lib.makeBinPath [ ghostscript jbig2enc pngquant qpdf tesseract4 unpaper ]}" ];

meta = with stdenv.lib; {