persistent-cache-cpp: 1.0.6 -> 1.0.7
This commit is contained in:
parent
058d36f159
commit
2f9280632b
@ -12,17 +12,18 @@
|
||||
, lomiri
|
||||
, pkg-config
|
||||
, python3
|
||||
, validatePkgConfig
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "persistent-cache-cpp";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "ubports";
|
||||
repo = "development/core/lib-cpp/persistent-cache-cpp";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-RLZiYY0Y9LT+ajM4Va4MpVVDBlu2yvCpn8bNGMB8ydo=";
|
||||
hash = "sha256-bOABrRSy5Mzeaqoc5ujcGXyBAaCJLv/488M7fkr0npE=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
@ -32,43 +33,22 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Version in CMakeLists.txt didn't get bumped, emits wrong version in pkg-config
|
||||
# Remove when https://gitlab.com/ubports/development/core/lib-cpp/persistent-cache-cpp/-/merge_requests/13 merged & in release
|
||||
(fetchpatch {
|
||||
name = "0001-persistent-cache-cpp-CMakeLists-txt-Update-version.patch";
|
||||
url = "https://gitlab.com/OPNA2608/persistent-cache-cpp/-/commit/20d5d3f61563c62bcbe85e71ddc4fe16d7c995d5.patch";
|
||||
hash = "sha256-BKovtT9OvV+xEwBO8AZTxAzL9kqyDB9ip32t2Xx4eIk=";
|
||||
})
|
||||
|
||||
# PersistentStringCacheImpl.exceptions test fails on LLVM's libcxx, it depends on std::system_error producing a very specific exception text
|
||||
# Expects "Unknown error 666", gets "unspecified generic_category error"
|
||||
# Remove when https://gitlab.com/ubports/development/core/lib-cpp/persistent-cache-cpp/-/merge_requests/14 merged & in release
|
||||
(fetchpatch {
|
||||
name = "0002-persistent-cache-cpp-persistent_string_cache_impl_test-libcxx-fix.patch";
|
||||
url = "https://gitlab.com/OPNA2608/persistent-cache-cpp/-/commit/a696dbd3093b8333f9ee1f0cad846b2256c729c5.patch";
|
||||
name = "0001-persistent-cache-cpp-persistent_string_cache_impl_test-libcxx-fix.patch";
|
||||
url = "https://gitlab.com/ubports/development/core/lib-cpp/persistent-cache-cpp/-/commit/a696dbd3093b8333f9ee1f0cad846b2256c729c5.patch";
|
||||
hash = "sha256-SJxdXeM7W+WKEmiLTwnQYAM7YmPayEk6vPb46y4thv4=";
|
||||
})
|
||||
|
||||
# Enable usage of BUILD_TESTING to opting out of tests
|
||||
# Remove when https://gitlab.com/ubports/development/core/lib-cpp/persistent-cache-cpp/-/merge_requests/15 merged & in release
|
||||
(fetchpatch {
|
||||
name = "0003-persistent-cache-cpp-Enable-opting-out-of-tests.patch";
|
||||
url = "https://gitlab.com/OPNA2608/persistent-cache-cpp/-/commit/1fb06d28c16325e90046e93662c0f5fd16c29b4a.patch";
|
||||
name = "0002-persistent-cache-cpp-Enable-opting-out-of-tests.patch";
|
||||
url = "https://gitlab.com/ubports/development/core/lib-cpp/persistent-cache-cpp/-/commit/1fb06d28c16325e90046e93662c0f5fd16c29b4a.patch";
|
||||
hash = "sha256-2/6EYBh71S4dzqWEde+3dLOGp015fN6IifAj1bI1XAI=";
|
||||
})
|
||||
|
||||
# Enable linking based on stdenv (static or dynamic), only propagate leveldb link requirement when linked statically
|
||||
# Remove when https://gitlab.com/ubports/development/core/lib-cpp/persistent-cache-cpp/-/merge_requests/16 merged & in release
|
||||
(fetchpatch {
|
||||
name = "0004-persistent-cache-cpp-Un-hardcode-static-linking.patch";
|
||||
url = "https://gitlab.com/OPNA2608/persistent-cache-cpp/-/commit/45cd84fe76e3a0e1da41a662df695009a6f4f07e.patch";
|
||||
hash = "sha256-1UjdhzrjnIUO1ySaZTm0vkdNgok0RNlGtNOWUoAUlzU=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "0005-persistent-cache-cpp-Propagate-leveldb-dependency-only-when-needed.patch";
|
||||
url = "https://gitlab.com/OPNA2608/persistent-cache-cpp/-/commit/6204b65df32360a7e358558041219a867652c429.patch";
|
||||
hash = "sha256-cIewdtF0OdQuLz94KNY2HL8XZp1IaKlZz2hNlMvKLw4=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@ -87,6 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cmake
|
||||
doxygen
|
||||
pkg-config
|
||||
validatePkgConfig
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@ -106,6 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cmakeFlags = [
|
||||
# error: 'old_version' may be used uninitialized
|
||||
(lib.cmakeBool "Werror" false)
|
||||
# Defaults to static if not set
|
||||
(lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
|
||||
];
|
||||
|
||||
@ -123,6 +105,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
image files) that is fast, scalable, and crash-proof.
|
||||
'';
|
||||
homepage = "https://gitlab.com/ubports/development/core/lib-cpp/persistent-cache-cpp";
|
||||
changelog = "https://gitlab.com/ubports/development/core/lib-cpp/persistent-cache-cpp/-/blob/${finalAttrs.version}/ChangeLog";
|
||||
license = licenses.lgpl3Only;
|
||||
maintainers = teams.lomiri.members;
|
||||
platforms = platforms.unix;
|
||||
|
Loading…
Reference in New Issue
Block a user