From 63c77937bbb9ee419094d14cdf7683578ee02d1b Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 18 Jan 2025 12:39:44 +0100
Subject: [PATCH] redis: 7.2.6 -> 7.2.7

Fixes CVE-2024-46981 and CVE-2024-51741.

https://github.com/redis/redis/releases/tag/7.2.7
---
 pkgs/by-name/re/redis/package.nix | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/re/redis/package.nix b/pkgs/by-name/re/redis/package.nix
index 5e008b7d4d90..8e6b697aaa39 100644
--- a/pkgs/by-name/re/redis/package.nix
+++ b/pkgs/by-name/re/redis/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchurl,
-  fetchpatch,
   lua,
   jemalloc,
   pkg-config,
@@ -25,29 +24,20 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "redis";
-  version = "7.2.6";
+  version = "7.2.7";
 
   src = fetchurl {
     url = "https://download.redis.io/releases/redis-${finalAttrs.version}.tar.gz";
-    hash = "sha256-+xDWei/itFVvbLhABk3W5uMXXOjKA18HJpkOwtqfPQ4=";
+    hash = "sha256-csCB47jPrnFEJz0m12c28IMZAAr0bAFRXK1dKXZc6tU=";
   };
 
-  patches =
-    [
-      # fixes: make test [exception]: Executing test client: permission denied
-      # https://github.com/redis/redis/issues/12792
-      (fetchpatch {
-        url = "https://github.com/redis/redis/pull/12887.diff";
-        hash = "sha256-VZEMShW7Ckn5hLJHffQvE94Uly41WZW1bwvxny+Y3W8=";
-      })
-    ]
-    ++ lib.optionals useSystemJemalloc [
-      # use system jemalloc
-      (fetchurl {
-        url = "https://gitlab.archlinux.org/archlinux/packaging/packages/redis/-/raw/102cc861713c796756abd541bf341a4512eb06e6/redis-5.0-use-system-jemalloc.patch";
-        hash = "sha256-VPRfoSnctkkkzLrXEWQX3Lh5HmZaCXoJafyOG007KzM=";
-      })
-    ];
+  patches = lib.optionals useSystemJemalloc [
+    # use system jemalloc
+    (fetchurl {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/redis/-/raw/102cc861713c796756abd541bf341a4512eb06e6/redis-5.0-use-system-jemalloc.patch";
+      hash = "sha256-VPRfoSnctkkkzLrXEWQX3Lh5HmZaCXoJafyOG007KzM=";
+    })
+  ];
 
   nativeBuildInputs = [ pkg-config ];