Skip to content

[staging] shaderc: 2024.0 -> 2025.2, koboldcpp: 1.86.2 -> 1.92 #401421

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
Merged
JohnRTitor merged 4 commits into from
May 29, 2025
Merged

[staging] shaderc: 2024.0 -> 2025.2, koboldcpp: 1.86.2 -> 1.92 #401421

JohnRTitor merged 4 commits into from
May 29, 2025

Conversation

@FlameFlag
Copy link
Member

@FlameFlag FlameFlag commented Apr 24, 2025 •
edited
Loading

Things done

Changelog: https://github.com/LostRuins/koboldcpp/releases/tag/v1.92
Diff: LostRuins/koboldcpp@v1.86.2...v1.92

  • 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.

@github-actions github-actions bot added 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Apr 24, 2025
@nix-owners nix-owners bot requested a review from maxstrid April 24, 2025 12:06
@FlameFlag
Copy link
Member Author

FlameFlag commented Apr 24, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 401421

x86_64-linux

❌ 1 package failed to build:
  • koboldcpp

@FlameFlag FlameFlag marked this pull request as draft April 24, 2025 12:52
@FlameFlag FlameFlag force-pushed the update-koboldcpp branch 2 times, most recently from 81f2a24 to 1d6581b Compare April 29, 2025 16:48
@FlameFlag FlameFlag changed the title koboldcpp: 1.86.2 -> 1.89 shaderc: 2024.0 -> 2025.2, koboldcpp: 1.86.2 -> 1.90 Apr 29, 2025
@github-actions github-actions bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. and removed 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Apr 29, 2025
@FlameFlag FlameFlag changed the base branch from master to staging April 29, 2025 17:10
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: haskell General-purpose, statically typed, purely functional programming language 8.has: changelog This PR adds or changes release notes 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: erlang General-purpose, concurrent, functional high-level programming language 6.topic: lib The Nixpkgs function library 6.topic: teams Relating to team creation, updates, other management actions and removed 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: haskell General-purpose, statically typed, purely functional programming language labels Apr 29, 2025
@FlameFlag FlameFlag changed the title shaderc: 2024.0 -> 2025.2, koboldcpp: 1.86.2 -> 1.90 [staging] shaderc: 2024.0 -> 2025.2, koboldcpp: 1.86.2 -> 1.90 Apr 29, 2025
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Apr 29, 2025
@FlameFlag FlameFlag marked this pull request as ready for review April 29, 2025 17:42
@FlameFlag FlameFlag changed the title [staging] shaderc: 2024.0 -> 2025.2, koboldcpp: 1.86.2 -> 1.90 [staging] shaderc: 2024.0 -> 2025.2, koboldcpp: 1.86.2 -> 1.91 May 17, 2025
@FlameFlag FlameFlag added the backport staging-25.05 Backport PR automatically label May 22, 2025
@github-actions github-actions bot added the 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. label May 22, 2025
@FlameFlag
Copy link
Member Author

FlameFlag commented May 23, 2025

@ofborg eval

@FlameFlag FlameFlag changed the title [staging] shaderc: 2024.0 -> 2025.2, koboldcpp: 1.86.2 -> 1.91 [staging] shaderc: 2024.0 -> 2025.2, koboldcpp: 1.86.2 -> 1.92 May 24, 2025
@FlameFlag
Copy link
Member Author

FlameFlag commented May 26, 2025

x86_64-linux checks passed, and aarch64-darwin https://github.com/NixOS/nixpkgs/pull/401421/checks?check_run_id=42859539302 should work. But, Ofborg cut the LLVM compilation short, causing all dependencies to fail.

aarch64-linux https://github.com/NixOS/nixpkgs/pull/401421/checks?check_run_id=42845979699 also failed, specifically with the Nix daemon (unrelated to koboldcpp or shaderc). But, similar to aarch64-darwin, it should work

@FlameFlag FlameFlag mentioned this pull request May 29, 2025
Closed
3 tasks
@FlameFlag FlameFlag requested a review from JohnRTitor May 29, 2025 14:46
@JohnRTitor
Copy link
Member

JohnRTitor commented May 29, 2025

Does koboldcpp need to go through staging?

@FlameFlag
Copy link
Member Author

FlameFlag commented May 29, 2025

shaderc needs to be on a newer version; otherwise, koboldcpp can't be compiled with Vulkan support

@JohnRTitor JohnRTitor merged commit 63ae011 into NixOS:staging May 29, 2025
19 of 20 checks passed
@FlameFlag FlameFlag deleted the update-koboldcpp branch May 29, 2025 15:02
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented May 29, 2025

Successfully created backport PR for staging-25.05:

@nixpkgs-ci nixpkgs-ci bot mentioned this pull request May 29, 2025
Closed
1 task
@github-actions github-actions bot added the 8.has: port to stable This PR already has a backport to the stable release. label May 29, 2025
This was referenced Jun 3, 2025
Closed
Merged
@ccicnce113424
Copy link
Contributor

ccicnce113424 commented Jun 3, 2025 •
edited
Loading

Does shaderc currently have an active maintainer?

@JohnRTitor
Copy link
Member

JohnRTitor commented Jun 3, 2025

As far as I can see, none.

GGG-KILLER added a commit to GGG-KILLER/nixos-configs that referenced this pull request Jun 26, 2025
@GGG-KILLER
common/overlays/libplacebo: remove since NixOS/nixpkgs#401421 and Nix…
9ce6b6b 
…OS/nixpkgs#414326 have hit unstable.
@AsbjornOlling AsbjornOlling mentioned this pull request Aug 19, 2025
Closed
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@JohnRTitor JohnRTitor JohnRTitor approved these changes

@maxstrid maxstrid Awaiting requested review from maxstrid

Assignees

No one assigned

Labels

8.has: port to stable This PR already has a backport to the stable release. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. backport staging-25.05 Backport PR automatically

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@FlameFlag @JohnRTitor @ccicnce113424