Merge staging-next into staging
This commit is contained in:
nixpkgs-ci[bot]
@@ -10,6 +10,7 @@ let
|
||||
};
|
||||
env-vars = {
|
||||
DATA_PATH = cfg.dataDir;
|
||||
} // lib.optionalAttrs (cfg.extensions != []) {
|
||||
THIRDPARTY_EXTENSIONS_PATH = "${extension-env}/share/freshrss/";
|
||||
};
|
||||
in
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -38,12 +38,12 @@
|
||||
};
|
||||
apex = buildGrammar {
|
||||
language = "apex";
|
||||
version = "0.0.0+rev=bb2faa9";
|
||||
version = "0.0.0+rev=eade405";
|
||||
src = fetchFromGitHub {
|
||||
owner = "aheber";
|
||||
repo = "tree-sitter-sfapex";
|
||||
rev = "bb2faa992f6915079c2731632fba74874b85d188";
|
||||
hash = "sha256-WCjuDebUQu5rW+PEM3KpLWRTbfQVl8bfFMcj2TS8Tyw=";
|
||||
rev = "eade4054efc897f4bb18a5b7bf4b5a824dbffa74";
|
||||
hash = "sha256-XGATRlXRZCX4KeNSLTw8qLqZOvWULmj4bWvriQjvAiQ=";
|
||||
};
|
||||
location = "apex";
|
||||
meta.homepage = "https://github.com/aheber/tree-sitter-sfapex";
|
||||
@@ -347,12 +347,12 @@
|
||||
};
|
||||
css = buildGrammar {
|
||||
language = "css";
|
||||
version = "0.0.0+rev=6a442a3";
|
||||
version = "0.0.0+rev=5c89b88";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-css";
|
||||
rev = "6a442a3cf461b0ce275339e5afa178693484c927";
|
||||
hash = "sha256-+ZtJpxR+KlfrNHjpoCC5Il4aeYYvcB4Dtbs/BKxV60s=";
|
||||
rev = "5c89b88a37a2e1e36c031469462d6ee85ff2c13c";
|
||||
hash = "sha256-R5820/4sIQIfCMg3D/LF1Kk5Mf46YLokS8tBAcGL4Eo=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-css";
|
||||
};
|
||||
@@ -491,12 +491,12 @@
|
||||
};
|
||||
dockerfile = buildGrammar {
|
||||
language = "dockerfile";
|
||||
version = "0.0.0+rev=087daa2";
|
||||
version = "0.0.0+rev=971acdd";
|
||||
src = fetchFromGitHub {
|
||||
owner = "camdencheek";
|
||||
repo = "tree-sitter-dockerfile";
|
||||
rev = "087daa20438a6cc01fa5e6fe6906d77c869d19fe";
|
||||
hash = "sha256-uDRDq6MYYV8nh6FDsQN3tdyZywEg8A224bfWrgFGvFs=";
|
||||
rev = "971acdd908568b4531b0ba28a445bf0bb720aba5";
|
||||
hash = "sha256-WJJ/rjFea1sudGIyjKGupwm39TJ1zbyWlLgoRf1KCBI=";
|
||||
};
|
||||
meta.homepage = "https://github.com/camdencheek/tree-sitter-dockerfile";
|
||||
};
|
||||
@@ -536,12 +536,12 @@
|
||||
};
|
||||
earthfile = buildGrammar {
|
||||
language = "earthfile";
|
||||
version = "0.0.0+rev=059fb08";
|
||||
version = "0.0.0+rev=a44f6f6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "glehmann";
|
||||
repo = "tree-sitter-earthfile";
|
||||
rev = "059fb087247bef8789e938629388c3e7af32c986";
|
||||
hash = "sha256-W3nGFisHK8V7F65cm7eyEgWa+qnjr75adFNz7GHfpPs=";
|
||||
rev = "a44f6f6d22ea4fe16fa37ababd90240ab87a9e0d";
|
||||
hash = "sha256-yFx7+eOEauMFj5mHt1lDkVf1nOGv8ZkfMjsuoVkTMKQ=";
|
||||
};
|
||||
meta.homepage = "https://github.com/glehmann/tree-sitter-earthfile";
|
||||
};
|
||||
@@ -559,12 +559,12 @@
|
||||
};
|
||||
editorconfig = buildGrammar {
|
||||
language = "editorconfig";
|
||||
version = "0.0.0+rev=ad9d7b8";
|
||||
version = "0.0.0+rev=02f562e";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ValdezFOmar";
|
||||
repo = "tree-sitter-editorconfig";
|
||||
rev = "ad9d7b84453426c40717c2b2c6b13d0a955d0662";
|
||||
hash = "sha256-N717l1J0MCaWbjpmZ5hQI5bUy9kp9FSn2Coeqjn6CGE=";
|
||||
rev = "02f562e71dc28d573187809eecdffaee7c82321c";
|
||||
hash = "sha256-HSpBBjsnaGWZYTesEs+W/TgAy66qv/hJbbjNRrygmgQ=";
|
||||
};
|
||||
meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-editorconfig";
|
||||
};
|
||||
@@ -647,23 +647,23 @@
|
||||
};
|
||||
erlang = buildGrammar {
|
||||
language = "erlang";
|
||||
version = "0.0.0+rev=4095e99";
|
||||
version = "0.0.0+rev=d2281ab";
|
||||
src = fetchFromGitHub {
|
||||
owner = "WhatsApp";
|
||||
repo = "tree-sitter-erlang";
|
||||
rev = "4095e9993acc89cb311ab1be8614c21b1cf768a4";
|
||||
hash = "sha256-+mp0h7qaJN30eqNIDJem5iOnnWATR1X4D6dB4gyGlfM=";
|
||||
rev = "d2281ab060093290045941a865a3834eec862a3f";
|
||||
hash = "sha256-tiZY1CXwKBwkXRrl1uJACOoXIlC9AmqDQ9bxWuq9ejw=";
|
||||
};
|
||||
meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang";
|
||||
};
|
||||
facility = buildGrammar {
|
||||
language = "facility";
|
||||
version = "0.0.0+rev=2d037f2";
|
||||
version = "0.0.0+rev=e4bfd3e";
|
||||
src = fetchFromGitHub {
|
||||
owner = "FacilityApi";
|
||||
repo = "tree-sitter-facility";
|
||||
rev = "2d037f2f2bf668737f72e6be6eda4b7918b68d86";
|
||||
hash = "sha256-NyYymlCPqbi4GA+FI/M5MiQUr6tkJTNPO8Pvcy02lqI=";
|
||||
rev = "e4bfd3e960de9f4b4648acb1c92e9b95b47d8cfb";
|
||||
hash = "sha256-EwTkus2m0lwDwx5XO3Ee4ngretLPShx84JZytaHkZ4I=";
|
||||
};
|
||||
meta.homepage = "https://github.com/FacilityApi/tree-sitter-facility";
|
||||
};
|
||||
@@ -713,12 +713,12 @@
|
||||
};
|
||||
fish = buildGrammar {
|
||||
language = "fish";
|
||||
version = "0.0.0+rev=a78aef9";
|
||||
version = "0.0.0+rev=70640c0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ram02z";
|
||||
repo = "tree-sitter-fish";
|
||||
rev = "a78aef9abc395c600c38a037ac779afc7e3cc9e0";
|
||||
hash = "sha256-D7s3ZsHQeGf+pYdbXvi5GMFqbkgajBuqTQwvjnjnrVo=";
|
||||
rev = "70640c0696abde32622afc43291a385681afbd32";
|
||||
hash = "sha256-d+z43w7nl0ZzVjypwxk+xPivb/W6xJ21Uc63Ux9S74k=";
|
||||
};
|
||||
meta.homepage = "https://github.com/ram02z/tree-sitter-fish";
|
||||
};
|
||||
@@ -746,12 +746,12 @@
|
||||
};
|
||||
fortran = buildGrammar {
|
||||
language = "fortran";
|
||||
version = "0.0.0+rev=c979a86";
|
||||
version = "0.0.0+rev=5fc069e";
|
||||
src = fetchFromGitHub {
|
||||
owner = "stadelmanma";
|
||||
repo = "tree-sitter-fortran";
|
||||
rev = "c979a86414d3c5bfabee72356bb22bd5f87d0942";
|
||||
hash = "sha256-BdU5gRLxZMzX6nzB0D8E9vksmdJDtvuCGXX6mJGczPA=";
|
||||
rev = "5fc069e4f05810ec6f8e399cd522e4eba864181c";
|
||||
hash = "sha256-dcpGhtUbaw4lBrwL01nzokWF2BQLsER5S7zEH6xOzso=";
|
||||
};
|
||||
meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran";
|
||||
};
|
||||
@@ -802,12 +802,12 @@
|
||||
};
|
||||
gap = buildGrammar {
|
||||
language = "gap";
|
||||
version = "0.0.0+rev=ea70c22";
|
||||
version = "0.0.0+rev=7db7959";
|
||||
src = fetchFromGitHub {
|
||||
owner = "gap-system";
|
||||
repo = "tree-sitter-gap";
|
||||
rev = "ea70c228dd1d3875aeb264bf99903dc9a696894f";
|
||||
hash = "sha256-uEcKZ2gisxYON2GsiYOnfgEdbe6OwQDQIzX2l8Tlics=";
|
||||
rev = "7db79590d2f8b0e0246008ecfd569b4bfca587a9";
|
||||
hash = "sha256-M/nk1XM9vZe0XoFr6EttWCY4fjzw2r5I/XImJNjUwGk=";
|
||||
};
|
||||
meta.homepage = "https://github.com/gap-system/tree-sitter-gap";
|
||||
};
|
||||
@@ -1011,12 +1011,12 @@
|
||||
};
|
||||
gomod = buildGrammar {
|
||||
language = "gomod";
|
||||
version = "0.0.0+rev=3b01edc";
|
||||
version = "0.0.0+rev=6efb596";
|
||||
src = fetchFromGitHub {
|
||||
owner = "camdencheek";
|
||||
repo = "tree-sitter-go-mod";
|
||||
rev = "3b01edce2b9ea6766ca19328d1850e456fde3103";
|
||||
hash = "sha256-C3pPBgm68mmaPmstyIpIvvDHsx29yZ0ZX/QoUqwjb+0=";
|
||||
rev = "6efb59652d30e0e9cd5f3b3a669afd6f1a926d3c";
|
||||
hash = "sha256-KD6Fio9qie3wbGAvQaYsMdYOK1QjnRrGExt1oL/6mis=";
|
||||
};
|
||||
meta.homepage = "https://github.com/camdencheek/tree-sitter-go-mod";
|
||||
};
|
||||
@@ -1033,12 +1033,12 @@
|
||||
};
|
||||
gotmpl = buildGrammar {
|
||||
language = "gotmpl";
|
||||
version = "0.0.0+rev=ca52fbf";
|
||||
version = "0.0.0+rev=ab4a8c4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ngalaiko";
|
||||
repo = "tree-sitter-go-template";
|
||||
rev = "ca52fbfc98366c585b84f4cb3745df49f33cd140";
|
||||
hash = "sha256-ZWpzqKD3ceBzlsRjehXZgu+NZMbWyyK+/R1Ymg7DVkM=";
|
||||
rev = "ab4a8c4a51f271f320f2bad6a5d499415bf541b1";
|
||||
hash = "sha256-ePEZ+59rA8z7++Pq5Mv8nILkscjORWmQJYjLlqivYLs=";
|
||||
};
|
||||
meta.homepage = "https://github.com/ngalaiko/tree-sitter-go-template";
|
||||
};
|
||||
@@ -1088,12 +1088,12 @@
|
||||
};
|
||||
groovy = buildGrammar {
|
||||
language = "groovy";
|
||||
version = "0.0.0+rev=1f30c33";
|
||||
version = "0.0.0+rev=d1556e7";
|
||||
src = fetchFromGitHub {
|
||||
owner = "murtaza64";
|
||||
repo = "tree-sitter-groovy";
|
||||
rev = "1f30c3398495dfeba24c7aa3b12a2bc68c0bd419";
|
||||
hash = "sha256-oq3IzUuY4eF/8/7UhOAoR4ZWAz5onUgiB+f4TmHf7Vc=";
|
||||
rev = "d1556e77d49df1a28cd564af5766fdaea8ab7063";
|
||||
hash = "sha256-oEdO9P1akGzOmZvAUrO608yptgkMsJL5YAhPwBvarPI=";
|
||||
};
|
||||
meta.homepage = "https://github.com/murtaza64/tree-sitter-groovy";
|
||||
};
|
||||
@@ -1165,23 +1165,23 @@
|
||||
};
|
||||
heex = buildGrammar {
|
||||
language = "heex";
|
||||
version = "0.0.0+rev=f6b83f3";
|
||||
version = "0.0.0+rev=a63c69c";
|
||||
src = fetchFromGitHub {
|
||||
owner = "connorlay";
|
||||
repo = "tree-sitter-heex";
|
||||
rev = "f6b83f305a755cd49cf5f6a66b2b789be93dc7b9";
|
||||
hash = "sha256-B9kNSHH/FhBdeAnXPUxiZAZK9efJpqo0MnuR9nfLlLU=";
|
||||
rev = "a63c69c20fd88d1e5614a02b4a6b48cfb7e54a45";
|
||||
hash = "sha256-rifYGyIpB14VfcEZrmRwYSz+ZcajQcB4mCjXnXuVFDQ=";
|
||||
};
|
||||
meta.homepage = "https://github.com/connorlay/tree-sitter-heex";
|
||||
};
|
||||
helm = buildGrammar {
|
||||
language = "helm";
|
||||
version = "0.0.0+rev=ca52fbf";
|
||||
version = "0.0.0+rev=ab4a8c4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ngalaiko";
|
||||
repo = "tree-sitter-go-template";
|
||||
rev = "ca52fbfc98366c585b84f4cb3745df49f33cd140";
|
||||
hash = "sha256-ZWpzqKD3ceBzlsRjehXZgu+NZMbWyyK+/R1Ymg7DVkM=";
|
||||
rev = "ab4a8c4a51f271f320f2bad6a5d499415bf541b1";
|
||||
hash = "sha256-ePEZ+59rA8z7++Pq5Mv8nILkscjORWmQJYjLlqivYLs=";
|
||||
};
|
||||
location = "dialects/helm";
|
||||
meta.homepage = "https://github.com/ngalaiko/tree-sitter-go-template";
|
||||
@@ -1307,6 +1307,17 @@
|
||||
};
|
||||
meta.homepage = "https://github.com/cathaysia/tree-sitter-idl";
|
||||
};
|
||||
idris = buildGrammar {
|
||||
language = "idris";
|
||||
version = "0.0.0+rev=c56a25c";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kayhide";
|
||||
repo = "tree-sitter-idris";
|
||||
rev = "c56a25cf57c68ff929356db25505c1cc4c7820f6";
|
||||
hash = "sha256-aOAxb0KjhSwlNX/IDvGwEysYvImgUEIDeNDOWRl1qNk=";
|
||||
};
|
||||
meta.homepage = "https://github.com/kayhide/tree-sitter-idris";
|
||||
};
|
||||
ini = buildGrammar {
|
||||
language = "ini";
|
||||
version = "0.0.0+rev=962568c";
|
||||
@@ -1353,12 +1364,12 @@
|
||||
};
|
||||
janet_simple = buildGrammar {
|
||||
language = "janet_simple";
|
||||
version = "0.0.0+rev=12bfab7";
|
||||
version = "0.0.0+rev=b4aa56f";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sogaiu";
|
||||
repo = "tree-sitter-janet-simple";
|
||||
rev = "12bfab7db8a5f5b1d774ef84b5831acd34936071";
|
||||
hash = "sha256-ndxhGmfz0wYxsOeBJv/OJndj3pORQoWpRTfBuMcprhU=";
|
||||
rev = "b4aa56fd0a2ea2708fc93062683ae5eaa4e973e6";
|
||||
hash = "sha256-2Yo1ZGNZbe6TtfaSIykkG10L58Z6lk5hMr30K5zGuYI=";
|
||||
};
|
||||
meta.homepage = "https://github.com/sogaiu/tree-sitter-janet-simple";
|
||||
};
|
||||
@@ -1507,12 +1518,12 @@
|
||||
};
|
||||
koto = buildGrammar {
|
||||
language = "koto";
|
||||
version = "0.0.0+rev=7258681";
|
||||
version = "0.0.0+rev=329b0e8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "koto-lang";
|
||||
repo = "tree-sitter-koto";
|
||||
rev = "7258681498ac92f24b2d7ebb844b5e79dc3cf9ac";
|
||||
hash = "sha256-dBx0iyG1p+Lij/yKKhBZLZcnoB70P6A4Xd9UYzq2iVU=";
|
||||
rev = "329b0e84ef6cc6950665de4accd0bdda1601a2f1";
|
||||
hash = "sha256-2TfRbqmUQlRGVRieffKg0fMzKBXzLkiHHHXQ9iZiRcs=";
|
||||
};
|
||||
meta.homepage = "https://github.com/koto-lang/tree-sitter-koto";
|
||||
};
|
||||
@@ -1529,12 +1540,12 @@
|
||||
};
|
||||
lalrpop = buildGrammar {
|
||||
language = "lalrpop";
|
||||
version = "0.0.0+rev=194c255";
|
||||
version = "0.0.0+rev=a7f5ea2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "traxys";
|
||||
repo = "tree-sitter-lalrpop";
|
||||
rev = "194c25539f435de415ee0551a5f07058833da915";
|
||||
hash = "sha256-I2Kozd0N8R0CCOVl4xTAL4fhZ5BIzSzW+MRQOfZ3cMY=";
|
||||
rev = "a7f5ea297bd621d072ed4cb2cc8ba5ae64ae3c4b";
|
||||
hash = "sha256-R3hGTS8g+QzpsXN+7IpqDR1fi/git8Af/OBo0S0wrW8=";
|
||||
};
|
||||
meta.homepage = "https://github.com/traxys/tree-sitter-lalrpop";
|
||||
};
|
||||
@@ -1708,12 +1719,12 @@
|
||||
};
|
||||
matlab = buildGrammar {
|
||||
language = "matlab";
|
||||
version = "0.0.0+rev=306c43a";
|
||||
version = "0.0.0+rev=b0a0198";
|
||||
src = fetchFromGitHub {
|
||||
owner = "acristoffers";
|
||||
repo = "tree-sitter-matlab";
|
||||
rev = "306c43ab28b7b8a4976e40ff0a7c26b019ad52df";
|
||||
hash = "sha256-hueZg7hoZb11+ukrZgK1+da0w9J22jsj1BexlF4USXY=";
|
||||
rev = "b0a0198b182574cd3ca0447264c83331901b9338";
|
||||
hash = "sha256-U3ZcZgI4ZjBNzk08s9lVdB968AlOQec2Dcy+qb0blZ0=";
|
||||
};
|
||||
meta.homepage = "https://github.com/acristoffers/tree-sitter-matlab";
|
||||
};
|
||||
@@ -1752,12 +1763,12 @@
|
||||
};
|
||||
mlir = buildGrammar {
|
||||
language = "mlir";
|
||||
version = "0.0.0+rev=01065de";
|
||||
version = "0.0.0+rev=b5d5f23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "artagnon";
|
||||
repo = "tree-sitter-mlir";
|
||||
rev = "01065decfd6877fe3c4bae05782b8892544cb73e";
|
||||
hash = "sha256-XygafBpyD5WQ9JBZstWjbjKYuDbPWzPbvO/6VLMuQt4=";
|
||||
rev = "b5d5f238b371b7c9b764f6a053b045dda92bc836";
|
||||
hash = "sha256-qoT1RVgAo0YzG7qTeTNLx5i/B92I+MCwNo1PJVxmLxA=";
|
||||
};
|
||||
generate = true;
|
||||
meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
|
||||
@@ -1841,12 +1852,12 @@
|
||||
};
|
||||
nix = buildGrammar {
|
||||
language = "nix";
|
||||
version = "0.0.0+rev=21897cc";
|
||||
version = "0.0.0+rev=4b952d9";
|
||||
src = fetchFromGitHub {
|
||||
owner = "cstrahan";
|
||||
repo = "tree-sitter-nix";
|
||||
rev = "21897cc3dcd15325303e46b85295b743742af6ab";
|
||||
hash = "sha256-B2DSacC5+FwyBtzsKaelr19Osc93we7BSH8HG1uIksk=";
|
||||
rev = "4b952d99ce6fc795ff3cfa48b05637f2b1751d3b";
|
||||
hash = "sha256-w8JC2RHerof/7RZQn3x48po4F7fJq/PJSgOg+mnGp6w=";
|
||||
};
|
||||
meta.homepage = "https://github.com/cstrahan/tree-sitter-nix";
|
||||
};
|
||||
@@ -1907,24 +1918,24 @@
|
||||
};
|
||||
ocaml = buildGrammar {
|
||||
language = "ocaml";
|
||||
version = "0.0.0+rev=57644ed";
|
||||
version = "0.0.0+rev=37ad9ef";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-ocaml";
|
||||
rev = "57644edfbba0edb38ac17dba2add4c243fa3539b";
|
||||
hash = "sha256-eRCO7hNbNXd6k6I+cSLHMX8Ry68fKXTjJXLFmBvnQro=";
|
||||
rev = "37ad9efe601316248b22173d2ff19a6b4c992016";
|
||||
hash = "sha256-j2RF7yymVDjVogE8HI/eUHzJ6x0PdZhQRL/mVaCaIFU=";
|
||||
};
|
||||
location = "grammars/ocaml";
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml";
|
||||
};
|
||||
ocaml_interface = buildGrammar {
|
||||
language = "ocaml_interface";
|
||||
version = "0.0.0+rev=57644ed";
|
||||
version = "0.0.0+rev=37ad9ef";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-ocaml";
|
||||
rev = "57644edfbba0edb38ac17dba2add4c243fa3539b";
|
||||
hash = "sha256-eRCO7hNbNXd6k6I+cSLHMX8Ry68fKXTjJXLFmBvnQro=";
|
||||
rev = "37ad9efe601316248b22173d2ff19a6b4c992016";
|
||||
hash = "sha256-j2RF7yymVDjVogE8HI/eUHzJ6x0PdZhQRL/mVaCaIFU=";
|
||||
};
|
||||
location = "grammars/interface";
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml";
|
||||
@@ -1943,12 +1954,12 @@
|
||||
};
|
||||
odin = buildGrammar {
|
||||
language = "odin";
|
||||
version = "0.0.0+rev=e8adc73";
|
||||
version = "0.0.0+rev=d2ca8ef";
|
||||
src = fetchFromGitHub {
|
||||
owner = "amaanq";
|
||||
repo = "tree-sitter-odin";
|
||||
rev = "e8adc739b78409a99f8c31313f0bb54cc538cf73";
|
||||
hash = "sha256-vlw5XaHTdsgO9H4y8z0u0faYzs+L3UZPhqhD/IJ6khY=";
|
||||
rev = "d2ca8efb4487e156a60d5bd6db2598b872629403";
|
||||
hash = "sha256-aPeaGERAP1Fav2QAjZy1zXciCuUTQYrsqXaSQsYG0oU=";
|
||||
};
|
||||
meta.homepage = "https://github.com/amaanq/tree-sitter-odin";
|
||||
};
|
||||
@@ -2465,12 +2476,12 @@
|
||||
};
|
||||
roc = buildGrammar {
|
||||
language = "roc";
|
||||
version = "0.0.0+rev=7d29fc2";
|
||||
version = "0.0.0+rev=de0839d";
|
||||
src = fetchFromGitHub {
|
||||
owner = "faldor20";
|
||||
repo = "tree-sitter-roc";
|
||||
rev = "7d29fc24b36119494b4dc3f3d967075e261706c1";
|
||||
hash = "sha256-v+yZ7ZIX83QWBqCVTjNmXv3bhtOjB3PY3SXLnt6l+Cw=";
|
||||
rev = "de0839d6c7db2405e827435cf3ac62d22f4bd5e9";
|
||||
hash = "sha256-jB0oljkzNfxvKdDP8zMmD3q/843qANVGHSrzCGIeS2E=";
|
||||
};
|
||||
meta.homepage = "https://github.com/faldor20/tree-sitter-roc";
|
||||
};
|
||||
@@ -2576,12 +2587,12 @@
|
||||
};
|
||||
sflog = buildGrammar {
|
||||
language = "sflog";
|
||||
version = "0.0.0+rev=bb2faa9";
|
||||
version = "0.0.0+rev=eade405";
|
||||
src = fetchFromGitHub {
|
||||
owner = "aheber";
|
||||
repo = "tree-sitter-sfapex";
|
||||
rev = "bb2faa992f6915079c2731632fba74874b85d188";
|
||||
hash = "sha256-WCjuDebUQu5rW+PEM3KpLWRTbfQVl8bfFMcj2TS8Tyw=";
|
||||
rev = "eade4054efc897f4bb18a5b7bf4b5a824dbffa74";
|
||||
hash = "sha256-XGATRlXRZCX4KeNSLTw8qLqZOvWULmj4bWvriQjvAiQ=";
|
||||
};
|
||||
location = "sflog";
|
||||
meta.homepage = "https://github.com/aheber/tree-sitter-sfapex";
|
||||
@@ -2654,24 +2665,24 @@
|
||||
};
|
||||
soql = buildGrammar {
|
||||
language = "soql";
|
||||
version = "0.0.0+rev=bb2faa9";
|
||||
version = "0.0.0+rev=eade405";
|
||||
src = fetchFromGitHub {
|
||||
owner = "aheber";
|
||||
repo = "tree-sitter-sfapex";
|
||||
rev = "bb2faa992f6915079c2731632fba74874b85d188";
|
||||
hash = "sha256-WCjuDebUQu5rW+PEM3KpLWRTbfQVl8bfFMcj2TS8Tyw=";
|
||||
rev = "eade4054efc897f4bb18a5b7bf4b5a824dbffa74";
|
||||
hash = "sha256-XGATRlXRZCX4KeNSLTw8qLqZOvWULmj4bWvriQjvAiQ=";
|
||||
};
|
||||
location = "soql";
|
||||
meta.homepage = "https://github.com/aheber/tree-sitter-sfapex";
|
||||
};
|
||||
sosl = buildGrammar {
|
||||
language = "sosl";
|
||||
version = "0.0.0+rev=bb2faa9";
|
||||
version = "0.0.0+rev=eade405";
|
||||
src = fetchFromGitHub {
|
||||
owner = "aheber";
|
||||
repo = "tree-sitter-sfapex";
|
||||
rev = "bb2faa992f6915079c2731632fba74874b85d188";
|
||||
hash = "sha256-WCjuDebUQu5rW+PEM3KpLWRTbfQVl8bfFMcj2TS8Tyw=";
|
||||
rev = "eade4054efc897f4bb18a5b7bf4b5a824dbffa74";
|
||||
hash = "sha256-XGATRlXRZCX4KeNSLTw8qLqZOvWULmj4bWvriQjvAiQ=";
|
||||
};
|
||||
location = "sosl";
|
||||
meta.homepage = "https://github.com/aheber/tree-sitter-sfapex";
|
||||
@@ -3215,12 +3226,12 @@
|
||||
};
|
||||
vhs = buildGrammar {
|
||||
language = "vhs";
|
||||
version = "0.0.0+rev=09f8fbf";
|
||||
version = "0.0.0+rev=037e675";
|
||||
src = fetchFromGitHub {
|
||||
owner = "charmbracelet";
|
||||
repo = "tree-sitter-vhs";
|
||||
rev = "09f8fbfe40a3a699b200daca7d92e65fbbe9f9e6";
|
||||
hash = "sha256-TUA94sJVWGK0KdvMueyQDmU+AlhdCOg0mlwcfL0XG8E=";
|
||||
rev = "037e675d547b18bbf3fdeb222e242ae5dccc39d7";
|
||||
hash = "sha256-iuDQx1BYSMyDCnZ86aWTqguRP7dQ+1ovS44NrEmSK20=";
|
||||
};
|
||||
meta.homepage = "https://github.com/charmbracelet/tree-sitter-vhs";
|
||||
};
|
||||
@@ -3337,12 +3348,12 @@
|
||||
};
|
||||
xresources = buildGrammar {
|
||||
language = "xresources";
|
||||
version = "0.0.0+rev=8117b0a";
|
||||
version = "0.0.0+rev=983f13a";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ValdezFOmar";
|
||||
repo = "tree-sitter-xresources";
|
||||
rev = "8117b0ab58df8afb902c0862b7f6eb3bbb06c7ab";
|
||||
hash = "sha256-3umsmD5avsKW4BmBvwXI14Ex82E8hXq8xk4EFabDjO0=";
|
||||
rev = "983f13acef542aef431a845fef084ddda8d9d666";
|
||||
hash = "sha256-s/wuzVzF8TzySZ0OFNCFpbvjminQzbb3icZc+DnChjc=";
|
||||
};
|
||||
meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-xresources";
|
||||
};
|
||||
|
||||
@@ -1415,6 +1415,7 @@ in
|
||||
"lazyvim.plugins.extras.coding.blink"
|
||||
"lazyvim.plugins.extras.coding.luasnip"
|
||||
"lazyvim.plugins.extras.editor.fzf"
|
||||
"lazyvim.plugins.extras.editor.snacks_picker"
|
||||
"lazyvim.plugins.extras.editor.telescope"
|
||||
"lazyvim.plugins.extras.formatting.prettier"
|
||||
"lazyvim.plugins.extras.lang.markdown"
|
||||
@@ -2855,6 +2856,8 @@ in
|
||||
"snacks.picker.actions"
|
||||
# Optional trouble integration
|
||||
"trouble.sources.profiler"
|
||||
# TODO: Plugin requires libsqlite available, create a test for it
|
||||
"snacks.picker.util.db"
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
{
|
||||
lib,
|
||||
lldb,
|
||||
makeWrapper,
|
||||
rustPlatform,
|
||||
stdenv,
|
||||
|
||||
pname,
|
||||
src,
|
||||
version,
|
||||
}:
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "${pname}-adapter";
|
||||
inherit version src;
|
||||
|
||||
cargoHash = "sha256-e/Jki/4pCs0qzaBVR4iiUhdBFmWlTZYREQkuFSoWYFo=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ lldb ];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_LDFLAGS = "-llldb -lc++abi"; };
|
||||
|
||||
buildAndTestSubdir = "adapter";
|
||||
|
||||
buildFeatures = [ "weak-linkage" ];
|
||||
|
||||
cargoBuildFlags = [
|
||||
"--lib"
|
||||
"--bin=codelldb"
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
mkdir -p $out/share/{adapter,formatters}
|
||||
# codelldb expects libcodelldb.so to be in the same
|
||||
# directory as the executable, and can't find it in $out/lib.
|
||||
# To make codelldb executable as a standalone,
|
||||
# we put all files in $out/share, and then wrap the binary in $out/bin.
|
||||
mv $out/bin/* $out/share/adapter
|
||||
cp $out/lib/* $out/share/adapter
|
||||
cp -r adapter/scripts $out/share/adapter
|
||||
cp -t $out/share/formatters formatters/*.py
|
||||
ln -s ${lib.getLib lldb} $out/share/lldb
|
||||
makeWrapper $out/share/adapter/codelldb $out/bin/codelldb \
|
||||
--set-default LLDB_DEBUGSERVER_PATH "${lldb.out}/bin/lldb-server"
|
||||
'';
|
||||
|
||||
patches = [ ./patches/adapter-output-shared_object.patch ];
|
||||
|
||||
# Tests are linked to liblldb but it is not available here.
|
||||
doCheck = false;
|
||||
}
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
runCommand,
|
||||
rustPlatform,
|
||||
makeWrapper,
|
||||
llvmPackages,
|
||||
@@ -13,7 +12,6 @@
|
||||
python3,
|
||||
pkg-config,
|
||||
libsecret,
|
||||
darwin,
|
||||
}:
|
||||
assert lib.versionAtLeast python3.version "3.5";
|
||||
let
|
||||
@@ -33,82 +31,38 @@ let
|
||||
};
|
||||
|
||||
# need to build a custom version of lldb and llvm for enhanced rust support
|
||||
lldb = (import ./lldb.nix { inherit fetchFromGitHub runCommand llvmPackages; });
|
||||
lldb = (import ./lldb.nix { inherit fetchFromGitHub llvmPackages; });
|
||||
|
||||
adapter = rustPlatform.buildRustPackage {
|
||||
pname = "${pname}-adapter";
|
||||
inherit version src;
|
||||
adapter = (
|
||||
import ./adapter.nix {
|
||||
inherit
|
||||
lib
|
||||
lldb
|
||||
makeWrapper
|
||||
rustPlatform
|
||||
stdenv
|
||||
|
||||
cargoHash = "sha256-e/Jki/4pCs0qzaBVR4iiUhdBFmWlTZYREQkuFSoWYFo=";
|
||||
pname
|
||||
src
|
||||
version
|
||||
;
|
||||
}
|
||||
);
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ lldb ];
|
||||
nodeDeps = (
|
||||
import ./node_deps.nix {
|
||||
inherit
|
||||
buildNpmPackage
|
||||
libsecret
|
||||
pkg-config
|
||||
python3
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_LDFLAGS = "-llldb -lc++abi"; };
|
||||
|
||||
buildAndTestSubdir = "adapter";
|
||||
|
||||
buildFeatures = [ "weak-linkage" ];
|
||||
|
||||
cargoBuildFlags = [
|
||||
"--lib"
|
||||
"--bin=codelldb"
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
mkdir -p $out/share/{adapter,formatters}
|
||||
# codelldb expects libcodelldb.so to be in the same
|
||||
# directory as the executable, and can't find it in $out/lib.
|
||||
# To make codelldb executable as a standalone,
|
||||
# we put all files in $out/share, and then wrap the binary in $out/bin.
|
||||
mv $out/bin/* $out/share/adapter
|
||||
cp $out/lib/* $out/share/adapter
|
||||
cp -r adapter/scripts $out/share/adapter
|
||||
cp -t $out/share/formatters formatters/*.py
|
||||
ln -s ${lib.getLib lldb} $out/share/lldb
|
||||
makeWrapper $out/share/adapter/codelldb $out/bin/codelldb \
|
||||
--set-default LLDB_DEBUGSERVER_PATH "${lldb.out}/bin/lldb-server"
|
||||
'';
|
||||
|
||||
patches = [ ./adapter-output-shared_object.patch ];
|
||||
|
||||
# Tests are linked to liblldb but it is not available here.
|
||||
doCheck = false;
|
||||
};
|
||||
|
||||
nodeDeps = buildNpmPackage {
|
||||
pname = "${pname}-node-deps";
|
||||
inherit version src;
|
||||
|
||||
npmDepsHash = "sha256-fMKGi+AJTMlWl7SQtZ21hUwOLgqlFYDhwLvEergQLfI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[ libsecret ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin (
|
||||
with darwin.apple_sdk.frameworks;
|
||||
[
|
||||
Security
|
||||
AppKit
|
||||
]
|
||||
);
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/lib
|
||||
cp -r node_modules $out/lib
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
pname
|
||||
src
|
||||
version
|
||||
;
|
||||
}
|
||||
);
|
||||
|
||||
# debugservers on macOS require the 'com.apple.security.cs.debugger'
|
||||
# entitlement which nixpkgs' lldb-server does not yet provide; see
|
||||
@@ -133,17 +87,17 @@ stdenv.mkDerivation {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
makeWrapper
|
||||
nodejs
|
||||
unzip
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
patches = [ ./cmake-build-extension-only.patch ];
|
||||
patches = [ ./patches/cmake-build-extension-only.patch ];
|
||||
|
||||
postPatch = ''
|
||||
# temporary patch for forgotten version updates
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "1.9.2" ${version}
|
||||
--replace-fail "1.9.2" ${version}
|
||||
'';
|
||||
|
||||
postConfigure =
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
# Patched lldb for Rust language support.
|
||||
{
|
||||
fetchFromGitHub,
|
||||
runCommand,
|
||||
llvmPackages,
|
||||
}:
|
||||
let
|
||||
@@ -12,24 +11,25 @@ let
|
||||
rev = "4c267c83cbb55fedf2e0b89644dc1db320fdfde7";
|
||||
hash = "sha256-jM//ej6AxnRYj+8BAn4QrxHPT6HiDzK5RqHPSg3dCcw=";
|
||||
};
|
||||
|
||||
lldbDrv = llvmPackages.lldb.overrideAttrs (oldAttrs: {
|
||||
passthru = (oldAttrs.passthru or { }) // {
|
||||
inherit llvmSrc;
|
||||
};
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
# installCheck for lldb_14 currently broken
|
||||
# https://github.com/NixOS/nixpkgs/issues/166604#issuecomment-1086103692
|
||||
# ignore the oldAttrs installCheck
|
||||
installCheckPhase = ''
|
||||
versionOutput="$($out/bin/lldb --version)"
|
||||
echo "'lldb --version' returns: $versionOutput"
|
||||
echo "$versionOutput" | grep -q 'rust-enabled'
|
||||
'';
|
||||
});
|
||||
in
|
||||
(llvmPackages.lldb.overrideAttrs (oldAttrs: rec {
|
||||
passthru = (oldAttrs.passthru or { }) // {
|
||||
inherit llvmSrc;
|
||||
};
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
# installCheck for lldb_14 currently broken
|
||||
# https://github.com/NixOS/nixpkgs/issues/166604#issuecomment-1086103692
|
||||
# ignore the oldAttrs installCheck
|
||||
installCheckPhase = ''
|
||||
versionOutput="$($out/bin/lldb --version)"
|
||||
echo "'lldb --version' returns: $versionOutput"
|
||||
echo "$versionOutput" | grep -q 'rust-enabled'
|
||||
'';
|
||||
})).override
|
||||
({
|
||||
monorepoSrc = llvmSrc;
|
||||
libllvm = llvmPackages.libllvm.override ({ monorepoSrc = llvmSrc; });
|
||||
})
|
||||
lldbDrv.override {
|
||||
monorepoSrc = llvmSrc;
|
||||
libllvm = llvmPackages.libllvm.override { monorepoSrc = llvmSrc; };
|
||||
}
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
{
|
||||
buildNpmPackage,
|
||||
|
||||
libsecret,
|
||||
python3,
|
||||
pkg-config,
|
||||
|
||||
pname,
|
||||
src,
|
||||
version,
|
||||
}:
|
||||
buildNpmPackage {
|
||||
pname = "${pname}-node-deps";
|
||||
inherit version src;
|
||||
|
||||
npmDepsHash = "sha256-fMKGi+AJTMlWl7SQtZ21hUwOLgqlFYDhwLvEergQLfI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [ libsecret ];
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/lib
|
||||
cp -r node_modules $out/lib
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
}
|
||||
@@ -372,7 +372,7 @@ let
|
||||
|
||||
appendToVar makeWrapperArgs --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
|
||||
concatTo makeWrapperArgs oldWrapperArgs
|
||||
makeWrapper "$oldExe" "''${executablePath}${nameSuffix}" ''${makeWrapperArgs[@]}
|
||||
makeWrapper "$oldExe" "''${executablePath}${nameSuffix}" "''${makeWrapperArgs[@]}"
|
||||
#############################
|
||||
# #
|
||||
# END EXTRA PREF CHANGES #
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "ananicy-rules-cachyos";
|
||||
version = "0-unstable-2025-01-03";
|
||||
version = "0-unstable-2025-01-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CachyOS";
|
||||
repo = "ananicy-rules";
|
||||
rev = "45d223fe8bda37d4ab3f8a931e65ce90bd1ffa88";
|
||||
hash = "sha256-BQM9AmF2w3cl5I0D/Bw9ndvnGVwABWDSsKTEIvVSdTg=";
|
||||
rev = "09e6e86c7690418737847456ed764a7dce4d2e52";
|
||||
hash = "sha256-9Ew7HhiuvAUipnJwoEs+tnf2UZS0U83k5VWFgLayFmw=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -22,16 +22,16 @@ let
|
||||
in
|
||||
buildNpmPackage' rec {
|
||||
pname = "balena-cli";
|
||||
version = "20.2.1";
|
||||
version = "20.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "balena-io";
|
||||
repo = "balena-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-D+V4WJ7/jkhUmEeRnYCtYtUzT7OXnHitIaGk2aimDFI=";
|
||||
hash = "sha256-sJksNbsGBzH1tjqAv0kX++J7NCj1fu64Bi/i3Tp8R9E=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-HslQ7Jvn8M7eKMePnwWd/xDhx1QyXwwjOS6EexRULJM=";
|
||||
npmDepsHash = "sha256-t1ZTQOuEvRcy9Zl9qqi8DDH2EVkjrBaTX4pTuRGl2ww=";
|
||||
|
||||
postPatch = ''
|
||||
ln -s npm-shrinkwrap.json package-lock.json
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-show-asm";
|
||||
version = "0.2.45";
|
||||
version = "0.2.46";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-0EH5/ENDKtRK7a3Vq3W6Z/X5ZvrLQWRBxsDv4lABWZI=";
|
||||
hash = "sha256-MiODtrEE/arK5SiSs/YuFWBkSQkSUrPqUZcjFd+HNbg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-q+ipoYtoIWKw11gIS7pV2TYSbyOTZ95YrV53tXqzT5A=";
|
||||
cargoHash = "sha256-VUqANn4ykAYB4+7h3lHY2UvqduHJPd3P29wsxLpPXFg=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -2,17 +2,18 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "clac";
|
||||
version = "0.3.3-unstable-2021-09-06";
|
||||
version = "0.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "soveran";
|
||||
repo = "clac";
|
||||
rev = "beae8c4bc89912f4cd66bb875585fa471692cd54";
|
||||
sha256 = "XaULDkFF9OZW7Hbh60wbGgvCJ6L+3gZNGQ9uQv3G0zU=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-DcW35jKIZQqkNa5Y6am2e5/TAEg3Fo2n+fHG3nOpNzM=";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
@@ -22,12 +23,18 @@ stdenv.mkDerivation rec {
|
||||
cp README* LICENSE "$out/share/doc/clac"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Interactive stack-based calculator";
|
||||
homepage = "https://github.com/soveran/clac";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
platforms = platforms.unix;
|
||||
changelog = "https://github.com/soveran/clac/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = with lib.maintainers; [
|
||||
gepbird
|
||||
raskin
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "clac";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -16,16 +16,16 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.132.1";
|
||||
version = "0.133.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evcc-io";
|
||||
repo = "evcc";
|
||||
tag = version;
|
||||
hash = "sha256-TrKPI+b9hlVPGUXmJ73QO2TfGoDip31KZ5RzgQC+BS4=";
|
||||
hash = "sha256-10xgw6zL49Hk7OH5c6lqeTsIhdkSOyRZCJjSkQox0XI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-jhYDk2BV1L6lrkOl6sSiYe79Q7vtC4Da/DzWzilCXRM=";
|
||||
vendorHash = "sha256-aBTs6S7b+1JS9MNKWMpuUZ6AXb9ylfXnuAV7q9WnE9w=";
|
||||
|
||||
commonMeta = with lib; {
|
||||
license = licenses.mit;
|
||||
|
||||
@@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
|
||||
openssh
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
|
||||
|
||||
preConfigure = ''
|
||||
configureFlagsArray+=( "--enable-i8" \
|
||||
"--with-mpi" \
|
||||
|
||||
@@ -66,7 +66,17 @@ stdenv.mkDerivation rec {
|
||||
sed -i -e "s@env = Environment()@env = Environment( ENV = os.environ )@" SConstruct
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ scons ];
|
||||
# fix sdl-config for cross
|
||||
# TODO: remaining *-config, and make it work for !(build.canExecute host)
|
||||
preBuild = ''
|
||||
substituteInPlace SConstruct \
|
||||
--replace-fail sdl-config "${lib.getExe' (lib.getDev SDL) "sdl-config"}"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
scons
|
||||
bsdiff # bspatch
|
||||
];
|
||||
buildInputs = [
|
||||
libGLU
|
||||
libGL
|
||||
@@ -80,7 +90,6 @@ stdenv.mkDerivation rec {
|
||||
libogg
|
||||
boost
|
||||
fribidi
|
||||
bsdiff
|
||||
];
|
||||
|
||||
sconsFlags = [
|
||||
@@ -97,6 +106,7 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl3;
|
||||
broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||
};
|
||||
passthru.updateInfo.downloadPage = "http://globulation2.org/wiki/Download_and_Install";
|
||||
}
|
||||
|
||||
@@ -10,17 +10,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "helix";
|
||||
version = "25.01";
|
||||
version = "25.01.1";
|
||||
|
||||
# This release tarball includes source code for the tree-sitter grammars,
|
||||
# which is not ordinarily part of the repository.
|
||||
src = fetchzip {
|
||||
url = "https://github.com/helix-editor/helix/releases/download/${version}/helix-${version}-source.tar.xz";
|
||||
hash = "sha256-HyDsHimDug+8vX0wfon4pK0DEYH5402CDinp3EZpaWs=";
|
||||
hash = "sha256-rN2eK+AoyDH+tL3yxTRQQQYHf0PoYK84FgrRwm/Wfjk=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
cargoHash = "sha256-G3gJRI12JFk+A4DP65TOcD9jBJvNrb4aPr9V9uv4JP0=";
|
||||
cargoHash = "sha256-PVUzRl8yu2ha2El904WQo+EzvjGb3bXp+BAtZNlxAkE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
git
|
||||
@@ -44,10 +44,6 @@ rustPlatform.buildRustPackage rec {
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
# `hx --version` outputs 25.1 instead of 25.01
|
||||
preVersionCheck = ''
|
||||
export version=${lib.replaceStrings [ ".0" ] [ "." ] version}
|
||||
'';
|
||||
versionCheckProgram = "${placeholder "out"}/bin/hx";
|
||||
versionCheckProgramArg = [ "--version" ];
|
||||
doInstallCheck = true;
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
pkg-config,
|
||||
libpng,
|
||||
zlib,
|
||||
buildPackages,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -25,8 +26,24 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "03ibk51swxfl7pfrhcrfiffdi4mnf8kla0g1xj1lsrvrjwapfx03";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace doc/Makefile.am --replace-fail \
|
||||
'$(HELP2MAN) --output=$@ --no-info --include=$< $(PROGNAME)' \
|
||||
'$(HELP2MAN) --output=$@ --no-info --include=$< ${
|
||||
if stdenv.buildPlatform.canExecute stdenv.hostPlatform then
|
||||
(placeholder "out")
|
||||
else
|
||||
buildPackages.hyp2mat
|
||||
}/bin/`basename $(PROGNAME)`'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
bison
|
||||
flex
|
||||
gengetopt
|
||||
groff
|
||||
help2man
|
||||
pkg-config
|
||||
];
|
||||
|
||||
@@ -34,11 +51,6 @@ stdenv.mkDerivation rec {
|
||||
libharu
|
||||
libpng
|
||||
zlib
|
||||
bison
|
||||
flex
|
||||
gengetopt
|
||||
help2man
|
||||
groff
|
||||
];
|
||||
|
||||
configureFlags = [ "--enable-library" ];
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
lib,
|
||||
cmake,
|
||||
expat,
|
||||
check,
|
||||
pkg-config,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -17,18 +19,18 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-yy8+CyNKXuttCmxRxH/XptIloDklto4f5Zg0vnwnneY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
check
|
||||
];
|
||||
buildInputs = [ expat ];
|
||||
|
||||
postPatch = ''
|
||||
sed -i 's/^SET.*$//' cmake/CMakeLists.txt
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/libwbxml/libwbxml";
|
||||
description = "WBXML Library (aka libwbxml) contains a library and its associated tools to Parse, Encode and Handle WBXML documents";
|
||||
maintainers = with maintainers; [ mh ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
license = licenses.lgpl21Plus;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "lrs";
|
||||
version = "7.2";
|
||||
version = "7.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/lrslib-072.tar.gz";
|
||||
sha256 = "1w1jsnfgny8cihndr5gfm99pvwp48qsvxkqfsi2q87gd3m57aj7w";
|
||||
url = "http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/lrslib-073.tar.gz";
|
||||
sha256 = "sha256-xJpOvYVhg0c9HVpieF/N/hBX1dZx1LlvOhJQ6xr+ToM=";
|
||||
};
|
||||
|
||||
buildInputs = [ gmp ];
|
||||
|
||||
@@ -8,21 +8,31 @@
|
||||
fetchNpmDeps,
|
||||
jq,
|
||||
nixosTests,
|
||||
|
||||
versionInfo ? {
|
||||
# ESR releases only.
|
||||
# See https://docs.mattermost.com/upgrade/extended-support-release.html
|
||||
# When a new ESR version is available (e.g. 8.1.x -> 9.5.x), update
|
||||
# the version regex here as well.
|
||||
#
|
||||
# Ensure you also check ../mattermostLatest/package.nix.
|
||||
regex = "^v(9\.11\.[0-9]+)$";
|
||||
version = "9.11.7";
|
||||
srcHash = "sha256-KeGpYy3jr7/B2mtBk9em2MXJBJR2+Wajmvtz/yT4SG8=";
|
||||
vendorHash = "sha256-alLPBfnA1o6bUUgPRqvYW/98UKR9wltmFTzKIGtVEm4=";
|
||||
npmDepsHash = "sha256-ysz38ywGxJ5DXrrcDmcmezKbc5Y7aug9jOWUzHRAs/0=";
|
||||
},
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mattermost";
|
||||
# ESR releases only.
|
||||
# See https://docs.mattermost.com/upgrade/extended-support-release.html
|
||||
# When a new ESR version is available (e.g. 8.1.x -> 9.5.x), update
|
||||
# the version regex in passthru.updateScript as well.
|
||||
version = "9.11.6";
|
||||
inherit (versionInfo) version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattermost";
|
||||
repo = "mattermost";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-G9RYktnnVXdhNWp8q+bNbdlHB9ZOGtnESnZVOA7lDvE=";
|
||||
tag = "v${version}";
|
||||
hash = versionInfo.srcHash;
|
||||
postFetch = ''
|
||||
cd $out/webapp
|
||||
|
||||
@@ -31,6 +41,18 @@ buildGoModule rec {
|
||||
def desuffix(version): version | gsub("^(?<prefix>[^\\+]+)\\+.*$"; "\(.prefix)");
|
||||
.packages |= map_values(if has("version") then .version = desuffix(.version) else . end)
|
||||
' < package-lock.json > package-lock.fixed.json
|
||||
|
||||
# Run the lockfile overlay, if present.
|
||||
${lib.optionalString (versionInfo.lockfileOverlay or null != null) ''
|
||||
${lib.getExe jq} ${lib.escapeShellArg ''
|
||||
# Unlock a dependency and let npm-lockfile-fix relock it.
|
||||
def unlock(root; dependency; path):
|
||||
root | .packages[path] |= del(.resolved, .integrity)
|
||||
| .packages[path].version = root.packages.channels.dependencies[dependency];
|
||||
${versionInfo.lockfileOverlay}
|
||||
''} < package-lock.fixed.json > package-lock.overlaid.json
|
||||
mv package-lock.overlaid.json package-lock.fixed.json
|
||||
''}
|
||||
${lib.getExe npm-lockfile-fix} package-lock.fixed.json
|
||||
|
||||
rm -f package-lock.json
|
||||
@@ -54,7 +76,7 @@ buildGoModule rec {
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit src;
|
||||
sourceRoot = "${src.name}/webapp";
|
||||
hash = "sha256-ysz38ywGxJ5DXrrcDmcmezKbc5Y7aug9jOWUzHRAs/0=";
|
||||
hash = versionInfo.npmDepsHash;
|
||||
makeCacheWritable = true;
|
||||
forceGitDeps = true;
|
||||
};
|
||||
@@ -99,7 +121,7 @@ buildGoModule rec {
|
||||
'';
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Gwv6clnq7ihoFC8ox8iEM5xp/us9jWUrcmqA9/XbxBE=";
|
||||
inherit (versionInfo) vendorHash;
|
||||
|
||||
modRoot = "./server";
|
||||
preBuild = ''
|
||||
@@ -142,10 +164,15 @@ buildGoModule rec {
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"^v(9\.11\.[0-9]+)$"
|
||||
];
|
||||
extraArgs =
|
||||
[
|
||||
"--version-regex"
|
||||
versionInfo.regex
|
||||
]
|
||||
++ lib.optionals (versionInfo.autoUpdate or null != null) [
|
||||
"--override-filename"
|
||||
versionInfo.autoUpdate
|
||||
];
|
||||
};
|
||||
tests.mattermost = nixosTests.mattermost;
|
||||
};
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
{
|
||||
mattermost,
|
||||
}:
|
||||
|
||||
mattermost.override {
|
||||
versionInfo = {
|
||||
# Latest, non-RC releases only.
|
||||
# If the latest is an ESR (Extended Support Release),
|
||||
# duplicate it here to facilitate the update script.
|
||||
# See https://docs.mattermost.com/about/mattermost-server-releases.html
|
||||
# and make sure the version regex is up to date here.
|
||||
# Ensure you also check ../mattermost/package.nix for ESR releases.
|
||||
regex = "^v(10\.[0-9]+\.[0-9]+)$";
|
||||
version = "10.4.1";
|
||||
srcHash = "sha256-e7uT30tWhJpEQzlcDUY2huFcupDbe4l8B19Dgub2pg0=";
|
||||
vendorHash = "sha256-AcemUxcBoytE/ZoXqaIlxkzAnmGV/C1laDqziMuE+XE=";
|
||||
npmDepsHash = "sha256-HABPwdhtev9DZLhWJQsyU4g2ZueYgsX+tUduMsc74YY=";
|
||||
lockfileOverlay = ''
|
||||
unlock(.; "@floating-ui/react"; "channels/node_modules/@floating-ui/react")
|
||||
'';
|
||||
autoUpdate = ./package.nix;
|
||||
};
|
||||
}
|
||||
@@ -9,21 +9,22 @@
|
||||
libglvnd,
|
||||
makeWrapper,
|
||||
ninja,
|
||||
nix-update-script,
|
||||
stdenv,
|
||||
vulkan-headers,
|
||||
vulkan-loader,
|
||||
vulkan-validation-layers,
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "opengothic";
|
||||
version = "0.80-unstable-09-10-2024";
|
||||
version = "1.0.3010";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Try";
|
||||
repo = "OpenGothic";
|
||||
rev = "0db60b0a956e2a2f365aa3a8bdbe366be198e641";
|
||||
tag = "opengothic-v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-Hf3B7B4CaW/GsTcYs0PChpPfA9aK41pPJkImtUDgoKc=";
|
||||
hash = "sha256-ELDuyoAZmulMjFFctuCmdKDUMtrbVVndJxIf9Xo82N4=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
@@ -48,11 +49,20 @@ stdenv.mkDerivation {
|
||||
vulkan-validation-layers
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "-Werror" ""
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/Gothic2Notr \
|
||||
--set LD_PRELOAD "${lib.getLib alsa-lib}/lib/libasound.so.2"
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [ "--version-regex=^opengothic-v(.*)$" ];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Open source re-implementation of Gothic 2: Night of the Raven";
|
||||
homepage = "https://github.com/Try/OpenGothic";
|
||||
@@ -61,4 +71,4 @@ stdenv.mkDerivation {
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "Gothic2Notr";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "phpunit";
|
||||
version = "11.5.2";
|
||||
version = "11.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sebastianbergmann";
|
||||
repo = "phpunit";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-0NVoaUFmmV4EtaErhaqLxJzCbD2WuMaVZC2OHG9+gSA=";
|
||||
hash = "sha256-+PF4ZeN53GckAV0NsWPVuuNpITacv+/AlwhP7zI5TiI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-C1BmMURmAMQhDS6iAKC80wqZuYdSRPGyFpU9Jdr6snA=";
|
||||
vendorHash = "sha256-nACtesZ67ZzFuqqKhuag8RVZhg9zQA0+iJQaX9iD9Ng=";
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
|
||||
@@ -1,28 +1,52 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
libtool,
|
||||
automake,
|
||||
inputs@{
|
||||
autoconf,
|
||||
ucx,
|
||||
automake,
|
||||
config,
|
||||
enableCuda ? config.cudaSupport,
|
||||
cudaPackages,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
libtool,
|
||||
stdenv,
|
||||
ucx,
|
||||
# Configuration options
|
||||
enableAvx ? stdenv.hostPlatform.avxSupport,
|
||||
enableCuda ? config.cudaSupport,
|
||||
enableSse41 ? stdenv.hostPlatform.sse4_1Support,
|
||||
enableSse42 ? stdenv.hostPlatform.sse4_2Support,
|
||||
}:
|
||||
let
|
||||
inherit (lib.attrsets) getLib;
|
||||
inherit (lib.lists) optionals;
|
||||
inherit (lib.strings) concatStringsSep;
|
||||
|
||||
inherit (cudaPackages)
|
||||
cuda_cccl
|
||||
cuda_cudart
|
||||
cuda_nvcc
|
||||
cuda_nvml_dev
|
||||
cudaFlags
|
||||
nccl
|
||||
;
|
||||
|
||||
stdenv = throw "Use effectiveStdenv instead";
|
||||
effectiveStdenv = if enableCuda then cudaPackages.backendStdenv else inputs.stdenv;
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
__structuredAttrs = true;
|
||||
# TODO(@connorbaker):
|
||||
# When strictDeps is enabled, `cuda_nvcc` is required as the argument to `--with-cuda` in `configureFlags` or else
|
||||
# configurePhase fails with `checking for cuda_runtime.h... no`.
|
||||
# This is odd, especially given `cuda_runtime.h` is provided by `cuda_cudart.dev`, which is already in `buildInputs`.
|
||||
strictDeps = true;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ucc";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openucx";
|
||||
repo = "ucc";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xcJLYktkxNK2ewWRgm8zH/dMaIoI+9JexuswXi7MpAU=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-xcJLYktkxNK2ewWRgm8zH/dMaIoI+9JexuswXi7MpAU=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
@@ -32,44 +56,58 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# NOTE: We use --replace-quiet because not all Makefile.am files contain /bin/bash.
|
||||
postPatch = ''
|
||||
|
||||
for comp in $(find src/components -name Makefile.am); do
|
||||
substituteInPlace $comp \
|
||||
--replace "/bin/bash" "${stdenv.shell}"
|
||||
substituteInPlace "$comp" \
|
||||
--replace-quiet \
|
||||
"/bin/bash" \
|
||||
"${effectiveStdenv.shell}"
|
||||
done
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
libtool
|
||||
automake
|
||||
autoconf
|
||||
] ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ];
|
||||
automake
|
||||
libtool
|
||||
] ++ optionals enableCuda [ cuda_nvcc ];
|
||||
|
||||
buildInputs =
|
||||
[ ucx ]
|
||||
++ lib.optionals enableCuda [
|
||||
cudaPackages.cuda_cccl
|
||||
cudaPackages.cuda_cudart
|
||||
++ optionals enableCuda [
|
||||
cuda_cccl
|
||||
cuda_cudart
|
||||
cuda_nvml_dev
|
||||
nccl
|
||||
];
|
||||
|
||||
preConfigure =
|
||||
''
|
||||
./autogen.sh
|
||||
''
|
||||
+ lib.optionalString enableCuda ''
|
||||
configureFlagsArray+=( "--with-nvcc-gencode=${builtins.concatStringsSep " " cudaPackages.cudaFlags.gencode}" )
|
||||
'';
|
||||
# NOTE: With `__structuredAttrs` enabled, `LDFLAGS` must be set under `env` so it is assured to be a string;
|
||||
# otherwise, we might have forgotten to convert it to a string and Nix would make LDFLAGS a shell variable
|
||||
# referring to an array!
|
||||
env.LDFLAGS = builtins.toString (
|
||||
optionals enableCuda [
|
||||
# Fake libnvidia-ml.so (the real one is deployed impurely)
|
||||
"-L${getLib cuda_nvml_dev}/lib/stubs"
|
||||
]
|
||||
);
|
||||
|
||||
preConfigure = ''
|
||||
./autogen.sh
|
||||
'';
|
||||
|
||||
configureFlags =
|
||||
[ ]
|
||||
++ lib.optional enableSse41 "--with-sse41"
|
||||
++ lib.optional enableSse42 "--with-sse42"
|
||||
++ lib.optional enableAvx "--with-avx"
|
||||
++ lib.optional enableCuda "--with-cuda=${cudaPackages.cuda_cudart}";
|
||||
optionals enableSse41 [ "--with-sse41" ]
|
||||
++ optionals enableSse42 [ "--with-sse42" ]
|
||||
++ optionals enableAvx [ "--with-avx" ]
|
||||
++ optionals enableCuda [
|
||||
"--with-cuda=${cuda_nvcc}"
|
||||
"--with-nvcc-gencode=${concatStringsSep " " cudaFlags.gencode}"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
find $out/lib/ -name "*.la" -exec rm -f \{} \;
|
||||
find "$out/lib/" -name "*.la" -exec rm -f \{} \;
|
||||
|
||||
moveToOutput bin/ucc_info $dev
|
||||
moveToOutput bin/ucc_info "$dev"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
@@ -79,4 +117,4 @@ stdenv.mkDerivation rec {
|
||||
maintainers = [ maintainers.markuskowa ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "wcc-unstable";
|
||||
version = "2018-04-05";
|
||||
version = "0.0.7-unstable-2025-01-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "endrazine";
|
||||
repo = "wcc";
|
||||
rev = "f141963ff193d7e1931d41acde36d20d7221e74f";
|
||||
sha256 = "1f0w869x0176n5nsq7m70r344gv5qvfmk7b58syc0jls8ghmjvb4";
|
||||
rev = "fe1f71d7f6c756e196b82a884dc38bb8f8aef4d3";
|
||||
sha256 = "sha256-Kb9QIL+W0JFdfweqZL05OajXGGqXn6e6Jv3IVCr3BwQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
|
||||
installFlags = [ "DESTDIR=$(out)" ];
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p $out/usr/bin
|
||||
mkdir -p $out/usr/bin $out/lib/x86_64-linux-gnu
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
@@ -49,9 +49,9 @@ stdenv.mkDerivation {
|
||||
cp doc/manpages/*.1 $out/share/man/man1/
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
# Let patchShebangs rewrite shebangs with wsh.
|
||||
PATH+=:$out/bin
|
||||
postFixup = ''
|
||||
# not detected by patchShebangs
|
||||
substituteInPlace $out/bin/wcch --replace-fail '#!/usr/bin/wsh' "#!$out/bin/wsh"
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -88,6 +88,7 @@ buildNpmPackage rec {
|
||||
mainProgram = "webcord";
|
||||
maintainers = with lib.maintainers; [
|
||||
huantian
|
||||
NotAShelf
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
||||
@@ -1,32 +1,34 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
btrfs-progs,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
btrfs-progs,
|
||||
testers,
|
||||
werf,
|
||||
lib,
|
||||
stdenv,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "werf";
|
||||
version = "2.12.1";
|
||||
version = "2.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "werf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-EVFNUOvczsgU0t2hOfl4e5bFH4ByxmRsIk2idI+uquQ=";
|
||||
hash = "sha256-bNh2Rg77yWWBgXTnAo1IVU0RzieFOYtM5k0G1ltn3+Y=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-eJT3ROX/cAslWMNUdlFU6eQE8o2GlAFKrBaT//Pde1o=";
|
||||
vendorHash = "sha256-ICZneCPV858wRThUaSBmS9oApemKlUiA4SEWsH2sOak=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
subPackages = [ "cmd/werf" ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
versionCheckHook
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
lib.optionals stdenv.hostPlatform.isLinux [ btrfs-progs ]
|
||||
@@ -64,13 +66,13 @@ buildGoModule rec {
|
||||
|
||||
preCheck =
|
||||
''
|
||||
# Test all targets.
|
||||
# Test all packages.
|
||||
unset subPackages
|
||||
|
||||
# Remove tests that require external services.
|
||||
# Remove tests that require external services, usually a Docker daemon.
|
||||
rm -rf \
|
||||
integration/suites \
|
||||
pkg/true_git/*test.go \
|
||||
pkg/true_git/*_test.go \
|
||||
test/e2e
|
||||
''
|
||||
+ lib.optionalString (env.CGO_ENABLED == 0) ''
|
||||
@@ -78,28 +80,30 @@ buildGoModule rec {
|
||||
export USER=nixbld
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
versionCheckProgramArg = "version";
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd werf \
|
||||
--bash <($out/bin/werf completion --shell=bash) \
|
||||
--zsh <($out/bin/werf completion --shell=zsh)
|
||||
for shell in bash fish zsh; do
|
||||
installShellCompletion \
|
||||
--cmd werf \
|
||||
--$shell <($out/bin/werf completion --shell=$shell)
|
||||
done
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = werf;
|
||||
command = "werf version";
|
||||
version = src.rev;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "GitOps delivery tool";
|
||||
mainProgram = "werf";
|
||||
longDescription = ''
|
||||
The CLI tool gluing Git, Docker, Helm & Kubernetes with any CI system to
|
||||
implement CI/CD and Giterminism.
|
||||
werf is a CNCF Sandbox CLI tool to implement full-cycle CI/CD to
|
||||
Kubernetes easily. werf integrates into your CI system and leverages
|
||||
familiar and reliable technologies, such as Git, Dockerfile, Helm, and
|
||||
Buildah.
|
||||
'';
|
||||
homepage = "https://werf.io";
|
||||
changelog = "https://github.com/werf/werf/releases/tag/${src.rev}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ azahi ];
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.azahi ];
|
||||
mainProgram = "werf";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -713,7 +713,21 @@ let
|
||||
# FIXME: do we need this after 15?
|
||||
(metadata.getVersionFile "lldb/procfs.patch")
|
||||
]
|
||||
++ lib.optional (lib.versionOlder metadata.release_version "17") resourceDirPatch
|
||||
++ lib.optional (lib.versionOlder metadata.release_version "18") (fetchpatch {
|
||||
name = "libcxx-19-char_traits.patch";
|
||||
url = "https://github.com/llvm/llvm-project/commit/68744ffbdd7daac41da274eef9ac0d191e11c16d.patch";
|
||||
stripLen = 1;
|
||||
hash = "sha256-QCGhsL/mi7610ZNb5SqxjRGjwJeK2rwtsFVGeG3PUGc=";
|
||||
})
|
||||
++ lib.optionals (lib.versionOlder metadata.release_version "17") [
|
||||
resourceDirPatch
|
||||
(fetchpatch {
|
||||
name = "add-cstdio.patch";
|
||||
url = "https://github.com/llvm/llvm-project/commit/73e15b5edb4fa4a77e68c299a6e3b21e610d351f.patch";
|
||||
stripLen = 1;
|
||||
hash = "sha256-eFcvxZaAuBsY/bda1h9212QevrXyvCHw8Cr9ngetDr0=";
|
||||
})
|
||||
]
|
||||
++ lib.optional (lib.versionOlder metadata.release_version "14") (
|
||||
metadata.getVersionFile "lldb/gnu-install-dirs.patch"
|
||||
)
|
||||
|
||||
@@ -127,13 +127,13 @@ stdenv.mkDerivation (rec {
|
||||
|
||||
# TODO: cleanup with mass-rebuild
|
||||
installCheckPhase = ''
|
||||
if [ ! -e $lib/${python3.sitePackages}/lldb/_lldb*.so ] ; then
|
||||
if [ ! -e ''${!outputLib}/${python3.sitePackages}/lldb/_lldb*.so ] ; then
|
||||
echo "ERROR: python files not installed where expected!";
|
||||
return 1;
|
||||
fi
|
||||
'' # Something lua is built on older versions but this file doesn't exist.
|
||||
+ lib.optionalString (lib.versionAtLeast release_version "14") ''
|
||||
if [ ! -e "$lib/lib/lua/${lua5_3.luaversion}/lldb.so" ] ; then
|
||||
if [ ! -e "''${!outputLib}/lib/lua/${lua5_3.luaversion}/lldb.so" ] ; then
|
||||
echo "ERROR: lua files not installed where expected!";
|
||||
return 1;
|
||||
fi
|
||||
|
||||
@@ -2005,7 +2005,6 @@ broken-packages:
|
||||
- ghc-clippy-plugin # failure in job https://hydra.nixos.org/build/233227499 at 2023-09-02
|
||||
- ghc-core-smallstep # failure in job https://hydra.nixos.org/build/233209763 at 2023-09-02
|
||||
- ghc-corroborate # failure in job https://hydra.nixos.org/build/233223692 at 2023-09-02
|
||||
- ghc-datasize # failure in job https://hydra.nixos.org/build/233196292 at 2023-09-02
|
||||
- ghc-definitions-th # failure in job https://hydra.nixos.org/build/233254844 at 2023-09-02
|
||||
- ghc-dump-core # failure in job https://hydra.nixos.org/build/233214478 at 2023-09-02
|
||||
- ghc-dump-tree # failure in job https://hydra.nixos.org/build/233237228 at 2023-09-02
|
||||
@@ -4990,6 +4989,7 @@ broken-packages:
|
||||
- rattle # failure in job https://hydra.nixos.org/build/233234335 at 2023-09-02
|
||||
- rattletrap # failure in job https://hydra.nixos.org/build/233206840 at 2023-09-02
|
||||
- raven-haskell-scotty # failure in job https://hydra.nixos.org/build/233244270 at 2023-09-02
|
||||
- rawr # fails to build after unbreaking ghc-datasize at 2025-01-19
|
||||
- raylib-imgui # failure in job https://hydra.nixos.org/build/233222471 at 2023-09-02
|
||||
- raz # failure in job https://hydra.nixos.org/build/233218482 at 2023-09-02
|
||||
- rbst # failure in job https://hydra.nixos.org/build/233238184 at 2023-09-02
|
||||
|
||||
@@ -3299,7 +3299,6 @@ dont-distribute-packages:
|
||||
- rascal
|
||||
- raw-feldspar
|
||||
- rawlock
|
||||
- rawr
|
||||
- razom-text-util
|
||||
- rbr
|
||||
- rc
|
||||
|
||||
@@ -122152,8 +122152,6 @@ self: {
|
||||
libraryHaskellDepends = [ base deepseq ghc-heap ghc-prim ];
|
||||
description = "Determine the size of data structures in GHC's memory";
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
broken = true;
|
||||
}) {};
|
||||
|
||||
"ghc-debug-brick" = callPackage
|
||||
|
||||
@@ -24,14 +24,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "vector";
|
||||
version = "1.5.2";
|
||||
version = "1.6.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scikit-hep";
|
||||
repo = "vector";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-lj6ZloBGZqHW0g7lCD7m9zvszJceB9TQ3r6B3Xuj5KE=";
|
||||
hash = "sha256-W10j1oQdmJ7GE0dCsAPtIsEPy4L2CIvVEZZqm7aHxII=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -58,16 +58,10 @@ buildPythonPackage rec {
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
disabledTests =
|
||||
[
|
||||
# AssertionError (unclear why)
|
||||
"test_rhophi_eta_tau"
|
||||
"test_xy_eta_tau"
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
|
||||
# AssertionError: assert 2.1073424255447017e-08 == 0.0
|
||||
"test_issue_463"
|
||||
];
|
||||
disabledTests = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
|
||||
# AssertionError: assert 2.1073424255447017e-08 == 0.0
|
||||
"test_issue_463"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Library for 2D, 3D, and Lorentz vectors, especially arrays of vectors, to solve common physics problems in a NumPy-like way";
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "weaviate-client";
|
||||
version = "4.10.2";
|
||||
version = "4.10.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.12";
|
||||
@@ -35,7 +35,7 @@ buildPythonPackage rec {
|
||||
owner = "weaviate";
|
||||
repo = "weaviate-python-client";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-c2ZO5n/sMrq8f1V+MSwv+pYSzPa9cTBHU8INXHcB8gk=";
|
||||
hash = "sha256-I5+xQkGoIFKEniwvK3l3WXB079IzPzwdKVt0JAXK3kU=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
flex,
|
||||
bison,
|
||||
systemd,
|
||||
boost,
|
||||
boost186,
|
||||
openssl,
|
||||
patchelf,
|
||||
mariadb-connector-c,
|
||||
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
boost186
|
||||
openssl
|
||||
systemd
|
||||
] ++ lib.optional withPostgresql libpq;
|
||||
|
||||
@@ -21,10 +21,13 @@ stdenvNoCC.mkDerivation rec {
|
||||
patchShebangs cli/*.php app/actualize_script.php
|
||||
'';
|
||||
|
||||
# the thirdparty_extension_path can only be set by config, but should be read by an env-var.
|
||||
# THIRDPARTY_EXTENSIONS_PATH can only be set by config, but should be read from an env-var.
|
||||
overrideConfig = writeText "constants.local.php" ''
|
||||
<?php
|
||||
define('THIRDPARTY_EXTENSIONS_PATH', getenv('THIRDPARTY_EXTENSIONS_PATH') . '/extensions');
|
||||
$thirdpartyExtensionsPath = getenv('THIRDPARTY_EXTENSIONS_PATH');
|
||||
if (is_string($thirdpartyExtensionsPath) && $thirdpartyExtensionsPath !== "") {
|
||||
define('THIRDPARTY_EXTENSIONS_PATH', $thirdpartyExtensionsPath . '/extensions');
|
||||
}
|
||||
'';
|
||||
|
||||
buildInputs = [ php ];
|
||||
|
||||
@@ -15710,9 +15710,9 @@ with pkgs;
|
||||
|
||||
webcamoid = libsForQt5.callPackage ../applications/video/webcamoid { };
|
||||
|
||||
webcord = callPackage ../by-name/we/webcord/package.nix { electron = electron; };
|
||||
webcord = callPackage ../by-name/we/webcord/package.nix { electron = electron_33; };
|
||||
|
||||
webcord-vencord = callPackage ../by-name/we/webcord-vencord/package.nix { electron = electron_31; };
|
||||
webcord-vencord = callPackage ../by-name/we/webcord-vencord/package.nix { electron = electron_33; };
|
||||
|
||||
webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {
|
||||
stdenv = if stdenv.cc.isClang then gccStdenv else stdenv;
|
||||
|
||||
Reference in New Issue
Block a user