dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gaétan Lepage 2024-11-03 22:58:58 +01:00 committed by GitHub
commit 181c598fa1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 26 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkgs/by-name/ta/tabby/Cargo.lock generated
View File

@ -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",

28
pkgs/by-name/ta/tabby/package.nix
View File

@ -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
@ -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;
};