commit f23ec9f976b86609b29a1c818cf2607a868e997a · pyrox.dev/nixpkgs

+31 -22

pkgs/by-name/ol/ollama/package.nix

···

       19
       19
        
         cudaPackages,

     

       20
       20
        
         darwin,

     

       21
       21
        
         autoAddDriverRunpath,

     

       22
       22
       +
         versionCheckHook,

     

       22
       23
        
       

     

       24
       24
       +
         # passthru

     

       23
       25
        
         nixosTests,

     

       24
       26
        
         testers,

     

       25
       27
        
         ollama,

     
···

       41
       43
        
       let

     

       42
       44
        
         pname = "ollama";

     

       43
       45
        
         # don't forget to invalidate all hashes each update

     

       44
       44
       -
         version = "0.5.1";

     

       46
       46
       +
         version = "0.5.4";

     

       45
       47
        
       

     

       46
       48
        
         src = fetchFromGitHub {

     

       47
       49
        
           owner = "ollama";

     

       48
       50
        
           repo = "ollama";

     

       49
       49
       -
           rev = "v${version}";

     

       50
       50
       -
           hash = "sha256-llsK/rMK1jf2uneqgon9gqtZcbC9PuCDxoYfC7Ta6PY=";

     

       51
       51
       +
           tag = "v${version}";

     

       52
       52
       +
           hash = "sha256-JyP7A1+u9Vs6ynOKDwun1qLBsjN+CVHIv39Hh2TYa2U=";

     

       51
       53
        
           fetchSubmodules = true;

     

       52
       54
        
         };

     

       53
       55
        
       

     
···

       169
       171
        
           ++ lib.optionals enableCuda cudaLibs

     

       170
       172
        
           ++ lib.optionals stdenv.hostPlatform.isDarwin metalFrameworks;

     

       171
       173
        
       

     

       172
       172
       -
         patches = [

     

       173
       173
       -
           # ollama's build script is unable to find hipcc

     

       174
       174
       -
           ./rocm.patch

     

       175
       175
       -
         ];

     

       176
       176
       -
       

     

       174
       174
       +
         # replace inaccurate version number with actual release version

     

       177
       175
        
         postPatch = ''

     

       178
       178
       -
           # replace inaccurate version number with actual release version

     

       179
       179
       -
           substituteInPlace version/version.go --replace-fail 0.0.0 '${version}'

     

       176
       176
       +
           substituteInPlace version/version.go \

     

       177
       177
       +
             --replace-fail 0.0.0 '${version}'

     

       180
       178
        
         '';

     

       181
       179
        
       

     

       182
       180
        
         overrideModAttrs = (

     
···

       186
       184
        
           }

     

       187
       185
        
         );

     

       188
       186
        
       

     

       189
       189
       -
         preBuild = ''

     

       187
       187
       +
         preBuild =

     

       188
       188
       +
           let

     

       189
       189
       +
             dist_cmd =

     

       190
       190
       +
               if cudaRequested then

     

       191
       191
       +
                 "dist_cuda_v${cudaMajorVersion}"

     

       192
       192
       +
               else if rocmRequested then

     

       193
       193
       +
                 "dist_rocm"

     

       194
       194
       +
               else

     

       195
       195
       +
                 "dist";

     

       196
       196
       +
           in

     

       190
       197
        
           # build llama.cpp libraries for ollama

     

       191
       191
       -
           make -j $NIX_BUILD_CORES

     

       192
       192
       -
         '';

     

       193
       193
       -
       

     

       194
       194
       -
         postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''

     

       195
       195
       -
           # copy libggml_*.so and runners into lib

     

       196
       196
       -
           # https://github.com/ollama/ollama/blob/v0.4.4/llama/make/gpu.make#L90

     

       197
       197
       -
           mkdir -p $out/lib

     

       198
       198
       -
           cp -r dist/*/lib/* $out/lib/

     

       199
       199
       -
         '';

     

       198
       198
       +
           ''

     

       199
       199
       +
             make ${dist_cmd} -j $NIX_BUILD_CORES

     

       200
       200
       +
           '';

     

       200
       201
        
       

     

       201
       202
        
         postFixup =

     

       203
       203
       +
           # the app doesn't appear functional at the moment, so hide it

     

       202
       204
        
           ''

     

       203
       203
       -
             # the app doesn't appear functional at the moment, so hide it

     

       204
       205
        
             mv "$out/bin/app" "$out/bin/.ollama-app"

     

       205
       206
        
           ''

     

       207
       207
       +
           # expose runtime libraries necessary to use the gpu

     

       206
       208
        
           + lib.optionalString (enableRocm || enableCuda) ''

     

       207
       207
       -
             # expose runtime libraries necessary to use the gpu

     

       208
       209
        
             wrapProgram "$out/bin/ollama" ${wrapperArgs}

     

       209
       210
        
           '';

     

       210
       211
        
       

     
···

       214
       215
        
           "-X=github.com/ollama/ollama/version.Version=${version}"

     

       215
       216
        
           "-X=github.com/ollama/ollama/server.mode=release"

     

       216
       217
        
         ];

     

       218
       218
       +
       

     

       219
       219
       +
         __darwinAllowLocalNetworking = true;

     

       220
       220
       +
       

     

       221
       221
       +
         nativeInstallCheck = [

     

       222
       222
       +
           versionCheckHook

     

       223
       223
       +
         ];

     

       224
       224
       +
         versionCheckProgramArg = [ "--version" ];

     

       225
       225
       +
         doInstallCheck = true;

     

       217
       226
        
       

     

       218
       227
        
         passthru = {

     

       219
       228
        
           tests =

-13

pkgs/by-name/ol/ollama/rocm.patch

···

       1
       1
       -
       diff --git a/llama/make/Makefile.rocm b/llama/make/Makefile.rocm

     

       2
       2
       -
       index 4ab176b4..cd8be223 100644

     

       3
       3
       -
       --- a/llama/make/Makefile.rocm

     

       4
       4
       -
       +++ b/llama/make/Makefile.rocm

     

       5
       5
       -
       @@ -15,7 +15,7 @@ ifeq ($(OS),windows)

     

       6
       6
       -
        	GPU_COMPILER:=$(GPU_COMPILER_WIN)

     

       7
       7
       -
        else ifeq ($(OS),linux)

     

       8
       8
       -
        	GPU_LIB_DIR_LINUX := $(HIP_PATH)/lib

     

       9
       9
       -
       -	GPU_COMPILER_LINUX := $(shell X=$$(which hipcc 2>/dev/null) && echo $$X)

     

       10
       10
       -
       +	GPU_COMPILER_LINUX := $(HIP_PATH)/bin/hipcc

     

       11
       11
       -
        	GPU_COMPILER:=$(GPU_COMPILER_LINUX)

     

       12
       12
       -
        	ROCM_TRANSITIVE_LIBS_INITIAL = $(sort $(shell ldd $(GPU_LIBS) | grep "=>" | cut -f2 -d= | cut -f2 -d' '  | grep -e rocm -e amdgpu -e libtinfo -e libnuma -e libelf))

     

       13
       13
       -
        	GPU_TRANSITIVE_LIBS = $(sort $(shell readlink -f $(ROCM_TRANSITIVE_LIBS_INITIAL)) $(ROCM_TRANSITIVE_LIBS_INITIAL))