tabby: darwin sdk refactor; 0.18.0 -> 0.19.0 (#352908)

NixOS · Nov 3, 2024 · 181c598 · 181c598
2 parents c68cdfe + 3fe4bdd
commit 181c598
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 37 deletions.
diff --git a/pkgs/by-name/ta/tabby/Cargo.lock b/pkgs/by-name/ta/tabby/Cargo.lock
diff --git a/pkgs/by-name/ta/tabby/package.nix b/pkgs/by-name/ta/tabby/package.nix
@@ -13,17 +13,15 @@
 
   llama-cpp,
 
+  apple-sdk_15,
   autoAddDriverRunpath,
-  cudaSupport ? config.cudaSupport,
+  versionCheckHook,
 
+  cudaSupport ? config.cudaSupport,
   rocmSupport ? config.rocmSupport,
-
-  darwin,
   metalSupport ? stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64,
-
   # one of [ null "cpu" "rocm" "cuda" "metal" ];
   acceleration ? null,
-  versionCheckHook,
 }:
 
 let
@@ -33,7 +31,7 @@ let
   # https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/ollama/default.nix
 
   pname = "tabby";
-  version = "0.18.0";
+  version = "0.19.0";
 
   availableAccelerations = flatten [
     (optional cudaSupport "cuda")
@@ -106,19 +104,9 @@ let
   # TODO(ghthor): some of this can be removed
   darwinBuildInputs =
     [ llamaccpPackage ]
-    ++ optionals stdenv.hostPlatform.isDarwin (
-      with darwin.apple_sdk.frameworks;
-      [
-        Foundation
-        Accelerate
-        CoreVideo
-        CoreGraphics
-      ]
-      ++ optionals enableMetal [
-        Metal
-        MetalKit
-      ]
-    );
+    ++ optionals stdenv.hostPlatform.isDarwin ([
+      apple-sdk_15
+    ]);
 
   cudaBuildInputs = [ llamaccpPackage ];
   rocmBuildInputs = [ llamaccpPackage ];
@@ -132,7 +120,7 @@ rustPlatform.buildRustPackage {
     owner = "TabbyML";
     repo = "tabby";
     rev = "refs/tags/v${version}";
-    hash = "sha256-8clEBWAT+HI2eecOsmldgRcA58Ehq9bZT4ZwUMm494g=";
+    hash = "sha256-RK81gQ5IUzZ4HXJbKBr5bqayH0Xip6ZVAgdMwqP+kx8=";
     fetchSubmodules = true;
   };