Backport 483505 to release 25.11

[daniel-fahey]

Re: #483505 (comment) and to resolve #488751.

Things done

• Built on platform:
  • x86_64-linux
  • aarch64-linux
  • x86_64-darwin
  • aarch64-darwin
• Tested, as applicable:
  • NixOS tests in nixos/tests.
  • Package tests at passthru.tests.
  • Tests in lib/tests or pkgs/test for functions and "core" functionality.
• Ran nixpkgs-review on this PR. See nixpkgs-review usage.
• Tested basic functionality of all binary files, usually in ./result/bin/.
• Nixpkgs Release Notes
  • Package update: when the change is major or breaking.
• NixOS Release Notes
  • Module addition: when adding a new NixOS module.
  • Module update: when the change is significant.
• Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

[github-actions]

This report is automatically generated by the PR / Check / cherry-pick CI workflow.

Some of the commits in this PR require the author's and reviewer's attention.

Sometimes it is not possible to cherry-pick exactly the same patch.
This most frequently happens when resolving merge conflicts.
The range-diff will help to review the resolution of conflicts.

If you need to merge this PR despite the warnings, please dismiss this review shortly before merging.

Warning

Difference between 4ca863b and original a1fe3d6 may warrant inspection.

Show diff

@@ Commit message
     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 ##
 @@ pkgs/development/python-modules/vllm/default.nix: in
  
- buildPythonPackage.override { stdenv = torch.stdenv; } (finalAttrs: {
+ buildPythonPackage rec {
    pname = "vllm";
--  version = "0.14.0";
+-  version = "0.11.2";
 +  version = "0.14.1";
    pyproject = true;
  
+   stdenv = torch.stdenv;
+@@ pkgs/development/python-modules/vllm/default.nix: buildPythonPackage rec {
    src = fetchFromGitHub {
      owner = "vllm-project";
      repo = "vllm";
-     tag = "v${finalAttrs.version}";
--    hash = "sha256-gUfEjoNgS/FgSDqQDnDe/onWGigzwkKuPgmdRZHVGn0=";
+-    tag = "v${version}";
+-    hash = "sha256-DoSlkFmR3KKEtfSfdRB++0CZeeXgxmM3zZjONlxbe8U=";
++    tag = "v${finalAttrs.version}";
 +    hash = "sha256-qoC3RpjnqbMR3JwkJfquIyuXhLyW+uGG+zSCCek4G2U=";
    };
  

Warning

Difference between 6201571 and original 315eefb may warrant inspection.

Show diff

@@ Metadata
  ## Commit message ##
     python3Packages.kserve: use finalAttrs
 
+    (cherry picked from commit 315eefb91376ddd12e6de869997c728c478faca5)
+
  ## pkgs/development/python-modules/kserve/default.nix ##
 @@
    tomlkit,
@@ pkgs/development/python-modules/kserve/default.nix: buildPythonPackage rec {
      hash = "sha256-f6ILZMLxfckEpy7wSgCqUx89JWSnn0DbQiqRSHcQHms=";
    };
  
-@@ pkgs/development/python-modules/kserve/default.nix: buildPythonPackage rec {
-         "from vllm.entrypoints.pooling.score.protocol import RerankRequest, RerankResponse as Rerank"
-   '';
- 
 -  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 = [
@@ pkgs/development/python-modules/kserve/default.nix: buildPythonPackage rec {
      pytestCheckHook
      tomlkit
    ]
--  ++ lib.concatAttrValues optional-dependencies;
+-  ++ lib.flatten (builtins.attrValues optional-dependencies);
 +  ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies;
  
    pythonImportsCheck = [ "kserve" ];

Warning

Difference between cec993d and original 80282ca may warrant inspection.

Show diff

@@ Commit message
     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 ##
+@@
+   tomlkit,
+ }:
+ 
+-buildPythonPackage (finalAttrs: {
++buildPythonPackage rec {
+   pname = "kserve";
+   version = "0.16.0";
+   pyproject = true;
+@@ pkgs/development/python-modules/kserve/default.nix: buildPythonPackage (finalAttrs: {
+   src = fetchFromGitHub {
+     owner = "kserve";
+     repo = "kserve";
+-    tag = "v${finalAttrs.version}";
++    tag = "v${version}";
+     hash = "sha256-f6ILZMLxfckEpy7wSgCqUx89JWSnn0DbQiqRSHcQHms=";
+   };
+ 
+@@ pkgs/development/python-modules/kserve/default.nix: buildPythonPackage (finalAttrs: {
+     })
+   ];
+ 
+-  sourceRoot = "${finalAttrs.src.name}/python/kserve";
++  sourceRoot = "${src.name}/python/kserve";
+ 
+   pythonRelaxDeps = [
+     "fastapi"
+@@ pkgs/development/python-modules/kserve/default.nix: buildPythonPackage (finalAttrs: {
+     pytestCheckHook
+     tomlkit
+   ]
+-  ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies;
++  ++ lib.flatten (builtins.attrValues optional-dependencies);
+ 
+   pythonImportsCheck = [ "kserve" ];
+ 
+@@ pkgs/development/python-modules/kserve/default.nix: 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 ];
+   };
+-})
++}
 
  ## pkgs/development/python-modules/vllm/default.nix ##
 @@ pkgs/development/python-modules/vllm/default.nix: in
  
- buildPythonPackage.override { stdenv = torch.stdenv; } (finalAttrs: {
+ buildPythonPackage rec {
    pname = "vllm";
 -  version = "0.15.0";
 +  version = "0.15.1";
    pyproject = true;
  
+   stdenv = torch.stdenv;
+@@ pkgs/development/python-modules/vllm/default.nix: buildPythonPackage rec {
    src = fetchFromGitHub {
      owner = "vllm-project";
      repo = "vllm";
-     tag = "v${finalAttrs.version}";
+-    tag = "v${finalAttrs.version}";
 -    hash = "sha256-E6F69tVN4+uws9X8wJzwRrFYuLsf7Iv88n3zcVH1geg=";
++    tag = "v${version}";
 +    hash = "sha256-qsAvcOB8ugGlBqBrLfNHqaIUcxLwaXBTg8xWRnGyd94=";
    };
  

Hint: The full diffs are also available in the runner logs with slightly better highlighting.