Commit Graph

719 Commits

Author SHA1 Message Date
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
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