ollama: 0.12.3 -> 0.12.5 (#452000)
This commit is contained in:
@@ -3,8 +3,7 @@
|
|||||||
buildGoModule,
|
buildGoModule,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
buildEnv,
|
buildEnv,
|
||||||
linkFarm,
|
makeBinaryWrapper,
|
||||||
makeWrapper,
|
|
||||||
stdenv,
|
stdenv,
|
||||||
addDriverRunpath,
|
addDriverRunpath,
|
||||||
nix-update-script,
|
nix-update-script,
|
||||||
@@ -20,9 +19,11 @@
|
|||||||
autoAddDriverRunpath,
|
autoAddDriverRunpath,
|
||||||
apple-sdk_15,
|
apple-sdk_15,
|
||||||
|
|
||||||
|
versionCheckHook,
|
||||||
|
writableTmpDirAsHomeHook,
|
||||||
|
|
||||||
# passthru
|
# passthru
|
||||||
nixosTests,
|
nixosTests,
|
||||||
testers,
|
|
||||||
ollama,
|
ollama,
|
||||||
ollama-rocm,
|
ollama-rocm,
|
||||||
ollama-cuda,
|
ollama-cuda,
|
||||||
@@ -117,13 +118,13 @@ in
|
|||||||
goBuild (finalAttrs: {
|
goBuild (finalAttrs: {
|
||||||
pname = "ollama";
|
pname = "ollama";
|
||||||
# don't forget to invalidate all hashes each update
|
# don't forget to invalidate all hashes each update
|
||||||
version = "0.12.3";
|
version = "0.12.5";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ollama";
|
owner = "ollama";
|
||||||
repo = "ollama";
|
repo = "ollama";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-ooDGwTklGJ/wzDlAY3uJiqpZUxT1cCsqVNJKU8BAPbQ=";
|
hash = "sha256-X5xxM53DfN8EW29hfJiAeADKLvKdmdNYE2NBa05T82k=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-SlaDsu001TUW+t9WRp7LqxUSQSGDF1Lqu9M1bgILoX4=";
|
vendorHash = "sha256-SlaDsu001TUW+t9WRp7LqxUSQSGDF1Lqu9M1bgILoX4=";
|
||||||
@@ -148,7 +149,7 @@ goBuild (finalAttrs: {
|
|||||||
]
|
]
|
||||||
++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ]
|
++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ]
|
||||||
++ lib.optionals (enableRocm || enableCuda) [
|
++ lib.optionals (enableRocm || enableCuda) [
|
||||||
makeWrapper
|
makeBinaryWrapper
|
||||||
autoAddDriverRunpath
|
autoAddDriverRunpath
|
||||||
];
|
];
|
||||||
|
|
||||||
@@ -214,8 +215,6 @@ goBuild (finalAttrs: {
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
ldflags = [
|
ldflags = [
|
||||||
"-s"
|
|
||||||
"-w"
|
|
||||||
"-X=github.com/ollama/ollama/version.Version=${finalAttrs.version}"
|
"-X=github.com/ollama/ollama/version.Version=${finalAttrs.version}"
|
||||||
"-X=github.com/ollama/ollama/server.mode=release"
|
"-X=github.com/ollama/ollama/server.mode=release"
|
||||||
];
|
];
|
||||||
@@ -237,13 +236,17 @@ goBuild (finalAttrs: {
|
|||||||
in
|
in
|
||||||
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
|
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
|
||||||
|
|
||||||
|
doInstallCheck = true;
|
||||||
|
nativeInstallCheckInputs = [
|
||||||
|
versionCheckHook
|
||||||
|
writableTmpDirAsHomeHook
|
||||||
|
];
|
||||||
|
versionCheckKeepEnvironment = "HOME";
|
||||||
|
versionCheckProgramArg = "--version";
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
tests = {
|
tests = {
|
||||||
inherit ollama;
|
inherit ollama;
|
||||||
version = testers.testVersion {
|
|
||||||
inherit (finalAttrs) version;
|
|
||||||
package = ollama;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
// lib.optionalAttrs stdenv.hostPlatform.isLinux {
|
// lib.optionalAttrs stdenv.hostPlatform.isLinux {
|
||||||
inherit ollama-rocm ollama-cuda;
|
inherit ollama-rocm ollama-cuda;
|
||||||
|
|||||||
Reference in New Issue
Block a user