Merge remote-tracking branch 'nixpkgs/master' into staging-next

Conflicts:
	pkgs/os-specific/linux/libfabric/default.nix
	pkgs/tools/filesystems/btrfs-progs/default.nix

2 files changed, 0 insertions, 102 deletions

diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix
deleted file mode 100644
index 4292c275a7f1a..0000000000000
--- a/pkgs/tools/text/ocrmypdf/default.nix
+++ /dev/null
@@ -1,89 +0,0 @@
-{ fetchFromGitHub
-, ghostscript
-, img2pdf
-, jbig2enc
-, leptonica
-, pngquant
-, python3
-, python3Packages
-, qpdf
-, lib
-, stdenv
-, tesseract4
-, unpaper
-, substituteAll
-}:
-let
-  inherit (python3Packages) buildPythonApplication;
-
-  runtimeDeps = with python3Packages; [
-    ghostscript
-    jbig2enc
-    leptonica
-    pngquant
-    qpdf
-    tesseract4
-    unpaper
-    pillow
-  ];
-
-in
-buildPythonApplication rec {
-  pname = "ocrmypdf";
-  version = "12.5.0";
-
-  src = fetchFromGitHub {
-    owner = "jbarlow83";
-    repo = "OCRmyPDF";
-    rev = "v${version}";
-    sha256 = "sha256-g80WedX+TGHE9EJ/RSgOc53PM17V3WZslUNaHoqKTo0=";
-  };
-
-  nativeBuildInputs = with python3Packages; [
-    setuptools
-    setuptools-scm-git-archive
-    setuptools-scm
-  ];
-
-  propagatedBuildInputs = with python3Packages; [
-    cffi
-    coloredlogs
-    img2pdf
-    importlib-resources
-    pdfminer
-    pluggy
-    pikepdf
-    pillow
-    reportlab
-    setuptools
-    tqdm
-  ];
-
-  checkInputs = with python3Packages; [
-    pypdf2
-    pytest
-    pytest-helpers-namespace
-    pytest-xdist
-    pytest-cov
-    python-xmp-toolkit
-    pytestCheckHook
-  ] ++ runtimeDeps;
-
-  patches = [
-    (substituteAll {
-      src = ./liblept.patch;
-      liblept = "${lib.getLib leptonica}/lib/liblept${stdenv.hostPlatform.extensions.sharedLibrary}";
-    })
-  ];
-
-  makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ghostscript jbig2enc pngquant qpdf tesseract4 unpaper ]}" ];
-
-  meta = with lib; {
-    homepage = "https://github.com/jbarlow83/OCRmyPDF";
-    description = "Adds an OCR text layer to scanned PDF files, allowing them to be searched";
-    license = with licenses; [ mpl20 mit ];
-    platforms = platforms.linux;
-    maintainers = [ maintainers.kiwi ];
-    changelog = "https://github.com/jbarlow83/OCRmyPDF/blob/v${version}/docs/release_notes.rst";
-  };
-}
diff --git a/pkgs/tools/text/ocrmypdf/liblept.patch b/pkgs/tools/text/ocrmypdf/liblept.patch
deleted file mode 100644
index ed413a8b37bdf..0000000000000
--- a/pkgs/tools/text/ocrmypdf/liblept.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/ocrmypdf/leptonica.py b/src/ocrmypdf/leptonica.py
-index 328b063..b993cc9 100644
---- a/src/ocrmypdf/leptonica.py
-+++ b/src/ocrmypdf/leptonica.py
-@@ -46,7 +46,7 @@ if os.name == 'nt':
-     os.environ['PATH'] = shim_paths_with_program_files()
- else:
-     libname = 'lept'
--_libpath = find_library(libname)
-+_libpath = '@liblept@'
- if not _libpath:
-     raise MissingDependencyError(
-         """