treewide: redis -> valkey

Upstream Redis' last free version is going EOL soon, and often has
build issues with flaky tests and such. Use Valkey, which is
both fully open and actively maintained.
This commit is contained in:
K900 2025-03-20 11:37:17 +03:00
parent 1422e89acf
commit 1c1e56fb16
16 changed files with 26 additions and 34 deletions

View file

@ -6,7 +6,7 @@
, git
, postgresql
, postgresqlTestHook
, redis
, valkey
}:
let
@ -84,7 +84,7 @@ py.pkgs.buildPythonPackage rec {
nativeCheckInputs = [
git
redis
valkey
postgresql
postgresqlTestHook
] ++ (with py.pkgs; [

View file

@ -27,7 +27,7 @@
python3,
zlib,
redisSupport ? true,
redis,
valkey,
hiredis,
rustSupport ? true,
rustc,
@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
]
++ lib.optional hyperscanSupport hyperscan
++ lib.optionals redisSupport [
redis
valkey
hiredis
];

View file

@ -14,7 +14,7 @@
nodejs,
pnpm_9,
cacert,
redis,
valkey,
dataDir ? "/var/lib/zammad",
}:
@ -68,7 +68,7 @@ stdenvNoCC.mkDerivation {
];
nativeBuildInputs = [
redis
valkey
postgresql
pnpm_9.configHook
nodejs

View file

@ -71,7 +71,7 @@ buildPythonPackage rec {
];
preCheck = ''
${lib.getBin pkgs.redis}/bin/redis-server &
${lib.getBin pkgs.valkey}/bin/redis-server &
REDIS_PID=$!
${lib.getBin pkgs.memcached}/bin/memcached &

View file

@ -52,7 +52,7 @@ buildPythonPackage rec {
jinja2
before-after
nettools
pkgs.redis
pkgs.valkey
];
preCheck = ''

View file

@ -65,7 +65,7 @@ buildPythonPackage rec {
pythonImportsCheck = [ "django_q" ];
preCheck = ''
${pkgs.redis}/bin/redis-server &
${pkgs.valkey}/bin/redis-server &
REDIS_PID=$!
'';

View file

@ -52,7 +52,7 @@ buildPythonPackage rec {
preCheck = ''
export DJANGO_SETTINGS_MODULE=tests.settings.sqlite
${pkgs.redis}/bin/redis-server &
${pkgs.valkey}/bin/redis-server &
REDIS_PID=$!
'';

View file

@ -12,7 +12,7 @@
pytestCheckHook,
pythonOlder,
redis,
redis-server,
valkey,
sortedcontainers,
}:
@ -57,7 +57,7 @@ buildPythonPackage rec {
pytestFlagsArray = [ "-m 'not slow'" ];
preCheck = ''
${lib.getExe' redis-server "redis-server"} --port 6390 &
${lib.getExe' valkey "redis-server"} --port 6390 &
REDIS_PID=$!
'';

View file

@ -54,7 +54,7 @@ buildPythonPackage rec {
];
preCheck = ''
${lib.getExe' pkgs.redis "redis-server"} &
${lib.getExe' pkgs.valkey "redis-server"} &
${lib.getExe pkgs.memcached} &
'';

View file

@ -6,7 +6,7 @@
pytestCheckHook,
pythonAtLeast,
pythonOlder,
redis-server,
valkey,
redis,
setuptools,
}:
@ -27,7 +27,7 @@ buildPythonPackage rec {
substituteInPlace tests/test_dictconfig.py \
--replace-fail "assertEquals" "assertEqual"
substituteInPlace tests/test_redis.py \
--replace-fail "'redis-server'" "'${redis-server}/bin/redis-server'"
--replace-fail "'redis-server'" "'${valkey}/bin/redis-server'"
'';
build-system = [ setuptools ];

View file

@ -29,7 +29,7 @@
pytest-cov-stub,
pytestCheckHook,
redis,
redis-server,
valkey,
requests,
sure,
@ -75,7 +75,7 @@ buildPythonPackage rec {
] ++ lib.flatten (lib.attrValues optional-dependencies);
preCheck = lib.optionalString stdenv.hostPlatform.isLinux ''
${redis-server}/bin/redis-server &
${valkey}/bin/redis-server &
REDIS_PID=$!
'';

View file

@ -54,7 +54,7 @@ buildPythonPackage rec {
gevent
pytestCheckHook
process-tests
pkgs.redis
pkgs.valkey
] ++ optional-dependencies.django;
# For Django tests

View file

@ -64,7 +64,7 @@ buildPythonPackage rec {
];
preCheck = ''
${pkgs.redis}/bin/redis-server &
${pkgs.valkey}/bin/redis-server &
REDIS_PID=$!
'';

View file

@ -14,7 +14,7 @@
# tests
psutil,
pytestCheckHook,
redis-server,
valkey,
sentry-sdk,
}:
@ -47,7 +47,7 @@ buildPythonPackage rec {
preCheck = ''
PATH=$out/bin:$PATH
${redis-server}/bin/redis-server &
${valkey}/bin/redis-server &
'';
postCheck = ''

View file

@ -30,7 +30,7 @@ buildPythonPackage rec {
nativeCheckInputs = [ unittestCheckHook ];
preCheck = ''
${pkgs.redis}/bin/redis-server &
${pkgs.valkey}/bin/redis-server &
REDIS_PID=$!
'';

View file

@ -4561,9 +4561,7 @@ self: super: with self; {
faker = callPackage ../development/python-modules/faker { };
fakeredis = callPackage ../development/python-modules/fakeredis {
redis-server = pkgs.redis;
};
fakeredis = callPackage ../development/python-modules/fakeredis { };
falcon = callPackage ../development/python-modules/falcon { };
@ -7913,9 +7911,7 @@ self: super: with self; {
loguru-logging-intercept = callPackage ../development/python-modules/loguru-logging-intercept { };
logutils = callPackage ../development/python-modules/logutils {
redis-server = pkgs.redis;
};
logutils = callPackage ../development/python-modules/logutils { };
logzero = callPackage ../development/python-modules/logzero { };
@ -8594,9 +8590,7 @@ self: super: with self; {
mobly = callPackage ../development/python-modules/mobly { };
mocket = callPackage ../development/python-modules/mocket {
redis-server = pkgs.redis;
};
mocket = callPackage ../development/python-modules/mocket { };
mock = callPackage ../development/python-modules/mock { };
@ -14697,9 +14691,7 @@ self: super: with self; {
rpyc = callPackage ../development/python-modules/rpyc { };
rq = callPackage ../development/python-modules/rq {
redis-server = pkgs.redis;
};
rq = callPackage ../development/python-modules/rq { };
rsa = callPackage ../development/python-modules/rsa { };