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; 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 [