BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add teal-language-server + update lua modules (#205856)

Browse source 
* luaPackages.teal-language-server: init at 2022-11-22

* luaPackages: update

init cyan and teal-language-server
This commit is contained in:
Matthieu Coudron 2022-12-20 18:35:22 +01:00 committed by GitHub
parent 815e8e0a94
commit 27dd8e291d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 145 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
maintainers/scripts/luarocks-packages.csv
View file

@ -11,6 +11,7 @@ compat53,,,,0.7-1,,vcunat
cosmo,,,,,,marsam
coxpcall,,,,1.17.0-1,,
cqueues,,,,,,vcunat
cyan,,,,,,
cyrussasl,https://github.com/JorjBauer/lua-cyrussasl.git,,,,,
digestif,https://github.com/astoff/digestif.git,,,0.2-1,5.3,
dkjson,,,,,,
@ -99,6 +100,7 @@ sqlite,,,,,,
std._debug,https://github.com/lua-stdlib/_debug.git,,,,,
std.normalize,https://github.com/lua-stdlib/normalize.git,,,,,
stdlib,,,,41.2.2,,vyp
teal-language-server,,,http://luarocks.org/dev,,,
tl,,,,,,mephistophiles
vstruct,https://github.com/ToxicFrog/vstruct.git,,,,,
vusted,,,,,,figsoda

1 name src ref server version luaversion maintainers
11 cosmo marsam
12 coxpcall 1.17.0-1
13 cqueues vcunat
14 cyan
15 cyrussasl https://github.com/JorjBauer/lua-cyrussasl.git
16 digestif https://github.com/astoff/digestif.git 0.2-1 5.3
17 dkjson
100 std._debug https://github.com/lua-stdlib/_debug.git
101 std.normalize https://github.com/lua-stdlib/normalize.git
102 stdlib 41.2.2 vyp
103 teal-language-server http://luarocks.org/dev
104 tl mephistophiles
105 vstruct https://github.com/ToxicFrog/vstruct.git
106 vusted figsoda

222
pkgs/development/lua-modules/generated-packages.nix
View file

@ -224,17 +224,17 @@ cldr = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
}:
buildLuarocksPackage {
pname = "cldr";
version = "0.2.0-0";
version = "0.3.0-0";
knownRockspec = (fetchurl {
url = "mirror://luarocks/cldr-0.2.0-0.rockspec";
sha256 = "1vjwrlrdy10bacn0324fvs4sx85xryyg7npw2mp1k9kmasfr8r1s";
url = "mirror://luarocks/cldr-0.3.0-0.rockspec";
sha256 = "1fnr8k713w21v7hc64s4w5lgcgnbphq3gm69pisc2s4wq2fkija1";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/alerque/cldr-lua.git",
"rev": "51e4760838c0a83ef1a76d0a0fb2e9f964069a50",
"date": "2022-04-16T14:46:14+03:00",
"path": "/nix/store/7jziz15bjm27zw9i3arrxprglakz8n4d-cldr-lua",
"sha256": "1i22mcs50z99850j47gkgwyf0ahl4yh1732b4x3davjwy2fwak1x",
"rev": "4602a7859535ca198ddfaba73a02f9bce3e81025",
"date": "2022-12-06T12:36:06+03:00",
"path": "/nix/store/3xgwqd2pica8301sbfrw4bmv0xm2wzx5-cldr-lua",
"sha256": "0hlfb115qhamczzskvckxczf9dpp8cv8h6vz7zgdl2n025ik9dp4",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -368,6 +368,38 @@ buildLuarocksPackage {
};
}) {};
cyan = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchgit, argparse, luafilesystem, tl
}:
buildLuarocksPackage {
pname = "cyan";
version = "0.2.0-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/cyan-0.2.0-1.rockspec";
sha256 = "06v9arib8slcllqxxx0a1z7wqmb184v7klrisvkdqqhpbrry7ys5";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/teal-language/cyan",
"rev": "d2048e73fec6c693a90b189c63db47006cbae699",
"date": "2022-08-21T17:11:18-05:00",
"path": "/nix/store/gz58lng3g8hflqgl6xsnmzkjika0ncvx-cyan",
"sha256": "119slbsvl39r2c51gvv9yvnsda0x9yvbrxnm2nzz2pnwh3ry50qc",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
}
'') ["date" "path"]) ;
propagatedBuildInputs = [ argparse luafilesystem tl ];
meta = {
homepage = "https://github.com/teal-language/cyan";
description = "A build system for the Teal language";
license.fullName = "MIT";
};
}) {};
cyrussasl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchgit, lua
}:
@ -407,10 +439,10 @@ buildLuarocksPackage {
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/astoff/digestif",
"rev": "95b13ba7ed33605406353b200920ece08868d5a8",
"date": "2022-07-03T13:41:35+02:00",
"path": "/nix/store/k8y6gk4pqri76657c2sy4j4bkyh30jz5-digestif",
"sha256": "12pksz1l84iml7ng6yhywf0fyy8lclmcn2jjkdrh994lb7q9ya99",
"rev": "f1b4202928a49e8c20f84ed14deafd0f6b798e2f",
"date": "2022-12-07T18:12:23+01:00",
"path": "/nix/store/ss4kfahp9gnz2y826fr5w6dqxyxs25sn-digestif",
"sha256": "1jb8h7yks8bp74jpq85sz69d2k69vhp6gliajz8ximl3hbhdq17i",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -424,7 +456,7 @@ buildLuarocksPackage {
meta = {
homepage = "https://github.com/astoff/digestif/";
description = "A code analyzer for TeX";
license.fullName = "MIT";
license.fullName = "GPLv3+ and other free licenses";
};
}) {};
@ -546,10 +578,10 @@ buildLuarocksPackage {
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/lewis6991/gitsigns.nvim",
"rev": "56e01cb0ea52635854e97bd2dd2587c8ebfab978",
"date": "2022-10-16T16:50:37+01:00",
"path": "/nix/store/yrm4xpi43x2sijw8gamvlfgqnyd7j19l-gitsigns.nvim",
"sha256": "0rdfnw2pr0hjxlw7bfjfvbh7lll4ba8ymp5nxq58d0jq01lzsxkr",
"rev": "2ab3bdf0a40bab53033048c6be75bda86316b55d",
"date": "2022-12-19T14:51:38+00:00",
"path": "/nix/store/hdjmih6vd3707wdfvycnvq1ig2q349xx-gitsigns.nvim",
"sha256": "13j5cmrd54cx9d8rirmys01xgmf90ylc3wb5dzmsdjc7hy0viha2",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -693,10 +725,10 @@ buildLuarocksPackage {
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/stevedonovan/LDoc.git",
"rev": "71dd5edbda829cd87b312956f4eae1ff8133fb14",
"date": "2022-06-17T13:41:29+03:00",
"path": "/nix/store/ywgvf4a5bdh7b7jzx8xgibch0a9kr9d2-LDoc",
"sha256": "0wwr28fl46y84p78bxaw9wsb7b4x7hmjywfdx5d70axh0amnlyrv",
"rev": "01d648f4ad50c3d14f2acadee6acb26beda56990",
"date": "2022-11-18T00:01:45+01:00",
"path": "/nix/store/m7vvl2b5k69jrb88d0y60f2y4ryazkp9-LDoc",
"sha256": "1kl0ba9mnd7nksakzb3vwr0hkkkgyk92v93r2w9xnrq879dhy5mm",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -1084,17 +1116,17 @@ lua-cjson = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
}:
buildLuarocksPackage {
pname = "lua-cjson";
version = "2.1.0.6-1";
version = "2.1.0.10-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/lua-cjson-2.1.0.6-1.rockspec";
sha256 = "1x6dk17lwmgkafpki99yl1hlypchbrxr9sxqafrmx7wwvzbz6q11";
url = "mirror://luarocks/lua-cjson-2.1.0.10-1.rockspec";
sha256 = "05sp7rq72x4kdkyid1ch0yyscwsi5wk85d2hj6xwssz3h8n8drdg";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/openresty/lua-cjson",
"rev": "a03094c5473d9a9764bb486fbe5e99a62d166dae",
"date": "2018-04-19T12:03:43-07:00",
"path": "/nix/store/qdpqx2g0xi1c9fknzxx280mcdq6fi8rw-lua-cjson",
"sha256": "0i2sjsi6flax1k0bm647yijgmc02jznq9bn88mj71pgii79pfjhw",
"rev": "96e6e0ce67ed070a52223c1e9518c9018b1ce376",
"date": "2021-12-10T20:19:58+08:00",
"path": "/nix/store/1ac8lz6smfa8zqfipqfsg749l9rw4ly9-lua-cjson",
"sha256": "03hdsv7d77mggis58k8fmlpbh1d544m0lfqyl9rpjcqkiqs1qvza",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -1233,17 +1265,17 @@ lua-protobuf = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
}:
buildLuarocksPackage {
pname = "lua-protobuf";
version = "0.4.0-1";
version = "0.4.1-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/lua-protobuf-0.4.0-1.rockspec";
sha256 = "053r6z37847wm1xaxv5rwplmdqkp507qawgd382z0l7m05f06ls9";
url = "mirror://luarocks/lua-protobuf-0.4.1-1.rockspec";
sha256 = "0b395lhby26drb8dzf2gn2avlwvxmnaqmqx5m4g3ik7dmmn7p09i";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/starwing/lua-protobuf.git",
"rev": "832facd266366cd86ee9bf41d35327255d0033f2",
"date": "2022-07-27T14:34:12+08:00",
"path": "/nix/store/g68x4cbi6ssd5zak14r5cbi7k88d3ml9-lua-protobuf",
"sha256": "0ynfq0va4w8zlr67ld6v9nmi5mnvchfygd8h5jbwk2vzlj9hg2yw",
"rev": "2a2b0b95117642ad9470bfe0add7dd6ce82f3869",
"date": "2022-11-29T21:34:24+08:00",
"path": "/nix/store/8yjzfj6gy8nkz1dxf0bmy8afwiv8gsjr-lua-protobuf",
"sha256": "0c1vjji0nj9lznsxw5gbnhab0ibs69298yrsn5yky0hhz8mmx5nr",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -1365,17 +1397,17 @@ lua-resty-openssl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchgit}:
buildLuarocksPackage {
pname = "lua-resty-openssl";
version = "0.8.13-1";
version = "0.8.15-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/lua-resty-openssl-0.8.13-1.rockspec";
sha256 = "12wd4v2pc3ppnr64109nx4sh33clwllfbp11mmg1c1n2w13fz578";
url = "mirror://luarocks/lua-resty-openssl-0.8.15-1.rockspec";
sha256 = "1i5nvii1wjgs28lcg8gk1axh394fz773br23jppa7rcan7lvrs4j";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/fffonion/lua-resty-openssl.git",
"rev": "3293e301f6c3818b780f1a818eacc9b78960b274",
"date": "2022-10-14T16:38:23+08:00",
"path": "/nix/store/ykj5yj8sj9rc5122gg7dcnq723fsxjq5-lua-resty-openssl",
"sha256": "0hkhy8x34z9m7wsqxrrc4vfqw0dbjhq36pjkqcq391vlsvzxhx5h",
"rev": "fadbea797bed4227269128a14fdabd4dee7cc486",
"date": "2022-10-28T12:17:38+08:00",
"path": "/nix/store/a6qqhb2p408mldvm1rqya09rjn04bbkj-lua-resty-openssl",
"sha256": "0w03fggfnqch6q90lwsig803i3rv74vsdxlfdbfb4si2yssjyxsz",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -1635,17 +1667,17 @@ luacheck = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
}:
buildLuarocksPackage {
pname = "luacheck";
version = "1.0.0-1";
version = "1.1.0-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/luacheck-1.0.0-1.rockspec";
sha256 = "0q5kqix5n016piqhasp4h22srz1lzp96cjls4fgsbirjn87gsnxv";
url = "mirror://luarocks/luacheck-1.1.0-1.rockspec";
sha256 = "1r8d02x0hw28rd5p2gr7sf503lczjxv6qk1q66b375ibx6smpyza";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/lunarmodules/luacheck.git",
"rev": "4d2979930245415e556a7c9f47b63ea038afcfee",
"date": "2022-08-24T12:50:43+03:00",
"path": "/nix/store/kfqdn4v9nzqqdw02fri10ic7v61r99n7-luacheck",
"sha256": "1dkqcaf0yrbcwbjiqbpdksj39sj8rbkd8432q568dgq2z5y9khcf",
"rev": "fcbdeacad00e643e0d78c56b9ba6d8b3c7fa584f",
"date": "2022-12-19T20:51:56+03:00",
"path": "/nix/store/srzi8dfrbb9gby9lc7r4sndzzrpzd7nm-luacheck",
"sha256": "0bkbcxadlf0j59lyvadp7hs7l107blkci15i0hrbi72bx18hj99h",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -1992,17 +2024,17 @@ lualogging = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
}:
buildLuarocksPackage {
pname = "lualogging";
version = "1.7.0-1";
version = "1.8.0-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/lualogging-1.7.0-1.rockspec";
sha256 = "1h6zrhp3jvx4257gkskg8b6kd7pm6pd9wzhqb20vllyhj5vfb53h";
url = "mirror://luarocks/lualogging-1.8.0-1.rockspec";
sha256 = "0q1719r8lg8rnql809ylm6dbnja85f6nwyqir6f9giq3kcbvnsaq";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/lunarmodules/lualogging.git",
"rev": "540df4424165b622d7c408b1f9d2d3420a5206e8",
"date": "2022-09-21T22:50:18+02:00",
"path": "/nix/store/69jb23b1gv0pcb20jwan342zzp0zjw1f-lualogging",
"sha256": "1rwbf593qx67cbk45vm155d7ws1y0xgxmwca508l8clq7d6rv3x0",
"rev": "1c6fcf5f68e4d0324c5977f1a27083c06f4d1b8f",
"date": "2022-10-22T09:15:52+02:00",
"path": "/nix/store/yi5v7b8jyplgylsjamjg9c0iswjpzrfj-lualogging",
"sha256": "17y84wrbijfm1z91p8i41ijq9py69qn0k6c5in9yl2mha7s1vndh",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -2309,10 +2341,10 @@ luautf8 = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
}:
buildLuarocksPackage {
pname = "luautf8";
version = "0.1.4-1";
version = "0.1.5-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/luautf8-0.1.4-1.rockspec";
sha256 = "1pa91djyymhzfqnlc559v9wgk5l0m40wq0hnlnf841w6h5aj4fra";
url = "mirror://luarocks/luautf8-0.1.5-1.rockspec";
sha256 = "0b2fzb3ignpb028j35np3mkkydg73dpm0lqr4z89gzy2gfjm0iy7";
}).outPath;
src = fetchurl {
url = "https://github.com/starwing/luautf8/archive/refs/tags/0.1.4.tar.gz";
@ -2372,10 +2404,10 @@ buildLuarocksPackage {
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/rktjmp/lush.nvim",
"rev": "fca6940b754812746c9758cc512cc97dcdb47de0",
"date": "2022-10-17T06:32:03+11:00",
"path": "/nix/store/aybmp713rb8qa0crm94hgzjcqdvjjv8f-lush.nvim",
"sha256": "1q8jzyxdxlif7sjxjqs8x696q1734saca5g05gqhvv5d23287hrn",
"rev": "4cc81a12731fbefce1582a940b755691eb3eb6d1",
"date": "2022-12-16T22:20:07+11:00",
"path": "/nix/store/2h8v2ff1bha580jzyrhhwa9lnj98f327-lush.nvim",
"sha256": "0zwb9d8makr9k20cdf7fajhk3frbh4n4p1zajxig0f3ws867zjqx",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -2451,14 +2483,14 @@ lyaml = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
}:
buildLuarocksPackage {
pname = "lyaml";
version = "6.2.7-1";
version = "6.2.8-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/lyaml-6.2.7-1.rockspec";
sha256 = "0m5bnzg24nyk35gcn4rydgzk0ysk1f6rslxwxd0w3drl1bg64zja";
url = "mirror://luarocks/lyaml-6.2.8-1.rockspec";
sha256 = "0d0h70kjl5fkq589y1sx8qy8as002dhcf88pf60pghvch002ryi1";
}).outPath;
src = fetchzip {
url = "http://github.com/gvvaughan/lyaml/archive/v6.2.7.zip";
sha256 = "1qfvk610xgglyv9n2dp0cnh21f20q2zkl941qsv9qcbnm2f03vna";
url = "http://github.com/gvvaughan/lyaml/archive/v6.2.8.zip";
sha256 = "0r3jjsd8x2fs1aanki0s1mvpznl16f32c1qfgmicy0icgy5xfch0";
};
disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5");
@ -2539,10 +2571,10 @@ buildLuarocksPackage {
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/leafo/moonscript.git",
"rev": "b7efcd131046ed921ae1075d7c0f6a3b64a570f7",
"date": "2021-03-18T11:51:52-07:00",
"path": "/nix/store/xijbk0bgjpxjgmvscbqnghj4r3zdzgxl-moonscript",
"sha256": "14xx6pij0djblfv3g2hi0xlljh7h0yrbb03f4x90q5j66v693gx7",
"rev": "a0108328373d5f3f1aefb98341aa895dd75a1b2a",
"date": "2022-11-04T13:38:05-07:00",
"path": "/nix/store/js597jw44cdfq154a7bpqba99ninzsqh-moonscript",
"sha256": "02ig93c1dzrbs64mz40bkzz3p93fdxm6m0i7gfqwiickybr9wd97",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -2614,10 +2646,10 @@ buildLuarocksPackage {
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/hrsh7th/nvim-cmp",
"rev": "e94d3489311f941788756953df23ca84f83eec95",
"date": "2022-10-16T18:29:26+09:00",
"path": "/nix/store/jplbdkkgdbwxm930wyvxs6ghbljvh47g-nvim-cmp",
"sha256": "1v6iw2bqaqxzspl239jw3aqj64mc9sq2xxibvll7rmxxgv2mgyb5",
"rev": "8bbaeda725d5db6e4e1be2867a64b43bf547cf06",
"date": "2022-12-15T20:27:02+09:00",
"path": "/nix/store/bd3da1ahlp53p3b12780h2x29amr8a3h-nvim-cmp",
"sha256": "1ldbvspz6aam78d47ldpa7bv4z419bzsk5nhli75mz0vzidfvrw5",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -2644,10 +2676,10 @@ buildLuarocksPackage {
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/lunarmodules/penlight.git",
"rev": "d5958e242b95984a278c39c63fadc5ef1258978b",
"date": "2022-08-14T10:06:20+02:00",
"path": "/nix/store/91nha43c2gdjyn8146fn9zfghlgvvdzz-penlight",
"sha256": "0bvc1a3g41mx8wlaq4ig3cl568rsysyggsr00hf7bi0ygf529sny",
"rev": "b101290c532c2901764de57367d3f2b84127286d",
"date": "2022-10-23T07:52:51+03:00",
"path": "/nix/store/k2jh5076dwb8dp6h05vbdj9jpa87gl1f-penlight",
"sha256": "10pb55cfqrpc9a112pvldkanh63s8dww452gl2rkjnrsh9b9gw4b",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
@ -2963,6 +2995,38 @@ buildLuarocksPackage {
};
}) {};
teal-language-server = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchgit, cyan, dkjson, luafilesystem
}:
buildLuarocksPackage {
pname = "teal-language-server";
version = "dev-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/teal-language-server-dev-1.rockspec";
sha256 = "01l44c6bknz7ff9xqgich31hlb0yk4ms5k1hs4rhm3cs95s5vlzc";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://git@github.com/teal-language/teal-language-server.git",
"rev": "38266ed482ef4b7e51d9cf149f4c75103fd0cefc",
"date": "2022-11-22T12:51:28-06:00",
"path": "/nix/store/3wzza2p2c9ylcj8ihv4xmkgljkwgs0z6-teal-language-server",
"sha256": "0q50a9f4gskx80mifpg9lf5haxsiw53b9lik398ijbkym4mfg2sz",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
}
'') ["date" "path"]) ;
propagatedBuildInputs = [ cyan dkjson luafilesystem ];
meta = {
homepage = "https://github.com/teal-language/teal-language-server";
description = "A language server for the Teal language";
license.fullName = "MIT";
};
}) {};
tl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
, fetchgit, argparse, compat53, luafilesystem
, dkjson}: