Unverified Commit 72a8438d authored by Adam C. Stephens's avatar Adam C. Stephens Committed by GitHub
Browse files

ollama: 0.3.10 -> 0.3.11 (#343033)

parents 10489d20 4a150a2d

pkgs/by-name/ol/ollama/disable-git.patch

+9 −7
Original line number Diff line number Diff line 
diff --git a/llm/generate/gen_common.sh b/llm/generate/gen_common.sh

index 3825c155..d22eccd2 100644

--- a/llm/generate/gen_common.sh

+++ b/llm/generate/gen_common.sh

@@ -65,6 +65,8 @@

         echo 'add_subdirectory(../ext_server ext_server) # ollama' >>${LLAMACPP_DIR}/CMakeLists.txt

     fi

@@ -69,6 +69,8 @@ git_module_setup() {

 }

 

 apply_patches() {

+    return

+

     if [ -n "$(ls -A ../patches/*.diff)" ]; then

     # apply temporary patches until fix is upstream

         for patch in ../patches/*.diff; do

@@ -110,6 +112,8 @@

     for patch in ../patches/*.patch; do

         git -c 'user.name=nobody' -c 'user.email=<>' -C ${LLAMACPP_DIR} am ${patch}

@@ -133,6 +135,8 @@ install() {

 

 # Keep the local tree clean after we're done with the build

 cleanup() {

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

+20 −15
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
  makeWrapper,

  stdenv,

  addDriverRunpath,

  nix-update-script,



  cmake,

  gcc12,
@@ -39,13 +40,13 @@ assert builtins.elem acceleration [ 
let

  pname = "ollama";

  # don't forget to invalidate all hashes each update

  version = "0.3.10";

  version = "0.3.11";



  src = fetchFromGitHub {

    owner = "ollama";

    repo = "ollama";

    rev = "v${version}";

    hash = "sha256-iNjqnhiM0L873BiBPAgI2Y0KEQyCInn2nEihzwLasFU=";

    hash = "sha256-YYrNrlXL6ytLfnrvSHybi0va0lvgVNuIRP+IFE5XZX8=";

    fetchSubmodules = true;

  };
@@ -199,7 +200,8 @@ goBuild { 
    "-X=github.com/ollama/ollama/server.mode=release"

  ];



  passthru.tests =

  passthru = {

    tests =

      {

        inherit ollama;

        version = testers.testVersion {
@@ -214,6 +216,9 @@ goBuild { 
        service-rocm = nixosTests.ollama-rocm;

      };



    updateScript = nix-update-script { };

  };



  meta = {

    description =

      "Get up and running with large language models locally"