From eb0189224b96379b7e3d76c2393f989abed44817 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Fri, 20 Dec 2024 16:24:49 +0200 Subject: [PATCH 1/7] koboldcpp: update `cudaArches` example --- pkgs/by-name/ko/koboldcpp/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index 499c5ddd3fe1..457733e63633 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -20,7 +20,7 @@ cublasSupport ? config.cudaSupport, # You can find a full list here: https://arnon.dk/matching-sm-architectures-arch-and-gencode-for-various-nvidia-cards/ - # For example if you're on an GTX 1080 that means you're using "Pascal" and you need to pass "sm_60" + # For example if you're on an RTX 3060 that means you're using "Ampere" and you need to pass "sm_86" cudaArches ? cudaPackages.cudaFlags.realArches or [ ], clblastSupport ? stdenv.hostPlatform.isLinux, From 4bd5e1da37c506ac21862d28064977103fb805df Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Fri, 20 Dec 2024 16:25:30 +0200 Subject: [PATCH 2/7] koboldcpp: remove `gitUpdater` --- pkgs/by-name/ko/koboldcpp/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index 457733e63633..4ad4ad01a82d 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -3,7 +3,6 @@ fetchFromGitHub, stdenv, makeWrapper, - gitUpdater, python3Packages, tk, addDriverRunpath, From 415fe80741e2b2b65c4a4d5f9416d34b20cc9c69 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Fri, 20 Dec 2024 16:26:36 +0200 Subject: [PATCH 3/7] koboldcpp: drop `openblas` Upstream dropped `openblass` since v1.75 --- pkgs/by-name/ko/koboldcpp/package.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index 4ad4ad01a82d..3841ec6755c5 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -14,9 +14,6 @@ config, cudaPackages ? { }, - openblasSupport ? !stdenv.hostPlatform.isDarwin, - openblas, - cublasSupport ? config.cudaSupport, # You can find a full list here: https://arnon.dk/matching-sm-architectures-arch-and-gencode-for-various-nvidia-cards/ # For example if you're on an RTX 3060 that means you're using "Ampere" and you need to pass "sm_86" @@ -65,7 +62,6 @@ effectiveStdenv.mkDerivation (finalAttrs: { [ tk ] ++ finalAttrs.pythonInputs ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_12 ] - ++ lib.optionals openblasSupport [ openblas ] ++ lib.optionals cublasSupport [ cudaPackages.libcublas cudaPackages.cuda_nvcc @@ -81,7 +77,6 @@ effectiveStdenv.mkDerivation (finalAttrs: { pythonPath = finalAttrs.pythonInputs; makeFlags = [ - (makeBool "LLAMA_OPENBLAS" openblasSupport) (makeBool "LLAMA_CUBLAS" cublasSupport) (makeBool "LLAMA_CLBLAST" clblastSupport) (makeBool "LLAMA_VULKAN" vulkanSupport) From 0dae157805a942c99900cc40aa5e907b7c5920dc Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Fri, 20 Dec 2024 14:30:31 +0000 Subject: [PATCH 4/7] koboldcpp: 1.79.1 -> 1.80 Changelog: https://github.com/LostRuins/koboldcpp/releases/tag/v1.80 Diff: https://github.com/LostRuins/koboldcpp/compare/v1.79.1...v1.80 --- pkgs/by-name/ko/koboldcpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index 3841ec6755c5..82f586c958f2 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -40,13 +40,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "koboldcpp"; - version = "1.79.1"; + version = "1.80"; src = fetchFromGitHub { owner = "LostRuins"; repo = "koboldcpp"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-RHeEI6mJklGF7BQXxLwxSr1xD6GsI9+fio888UxKru0="; + hash = "sha256-X91sBw4YmozKwDe9Hzvk4CP3DLvw2Q6XPTBR3TaEwqg="; }; enableParallelBuilding = true; From e62a47c0c8c1f340066165e1d35dab63f519ce6a Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Fri, 20 Dec 2024 22:03:28 +0200 Subject: [PATCH 5/7] koboldcpp: add `(darwinMinVersionHook "10.15")` Bump up minimum version, so no APIs are missing --- pkgs/by-name/ko/koboldcpp/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index 82f586c958f2..ba67339e9266 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -8,6 +8,7 @@ addDriverRunpath, apple-sdk_12, + darwinMinVersionHook, koboldLiteSupport ? true, @@ -61,7 +62,10 @@ effectiveStdenv.mkDerivation (finalAttrs: { buildInputs = [ tk ] ++ finalAttrs.pythonInputs - ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_12 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_12 + (darwinMinVersionHook "10.15") + ] ++ lib.optionals cublasSupport [ cudaPackages.libcublas cudaPackages.cuda_nvcc From 1ccd253accfb140acbf9da9f56d9dc6d3aece088 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Fri, 20 Dec 2024 22:16:27 +0200 Subject: [PATCH 6/7] koboldcpp: disable vulkan for darwin It's causing build failure --- pkgs/by-name/ko/koboldcpp/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index ba67339e9266..68dfe8237d70 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -24,7 +24,7 @@ clblast, ocl-icd, - vulkanSupport ? true, + vulkanSupport ? (!stdenv.hostPlatform.isDarwin), vulkan-loader, metalSupport ? stdenv.hostPlatform.isDarwin, nix-update-script, From e57e423549cc53355e9f72449bc47501e7f367eb Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sat, 21 Dec 2024 16:49:02 +0000 Subject: [PATCH 7/7] koboldcpp: 1.80 -> 1.80.1 Changelog: https://github.com/LostRuins/koboldcpp/releases/tag/v1.80.1 Diff: https://github.com/LostRuins/koboldcpp/compare/v1.80...v1.80.1 --- pkgs/by-name/ko/koboldcpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index 68dfe8237d70..1c5b60219bde 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -41,13 +41,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "koboldcpp"; - version = "1.80"; + version = "1.80.1"; src = fetchFromGitHub { owner = "LostRuins"; repo = "koboldcpp"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-X91sBw4YmozKwDe9Hzvk4CP3DLvw2Q6XPTBR3TaEwqg="; + hash = "sha256-CgJzYF8FnHk0zKdysGJWLnNo/MND24AbQdjRbDtv0II="; }; enableParallelBuilding = true;