From 612e1e9be4b1f391b4f9d3ee8ef681b1d56a1b90 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Fri, 15 Aug 2025 22:57:54 -0400
Subject: [PATCH] moltenvk: 1.2.11 -> 1.3.0

This should solve an issue with llama-cpp-vulkan server generating
garbage tokens, as described in:

https://github.com/KhronosGroup/MoltenVK/issues/2423
https://github.com/containers/ramalama/issues/1843
---
 pkgs/by-name/mo/moltenvk/package.nix | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/mo/moltenvk/package.nix b/pkgs/by-name/mo/moltenvk/package.nix
index 4fd4aa6e6b3b..576cab57fa59 100644
--- a/pkgs/by-name/mo/moltenvk/package.nix
+++ b/pkgs/by-name/mo/moltenvk/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch2,
   gitUpdater,
   apple-sdk_15,
   cereal,
@@ -22,7 +21,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "MoltenVK";
-  version = "1.2.11";
+  version = "1.3.0";
 
   strictDeps = true;
 
@@ -48,18 +47,9 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "KhronosGroup";
     repo = "MoltenVK";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-24qQnJ0RnJP2M4zSlSlQ4c4dVZtHutNiCvjrsCDw6wY=";
+    hash = "sha256-V69P1t48XP/pAPgpVsnFeCBidhHk60XGHRkHF6AEke0=";
   };
 
-  patches = [
-    # Cherry-pick patch to fix build failure due to a hardcoded SPIRV-Cross namespace.
-    # This can be dropped for MoltenVK 1.2.12.
-    (fetchpatch2 {
-      url = "https://github.com/KhronosGroup/MoltenVK/commit/856c8237ac3b32178caae3408effc35bedfdffa1.patch?full_index=1";
-      hash = "sha256-dVTop8sU19Swdb3ajbI+6S715NaxTqd7d0yQ/FDqxqY=";
-    })
-  ];
-
   postPatch = ''
     # Move `mvkGitRevDerived.h` to a stable location
     substituteInPlace Scripts/gen_moltenvk_rev_hdr.sh \