diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-01-06 02:12:23 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-01-06 02:12:23 +0100 |
| commit | f34a1b70eb86e4a63cfb88ea460345bb1aed88e3 (patch) | |
| tree | 32834d23912250e0c4b86aa4420baacf8091c0fe /nixpkgs/pkgs/tools/misc/ollama | |
| parent | 003ab91dd67b093890db1dd0bab564345db6e496 (diff) | |
| parent | 7a7cfff8915e06365bc2365ff33d4d413184fa9f (diff) | |
| download | nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.gz nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.bz2 nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.lz nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.xz nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.zst nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/pkgs/tools/misc/ollama')
| -rw-r--r-- | nixpkgs/pkgs/tools/misc/ollama/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/tools/misc/ollama/default.nix b/nixpkgs/pkgs/tools/misc/ollama/default.nix index c0ac7f415f95..2176582e1fe9 100644 --- a/nixpkgs/pkgs/tools/misc/ollama/default.nix +++ b/nixpkgs/pkgs/tools/misc/ollama/default.nix @@ -2,18 +2,17 @@ , buildGoModule , fetchFromGitHub , llama-cpp -, stdenv }: buildGoModule rec { pname = "ollama"; - version = "0.1.11"; + version = "0.1.17"; src = fetchFromGitHub { owner = "jmorganca"; repo = "ollama"; rev = "v${version}"; - hash = "sha256-Jc6w+zQS/L3GKbfCaJO281LAgVdxNrseT0GX04N9MMY="; + hash = "sha256-eXukNn9Lu1hF19GEi7S7a96qktsjnmXCUp38gw+3MzY="; }; patches = [ @@ -28,9 +27,10 @@ buildGoModule rec { postPatch = '' substituteInPlace llm/llama.go \ --subst-var-by llamaCppServer "${llama-cpp}/bin/llama-cpp-server" + substituteInPlace server/routes_test.go --replace "0.0.0" "${version}" ''; - vendorHash = "sha256-fuSHaDDpkuQThYVNoEjnHgWkgh/LFLNHNss5Gezlv5w="; + vendorHash = "sha256-yGdCsTJtvdwHw21v0Ot6I8gxtccAvNzZyRu1T0vaius="; ldflags = [ "-s" |