Commit Graph

750 Commits

Author SHA1 Message Date
Bernardo Meurer
e7da2487fd
tree-sitter-grammars: use maintained repo for tree-sitter-sql 2022-11-08 10:30:28 -05:00
Bernardo Meurer
42e147380a
tree-sitter-grammars: remove fluent as it is abandoned 2022-11-08 10:24:54 -05:00
Bernardo Meurer
f77532fac5
tree-sitter-grammars: remove agda as it is abandoned 2022-11-08 10:24:26 -05:00
Bernardo Meurer
1b823ac6a9
tree-sitter: update grammars 2022-11-08 10:20:54 -05:00
c4710n
1bd99d9268 tree-sitter-grammars: add eex 2022-11-05 19:54:00 +08:00
Profpatsch
0242c271aa tree-sitter/update: fetch orgas and directly check in python 2022-11-04 18:14:33 +01:00
Profpatsch
8f2f2e34d0 tree-sitter/update: rename fetchImpl to updateImpl 2022-11-04 18:14:33 +01:00
Profpatsch
3b0b6d1b61 tree-sitter/update: move atomically-write to python
It should do the same thing, but take with a grain of salt maybe.
2022-11-04 18:14:33 +01:00
Profpatsch
484bce31b7 tree-sitter/update: move printing of the import nix file to python
This is a bit crappy, but the complexity should go away once it’s done
in all python. Might have been wiser to rewrite the other stuff first.
2022-11-04 18:14:33 +01:00
Profpatsch
a953387d22 tree-sitter/update: move checkTreeSitterRepos into python impl
Direct translation of the jq set logic.
2022-11-04 18:14:33 +01:00
Profpatsch
923975a604 tree-sitter/update: BINARIES -> ARGS.binaries
I want to pass more information in the next step, so binaries are just
one of multiple elements of the json value.

Generate a json file via `format` so that we get nicer
formatting (`lib.generators.toJSON` uses `builtins.toJSON` which does
not add any whitespace).
2022-11-04 18:14:33 +01:00
Profpatsch
aa480ba111 tree-sitter/update: Move json file output to python
Removes the second-to-last use of jq from the shell script.
2022-11-04 18:14:33 +01:00
Profpatsch
965c698e2c tree-sitter/update: ARGLIB_JSON -> BINARIES, factor out wrapper
arglib is a term I coined for passing arguments as structured
environment variable, but in this case it’s probably easier to
understand if we just call it `BINARIES`.

Factors out the code that passes the environment to another script.
2022-11-04 18:14:33 +01:00
Profpatsch
ef9d708262 tree-sitter: Update grammars 2022-11-04 18:14:33 +01:00
Profpatsch
2de554d512 tree-sitter/update: Fetch repositories in parallel
This was the main annoyance with the existing script, it would fetch
one repository after the other instead of multiple in parallel.
The `xe` tool is a simple `xargs`-like that can do that.

We put the json information for all repositories into a file with one
object per line, then pass that to xe.
2022-11-04 18:14:33 +01:00
Profpatsch
a64a9d5552 tree-sitter/update: Write files atomically
Otherwise you can’t interrupt the process without creating
broken/half-written files.
2022-11-04 18:14:33 +01:00
Profpatsch
26cb66b681 tree-sitter/update: Fetch the existing repos from python as well
I also used the chance to add some type annotations and make sure they
get accepted by mypy.
2022-11-04 18:14:33 +01:00
Profpatsch
805b5e978d tree-sitter/update: get executables from nix instead of environment
This was a small bug, the update script should of course not depend on
any executables in the environment.

Since we don’t use a nix string anymore, interpolation is out of the
question, so we pass it as arglib environment json string.
2022-11-04 18:14:33 +01:00
Profpatsch
0d067c8603 tree-sitter/update: move pyhon impl into its own file
This helps with syntax highlighting & editor support
2022-11-04 18:14:33 +01:00
Profpatsch
673676319b tree-sitter/update: factor out github url 2022-11-04 18:14:33 +01:00
Profpatsch
7948439959 tree-sitter/update: prepare moving more stuff to python
I don’t want to split up the python code, so for now I’m just passing
a “mode” to the script to run a different subset of the functionality.
2022-11-04 18:14:33 +01:00
Profpatsch
d325f6f702 tree-sitter: partially rewrite update script in python
The update script is getting out of hand, so we should rewrite it in
something that resembles sanity, i.e. Python

This is the first step, rewriting the part that checks and fetches a
release.

Next up is integrating latestGithubRepos into that script.
2022-11-04 18:14:33 +01:00
figsoda
a84e2492ac tree-sitter: update grammars 2022-10-29 15:12:21 -04:00
Luna Nova
183b4ff833 antlr4_x.runtime.cpp: fix build error due to sourceRoot missing source prefix
Fixes https://github.com/NixOS/nixpkgs/issues/197985

Patch from @NickCao https://github.com/NixOS/nixpkgs/issues/197985#issuecomment-1292843789
2022-10-27 01:23:32 -04:00
Sandro
54bd0eafed
Merge pull request #191299 from Technius/antlr4_11-init 2022-10-26 22:05:24 +02:00
Bryan Tan
83b0d09f1c antlr4: remove redundant settings
- Remove unneeded patch flags
- Move sourceRoot out of postUnpack

This change requires a rebuild.
2022-10-21 22:46:11 -07:00
Bryan Tan
98b114eee2 antlr4: simplify package definitions
This does not require a rebuild.
2022-10-21 22:45:25 -07:00
Bryan Tan
a195a65efe antlr4_10: init 2022-10-18 23:57:45 -07:00
Jan Tojnar
457f28f6f8 Merge branch 'master' into staging-next
; Conflicts:
;	pkgs/development/tools/codespell/default.nix

codespell 2.2.2 switched to pyproject & setuptools_scm:
https://github.com/codespell-project/codespell/pull/2523
2022-10-19 05:24:28 +02:00
Bogdan Burlacu
e97d77d402
tree-sitter-grammars: update cpp grammar 2022-10-18 13:38:18 +02:00
Bryan Tan
35dd06d6e7 antlr4_8, antlr4_9, antlr4_11: refactor definition
This commit refactors the antlr 4.8, 4.9, and 4.11 derivations to use common
code, greatly reducing the amount of code duplication, but at the expense of
slightly increased complexity.
2022-10-13 00:45:50 -07:00
Bryan Tan
36019e6120 antlr4_11: init 2022-10-13 00:38:51 -07:00
Artturi
e66d2fd89d
Merge pull request #194256 from Artturin/treewides2 2022-10-13 00:08:01 +03:00
Benoit Louy
f5dd2748f9
tree-sitter-grammars: update smithy grammar
update to new version of tree-sitter-smithy that supports smithy 2.0
2022-10-10 20:52:39 -04:00
Artturin
7e49471316 treewide: optional -> optionals where the argument is a list
the argument to optional should not be list
2022-10-10 15:40:21 +03:00
github-actions[bot]
535838d0a5
Merge master into staging-next 2022-10-10 00:03:49 +00:00
Pierce Bartine
932a99b4b2
tree-sitter-grammars: Add jsonnet 2022-10-08 11:24:06 -07:00
Pierce Bartine
17ba8ceecb
tree-sitter-grammars: Ignore ruby-tree-sitter.old 2022-10-08 11:23:39 -07:00
Vladimír Čunát
e7fce4b037
Merge #190196: tree-sitter: 0.20.6 -> 0.20.7
...into staging
2022-09-28 10:13:54 +02:00
Benoit Louy
dcd7afb872
tree-sitter-grammars.tree-sitter-smithy: init 2022-09-22 12:31:27 -04:00
José Luis Lafuente
be6bb3c407
tree-sitter: add nickel grammar 2022-09-15 12:45:46 +02:00
R. Ryantm
6ab84fc184 tree-sitter: 0.20.6 -> 0.20.7 2022-09-07 21:02:13 +00:00
Souvik Sen
6952cab029
javacc: 7.0.10 -> 7.0.12 (#187867)
Co-authored-by: R. Ryantm <ryantm-bot@ryantm.com>
Co-authored-by: Souvik Sen <nixpkgs-commits@deshaw.com>
2022-09-04 02:16:34 +02:00
Ana Hobden
3c265de78d tree-sitter: Update grammars
Signed-off-by: Ana Hobden <operator@hoverbear.org>
2022-08-28 08:32:37 -07:00
talyz
784686d06c
tree-sitter: Package query files used for syntax highlighting 2022-08-25 18:10:47 +02:00
Sergei Trofimovich
717e7bd291 tree-sitter: strip only debug info by default
Noticed use of $STRIP when passed through various uses of $STRIP
in `nixpkgs`. This looked unusual in a way that it strips not just
debugging symbols but also all the rest.

The change switch to debug-only stripping.

While at it switched to expliict use of `-fPIC` for shared library.
2022-08-07 17:35:48 +01:00
Weijia Wang
68a4655811 ragelStable: unbreak on darwin 2022-08-03 16:41:25 +02:00
Artturi
5a01941e5f
Merge pull request #180879 from jonringer/bison-tests 2022-07-21 23:11:23 +03:00
Jocelyn Thode
c75aa80bed tree-sitter: Update grammars and add markdown-inline 2022-07-15 16:39:44 +02:00
Jonathan Ringer
2d8f2d938c
bison: only run install check
Install check appears to run
the normal check target as well.
This introduces a scenario where
a large test suite is being ran twice.
2022-07-09 12:49:48 -07:00
ajs124
f14b6f553a javacc: fix meta.maintainers 2022-06-29 13:50:33 -04:00
Sandro
f4485783b0
Merge pull request #177651 from ambroisie/add-tree-sitter-tiger
tree-sitter: add tree-sitter-tiger
2022-06-15 14:27:19 +02:00
Bruno BELANYI
685e69f75c tree-sitter: add tree-sitter-tiger 2022-06-14 16:48:58 +02:00
Sandro Jäckel
4532226e4d
tree-sitter: init tree-sitter-sql 2022-06-12 22:47:23 +02:00
Sandro Jäckel
7b4b39cbc1
tree-sitter: init tree-sitter-rego 2022-06-12 22:47:23 +02:00
Sandro Jäckel
cd5793da83
tree-sitter: update grammars 2022-06-12 22:47:23 +02:00
Sandro Jäckel
47cbc38f08
tree-sitter: init tree-sitter-go-work 2022-06-12 22:47:23 +02:00
Robert Scott
3b6bc4b69c treewide: set sourceProvenance for packages containing downloaded jars
these are the easily identifiable cases and will not be comprehensive
2022-06-04 19:47:57 +01:00
Vladimír Čunát
cbd66894e6
Merge #175150: staging-next 2022-05-28
the first one after 22.05 release
2022-06-02 10:23:00 +02:00
adisbladis
586e1c7a2a
Merge pull request #174740 from tssm/update-tree-sitter-grammars
Update tree-sitter grammars
2022-06-02 15:23:16 +08:00
Tae Selene Sandoval Murgan
da0058d4a8 tree-sitter: Update grammars 2022-06-01 20:16:08 +02:00
github-actions[bot]
af1764d5c5
Merge master into staging-next 2022-06-01 18:01:14 +00:00
sternenseemann
ddd16ea9f1 antlr4_9: 4.9.2 -> 4.9.3 2022-06-01 10:43:09 +02:00
github-actions[bot]
8d36a138eb
Merge master into staging-next 2022-05-30 18:01:09 +00:00
Rick van Schijndel
13e0d33703
treewide: pkgs/development/tools: mark broken for darwin 2022-05-30 13:41:14 +02:00
Tae Selene Sandoval Murgan
235f1299d3 tree-sitter: Remove the Swift grammar
It was abandoned, and the recommended one doesn't have a parser.c file
2022-05-25 21:28:29 +02:00
Martin Weinelt
1923b68bda Merge remote-tracking branch 'origin/staging-next' into staging 2022-05-23 17:35:37 +02:00
Azat Bahawi
00dab1a9a9
hammer: e7aa734 -> nightly_20220416
This commit also changes the source repository from
github.com/UpstandingHackers/hammer to
gitlab.special-circumstanc.es/hammer/hammer.
2022-05-22 19:24:30 +03:00
Artturin
62e002d1cd bison: explicitly set strictDeps
see the comment
2022-05-22 16:40:13 +03:00
William Kral
0c28d3bbec tree-sitter: revert #172850 for nix 2022-05-18 10:32:26 -07:00
adisbladis
492f7190ce tree-sitter: Bump grammars 2022-05-13 22:44:37 +12:00
oxalica
b1723f8c47
tree-sitter: update grammars and add oxalica as maintainer 2022-05-12 05:20:22 +08:00
Sandro
5d589feb6e
Merge pull request #168921 from risicle/ris-re2c-passthru-tests
re2c: add some key reverse dependencies to passthru.tests
2022-05-10 22:56:28 +02:00
Robert Scott
977f14fab1 re2c: add some key reverse dependencies to passthru.tests 2022-05-09 22:17:31 +01:00
Sandro
73465c2247
Merge pull request #169967 from adisbladis/tree-sitter-emacs-langs-parity
tree-sitter-grammars: Add grammars for parity with Emacs tree-sitter-langs
2022-04-27 17:35:28 +02:00
oxalica
d5d7d01114
tree-sitter: revert the parser for nix
The new version of parser is out of sync with nvim-treesitter's queries
and causes highlighting failures.
2022-04-25 22:21:32 +08:00
oxalica
011f56b2cb
tree-sitter: update grammars
There are node changes on lua and/or vim parsers, which cause highlight
errors with current version of nvim-treesitter in nixpkgs.
This update should fix them.
2022-04-25 14:14:34 +08:00
adisbladis
4c83c0b027 tree-sitter-grammars.tree-sitter-pgn: init 2022-04-24 04:35:05 +12:00
adisbladis
8f0bd07971 tree-sitter-grammars.tree-sitter-janet-simple: init 2022-04-24 04:35:05 +12:00
Christian Kögler
5961157781 tree-sitter: Add tree-sitter-scheme 2022-04-23 14:36:06 +02:00
Felix Buehler
88ca581508 hammer: switch to fetchFromGitHub 2022-03-29 13:05:17 +02:00
Sandro
2f1e03cb2b
Merge pull request #165691 from lucc/github-removed-unencrypted-git 2022-03-28 12:47:42 +02:00
Lucas Hoffmann
47190314df treewide: replace defunct git://github.com urls with https://
Github has removed support for git://github.com and recommends
https://github.com instead.

See https://github.blog/2021-09-01-improving-git-protocol-security-github/
2022-03-25 11:21:42 +01:00
Ben Siraphob
f36dfc2059
tree-sitter: rollback #165178 for Nix
Large changes to the nodes mean that highlighters need to update their
queries before the update can be merged
2022-03-24 21:06:09 -05:00
Martin Weinelt
964b4a6bd2
tree-sitter: update grammars 2022-03-23 05:22:56 +01:00
Martin Weinelt
edbaf11e94
tree-sitter: unquote latest version in update script
Otherwise if a tag was found it would try to fetch `refs/tag/"v1.2.0"`.

```
fetching list of grammars
checking the tree-sitter repo list against the grammars we know
writing files to /etc/nixos/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars
Fetching latest release ("v1.2.1") of tree-sitter-agda …
Initialized empty Git repository in /tmp/git-checkout-tmp-RU9DUpjM/tree-sitter-agda/.git/
fatal: couldn't find remote ref refs/tags/"v1.2.1"
From https://github.com/tree-sitter/tree-sitter-agda
 * branch            HEAD       -> FETCH_HEAD
fatal: Not a valid object name
Unrecognized git object type:
Unable to checkout refs/tags/"v1.2.1" from https://github.com/tree-sitter/tree-sitter-agda.
```
2022-03-23 05:18:09 +01:00
Ben Siraphob
3d81edb00f
Merge pull request #162766 from stephank/feat/tree-sitter-hcl 2022-03-22 19:14:10 -05:00
Ben Siraphob
6326d1b397
Merge pull request #165178 from siraben/tree-sitter-update 2022-03-21 23:52:08 -05:00
Ben Siraphob
e6c5413578
Merge pull request #161456 from siraben/tree-sitter-overridable 2022-03-21 23:51:52 -05:00
Ben Siraphob
838f644e91
tree-sitter: update grammars 2022-03-21 16:39:37 -05:00
Ben Siraphob
5b55eb42f1
tree-sitter: add extraGrammars attribute 2022-03-17 16:48:19 -05:00
Ben Siraphob
6ff99f2a17
Merge pull request #158261 from mdavezac/nvim-tree-sitter-darwin 2022-03-17 16:26:14 -05:00
github-actions[bot]
8e01330277
Merge master into staging-next 2022-03-07 12:01:33 +00:00
R. Ryantm
91247c747d tree-sitter: 0.20.4 -> 0.20.6 2022-03-07 11:28:18 +01:00
Stéphan Kochen
192646e441 tree-sitter-hcl: init 2022-03-04 13:48:44 +01:00
github-actions[bot]
7b0b3b6225
Merge staging-next into staging 2022-02-16 00:02:21 +00:00
Dmitry Kalinkin
96f797b2e5
Merge pull request #155208 from drperceptron/flex-alias
flex: backwards-compatible executable alias `lex`
2022-02-15 13:12:08 -05:00
Zhong Jianxin
e8f3914985 treewide: Replace transfig with fig2dev
Reasons:

- transfig never get upstream update since it was added to nixpkgs 2006,
  according to [fig2dev Debian changelog][1], upstream maintainership
  was taken over at 2016, and renamed to fig2dev.

- [Debian][2], [ArchLinux][3], [HomeBrew][4] all use fig2dev to replace
  transfig.

- transfig builds [failed][5] on aarch64-darwin, fig2dev builds fine.

- One less package to maintain.

[1]: https://salsa.debian.org/debian/fig2dev/-/blob/debian/1%253.2.6_beta-1/debian/changelog
[2]: https://packages.debian.org/bullseye/transfig
[3]: https://archlinux.org/packages/community/x86_64/fig2dev/
[4]: https://formulae.brew.sh/formula/fig2dev
[5]: https://hydra.nixos.org/build/163404782/nixlog/2
2022-02-15 10:13:56 +08:00
R. Ryantm
ad205764e8 byacc: 20211224 -> 20220128 2022-02-12 21:35:03 -08:00
Jonathan Ringer
39669ea2b6
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/top-level/aliases.nix
2022-02-09 19:58:40 -08:00