diff --git a/pkgs/development/python-modules/kserve/default.nix b/pkgs/development/python-modules/kserve/default.nix index c547a18e5cff7..112b09379f847 100644 --- a/pkgs/development/python-modules/kserve/default.nix +++ b/pkgs/development/python-modules/kserve/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch2, # build-system setuptools, @@ -63,6 +64,17 @@ buildPythonPackage rec { hash = "sha256-f6ILZMLxfckEpy7wSgCqUx89JWSnn0DbQiqRSHcQHms="; }; + patches = [ + # Fix vllm imports in python/kserve/kserve/protocol/rest/openai/types/__init__.py + # Submitted upstream: https://github.com/kserve/kserve/pull/4882 + (fetchpatch2 { + name = "update-vllm-imports-to-fix-compat"; + url = "https://github.com/kserve/kserve/commit/dd1575501e56f588103f448efca684bc54569b81.patch"; + stripLen = 2; + hash = "sha256-K0ImsDADhH6G3R+27nRX/sD7UdRXptYIkLaoxuwB8+M="; + }) + ]; + sourceRoot = "${src.name}/python/kserve"; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix index fb030ed2665be..981252a5b86aa 100644 --- a/pkgs/development/python-modules/vllm/default.nix +++ b/pkgs/development/python-modules/vllm/default.nix @@ -117,8 +117,8 @@ let cutlass-flashmla = fetchFromGitHub { owner = "NVIDIA"; repo = "cutlass"; - tag = "v3.9.0"; - hash = "sha256-Q6y/Z6vahASeSsfxvZDwbMFHGx8CnsF90IlveeVLO9g="; + rev = "147f5673d0c1c3dcf66f78d677fd647e4a020219"; + hash = "sha256-dHQto08IwTDOIuFUp9jwm1MWkFi8v2YJ/UESrLuG71g="; }; flashmla = stdenv.mkDerivation { @@ -132,8 +132,8 @@ let name = "FlashMLA-source"; owner = "vllm-project"; repo = "FlashMLA"; - rev = "46d64a8ebef03fa50b4ae74937276a5c940e3f95"; - hash = "sha256-jtMzWB5hKz8mJGsdK6q4YpQbGp9IrQxbwmB3a64DIl0="; + rev = "c2afa9cb93e674d5a9120a170a6da57b89267208"; + hash = "sha256-pKlwxV6G9iHag/jbu3bAyvYvnu5TbrQwUMFV0AlGC3s="; }; dontConfigure = true; @@ -299,7 +299,7 @@ in buildPythonPackage rec { pname = "vllm"; - version = "0.11.2"; + version = "0.15.1"; pyproject = true; stdenv = torch.stdenv; @@ -308,7 +308,7 @@ buildPythonPackage rec { owner = "vllm-project"; repo = "vllm"; tag = "v${version}"; - hash = "sha256-DoSlkFmR3KKEtfSfdRB++0CZeeXgxmM3zZjONlxbe8U="; + hash = "sha256-qsAvcOB8ugGlBqBrLfNHqaIUcxLwaXBTg8xWRnGyd94="; }; patches = [