From 434feb801dfba0284b1b846573cd8291d2671551 Mon Sep 17 00:00:00 2001 From: liberodark Date: Tue, 28 Jan 2025 12:42:04 +0100 Subject: [PATCH] poppler: 24.02.0 -> 25.01.0 --- .../development/libraries/poppler/default.nix | 21 ++----------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 424dd1d6085972..1ebd41c07fe0dc 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -62,7 +62,7 @@ let in stdenv.mkDerivation (finalAttrs: rec { pname = "poppler-${suffix}"; - version = "24.02.0"; # beware: updates often break cups-filters build, check scribus too! + version = "25.01.0"; # beware: updates often break cups-filters build, check scribus too! outputs = [ "out" @@ -71,26 +71,9 @@ stdenv.mkDerivation (finalAttrs: rec { src = fetchurl { url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; - hash = "sha256-GRh6P90F8z59YExHmcGD3lygEYZAyIs3DdzzE2NDIi4="; + hash = "sha256-fu/BIiB7u9cqMDxeB0P0lB6K6GHiTc8FAeGM4dFBQRI="; }; - patches = [ - (fetchpatch { - # https://access.redhat.com/security/cve/CVE-2024-6239 - name = "CVE-2024-6239.patch"; - url = "https://gitlab.freedesktop.org/poppler/poppler/-/commit/0554731052d1a97745cb179ab0d45620589dd9c4.patch"; - hash = "sha256-I78wJ4l1DSh+x/e00ZL8uvrGdBH+ufp+EDm0A1XWyCU="; - }) - - (fetchpatch { - # fixes build on clang-19 - # https://gitlab.freedesktop.org/poppler/poppler/-/merge_requests/1526 - name = "char16_t-not-short.patch"; - url = "https://gitlab.freedesktop.org/poppler/poppler/-/commit/b4ac7d9af7cb5edfcfcbda035ed8b8c218ba8564.patch"; - hash = "sha256-2aEq3VDITJabvB/+bcdULBXbqVbDdL0xJr2TWLiWqX8="; - }) - ]; - nativeBuildInputs = [ cmake