From eb37af69ab439eb3e27ad2638198c51897c9757b Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Sun, 5 Apr 2026 13:44:41 +0200 Subject: [PATCH 1/3] poco: add passthru.updateScript --- pkgs/by-name/po/poco/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/po/poco/package.nix b/pkgs/by-name/po/poco/package.nix index 9475a681a1d0..9183abea2921 100644 --- a/pkgs/by-name/po/poco/package.nix +++ b/pkgs/by-name/po/poco/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, fetchpatch, cmake, + nix-update-script, pkg-config, zlib, pcre2, @@ -109,6 +110,10 @@ stdenv.mkDerivation rec { done ''; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version-regex=poco-(.*)-release" ]; + }; + meta = { homepage = "https://pocoproject.org/"; description = "Cross-platform C++ libraries with a network/internet focus"; From d2a0513c7bbae548c4b666aa0bd440de672c693e Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Sun, 5 Apr 2026 13:58:09 +0200 Subject: [PATCH 2/3] poco: 1.14.2 -> 1.15.1 changelog: https://github.com/pocoproject/poco/releases/tag/poco-1.15.1-release diff: https://github.com/pocoproject/poco/compare/poco-1.14.2-release...poco-1.15.1-release --- .../by-name/po/poco/disable-flaky-tests.patch | 18 ---------- pkgs/by-name/po/poco/package.nix | 33 +++++++------------ 2 files changed, 12 insertions(+), 39 deletions(-) delete mode 100644 pkgs/by-name/po/poco/disable-flaky-tests.patch diff --git a/pkgs/by-name/po/poco/disable-flaky-tests.patch b/pkgs/by-name/po/poco/disable-flaky-tests.patch deleted file mode 100644 index 4f3b6ca5833e..000000000000 --- a/pkgs/by-name/po/poco/disable-flaky-tests.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/Foundation/testsuite/src/ExpireLRUCacheTest.cpp b/Foundation/testsuite/src/ExpireLRUCacheTest.cpp ---- a/Foundation/testsuite/src/ExpireLRUCacheTest.cpp -+++ b/Foundation/testsuite/src/ExpireLRUCacheTest.cpp -@@ -336 +336 @@ -- CppUnit_addTest(pSuite, ExpireLRUCacheTest, testExpireN); -+ // CppUnit_addTest(pSuite, ExpireLRUCacheTest, testExpireN); -diff --git a/Foundation/testsuite/src/TimestampTest.cpp b/Foundation/testsuite/src/TimestampTest.cpp ---- a/Foundation/testsuite/src/TimestampTest.cpp -+++ b/Foundation/testsuite/src/TimestampTest.cpp -@@ -97 +97 @@ -- CppUnit_addTest(pSuite, TimestampTest, testTimestamp); -+ // CppUnit_addTest(pSuite, TimestampTest, testTimestamp); -diff --git a/Foundation/testsuite/src/UniqueExpireCacheTest.cpp b/Foundation/testsuite/src/UniqueExpireCacheTest.cpp ---- a/Foundation/testsuite/src/UniqueExpireCacheTest.cpp -+++ b/Foundation/testsuite/src/UniqueExpireCacheTest.cpp -@@ -248 +248 @@ -- CppUnit_addTest(pSuite, UniqueExpireCacheTest, testExpireN); -+ // CppUnit_addTest(pSuite, UniqueExpireCacheTest, testExpireN); diff --git a/pkgs/by-name/po/poco/package.nix b/pkgs/by-name/po/poco/package.nix index 9183abea2921..a0aad31cf36e 100644 --- a/pkgs/by-name/po/poco/package.nix +++ b/pkgs/by-name/po/poco/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, nix-update-script, pkg-config, @@ -14,19 +13,20 @@ openssl, unixodbc, libmysqlclient, + libpng, writableTmpDirAsHomeHook, }: stdenv.mkDerivation rec { pname = "poco"; - version = "1.14.2"; + version = "1.15.1"; src = fetchFromGitHub { owner = "pocoproject"; repo = "poco"; - hash = "sha256-koREkrfAHWfpqITN5afiXwZg37Wve2Ftx8sr8t2bSV4="; - rev = "poco-${version}-release"; + hash = "sha256-JyjEs5aecKSdrNEaSs4Dzs3mAu2rhhBNAG93VLHdU3E="; + tag = "poco-${version}-release"; }; nativeBuildInputs = [ @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { buildInputs = [ unixodbc libmysqlclient + libpng ]; propagatedBuildInputs = [ @@ -79,23 +80,13 @@ stdenv.mkDerivation rec { (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'${excludeTestsRegex}'") ]; - patches = [ - # Remove on next release - (fetchpatch { - name = "disable-included-pcre-if-pcre-is-linked-staticly"; - # this happens when building pkgsStatic.poco - url = "https://patch-diff.githubusercontent.com/raw/pocoproject/poco/pull/4879.patch"; - hash = "sha256-VFWuRuf0GPYFp43WKI8utl+agP+7a5biLg7m64EMnVo="; - }) - # https://github.com/pocoproject/poco/issues/4977 - ./disable-flaky-tests.patch - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - ./disable-broken-tests-darwin.patch - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - ./disable-broken-tests-linux.patch - ]; + patches = + lib.optionals stdenv.hostPlatform.isDarwin [ + ./disable-broken-tests-darwin.patch + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + ./disable-broken-tests-linux.patch + ]; doCheck = true; nativeCheckInputs = [ From baeefc9276b667bc38db2b4eb3c85d8ec779a7cf Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Sun, 5 Apr 2026 13:58:48 +0200 Subject: [PATCH 3/3] poco: add hythera as maintainer --- pkgs/by-name/po/poco/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/po/poco/package.nix b/pkgs/by-name/po/poco/package.nix index a0aad31cf36e..22a783f84e61 100644 --- a/pkgs/by-name/po/poco/package.nix +++ b/pkgs/by-name/po/poco/package.nix @@ -110,6 +110,7 @@ stdenv.mkDerivation rec { description = "Cross-platform C++ libraries with a network/internet focus"; license = lib.licenses.boost; maintainers = with lib.maintainers; [ + hythera tomodachi94 ]; platforms = lib.platforms.unix;