talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

poppler: 25.05.0 -> 25.07.0 (#424609)

Browse Source
This commit is contained in:
Vladimír Čunát 2025-08-08 13:17:04 +02:00
commit b069b7c1e2
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/graphics/inkscape/default.nix
View File

@ -97,6 +97,16 @@ stdenv.mkDerivation (finalAttrs: {
# Fix path to ps2pdf binary # Fix path to ps2pdf binary
inherit ghostscript; inherit ghostscript;
}) })
(fetchpatch {
name = "fix-build-poppler-25.06.0.patch";
url = "https://gitlab.com/inkscape/inkscape/-/commit/97bd8f29a61e691ceea98ca2444b974cf4256ae0.patch";
hash = "sha256-bYRd/KUh/7qFb7x0EuUgQYA9P8abcTf5XS67gzaAiXA=";
})
(fetchpatch {
name = "fix-build-poppler-25.07.0.patch";
url = "https://gitlab.com/inkscape/inkscape/-/commit/ce52c5f96106ae5747171663a46831f21aa52d95.patch";
hash = "sha256-3Yj+neSRSSQPeeZkHJ0P6v3Sis/lg9xiygktI6Z+zDY=";
})
]; ];
postPatch = '' postPatch = ''

10
pkgs/by-name/sc/scribus/package.nix
View File

@ -106,6 +106,16 @@ stdenv.mkDerivation (finalAttrs: {
url = "https://aur.archlinux.org/cgit/aur.git/plain/fix_build_with_poppler_25.02.0.patch?h=scribus-unstable"; url = "https://aur.archlinux.org/cgit/aur.git/plain/fix_build_with_poppler_25.02.0.patch?h=scribus-unstable";
hash = "sha256-t9xJA6KGMGAdUFyjI8OlTNilewyMr1FFM7vjHOM15Xg="; hash = "sha256-t9xJA6KGMGAdUFyjI8OlTNilewyMr1FFM7vjHOM15Xg=";
}) })
(fetchpatch {
name = "fix-build-poppler-25.06.0.patch";
url = "https://github.com/scribusproject/scribus/commit/8dcf8d777bd85a0741c455961f2de382e3ed47ec.patch";
hash = "sha256-JBHCgvEJnYrUdtLnFSXTfr1FFin4uUNUnddYwfRbn7k=";
})
(fetchpatch {
name = "fix-build-poppler-25.07.0.patch";
url = "https://github.com/scribusproject/scribus/commit/ff6c6abfa8683028e548a269dee6a859b6f63335.patch";
hash = "sha256-N4jve5feehsX5H0RXdxR4ableKL+c/rTyqCwkEf37Dk=";
})
]; ];
meta = { meta = {

8
pkgs/development/libraries/poppler/default.nix
View File

@ -55,13 +55,13 @@ let
domain = "gitlab.freedesktop.org"; domain = "gitlab.freedesktop.org";
owner = "poppler"; owner = "poppler";
repo = "test"; repo = "test";
rev = "91ee031c882634c36f2f0f2f14eb6646dd542fb9"; rev = "c79c6839e859dbee6b73ac260788fa2de8618ba4";
hash = "sha256-bImTdlhMAA79kwbKPrHN3a9vVrtsgBh3rFjH3B7tEbQ="; hash = "sha256-j66AsBUnFpO5athVgQmf4vcyXxYcJ/plJtHg+3vXG4Y=";
}; };
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "poppler-${suffix}"; pname = "poppler-${suffix}";
version = "25.05.0"; # beware: updates often break cups-filters build, check scribus too! version = "25.07.0"; # beware: updates often break cups-filters build, check scribus too!
outputs = [ outputs = [
"out" "out"
@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl { src = fetchurl {
url = "https://poppler.freedesktop.org/poppler-${finalAttrs.version}.tar.xz"; url = "https://poppler.freedesktop.org/poppler-${finalAttrs.version}.tar.xz";
hash = "sha256-mxYnxbdoFqxeQFKgP1tgW6QLRc8GsCyt0EeWILSZqzg="; hash = "sha256-xQSpBm29/r43etU87GQf2XHulsTh6Mp05snAPUbYF64=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [