From 4ca863b859ed2427b51a68e5df24ea03bf75f287 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 24 Jan 2026 23:57:10 +0000 Subject: [PATCH 1/5] python3Packages.vllm: 0.14.0 -> 0.14.1 Diff: https://github.com/vllm-project/vllm/compare/v0.14.0...v0.14.1 Changelog: https://github.com/vllm-project/vllm/releases/tag/v0.14.1 (cherry picked from commit a1fe3d6f7e61ae658f7626f0176210e716f53631) --- pkgs/development/python-modules/vllm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix index fb030ed2665be..1e16592f08716 100644 --- a/pkgs/development/python-modules/vllm/default.nix +++ b/pkgs/development/python-modules/vllm/default.nix @@ -299,7 +299,7 @@ in buildPythonPackage rec { pname = "vllm"; - version = "0.11.2"; + version = "0.14.1"; pyproject = true; stdenv = torch.stdenv; @@ -307,8 +307,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vllm-project"; repo = "vllm"; - tag = "v${version}"; - hash = "sha256-DoSlkFmR3KKEtfSfdRB++0CZeeXgxmM3zZjONlxbe8U="; + tag = "v${finalAttrs.version}"; + hash = "sha256-qoC3RpjnqbMR3JwkJfquIyuXhLyW+uGG+zSCCek4G2U="; }; patches = [ From 3c3219c081d395eb6b2dc5287298534ec579e45e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 31 Jan 2026 12:20:26 +0000 Subject: [PATCH 2/5] python3Packages.vllm: 0.14.1 -> 0.15.0 Diff: https://github.com/vllm-project/vllm/compare/v0.14.1...v0.15.0 Changelog: https://github.com/vllm-project/vllm/releases/tag/v0.15.0 (cherry picked from commit 715481ee1c4b46027087deff497d408e1111091b) --- pkgs/development/python-modules/vllm/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix index 1e16592f08716..cdf37abf73f00 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.14.1"; + version = "0.15.0"; pyproject = true; stdenv = torch.stdenv; @@ -308,7 +308,7 @@ buildPythonPackage rec { owner = "vllm-project"; repo = "vllm"; tag = "v${finalAttrs.version}"; - hash = "sha256-qoC3RpjnqbMR3JwkJfquIyuXhLyW+uGG+zSCCek4G2U="; + hash = "sha256-E6F69tVN4+uws9X8wJzwRrFYuLsf7Iv88n3zcVH1geg="; }; patches = [ From 62015715b2586b511e202d96fe109357bfa0047a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 1 Feb 2026 19:08:11 +0000 Subject: [PATCH 3/5] python3Packages.kserve: use finalAttrs (cherry picked from commit 315eefb91376ddd12e6de869997c728c478faca5) --- .../python-modules/kserve/default.nix | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/kserve/default.nix b/pkgs/development/python-modules/kserve/default.nix index c547a18e5cff7..cb9d6fba55d35 100644 --- a/pkgs/development/python-modules/kserve/default.nix +++ b/pkgs/development/python-modules/kserve/default.nix @@ -51,7 +51,7 @@ tomlkit, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "kserve"; version = "0.16.0"; pyproject = true; @@ -59,11 +59,23 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kserve"; repo = "kserve"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-f6ILZMLxfckEpy7wSgCqUx89JWSnn0DbQiqRSHcQHms="; }; - sourceRoot = "${src.name}/python/kserve"; + # Fix vllm 0.12.0 compatibility + # Patch submitted upstream: https://github.com/kserve/kserve/pull/4882 + postPatch = '' + substituteInPlace kserve/protocol/rest/openai/types/__init__.py \ + --replace-fail \ + "from vllm.entrypoints.openai.protocol import EmbeddingRequest, EmbeddingResponse as Embedding, EmbeddingResponseData, EmbeddingCompletionRequest" \ + "from vllm.entrypoints.pooling.embed.protocol import EmbeddingRequest, EmbeddingResponse as Embedding, EmbeddingResponseData, EmbeddingCompletionRequest" \ + --replace-fail \ + "from vllm.entrypoints.openai.protocol import RerankRequest, RerankResponse as Rerank" \ + "from vllm.entrypoints.pooling.score.protocol import RerankRequest, RerankResponse as Rerank" + ''; + + sourceRoot = "${finalAttrs.src.name}/python/kserve"; pythonRelaxDeps = [ "fastapi" @@ -130,7 +142,7 @@ buildPythonPackage rec { pytestCheckHook tomlkit ] - ++ lib.flatten (builtins.attrValues optional-dependencies); + ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies; pythonImportsCheck = [ "kserve" ]; @@ -185,8 +197,8 @@ buildPythonPackage rec { meta = { description = "Standardized Serverless ML Inference Platform on Kubernetes"; homepage = "https://github.com/kserve/kserve/tree/master/python/kserve"; - changelog = "https://github.com/kserve/kserve/releases/tag/${src.tag}"; + changelog = "https://github.com/kserve/kserve/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ GaetanLepage ]; }; -} +}) From ef71fd5c6e6315f1703e8dea6ef4eb0b8ca77842 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 1 Feb 2026 19:08:43 +0000 Subject: [PATCH 4/5] python3Packages.kserve: fix vllm compat by updating imports (cherry picked from commit 3dc1661ab4803bac458f65bbb5faac54a578c52b) --- .../python-modules/kserve/default.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/kserve/default.nix b/pkgs/development/python-modules/kserve/default.nix index cb9d6fba55d35..8e48e98fc6ca6 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,17 +64,16 @@ buildPythonPackage (finalAttrs: { hash = "sha256-f6ILZMLxfckEpy7wSgCqUx89JWSnn0DbQiqRSHcQHms="; }; - # Fix vllm 0.12.0 compatibility - # Patch submitted upstream: https://github.com/kserve/kserve/pull/4882 - postPatch = '' - substituteInPlace kserve/protocol/rest/openai/types/__init__.py \ - --replace-fail \ - "from vllm.entrypoints.openai.protocol import EmbeddingRequest, EmbeddingResponse as Embedding, EmbeddingResponseData, EmbeddingCompletionRequest" \ - "from vllm.entrypoints.pooling.embed.protocol import EmbeddingRequest, EmbeddingResponse as Embedding, EmbeddingResponseData, EmbeddingCompletionRequest" \ - --replace-fail \ - "from vllm.entrypoints.openai.protocol import RerankRequest, RerankResponse as Rerank" \ - "from vllm.entrypoints.pooling.score.protocol import RerankRequest, RerankResponse as Rerank" - ''; + 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 = "${finalAttrs.src.name}/python/kserve"; From cec993d5e8638f34da3c5838d5dd1104fbd8634c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 4 Feb 2026 23:12:08 +0000 Subject: [PATCH 5/5] python3Packages.vllm: 0.15.0 -> 0.15.1 Diff: https://github.com/vllm-project/vllm/compare/v0.15.0...v0.15.1 Changelog: https://github.com/vllm-project/vllm/releases/tag/v0.15.1 (cherry picked from commit 80282ca350ec642a06fdba485d51390164b51704) --- pkgs/development/python-modules/kserve/default.nix | 12 ++++++------ pkgs/development/python-modules/vllm/default.nix | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/kserve/default.nix b/pkgs/development/python-modules/kserve/default.nix index 8e48e98fc6ca6..112b09379f847 100644 --- a/pkgs/development/python-modules/kserve/default.nix +++ b/pkgs/development/python-modules/kserve/default.nix @@ -52,7 +52,7 @@ tomlkit, }: -buildPythonPackage (finalAttrs: { +buildPythonPackage rec { pname = "kserve"; version = "0.16.0"; pyproject = true; @@ -60,7 +60,7 @@ buildPythonPackage (finalAttrs: { src = fetchFromGitHub { owner = "kserve"; repo = "kserve"; - tag = "v${finalAttrs.version}"; + tag = "v${version}"; hash = "sha256-f6ILZMLxfckEpy7wSgCqUx89JWSnn0DbQiqRSHcQHms="; }; @@ -75,7 +75,7 @@ buildPythonPackage (finalAttrs: { }) ]; - sourceRoot = "${finalAttrs.src.name}/python/kserve"; + sourceRoot = "${src.name}/python/kserve"; pythonRelaxDeps = [ "fastapi" @@ -142,7 +142,7 @@ buildPythonPackage (finalAttrs: { pytestCheckHook tomlkit ] - ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies; + ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "kserve" ]; @@ -197,8 +197,8 @@ buildPythonPackage (finalAttrs: { meta = { description = "Standardized Serverless ML Inference Platform on Kubernetes"; homepage = "https://github.com/kserve/kserve/tree/master/python/kserve"; - changelog = "https://github.com/kserve/kserve/releases/tag/${finalAttrs.src.tag}"; + changelog = "https://github.com/kserve/kserve/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ GaetanLepage ]; }; -}) +} diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix index cdf37abf73f00..981252a5b86aa 100644 --- a/pkgs/development/python-modules/vllm/default.nix +++ b/pkgs/development/python-modules/vllm/default.nix @@ -299,7 +299,7 @@ in buildPythonPackage rec { pname = "vllm"; - version = "0.15.0"; + version = "0.15.1"; pyproject = true; stdenv = torch.stdenv; @@ -307,8 +307,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vllm-project"; repo = "vllm"; - tag = "v${finalAttrs.version}"; - hash = "sha256-E6F69tVN4+uws9X8wJzwRrFYuLsf7Iv88n3zcVH1geg="; + tag = "v${version}"; + hash = "sha256-qsAvcOB8ugGlBqBrLfNHqaIUcxLwaXBTg8xWRnGyd94="; }; patches = [