diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2024-09-27 11:41:25 +0200 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2024-09-27 11:41:25 +0200 |
| commit | b341506a8d18d8d5d47ed4dbb201c8ed04b183d1 (patch) | |
| tree | aa477119c53f4d71f3cfceb0f827b92e1c13351b /pkgs/by-name/ll/llama-cpp/package.nix | |
| parent | b6b063bdc265990fb87781682da974578b16443c (diff) | |
| parent | fdadb5f0df5d2641c7e4494f4defc31f1e9cb8c0 (diff) | |
Merge branch master into haskell-updates haskell-updates
Conflicts from #341407 resolved.
Diffstat (limited to 'pkgs/by-name/ll/llama-cpp/package.nix')
| -rw-r--r-- | pkgs/by-name/ll/llama-cpp/package.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 3b943a83cb65d..1a600461232a0 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -20,7 +20,7 @@ , blas , pkg-config -, metalSupport ? stdenv.isDarwin && stdenv.isAarch64 && !openclSupport +, metalSupport ? stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 && !openclSupport , vulkanSupport ? false , rpcSupport ? false , shaderc @@ -69,13 +69,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "3672"; + version = "3772"; src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; rev = "refs/tags/b${finalAttrs.version}"; - hash = "sha256-m9mMmvIasoJkj0DAx/6TLdt5Qflbe1JqaU1VQ/8bEG0="; + hash = "sha256-gJFCFhppaXs/9GReEjEZiU/BZ51pjl7IBsUN04uTls0="; leaveDotGit = true; postFetch = '' git -C "$out" rev-parse --short HEAD > $out/COMMIT @@ -98,7 +98,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { autoAddDriverRunpath ]; - buildInputs = optionals effectiveStdenv.isDarwin darwinBuildInputs + buildInputs = optionals effectiveStdenv.hostPlatform.isDarwin darwinBuildInputs ++ optionals cudaSupport cudaBuildInputs ++ optionals openclSupport [ clblast ] ++ optionals rocmSupport rocmBuildInputs @@ -163,6 +163,6 @@ effectiveStdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ dit7ya elohmeier philiptaron ]; platforms = platforms.unix; badPlatforms = optionals (cudaSupport || openclSupport) lib.platforms.darwin; - broken = (metalSupport && !effectiveStdenv.isDarwin); + broken = (metalSupport && !effectiveStdenv.hostPlatform.isDarwin); }; }) |