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

Elisp updates #268477

Closed
wants to merge 6 commits into from
Closed

Elisp updates #268477

wants to merge 6 commits into from

Conversation

bhankas
Copy link
Contributor

@bhankas bhankas commented Nov 19, 2023

Description of changes

Includes and requires changes from #295805. Will keep it rebased on top of it.

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/)
  • 23.11 Release Notes (or backporting 23.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.

@bhankas bhankas changed the title Grammar update Tree-sitter: Update grammars Nov 19, 2023
@bhankas
Copy link
Contributor Author

bhankas commented Nov 19, 2023

@adisbladis @AndersonTorres separate PR for grammar updates as requested.

@AndersonTorres
Copy link
Member

Rebase and remove the elisp updates

@akirak
Copy link
Contributor

akirak commented Nov 26, 2023

@bhankas You didn't update tree-sitter grammars, did you? You've updated some elisp packages and added some grammars for updating, but didn't update grammars. If that's your intention, it would be nice if you changed the PR title.

@bhankas
Copy link
Contributor Author

bhankas commented Nov 26, 2023

@akirak Yes, I've been meaning to update the PR but haven't been able to. Will try to fix in a day or two.

@bhankas bhankas changed the title Tree-sitter: Update grammars Elisp updates Mar 14, 2024
@bhankas
Copy link
Contributor Author

bhankas commented Mar 14, 2024

Apologies for extreme late response, but I think this one is conservative enough.

This builds on top of #295805, and updates elisp packages. The change in update-defaults.py is same as before, as the script fails without.

Still unsure how to get gleam-ts-mode in nixpkgs since it is in non-default branch, also unsure if the built grammar will be available to emacs itself during runtime so gleam-ts-mode can make use of it if pulled via use-package.

@AndersonTorres please take a look whenever possible.

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/3629

@AndersonTorres
Copy link
Member

Remove the Elisp updates.

They mass-rebuild and therefore should go to Staging.

@bhankas
Copy link
Contributor Author

bhankas commented Mar 14, 2024

Remove the Elisp updates.

They mass-rebuild and therefore should go to Staging.

In that case this PR can be closed in favor of #295805 , what do you say?

@AndersonTorres
Copy link
Member

AndersonTorres commented Mar 14, 2024

Remove the Elisp updates.
They mass-rebuild and therefore should go to Staging.

In that case this PR can be closed in favor of #295805 , what do you say?

Yes, it's even better.
Tree-Sitter updates are useful for other users besides Emacs power users. They should not need to wait the Master-Staging merge.

About the gleam-ts-mode that will be generated from Elisp updates, the best we can do is ... wait the merge between Staging and Master.

@bhankas
Copy link
Contributor Author

bhankas commented Mar 14, 2024

Thanks, closing this.

@bhankas bhankas closed this Mar 14, 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.

None yet

4 participants