pyrox.dev
redis: 7.2.7 -> 8.0.2 (#403628)
authored by Wolfgang Walther and committed by GitHub 1144b439 d3347025
+21
-12
pkgs/by-name/re/redis/package.nix
+21
-12
pkgs/by-name/re/redis/package.nix
···
14
14
systemd,
15
15
openssl,
16
16
python3,
17
-
17
+
nix-update-script,
18
+
versionCheckHook,
18
19
withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
19
20
tlsSupport ? true,
20
21
# Using system jemalloc fixes cross-compilation and various setups.
···
25
26
26
27
stdenv.mkDerivation (finalAttrs: {
27
28
pname = "redis";
28
-
version = "7.2.7";
29
+
version = "8.0.2";
29
30
30
31
src = fetchFromGitHub {
31
32
owner = "redis";
32
33
repo = "redis";
33
-
rev = finalAttrs.version;
34
-
hash = "sha256-WZ89BUm3zz6n0dZKyODHCyMGExbqaPJJ1qxLvJKUSDI=";
34
+
tag = finalAttrs.version;
35
+
hash = "sha256-BZJEBp3M7Gw/6/fZjfaMfU777dFmMzAS4bDI06ErkSc=";
35
36
};
36
37
37
38
patches = lib.optional useSystemJemalloc (fetchpatch2 {
···
65
66
66
67
hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ];
67
68
68
-
env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ "-std=c11" ]);
69
69
env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isFreeBSD "-lexecinfo";
70
70
71
71
# darwin currently lacks a pure `pgrep` which is extensively used here
···
81
81
# disable test "Connect multiple replicas at the same time": even
82
82
# upstream find this test too timing-sensitive
83
83
substituteInPlace tests/integration/replication.tcl \
84
-
--replace 'foreach mdl {no yes}' 'foreach mdl {}'
84
+
--replace-fail 'foreach sdl {disabled swapdb} {' 'foreach sdl {} {'
85
85
86
86
substituteInPlace tests/support/server.tcl \
87
-
--replace 'exec /usr/bin/env' 'exec env'
87
+
--replace-fail 'exec /usr/bin/env' 'exec env'
88
88
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/; }' \
90
91
tests/support/util.tcl
91
92
92
93
./runtest \
···
100
101
runHook postCheck
101
102
'';
102
103
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
+
};
105
114
106
115
meta = {
107
116
homepage = "https://redis.io";
108
117
description = "Open source, advanced key-value store";
109
-
license = lib.licenses.bsd3;
118
+
license = lib.licenses.agpl3Only;
110
119
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}";
112
121
maintainers = with lib.maintainers; [
113
122
berdario
114
123
globin