Commit Graph

835 Commits

Author SHA1 Message Date
Bernardo Meurer
2e647defa9
Merge pull request #259001 from acowley/init-tree-sitter-wgsl
tree-sitter-grammars: add wgsl
2023-10-25 09:00:40 -04:00
github-actions[bot]
c99731d9ac
Merge staging-next into staging 2023-10-17 18:01:44 +00:00
Mario Rodas
6ca7035159
Merge pull request #238420 from r-ryantm/auto-update/spicy-parser-generator
spicy-parser-generator: 1.7.0 -> 1.8.1
2023-10-17 06:01:34 -05:00
R. Ryantm
597b9d6a09 re-flex: 3.4.1 -> 3.5.0 2023-10-16 23:07:24 +00:00
github-actions[bot]
49523dec15
Merge staging-next into staging 2023-10-13 06:01:45 +00:00
Weijia Wang
b96bd4df41
Merge pull request #259463 from r-ryantm/auto-update/re-flex
re-flex: 3.3.8 -> 3.4.1
2023-10-13 04:19:40 +02:00
github-actions[bot]
4da0322a88
Merge staging-next into staging 2023-10-12 12:02:01 +00:00
Damien Cassou
632c4140e9
tree-sitter: let nixpkgs-format reformat the buffer 2023-10-12 11:30:22 +02:00
Damien Cassou
85e135d302
tree-sitter-grammars: add proto
The tree-sitter-proto.json file was created by running the update
script as described in tree-sitter/default.nix.
2023-10-12 11:30:00 +02:00
github-actions[bot]
0cf0d9af7e
Merge staging-next into staging 2023-10-10 18:01:26 +00:00
Adam Stephens
778f23d04f
tree-sitter-grammars: fix typst grammar 2023-10-09 13:40:22 -04:00
github-actions[bot]
3a91f17abe
Merge staging-next into staging 2023-10-09 12:01:54 +00:00
Icy-Thought
df9c6eb781
tree-sitter-grammars: generate typst parser 2023-10-08 16:28:46 +02:00
Alyssa Ross
182718fecc
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
	pkgs/top-level/linux-kernels.nix
2023-10-07 19:52:18 +00:00
R. Ryantm
366e56703c re-flex: 3.3.8 -> 3.4.1 2023-10-06 21:01:58 +00:00
Icy-Thought
1045b89402
tree-sitter-grammars: add typst 2023-10-06 09:20:39 +02:00
Maximilian Bosch
8bc5104a6e
treewide: refactor .attrs.sh detection
When specifying the `builder` attribute in `stdenv.mkDerivation`, this
will be effectively transformed into

    builtins.derivation {
      builder = stdenv.shell;
      args = [ "-e" builder ];
    }

This also means that `default-builder.sh` is never sourced and as a
result it's not guaranteed that `$NIX_ATTRS_SH_FILE` is set to a correct
location[1].

Also, we need to source `.attrs.sh` to source `$stdenv`. So, the
following is done now:

* If `$NIX_ATTRS_SH_FILE` points to a correct location, then use it.
  Directly using `.attrs.sh` is problematic for `nix-shell(1)` usage
  (see previous commit for more context), so prefer the environment
  variable if possible.

* Otherwise, if `.attrs.sh` exists, then use it. See [1] for when this
  can happen.

* If neither applies, it can be assumed that `__structuredAttrs` is
  turned off and thus nothing needs to be done.

[1] It's possible that it doesn't exist at all - in case of Nix 2.3 or
    it can point to a wrong location on older Nix versions with a bug in
    `__structuredAttrs`.
2023-10-04 18:36:57 +02:00
Anthony Cowley
edf4036ece tree-sitter-grammars: add wgsl 2023-10-04 09:54:26 -04:00
Evgeny Kurnevsky
3b0a6d5ffd
tree-sitter: update grammars 2023-09-26 12:54:44 +03:00
Artturi
014b0d9fba
Merge pull request #241340 from ErinvanderVeen/tree-sitter-emscripten-fix 2023-09-15 06:59:33 +03:00
Nick Cao
ca9144be02
antlr4_13: init at 4.13.0 2023-09-03 08:54:47 -04:00
R. Ryantm
0aa8f3fcc9 re-flex: 3.3.7 -> 3.3.8 2023-08-13 05:47:26 +00:00
github-actions[bot]
0542af4e29
Merge master into staging-next 2023-08-04 00:02:04 +00:00
Jan Malakhovski
5852f26bdc treewide: noop: refer to src.name or similar in sourceRoot where appropriate, part 1: trivial cases 2023-08-03 16:32:03 +00:00
github-actions[bot]
dd978826f9
Merge staging-next into staging 2023-07-23 12:02:06 +00:00
github-actions[bot]
10af23a180
Merge master into staging-next 2023-07-23 12:01:27 +00:00
R. Ryantm
53f8f97c4c re-flex: 3.3.6 -> 3.3.7 2023-07-23 03:06:29 +00:00
Sandro
17c6f710a4
Merge pull request #244427 from trofi/re2c-update 2023-07-21 11:31:50 +02:00
Sergei Trofimovich
901246e11a re2c: 3.0 -> 3.1
Changes: https://re2c.org/releases/changelog/changelog.html#id1
2023-07-19 23:59:25 +01:00
github-actions[bot]
b110c513b2
Merge master into staging-next 2023-07-19 12:01:12 +00:00
oxalica
9b3ff4831b
{birdtray,isgx,mycrypto,osu-lazer,stretchly,tree-sitter}: remove oxalica as maintainer 2023-07-19 16:20:11 +08:00
R. Ryantm
5849c65c52 re-flex: 3.3.5 -> 3.3.6 2023-07-19 04:57:26 +00:00
Artturin
ff49613671 ragel: enableParallelBuilding
ragel: 47s -> 9s
ragelDev: 1m51s  45s
2023-07-10 23:03:57 +03:00
R. Ryantm
3310b016fb spicy-parser-generator: 1.7.0 -> 1.8.1 2023-07-09 07:18:35 +00:00
Profpatsch
c97ad2763a rm Profpatsch from stuff without interest/capacity of maintaining
For tree-sitter I’m still interested, but don’t want to be first in
the list :)
2023-07-07 12:53:42 +02:00
Erin van der Veen
05fa438733 tree-sitter: set emcc cache outside of nix store 2023-07-03 22:02:39 +02:00
Nick Cao
d5d9df6642
Merge pull request #239948 from Strum355/tree-sitter-playground
tree-sitter: fix webui/playground notice & terminating
2023-06-29 12:50:25 +08:00
Glib Shpychka
bbd132ed3e
tree-sitter-grammars: add wing (#240140) 2023-06-28 14:20:29 +02:00
Glib Shpychka
ce10c78c78
tree-sitter: allow use of 'generate' argument 2023-06-26 18:36:03 +03:00
Noah Santschi-Cooney
67ad8087de
tree-sitter: fix webui/playground notice 2023-06-26 15:41:26 +01:00
R. Ryantm
e273a2f4f8 re-flex: 3.3.4 -> 3.3.5 2023-06-23 10:36:47 +00:00
Jean-Philippe Braun
72b445d91e tree-sitter-grammars: add cue 2023-06-16 15:24:43 +02:00
R. Ryantm
af49f98525 re-flex: 3.3.3 -> 3.3.4 2023-06-03 19:03:37 +00:00
R. Ryantm
fabe206448 byacc: 20230219 -> 20230521 2023-06-01 00:46:10 +00:00
R. Ryantm
997a334cd2 re-flex: 3.3.2 -> 3.3.3 2023-05-30 05:21:33 +00:00
Kasper Kondzielski
946a4d60e8
tree-sitter: Update grammars (#232633) 2023-05-24 16:08:12 -04:00
Benjamin Lee
a5340ba9ff tree-sitter-grammars: add nu 2023-04-23 11:44:31 -04:00
Anderson Torres
cb1c86036f byacc: change self to finalAttrs 2023-04-20 22:22:23 -03:00
Mario Rodas
27bd2fc3e2
Merge pull request #219056 from shazow/tree-sitter-update
tree-sitter: Add solidity, update grammars
2023-04-10 00:00:15 -05:00
Matthieu Coudron
aeb3a380cc tree-sitter: 0.20.7 -> 0.20.8
0.20.8 will be required by neovim 0.9 so this is a preliminary bump
2023-04-08 19:20:04 +02:00
R. Ryantm
e5c3f019fb re-flex: 3.3.1 -> 3.3.2 2023-03-22 16:56:14 +00:00
Nick Cao
9a96b203e3
antlr4: add add antlr4-parse to bin
Reference: 8188dc5388/tool/src/org/antlr/v4/gui/Interpreter.java (L22)
2023-03-13 10:13:56 +08:00
Nick Cao
069d4196eb
antlr4_12: init at 4.12.0 2023-03-13 10:10:25 +08:00
Ilan Joselevich
476324e4b4
Merge pull request #219895 from prrlvr/add-re-flex
re-flex: init at 3.3.1
2023-03-08 00:46:43 +02:00
Pierre-Olivier Rey
bfe60278b9
re-flex: init at 3.3.1 2023-03-07 23:24:28 +01:00
Anderson Torres
6a581de7d8
Merge pull request #219930 from r-ryantm/auto-update/byacc
byacc: 20221229 -> 20230219
2023-03-07 18:21:29 -03:00
Anderson Torres
4839388d2b byacc: refactor
- Get rid of double with in meta.
2023-03-07 08:19:10 -03:00
R. Ryantm
24af7f357f byacc: 20221229 -> 20230219 2023-03-07 05:13:21 +00:00
Tobias Mayer
b5ee3bef18
spicy-parser-generator: 1.5.3 -> 1.7.0 2023-03-06 18:37:17 +01:00
Andrey Petrov
8ec3627796 tree-sitter: Add solidity, update grammars 2023-03-01 16:34:57 -05:00
Artturin
f9fdf2d402 treewide: move NIX_CFLAGS_COMPILE to the env attrset
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper

this makes it clearer that NIX_CFLAGS_COMPILE must be a string as lists
in env cause a eval failure
2023-02-22 21:23:04 +02:00
Gabriel Volpe
eed1326592
tree-sitter: fix src value 2023-02-13 12:31:15 +01:00
Tobias Mayer
83f225ecbf
spicy-parser-generator: init at 1.5.3 2023-02-04 14:35:40 +01:00
Erik Arvstedt
5339c7ccf1
tree-sitter/grammar: make fit for public use
- Rename `source` to the more idiomatic `src`.

- Pass `version` to `mkDerivation` so that it's available in
  `drvAttrs`/`overrideAttrs`.

- Remove misleading comment about `version`.
  (nvim-treesitter sets the version to the grammar src hash.)
2023-01-23 23:32:09 +01:00
Erik Arvstedt
99225ef64d
tree-sitter: add buildGrammar to passthru
`buildGrammar` is useful for building custom grammars.

Also, improve perf by moving `callPackage` out of the fn call.

Use more precise var name: `change` -> `build`.
2023-01-23 23:31:06 +01:00
Ferry Jérémie
65d7e87fdb treewide: replace http by https when https is a permanent redirection 2023-01-22 02:46:49 +01:00
Martin Weinelt
c1e6c6af69 Merge remote-tracking branch 'origin/master' into staging-next 2023-01-11 03:51:33 +01:00
figsoda
a703136df1
Merge pull request #209949 from figsoda/vim
vimPlugins.nix-develop-nvim: init at 2023-01-10
2023-01-10 11:35:26 -05:00
figsoda
a1cdb52f4a vimPlugins.nvim-treesitter.builtGrammars.http: fix build 2023-01-10 11:06:00 -05:00
Sandro
ede482331b
Merge pull request #198963 from urandom2/mgmt
Fixes https://github.com/NixOS/nixpkgs/issues/98458
2023-01-10 15:32:00 +01:00
github-actions[bot]
99dd0da8dc
Merge master into staging-next 2023-01-09 06:01:08 +00:00
R. Ryantm
6601a42cf3 byacc: 20221106 -> 20221229 2023-01-09 01:25:44 +00:00
Colin Arnott
9025e3da4c
nex: init at unstable-2021-03-30 2022-12-31 23:27:41 +00:00
Sergei Trofimovich
092d57c076 Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
    pkgs/development/tools/language-servers/ansible-language-server/default.nix
2022-12-28 09:35:37 +00:00
Naïm Favier
21f61857ae
Merge pull request #206527 from ncfavier/tree-sitter-unionOfDisjoint 2022-12-27 16:29:49 +01:00
figsoda
a211d94291 treewide: remove attrPath from nix-update-script calls
after https://github.com/Mic92/nix-update/pull/120 and https://github.com/NixOS/nixpkgs/pull/207703, `attrPath` can now be omitted when using `nix-update-script`
2022-12-26 12:39:21 -05:00
Naïm Favier
7adad93912
tree-sitter/update: use unionOfDisjoints 2022-12-17 13:14:05 +01:00
Artturin
c01f509e44 treewide: source .attrs in builders
if theres a source $stdenv then this is needed

for structuredAttrs
2022-12-08 21:09:02 +02:00
Weijia Wang
366d3c64f5 antlr2: drop python2 2022-12-03 18:45:31 +01:00
figsoda
82fe76d1cd carnix,cratesIO: remove 2022-11-22 14:10:25 -05:00
Bernardo Meurer
dd1fc37d06
tree-sitter-grammars: update 2022-11-18 15:27:42 -05:00
figsoda
c0c0a4ae2e tree-sitter/grammar.nix: accept extra arguments 2022-11-17 23:15:27 -05:00
figsoda
af810aa232 vimPlugins.nvim-treesitter: move grammar generation from fetch to grammar.nix 2022-11-14 23:22:24 -05:00
Bernardo Meurer
7d616f2a32
Merge pull request #200216 from lovesegfault/update-tree-sitter 2022-11-10 17:33:38 -05:00
AndersonTorres
684b0f278a byacc: 20220128 -> 20221106
Also, add AndersonTorres as maintainer.
2022-11-09 07:56:54 -03:00
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