gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

poco: 1.14.2 -> 1.15.1, adopt (#501671)

Browse Source
This commit is contained in:
Sandro
2026-04-11 02:23:46 +00:00
committed by GitHub
parent 424dcb94e1 baeefc9276
commit 720b0cfc8c
2 changed files with 18 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/po/poco/disable-flaky-tests.patch
-18
View File
@@ -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);
pkgs/by-name/po/poco/package.nix
+18 -21
View File
@@ -2,8 +2,8 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
cmake,
nix-update-script,
pkg-config,
zlib,
pcre2,
@@ -13,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 = [
@@ -36,6 +37,7 @@ stdenv.mkDerivation rec {
buildInputs = [
unixodbc
libmysqlclient
libpng
];
propagatedBuildInputs = [
@@ -78,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 = [
@@ -109,11 +101,16 @@ 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";
license = lib.licenses.boost;
maintainers = with lib.maintainers; [
hythera
tomodachi94
];
platforms = lib.platforms.unix;