From 27239792dd4bb2f931210db8d96b2bb802e9bf9f Mon Sep 17 00:00:00 2001 From: kuflierl <41301536+kuflierl@users.noreply.github.com> Date: Fri, 8 May 2026 16:07:22 +0200 Subject: [PATCH 1/4] podofo_0_9: drop, podofo_0_10 -> podofo0, podofo_1_0 -> podofo --- .../po/{podofo_1_0 => podofo}/package.nix | 0 .../po/{podofo_0_10 => podofo0}/package.nix | 0 pkgs/by-name/po/podofo_0_9/package.nix | 82 ------------------- pkgs/top-level/aliases.nix | 5 +- pkgs/top-level/all-packages.nix | 2 - 5 files changed, 4 insertions(+), 85 deletions(-) rename pkgs/by-name/po/{podofo_1_0 => podofo}/package.nix (100%) rename pkgs/by-name/po/{podofo_0_10 => podofo0}/package.nix (100%) delete mode 100644 pkgs/by-name/po/podofo_0_9/package.nix diff --git a/pkgs/by-name/po/podofo_1_0/package.nix b/pkgs/by-name/po/podofo/package.nix similarity index 100% rename from pkgs/by-name/po/podofo_1_0/package.nix rename to pkgs/by-name/po/podofo/package.nix diff --git a/pkgs/by-name/po/podofo_0_10/package.nix b/pkgs/by-name/po/podofo0/package.nix similarity index 100% rename from pkgs/by-name/po/podofo_0_10/package.nix rename to pkgs/by-name/po/podofo0/package.nix diff --git a/pkgs/by-name/po/podofo_0_9/package.nix b/pkgs/by-name/po/podofo_0_9/package.nix deleted file mode 100644 index 5131b6138d74..000000000000 --- a/pkgs/by-name/po/podofo_0_9/package.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - zlib, - freetype, - libjpeg, - libtiff, - fontconfig, - openssl, - libpng, - lua5, - pkg-config, - libidn, -}: - -stdenv.mkDerivation (finalAttrs: { - version = "0.9.8"; - pname = "podofo"; - - src = fetchFromGitHub { - owner = "podofo"; - repo = "podofo"; - rev = finalAttrs.version; - hash = "sha256-VGsACeCC8xKC1n/ackT576ZU3ZR1LAw8H0l/Q9cH27s="; - }; - - outputs = [ - "out" - "dev" - "lib" - ]; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - zlib - freetype - libjpeg - libtiff - fontconfig - openssl - libpng - libidn - lua5 - ]; - - cmakeFlags = [ - "-DPODOFO_BUILD_SHARED=ON" - "-DPODOFO_BUILD_STATIC=OFF" - "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" - ]; - - postPatch = '' - # Use GNU directories to fix multiple outputs - failNoMatches='t yes; b no; :yes h; :no p; $ {x; /./{x;q}; q1}' - sed -ni src/podofo/CMakeLists.txt \ - -e 's/LIBDIRNAME/CMAKE_INSTALL_LIBDIR/' -e "$failNoMatches" - sed -ni src/podofo/libpodofo.pc.in \ - -e 's/^libdir=.*/libdir=@CMAKE_INSTALL_LIBDIR@/' -e "$failNoMatches" - - substituteInPlace {src/podofo/,./}CMakeLists.txt \ - --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)" - ''; - - meta = { - homepage = "https://podofo.sourceforge.net"; - description = "Library to work with the PDF file format"; - platforms = lib.platforms.all; - license = with lib.licenses; [ - gpl2Plus - lgpl2Plus - ]; - maintainers = with lib.maintainers; [ - kuflierl - ]; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 332b66fac6ea..1bfe6678c5e9 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1695,7 +1695,10 @@ mapAliases { pn = throw "'pn' has been removed as upstream was archived in 2020"; # Added 2025-10-17 poac = throw "'poac' has been renamed to/replaced by 'cabinpkg'"; # Converted to throw 2025-10-27 pocket-updater-utility = throw "'pocket-updater-utility' has been renamed to/replaced by 'pupdate'"; # Converted to throw 2025-10-27 - podofo010 = throw "'podofo010' has been renamed to/replaced by 'podofo_0_10'"; # Converted to throw 2025-10-27 + podofo010 = throw "'podofo010' has been renamed to 'podofo0'"; # Converted to throw 2025-10-27 + podofo_0_9 = throw "'podofo_0_9' has been deprecated, it may be replaced by 'podofo0'"; # Added 2026-05-08 + podofo_0_10 = warnAlias "'podofo_0_10' has been renamed to 'podofo0'" podofo0; # Added 2026-05-08 + podofo_1_0 = throw "'podofo_1_0' has been deprecated in favour of 'podofo'"; # Added 2026-05-08 polipo = throw "'polipo' has been removed as it is unmaintained upstream"; # Added 2025-05-18 polonium = throw "'polonium' has been removed, as Plasma 5 has reached end of life."; # Added 2026-05-01 polypane = throw "'polypane' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae67292ec8e1..15e3d08617eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7049,8 +7049,6 @@ with pkgs; place-cursor-at = haskell.lib.compose.justStaticExecutables haskellPackages.place-cursor-at; - podofo = podofo_1_0; - poppler = callPackage ../development/libraries/poppler { lcms = lcms2; }; poppler_gi = lowPrio ( From d9fca43e68b5e6cc547d55be3f16c193ffba0939 Mon Sep 17 00:00:00 2001 From: kuflierl <41301536+kuflierl@users.noreply.github.com> Date: Fri, 8 May 2026 16:10:20 +0200 Subject: [PATCH 2/4] various: update podofo dependency name scribus: switch to podofo 1 --- pkgs/by-name/ca/calibre/package.nix | 8 ++++---- pkgs/by-name/ci/cie-middleware-linux/package.nix | 4 ++-- pkgs/by-name/gi/gimagereader/package.nix | 4 ++-- pkgs/by-name/ho/horizon-eda/base.nix | 4 ++-- pkgs/by-name/kr/krename/package.nix | 4 ++-- pkgs/by-name/sc/scribus/package.nix | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/ca/calibre/package.nix b/pkgs/by-name/ca/calibre/package.nix index e998ad1c814b..ec47875efd39 100644 --- a/pkgs/by-name/ca/calibre/package.nix +++ b/pkgs/by-name/ca/calibre/package.nix @@ -23,7 +23,7 @@ optipng, piper-tts, pkg-config, - podofo_0_10, + podofo0, poppler-utils, python314Packages, qt6, @@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: { libuchardet libusb1 onnxruntime - podofo_0_10 + podofo0 poppler-utils qt6.qtbase qt6.qtwayland @@ -170,8 +170,8 @@ stdenv.mkDerivation (finalAttrs: { MAGICK_LIB = "${lib.getLib imagemagick}/lib"; FC_INC_DIR = "${lib.getDev fontconfig}/include/fontconfig"; FC_LIB_DIR = "${lib.getLib fontconfig}/lib"; - PODOFO_INC_DIR = "${lib.getDev podofo_0_10}/include/podofo"; - PODOFO_LIB_DIR = "${lib.getLib podofo_0_10}/lib"; + PODOFO_INC_DIR = "${lib.getDev podofo0}/include/podofo"; + PODOFO_LIB_DIR = "${lib.getLib podofo0}/lib"; XDG_DATA_HOME = "${placeholder "out"}/share"; XDG_UTILS_INSTALL_MODE = "user"; } diff --git a/pkgs/by-name/ci/cie-middleware-linux/package.nix b/pkgs/by-name/ci/cie-middleware-linux/package.nix index 517cda05f5b7..c6ca421d5c5d 100644 --- a/pkgs/by-name/ci/cie-middleware-linux/package.nix +++ b/pkgs/by-name/ci/cie-middleware-linux/package.nix @@ -15,7 +15,7 @@ libxml2, openssl, pcsclite, - podofo_0_10, + podofo0, ghostscript, }: @@ -54,7 +54,7 @@ stdenv.mkDerivation { buildInputs = [ cryptopp fontconfig - podofo_0_10 + podofo0 openssl pcsclite curl diff --git a/pkgs/by-name/gi/gimagereader/package.nix b/pkgs/by-name/gi/gimagereader/package.nix index e93e55f97806..b6c8f4741587 100644 --- a/pkgs/by-name/gi/gimagereader/package.nix +++ b/pkgs/by-name/gi/gimagereader/package.nix @@ -6,7 +6,7 @@ pkg-config, libuuid, sane-backends, - podofo_0_10, + podofo0, libjpeg, djvulibre, libxmlxx3, @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { libzip libuuid sane-backends - podofo_0_10 + podofo0 libjpeg djvulibre tesseract diff --git a/pkgs/by-name/ho/horizon-eda/base.nix b/pkgs/by-name/ho/horizon-eda/base.nix index a29b038884a0..45d1122adaca 100644 --- a/pkgs/by-name/ho/horizon-eda/base.nix +++ b/pkgs/by-name/ho/horizon-eda/base.nix @@ -15,7 +15,7 @@ ninja, opencascade-occt_7_6, pkg-config, - podofo_0_10, + podofo0, sqlite, }: let @@ -51,7 +51,7 @@ rec { librsvg libuuid opencascade-occt - podofo_0_10 + podofo0 sqlite ]; diff --git a/pkgs/by-name/kr/krename/package.nix b/pkgs/by-name/kr/krename/package.nix index 92cc85ddf0f1..7201878a8af8 100644 --- a/pkgs/by-name/kr/krename/package.nix +++ b/pkgs/by-name/kr/krename/package.nix @@ -6,7 +6,7 @@ kdePackages, taglib, exiv2, - podofo_0_10, + podofo0, }: stdenv.mkDerivation (finalAttrs: { @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = with kdePackages; [ exiv2 - podofo_0_10 + podofo0 kio kxmlgui qtbase diff --git a/pkgs/by-name/sc/scribus/package.nix b/pkgs/by-name/sc/scribus/package.nix index ea6dbf56309e..faba5541389b 100644 --- a/pkgs/by-name/sc/scribus/package.nix +++ b/pkgs/by-name/sc/scribus/package.nix @@ -29,7 +29,7 @@ libzmf, pixman, pkg-config, - podofo_0_10, + podofo, poppler, poppler_data, python3, @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { libxml2 libzmf pixman - podofo_0_10 + podofo poppler poppler_data (python3.withPackages ( From 2676cc1218e96459f0882d91b31fc3ee8f7b0d65 Mon Sep 17 00:00:00 2001 From: kuflierl <41301536+kuflierl@users.noreply.github.com> Date: Fri, 8 May 2026 16:25:24 +0200 Subject: [PATCH 3/4] podofo0: simplify by making it an override of podofo --- pkgs/by-name/po/podofo0/package.nix | 65 ++--------------------------- 1 file changed, 4 insertions(+), 61 deletions(-) diff --git a/pkgs/by-name/po/podofo0/package.nix b/pkgs/by-name/po/podofo0/package.nix index 0470a0ad3825..31fd73e8d69d 100644 --- a/pkgs/by-name/po/podofo0/package.nix +++ b/pkgs/by-name/po/podofo0/package.nix @@ -1,68 +1,11 @@ { - lib, - stdenv, - fetchFromGitHub, - cmake, - fontconfig, - freetype, + podofo, libidn, - libjpeg, - libpng, - libtiff, - libxml2, - openssl, - pkg-config, - zlib, }: - -stdenv.mkDerivation (finalAttrs: { - pname = "podofo"; +podofo.overrideAttrs (prevAttrs: { version = "0.10.6"; - - src = fetchFromGitHub { - owner = "podofo"; - repo = "podofo"; - rev = finalAttrs.version; + src = prevAttrs.src.override { hash = "sha256-DlCKQYlsgTfnZACk6yTeoIiaOL5AtICcHjRd8jl0RkI="; }; - - outputs = [ - "out" - "dev" - ]; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - fontconfig - freetype - libidn - libjpeg - libpng - libtiff - libxml2 - openssl - zlib - ]; - - cmakeFlags = [ - "-DPODOFO_BUILD_STATIC=${if stdenv.hostPlatform.isStatic then "ON" else "OFF"}" - "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" - ]; - - meta = { - homepage = "https://github.com/podofo/podofo"; - description = "Library to work with the PDF file format"; - platforms = lib.platforms.all; - license = with lib.licenses; [ - gpl2Plus - lgpl2Plus - ]; - maintainers = with lib.maintainers; [ - kuflierl - ]; - }; + buildInputs = prevAttrs.buildInputs ++ [ libidn ]; }) From bdcc71f661a2d49ce0763988e92ecb78b1dd23c2 Mon Sep 17 00:00:00 2001 From: kuflierl <41301536+kuflierl@users.noreply.github.com> Date: Fri, 8 May 2026 16:34:54 +0200 Subject: [PATCH 4/4] podofo{,0}: add changelog, use lib.cmakeBool, strictDeps, __structuredAttrs --- pkgs/by-name/po/podofo/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/podofo/package.nix b/pkgs/by-name/po/podofo/package.nix index 1576ce6bc232..bf635ab9b383 100644 --- a/pkgs/by-name/po/podofo/package.nix +++ b/pkgs/by-name/po/podofo/package.nix @@ -47,13 +47,17 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DPODOFO_BUILD_STATIC=${if stdenv.hostPlatform.isStatic then "ON" else "OFF"}" - "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" + (lib.cmakeBool "PODOFO_BUILD_STATIC" stdenv.hostPlatform.isStatic) + (lib.cmakeBool "CMAKE_BUILD_WITH_INSTALL_NAME_DIR" true) ]; + strictDeps = true; + __structuredAttrs = true; + meta = { homepage = "https://github.com/podofo/podofo"; description = "Library to work with the PDF file format"; + changelog = "https://github.com/podofo/podofo/blob/${finalAttrs.version}/CHANGELOG.md"; platforms = lib.platforms.all; license = with lib.licenses; [ gpl2Plus