Unverified Commit ce91260a authored by Robert Scott's avatar Robert Scott Committed by GitHub
Browse files

Merge pull request #219297 from dotlambda/tesseract5 

tesseract: 3.05.02 -> 5.3.0
parents 9e7d8bba da843ebb

pkgs/applications/misc/qt-box-editor/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
, qtsvg

, qmake

, leptonica

, tesseract

, tesseract4

}:



mkDerivation {
@@ -19,7 +19,7 @@ mkDerivation { 
    hash = "sha256-3dWnAu0CLO3atjbC1zJEnL3vzsIEecDDDhW3INMfCv4=";

  };



  buildInputs = [ qtbase qtsvg leptonica tesseract ];

  buildInputs = [ qtbase qtsvg leptonica tesseract4 ];



  nativeBuildInputs = [ qmake ];

pkgs/development/python-modules/tesserocr/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
, cython

, leptonica

, pkg-config

, tesseract

, tesseract4



# propagates

, pillow
@@ -36,7 +36,7 @@ buildPythonPackage rec { 


  buildInputs = [

    leptonica

    tesseract

    tesseract4

  ];



  propagatedBuildInputs = [

pkgs/tools/cd-dvd/vobsub2srt/default.nix

+2 −2
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, cmake, libtiff, pkg-config, tesseract }:

{ lib, stdenv, fetchFromGitHub, cmake, libtiff, pkg-config, tesseract3 }:



stdenv.mkDerivation rec {

  pname = "vobsub2srt";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec { 


  nativeBuildInputs = [ cmake pkg-config ];

  buildInputs = [ libtiff ];

  propagatedBuildInputs = [ tesseract ];

  propagatedBuildInputs = [ tesseract3 ];



  meta = {

    homepage = "https://github.com/ruediger/VobSub2SRT";

pkgs/tools/text/ripgrep-all/default.nix

+2 −2
Original line number Diff line number Diff line 
{ stdenv, lib, fetchFromGitHub, rustPlatform, makeWrapper, ffmpeg

, pandoc, poppler_utils, ripgrep, Security, imagemagick, tesseract

, pandoc, poppler_utils, ripgrep, Security, imagemagick, tesseract3

}:



rustPlatform.buildRustPackage rec {
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { 


  postInstall = ''

    wrapProgram $out/bin/rga \

      --prefix PATH ":" "${lib.makeBinPath [ ffmpeg pandoc poppler_utils ripgrep imagemagick tesseract ]}"

      --prefix PATH ":" "${lib.makeBinPath [ ffmpeg pandoc poppler_utils ripgrep imagemagick tesseract3 ]}"

  '';



  # Use upstream's example data to run a couple of queries to ensure the dependencies

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -33553,7 +33553,7 @@ with pkgs; 
    tesseract3

    tesseract4

    tesseract5;

  tesseract = tesseract3;

  tesseract = tesseract5;















  tetraproc = callPackage ../applications/audio/tetraproc { };