Unverified Commit c9c6f48c authored by abysssol's avatar abysssol Committed by GitHub
Browse files

Merge pull request #319205 from abysssol/ollama-nix-cache 

ollama: add overridden versions of ollama to `all-packages.nix`
parents 0b3a8c06 d76cd935

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

+11 −6
Original line number Diff line number Diff line
@@ -7,9 +7,7 @@ 
, overrideCC

, makeWrapper

, stdenv

, nixosTests



, pkgs

, cmake

, gcc12

, clblast
@@ -19,8 +17,11 @@ 
, linuxPackages

, darwin



, nixosTests

, testers

, ollama

, ollama-rocm

, ollama-cuda



, config

  # one of `[ null false "rocm" "cuda" ]`
@@ -198,20 +199,24 @@ goBuild ((lib.optionalAttrs enableRocm { 


  passthru.tests = {

    service = nixosTests.ollama;

    rocm = pkgs.ollama.override { acceleration = "rocm"; };

    cuda = pkgs.ollama.override { acceleration = "cuda"; };

    version = testers.testVersion {

      inherit version;

      package = ollama;

    };

  } // stdenv.isLinux {

    inherit ollama-rocm ollama-cuda;

  };



  meta = {

    description = "Get up and running with large language models locally";

    description = "Get up and running with large language models locally"

      + lib.optionalString enableRocm ", using ROCm for AMD GPU acceleration"

      + lib.optionalString enableCuda ", using CUDA for NVIDIA GPU acceleration";

    homepage = "https://github.com/ollama/ollama";

    changelog = "https://github.com/ollama/ollama/releases/tag/v${version}";

    license = licenses.mit;

    platforms = platforms.unix;

    platforms =

      if (enableRocm || enableCuda) then platforms.linux

      else platforms.unix;

    mainProgram = "ollama";

    maintainers = with maintainers; [ abysssol dit7ya elohmeier roydubnium ];

  };

pkgs/top-level/all-packages.nix

+3 −0
Original line number Diff line number Diff line
@@ -812,6 +812,9 @@ with pkgs; 














  oletools = with python3.pkgs; toPythonApplication oletools;



























  ollama-rocm = callPackage ../by-name/ol/ollama/package.nix { acceleration = "rocm"; };













  ollama-cuda = callPackage ../by-name/ol/ollama/package.nix { acceleration = "cuda"; };



























  ots = callPackage ../tools/security/ots {  };





























  credential-detector = callPackage ../tools/security/credential-detector { };