movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 03:23:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

poppler-utils: rename from poppler_utils

Browse source
This commit is contained in:
Aaron Jheng 2025-02-27 16:43:46 +08:00
parent 204bd937e2
commit a2f3625d99
No known key found for this signature in database
GPG key ID: F6A547A869D050A3
29 changed files with 64 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

5
nixos/modules/services/web-apps/mediagoblin.nix
View file

@ -220,7 +220,8 @@ in
''; '';
locations = { locations = {
"/".proxyPass = "http://127.0.0.1:${toString cfg.paste.port}"; "/".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/"; "/mgoblin_media/".alias = "/var/lib/mediagoblin/user_dev/media/public/";
"/theme_static/".alias = "/var/lib/mediagoblin/user_dev/theme_static/"; "/theme_static/".alias = "/var/lib/mediagoblin/user_dev/theme_static/";
"/plugin_static/".alias = "/var/lib/mediagoblin/user_dev/plugin_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") ( ++ lib.optionals (cfg.settings.mediagoblin.plugins ? "mediagoblin.media_types.pdf") (
with pkgs; with pkgs;
[ [
poppler_utils poppler-utils
unoconv unoconv
] ]
); );

2
nixos/modules/services/web-apps/stirling-pdf.nix
View file

@ -57,7 +57,7 @@ in
libreoffice libreoffice
qpdf qpdf
ocrmypdf ocrmypdf
poppler_utils poppler-utils
unoconv unoconv
pngquant pngquant
tesseract tesseract

2
nixos/tests/cups-pdf.nix
View file

@ -7,7 +7,7 @@ import ./make-test-python.nix (
{ pkgs, ... }: { pkgs, ... }:
{ {
imports = [ ./common/user-account.nix ]; 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 fonts.packages = [ pkgs.dejavu_fonts ]; # yields more OCR-able pdf
services.printing.cups-pdf.enable = true; services.printing.cups-pdf.enable = true;
services.printing.cups-pdf.instances = { services.printing.cups-pdf.instances = {

8
pkgs/applications/graphics/seamly2d/default.nix
View file

@ -5,7 +5,7 @@
wrapQtAppsHook, wrapQtAppsHook,
fetchFromGitHub, fetchFromGitHub,
addDriverRunpath, addDriverRunpath,
poppler_utils, poppler-utils,
qtxmlpatterns, qtxmlpatterns,
qtsvg, qtsvg,
libgbm, libgbm,
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
git git
qtPython qtPython
qtbase qtbase
poppler_utils poppler-utils
qtxmlpatterns qtxmlpatterns
qtsvg qtsvg
libgbm libgbm
@ -64,9 +64,9 @@ stdenv.mkDerivation rec {
substituteInPlace src/app/translations.pri \ substituteInPlace src/app/translations.pri \
--replace '$$[QT_INSTALL_BINS]/$$LRELEASE' '${lib.getDev qttools}/bin/lrelease' --replace '$$[QT_INSTALL_BINS]/$$LRELEASE' '${lib.getDev qttools}/bin/lrelease'
substituteInPlace src/app/seamly2d/mainwindowsnogui.cpp \ 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 \ 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 \ substituteInPlace src/app/seamlyme/mapplication.cpp \
--replace 'diagrams.rcc' '../share/diagrams.rcc' --replace 'diagrams.rcc' '../share/diagrams.rcc'
''; '';

4
pkgs/applications/search/recoll/default.nix
View file

@ -28,7 +28,7 @@
perl, perl,
perlPackages, perlPackages,
pkg-config, pkg-config,
poppler_utils, poppler-utils,
python3Packages, python3Packages,
qtbase, qtbase,
qttools, qttools,
@ -57,7 +57,7 @@ let
groff = groff; groff = groff;
gunzip = gzip; gunzip = gzip;
iconv = libiconv; iconv = libiconv;
pdftotext = poppler_utils; pdftotext = poppler-utils;
ps2ascii = ghostscript; ps2ascii = ghostscript;
sed = gnused; sed = gnused;
tar = gnutar; tar = gnutar;

4
pkgs/by-name/bo/bookworm/package.nix
View file

@ -18,7 +18,7 @@
pantheon, pantheon,
pkg-config, pkg-config,
poppler, poppler,
poppler_utils, poppler-utils,
python3, python3,
sqlite, sqlite,
unar, unar,
@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
lib.makeBinPath [ lib.makeBinPath [
unzip unzip
unar unar
poppler_utils poppler-utils
html2text html2text
coreutils coreutils
curl curl

10
pkgs/by-name/ca/calibre/package.nix
View file

@ -21,7 +21,7 @@
piper-tts, piper-tts,
pkg-config, pkg-config,
podofo, podofo,
poppler_utils, poppler-utils,
python3Packages, python3Packages,
qt6, qt6,
speechd-minimal, speechd-minimal,
@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
libusb1 libusb1
piper-tts piper-tts
podofo podofo
poppler_utils poppler-utils
qt6.qtbase qt6.qtbase
qt6.qtwayland qt6.qtwayland
sqlite sqlite
@ -149,8 +149,8 @@ stdenv.mkDerivation (finalAttrs: {
runHook preInstall runHook preInstall
export HOME=$TMPDIR/fakehome export HOME=$TMPDIR/fakehome
export POPPLER_INC_DIR=${poppler_utils.dev}/include/poppler export POPPLER_INC_DIR=${poppler-utils.dev}/include/poppler
export POPPLER_LIB_DIR=${poppler_utils.out}/lib export POPPLER_LIB_DIR=${poppler-utils.out}/lib
export MAGICK_INC=${imagemagick.dev}/include/ImageMagick export MAGICK_INC=${imagemagick.dev}/include/ImageMagick
export MAGICK_LIB=${imagemagick.out}/lib export MAGICK_LIB=${imagemagick.out}/lib
export FC_INC_DIR=${fontconfig.dev}/include/fontconfig export FC_INC_DIR=${fontconfig.dev}/include/fontconfig
@ -187,7 +187,7 @@ stdenv.mkDerivation (finalAttrs: {
preFixup = preFixup =
let let
popplerArgs = "--prefix PATH : ${poppler_utils.out}/bin"; popplerArgs = "--prefix PATH : ${poppler-utils.out}/bin";
in in
'' ''
for program in $out/bin/*; do for program in $out/bin/*; do

4
pkgs/by-name/do/docfd/package.nix
View file

@ -8,7 +8,7 @@
dune_3, dune_3,
makeWrapper, makeWrapper,
pandoc, pandoc,
poppler_utils, poppler-utils,
testers, testers,
docfd, docfd,
}: }:
@ -61,7 +61,7 @@ buildDunePackage' rec {
wrapProgram $out/bin/docfd --prefix PATH : "${ wrapProgram $out/bin/docfd --prefix PATH : "${
lib.makeBinPath [ lib.makeBinPath [
pandoc pandoc
poppler_utils poppler-utils
] ]
}" }"
''; '';

6
pkgs/by-name/gs/gscan2pdf/package.nix
View file

@ -11,7 +11,7 @@
imagemagick, imagemagick,
libtiff, libtiff,
djvulibre, djvulibre,
poppler_utils, poppler-utils,
ghostscript, ghostscript,
unpaper, unpaper,
pdftk, pdftk,
@ -98,7 +98,7 @@ perlPackages.buildPerlPackage rec {
--prefix PATH : "${imagemagick}/bin" \ --prefix PATH : "${imagemagick}/bin" \
--prefix PATH : "${libtiff}/bin" \ --prefix PATH : "${libtiff}/bin" \
--prefix PATH : "${djvulibre}/bin" \ --prefix PATH : "${djvulibre}/bin" \
--prefix PATH : "${poppler_utils}/bin" \ --prefix PATH : "${poppler-utils}/bin" \
--prefix PATH : "${ghostscript}/bin" \ --prefix PATH : "${ghostscript}/bin" \
--prefix PATH : "${unpaper}/bin" \ --prefix PATH : "${unpaper}/bin" \
--prefix PATH : "${pdftk}/bin" --prefix PATH : "${pdftk}/bin"
@ -118,7 +118,7 @@ perlPackages.buildPerlPackage rec {
imagemagick imagemagick
libtiff libtiff
djvulibre djvulibre
poppler_utils poppler-utils
ghostscript ghostscript
unpaper unpaper
pdftk pdftk

4
pkgs/by-name/in/invoice2data/package.nix
View file

@ -4,7 +4,7 @@
fetchpatch, fetchpatch,
ghostscript, ghostscript,
imagemagick, imagemagick,
poppler_utils, poppler-utils,
python3, python3,
tesseract5, tesseract5,
}: }:
@ -50,7 +50,7 @@ python3.pkgs.buildPythonApplication rec {
ghostscript ghostscript
imagemagick imagemagick
tesseract5 tesseract5
poppler_utils poppler-utils
]) ])
]; ];

4
pkgs/by-name/li/libcupsfilters/package.nix
View file

@ -15,7 +15,7 @@
mupdf, mupdf,
pkg-config, pkg-config,
poppler, poppler,
poppler_utils, poppler-utils,
qpdf, qpdf,
stdenv, stdenv,
}: }:
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
libtiff libtiff
mupdf mupdf
poppler poppler
poppler_utils poppler-utils
qpdf qpdf
]; ];
configureFlags = [ configureFlags = [

6
pkgs/by-name/li/libppd/package.nix
View file

@ -7,7 +7,7 @@
libz, libz,
mupdf, mupdf,
pkg-config, pkg-config,
poppler_utils, poppler-utils,
stdenv, stdenv,
}: }:
@ -37,9 +37,9 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--with-mutool-path=${mupdf}/bin/mutool" "--with-mutool-path=${mupdf}/bin/mutool"
"--with-pdftops=pdftops" "--with-pdftops=pdftops"
"--with-pdftops-path=${poppler_utils}/bin/pdftops" "--with-pdftops-path=${poppler-utils}/bin/pdftops"
"--with-gs-path=${ghostscript}/bin/gs" "--with-gs-path=${ghostscript}/bin/gs"
"--with-pdftocairo-path=${poppler_utils}/bin/pdftocairo" "--with-pdftocairo-path=${poppler-utils}/bin/pdftocairo"
]; ];
makeFlags = [ makeFlags = [
"CUPS_SERVERBIN=$(out)/lib/cups" "CUPS_SERVERBIN=$(out)/lib/cups"

4
pkgs/by-name/me/mediagoblin/package.nix
View file

@ -4,7 +4,7 @@
fetchFromSourcehut, fetchFromSourcehut,
gobject-introspection, gobject-introspection,
gst_all_1, gst_all_1,
poppler_utils, poppler-utils,
python3, python3,
xorg, xorg,
}: }:
@ -137,7 +137,7 @@ python.pkgs.buildPythonApplication rec {
pytestCheckHook pytestCheckHook
webtest webtest
poppler_utils poppler-utils
] ]
++ lib.flatten (lib.attrValues optional-dependencies); ++ lib.flatten (lib.attrValues optional-dependencies);

6
pkgs/by-name/pa/paperless-ngx/package.nix
View file

@ -17,7 +17,7 @@
qpdf, qpdf,
tesseract5, tesseract5,
unpaper, unpaper,
poppler_utils, poppler-utils,
liberation_ttf, liberation_ttf,
xcbuild, xcbuild,
pango, pango,
@ -73,14 +73,14 @@ let
qpdf qpdf
tesseract5 tesseract5
unpaper unpaper
poppler_utils poppler-utils
]; ];
frontend = buildNpmPackage { frontend = buildNpmPackage {
pname = "paperless-ngx-frontend"; pname = "paperless-ngx-frontend";
inherit version src; inherit version src;
nodejs = nodejs_20; # does not build with 22 nodejs = nodejs_20; # does not build with 22
postPatch = '' postPatch = ''
cd src-ui cd src-ui

4
pkgs/by-name/pd/pdf-sign/package.nix
View file

@ -6,7 +6,7 @@
python3, python3,
ghostscript, ghostscript,
qpdf, qpdf,
poppler_utils, poppler-utils,
makeBinaryWrapper, makeBinaryWrapper,
}: }:
@ -16,7 +16,7 @@ let
binPath = lib.makeBinPath [ binPath = lib.makeBinPath [
ghostscript ghostscript
qpdf qpdf
poppler_utils poppler-utils
]; ];
in in
stdenv.mkDerivation { stdenv.mkDerivation {

4
pkgs/by-name/pd/pdfsandwich/package.nix
View file

@ -7,7 +7,7 @@
ghostscript, ghostscript,
imagemagick, imagemagick,
perl, perl,
poppler_utils, poppler-utils,
tesseract, tesseract,
unpaper, unpaper,
}: }:
@ -36,7 +36,7 @@ stdenv.mkDerivation {
lib.makeBinPath [ lib.makeBinPath [
imagemagick imagemagick
ghostscript ghostscript
poppler_utils poppler-utils
unpaper unpaper
tesseract tesseract
] ]

4
pkgs/by-name/si/sile/package.nix
View file

@ -24,7 +24,7 @@
# passthru.tests # passthru.tests
runCommand, runCommand,
poppler_utils, poppler-utils,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
@ -157,7 +157,7 @@ stdenv.mkDerivation (finalAttrs: {
runCommand "${finalAttrs.pname}-test" runCommand "${finalAttrs.pname}-test"
{ {
nativeBuildInputs = [ nativeBuildInputs = [
poppler_utils poppler-utils
finalAttrs.finalPackage finalAttrs.finalPackage
]; ];
inherit (finalAttrs) FONTCONFIG_FILE; inherit (finalAttrs) FONTCONFIG_FILE;

4
pkgs/by-name/sp/spamassassin/package.nix
View file

@ -10,7 +10,7 @@
libxcrypt, libxcrypt,
openssl, openssl,
coreutils, coreutils,
poppler_utils, poppler-utils,
tesseract, tesseract,
iana-etc, iana-etc,
}: }:
@ -80,7 +80,7 @@ perlPackages.buildPerlPackage rec {
]) ])
++ [ ++ [
coreutils # date, t/basic_meta.t coreutils # date, t/basic_meta.t
poppler_utils # pdftotext, t/extracttext.t poppler-utils # pdftotext, t/extracttext.t
tesseract # tesseract, t/extracttext.t tesseract # tesseract, t/extracttext.t
iana-etc # t/dnsbl_subtests.t (/etc/protocols used by Net::DNS::Nameserver) iana-etc # t/dnsbl_subtests.t (/etc/protocols used by Net::DNS::Nameserver)
re2c re2c

4
pkgs/by-name/ya/yazi/package.nix
View file

@ -7,7 +7,7 @@
extraPackages ? [ ], extraPackages ? [ ],
optionalDeps ? [ optionalDeps ? [
jq jq
poppler_utils poppler-utils
_7zz _7zz
ffmpeg ffmpeg
fd fd
@ -24,7 +24,7 @@
# optional deps # optional deps
jq, jq,
poppler_utils, poppler-utils,
_7zz, _7zz,
ffmpeg, ffmpeg,
fd, fd,

4
pkgs/development/python-modules/django-filingcabinet/default.nix
View file

@ -25,7 +25,7 @@
camelot, camelot,
pytesseract, pytesseract,
pytest-factoryboy, pytest-factoryboy,
poppler_utils, poppler-utils,
pytest-playwright, pytest-playwright,
playwright-driver, playwright-driver,
pnpm_9, pnpm_9,
@ -99,7 +99,7 @@ buildPythonPackage rec {
''; '';
nativeCheckInputs = [ nativeCheckInputs = [
poppler_utils poppler-utils
pytest-django pytest-django
pytest-factoryboy pytest-factoryboy
pytest-playwright pytest-playwright

4
pkgs/development/python-modules/img2pdf/default.nix
View file

@ -16,7 +16,7 @@
mupdf-headless, mupdf-headless,
netpbm, netpbm,
numpy, numpy,
poppler_utils, poppler-utils,
pytestCheckHook, pytestCheckHook,
runCommand, runCommand,
scipy, scipy,
@ -75,7 +75,7 @@ buildPythonPackage rec {
mupdf-headless mupdf-headless
netpbm netpbm
numpy numpy
poppler_utils poppler-utils
pytestCheckHook pytestCheckHook
scipy scipy
]; ];

6
pkgs/development/python-modules/pdf2image/default.nix
View file

@ -3,7 +3,7 @@
buildPythonPackage, buildPythonPackage,
fetchPypi, fetchPypi,
pillow, pillow,
poppler_utils, poppler-utils,
pythonOlder, pythonOlder,
}: }:
@ -20,10 +20,10 @@ buildPythonPackage rec {
}; };
postPatch = '' postPatch = ''
# replace all default values of paths to poppler_utils # replace all default values of paths to poppler-utils
substituteInPlace pdf2image/pdf2image.py \ substituteInPlace pdf2image/pdf2image.py \
--replace-fail 'poppler_path: Union[str, PurePath] = None' \ --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 ]; propagatedBuildInputs = [ pillow ];

4
pkgs/development/python-modules/pnglatex/default.nix
View file

@ -2,7 +2,7 @@
lib, lib,
buildPythonPackage, buildPythonPackage,
fetchPypi, fetchPypi,
poppler_utils, poppler-utils,
netpbm, netpbm,
}: }:
@ -18,7 +18,7 @@ buildPythonPackage rec {
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
poppler_utils poppler-utils
netpbm netpbm
]; ];

2
pkgs/misc/cups/filters.nix
View file

@ -24,7 +24,7 @@
perl, perl,
pkg-config, pkg-config,
poppler, poppler,
poppler_utils, poppler-utils,
qpdf, qpdf,
stdenv, stdenv,
which, which,

4
pkgs/tools/misc/anystyle-cli/default.nix
View file

@ -3,7 +3,7 @@
buildRubyGem, buildRubyGem,
bundlerEnv, bundlerEnv,
ruby, ruby,
poppler_utils, poppler-utils,
}: }:
let let
deps = bundlerEnv rec { deps = bundlerEnv rec {
@ -31,7 +31,7 @@ buildRubyGem rec {
propagatedBuildInputs = [ deps ]; propagatedBuildInputs = [ deps ];
preFixup = '' preFixup = ''
wrapProgram $out/bin/anystyle --prefix PATH : ${poppler_utils}/bin wrapProgram $out/bin/anystyle --prefix PATH : ${poppler-utils}/bin
''; '';
meta = with lib; { meta = with lib; {

4
pkgs/tools/misc/diffoscope/default.nix
View file

@ -57,7 +57,7 @@
pdftk, pdftk,
perl, perl,
pgpdump, pgpdump,
poppler_utils, poppler-utils,
procyon, procyon,
python3, python3,
qemu, qemu,
@ -232,7 +232,7 @@ python.pkgs.buildPythonApplication rec {
openssh openssh
pdftk pdftk
perl perl
poppler_utils poppler-utils
procyon procyon
qemu qemu
R R

6
pkgs/tools/text/ripgrep-all/default.nix
View file

@ -6,7 +6,7 @@
makeWrapper, makeWrapper,
ffmpeg, ffmpeg,
pandoc, pandoc,
poppler_utils, poppler-utils,
ripgrep, ripgrep,
Security, Security,
zip, zip,
@ -17,7 +17,7 @@ let
path = [ path = [
ffmpeg ffmpeg
pandoc pandoc
poppler_utils poppler-utils
ripgrep ripgrep
zip zip
fzf fzf
@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ nativeBuildInputs = [
makeWrapper makeWrapper
poppler_utils poppler-utils
]; ];
buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security;

1
pkgs/top-level/aliases.nix
View file

@ -1214,6 +1214,7 @@ mapAliases {
PlistCpp = plistcpp; # Added 2024-01-05 PlistCpp = plistcpp; # Added 2024-01-05
pocket-updater-utility = pupdate; # Added 2024-01-25 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 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 = 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 prismlauncher-qt5-unwrapped = throw "'prismlauncher-qt5-unwrapped' has been removed from nixpkgs. Please use 'prismlauncher-unwrapped'"; # Added 2024-04-20

2
pkgs/top-level/all-packages.nix
View file

@ -10198,7 +10198,7 @@ with pkgs;
suffix = "min"; suffix = "min";
}; };
poppler_utils = poppler.override { poppler-utils = poppler.override {
suffix = "utils"; suffix = "utils";
utils = true; utils = true;
}; };