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

koboldcpp: drop unused args, refactor darwin sdks #349052

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

DontEatOreo
Copy link
Member

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.11 Release Notes (or backporting 23.11 and 24.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.

@DontEatOreo DontEatOreo force-pushed the drop-unused-args-refactor-darwin-sdks branch 2 times, most recently from 91df882 to 8a3c501 Compare October 16, 2024 14:38
@DontEatOreo
Copy link
Member Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 349052 --extra-nixpkgs-config '{ allowAliases = false; allowBroken = false; allowUnfree = true; checkMeta = true; cudaSupport = true; cudaCapabilities = [ "7.5" ]; }'


x86_64-linux

✅ 1 package built:
  • koboldcpp

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Oct 16, 2024
@DontEatOreo
Copy link
Member Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 349052


x86_64-darwin

✅ 1 package built:
  • koboldcpp

aarch64-darwin

✅ 1 package built:
  • koboldcpp

@emilazy
Copy link
Member

emilazy commented Oct 16, 2024

FWIW the pattern is different and simpler now in staging-next after #346043. (Though this form will still work for compatibility.)

Edit: Actually, it will need fixing, because you’re depending on the filesystem contents of the framework derivations which is no longer supported. (Probably just dropping those lines will work, though.)

@emilazy
Copy link
Member

emilazy commented Oct 16, 2024

If you wanted to do this on staging-next instead, you would leave stdenv alone, add apple-sdk_12 (or whichever SDK is best‐supported) and (darwinMinVersionHook "10.15") to buildInputs, remove the -F lines (and perhaps the -frameworks, if the upstream build system will detect them correctly with a normal SDKROOT), drop the AArch64 requirement from metalSupport, and remove all the framework dependencies.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants