Commit Graph

817 Commits

Author SHA1 Message Date
seth
f348632995
tree-sitter-grammars: add just 2024-01-19 15:26:35 -05:00
Weijia Wang
a264bba538
Merge pull request #278577 from TomaSajt/javacc
javacc: make deterministic and clean up
2024-01-11 20:30:13 +01:00
R. Ryantm
16c2f88a96 byacc: 20230521 -> 20240109 2024-01-11 04:19:38 +00:00
TomaSajt
45f234686c
javacc: make deterministic and clean up 2024-01-03 22:33:33 +01:00
Weijia Wang
5e621e80f1
Merge pull request #275005 from r-ryantm/auto-update/peg
peg: 0.1.19 -> 0.1.20
2024-01-03 18:08:36 +01:00
Otavio Salvador
17d6576d85 tree-sitter-grammars: add bitbake
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2023-12-30 20:11:57 -03:00
adisbladis
5f396752c0 tree-sitter-grammars.tree-sitter-nix: update grammar 2023-12-26 15:47:54 +13:00
Adam Stephens
72ff6b5fcf tree-sitter-grammars.tree-sitter-nu: use official repo 2023-12-21 11:47:16 -08:00
Weijia Wang
b425dc72ad
Merge pull request #272259 from rvolosatovs/fix/aarch64-darwin-jshon
jshon: fix build on aarch64-darwin
2023-12-17 20:16:39 +01:00
R. Ryantm
4fa6dc6a4d peg: 0.1.19 -> 0.1.20 2023-12-17 15:20:36 +00:00
Roman Volosatovs
73877a6f34 jshon: fix build on aarch64-darwin
```
jshon> clang -std=c99 -Wall -pedantic -Wextra -Werror    -c -o jshon.o jshon.c
jshon> jshon.c:189:25: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
jshon> json_t** stack_safe_peek()
jshon>                         ^
jshon>                          void
jshon> 6 errors generated.
jshon> make: *** [<builtin>: jshon.o] Error 1
```

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>
2023-12-10 01:07:57 +01:00
Aaron Jheng
adadeffea9
utf8cpp: 3.2.5 -> 4.0.3 2023-12-08 12:20:46 +00:00
Pol Dellaiera
38da51f06c
Merge pull request #268695 from purcell/tree-sitter-uiua
tree-sitter-grammars: add uiua
2023-11-30 16:33:18 +01:00
Matthieu Coudron
c808d957d0
Merge pull request #270304 from teto/add-neorg-meta
tree-sitter-grammars.tree-sitter-norg-meta: init
2023-11-30 13:50:11 +01:00
Pol Dellaiera
9f1c780a7b
Merge pull request #267034 from r-ryantm/auto-update/re-flex
re-flex: 3.5.0 -> 3.5.1
2023-11-27 21:14:27 +01:00
Pol Dellaiera
6c285f35e4
Merge pull request #269116 from r-ryantm/auto-update/peg
peg: 0.1.18 -> 0.1.19
2023-11-27 20:52:38 +01:00
Matthieu Coudron
91ed9b6d93 tree-sitter-grammars.tree-sitter-norg-meta: init 2023-11-27 00:26:29 +01:00
Matthieu Coudron
1266abe247 tree-sitter: ignore csharp-tree-sitter to unblock update 2023-11-27 00:23:28 +01:00
R. Ryantm
a6779efbbc javacc: 7.0.12 -> 7.0.13 2023-11-23 12:02:32 -08:00
R. Ryantm
e8e83ee1a8 peg: 0.1.18 -> 0.1.19 2023-11-22 05:33:16 +00:00
Steve Purcell
7b5f99cbac tree-sitter-grammars: add uiua 2023-11-20 11:25:06 +00:00
Martin Weinelt
3c336a1647
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/libraries/gdcm/default.nix
2023-11-14 13:16:34 +01:00
R. Ryantm
6276c26abf spicy-parser-generator: 1.8.1 -> 1.9.0 2023-11-14 03:02:47 +00:00
R. Ryantm
5997302957 re-flex: 3.5.0 -> 3.5.1 2023-11-12 11:29:54 +00:00
github-actions[bot]
38bc2a577e
Merge master into staging-next 2023-11-07 00:02:31 +00:00
Dmitry Kalinkin
93b63a2cab
Merge pull request #265514 from xworld21/treewide-texlive-with-packages
treewide: switch to texlive.withPackages
2023-11-06 16:47:04 -05:00
Weijia Wang
32da89a1a1 Merge branch 'master' into staging-next 2023-11-06 14:33:18 +01:00
Thiago Kenji Okada
b45133e20d
Merge pull request #244298 from oxalica/remove-unused
{birdtray,isgx,mycrypto,osu-lazer,stretchly,tree-sitter}: remove oxalica as maintainer
2023-11-06 08:13:34 +00:00
Vincenzo Mantova
1fd9882538 ragel: replace texlive.combined.scheme-small with texliveSmall 2023-11-05 11:56:04 +00:00
github-actions[bot]
81ed2302dc
Merge master into staging-next 2023-10-28 06:00:57 +00:00
Weijia Wang
e5092f1b39
Merge pull request #261519 from r-ryantm/auto-update/re-flex
re-flex: 3.4.1 -> 3.5.0
2023-10-28 03:31:21 +02:00
Vladimír Čunát
d811555465
Merge branch 'staging' into staging-next 2023-10-26 10:36:50 +02:00
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