From a466ab78f65e98f7c5123c8720a596275901cef7 Mon Sep 17 00:00:00 2001 From: Antoine Viallon Date: Fri, 28 Feb 2025 10:44:03 +0100 Subject: [PATCH] Revert "[Desktop/Developer] use ollama from nixpkgs unstable (rebuilt with callPackage)" This reverts commit 1930e7fc17ae12c23c523ba8a547492dd1b869ce. --- desktop/developer.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/desktop/developer.nix b/desktop/developer.nix index df230b1..e82ac2b 100644 --- a/desktop/developer.nix +++ b/desktop/developer.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, nixpkgs-unstable, ... }: +{ config, pkgs, lib, ... }: with lib; let cfg = config.aviallon.developer; @@ -131,10 +131,10 @@ in { user = "ollama"; package = if config.aviallon.hardware.amd.enable - then (pkgs.callPackage (nixpkgs-unstable + "pkgs/by-name/ol/ollama") { acceleration = "rocm"; }) + then pkgs.unstable.ollama-rocm else if (config.aviallon.hardware.nvidia.enable && config.aviallon.hardware.nvidia.variant != "nouveau") - then (pkgs.callPackage (nixpkgs-unstable + "pkgs/by-name/ol/ollama") { acceleration = "cuda"; }) - else (pkgs.callPackage (nixpkgs-unstable + "pkgs/by-name/ol/ollama") {}) + then pkgs.unstable.ollama-cuda + else pkgs.unstable.ollama ; };