diff --git a/nixos/modules/services/web-apps/mediagoblin.nix b/nixos/modules/services/web-apps/mediagoblin.nix index a6f2e5cdd0a3..9cf7d4dcb2ec 100644 --- a/nixos/modules/services/web-apps/mediagoblin.nix +++ b/nixos/modules/services/web-apps/mediagoblin.nix @@ -220,7 +220,8 @@ in ''; locations = { "/".proxyPass = "http://127.0.0.1:${toString cfg.paste.port}"; - "/mgoblin_static/".alias = "${finalPackage}/${finalPackage.python.sitePackages}/mediagoblin/static/"; + "/mgoblin_static/".alias = + "${finalPackage}/${finalPackage.python.sitePackages}/mediagoblin/static/"; "/mgoblin_media/".alias = "/var/lib/mediagoblin/user_dev/media/public/"; "/theme_static/".alias = "/var/lib/mediagoblin/user_dev/theme_static/"; "/plugin_static/".alias = "/var/lib/mediagoblin/user_dev/plugin_static/"; @@ -252,7 +253,7 @@ in ++ lib.optionals (cfg.settings.mediagoblin.plugins ? "mediagoblin.media_types.pdf") ( with pkgs; [ - poppler_utils + poppler-utils unoconv ] ); diff --git a/nixos/modules/services/web-apps/stirling-pdf.nix b/nixos/modules/services/web-apps/stirling-pdf.nix index d6ecc8ccb9c3..d3b847be5a76 100644 --- a/nixos/modules/services/web-apps/stirling-pdf.nix +++ b/nixos/modules/services/web-apps/stirling-pdf.nix @@ -57,7 +57,7 @@ in libreoffice qpdf ocrmypdf - poppler_utils + poppler-utils unoconv pngquant tesseract diff --git a/nixos/tests/cups-pdf.nix b/nixos/tests/cups-pdf.nix index 727bc85fc266..917c3d8d4a8c 100644 --- a/nixos/tests/cups-pdf.nix +++ b/nixos/tests/cups-pdf.nix @@ -7,7 +7,7 @@ import ./make-test-python.nix ( { pkgs, ... }: { imports = [ ./common/user-account.nix ]; - environment.systemPackages = [ pkgs.poppler_utils ]; + environment.systemPackages = [ pkgs.poppler-utils ]; fonts.packages = [ pkgs.dejavu_fonts ]; # yields more OCR-able pdf services.printing.cups-pdf.enable = true; services.printing.cups-pdf.instances = { diff --git a/pkgs/applications/graphics/seamly2d/default.nix b/pkgs/applications/graphics/seamly2d/default.nix index c2d76ee9be8a..beeb92b47ef1 100644 --- a/pkgs/applications/graphics/seamly2d/default.nix +++ b/pkgs/applications/graphics/seamly2d/default.nix @@ -5,7 +5,7 @@ wrapQtAppsHook, fetchFromGitHub, addDriverRunpath, - poppler_utils, + poppler-utils, qtxmlpatterns, qtsvg, libgbm, @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { git qtPython qtbase - poppler_utils + poppler-utils qtxmlpatterns qtsvg libgbm @@ -64,9 +64,9 @@ stdenv.mkDerivation rec { substituteInPlace src/app/translations.pri \ --replace '$$[QT_INSTALL_BINS]/$$LRELEASE' '${lib.getDev qttools}/bin/lrelease' substituteInPlace src/app/seamly2d/mainwindowsnogui.cpp \ - --replace 'define PDFTOPS "pdftops"' 'define PDFTOPS "${lib.getBin poppler_utils}/bin/pdftops"' + --replace 'define PDFTOPS "pdftops"' 'define PDFTOPS "${lib.getBin poppler-utils}/bin/pdftops"' substituteInPlace src/libs/vwidgets/export_format_combobox.cpp \ - --replace 'define PDFTOPS "pdftops"' 'define PDFTOPS "${lib.getBin poppler_utils}/bin/pdftops"' + --replace 'define PDFTOPS "pdftops"' 'define PDFTOPS "${lib.getBin poppler-utils}/bin/pdftops"' substituteInPlace src/app/seamlyme/mapplication.cpp \ --replace 'diagrams.rcc' '../share/diagrams.rcc' ''; diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index c5ad07c62530..bad287cc9153 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -28,7 +28,7 @@ perl, perlPackages, pkg-config, - poppler_utils, + poppler-utils, python3Packages, qtbase, qttools, @@ -57,7 +57,7 @@ let groff = groff; gunzip = gzip; iconv = libiconv; - pdftotext = poppler_utils; + pdftotext = poppler-utils; ps2ascii = ghostscript; sed = gnused; tar = gnutar; diff --git a/pkgs/by-name/bo/bookworm/package.nix b/pkgs/by-name/bo/bookworm/package.nix index 5f8345bd6ab7..d5a0c6a1ca33 100644 --- a/pkgs/by-name/bo/bookworm/package.nix +++ b/pkgs/by-name/bo/bookworm/package.nix @@ -18,7 +18,7 @@ pantheon, pkg-config, poppler, - poppler_utils, + poppler-utils, python3, sqlite, unar, @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { lib.makeBinPath [ unzip unar - poppler_utils + poppler-utils html2text coreutils curl diff --git a/pkgs/by-name/ca/calibre/package.nix b/pkgs/by-name/ca/calibre/package.nix index 69a5e3b7d0c9..d2a039618611 100644 --- a/pkgs/by-name/ca/calibre/package.nix +++ b/pkgs/by-name/ca/calibre/package.nix @@ -21,7 +21,7 @@ piper-tts, pkg-config, podofo, - poppler_utils, + poppler-utils, python3Packages, qt6, speechd-minimal, @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { libusb1 piper-tts podofo - poppler_utils + poppler-utils qt6.qtbase qt6.qtwayland sqlite @@ -149,8 +149,8 @@ stdenv.mkDerivation (finalAttrs: { runHook preInstall export HOME=$TMPDIR/fakehome - export POPPLER_INC_DIR=${poppler_utils.dev}/include/poppler - export POPPLER_LIB_DIR=${poppler_utils.out}/lib + export POPPLER_INC_DIR=${poppler-utils.dev}/include/poppler + export POPPLER_LIB_DIR=${poppler-utils.out}/lib export MAGICK_INC=${imagemagick.dev}/include/ImageMagick export MAGICK_LIB=${imagemagick.out}/lib export FC_INC_DIR=${fontconfig.dev}/include/fontconfig @@ -187,7 +187,7 @@ stdenv.mkDerivation (finalAttrs: { preFixup = let - popplerArgs = "--prefix PATH : ${poppler_utils.out}/bin"; + popplerArgs = "--prefix PATH : ${poppler-utils.out}/bin"; in '' for program in $out/bin/*; do diff --git a/pkgs/by-name/do/docfd/package.nix b/pkgs/by-name/do/docfd/package.nix index e4828191c0c6..07d247b8d65c 100644 --- a/pkgs/by-name/do/docfd/package.nix +++ b/pkgs/by-name/do/docfd/package.nix @@ -8,7 +8,7 @@ dune_3, makeWrapper, pandoc, - poppler_utils, + poppler-utils, testers, docfd, }: @@ -61,7 +61,7 @@ buildDunePackage' rec { wrapProgram $out/bin/docfd --prefix PATH : "${ lib.makeBinPath [ pandoc - poppler_utils + poppler-utils ] }" ''; diff --git a/pkgs/by-name/gs/gscan2pdf/package.nix b/pkgs/by-name/gs/gscan2pdf/package.nix index 9e1bba7bec9c..599bf6d44513 100644 --- a/pkgs/by-name/gs/gscan2pdf/package.nix +++ b/pkgs/by-name/gs/gscan2pdf/package.nix @@ -11,7 +11,7 @@ imagemagick, libtiff, djvulibre, - poppler_utils, + poppler-utils, ghostscript, unpaper, pdftk, @@ -98,7 +98,7 @@ perlPackages.buildPerlPackage rec { --prefix PATH : "${imagemagick}/bin" \ --prefix PATH : "${libtiff}/bin" \ --prefix PATH : "${djvulibre}/bin" \ - --prefix PATH : "${poppler_utils}/bin" \ + --prefix PATH : "${poppler-utils}/bin" \ --prefix PATH : "${ghostscript}/bin" \ --prefix PATH : "${unpaper}/bin" \ --prefix PATH : "${pdftk}/bin" @@ -118,7 +118,7 @@ perlPackages.buildPerlPackage rec { imagemagick libtiff djvulibre - poppler_utils + poppler-utils ghostscript unpaper pdftk diff --git a/pkgs/by-name/in/invoice2data/package.nix b/pkgs/by-name/in/invoice2data/package.nix index 3280b1fab236..e6871a503bba 100644 --- a/pkgs/by-name/in/invoice2data/package.nix +++ b/pkgs/by-name/in/invoice2data/package.nix @@ -4,7 +4,7 @@ fetchpatch, ghostscript, imagemagick, - poppler_utils, + poppler-utils, python3, tesseract5, }: @@ -50,7 +50,7 @@ python3.pkgs.buildPythonApplication rec { ghostscript imagemagick tesseract5 - poppler_utils + poppler-utils ]) ]; diff --git a/pkgs/by-name/li/libcupsfilters/package.nix b/pkgs/by-name/li/libcupsfilters/package.nix index 22d497f098dd..1db8215caaaa 100644 --- a/pkgs/by-name/li/libcupsfilters/package.nix +++ b/pkgs/by-name/li/libcupsfilters/package.nix @@ -15,7 +15,7 @@ mupdf, pkg-config, poppler, - poppler_utils, + poppler-utils, qpdf, stdenv, }: @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { libtiff mupdf poppler - poppler_utils + poppler-utils qpdf ]; configureFlags = [ diff --git a/pkgs/by-name/li/libppd/package.nix b/pkgs/by-name/li/libppd/package.nix index 1493e22d2c22..1284f0e0cf24 100644 --- a/pkgs/by-name/li/libppd/package.nix +++ b/pkgs/by-name/li/libppd/package.nix @@ -7,7 +7,7 @@ libz, mupdf, pkg-config, - poppler_utils, + poppler-utils, stdenv, }: @@ -37,9 +37,9 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-mutool-path=${mupdf}/bin/mutool" "--with-pdftops=pdftops" - "--with-pdftops-path=${poppler_utils}/bin/pdftops" + "--with-pdftops-path=${poppler-utils}/bin/pdftops" "--with-gs-path=${ghostscript}/bin/gs" - "--with-pdftocairo-path=${poppler_utils}/bin/pdftocairo" + "--with-pdftocairo-path=${poppler-utils}/bin/pdftocairo" ]; makeFlags = [ "CUPS_SERVERBIN=$(out)/lib/cups" diff --git a/pkgs/by-name/me/mediagoblin/package.nix b/pkgs/by-name/me/mediagoblin/package.nix index bf57c6916282..309b4abe50c5 100644 --- a/pkgs/by-name/me/mediagoblin/package.nix +++ b/pkgs/by-name/me/mediagoblin/package.nix @@ -4,7 +4,7 @@ fetchFromSourcehut, gobject-introspection, gst_all_1, - poppler_utils, + poppler-utils, python3, xorg, }: @@ -137,7 +137,7 @@ python.pkgs.buildPythonApplication rec { pytestCheckHook webtest - poppler_utils + poppler-utils ] ++ lib.flatten (lib.attrValues optional-dependencies); diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index 81f74f818f6a..72e2e6b9f935 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -17,7 +17,7 @@ qpdf, tesseract5, unpaper, - poppler_utils, + poppler-utils, liberation_ttf, xcbuild, pango, @@ -73,14 +73,14 @@ let qpdf tesseract5 unpaper - poppler_utils + poppler-utils ]; frontend = buildNpmPackage { pname = "paperless-ngx-frontend"; inherit version src; - nodejs = nodejs_20; # does not build with 22 + nodejs = nodejs_20; # does not build with 22 postPatch = '' cd src-ui diff --git a/pkgs/by-name/pd/pdf-sign/package.nix b/pkgs/by-name/pd/pdf-sign/package.nix index ffa038690dcd..b4b3db6027e4 100644 --- a/pkgs/by-name/pd/pdf-sign/package.nix +++ b/pkgs/by-name/pd/pdf-sign/package.nix @@ -6,7 +6,7 @@ python3, ghostscript, qpdf, - poppler_utils, + poppler-utils, makeBinaryWrapper, }: @@ -16,7 +16,7 @@ let binPath = lib.makeBinPath [ ghostscript qpdf - poppler_utils + poppler-utils ]; in stdenv.mkDerivation { diff --git a/pkgs/by-name/pd/pdfsandwich/package.nix b/pkgs/by-name/pd/pdfsandwich/package.nix index 4568767b200d..7a03b5df7ff9 100644 --- a/pkgs/by-name/pd/pdfsandwich/package.nix +++ b/pkgs/by-name/pd/pdfsandwich/package.nix @@ -7,7 +7,7 @@ ghostscript, imagemagick, perl, - poppler_utils, + poppler-utils, tesseract, unpaper, }: @@ -36,7 +36,7 @@ stdenv.mkDerivation { lib.makeBinPath [ imagemagick ghostscript - poppler_utils + poppler-utils unpaper tesseract ] diff --git a/pkgs/by-name/si/sile/package.nix b/pkgs/by-name/si/sile/package.nix index b2b1d7a27871..cfffab29a406 100644 --- a/pkgs/by-name/si/sile/package.nix +++ b/pkgs/by-name/si/sile/package.nix @@ -24,7 +24,7 @@ # passthru.tests runCommand, - poppler_utils, + poppler-utils, }: stdenv.mkDerivation (finalAttrs: { @@ -157,7 +157,7 @@ stdenv.mkDerivation (finalAttrs: { runCommand "${finalAttrs.pname}-test" { nativeBuildInputs = [ - poppler_utils + poppler-utils finalAttrs.finalPackage ]; inherit (finalAttrs) FONTCONFIG_FILE; diff --git a/pkgs/by-name/sp/spamassassin/package.nix b/pkgs/by-name/sp/spamassassin/package.nix index 790980da2075..e4f44f650320 100644 --- a/pkgs/by-name/sp/spamassassin/package.nix +++ b/pkgs/by-name/sp/spamassassin/package.nix @@ -10,7 +10,7 @@ libxcrypt, openssl, coreutils, - poppler_utils, + poppler-utils, tesseract, iana-etc, }: @@ -80,7 +80,7 @@ perlPackages.buildPerlPackage rec { ]) ++ [ coreutils # date, t/basic_meta.t - poppler_utils # pdftotext, t/extracttext.t + poppler-utils # pdftotext, t/extracttext.t tesseract # tesseract, t/extracttext.t iana-etc # t/dnsbl_subtests.t (/etc/protocols used by Net::DNS::Nameserver) re2c diff --git a/pkgs/by-name/ya/yazi/package.nix b/pkgs/by-name/ya/yazi/package.nix index fbf4e408a6fe..de7be8884cc6 100644 --- a/pkgs/by-name/ya/yazi/package.nix +++ b/pkgs/by-name/ya/yazi/package.nix @@ -7,7 +7,7 @@ extraPackages ? [ ], optionalDeps ? [ jq - poppler_utils + poppler-utils _7zz ffmpeg fd @@ -24,7 +24,7 @@ # optional deps jq, - poppler_utils, + poppler-utils, _7zz, ffmpeg, fd, diff --git a/pkgs/development/python-modules/django-filingcabinet/default.nix b/pkgs/development/python-modules/django-filingcabinet/default.nix index a0e10637956b..f2bb49b0d4e8 100644 --- a/pkgs/development/python-modules/django-filingcabinet/default.nix +++ b/pkgs/development/python-modules/django-filingcabinet/default.nix @@ -25,7 +25,7 @@ camelot, pytesseract, pytest-factoryboy, - poppler_utils, + poppler-utils, pytest-playwright, playwright-driver, pnpm_9, @@ -99,7 +99,7 @@ buildPythonPackage rec { ''; nativeCheckInputs = [ - poppler_utils + poppler-utils pytest-django pytest-factoryboy pytest-playwright diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix index 913e8a913acc..f65c4b334a40 100644 --- a/pkgs/development/python-modules/img2pdf/default.nix +++ b/pkgs/development/python-modules/img2pdf/default.nix @@ -16,7 +16,7 @@ mupdf-headless, netpbm, numpy, - poppler_utils, + poppler-utils, pytestCheckHook, runCommand, scipy, @@ -75,7 +75,7 @@ buildPythonPackage rec { mupdf-headless netpbm numpy - poppler_utils + poppler-utils pytestCheckHook scipy ]; diff --git a/pkgs/development/python-modules/pdf2image/default.nix b/pkgs/development/python-modules/pdf2image/default.nix index b7f3f6e197f3..150682c9d3da 100644 --- a/pkgs/development/python-modules/pdf2image/default.nix +++ b/pkgs/development/python-modules/pdf2image/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchPypi, pillow, - poppler_utils, + poppler-utils, pythonOlder, }: @@ -20,10 +20,10 @@ buildPythonPackage rec { }; postPatch = '' - # replace all default values of paths to poppler_utils + # replace all default values of paths to poppler-utils substituteInPlace pdf2image/pdf2image.py \ --replace-fail 'poppler_path: Union[str, PurePath] = None' \ - 'poppler_path: Union[str, PurePath] = "${poppler_utils}/bin"' + 'poppler_path: Union[str, PurePath] = "${poppler-utils}/bin"' ''; propagatedBuildInputs = [ pillow ]; diff --git a/pkgs/development/python-modules/pnglatex/default.nix b/pkgs/development/python-modules/pnglatex/default.nix index a46359bf76e5..5f8bed5f0dbe 100644 --- a/pkgs/development/python-modules/pnglatex/default.nix +++ b/pkgs/development/python-modules/pnglatex/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchPypi, - poppler_utils, + poppler-utils, netpbm, }: @@ -18,7 +18,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - poppler_utils + poppler-utils netpbm ]; diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index ec10c8af68c6..a5468f00fecc 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -24,7 +24,7 @@ perl, pkg-config, poppler, - poppler_utils, + poppler-utils, qpdf, stdenv, which, diff --git a/pkgs/tools/misc/anystyle-cli/default.nix b/pkgs/tools/misc/anystyle-cli/default.nix index 19379ae96ffe..f23bb9549fda 100644 --- a/pkgs/tools/misc/anystyle-cli/default.nix +++ b/pkgs/tools/misc/anystyle-cli/default.nix @@ -3,7 +3,7 @@ buildRubyGem, bundlerEnv, ruby, - poppler_utils, + poppler-utils, }: let deps = bundlerEnv rec { @@ -31,7 +31,7 @@ buildRubyGem rec { propagatedBuildInputs = [ deps ]; preFixup = '' - wrapProgram $out/bin/anystyle --prefix PATH : ${poppler_utils}/bin + wrapProgram $out/bin/anystyle --prefix PATH : ${poppler-utils}/bin ''; meta = with lib; { diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index b11f637d104f..59208a5ade7a 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -57,7 +57,7 @@ pdftk, perl, pgpdump, - poppler_utils, + poppler-utils, procyon, python3, qemu, @@ -232,7 +232,7 @@ python.pkgs.buildPythonApplication rec { openssh pdftk perl - poppler_utils + poppler-utils procyon qemu R diff --git a/pkgs/tools/text/ripgrep-all/default.nix b/pkgs/tools/text/ripgrep-all/default.nix index 96473dab41ea..fcc5d343c8d0 100644 --- a/pkgs/tools/text/ripgrep-all/default.nix +++ b/pkgs/tools/text/ripgrep-all/default.nix @@ -6,7 +6,7 @@ makeWrapper, ffmpeg, pandoc, - poppler_utils, + poppler-utils, ripgrep, Security, zip, @@ -17,7 +17,7 @@ let path = [ ffmpeg pandoc - poppler_utils + poppler-utils ripgrep zip fzf @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ makeWrapper - poppler_utils + poppler-utils ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f09f526d513f..a87e209b837d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1214,6 +1214,7 @@ mapAliases { PlistCpp = plistcpp; # Added 2024-01-05 pocket-updater-utility = pupdate; # Added 2024-01-25 + poppler_utils = poppler-utils; # Added 2025-02-27 powerline-rs = throw "'powerline-rs' has been removed due to lack of upstream maintenance"; # Added 2025-01-26 prismlauncher-qt5 = throw "'prismlauncher-qt5' has been removed from nixpkgs. Please use 'prismlauncher'"; # Added 2024-04-20 prismlauncher-qt5-unwrapped = throw "'prismlauncher-qt5-unwrapped' has been removed from nixpkgs. Please use 'prismlauncher-unwrapped'"; # Added 2024-04-20 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6262d930dfb4..4fdb189925f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10198,7 +10198,7 @@ with pkgs; suffix = "min"; }; - poppler_utils = poppler.override { + poppler-utils = poppler.override { suffix = "utils"; utils = true; };