From 067f836b5d5db56533a4f309cfa4ca04e152e5bf Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Mon, 6 Jul 2026 21:29:05 +0700
Subject: [PATCH 1/3] redis: move tests to passthru

---
 pkgs/by-name/re/redis/package.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/re/redis/package.nix b/pkgs/by-name/re/redis/package.nix
index 98057ad86d3a..a46d70a2b3d8 100644
--- a/pkgs/by-name/re/redis/package.nix
+++ b/pkgs/by-name/re/redis/package.nix
@@ -77,8 +77,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isFreeBSD "-lexecinfo";
 
-  # darwin currently lacks a pure `pgrep` which is extensively used here
-  doCheck = !stdenv.hostPlatform.isDarwin;
+  # Tests are in the `tests` passthru derivation: the suite is very large and some tests (e.g. memtests) are flaky.
+  doCheck = false;
+
   nativeCheckInputs = [
     which
     tcl
@@ -126,7 +127,10 @@ stdenv.mkDerivation (finalAttrs: {
   versionCheckProgram = "${placeholder "out"}/bin/redis-server";
 
   passthru = {
-    tests.redis = nixosTests.redis;
+    tests = {
+      redis = nixosTests.redis;
+      unitTests = finalAttrs.finalPackage.overrideAttrs { doCheck = true; };
+    };
     serverBin = "redis-server";
     updateScript = nix-update-script { };
   };

From eba8e3dd5164ba9c75e07d7cacfa7a9cd0d41f10 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Mon, 6 Jul 2026 21:32:57 +0700
Subject: [PATCH 2/3] valkey: move tests to passthru

---
 pkgs/by-name/va/valkey/package.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/va/valkey/package.nix b/pkgs/by-name/va/valkey/package.nix
index 82e625efe933..767dbea97547 100644
--- a/pkgs/by-name/va/valkey/package.nix
+++ b/pkgs/by-name/va/valkey/package.nix
@@ -65,8 +65,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ "-std=c11" ]);
 
-  # darwin currently lacks a pure `pgrep` which is extensively used here
-  doCheck = !stdenv.hostPlatform.isDarwin;
+  # Tests are in the `tests` passthru derivation: the suite is very large and significantly slows down the build.
+  doCheck = false;
+
   nativeCheckInputs = [
     which
     tcl
@@ -108,7 +109,10 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   passthru = {
-    tests.redis = nixosTests.redis;
+    tests = {
+      redis = nixosTests.redis;
+      unitTests = finalAttrs.finalPackage.overrideAttrs { doCheck = true; };
+    };
     serverBin = "valkey-server";
   };
 

From fd86301e0431977e327bb5beb44bb5c7668e4397 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Mon, 6 Jul 2026 23:22:48 +0700
Subject: [PATCH 3/3] valkey: disable flaky dual-channel-replication test

---
 pkgs/by-name/va/valkey/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/va/valkey/package.nix b/pkgs/by-name/va/valkey/package.nix
index 767dbea97547..558f37808261 100644
--- a/pkgs/by-name/va/valkey/package.nix
+++ b/pkgs/by-name/va/valkey/package.nix
@@ -103,7 +103,8 @@ stdenv.mkDerivation (finalAttrs: {
       --skipunit unit/memefficiency \
       --skipunit unit/type/string \
       --skipunit integration/failover \
-      --skipunit integration/aof-multi-part
+      --skipunit integration/aof-multi-part \
+      --skipunit integration/dual-channel-replication
 
     runHook postCheck
   '';