From 29d5e4b3a716a11b7eb401ba06af8e0fc437c9d3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 4 Oct 2025 21:10:49 +0200
Subject: [PATCH] redis: 8.0.3 -> 8.2.2

https://github.com/redis/redis/releases/tag/8.2.0
https://github.com/redis/redis/releases/tag/8.2.1
https://github.com/redis/redis/releases/tag/8.2.2

Fixes: CVE-2025-49844, CVE-2025-46817, CVE-2025-46818, CVE-2025-46819
---
 pkgs/by-name/re/redis/package.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/re/redis/package.nix b/pkgs/by-name/re/redis/package.nix
index abc1811cc8ee..48eccfc821eb 100644
--- a/pkgs/by-name/re/redis/package.nix
+++ b/pkgs/by-name/re/redis/package.nix
@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "redis";
-  version = "8.0.3";
+  version = "8.2.2";
 
   src = fetchFromGitHub {
     owner = "redis";
     repo = "redis";
     tag = finalAttrs.version;
-    hash = "sha256-e6pPsPz0huZyn14XO3uFUmJhBpMxhWLfyD0VBQXsJ1s=";
+    hash = "sha256-0TMUSNCrDEtOkojcmFFhmLQ0ghyLAn+OS4xl4Sbr76c=";
   };
 
   patches = lib.optional useSystemJemalloc (fetchpatch2 {
@@ -106,7 +106,9 @@ stdenv.mkDerivation (finalAttrs: {
       --tags -leaks \
       --skipunit integration/aof-multi-part \
       --skipunit integration/failover \
-      --skipunit integration/replication-rdbchannel
+      --skipunit integration/replication-rdbchannel \
+      --skiptest "Check MEMORY USAGE for embedded key strings with jemalloc"
+      # ^ breaks due to unexpected and varying address space sizes that jemalloc gets built with
 
     runHook postCheck
   '';