From 089b42ea867f297e61db29ef7ed56652745b2d99 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 1 Nov 2024 10:56:33 -0500 Subject: [PATCH 1/2] tabby: darwin sdk refactor Use macos 15 since upstream CI is tied to macos-latest github action runner. --- pkgs/by-name/ta/tabby/package.nix | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/ta/tabby/package.nix b/pkgs/by-name/ta/tabby/package.nix index 03179482b4d8..273387813e11 100644 --- 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, + 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 @@ -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 ]; From 3fe4bdd2139edf1df860ac240c9aeca75a3d90f8 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 2 Nov 2024 18:20:57 -0500 Subject: [PATCH 2/2] tabby: 0.18.0 -> 0.19.0 --- pkgs/by-name/ta/tabby/Cargo.lock | 35 ++++++++++++++++--------------- pkgs/by-name/ta/tabby/package.nix | 4 ++-- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/ta/tabby/Cargo.lock b/pkgs/by-name/ta/tabby/Cargo.lock index e310f97d2622..3bc79f2f32b2 100644 --- a/pkgs/by-name/ta/tabby/Cargo.lock +++ b/pkgs/by-name/ta/tabby/Cargo.lock @@ -41,7 +41,7 @@ dependencies = [ [[package]] name = "aim-downloader" -version = "0.18.0" +version = "0.19.0" dependencies = [ "async-stream", "clap", @@ -1691,7 +1691,7 @@ dependencies = [ [[package]] name = "hash-ids" -version = "0.18.0" +version = "0.19.0" [[package]] name = "hashbrown" @@ -1875,7 +1875,7 @@ dependencies = [ [[package]] name = "http-api-bindings" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "async-openai", @@ -2538,7 +2538,7 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "llama-cpp-server" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "async-openai", @@ -3066,7 +3066,7 @@ dependencies = [ [[package]] name = "ollama-api-bindings" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "async-stream", @@ -4980,7 +4980,7 @@ dependencies = [ [[package]] name = "tabby" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "assert-json-diff", @@ -5030,7 +5030,7 @@ dependencies = [ [[package]] name = "tabby-common" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "async-trait", @@ -5058,7 +5058,7 @@ dependencies = [ [[package]] name = "tabby-crawler" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "async-stream", @@ -5077,7 +5077,7 @@ dependencies = [ [[package]] name = "tabby-db" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "assert_matches", @@ -5095,7 +5095,7 @@ dependencies = [ [[package]] name = "tabby-db-macros" -version = "0.18.0" +version = "0.19.0" dependencies = [ "quote", "syn 2.0.66", @@ -5103,10 +5103,11 @@ dependencies = [ [[package]] name = "tabby-download" -version = "0.18.0" +version = "0.19.0" dependencies = [ "aim-downloader", "anyhow", + "serial_test 3.1.1", "tabby-common", "tokio-retry", "tracing", @@ -5114,7 +5115,7 @@ dependencies = [ [[package]] name = "tabby-git" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "assert_matches", @@ -5135,7 +5136,7 @@ dependencies = [ [[package]] name = "tabby-index" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "async-stream", @@ -5177,7 +5178,7 @@ dependencies = [ [[package]] name = "tabby-index-cli" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "clap", @@ -5189,7 +5190,7 @@ dependencies = [ [[package]] name = "tabby-inference" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "async-openai", @@ -5206,7 +5207,7 @@ dependencies = [ [[package]] name = "tabby-schema" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "async-trait", @@ -5231,7 +5232,7 @@ dependencies = [ [[package]] name = "tabby-webserver" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "argon2", diff --git a/pkgs/by-name/ta/tabby/package.nix b/pkgs/by-name/ta/tabby/package.nix index 273387813e11..725cbb669f66 100644 --- a/pkgs/by-name/ta/tabby/package.nix +++ b/pkgs/by-name/ta/tabby/package.nix @@ -31,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") @@ -120,7 +120,7 @@ rustPlatform.buildRustPackage { owner = "TabbyML"; repo = "tabby"; rev = "refs/tags/v${version}"; - hash = "sha256-8clEBWAT+HI2eecOsmldgRcA58Ehq9bZT4ZwUMm494g="; + hash = "sha256-RK81gQ5IUzZ4HXJbKBr5bqayH0Xip6ZVAgdMwqP+kx8="; fetchSubmodules = true; };