Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
eb0de71dc6
@ -8,11 +8,11 @@
|
||||
"new": "cmp-tmux"
|
||||
},
|
||||
"fern-vim": {
|
||||
"date": "2024-05-17",
|
||||
"date": "2024-05-25",
|
||||
"new": "vim-fern"
|
||||
},
|
||||
"gina-vim": {
|
||||
"date": "2024-05-17",
|
||||
"date": "2024-05-25",
|
||||
"new": "vim-gina"
|
||||
},
|
||||
"gist-vim": {
|
||||
@ -60,7 +60,7 @@
|
||||
"new": "vim-suda"
|
||||
},
|
||||
"vim-fsharp": {
|
||||
"date": "2024-05-17",
|
||||
"date": "2024-05-25",
|
||||
"new": "zarchive-vim-fsharp"
|
||||
},
|
||||
"vim-jade": {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -5,12 +5,12 @@
|
||||
{
|
||||
ada = buildGrammar {
|
||||
language = "ada";
|
||||
version = "0.0.0+rev=ba0894e";
|
||||
version = "0.0.0+rev=e8e2515";
|
||||
src = fetchFromGitHub {
|
||||
owner = "briot";
|
||||
repo = "tree-sitter-ada";
|
||||
rev = "ba0894efa03beb70780156b91e28c716b7a4764d";
|
||||
hash = "sha256-30yCHcO9LdZ9VKQpObWRfk49M5tC85IZvutXgzGwTjQ=";
|
||||
rev = "e8e2515465cc2d7c444498e68bdb9f1d86767f95";
|
||||
hash = "sha256-qfuVoh3R418F1FMN6CTXNnCaAk5gQj5lI/NoaJgnkW8=";
|
||||
};
|
||||
meta.homepage = "https://github.com/briot/tree-sitter-ada";
|
||||
};
|
||||
@ -180,6 +180,17 @@
|
||||
};
|
||||
meta.homepage = "https://gitlab.com/gabmus/tree-sitter-blueprint.git";
|
||||
};
|
||||
bp = buildGrammar {
|
||||
language = "bp";
|
||||
version = "0.0.0+rev=2326d70";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ambroisie";
|
||||
repo = "tree-sitter-bp";
|
||||
rev = "2326d709fb9cf73cf124fdbc803c267f851721a4";
|
||||
hash = "sha256-h9T8tfS2K85N9NLwYj6tu2MHPj4YyG/UBYoezfWuEyI=";
|
||||
};
|
||||
meta.homepage = "https://github.com/ambroisie/tree-sitter-bp";
|
||||
};
|
||||
c = buildGrammar {
|
||||
language = "c";
|
||||
version = "0.0.0+rev=82fb86a";
|
||||
@ -237,12 +248,12 @@
|
||||
};
|
||||
clojure = buildGrammar {
|
||||
language = "clojure";
|
||||
version = "0.0.0+rev=3a1ace9";
|
||||
version = "0.0.0+rev=f4236d4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sogaiu";
|
||||
repo = "tree-sitter-clojure";
|
||||
rev = "3a1ace906c151dd631cf6f149b5083f2b60e6a9e";
|
||||
hash = "sha256-pLOCUReklkRt9t5kalDrOAlE9U7a2O8sXaZFjYhagcg=";
|
||||
rev = "f4236d4da8aa92bc105d9c118746474c608e6af7";
|
||||
hash = "sha256-UlK6D/xnuPFL/Cu5W7hBMQ/zbodFwrS1CeJDjVpZFpo=";
|
||||
};
|
||||
meta.homepage = "https://github.com/sogaiu/tree-sitter-clojure";
|
||||
};
|
||||
@ -492,12 +503,12 @@
|
||||
};
|
||||
earthfile = buildGrammar {
|
||||
language = "earthfile";
|
||||
version = "0.0.0+rev=cc99a3f";
|
||||
version = "0.0.0+rev=91fc943";
|
||||
src = fetchFromGitHub {
|
||||
owner = "glehmann";
|
||||
repo = "tree-sitter-earthfile";
|
||||
rev = "cc99a3f5e4281b63fdd63dca4750e808fd52628f";
|
||||
hash = "sha256-wOKNkNoNw2Stv+8zhVAX2No8Y060Kri/j5iytJvviUc=";
|
||||
rev = "91fc9434283aec06139e37fc007ad00922f278b4";
|
||||
hash = "sha256-MMz4Af3U5PXuojOmMHL8cYEjklPBHnffEOJX2lAVqjw=";
|
||||
};
|
||||
meta.homepage = "https://github.com/glehmann/tree-sitter-earthfile";
|
||||
};
|
||||
@ -592,12 +603,12 @@
|
||||
};
|
||||
erlang = buildGrammar {
|
||||
language = "erlang";
|
||||
version = "0.0.0+rev=868306b";
|
||||
version = "0.0.0+rev=98ea1f9";
|
||||
src = fetchFromGitHub {
|
||||
owner = "WhatsApp";
|
||||
repo = "tree-sitter-erlang";
|
||||
rev = "868306b033f5163658e8777940da68d61afad5cb";
|
||||
hash = "sha256-9QRYYKSy7riZfUVSnYzTIGH0tznU90Q1nYwe7DDr284=";
|
||||
rev = "98ea1f9c957b2ad520415eecb5a5b406e931101e";
|
||||
hash = "sha256-9CpVwtTy5vojZABc97KZt2P8vBOZFAw3ZFRp43WOqEc=";
|
||||
};
|
||||
meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang";
|
||||
};
|
||||
@ -834,12 +845,12 @@
|
||||
};
|
||||
glsl = buildGrammar {
|
||||
language = "glsl";
|
||||
version = "0.0.0+rev=8c9fb41";
|
||||
version = "0.0.0+rev=33a16b6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "theHamsta";
|
||||
repo = "tree-sitter-glsl";
|
||||
rev = "8c9fb41836dc202bbbcf0e2369f256055786dedb";
|
||||
hash = "sha256-aUM0gisdoV3A9lWSjn21wXIBI8ZrKI/5IffAaf917e4=";
|
||||
rev = "33a16b6ff4d7206a16f2dc96c40e149c657db65f";
|
||||
hash = "sha256-qblDE+NIlJR5wyprvY6G3kG0uFzqWaQZmxN/hDnjNAs=";
|
||||
};
|
||||
meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl";
|
||||
};
|
||||
@ -911,12 +922,12 @@
|
||||
};
|
||||
gotmpl = buildGrammar {
|
||||
language = "gotmpl";
|
||||
version = "0.0.0+rev=17144a7";
|
||||
version = "0.0.0+rev=9d3f6e5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ngalaiko";
|
||||
repo = "tree-sitter-go-template";
|
||||
rev = "17144a77be0acdecebd9d557398883569fed41de";
|
||||
hash = "sha256-aB8MTTKzxV9+66goNfFRI39wzuBiGECAc8HvAQzIv80=";
|
||||
rev = "9d3f6e526dd074b9edae9070b7bb778f00e87a5b";
|
||||
hash = "sha256-ndd85YVO2brK7JVBFOg6bbKV66qVPjo4DVi7GaT/eZA=";
|
||||
};
|
||||
meta.homepage = "https://github.com/ngalaiko/tree-sitter-go-template";
|
||||
};
|
||||
@ -1043,12 +1054,12 @@
|
||||
};
|
||||
helm = buildGrammar {
|
||||
language = "helm";
|
||||
version = "0.0.0+rev=17144a7";
|
||||
version = "0.0.0+rev=9d3f6e5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ngalaiko";
|
||||
repo = "tree-sitter-go-template";
|
||||
rev = "17144a77be0acdecebd9d557398883569fed41de";
|
||||
hash = "sha256-aB8MTTKzxV9+66goNfFRI39wzuBiGECAc8HvAQzIv80=";
|
||||
rev = "9d3f6e526dd074b9edae9070b7bb778f00e87a5b";
|
||||
hash = "sha256-ndd85YVO2brK7JVBFOg6bbKV66qVPjo4DVi7GaT/eZA=";
|
||||
};
|
||||
location = "dialects/helm";
|
||||
meta.homepage = "https://github.com/ngalaiko/tree-sitter-go-template";
|
||||
@ -1066,12 +1077,12 @@
|
||||
};
|
||||
hlsl = buildGrammar {
|
||||
language = "hlsl";
|
||||
version = "0.0.0+rev=feea0ff";
|
||||
version = "0.0.0+rev=a84e8d4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "theHamsta";
|
||||
repo = "tree-sitter-hlsl";
|
||||
rev = "feea0ff6eccda8be958c133985dca8977db3d887";
|
||||
hash = "sha256-VIrNt9pjNtwVbQKZGPota5blxbPGGEhdiRYtPNU/XtA=";
|
||||
rev = "a84e8d4f675d0006f7c07f6c7bcea2fca04cdb6e";
|
||||
hash = "sha256-9UpcYchmtLwlH1YCGfsWnMt7tQ/560lKIzqSgPWovdc=";
|
||||
};
|
||||
meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl";
|
||||
};
|
||||
@ -1165,12 +1176,12 @@
|
||||
};
|
||||
idl = buildGrammar {
|
||||
language = "idl";
|
||||
version = "0.0.0+rev=006a526";
|
||||
version = "0.0.0+rev=b5b53e2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "cathaysia";
|
||||
repo = "tree-sitter-idl";
|
||||
rev = "006a5266d771cab57da58a6ade483ebd3075638d";
|
||||
hash = "sha256-NV7VojLenoq7RDyN1HMuyZFjcQhZeC6OtRz/y4bAe58=";
|
||||
rev = "b5b53e2ca0521b98277d5e4b109f0b0e362e850e";
|
||||
hash = "sha256-zgjTZWTBchKDYgubQX5SIblbflCVh9Tv9R//ohzZFKw=";
|
||||
};
|
||||
meta.homepage = "https://github.com/cathaysia/tree-sitter-idl";
|
||||
};
|
||||
@ -1187,12 +1198,12 @@
|
||||
};
|
||||
inko = buildGrammar {
|
||||
language = "inko";
|
||||
version = "0.0.0+rev=4cef9aa";
|
||||
version = "0.0.0+rev=7860637";
|
||||
src = fetchFromGitHub {
|
||||
owner = "inko-lang";
|
||||
repo = "tree-sitter-inko";
|
||||
rev = "4cef9aa4980606311b906b2f2b8c6cf791c60396";
|
||||
hash = "sha256-NnZ5sSNwVVsx1I8eacvTl+1Vn/PL3NsrlFNPHQMUP6I=";
|
||||
rev = "7860637ce1b43f5f79cfb7cc3311bf3234e9479f";
|
||||
hash = "sha256-NlmfN83UOJW5z8IGCEVfDnhZBUG04oA6/5O7aJckqdI=";
|
||||
};
|
||||
meta.homepage = "https://github.com/inko-lang/tree-sitter-inko";
|
||||
};
|
||||
@ -1209,12 +1220,12 @@
|
||||
};
|
||||
janet_simple = buildGrammar {
|
||||
language = "janet_simple";
|
||||
version = "0.0.0+rev=51271e2";
|
||||
version = "0.0.0+rev=f3d6e09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sogaiu";
|
||||
repo = "tree-sitter-janet-simple";
|
||||
rev = "51271e260346878e1a1aa6c506ce6a797b7c25e2";
|
||||
hash = "sha256-QXH/s0mB9kDKuYYB+Pa+nPjArt4pjcsLXCHP4I3nGwU=";
|
||||
rev = "f3d6e09cc47e76833f23f83b2c59ea0878660953";
|
||||
hash = "sha256-5LGAb5zsjaMlFFhLRNFOeZuGXxJ6btwfeduQqsDTRng=";
|
||||
};
|
||||
meta.homepage = "https://github.com/sogaiu/tree-sitter-janet-simple";
|
||||
};
|
||||
@ -1231,12 +1242,12 @@
|
||||
};
|
||||
javascript = buildGrammar {
|
||||
language = "javascript";
|
||||
version = "0.0.0+rev=e88537c";
|
||||
version = "0.0.0+rev=a5de24d";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-javascript";
|
||||
rev = "e88537c2703546f3f0887dd3f16898e1749cdba5";
|
||||
hash = "sha256-/poR9qMfjWKJW6aw0s6VjNh7fkf/HvUJNZIeZ1YEwVM=";
|
||||
rev = "a5de24dc7939cb07a758f8d89c089cfdb6f479aa";
|
||||
hash = "sha256-jsdY9Pd9WqZuBYtk088mx1bRQadC6D2/tGGVY+ZZ0J4=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript";
|
||||
};
|
||||
@ -1452,12 +1463,12 @@
|
||||
};
|
||||
liquidsoap = buildGrammar {
|
||||
language = "liquidsoap";
|
||||
version = "0.0.0+rev=a9b8012";
|
||||
version = "0.0.0+rev=14feafa";
|
||||
src = fetchFromGitHub {
|
||||
owner = "savonet";
|
||||
repo = "tree-sitter-liquidsoap";
|
||||
rev = "a9b8012366eab7d0c28bbda5f75a847be931008f";
|
||||
hash = "sha256-n8kT4bxRSp3EOJwsm0S4kKYq6Iln1vvvho/di4N0lRs=";
|
||||
rev = "14feafa91630afb1ab9988cf9b738b7ea29f3f89";
|
||||
hash = "sha256-FERYGF9D163b6S/YBwHwkrUM2qRkEKOViSDRa61OjtQ=";
|
||||
};
|
||||
meta.homepage = "https://github.com/savonet/tree-sitter-liquidsoap";
|
||||
};
|
||||
@ -1507,12 +1518,12 @@
|
||||
};
|
||||
luau = buildGrammar {
|
||||
language = "luau";
|
||||
version = "0.0.0+rev=5b088fa";
|
||||
version = "0.0.0+rev=5aa9b88";
|
||||
src = fetchFromGitHub {
|
||||
owner = "amaanq";
|
||||
repo = "tree-sitter-luau";
|
||||
rev = "5b088fac748f2666a315cafd1638a214388eb23e";
|
||||
hash = "sha256-m0xHQu9nxjyrCMza9Aw/kRK8Rlhtc2DRbtyyFtMZkJU=";
|
||||
rev = "5aa9b88a8e3327276ec6e72de997f04ac80b1ae4";
|
||||
hash = "sha256-7cxnELiCmLOPecca3U2CN1F4CUSbL8upxAn0PxwU6dM=";
|
||||
};
|
||||
meta.homepage = "https://github.com/amaanq/tree-sitter-luau";
|
||||
};
|
||||
@ -1608,12 +1619,12 @@
|
||||
};
|
||||
mlir = buildGrammar {
|
||||
language = "mlir";
|
||||
version = "0.0.0+rev=a708e9b";
|
||||
version = "0.0.0+rev=00c32d8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "artagnon";
|
||||
repo = "tree-sitter-mlir";
|
||||
rev = "a708e9b3f3d7f2fc85ac3fd1d4317c51b101eab0";
|
||||
hash = "sha256-ITimvcYGqPUrqg3Z9EyfhEznzME2TKBOJpr0Fbc3OoE=";
|
||||
rev = "00c32d8562dc957b187da110a3443307962b8da8";
|
||||
hash = "sha256-cyd9n1ydIEoBL+hnRiCSEC2S9H1hrWZlMCxVbxWyazI=";
|
||||
};
|
||||
generate = true;
|
||||
meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
|
||||
@ -1777,12 +1788,12 @@
|
||||
};
|
||||
odin = buildGrammar {
|
||||
language = "odin";
|
||||
version = "0.0.0+rev=f25b8c5";
|
||||
version = "0.0.0+rev=d37b8f2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "amaanq";
|
||||
repo = "tree-sitter-odin";
|
||||
rev = "f25b8c5201c1480dc0c8c4155a059a79a5a40719";
|
||||
hash = "sha256-720CY0OKlq1P+9g0VHQ6l0lTBjGy/tYiolL8e2ahd8o=";
|
||||
rev = "d37b8f24f653378b268ec18404e9c14ad355b128";
|
||||
hash = "sha256-QZn+XgVQXEaMZF4XkMfS4bHf/tQIersI8982JQyiXms=";
|
||||
};
|
||||
meta.homepage = "https://github.com/amaanq/tree-sitter-odin";
|
||||
};
|
||||
@ -1832,35 +1843,35 @@
|
||||
};
|
||||
perl = buildGrammar {
|
||||
language = "perl";
|
||||
version = "0.0.0+rev=d4ebabd";
|
||||
version = "0.0.0+rev=309cb8d";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter-perl";
|
||||
repo = "tree-sitter-perl";
|
||||
rev = "d4ebabd45bcb053fcc7f6688b5c8ed80c7ae7a32";
|
||||
hash = "sha256-0WnI0L6Tuy3FD4XxCZR1HcQyo5uv0VXhK8eqopCAS+A=";
|
||||
rev = "309cb8d33bcfd0a81050b21be08f9eb3f2fe2138";
|
||||
hash = "sha256-eMmU6qkg9ZVjtxaW1tSPhqsPe2WX3/frPfqMxXCziyo=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl";
|
||||
};
|
||||
php = buildGrammar {
|
||||
language = "php";
|
||||
version = "0.0.0+rev=27afeb0";
|
||||
version = "0.0.0+rev=b38c535";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-php";
|
||||
rev = "27afeb02e49ff30acd17b67897b1c0114561a38c";
|
||||
hash = "sha256-PnxjmaC9FPhHlhbhDR+VIbzf5K7Pon7V0pLMymvqoKo=";
|
||||
rev = "b38c53537769df05871643c9688c264074fb6076";
|
||||
hash = "sha256-PWAuWTi2sXeGYes6p6mLi3Mx2Nu+xLuc86NLZrEyK00=";
|
||||
};
|
||||
location = "php";
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
|
||||
};
|
||||
php_only = buildGrammar {
|
||||
language = "php_only";
|
||||
version = "0.0.0+rev=27afeb0";
|
||||
version = "0.0.0+rev=b38c535";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-php";
|
||||
rev = "27afeb02e49ff30acd17b67897b1c0114561a38c";
|
||||
hash = "sha256-PnxjmaC9FPhHlhbhDR+VIbzf5K7Pon7V0pLMymvqoKo=";
|
||||
rev = "b38c53537769df05871643c9688c264074fb6076";
|
||||
hash = "sha256-PWAuWTi2sXeGYes6p6mLi3Mx2Nu+xLuc86NLZrEyK00=";
|
||||
};
|
||||
location = "php_only";
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
|
||||
@ -2099,12 +2110,12 @@
|
||||
};
|
||||
query = buildGrammar {
|
||||
language = "query";
|
||||
version = "0.0.0+rev=d25e8d1";
|
||||
version = "0.0.0+rev=a12c4a1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-treesitter";
|
||||
repo = "tree-sitter-query";
|
||||
rev = "d25e8d183f319497b8b22a2a1585975b020da722";
|
||||
hash = "sha256-c4ttg5UXtRlUdtljQwczoBSR/oX+rnj5gUqR8EIYMKQ=";
|
||||
rev = "a12c4a1cd8aa6e0340ecb7089a05cd345a12bae3";
|
||||
hash = "sha256-LeyYv4qNvCIagMwdJ0eyXx/1RCD+sL7oWRCkfNe/8V4=";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-treesitter/tree-sitter-query";
|
||||
};
|
||||
@ -2132,12 +2143,12 @@
|
||||
};
|
||||
rasi = buildGrammar {
|
||||
language = "rasi";
|
||||
version = "0.0.0+rev=43196d9";
|
||||
version = "0.0.0+rev=6c9bbcf";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Fymyte";
|
||||
repo = "tree-sitter-rasi";
|
||||
rev = "43196d934a9a6ab3c7093a8683efd0111bb03db1";
|
||||
hash = "sha256-7zhQ5wGm0FFyuTiBVN2KgvUTw8G6fwUGR8HKJ69kR+c=";
|
||||
rev = "6c9bbcfdf5f0f553d9ebc01750a3aa247a37b8aa";
|
||||
hash = "sha256-sPrIVgGGaBaXeqHNxjcdJ/S2FvxyV6rD9UPKU/tpspw=";
|
||||
};
|
||||
meta.homepage = "https://github.com/Fymyte/tree-sitter-rasi";
|
||||
};
|
||||
@ -2198,12 +2209,12 @@
|
||||
};
|
||||
requirements = buildGrammar {
|
||||
language = "requirements";
|
||||
version = "0.0.0+rev=8666a4d";
|
||||
version = "0.0.0+rev=360c6a6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ObserverOfTime";
|
||||
repo = "tree-sitter-requirements";
|
||||
rev = "8666a4dfeb3107144398158bc3dd7a3f59d89ccb";
|
||||
hash = "sha256-M+/I0pn79Juk8LRB6LLRAyA3R5zcm6rIoR4viT9SW0c=";
|
||||
rev = "360c6a6b31076a482663806f7a8241de9cad6b4e";
|
||||
hash = "sha256-wqaFpT/4Gq8mWoORcZeGah18VunvKlgr8gCgHQvEF6E=";
|
||||
};
|
||||
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-requirements";
|
||||
};
|
||||
@ -2264,12 +2275,12 @@
|
||||
};
|
||||
ruby = buildGrammar {
|
||||
language = "ruby";
|
||||
version = "0.0.0+rev=788a63c";
|
||||
version = "0.0.0+rev=dc2d7d6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-ruby";
|
||||
rev = "788a63ca1b7619288980aaafd37d890ee2469421";
|
||||
hash = "sha256-FvLSj0lTNNabneXrDH7/HQq4mcTLvBwhkPW/Pf48JWc=";
|
||||
rev = "dc2d7d6b50f9975bc3c35bbec0ba11b2617b736b";
|
||||
hash = "sha256-HV/hJwftBTCj9WomIcLB6n0LcQRHAzlQsJBNOxu6XJo=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-ruby";
|
||||
};
|
||||
@ -2331,12 +2342,12 @@
|
||||
};
|
||||
slang = buildGrammar {
|
||||
language = "slang";
|
||||
version = "0.0.0+rev=6858753";
|
||||
version = "0.0.0+rev=989bfe5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "theHamsta";
|
||||
repo = "tree-sitter-slang";
|
||||
rev = "68587530d86aaeb1f1cb17fdada795281cdd0556";
|
||||
hash = "sha256-hWMfiwQEd39WKifIM6NhbXnoKI5zPIGxU2GBvfdjQ9s=";
|
||||
rev = "989bfe5ae69e7bad13454b8f52e4ab0c343d8ded";
|
||||
hash = "sha256-1/8cFxmWHENzrTB7p//DRaZ1pw8WdPe6V2HNj+105Kc=";
|
||||
};
|
||||
meta.homepage = "https://github.com/theHamsta/tree-sitter-slang";
|
||||
};
|
||||
@ -2421,12 +2432,12 @@
|
||||
};
|
||||
sourcepawn = buildGrammar {
|
||||
language = "sourcepawn";
|
||||
version = "0.0.0+rev=4c62065";
|
||||
version = "0.0.0+rev=227656e";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nilshelmig";
|
||||
repo = "tree-sitter-sourcepawn";
|
||||
rev = "4c62065c4136873ef42a9efe128380cbe7ae4f64";
|
||||
hash = "sha256-cJDEBX821nJnGQLfZ/Me/PDdX5cQuJYzhrJZOLfl+sk=";
|
||||
rev = "227656e72a5f0d430bb82a467bc8078f078bba84";
|
||||
hash = "sha256-EfvOwLMxTeY8wH0cVxltELiujxRDoOfCGno2Omrk7vw=";
|
||||
};
|
||||
meta.homepage = "https://github.com/nilshelmig/tree-sitter-sourcepawn";
|
||||
};
|
||||
@ -2476,12 +2487,12 @@
|
||||
};
|
||||
starlark = buildGrammar {
|
||||
language = "starlark";
|
||||
version = "0.0.0+rev=b31a616";
|
||||
version = "0.0.0+rev=018d0e0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "amaanq";
|
||||
repo = "tree-sitter-starlark";
|
||||
rev = "b31a616aac5d05f927f3f9dd809789db7805b632";
|
||||
hash = "sha256-AVQNg7Ck2x1+5asFqJHQ3sdNKJrLVeck9fsgNMBU3x8=";
|
||||
rev = "018d0e09d9d0f0dd6740a37682b8ee4512e8b2ac";
|
||||
hash = "sha256-Qp7FvREjO+FP7ovj6UE8JA3Se8W46iGxNrmmSsruOdA=";
|
||||
};
|
||||
meta.homepage = "https://github.com/amaanq/tree-sitter-starlark";
|
||||
};
|
||||
@ -2542,12 +2553,12 @@
|
||||
};
|
||||
swift = buildGrammar {
|
||||
language = "swift";
|
||||
version = "0.0.0+rev=c9c669b";
|
||||
version = "0.0.0+rev=03af4d0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "alex-pinkus";
|
||||
repo = "tree-sitter-swift";
|
||||
rev = "c9c669b4513479e07a0ff44cf14f72351959ac21";
|
||||
hash = "sha256-OyT7jkGTuNG7eQrQvZRI49ipu+MMXTOz/1O7r42MaOk=";
|
||||
rev = "03af4d057afc56edf6a703e6606b86f782353f22";
|
||||
hash = "sha256-w+LzDVr8A0oqNi9ac6chX2U6o+2bLhP9UqXY0WlcI7I=";
|
||||
};
|
||||
generate = true;
|
||||
meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift";
|
||||
@ -2632,12 +2643,12 @@
|
||||
};
|
||||
templ = buildGrammar {
|
||||
language = "templ";
|
||||
version = "0.0.0+rev=d631f60";
|
||||
version = "0.0.0+rev=cf84ea5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vrischmann";
|
||||
repo = "tree-sitter-templ";
|
||||
rev = "d631f60287c0904770bc41aa865e249594b52422";
|
||||
hash = "sha256-rANNbNlybga+IGNfclMGX0On48sQ3WTWvw3bnhxKsZk=";
|
||||
rev = "cf84ea53e2e2531f23009d676ac206090c1e2392";
|
||||
hash = "sha256-CQ11t4beqkjhtZktrawuavgQPSFzbwJrU/aSbPsqBPA=";
|
||||
};
|
||||
meta.homepage = "https://github.com/vrischmann/tree-sitter-templ";
|
||||
};
|
||||
@ -2688,12 +2699,12 @@
|
||||
};
|
||||
tlaplus = buildGrammar {
|
||||
language = "tlaplus";
|
||||
version = "0.0.0+rev=ef18145";
|
||||
version = "0.0.0+rev=200f9da";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tlaplus-community";
|
||||
repo = "tree-sitter-tlaplus";
|
||||
rev = "ef18145e7f985f592ad41b04004b24a590f58b71";
|
||||
hash = "sha256-y/AtFMj4aKwjiahYWk63U9BEMpnq7LUQDnPrXsun3kI=";
|
||||
rev = "200f9dab6b23f3b9bb8f67fc811221517f56c373";
|
||||
hash = "sha256-oIyZ+x0bRnxVAQGiuPgFXjHwZ/MSdC9Ge52cG3oYS3E=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus";
|
||||
};
|
||||
@ -2979,12 +2990,12 @@
|
||||
};
|
||||
wgsl_bevy = buildGrammar {
|
||||
language = "wgsl_bevy";
|
||||
version = "0.0.0+rev=59d5fbd";
|
||||
version = "0.0.0+rev=1e12c79";
|
||||
src = fetchFromGitHub {
|
||||
owner = "theHamsta";
|
||||
repo = "tree-sitter-wgsl-bevy";
|
||||
rev = "59d5fbd562c0e17c45312f49485098cce467f5ac";
|
||||
hash = "sha256-4Df7UEHjoIQv4pSdxLlw9c1k0BwnVNRbZ8x/Ky0Q4DE=";
|
||||
rev = "1e12c7925c41bb09818d86e30cd78644fde7d31a";
|
||||
hash = "sha256-7pntsp8mqXyQK+81FefZv32GNlJsnOWIhvJ9o6Q4FUQ=";
|
||||
};
|
||||
meta.homepage = "https://github.com/theHamsta/tree-sitter-wgsl-bevy";
|
||||
};
|
||||
|
||||
@ -1089,7 +1089,7 @@
|
||||
inherit (old) version src;
|
||||
sourceRoot = "${old.src.name}/spectre_oxi";
|
||||
|
||||
cargoHash = "sha256-seBq1zJNzNVfCQckIHq7rHI/Y8MyxP88cee3NO7NYgo=";
|
||||
cargoHash = "sha256-7V4RyWIo9gL3ir4Pay8CMIVn6cXjJi9sgKVOENG4muQ=";
|
||||
|
||||
|
||||
preCheck = ''
|
||||
@ -1225,7 +1225,7 @@
|
||||
pname = "sg-nvim-rust";
|
||||
inherit (old) version src;
|
||||
|
||||
cargoHash = "sha256-iGNLk3ckm90i5m05V/va+hO9RMiOUKL19dkszoUCwlU=";
|
||||
cargoHash = "sha256-bK4gyK6kqeRyoH7hnRHZURCjcxemIdqs71Qgb/Cl1pw=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@ -691,8 +691,8 @@ https://github.com/olrtg/nvim-rename-state/,HEAD,
|
||||
https://github.com/petertriho/nvim-scrollbar/,HEAD,
|
||||
https://github.com/dstein64/nvim-scrollview/,,
|
||||
https://github.com/s1n7ax/nvim-search-and-replace/,HEAD,
|
||||
https://github.com/dcampos/nvim-snippy/,HEAD,
|
||||
https://github.com/garymjr/nvim-snippets/,,
|
||||
https://github.com/dcampos/nvim-snippy/,HEAD,
|
||||
https://github.com/ishan9299/nvim-solarized-lua/,,
|
||||
https://github.com/lucidph3nx/nvim-sops/,HEAD,
|
||||
https://github.com/nvim-pack/nvim-spectre/,,
|
||||
|
||||
@ -14,13 +14,13 @@ assert withDynarec -> (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRi
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "box64";
|
||||
version = "0.2.6";
|
||||
version = "0.2.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ptitSeb";
|
||||
repo = "box64";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-eKYnBuaEWRb6kDGFvuG+xM70LbUAcJ6Zcr6hPHqi9Do=";
|
||||
hash = "sha256-P+m+JS3THh3LWMZYW6BQ7QyNWlBuL+hMcUtUbpMHzis=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib
|
||||
, config
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
@ -7,15 +8,17 @@
|
||||
, shaderc
|
||||
, vulkan-headers
|
||||
, wayland
|
||||
, cudaSupport ? config.cudaSupport
|
||||
, cudaPackages ? { }
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gpt4all";
|
||||
version = "2.7.5";
|
||||
version = "2.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-i/T6gk8ICneW624008eiStgYNv5CE8w0Yx8knk57EFw=";
|
||||
hash = "sha256-aSz37+1K26Xizf4cpV45a2DnSsl959VQok/ppFRk/hs=";
|
||||
owner = "nomic-ai";
|
||||
repo = "gpt4all";
|
||||
rev = "v${finalAttrs.version}";
|
||||
@ -26,6 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
qt6.wrapQtAppsHook
|
||||
] ++ lib.optionals cudaSupport [
|
||||
cudaPackages.cuda_nvcc
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@ -39,12 +44,23 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
shaderc
|
||||
vulkan-headers
|
||||
wayland
|
||||
];
|
||||
] ++ lib.optionals cudaSupport (
|
||||
with cudaPackages;
|
||||
[
|
||||
cuda_cccl.dev
|
||||
cuda_cudart.dev
|
||||
cuda_cudart.lib
|
||||
cuda_cudart.static
|
||||
libcublas.dev
|
||||
libcublas.lib
|
||||
]);
|
||||
|
||||
cmakeFlags = [
|
||||
"-DKOMPUTE_OPT_USE_BUILT_IN_VULKAN_HEADER=OFF"
|
||||
"-DKOMPUTE_OPT_DISABLE_VULKAN_VERSION_CHECK=ON"
|
||||
"-DKOMPUTE_OPT_USE_BUILT_IN_FMT=OFF"
|
||||
] ++ lib.optionals (!cudaSupport) [
|
||||
"-DLLMODEL_CUDA=OFF"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@ -9,6 +9,8 @@
|
||||
, python3Packages
|
||||
, rustPlatform
|
||||
, stdenv
|
||||
, testers
|
||||
, uv
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
@ -20,7 +22,7 @@ python3Packages.buildPythonApplication rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "astral-sh";
|
||||
repo = "uv";
|
||||
rev = version;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-NwIjuOsf6tv+kVEXA2GvQkVwDznZs5fnnkzcnVoOGpY=";
|
||||
};
|
||||
|
||||
@ -51,9 +53,6 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
cargoBuildFlags = [ "--package" "uv" ];
|
||||
|
||||
# Tests require network access
|
||||
doCheck = false;
|
||||
|
||||
env = {
|
||||
OPENSSL_NO_VENDOR = true;
|
||||
};
|
||||
@ -70,14 +69,19 @@ python3Packages.buildPythonApplication rec {
|
||||
"uv"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
passthru = {
|
||||
tests.version = testers.testVersion {
|
||||
package = uv;
|
||||
};
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "An extremely fast Python package installer and resolver, written in Rust";
|
||||
homepage = "https://github.com/astral-sh/uv";
|
||||
changelog = "https://github.com/astral-sh/uv/blob/${src.rev}/CHANGELOG.md";
|
||||
license = with licenses; [ asl20 mit ];
|
||||
maintainers = with maintainers; [ GaetanLepage ];
|
||||
license = with lib.licenses; [ asl20 mit ];
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
mainProgram = "uv";
|
||||
};
|
||||
}
|
||||
|
||||
454
pkgs/by-name/ze/zed-editor/Cargo.lock
generated
454
pkgs/by-name/ze/zed-editor/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -4,6 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
copyDesktopItems,
|
||||
curl,
|
||||
perl,
|
||||
pkg-config,
|
||||
protobuf,
|
||||
xcbuild,
|
||||
@ -26,13 +27,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zed";
|
||||
version = "0.135.2";
|
||||
version = "0.136.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zed-industries";
|
||||
repo = "zed";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-XnfTrcLKjJH42l9L9KxogMhNQ2u/8G4fyd6i/0dO5S0=";
|
||||
hash = "sha256-w2g9xkqB98XLED1Z9vIjD1fhOz2p6LxnVgf6xWSFObA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@ -40,13 +41,12 @@ rustPlatform.buildRustPackage rec {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"async-pipe-0.1.3" = "sha256-g120X88HGT8P6GNCrzpS5SutALx5H+45Sf4iSSxzctE=";
|
||||
"blade-graphics-0.4.0" = "sha256-U8278YkskWE1E60JVTx4hRv4322EV9jz8fzJkBTG3R8=";
|
||||
"blade-graphics-0.4.0" = "sha256-w5BTv/40Zy94dmoZUpVVWrhzR2IaGAIJ0Ftsw1v/R9Y=";
|
||||
"font-kit-0.11.0" = "sha256-+4zMzjFyMS60HfLMEXGfXqKn6P+pOngLA45udV09DM8=";
|
||||
"heed-0.20.0-alpha.9" = "sha256-8bzoMmfKS+6AmeTzh0/F7WM9OBdIex+NYFER28bpA/s=";
|
||||
"lsp-types-0.94.1" = "sha256-kplgPsafrgZFMI1D9pQCwmg+FKMn5HNWLbcgdXHUFVU=";
|
||||
"nvim-rs-0.6.0-pre" = "sha256-bdWWuCsBv01mnPA5e5zRpq48BgOqaqIcAu+b7y1NnM8=";
|
||||
"pathfinder_simd-0.5.3" = "sha256-bakBcAQZJdHQPXybe0zoMzE49aOHENQY7/ZWZUMt+pM=";
|
||||
"taffy-0.3.11" = "sha256-0hXOEj6IjSW8e1t+rvxBFX6V9XRum3QO2Des1XlHJEw=";
|
||||
"tree-sitter-0.20.100" = "sha256-xZDWAjNIhWC2n39H7jJdKDgyE/J6+MAVSa8dHtZ6CLE=";
|
||||
"tree-sitter-bash-0.20.4" = "sha256-VP7rJfE/k8KV1XN1w5f0YKjCnDMYU1go/up0zj1mabM=";
|
||||
"tree-sitter-cpp-0.20.0" = "sha256-2QYEFkpwcRmh2kf4qEAL2a5lGSa316CetOhF73e7rEM=";
|
||||
@ -68,6 +68,7 @@ rustPlatform.buildRustPackage rec {
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
curl
|
||||
perl
|
||||
pkg-config
|
||||
protobuf
|
||||
rustPlatform.bindgenHook
|
||||
@ -127,11 +128,8 @@ rustPlatform.buildRustPackage rec {
|
||||
'';
|
||||
|
||||
checkFlags = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
# Fails with "On 2823 Failed to find test1:A"
|
||||
"--skip=test_base_keymap"
|
||||
# Fails with "called `Result::unwrap()` on an `Err` value: Invalid keystroke `cmd-k`"
|
||||
# https://github.com/zed-industries/zed/issues/10427
|
||||
"--skip=test_disabled_keymap_binding"
|
||||
# Fails on certain hosts (including Hydra) for unclear reason
|
||||
"--skip=test_open_paths_action"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"commit": "88d42dc0129b0e3f4f702149a58667c66add9262",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/88d42dc0129b0e3f4f702149a58667c66add9262.tar.gz",
|
||||
"sha256": "0imff76qbg1hsvsdds6dc2wfip0prdsa0bixd5b575jr6yjlkirh",
|
||||
"msg": "Update from Hackage at 2024-05-15T11:29:34Z"
|
||||
"commit": "a71af8d538cda614baa0bcb3e44600061f815d57",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/a71af8d538cda614baa0bcb3e44600061f815d57.tar.gz",
|
||||
"sha256": "0hsqzdfb89rqmplipz39x7m80czcvrmk42y05ifnqjhxn6q4v91l",
|
||||
"msg": "Update from Hackage at 2024-05-20T16:06:03Z"
|
||||
}
|
||||
|
||||
@ -24,13 +24,13 @@ lib.checkListOfEnum "${pname}: tweaks" [ "image" "square" "round" ] tweaks
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "2023-05-24";
|
||||
version = "2024-05-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "L19pbmJJFr1xi4ZTp0ocxmdMvWmtkK2zquOFfbV+P5Q=";
|
||||
sha256 = "Q9DWBzaLZjwXsYRa/oDIrccypO3TCbSRXTkbXWRmm70=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -187,17 +187,7 @@ stdenv.mkDerivation (rec {
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
# FIXME(@sternenseemann): This can be simplified a lot (causing a rebuild)
|
||||
patches = (if lib.versions.majorMinor version == "9.0" then [
|
||||
# Fix docs build with sphinx >= 6.0
|
||||
# https://gitlab.haskell.org/ghc/ghc/-/issues/22766
|
||||
(fetchpatch {
|
||||
name = "ghc-docs-sphinx-6.0.patch";
|
||||
url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch";
|
||||
sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv";
|
||||
})
|
||||
# Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129
|
||||
./docs-sphinx-7.patch
|
||||
patches = lib.optionals (lib.versionOlder version "9.4") [
|
||||
# fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482
|
||||
(fetchpatch {
|
||||
url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch";
|
||||
@ -205,7 +195,24 @@ stdenv.mkDerivation (rec {
|
||||
extraPrefix = "utils/haddock/";
|
||||
stripLen = 1;
|
||||
})
|
||||
]
|
||||
|
||||
++ lib.optionals (lib.versionOlder version "9.4.6") [
|
||||
# Fix docs build with sphinx >= 6.0
|
||||
# https://gitlab.haskell.org/ghc/ghc/-/issues/22766
|
||||
(fetchpatch {
|
||||
name = "ghc-docs-sphinx-6.0.patch";
|
||||
url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch";
|
||||
sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv";
|
||||
})
|
||||
]
|
||||
|
||||
++ [
|
||||
# Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129
|
||||
./docs-sphinx-7.patch
|
||||
]
|
||||
|
||||
++ lib.optionals (lib.versionOlder version "9.2.2") [
|
||||
# Add flag that fixes C++ exception handling; opt-in. Merged in 9.4 and 9.2.2.
|
||||
# https://gitlab.haskell.org/ghc/ghc/-/merge_requests/7423
|
||||
(fetchpatch {
|
||||
@ -214,60 +221,25 @@ stdenv.mkDerivation (rec {
|
||||
url = "https://gitlab.haskell.org/ghc/ghc/-/commit/c6132c782d974a7701e7f6447bdcd2bf6db4299a.patch?merge_request_iid=7423";
|
||||
sha256 = "sha256-b4feGZIaKDj/UKjWTNY6/jH4s2iate0wAgMxG3rAbZI=";
|
||||
})
|
||||
] else if lib.versions.majorMinor version == "9.2" then [
|
||||
# Fix docs build with sphinx >= 6.0
|
||||
# https://gitlab.haskell.org/ghc/ghc/-/issues/22766
|
||||
(fetchpatch {
|
||||
name = "ghc-docs-sphinx-6.0.patch";
|
||||
url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch";
|
||||
sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv";
|
||||
})
|
||||
# Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129
|
||||
./docs-sphinx-7.patch
|
||||
# fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482
|
||||
(fetchpatch {
|
||||
url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch";
|
||||
sha256 = "sha256-8w8QUCsODaTvknCDGgTfFNZa8ZmvIKaKS+2ZJZ9foYk=";
|
||||
extraPrefix = "utils/haddock/";
|
||||
stripLen = 1;
|
||||
})
|
||||
# Don't generate code that doesn't compile when --enable-relocatable is passed to Setup.hs
|
||||
# Can be removed if the Cabal library included with ghc backports the linked fix
|
||||
(fetchpatch {
|
||||
url = "https://github.com/haskell/cabal/commit/6c796218c92f93c95e94d5ec2d077f6956f68e98.patch";
|
||||
stripLen = 1;
|
||||
extraPrefix = "libraries/Cabal/";
|
||||
sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY=";
|
||||
})
|
||||
] else if lib.versions.majorMinor version == "9.4" then [
|
||||
# Don't generate code that doesn't compile when --enable-relocatable is passed to Setup.hs
|
||||
# Can be removed if the Cabal library included with ghc backports the linked fix
|
||||
(fetchpatch {
|
||||
url = "https://github.com/haskell/cabal/commit/6c796218c92f93c95e94d5ec2d077f6956f68e98.patch";
|
||||
stripLen = 1;
|
||||
extraPrefix = "libraries/Cabal/";
|
||||
sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY=";
|
||||
})
|
||||
]
|
||||
++ lib.optionals (version == "9.4.5") [
|
||||
# Fix docs build with sphinx >= 6.0
|
||||
# https://gitlab.haskell.org/ghc/ghc/-/issues/22766
|
||||
(fetchpatch {
|
||||
name = "ghc-docs-sphinx-6.0.patch";
|
||||
url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch";
|
||||
sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv";
|
||||
})
|
||||
]
|
||||
++ [
|
||||
|
||||
# Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129
|
||||
./docs-sphinx-7.patch
|
||||
++ lib.optionals (lib.versionAtLeast version "9.2") [
|
||||
# Don't generate code that doesn't compile when --enable-relocatable is passed to Setup.hs
|
||||
# Can be removed if the Cabal library included with ghc backports the linked fix
|
||||
(fetchpatch {
|
||||
url = "https://github.com/haskell/cabal/commit/6c796218c92f93c95e94d5ec2d077f6956f68e98.patch";
|
||||
stripLen = 1;
|
||||
extraPrefix = "libraries/Cabal/";
|
||||
sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY=";
|
||||
})
|
||||
]
|
||||
|
||||
++ lib.optionals (version == "9.4.6") [
|
||||
# Work around a type not being defined when including Rts.h in bytestring's cbits
|
||||
# due to missing feature macros. See https://gitlab.haskell.org/ghc/ghc/-/issues/23810.
|
||||
./9.4.6-bytestring-posix-source.patch
|
||||
] else [ ])
|
||||
]
|
||||
|
||||
++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [
|
||||
# Prevent the paths module from emitting symbols that we don't use
|
||||
# when building with separate outputs.
|
||||
@ -313,12 +285,8 @@ stdenv.mkDerivation (rec {
|
||||
# LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm
|
||||
export CLANG="${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang"
|
||||
''
|
||||
+ lib.optionalString (version == "9.0.2" || lib.versionAtLeast version "9.4") ''
|
||||
|
||||
'' + ''
|
||||
+ ''
|
||||
echo -n "${buildMK}" > mk/build.mk
|
||||
'' + lib.optionalString (lib.versionAtLeast version "9.4") ''
|
||||
|
||||
''
|
||||
+ lib.optionalString (lib.versionOlder version "9.2" || lib.versionAtLeast version "9.4") ''
|
||||
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
|
||||
|
||||
@ -8,10 +8,10 @@
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "cabal2nix";
|
||||
version = "unstable-2024-04-21";
|
||||
version = "unstable-2024-05-20";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/NixOS/cabal2nix/archive/f8e6bf749a158a5ed866c57deee907b5f16c38e5.tar.gz";
|
||||
sha256 = "0c73mvza65iy46fv8c8cadsy7klk4jzmimm1mfdavvm8i2cr5476";
|
||||
url = "https://github.com/NixOS/cabal2nix/archive/79b73778680e2ae27302dce430beee302299f496.tar.gz";
|
||||
sha256 = "0xjrnf9x1f4jl4bsxc6kv5q7rsbn3vs0ddidj9qf6mzzzqxq14p3";
|
||||
};
|
||||
postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot";
|
||||
isLibrary = true;
|
||||
|
||||
@ -95,7 +95,7 @@ self: super: {
|
||||
ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser super.ghc-lib-parser-ex;
|
||||
|
||||
# This became a core library in ghc 8.10., so we don’t have an "exception" attribute anymore.
|
||||
exceptions = self.exceptions_0_10_7;
|
||||
exceptions = self.exceptions_0_10_8;
|
||||
|
||||
# vector 0.12.2 indroduced doctest checks that don’t work on older compilers
|
||||
vector = dontCheck super.vector;
|
||||
|
||||
@ -59,8 +59,8 @@ self: super: {
|
||||
megaparsec = doDistribute self.megaparsec_9_6_1;
|
||||
# TODO: remove when aeson updates or launches a revision
|
||||
# see https://github.com/haskell/aeson/issues/1089 and https://github.com/haskell/aeson/pulls/1088
|
||||
aeson = doJailbreak (doDistribute self.aeson_2_2_1_0);
|
||||
attoparsec-aeson = doDistribute self.attoparsec-aeson_2_2_0_1;
|
||||
aeson = doJailbreak (doDistribute self.aeson_2_2_2_0);
|
||||
attoparsec-aeson = doDistribute self.attoparsec-aeson_2_2_2_0;
|
||||
xmonad = doDistribute self.xmonad_0_18_0;
|
||||
apply-refact = self.apply-refact_0_14_0_0;
|
||||
ormolu = self.ormolu_0_7_4_0;
|
||||
|
||||
@ -27,7 +27,7 @@ self: super:
|
||||
# GHCJS does not ship with the same core packages as GHC.
|
||||
# https://github.com/ghcjs/ghcjs/issues/676
|
||||
stm = doJailbreak self.stm_2_5_3_1;
|
||||
exceptions = dontCheck self.exceptions_0_10_7;
|
||||
exceptions = dontCheck self.exceptions_0_10_8;
|
||||
|
||||
## OTHER PACKAGES
|
||||
|
||||
|
||||
@ -742,6 +742,7 @@ broken-packages:
|
||||
- changelog-d # failure in job https://hydra.nixos.org/build/257082502 at 2024-04-27
|
||||
- changelog-d # failure in job https://hydra.nixos.org/build/259607598 at 2024-05-15
|
||||
- changelog-d # failure in job https://hydra.nixos.org/build/259957724 at 2024-05-19
|
||||
- changelog-d # failure in job https://hydra.nixos.org/build/260724402 at 2024-05-25
|
||||
- changelogged # failure in job https://hydra.nixos.org/build/233211675 at 2023-09-02
|
||||
- character-cases # failure in job https://hydra.nixos.org/build/233197636 at 2023-09-02
|
||||
- charter # failure in job https://hydra.nixos.org/build/233237264 at 2023-09-02
|
||||
@ -764,7 +765,6 @@ broken-packages:
|
||||
- ChristmasTree # failure in job https://hydra.nixos.org/build/233259648 at 2023-09-02
|
||||
- chronograph # failure in job https://hydra.nixos.org/build/233232822 at 2023-09-02
|
||||
- chr-parse # failure in job https://hydra.nixos.org/build/233243933 at 2023-09-02
|
||||
- chs-cabal # failure in job https://hydra.nixos.org/build/259964491 at 2024-05-19
|
||||
- chunky # failure in job https://hydra.nixos.org/build/233216440 at 2023-09-02
|
||||
- church # failure in job https://hydra.nixos.org/build/233223920 at 2023-09-02
|
||||
- church-maybe # failure in job https://hydra.nixos.org/build/233258572 at 2023-09-02
|
||||
@ -1992,6 +1992,7 @@ broken-packages:
|
||||
- ghci-history-parser # failure in job https://hydra.nixos.org/build/233204448 at 2023-09-02
|
||||
- ghci-lib # failure in job https://hydra.nixos.org/build/233216644 at 2023-09-02
|
||||
- ghci-ng # failure in job https://hydra.nixos.org/build/233229533 at 2023-09-02
|
||||
- ghc-internal # failure in job https://hydra.nixos.org/build/260723678 at 2024-05-25
|
||||
- ghcitui # failure in job https://hydra.nixos.org/build/252737339 at 2024-03-16
|
||||
- ghcjs-base-stub # timeout
|
||||
- ghcjs-dom-javascript # failure in job https://hydra.nixos.org/build/255688382 at 2024-04-16
|
||||
@ -4119,6 +4120,7 @@ broken-packages:
|
||||
- non-empty-zipper # failure in job https://hydra.nixos.org/build/233244341 at 2023-09-02
|
||||
- nonlinear-optimization # failure in job https://hydra.nixos.org/build/233204674 at 2023-09-02
|
||||
- noodle # failure in job https://hydra.nixos.org/build/233195125 at 2023-09-02
|
||||
- no-recursion # failure in job https://hydra.nixos.org/build/260711915 at 2024-05-25
|
||||
- normalization-insensitive # failure in job https://hydra.nixos.org/build/233239612 at 2023-09-02
|
||||
- no-role-annots # failure in job https://hydra.nixos.org/build/233229589 at 2023-09-02
|
||||
- notcpp # failure in job https://hydra.nixos.org/build/233216543 at 2023-09-02
|
||||
@ -4933,6 +4935,7 @@ broken-packages:
|
||||
- readline-statevar # failure in job https://hydra.nixos.org/build/233226053 at 2023-09-02
|
||||
- readme-lhs # failure in job https://hydra.nixos.org/build/233248229 at 2023-09-02
|
||||
- readshp # failure in job https://hydra.nixos.org/build/233197835 at 2023-09-02
|
||||
- real-dice # failure in job https://hydra.nixos.org/build/260725788 at 2024-05-25
|
||||
- really-simple-xml-parser # failure in job https://hydra.nixos.org/build/233195945 at 2023-09-02
|
||||
- reanimate-svg # failure in job https://hydra.nixos.org/build/233242271 at 2023-09-02
|
||||
- reasonable-lens # failure in job https://hydra.nixos.org/build/233233111 at 2023-09-02
|
||||
@ -5795,7 +5798,6 @@ broken-packages:
|
||||
- supplemented # failure in job https://hydra.nixos.org/build/233237397 at 2023-09-02
|
||||
- supply-chain-core # failure in job https://hydra.nixos.org/build/252715612 at 2024-03-16
|
||||
- surjective # failure in job https://hydra.nixos.org/build/233242908 at 2023-09-02
|
||||
- sv2v # failure in job https://hydra.nixos.org/build/233190750 at 2023-09-02
|
||||
- sv-core # failure in job https://hydra.nixos.org/build/233217245 at 2023-09-02
|
||||
- SVD2HS # failure in job https://hydra.nixos.org/build/233248575 at 2023-09-02
|
||||
- svfactor # failure in job https://hydra.nixos.org/build/233256743 at 2023-09-02
|
||||
|
||||
@ -35,6 +35,7 @@ default-package-overrides:
|
||||
- extensions < 0.1.0.2 # Incompatible with Cabal < 3.12, the newest extensions version is only needed on ghc 9.10
|
||||
# 2024-05-10: need to match hlegder from stackage
|
||||
- hledger-ui < 1.33
|
||||
- chs-cabal < 0.1.1.2 # Incompatible with Cabal < 3.12
|
||||
|
||||
|
||||
extra-packages:
|
||||
@ -64,6 +65,7 @@ extra-packages:
|
||||
- ghc-exactprint == 0.6.* # 2022-12-12: needed for GHC < 9.2
|
||||
- ghc-exactprint == 1.5.* # 2023-03-30: needed for GHC == 9.2
|
||||
- ghc-exactprint == 1.6.* # 2023-03-30: needed for GHC == 9.4
|
||||
- ghc-exactprint == 1.8.* # 2024-05-20: needed for GHC == 9.8
|
||||
- ghc-lib == 9.2.* # 2022-02-17: preserve for GHC 9.2
|
||||
- ghc-lib-parser == 9.2.* # 2022-02-17: preserve for GHC 9.2
|
||||
- ghc-lib-parser == 9.8.* # 2024-05-19: preserve for GHC 9.8
|
||||
|
||||
@ -532,7 +532,6 @@ dont-distribute-packages:
|
||||
- apotiki
|
||||
- approx-rand-test
|
||||
- arbor-monad-metric-datadog
|
||||
- archive-libarchive
|
||||
- archive-tar-bytestring
|
||||
- archlinux-web
|
||||
- arduino-copilot
|
||||
@ -617,6 +616,7 @@ dont-distribute-packages:
|
||||
- bamstats
|
||||
- barley
|
||||
- base32-bytestring
|
||||
- base_4_20_0_0
|
||||
- baserock-schema
|
||||
- basic
|
||||
- batchd
|
||||
@ -637,6 +637,7 @@ dont-distribute-packages:
|
||||
- bearriver
|
||||
- beautifHOL
|
||||
- bech32-th
|
||||
- bech32-th_1_1_7
|
||||
- bein
|
||||
- belka
|
||||
- bff
|
||||
@ -1514,6 +1515,7 @@ dont-distribute-packages:
|
||||
- geolite-csv
|
||||
- getemx
|
||||
- ghc-dump-util
|
||||
- ghc-experimental
|
||||
- ghc-imported-from
|
||||
- ghc-instances
|
||||
- ghc-mod
|
||||
@ -2567,7 +2569,6 @@ dont-distribute-packages:
|
||||
- lha
|
||||
- lhae
|
||||
- lhe
|
||||
- libarchive
|
||||
- libconfig
|
||||
- libcspm
|
||||
- libgraph
|
||||
@ -2817,7 +2818,6 @@ dont-distribute-packages:
|
||||
- mps
|
||||
- mptcp-pm
|
||||
- mptcpanalyzer
|
||||
- ms-tds
|
||||
- msgpack-aeson
|
||||
- msgpack-arbitrary
|
||||
- msgpack-binary
|
||||
@ -2827,7 +2827,6 @@ dont-distribute-packages:
|
||||
- msgpack-rpc-conduit
|
||||
- msgpack-testsuite
|
||||
- msi-kb-backlit
|
||||
- mssql-simple
|
||||
- mstate
|
||||
- mtgoxapi
|
||||
- mu-avro
|
||||
@ -4228,6 +4227,7 @@ dont-distribute-packages:
|
||||
- werewolf-slack
|
||||
- wgpu-hs
|
||||
- what4
|
||||
- what4_1_6
|
||||
- wheb-mongo
|
||||
- wheb-redis
|
||||
- wheb-strapped
|
||||
|
||||
2296
pkgs/development/haskell-modules/hackage-packages.nix
generated
2296
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-auth";
|
||||
version = "0.7.18";
|
||||
version = "0.7.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = "aws-c-auth";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JWYJz8ugYvXDvtJ5dRWVcA8F3PdjxO8aCc8l0jghYXg=";
|
||||
hash = "sha256-8+SFag3hRQ+1aOK2vuHOV/gXE1qUIlAW5LNJDmUORLs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flax";
|
||||
version = "0.8.3";
|
||||
version = "0.8.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -35,7 +35,7 @@ buildPythonPackage rec {
|
||||
owner = "google";
|
||||
repo = "flax";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-uDGTyksUZTTL6FiTJP+qteFLOjr75dcTj9yRJ6Jm8xU=";
|
||||
hash = "sha256-ZwqKZdJ9LOfWTav5nE9xMsMw/DbryqQUuu5fqeugBzY=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@ -86,7 +86,7 @@ buildPythonPackage rec {
|
||||
# `tensorflow_datasets`, `vocabulary`) so the benefits of trying to run them
|
||||
# would be limited anyway.
|
||||
"examples/*"
|
||||
"flax/experimental/nnx/examples/*"
|
||||
"flax/nnx/examples/*"
|
||||
# See https://github.com/google/flax/issues/3232.
|
||||
"tests/jax_utils_test.py"
|
||||
# Requires tree
|
||||
@ -98,11 +98,11 @@ buildPythonPackage rec {
|
||||
"test_overwrite_checkpoints0"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Neural network library for JAX";
|
||||
homepage = "https://github.com/google/flax";
|
||||
changelog = "https://github.com/google/flax/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ndl ];
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ ndl ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "herepy";
|
||||
version = "3.6.2";
|
||||
version = "3.6.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "abdullahselek";
|
||||
repo = "HerePy";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-+DI9wjYVAUKdGEXWhbV9Xp0oOazcB+sS89ugIZuZM2w=";
|
||||
hash = "sha256-ht4EZBfREU7tDNo6tCPyECjm0H+yuhjsfJ60M4ss0jE=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -64,6 +64,8 @@ buildPythonPackage rec {
|
||||
disabledTestPaths = [
|
||||
# Tests requires pypdfium2
|
||||
"tests/test_display.py"
|
||||
# Tests requires pypdfium2
|
||||
"tests/test_issues.py"
|
||||
# Tests require Ghostscript
|
||||
"tests/test_repair.py"
|
||||
];
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-swiftclient";
|
||||
version = "4.5.0";
|
||||
version = "4.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-8qCIflo5KXq8BDJRrj+QiRTOFEei+NLcpWcWGGCBQr0=";
|
||||
hash = "sha256-1NGFQEE4k/wWrYd5HXQPgj92NDXoIS5o61PWDaJjgjM=";
|
||||
};
|
||||
|
||||
# remove duplicate script that will be created by setuptools from the
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "testcontainers";
|
||||
version = "4.4.1";
|
||||
version = "4.5.0";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
pyproject = true;
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "testcontainers";
|
||||
repo = "testcontainers-python";
|
||||
rev = "refs/tags/testcontainers-v${version}";
|
||||
hash = "sha256-osWppbptWpBSHcrHlAqNpn6j2n/qQ7iCobH3TVqB2bc=";
|
||||
hash = "sha256-+kMKxitRRjNGVqMJuDdJA0QnYpLicJ6qdD8tzplEbT8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -43,12 +43,10 @@ buildPythonPackage rec {
|
||||
|
||||
pythonImportsCheck = [ "testcontainers" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = ''
|
||||
Allows using docker containers for functional and integration testing
|
||||
'';
|
||||
meta = {
|
||||
description = "Allows using docker containers for functional and integration testing";
|
||||
homepage = "https://github.com/testcontainers/testcontainers-python";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ onny ];
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ onny ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -119,7 +119,7 @@ let
|
||||
|
||||
NIX_PGLIBDIR="${postgresql}/lib" \
|
||||
PGRX_BUILD_FLAGS="--frozen -j $NIX_BUILD_CORES ${builtins.concatStringsSep " " cargoBuildFlags}" \
|
||||
cargo-pgrx pgrx package \
|
||||
cargo pgrx package \
|
||||
--pg-config ${postgresql}/bin/pg_config \
|
||||
${maybeDebugFlag} \
|
||||
--features "${builtins.concatStringsSep " " buildFeatures}" \
|
||||
|
||||
@ -8556,6 +8556,10 @@ with pkgs;
|
||||
|
||||
gparted = callPackage ../tools/misc/gparted { };
|
||||
|
||||
gpt4all-cuda = gpt4all.override {
|
||||
cudaSupport = true;
|
||||
};
|
||||
|
||||
gpt2tc = callPackage ../tools/text/gpt2tc { };
|
||||
|
||||
gptcommit = callPackage ../development/tools/gptcommit {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user