BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #296118 from drupol/ollama/bump/0-1-29

Browse source 
ollama: 0.1.28 -> 0.1.29
This commit is contained in:
Pol Dellaiera 2024-03-15 14:18:16 +01:00 committed by GitHub
commit c2881b6794
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/tools/misc/ollama/default.nix
View file

@ -1,5 +1,5 @@
{ lib { lib
, buildGoModule , buildGo122Module
, fetchFromGitHub , fetchFromGitHub
, fetchpatch , fetchpatch
, buildEnv , buildEnv
@ -21,16 +21,19 @@
# one of `[ null "rocm" "cuda" ]` # one of `[ null "rocm" "cuda" ]`
, acceleration ? null , acceleration ? null
, testers
, ollama
}: }:
let let
pname = "ollama"; pname = "ollama";
version = "0.1.28"; version = "0.1.29";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jmorganca"; owner = "jmorganca";
repo = "ollama"; repo = "ollama";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-8f7veZitorNiqGBPJuf/Y36TcFK8Q75Vw4w6CeTk8qs="; hash = "sha256-M2G53DJF/22ZVCAb4jGjyErKO6q2argehHSV7AEef6w=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -79,9 +82,9 @@ let
goBuild = goBuild =
if enableCuda then if enableCuda then
buildGoModule.override { stdenv = overrideCC stdenv gcc12; } buildGo122Module.override { stdenv = overrideCC stdenv gcc12; }
else else
buildGoModule; buildGo122Module;
preparePatch = patch: hash: fetchpatch { preparePatch = patch: hash: fetchpatch {
url = "file://${src}/llm/patches/${patch}"; url = "file://${src}/llm/patches/${patch}";
inherit hash; inherit hash;
@ -99,7 +102,7 @@ goBuild ((lib.optionalAttrs enableRocm {
CUDAToolkit_ROOT = cudaToolkit; CUDAToolkit_ROOT = cudaToolkit;
}) // { }) // {
inherit pname version src; inherit pname version src;
vendorHash = "sha256-DPIhDqE/yXpSQqrx07osMBMafK61yU2dl4cZhxSTvm8="; vendorHash = "sha256-Lj7CBvS51RqF63c01cOCgY7BCQeCKGu794qzb/S80C0=";
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
@ -168,9 +171,14 @@ goBuild ((lib.optionalAttrs enableRocm {
service = nixosTests.ollama; service = nixosTests.ollama;
rocm = pkgs.ollama.override { acceleration = "rocm"; }; rocm = pkgs.ollama.override { acceleration = "rocm"; };
cuda = pkgs.ollama.override { acceleration = "cuda"; }; cuda = pkgs.ollama.override { acceleration = "cuda"; };
version = testers.testVersion {
inherit version;
package = ollama;
};
}; };
meta = { meta = {
changelog = "https://github.com/ollama/ollama/releases/tag/v${version}";
description = "Get up and running with large language models locally"; description = "Get up and running with large language models locally";
homepage = "https://github.com/jmorganca/ollama"; homepage = "https://github.com/jmorganca/ollama";
license = licenses.mit; license = licenses.mit;