From 226a78c3590720e8edf597c4e5b8db27561e1e2d Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 16 Sep 2026 16:42:07 +0200 Subject: [PATCH 1/2] llama-cpp: run update script only for the main package --- pkgs/by-name/ll/llama-cpp/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index a2af6b5e8025..ad84ff62aee6 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -205,12 +205,16 @@ effectiveStdenv.mkDerivation (finalAttrs: { # the tests are failing as of 2025-08 doCheck = false; - passthru = { + passthru = lib.optionalAttrs (!cudaSupport && !rocmSupport && !vulkanSupport) { updateScript = ./update.sh; }; meta = { - description = "Inference of Meta's LLaMA model (and others) in pure C/C++"; + description = + "Inference of Meta's LLaMA model (and others) in pure C/C++" + + optionalString cudaSupport ", with CUDA support" + + optionalString rocmSupport ", with ROCm support" + + optionalString vulkanSupport ", with Vulkan support"; homepage = "https://github.com/ggml-org/llama.cpp"; license = lib.licenses.mit; mainProgram = "llama"; From 9b3c63e5956362e270c8f2f980355b5b8d703d69 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 16 Sep 2026 16:42:26 +0200 Subject: [PATCH 2/2] ollama: fix update-script invocation --- pkgs/by-name/ol/ollama/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index 58c5038286e5..7f0ea47b66a6 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -383,9 +383,10 @@ goBuild (finalAttrs: { service-rocm = nixosTests.ollama-rocm; service-vulkan = nixosTests.ollama-vulkan; }; - updateScript = ./update.sh; } - // lib.optionalAttrs (!enableRocm && !enableCuda && !enableVulkan) { updateScript = ./update.sh; }; + // lib.optionalAttrs (!rocmRequested && !cudaRequested && !vulkanRequested) { + updateScript = ./update.sh; + }; meta = { description =