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.

Sign up for GitHub

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

Jump to bottom

tabby: v0.23.1 -> v0.24.0 #381784

Merged
merged 2 commits into from
Feb 14, 2025
Merged

tabby: v0.23.1 -> v0.24.0 #381784

merged 2 commits into from
Feb 14, 2025

Conversation

qxrein
Copy link
Member

@qxrein qxrein commented Feb 13, 2025

ISSUE linked: #381776

  • Fix CUDA build issues (Fixes tabbyml/tabby: cannot build with CUDA enabled #380441)

    • Add cmake as dependency for CUDA builds
    • Remove explicit "cuda" feature flag to avoid file collisions
    • Rely on overridden llama-cpp package for CUDA support
    • Add safety check to remove llama-server before symlinking

  • Code cleanup and improvements:

    • Simplify cargo build flags configuration
    • Remove unnecessary Cargo.lock file dependency
    • Use "--workspace" instead of "--package tabby" for better maintainability
    • Remove redundant build feature conditionals

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 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.

guylamar2006
guylamar2006 suggested changes Feb 13, 2025
View reviewed changes
Copy link
Contributor

@guylamar2006 guylamar2006 left a comment

Choose a reason for hiding this comment

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

Trailing whitespace.

pkgs/by-name/ta/tabby/package.nix Outdated Show resolved Hide resolved
@qxrein qxrein force-pushed the pewpepwmeep branch 4 times, most recently from 384d79f to d62fa13 Compare February 13, 2025 16:02
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux 10.rebuild-darwin: 1 10.rebuild-darwin: 1-10 10.rebuild-linux: 1 10.rebuild-linux: 1-10 and removed 10.rebuild-darwin: 1 10.rebuild-darwin: 1-10 10.rebuild-linux: 1 10.rebuild-linux: 1-10 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Feb 13, 2025
@qxrein qxrein requested review from khaneliman and msanft February 13, 2025 17:15
@donovanglover
Copy link
Member

@ghthor Did you ever join the NixOS organization? I'm unable to add you as a reviewer

msanft
msanft reviewed Feb 13, 2025
View reviewed changes
Copy link
Contributor

@msanft msanft left a comment

Choose a reason for hiding this comment

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

Diff LGTM, but I don't have the expertise to review this package

khaneliman
khaneliman requested changes Feb 13, 2025
View reviewed changes
Copy link
Contributor

@khaneliman khaneliman left a comment

Choose a reason for hiding this comment

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

Can you separate the refactor from the version bump commit, please.

pkgs/by-name/ta/tabby/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/ta/tabby/package.nix Show resolved Hide resolved
@khaneliman khaneliman mentioned this pull request Feb 13, 2025
Merged
13 tasks
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux and removed 10.rebuild-darwin: 1-10 10.rebuild-linux: 1 10.rebuild-linux: 1-10 labels Feb 14, 2025
@github-actions github-actions bot added the 6.topic: pantheon The Pantheon desktop environment label Feb 14, 2025
@github-actions github-actions bot removed the 6.topic: pantheon The Pantheon desktop environment label Feb 14, 2025
@github-actions github-actions bot removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Feb 14, 2025
@khaneliman
Copy link
Contributor

Appreciate your patience, was thinking more like tabby: set update script -> tabby: use useFetchCargoVendor

@qxrein
Copy link
Member Author

qxrein commented Feb 14, 2025

looks like its done lol.

khaneliman
khaneliman approved these changes Feb 14, 2025
View reviewed changes
Copy link
Contributor

@khaneliman khaneliman left a comment

Choose a reason for hiding this comment

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

LGTM

@khaneliman
Copy link
Contributor

khaneliman commented Feb 14, 2025 •
edited
Loading

Actually, looks like we need a commit for adding cmake dependency for CUDA. I think that got dropped in the shuffle

@qxrein
Copy link
Member Author

qxrein commented Feb 14, 2025

done thanks for pointing that

@qxrein qxrein changed the title tabby: v0.23.0 -> v0.24.0 tabby: v0.23.1 -> v0.24.0 Feb 14, 2025
@khaneliman
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 381784

x86_64-linux

✅ 1 package built:
  • tabby

aarch64-linux

✅ 1 package built:
  • tabby

x86_64-darwin

⏩ 1 package marked as broken and skipped:
  • tabby

aarch64-darwin

✅ 1 package built:
  • tabby

@khaneliman khaneliman merged commit fdfe825 into NixOS:master Feb 14, 2025
34 of 35 checks passed
@qxrein qxrein deleted the pewpepwmeep branch February 14, 2025 20:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@msanft msanft msanft left review comments

@khaneliman khaneliman khaneliman approved these changes

@guylamar2006 guylamar2006 guylamar2006 approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

tabbyml/tabby: cannot build with CUDA enabled
5 participants
@qxrein @donovanglover @khaneliman @guylamar2006 @msanft