Skip to content

tree-sitter-grammars.tree-sitter-qmljs: init#420833

Merged
teto merged 1 commit intoNixOS:masterfrom
jaredmontoya:add-qmljs-tree-sitter-grammar
Dec 18, 2025
Merged

tree-sitter-grammars.tree-sitter-qmljs: init#420833
teto merged 1 commit intoNixOS:masterfrom
jaredmontoya:add-qmljs-tree-sitter-grammar

Conversation

@jaredmontoya
Copy link
Contributor

@jaredmontoya jaredmontoya commented Jun 28, 2025 •
edited
Loading

Added qmljs tree sitter grammar.

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/)
  • Nixpkgs 25.11 Release Notes (or backporting 24.11 and 25.05 Nixpkgs Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
  • NixOS 25.11 Release Notes (or backporting 24.11 and 25.05 NixOS Release notes)
    • (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, pkgs/README.md, maintainers/README.md and other contributing documentation in corresponding paths.

Add a 👍 reaction to pull requests you find important.

@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. labels Jun 28, 2025
@jaredmontoya
Copy link
Contributor Author

jaredmontoya commented Jun 28, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 420833
Commit: 961e732622922c8d5ebc848f8fc6a4ea92b3304a

x86_64-linux

✅ 6 packages built:
  • diffsitter
  • python312Packages.tree-sitter-grammars.tree-sitter-qmljs
  • python312Packages.tree-sitter-grammars.tree-sitter-qmljs.dist
  • python313Packages.tree-sitter-grammars.tree-sitter-qmljs
  • python313Packages.tree-sitter-grammars.tree-sitter-qmljs.dist
  • tree-sitter-grammars.tree-sitter-qmljs

@nixpkgs-ci nixpkgs-ci bot added the 9.needs: reviewer This PR currently has no reviewers requested and needs attention. label Jul 4, 2025
@billksun
Copy link
Contributor

billksun commented Jul 28, 2025

@Profpatsch @uncenter
Can someone review this? Thanks!

@uncenter
Copy link
Member

uncenter commented Jul 28, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 420833
Commit: 961e732622922c8d5ebc848f8fc6a4ea92b3304a

aarch64-darwin

✅ 6 packages built:
  • diffsitter
  • python312Packages.tree-sitter-grammars.tree-sitter-qmljs
  • python312Packages.tree-sitter-grammars.tree-sitter-qmljs.dist
  • python313Packages.tree-sitter-grammars.tree-sitter-qmljs
  • python313Packages.tree-sitter-grammars.tree-sitter-qmljs.dist
  • tree-sitter-grammars.tree-sitter-qmljs

@uncenter uncenter added 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels Jul 28, 2025
@nixpkgs-ci nixpkgs-ci bot removed 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. 9.needs: reviewer This PR currently has no reviewers requested and needs attention. labels Jul 28, 2025
@jaredmontoya jaredmontoya force-pushed the add-qmljs-tree-sitter-grammar branch from 961e732 to 8d614d7 Compare September 19, 2025 16:46
@jaredmontoya jaredmontoya force-pushed the add-qmljs-tree-sitter-grammar branch from 8d614d7 to 9db6a95 Compare October 11, 2025 15:36
@jaredmontoya jaredmontoya force-pushed the add-qmljs-tree-sitter-grammar branch from 9db6a95 to c040825 Compare October 23, 2025 16:09
@nixpkgs-ci nixpkgs-ci bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Dec 12, 2025
@teto teto added the 6.topic: tree-sitter Tree-sitter is a parser generator tool and an incremental parsing library. label Dec 13, 2025
@jaredmontoya jaredmontoya force-pushed the add-qmljs-tree-sitter-grammar branch from c040825 to f24449a Compare December 15, 2025 09:51
@nixpkgs-ci nixpkgs-ci bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Dec 15, 2025
@jaredmontoya jaredmontoya requested a review from teto December 15, 2025 09:59
@teto
Copy link
Member

teto commented Dec 15, 2025

planning to merge #408414 first, then this one.

@teto
Copy link
Member

teto commented Dec 17, 2025

other PR merged, if you still want to add it, you should follow the new process documented in https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/tools/parsing/tree-sitter/grammars/README.md . I hope it works as it's a new workflow.

@nixpkgs-ci nixpkgs-ci bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Dec 17, 2025
@jaredmontoya jaredmontoya force-pushed the add-qmljs-tree-sitter-grammar branch from f24449a to c8a583d Compare December 17, 2025 23:01
@nixpkgs-ci nixpkgs-ci bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Dec 17, 2025
@jaredmontoya
Copy link
Contributor Author

jaredmontoya commented Dec 17, 2025

@teto Updated for the new workflow.

@uncenter uncenter requested a review from kimburgess December 18, 2025 06:12
kimburgess
kimburgess reviewed Dec 18, 2025
View reviewed changes
Copy link
Member

@kimburgess kimburgess left a comment

Choose a reason for hiding this comment

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

Declaration format is all spot on. Hopefully this was a bit simpler now :)

Very minor nitpick though: maintaining lexical ordering across these (e.g. insert above query) will make pendants like me much happier.

@jaredmontoya jaredmontoya force-pushed the add-qmljs-tree-sitter-grammar branch from c8a583d to 2b07d32 Compare December 18, 2025 13:48
@jaredmontoya
Copy link
Contributor Author

jaredmontoya commented Dec 18, 2025

@kimburgess done

@nixpkgs-ci nixpkgs-ci bot added 12.approvals: 2 This PR was reviewed and approved by two persons. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Dec 18, 2025
@uncenter
Copy link
Member

uncenter commented Dec 18, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 420833
Commit: 2b07d3238ceadb9bc8d23c0ea76de34e8b9d2eb0

aarch64-darwin

✅ 5 packages built:
  • python312Packages.tree-sitter-grammars.tree-sitter-qmljs
  • python312Packages.tree-sitter-grammars.tree-sitter-qmljs.dist
  • python313Packages.tree-sitter-grammars.tree-sitter-qmljs
  • python313Packages.tree-sitter-grammars.tree-sitter-qmljs.dist
  • tree-sitter-grammars.tree-sitter-qmljs

@teto
Copy link
Member

teto commented Dec 18, 2025

@jaredmontoya do you want to add yourself as a maintainer as per #471795 ? i dont think it's huge work but ti's nice at least one person using the grammar .

From a quick read of pkgs/development/tools/parsing/tree-sitter/grammars/./grammar-sources.nix , you would need to add a meta.maintainers field . @kimburgess (aka the tree-sitter king) can correct me if am wrong

@jaredmontoya jaredmontoya force-pushed the add-qmljs-tree-sitter-grammar branch from 2b07d32 to 1364159 Compare December 18, 2025 18:06
@jaredmontoya
Copy link
Contributor Author

jaredmontoya commented Dec 18, 2025

@teto Like this?

@jaredmontoya jaredmontoya force-pushed the add-qmljs-tree-sitter-grammar branch from 1364159 to f2ed268 Compare December 18, 2025 18:08
@teto
Copy link
Member

teto commented Dec 18, 2025

I checked in the REPL and it worked fine. You even added license awesome. I hope this doesn't confuse the updater but I dont think so. Merging.

@teto teto added this pull request to the merge queue Dec 18, 2025
Merged via the queue into NixOS:master with commit 17c769c Dec 18, 2025
25 checks passed
@jaredmontoya jaredmontoya deleted the add-qmljs-tree-sitter-grammar branch December 18, 2025 18:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@teto teto Awaiting requested review from teto

2 more reviewers

@kimburgess kimburgess kimburgess approved these changes

@uncenter uncenter uncenter approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

6.topic: tree-sitter Tree-sitter is a parser generator tool and an incremental parsing library. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 12.approvals: 2 This PR was reviewed and approved by two persons.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@jaredmontoya @billksun @uncenter @teto @kimburgess