diff options
| author | Nicolas Benes <nbenes.gh@xandea.de> | 2023-11-27 10:28:08 +0100 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2023-11-29 03:44:07 +0000 |
| commit | f6ab8ce7d3e6d98828cc7bb1270984273b693147 (patch) | |
| tree | 1e81e20760007e770b4a1b8107ae83b7e1b89d52 | |
| parent | Merge pull request #270700 from NixOS/backport-269962-to-release-23.11 (diff) | |
| download | nixpkgs-f6ab8ce7d3e6d98828cc7bb1270984273b693147.tar.gz | |
redis-plus-plus: 1.3.7 -> 1.3.10origin/backport-270388-to-release-23.11
https://github.com/sewenew/redis-plus-plus/releases/tag/1.3.8
https://github.com/sewenew/redis-plus-plus/releases/tag/1.3.9
https://github.com/sewenew/redis-plus-plus/releases/tag/1.3.10
(cherry picked from commit a4ce630f3e7e9c096ca97d12f9af60434fcaa512)
| -rw-r--r-- | pkgs/development/libraries/redis-plus-plus/0001-Fix-pkg-config-paths.patch | 14 | ||||
| -rw-r--r-- | pkgs/development/libraries/redis-plus-plus/default.nix | 8 |
2 files changed, 20 insertions, 2 deletions
diff --git a/pkgs/development/libraries/redis-plus-plus/0001-Fix-pkg-config-paths.patch b/pkgs/development/libraries/redis-plus-plus/0001-Fix-pkg-config-paths.patch new file mode 100644 index 000000000000..ac6490c51873 --- /dev/null +++ b/pkgs/development/libraries/redis-plus-plus/0001-Fix-pkg-config-paths.patch @@ -0,0 +1,14 @@ +diff --git a/cmake/redis++.pc.in b/cmake/redis++.pc.in +index c98b990..46849b6 100644 +--- a/cmake/redis++.pc.in ++++ b/cmake/redis++.pc.in +@@ -1,7 +1,5 @@ +-prefix=@CMAKE_INSTALL_PREFIX@ +-exec_prefix=${prefix} +-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/include ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: redis++ + Description: This is a Redis client, based on hiredis and written in C++11. It supports scritpting, pub/sub, pipeline, transaction, Redis Cluster, Redis Sentinel, connection pool, ACL, SSL and thread safety. diff --git a/pkgs/development/libraries/redis-plus-plus/default.nix b/pkgs/development/libraries/redis-plus-plus/default.nix index b064297afdd1..529bf73351ec 100644 --- a/pkgs/development/libraries/redis-plus-plus/default.nix +++ b/pkgs/development/libraries/redis-plus-plus/default.nix @@ -8,15 +8,19 @@ assert enableShared || enableStatic; stdenv.mkDerivation rec { pname = "redis-plus-plus"; - version = "1.3.7"; + version = "1.3.10"; src = fetchFromGitHub { owner = "sewenew"; repo = "redis-plus-plus"; rev = version; - sha256 = "sha256-QCNN85syxw2EGPdyTV3bL0txcHl7t2YhsKwK9lgnexY="; + sha256 = "sha256-lupS4WoJ4r0Vsh3sEGSuka0TtEBo2FPX2eks2blqRGk="; }; + patches = [ + ./0001-Fix-pkg-config-paths.patch + ]; + nativeBuildInputs = [ cmake ]; propagatedBuildInputs = [ hiredis ]; |
