aboutsummaryrefslogtreecommitdiff
path: root/infra/libkookie/nixpkgs/pkgs/development/tools/parsing
diff options
context:
space:
mode:
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/tools/parsing')
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/tools/parsing/antlr/4.8.nix (renamed from infra/libkookie/nixpkgs/pkgs/development/tools/parsing/antlr/4.7.nix)6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/tools/parsing/bison/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/tools/parsing/bisonc++/default.nix56
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix20
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix1
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json8
14 files changed, 117 insertions, 40 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/antlr/4.7.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/antlr/4.8.nix
index 23267bf24313..1c88c82e16ae 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/antlr/4.7.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/antlr/4.8.nix
@@ -2,12 +2,12 @@
, fetchFromGitHub, cmake, ninja, pkgconfig, libuuid, darwin }:
let
- version = "4.7.2";
+ version = "4.8";
source = fetchFromGitHub {
owner = "antlr";
repo = "antlr4";
rev = version;
- sha256 = "1pl0zs6c6wx9nmq30s7ccpc3dl72az55i8vfp574fw9sywmvxmlj";
+ sha256 = "1qal3add26qxskm85nk7r758arladn5rcyjinmhlhznmpbbv9j8m";
};
runtime = {
@@ -41,7 +41,7 @@ let
src = fetchurl {
url ="https://www.antlr.org/download/antlr-${version}-complete.jar";
- sha256 = "1d40nfkq3ws8g4ksx4gj6l6m2l9j4b605q6sf68z5vvmg5nkhlk8";
+ sha256 = "0nms976cnqyr1ndng3haxkmknpdq6xli4cpf4x4al0yr21l9v93k";
};
dontUnpack = true;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/bison/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/bison/default.nix
index 70fd733e1ee5..aa8d8df2c1d1 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/bison/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/bison/default.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "bison";
- version = "3.7.2";
+ version = "3.7.4";
src = fetchurl {
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
- sha256 = "111ax2imnydvrpcys5ami8ixn0a50m7a5pims7cbyysi8h8djp21";
+ sha256 = "1qkp2rfi5njyp5c5avajab00aj74pkmkgzkvshv4p2ydkhswgazv";
};
nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/bisonc++/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/bisonc++/default.nix
new file mode 100644
index 000000000000..c6a4fc1a068d
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/bisonc++/default.nix
@@ -0,0 +1,56 @@
+{stdenv, fetchurl, fetchFromGitLab
+, yodl, icmake, flexcpp, bobcat
+}:
+stdenv.mkDerivation rec {
+ pname = "bisonc++";
+ version = "6.04.00";
+
+ src = fetchFromGitLab {
+ domain = "gitlab.com";
+ owner = "fbb-git";
+ repo = "bisoncpp";
+ rev = "6.04.00";
+ sha256 = "sha256:0aa9bij4g08ilsk6cgrbgi03vyhqr9fn6j2164sjin93m63212wl";
+ };
+
+ buildInputs = [ bobcat ];
+
+ nativeBuildInputs = [ yodl icmake flexcpp ];
+
+ setSourceRoot = ''
+ sourceRoot="$(echo */bisonc++)"
+ '';
+
+ gpl = fetchurl {
+ url = "https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt";
+ sha256 = "sha256:0hq6i0dm4420825fdm0lnnppbil6z67ls67n5kgjcd912dszjxw1";
+ };
+
+ postPatch = ''
+ substituteInPlace INSTALL.im --replace /usr $out
+ patchShebangs .
+ for file in $(find documentation -type f); do
+ substituteInPlace "$file" --replace /usr/share/common-licenses/GPL ${gpl}
+ substituteInPlace "$file" --replace /usr $out
+ done
+ '';
+
+ buildPhase = ''
+ ./build program
+ ./build man
+ ./build manual
+ '';
+
+ installPhase = ''
+ ./build install x
+ '';
+
+ meta = with stdenv.lib; {
+ inherit version;
+ description = "A parser generator like bison, but it generates C++ code";
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ raskin ];
+ platforms = platforms.linux;
+ homepage = "https://fbb-git.gitlab.io/bisoncpp/";
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix
index be526085b757..60e6796850c2 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "byacc";
- version = "20200330";
+ version = "20200910";
src = fetchurl {
urls = [
"ftp://ftp.invisible-island.net/byacc/${pname}-${version}.tgz"
"https://invisible-mirror.net/archives/byacc/${pname}-${version}.tgz"
];
- sha256 = "1c0zyn6v286i09jlc8gx6jyaa5438qyy985rqsd76kb8ibfy56g0";
+ sha256 = "0c6gbvlgzi6yflri22w7fa2w3k5m3jk0xb5a43f3vwpa783hcn8a";
};
configureFlags = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix
index 63082f60ac2c..e34350615636 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix
@@ -3,6 +3,9 @@
, writeShellScript, runCommand, which
, rustPlatform, jq, nix-prefetch-git, xe, curl, emscripten
, callPackage
+, enableShared ? true
+, enableStatic ? false
+, Security
}:
# TODO: move to carnix or https://github.com/kolloch/crate2nix
@@ -11,9 +14,9 @@ let
# 1) change all these hashes
# 2) nix-build -A tree-sitter.updater.update-all-grammars
# 3) run the ./result script that is output by that (it updates ./grammars)
- version = "0.17.1";
- sha256 = "sha256-k61actAEyao/Ea8aw9PCm252U+1I0d43MAYC68/lui4=";
- cargoSha256 = "sha256-Jp/Fl20ZZfaIdWinOOujNVH5JjJNtyUYHfyTrmeeoRg=";
+ version = "0.17.3";
+ sha256 = "sha256-uQs80r9cPX8Q46irJYv2FfvuppwonSS5HVClFujaP+U=";
+ cargoSha256 = "sha256-fonlxLNh9KyEwCj7G5vxa7cM/DlcHNFbQpp0SwVQ3j4=";
src = fetchFromGitHub {
owner = "tree-sitter";
@@ -49,6 +52,8 @@ in rustPlatform.buildRustPackage {
pname = "tree-sitter";
inherit src version cargoSha256;
+ buildInputs = lib.optionals stdenv.isDarwin [ Security ];
+
nativeBuildInputs = [ emscripten which ];
postPatch = ''
@@ -68,6 +73,12 @@ in rustPlatform.buildRustPackage {
bash ./script/build-wasm --debug
'';
+ postInstall = ''
+ PREFIX=$out make install
+ ${lib.optionalString (!enableShared) "rm $out/lib/*.so{,.*}"}
+ ${lib.optionalString (!enableStatic) "rm $out/lib/*.a"}
+ '';
+
# test result: FAILED. 120 passed; 13 failed; 0 ignored; 0 measured; 0 filtered out
doCheck = false;
@@ -95,9 +106,8 @@ in rustPlatform.buildRustPackage {
'';
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ Profpatsch ];
- # Darwin needs some more work with default libraries
# Aarch has test failures with how tree-sitter compiles the generated C files
- broken = stdenv.isDarwin || stdenv.isAarch64;
+ broken = stdenv.isAarch64;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
index 083dc61a96f8..e9cb0a1db6ed 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
@@ -5,6 +5,7 @@
embedded-template = (builtins.fromJSON (builtins.readFile ./tree-sitter-embedded-template.json));
go = (builtins.fromJSON (builtins.readFile ./tree-sitter-go.json));
html = (builtins.fromJSON (builtins.readFile ./tree-sitter-html.json));
+ java = (builtins.fromJSON (builtins.readFile ./tree-sitter-java.json));
javascript = (builtins.fromJSON (builtins.readFile ./tree-sitter-javascript.json));
jsdoc = (builtins.fromJSON (builtins.readFile ./tree-sitter-jsdoc.json));
json = (builtins.fromJSON (builtins.readFile ./tree-sitter-json.json));
diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
index 99af884be9f7..16aef8ee33e9 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
+++ b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-cpp",
- "rev": "5e7476bd014445abdae879661e9caf299215478a",
- "date": "2020-05-14T11:46:56-07:00",
- "path": "/nix/store/xz540ah1xx06n3wwmk3ym72nj0bz82hh-tree-sitter-cpp",
- "sha256": "0v2l5269bhbpzcd929r3pn88gqcczx6spsq7p6ibsvsydbwj95wx",
+ "rev": "fb8250eef8b4cf1ce104806c50dc206e388b0e72",
+ "date": "2020-11-02T09:46:58-08:00",
+ "path": "/nix/store/qmza43f0fraa111bg50vaxsgnrs5kqs1-tree-sitter-cpp",
+ "sha256": "1sbk5a2p1fh6798naiswsap6fpj7n7bqhwd3xdyi35xf613qpwsi",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json
index 67d58d64063a..612b8eb64d88 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json
+++ b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-go",
- "rev": "34181774b3e86b7801c939c79c7b80a82df91a2b",
- "date": "2020-08-13T12:21:50-07:00",
- "path": "/nix/store/3a5w7pz1m74y0lhbzq3bw3k2297lypqs-tree-sitter-go",
- "sha256": "0cfi7ghs0m3iqwd4jvsqgsj4gnfikn1j2q0wbkdfvz2j25l0qwq0",
+ "rev": "dadfd9c9aab2630632e61cfce645c13c35aa092f",
+ "date": "2020-10-27T13:42:16-04:00",
+ "path": "/nix/store/91a8w265vjc955hyp7cqvpm8ks9zcmqv-tree-sitter-go",
+ "sha256": "1pwbzkg7s0l2fhr4p1rpcldjcpxbkaqsm3q81543almc75k38x8w",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json
new file mode 100644
index 000000000000..260dc4d10c00
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json
@@ -0,0 +1,10 @@
+{
+ "url": "https://github.com/tree-sitter/tree-sitter-java",
+ "rev": "f7b62ac33d63bea56ce202ace107aaa4285e50af",
+ "date": "2020-10-27T13:41:02-04:00",
+ "path": "/nix/store/h51zjbzdrm89gczcdv7nyih54vnd2xps-tree-sitter-java",
+ "sha256": "0jbh79brs1dskfqw05s9ndrp46hibyc37nfvhxlvanmgj3pjwgxb",
+ "fetchSubmodules": false,
+ "deepClone": false,
+ "leaveDotGit": false
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
index 9020e8a40bc3..68008d393d1f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
+++ b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-javascript",
- "rev": "3d5493495b62b4ff8e8c24aee7519dd904e25813",
- "date": "2020-09-21T17:18:41-07:00",
- "path": "/nix/store/bhjws8yif1ihhvhfsrdrp4inf03ks08r-tree-sitter-javascript",
- "sha256": "10fscmclcgl1a0314ppkfy0s7pmiiz5vjipbmks76608kic8nzpp",
+ "rev": "852f11b394804ac2a8986f8bcaafe77753635667",
+ "date": "2020-10-27T13:43:40-04:00",
+ "path": "/nix/store/7a9nd3prxbv2izvilqdxf58his097ak7-tree-sitter-javascript",
+ "sha256": "1cdqx75fm7fvna0iymw7n03a7f6gayfg97qwqz3himi0775fz9ir",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
index 1c057f51ea99..402c4c087b18 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
+++ b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-python",
- "rev": "30f538aa1f932a2864c102694761d3127a61dc68",
- "date": "2020-09-21T13:21:51-07:00",
- "path": "/nix/store/bxv85lm636xdsdqjf4n7sxjlhhh35qnv-tree-sitter-python",
- "sha256": "0hzzz90pn1qwyl5xk03cah62rbvp1c1yp1pw2m3hifqflxg4rs1g",
+ "rev": "d245768132eb6cb74d8a394ca4d29dc57169b096",
+ "date": "2020-10-27T13:20:04-04:00",
+ "path": "/nix/store/afv7ibxpf5c2shafa89cnza88hsfb7kj-tree-sitter-python",
+ "sha256": "075r5i2id2rn76xm3pcrn5cpvj63dlaxcpvphig39a4c9f9hrpdx",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json
index 06418942b4de..d5a1767a23ce 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json
+++ b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-ruby",
- "rev": "a6fcb529e9097a2efbbb3f4857e42773e7f2474f",
- "date": "2020-05-26T16:18:48-07:00",
- "path": "/nix/store/yqd5b7ky21scahnhrik9psalbkwi3ab3-tree-sitter-ruby",
- "sha256": "0bxg5lfdazz5mlfnf0amcygvc8b2ydzl2blvbbhnziyx92r8di6q",
+ "rev": "f86d90cce578e28c824afdcdbdca7d031b88c0b0",
+ "date": "2020-11-02T20:49:49-08:00",
+ "path": "/nix/store/gs0hhb1dlgmv0y60zyyz7ki30yvpddfx-tree-sitter-ruby",
+ "sha256": "1n1irdjfmv27p5ia2vqzv8zfsq19pxi0as0wrkb7z7s1lqr1gwrb",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
index 9f037cdc0947..4e0e2e2f7f47 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
+++ b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-rust",
- "rev": "40620bf4097cbc9cea79504d7e877865df43a19e",
- "date": "2020-05-15T10:53:35-07:00",
- "path": "/nix/store/r24bba6gxchb5zqzghna8yjvqnngbv4a-tree-sitter-rust",
- "sha256": "0hjp6nsskw341g97x41481b3zfwh8g853fs9six6j1mh92irmv6y",
+ "rev": "cf47ff80cbd8bdc6dd649a005c5f5d73f9c347e2",
+ "date": "2020-11-04T06:23:40-08:00",
+ "path": "/nix/store/8cvjxw8cz5jrkqwvgq88r7rfm269xwk1-tree-sitter-rust",
+ "sha256": "0yzcag0yy3ncxwpnb3fmsw8bxaidp7z8kbl8wwaxaj2vvxxf6sam",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
index 7081d3036cf1..d31f72754bf8 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
+++ b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-typescript",
- "rev": "5a38a5bd04364d9f48b902fd1514e075b98b0edc",
- "date": "2020-09-17T10:19:01-07:00",
- "path": "/nix/store/b3q7vz9zhgjdbv3c2xap4k2ghpdjp2yf-tree-sitter-typescript",
- "sha256": "1mxwvzqbaaq11cz7zidiwr29fs0b6ycf3nadwdkgiz8c6x2xx398",
+ "rev": "73afadbd117a8e8551758af9c3a522ef46452119",
+ "date": "2020-10-20T12:15:52-07:00",
+ "path": "/nix/store/wrgp1j5l50cigv5cmlxikw693a55i6g9-tree-sitter-typescript",
+ "sha256": "0dsbmcvjzys9s229drp1l8anram7d6nsx1nixl5m9znw54hr4w9p",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false