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

tree-sitter: format, new darwin SDK pattern, improve patches #363303

Open
wants to merge 4 commits into
base: staging
Choose a base branch
from

Conversation

uncenter
Copy link
Member

@uncenter uncenter commented Dec 8, 2024

  • Formats with nixfmt-rfc-style
  • Removes manually specified Darwin SDK frameworks (new SDK pattern)
  • Use substituteInPlace instead of fix-paths.patch to replace emcc path for webUI support
  • Use (new) remove-web-interface.patch instead of lots of sed commands when not webUI support.

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.

Use substituteInPlace instead of fix-paths.patch to replace emcc path,
and use remove-web-interface.patch instead of lots of sed commands.
@uncenter
Copy link
Member Author

uncenter commented Dec 8, 2024

Working on improving the update script but going to have to wait a bit until nix-prefetch-git is fixed on macOS (#358113). Just going to leave the update script for another day :)

@uncenter uncenter marked this pull request as draft December 8, 2024 20:18
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Dec 9, 2024
@ofborg ofborg bot requested a review from Profpatsch December 9, 2024 12:35
@uncenter uncenter marked this pull request as ready for review December 9, 2024 13:00
@ofborg ofborg bot added the 11.by: package-maintainer This PR was created by the maintainer of the package it changes label Dec 11, 2024
@uncenter uncenter removed the 11.by: package-maintainer This PR was created by the maintainer of the package it changes label Dec 11, 2024
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