From ad08e4c7100dc607350cc3b80ee1320ce35a476b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 11 Dec 2025 03:28:57 +0000
Subject: [PATCH 1/2] valkey: 8.1.4 -> 9.0.1

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

diff --git a/pkgs/by-name/va/valkey/package.nix b/pkgs/by-name/va/valkey/package.nix
index bfa1a3a01e25..76959d63576b 100644
--- a/pkgs/by-name/va/valkey/package.nix
+++ b/pkgs/by-name/va/valkey/package.nix
@@ -25,13 +25,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "valkey";
-  version = "8.1.4";
+  version = "9.0.1";
 
   src = fetchFromGitHub {
     owner = "valkey-io";
     repo = "valkey";
     rev = finalAttrs.version;
-    hash = "sha256-obtmiDobMs/POqYH5XjqpzmjVrEC6gUsTc1rREDJ8tw=";
+    hash = "sha256-Y0jJIS2DSJWQJK0Uyzyb/WSHTE/uQZefRidf0hRQwNU=";
   };
 
   patches = lib.optional useSystemJemalloc ./use_system_jemalloc.patch;

From 5b01520e86b2b9bb6ffc4922f017a4315d9bf912 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 27 Dec 2025 14:33:01 +0100
Subject: [PATCH 2/2] python3Packages.valkey: fix valkey 9.0 compat

and disable failing test on Python 3.12 and earlier.
---
 pkgs/development/python-modules/valkey/default.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/development/python-modules/valkey/default.nix b/pkgs/development/python-modules/valkey/default.nix
index 793104f20e05..3ea3640deebf 100644
--- a/pkgs/development/python-modules/valkey/default.nix
+++ b/pkgs/development/python-modules/valkey/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   buildPythonPackage,
   pythonOlder,
 
@@ -40,6 +41,14 @@ buildPythonPackage rec {
     hash = "sha256-woJYfgLNIVzTYj9q8IjXo+SXhQZkQdB/Ofv5StGy9Rc=";
   };
 
+  patches = [
+    (fetchpatch {
+      # valkey 9.0 compat
+      url = "https://github.com/valkey-io/valkey-py/commit/c01505e547f614f278b882a016557b6ed652bb9f.patch";
+      hash = "sha256-rvA65inIioqdc+QV4KaaUv1I/TMZUq0TWaFJcJiy8NU=";
+    })
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = lib.optionals (pythonOlder "3.11") [ async-timeout ];
@@ -92,6 +101,10 @@ buildPythonPackage rec {
     #  OSError: AF_UNIX path too long
     "test_uds_connect"
     "test_network_connection_failure"
+  ]
+  ++ lib.optionals (pythonOlder "3.13") [
+    # multiple disconnects are counted instead of just one
+    "test_valkey_from_pool"
   ];
 
   disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [