Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ollama: 0.1.30 -> 0.1.31 #303708

Merged
merged 2 commits into from
Apr 14, 2024
Merged

ollama: 0.1.30 -> 0.1.31 #303708

merged 2 commits into from
Apr 14, 2024

Conversation

abysssol
Copy link
Contributor

Description of changes

Update ollama to 0.1.31, as well as defaulting to config.rocmSupport or config.cudaSupport if acceleration isn't specified.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@abysssol abysssol requested a review from drupol April 12, 2024 20:47
Copy link
Contributor

@drupol drupol left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Apr 12, 2024
@ofborg ofborg bot requested review from elohmeier and dit7ya April 12, 2024 21:14

, config
# one of `[ null "rocm" "cuda" ]`
, acceleration ? null
Copy link
Contributor

@SomeoneSerge SomeoneSerge Apr 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd consider adding the explicit false variant which would produce the cpu-only ollama regardless of nixpkgs' instantiation. It can be confusing that (import <nixpkgs> { config.cudaSupport = true }).ollama.override { acceleration = null; } still produces the cuda variant

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A side note on this name: if we happen to add a package named "acceleration" at some point, this is going to break eval:) It might be prudent to change it early, say ollamaAcceleration

Copy link
Contributor Author

@abysssol abysssol Apr 14, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would like to keep the nixos option named the same as the package parameter if at all possible. Are there any rules on package naming across all of nixpkgs? Such as no underscores, only dashes, or anything along those lines? So I can figure out a nice name that would be fitting and that won't cause conflicts in the future.

pkgs/tools/misc/ollama/default.nix Outdated Show resolved Hide resolved
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Apr 13, 2024
@wegank wegank removed the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Apr 14, 2024
@drupol drupol merged commit 5d67f42 into NixOS:master Apr 14, 2024
25 checks passed
@abysssol abysssol deleted the update-ollama-0.1.31 branch April 15, 2024 06:08
@abysssol abysssol mentioned this pull request May 19, 2024
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants