Skip to content

Commit 1144b43

Browse files
redis: 7.2.7 -> 8.0.2 (#403628)
2 parents d334702 + f31f1bf commit 1144b43

File tree

1 file changed

+21
-12
lines changed

1 file changed

+21
-12
lines changed

pkgs/by-name/re/redis/package.nix

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
systemd,
1515
openssl,
1616
python3,
17-
17+
nix-update-script,
18+
versionCheckHook,
1819
withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
1920
tlsSupport ? true,
2021
# Using system jemalloc fixes cross-compilation and various setups.
@@ -25,13 +26,13 @@
2526

2627
stdenv.mkDerivation (finalAttrs: {
2728
pname = "redis";
28-
version = "7.2.7";
29+
version = "8.0.2";
2930

3031
src = fetchFromGitHub {
3132
owner = "redis";
3233
repo = "redis";
33-
rev = finalAttrs.version;
34-
hash = "sha256-WZ89BUm3zz6n0dZKyODHCyMGExbqaPJJ1qxLvJKUSDI=";
34+
tag = finalAttrs.version;
35+
hash = "sha256-BZJEBp3M7Gw/6/fZjfaMfU777dFmMzAS4bDI06ErkSc=";
3536
};
3637

3738
patches = lib.optional useSystemJemalloc (fetchpatch2 {
@@ -65,7 +66,6 @@ stdenv.mkDerivation (finalAttrs: {
6566

6667
hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ];
6768

68-
env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ "-std=c11" ]);
6969
env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isFreeBSD "-lexecinfo";
7070

7171
# darwin currently lacks a pure `pgrep` which is extensively used here
@@ -81,12 +81,13 @@ stdenv.mkDerivation (finalAttrs: {
8181
# disable test "Connect multiple replicas at the same time": even
8282
# upstream find this test too timing-sensitive
8383
substituteInPlace tests/integration/replication.tcl \
84-
--replace 'foreach mdl {no yes}' 'foreach mdl {}'
84+
--replace-fail 'foreach sdl {disabled swapdb} {' 'foreach sdl {} {'
8585
8686
substituteInPlace tests/support/server.tcl \
87-
--replace 'exec /usr/bin/env' 'exec env'
87+
--replace-fail 'exec /usr/bin/env' 'exec env'
8888
89-
sed -i '/^proc wait_load_handlers_disconnected/{n ; s/wait_for_condition 50 100/wait_for_condition 50 500/; }' \
89+
sed -i -e '/^proc wait_load_handlers_disconnected/{n ; s/wait_for_condition 50 100/wait_for_condition 50 500/; }' \
90+
-e '/^proc wait_for_ofs_sync/{n ; s/wait_for_condition 50 100/wait_for_condition 50 500/; }' \
9091
tests/support/util.tcl
9192
9293
./runtest \
@@ -100,15 +101,23 @@ stdenv.mkDerivation (finalAttrs: {
100101
runHook postCheck
101102
'';
102103

103-
passthru.tests.redis = nixosTests.redis;
104-
passthru.serverBin = "redis-server";
104+
doInstallCheck = true;
105+
nativeInstallCheckInputs = [ versionCheckHook ];
106+
versionCheckProgram = "${placeholder "out"}/bin/redis-server";
107+
versionCheckProgramArg = "--version";
108+
109+
passthru = {
110+
tests.redis = nixosTests.redis;
111+
serverBin = "redis-server";
112+
updateScript = nix-update-script { };
113+
};
105114

106115
meta = {
107116
homepage = "https://redis.io";
108117
description = "Open source, advanced key-value store";
109-
license = lib.licenses.bsd3;
118+
license = lib.licenses.agpl3Only;
110119
platforms = lib.platforms.all;
111-
changelog = "https://github.com/redis/redis/raw/${finalAttrs.version}/00-RELEASENOTES";
120+
changelog = "https://github.com/redis/redis/releases/tag/${finalAttrs.version}";
112121
maintainers = with lib.maintainers; [
113122
berdario
114123
globin

0 commit comments

Comments
 (0)