movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-13 21:25:30 +03:00
Code Issues Projects Releases Packages Wiki Activity

treewide: redis -> valkey

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

4
pkgs/by-name/ir/irrd/package.nix
View file

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

4
pkgs/by-name/su/suricata/package.nix
View file

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

4
pkgs/by-name/za/zammad/package.nix
View file

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

2
pkgs/development/python-modules/aiocache/default.nix
View file

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

2
pkgs/development/python-modules/django-cacheops/default.nix
View file

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

2
pkgs/development/python-modules/django-q2/default.nix
View file

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

2
pkgs/development/python-modules/django-redis/default.nix
View file

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

4
pkgs/development/python-modules/fakeredis/default.nix
View file

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

2
pkgs/development/python-modules/flask-session/default.nix
View file

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

4
pkgs/development/python-modules/logutils/default.nix
View file

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

4
pkgs/development/python-modules/mocket/default.nix
View file

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

2
pkgs/development/python-modules/python-redis-lock/default.nix
View file

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

2
pkgs/development/python-modules/redis-om/default.nix
View file

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

4
pkgs/development/python-modules/rq/default.nix
View file

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

2
pkgs/development/python-modules/walrus/default.nix
View file

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

16
pkgs/top-level/python-packages.nix
View file

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