Merge staging-next into staging

This commit is contained in:
nixpkgs-ci[bot]
2025-07-25 12:07:49 +00:00
committed by GitHub
58 changed files with 1042 additions and 3449 deletions
+2 -3
View File
@@ -7047,11 +7047,10 @@
name = "Dzmitry Lahoda";
};
e-v-o-l-v-e = {
name = "Ivanoe Megnin-Preiss";
email = "megninpreiss.ivanoe@gmail.com";
email = "oss@imp-network.com";
github = "e-v-o-l-v-e";
githubId = 84813895;
matrix = "@evolve:matrix.imp-network.com";
name = "Ivanoe Megnin-Preiss";
};
e1mo = {
email = "nixpkgs@e1mo.de";
File diff suppressed because it is too large Load Diff
@@ -43,12 +43,12 @@
};
angular = buildGrammar {
language = "angular";
version = "0.0.0+rev=93bb92f";
version = "0.0.0+rev=d1f24a8";
src = fetchFromGitHub {
owner = "dlvandenberg";
repo = "tree-sitter-angular";
rev = "93bb92f1289b7fe765da6cc747c82ccdc0afeb8d";
hash = "sha256-s6RLY8vGNbA3VHyaRbhE/cbe1T1llhaiZNTiYXkBCQc=";
rev = "d1f24a8890462cb740909ff62a3a079cded288bc";
hash = "sha256-vC4v3uuUdHVUcm33egg3pWIqWSCwCkw5LTyD3ouMdiQ=";
};
meta.homepage = "https://github.com/dlvandenberg/tree-sitter-angular";
};
@@ -66,12 +66,12 @@
};
arduino = buildGrammar {
language = "arduino";
version = "0.0.0+rev=017696b";
version = "0.0.0+rev=1b1fd5d";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-arduino";
rev = "017696bdf47ca2b10948c5a511f9ab387722d0f3";
hash = "sha256-zIs3ujkxfgCj6VBkNy/mobsAQ2mcxtjDMHxiQEMlWm8=";
rev = "1b1fd5dbd196e80342cf79f6fc5de154232c2829";
hash = "sha256-M+X2ofdy3wPUcDELNpjAFLywUG4rTsONQwZp63uYWfE=";
};
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-arduino";
};
@@ -143,12 +143,12 @@
};
beancount = buildGrammar {
language = "beancount";
version = "0.0.0+rev=9bc460a";
version = "0.0.0+rev=b7a2557";
src = fetchFromGitHub {
owner = "polarmutex";
repo = "tree-sitter-beancount";
rev = "9bc460a05b5f096d69568b5fb36105032ff4ff97";
hash = "sha256-MSLM7Or1SZeqj0WzJ26o5cmYa5vWcSbMhDzMkqWRJgE=";
rev = "b7a2557e6c8cf1dc70a52cece1861522ad3903fc";
hash = "sha256-E8FPmskJr1OQ55w52FUi9zub7BTZ6neX3VHypjEyRek=";
};
meta.homepage = "https://github.com/polarmutex/tree-sitter-beancount";
};
@@ -220,12 +220,12 @@
};
brightscript = buildGrammar {
language = "brightscript";
version = "0.0.0+rev=48ce168";
version = "0.0.0+rev=5516826";
src = fetchFromGitHub {
owner = "ajdelcimmuto";
repo = "tree-sitter-brightscript";
rev = "48ce1687125c6dfefcc7a1bef19fa0f0f00426cc";
hash = "sha256-eVHAl8qykIS90SpWHvpT6VEqjKuXCX8zIYlRGlhUm7w=";
rev = "55168264ea174085d2e91377a33f216190df2f51";
hash = "sha256-bZ8zhjfnF47ur2XNEYiGiATqDKAEnONusY/it9jmBBY=";
};
meta.homepage = "https://github.com/ajdelcimmuto/tree-sitter-brightscript";
};
@@ -396,12 +396,12 @@
};
cpp = buildGrammar {
language = "cpp";
version = "0.0.0+rev=2871652";
version = "0.0.0+rev=5cb9b69";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-cpp";
rev = "2871652b9893ab19e621628da03e670227a5d9d0";
hash = "sha256-ZeO+Jjw1/UnLLVvdOpwWVWZtVI910gtMCPK5Kh8dM1U=";
rev = "5cb9b693cfd7bfacab1d9ff4acac1a4150700609";
hash = "sha256-s9/n09EruafAMF3g6xOkfu6L+WXUx83PpcVKn1Tnmg8=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp";
};
@@ -619,12 +619,12 @@
};
editorconfig = buildGrammar {
language = "editorconfig";
version = "0.0.0+rev=9281e7d";
version = "0.0.0+rev=8ed3658";
src = fetchFromGitHub {
owner = "ValdezFOmar";
repo = "tree-sitter-editorconfig";
rev = "9281e7d8522cc0d06b61f97920e27936fa12be11";
hash = "sha256-HUIJQEWenilzGfxFAekqd6A9SXzU4Fe28gdwCme3X8A=";
rev = "8ed36589b5d0b3ebfdba45e1fd0ebefa01aafaea";
hash = "sha256-qNbkfeQ1MVDXsAW7xomUZ+BIqeuNvWZnhSg/e+3gWLM=";
};
meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-editorconfig";
};
@@ -707,12 +707,12 @@
};
enforce = buildGrammar {
language = "enforce";
version = "0.0.0+rev=8e4c841";
version = "0.0.0+rev=a194046";
src = fetchFromGitHub {
owner = "simonvic";
repo = "tree-sitter-enforce";
rev = "8e4c84144153deaf2b8461def43126cea6790020";
hash = "sha256-63zruBKP7aeyJ6SOTMaic/7xXibxuiETdPVqhj1UlfI=";
rev = "a194046e64bdec2c9e2e1a7caa35326387f78b95";
hash = "sha256-5G60pe/nf+7LZeiyyqc+LA955l7sW/Du/piwABxzSFk=";
};
meta.homepage = "https://github.com/simonvic/tree-sitter-enforce";
};
@@ -751,12 +751,12 @@
};
fennel = buildGrammar {
language = "fennel";
version = "0.0.0+rev=de06b9a";
version = "0.0.0+rev=cf7c000";
src = fetchFromGitHub {
owner = "alexmozaidze";
repo = "tree-sitter-fennel";
rev = "de06b9ad366f0186080056109a8c3be980129538";
hash = "sha256-DLwCJcF+zrBX/cZ8rYU97FpMgZlpVsfqLv1bFdwTj3c=";
rev = "cf7c000d934f2ff0a282a2c276b1f72e7fb2a099";
hash = "sha256-HlkgDX+MLlQq7TWRSFHxYR7LuaUtIjWqi25k+0J7XYQ=";
};
meta.homepage = "https://github.com/alexmozaidze/tree-sitter-fennel";
};
@@ -972,12 +972,12 @@
};
gleam = buildGrammar {
language = "gleam";
version = "0.0.0+rev=21e0e7b";
version = "0.0.0+rev=dae1551";
src = fetchFromGitHub {
owner = "gleam-lang";
repo = "tree-sitter-gleam";
rev = "21e0e7ba6f4f60ee80934cb368aa13c00d370734";
hash = "sha256-NJBD/IeJ8V2tuJHuUGwAinldubrRgLlA+4MUD7zyjzA=";
rev = "dae1551a9911b24f41d876c23f2ab05ece0a9d4c";
hash = "sha256-GIikbo8N2bmUa8wddpAgTHeejCInoEY8HxGDbuYq/zQ=";
};
meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam";
};
@@ -1093,12 +1093,12 @@
};
gosum = buildGrammar {
language = "gosum";
version = "0.0.0+rev=e2ac513";
version = "0.0.0+rev=27816eb";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-go-sum";
rev = "e2ac513b2240c7ff1069ae33b2df29ce90777c11";
hash = "sha256-2foA2sd5PQpmeX8OhXrW/dxoJaEyxDXzPWh+UD0dgzQ=";
rev = "27816eb6b7315746ae9fcf711e4e1396dc1cf237";
hash = "sha256-9tPFT0ad68YVmz/R6ia1bQE5AQRBX9ZoPW4inCZIBo4=";
};
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-go-sum";
};
@@ -1126,12 +1126,12 @@
};
gpg = buildGrammar {
language = "gpg";
version = "0.0.0+rev=63e80cf";
version = "0.0.0+rev=50482a3";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-gpg-config";
rev = "63e80cfe1302da9f9c7ee8d9df295f47d7d181bf";
hash = "sha256-W8BglyjX/OytZCACpVi9V/k7A0Q4JaVQV+9NcyqtFsc=";
rev = "50482a322cf1fa00dfe327ef8b00e4607eeeaa1d";
hash = "sha256-LHoFNQP3L1yozgOi0YOnOTmbXBc3H1hXsOB7sFDvSDg=";
};
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-gpg-config";
};
@@ -1168,6 +1168,17 @@
};
meta.homepage = "https://github.com/murtaza64/tree-sitter-groovy";
};
groq = buildGrammar {
language = "groq";
version = "0.0.0+rev=1fa1ab0";
src = fetchFromGitHub {
owner = "ajrussellaudio";
repo = "tree-sitter-groq";
rev = "1fa1ab0eb391a270957e8ad8c731b492e3645649";
hash = "sha256-pKwDiViRuFB+BPfWfOOc/VDPN3qFt9HqMCuLGGSMiOU=";
};
meta.homepage = "https://github.com/ajrussellaudio/tree-sitter-groq";
};
gstlaunch = buildGrammar {
language = "gstlaunch";
version = "0.0.0+rev=549aef2";
@@ -1369,12 +1380,12 @@
};
idl = buildGrammar {
language = "idl";
version = "0.0.0+rev=da50751";
version = "0.0.0+rev=fb1bd48";
src = fetchFromGitHub {
owner = "cathaysia";
repo = "tree-sitter-idl";
rev = "da50751d826030fcf8b1424de9f56cec2a274b38";
hash = "sha256-5FAppUTuPNNrRuLdS4zZMh4xeYDT/JOsQS53u/0nT/0=";
rev = "fb1bd480b84a5b75a0c7a44a8fed45c4fe2d9247";
hash = "sha256-XIPIz4awyRwjldb9K6hb08SNN4f+1GPaKT3I/kWuMSA=";
};
meta.homepage = "https://github.com/cathaysia/tree-sitter-idl";
};
@@ -1446,12 +1457,12 @@
};
javadoc = buildGrammar {
language = "javadoc";
version = "0.0.0+rev=e3420bd";
version = "0.0.0+rev=de50fbe";
src = fetchFromGitHub {
owner = "rmuir";
repo = "tree-sitter-javadoc";
rev = "e3420bd8b3e6fa996348c4bbcf627b812a8c1422";
hash = "sha256-9c6P3Wt6g14f3egr0pG2FMPj9C/d58Fza0Ga4H8mZIU=";
rev = "de50fbed2cc4c83e5fa2ec2d4231496e06d55e32";
hash = "sha256-NFbeqiK1fii/cR5ySOz6bIHCPFL2oJ+yUFGZVdfCiAg=";
};
meta.homepage = "https://github.com/rmuir/tree-sitter-javadoc";
};
@@ -1468,24 +1479,24 @@
};
jinja = buildGrammar {
language = "jinja";
version = "0.0.0+rev=2511019";
version = "0.0.0+rev=129184f";
src = fetchFromGitHub {
owner = "cathaysia";
repo = "tree-sitter-jinja";
rev = "251101981d86ccb2901741eddf3e7cf21567a66d";
hash = "sha256-JbutCmJFKmB1UKIGkEJdiBJOaFmIeea8jK9nhYMkikY=";
rev = "129184fb7bbc2d3e29967002432a869ac3758f2e";
hash = "sha256-+9aVQFi9V4RJtbkL0F48/L+l+myWqE5kM5G5EwHB9G8=";
};
location = "tree-sitter-jinja";
meta.homepage = "https://github.com/cathaysia/tree-sitter-jinja";
};
jinja_inline = buildGrammar {
language = "jinja_inline";
version = "0.0.0+rev=2511019";
version = "0.0.0+rev=129184f";
src = fetchFromGitHub {
owner = "cathaysia";
repo = "tree-sitter-jinja";
rev = "251101981d86ccb2901741eddf3e7cf21567a66d";
hash = "sha256-JbutCmJFKmB1UKIGkEJdiBJOaFmIeea8jK9nhYMkikY=";
rev = "129184fb7bbc2d3e29967002432a869ac3758f2e";
hash = "sha256-+9aVQFi9V4RJtbkL0F48/L+l+myWqE5kM5G5EwHB9G8=";
};
location = "tree-sitter-jinja_inline";
meta.homepage = "https://github.com/cathaysia/tree-sitter-jinja";
@@ -1624,12 +1635,12 @@
};
koto = buildGrammar {
language = "koto";
version = "0.0.0+rev=620ff8a";
version = "0.0.0+rev=2ffc77c";
src = fetchFromGitHub {
owner = "koto-lang";
repo = "tree-sitter-koto";
rev = "620ff8a32143f24f6f8e157bd1836183599d334d";
hash = "sha256-IT9ZgZr2VViD9PyyqZTEmkgLHDD17aYMPx+IznagNAQ=";
rev = "2ffc77c14f0ac1674384ff629bfc207b9c57ed89";
hash = "sha256-uummfcFCsLP73h1ioxNDXQYTVZfZt0RjYCRUJF4cuuI=";
};
meta.homepage = "https://github.com/koto-lang/tree-sitter-koto";
};
@@ -1713,23 +1724,23 @@
};
liquidsoap = buildGrammar {
language = "liquidsoap";
version = "0.0.0+rev=05a5dbb";
version = "0.0.0+rev=4de01f4";
src = fetchFromGitHub {
owner = "savonet";
repo = "tree-sitter-liquidsoap";
rev = "05a5dbb23addd207a295b904e44dbdd321b3b332";
hash = "sha256-8aKDOe77/nLLkhubCoXr4MMvJr/uhR7T6dk7TpMxTOA=";
rev = "4de01f44de2c051c33832ce523cf44690561320d";
hash = "sha256-ibDpFPqdz0WnRaKN0dP1uAPi9W9EWew+kDybuPz1Bow=";
};
meta.homepage = "https://github.com/savonet/tree-sitter-liquidsoap";
};
llvm = buildGrammar {
language = "llvm";
version = "0.0.0+rev=badf46d";
version = "0.0.0+rev=00c5389";
src = fetchFromGitHub {
owner = "benwilliamgraham";
repo = "tree-sitter-llvm";
rev = "badf46daedc7b469f5e849b53f2fb34e881962f1";
hash = "sha256-0rnumtLMKM1g2wcevIowCaawms2ghOQIR96cpRIe5Uc=";
rev = "00c5389a4598e1dce66fbc3b3d34733d308f2751";
hash = "sha256-nRV1DM/UHlVg5bsTeAhwUPX+2DV1sQiusEkC3ncV1xk=";
};
meta.homepage = "https://github.com/benwilliamgraham/tree-sitter-llvm";
};
@@ -1825,12 +1836,12 @@
};
matlab = buildGrammar {
language = "matlab";
version = "0.0.0+rev=d5fd97c";
version = "0.0.0+rev=dfed7b4";
src = fetchFromGitHub {
owner = "acristoffers";
repo = "tree-sitter-matlab";
rev = "d5fd97c7aec0881d3429642a240ad536c74582b9";
hash = "sha256-5SblRAJXzJSEXxiUFnM9vNiJV18sT5dt/NrOHPAix1c=";
rev = "dfed7b4bc548f2c036837c3e7e09cae7d1835289";
hash = "sha256-gKpfNxJXv7KKXbk++Vf9nETwOvmD9Vqd5YAPbh1Wuas=";
};
meta.homepage = "https://github.com/acristoffers/tree-sitter-matlab";
};
@@ -1869,12 +1880,12 @@
};
mlir = buildGrammar {
language = "mlir";
version = "0.0.0+rev=78eb123";
version = "0.0.0+rev=e2818d6";
src = fetchFromGitHub {
owner = "artagnon";
repo = "tree-sitter-mlir";
rev = "78eb123cab8bb0dfaacb6b1ee617ef3fcc29d8b1";
hash = "sha256-H7tMlGt3xB14n2mDksU2K9uh65ioYM1/TU/ce3kNWv0=";
rev = "e2818d616fc43cbbba316723cbd68a53c66a2704";
hash = "sha256-59h3UAk3uWuiMptT+aU8vABn9iVz6ZNscMfy/pwjZ78=";
};
generate = true;
meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
@@ -1958,14 +1969,14 @@
};
nix = buildGrammar {
language = "nix";
version = "0.0.0+rev=cfc53fd";
version = "0.0.0+rev=ea1d87f";
src = fetchFromGitHub {
owner = "cstrahan";
owner = "nix-community";
repo = "tree-sitter-nix";
rev = "cfc53fd287d23ab7281440a8526c73542984669b";
hash = "sha256-eqqneqZqA73McjPZfy7GbUi4ccmDYC5O++Ezt9+lqi4=";
rev = "ea1d87f7996be1329ef6555dcacfa63a69bd55c6";
hash = "sha256-VNOPzeyhh/0jHzK0bwEX1kwSIUGoSlCXGhgjHbYvWKk=";
};
meta.homepage = "https://github.com/cstrahan/tree-sitter-nix";
meta.homepage = "https://github.com/nix-community/tree-sitter-nix";
};
nqc = buildGrammar {
language = "nqc";
@@ -1980,12 +1991,12 @@
};
nu = buildGrammar {
language = "nu";
version = "0.0.0+rev=6810930";
version = "0.0.0+rev=6544c43";
src = fetchFromGitHub {
owner = "nushell";
repo = "tree-sitter-nu";
rev = "6810930d133af12aed8fe4557935b635934ab61a";
hash = "sha256-5LcREDBKFGiFSuziEYQ9RKnHkwR/qKijmW5dSrrxGhA=";
rev = "6544c4383643cf8608d50def2247a7af8314e148";
hash = "sha256-+KsRkfx0WmcfYBP7zxXqL8kPm/HsBjuI56/v910kMFU=";
};
meta.homepage = "https://github.com/nushell/tree-sitter-nu";
};
@@ -2082,12 +2093,12 @@
};
pem = buildGrammar {
language = "pem";
version = "0.0.0+rev=1d16b8e";
version = "0.0.0+rev=7374eab";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-pem";
rev = "1d16b8e063fdf4385e389096c4bc4999eaaef05f";
hash = "sha256-NhiSqaLjzEJHj8JimFdcZBVAR00lKf9O5JLtwIUCKhw=";
rev = "7374eab76f2caae02396721850f87af437b66c06";
hash = "sha256-goD7j8UmWgBBiOMaJ9E1tiwB4CSBoiUo6wKakEerGDI=";
};
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-pem";
};
@@ -2148,6 +2159,17 @@
};
meta.homepage = "https://github.com/leo60228/tree-sitter-pioasm";
};
pkl = buildGrammar {
language = "pkl";
version = "0.0.0+rev=4fc94a1";
src = fetchFromGitHub {
owner = "apple";
repo = "tree-sitter-pkl";
rev = "4fc94a102c25ea383d70397dac7e677ca3731f1e";
hash = "sha256-imA4+NuJ3XmVA8qfa7pkrQGBsbrNCgLNSuIFh0DsqmY=";
};
meta.homepage = "https://github.com/apple/tree-sitter-pkl";
};
po = buildGrammar {
language = "po";
version = "0.0.0+rev=bd860a0";
@@ -2205,12 +2227,12 @@
};
printf = buildGrammar {
language = "printf";
version = "0.0.0+rev=df6b699";
version = "0.0.0+rev=ec4e567";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-printf";
rev = "df6b69967db7d74ab338a86a9ab45c0966c5ee3c";
hash = "sha256-54yEvxL6u+Mya4INj1AIb1ldYv1WdQV55z8+wgKdthc=";
rev = "ec4e5674573d5554fccb87a887c97d4aec489da7";
hash = "sha256-JddrO4H7b3f/jrYag1lTAqeCzspf18SiIsVV2EJ25ZY=";
};
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-printf";
};
@@ -2262,12 +2284,12 @@
};
properties = buildGrammar {
language = "properties";
version = "0.0.0+rev=579b62f";
version = "0.0.0+rev=6310671";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-properties";
rev = "579b62f5ad8d96c2bb331f07d1408c92767531d9";
hash = "sha256-4WgGbU6fthFH1DcvlQiqNGXucCfxA+hANZ7Y+r8eXHg=";
rev = "6310671b24d4e04b803577b1c675d765cbd5773b";
hash = "sha256-LRutvpXXVK7z+xrnLQVvLY+VRg8IB/VK572PNgvsQfc=";
};
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-properties";
};
@@ -2340,12 +2362,12 @@
};
pymanifest = buildGrammar {
language = "pymanifest";
version = "0.0.0+rev=be06258";
version = "0.0.0+rev=debbdb8";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-pymanifest";
rev = "be062582956165019d3253794b4d712f66dfeaaa";
hash = "sha256-Kud/E67Sh9F4nc8nzW5UXFHW5+kGftLyFzwLOKLcpL8=";
rev = "debbdb83fe6356adc7261c41c69b45ba49c97294";
hash = "sha256-jaWi0F9ApUSwniN3O7x05VrCceL+0x2+98iJx9+PaZo=";
};
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-pymanifest";
};
@@ -2716,12 +2738,12 @@
};
slint = buildGrammar {
language = "slint";
version = "0.0.0+rev=03f24aa";
version = "0.0.0+rev=96bc969";
src = fetchFromGitHub {
owner = "slint-ui";
repo = "tree-sitter-slint";
rev = "03f24aa22d6712f79004286df6dd416ca6d2a91d";
hash = "sha256-cMiC5wTKXIxMBbIVChfisM8FTsYL11kQ6fpryDjFlIs=";
rev = "96bc969d20ff347030519184ea2467f4046a524d";
hash = "sha256-yTZxuA3Bco0Cv+kZ1VbfQZbIu12Y5N4b3HIUJ/PBpWA=";
};
meta.homepage = "https://github.com/slint-ui/tree-sitter-slint";
};
@@ -2894,12 +2916,12 @@
};
superhtml = buildGrammar {
language = "superhtml";
version = "0.0.0+rev=0b9bd0e";
version = "0.0.0+rev=a67317f";
src = fetchFromGitHub {
owner = "kristoff-it";
repo = "superhtml";
rev = "0b9bd0e8fd6284c0cfca85f7997535fe7f051046";
hash = "sha256-LydAGMEcUhT87SvD5WtmMMHtQG+x6dVoWmHJnat3jzw=";
rev = "a67317fb81afe76cc04e6d92124cfc20a903cee7";
hash = "sha256-Timo86R0nIktTThut1AlNzawnb5r3rddxY1VObdVSVE=";
};
location = "tree-sitter-superhtml";
meta.homepage = "https://github.com/kristoff-it/superhtml";
@@ -2973,23 +2995,23 @@
};
systemverilog = buildGrammar {
language = "systemverilog";
version = "0.0.0+rev=0dc5d86";
version = "0.0.0+rev=140a6d9";
src = fetchFromGitHub {
owner = "gmlarumbe";
repo = "tree-sitter-systemverilog";
rev = "0dc5d86af86120094d9f1268613b529142212ddd";
hash = "sha256-tFj6khM98KQ8022S/YA6i4hDYrAbsEBuKF7M3mjfcGg=";
rev = "140a6d96aa753f550d01c0d6c95dbf7c0cfae3fb";
hash = "sha256-YR5drmlt7+6D9jc6k0xIC04Y8ap3X51+AA6RIEfYIZw=";
};
meta.homepage = "https://github.com/gmlarumbe/tree-sitter-systemverilog";
};
t32 = buildGrammar {
language = "t32";
version = "0.0.0+rev=412cf98";
version = "0.0.0+rev=335e553";
src = fetchFromGitLab {
owner = "xasc";
repo = "tree-sitter-t32";
rev = "412cf98b2784dfe9c95ce0d7de840605c6953417";
hash = "sha256-BzKKBZyg/ezg2AauxNbvPP4LGtoeyKQdRbHRDldLDWc=";
rev = "335e5533de72a4ac8c6763958df1befbdc855a30";
hash = "sha256-6GO3B5Llr/89bQs9Vv7JA5xo7Gbw72PHqlxZonx8MU0=";
};
meta.homepage = "https://gitlab.com/xasc/tree-sitter-t32";
};
@@ -3051,12 +3073,12 @@
};
tera = buildGrammar {
language = "tera";
version = "0.0.0+rev=53ca910";
version = "0.0.0+rev=692937d";
src = fetchFromGitHub {
owner = "uncenter";
repo = "tree-sitter-tera";
rev = "53ca9100f231b72474225d98c9e53d1a4275046d";
hash = "sha256-9D/isIoLE4Fis3ry2zbj7OvceMvNDXVd6pw0pn12hJI=";
rev = "692937d52c8dfd91ce0dde722b9b4febbc9bc712";
hash = "sha256-3ZUark8lSH8mJwuLcvJPiQnE7+rlXstKkTPjvHzsE38=";
};
meta.homepage = "https://github.com/uncenter/tree-sitter-tera";
};
@@ -3186,12 +3208,12 @@
};
twig = buildGrammar {
language = "twig";
version = "0.0.0+rev=085648e";
version = "0.0.0+rev=7195ee5";
src = fetchFromGitHub {
owner = "gbprod";
repo = "tree-sitter-twig";
rev = "085648e01d1422163a1702a44e72303b4e2a0bd1";
hash = "sha256-87jFYAAnblTeEdlXqTjyiiNee/OgasPam1b2xyKQIHY=";
rev = "7195ee573ab5c3b3bb0e91b042e6f83ac1b11104";
hash = "sha256-wQ5pHFU35wqT3UxHIZ/cP8RPPX+mpGQCoBr9ilRfc4w=";
};
meta.homepage = "https://github.com/gbprod/tree-sitter-twig";
};
@@ -3242,12 +3264,12 @@
};
udev = buildGrammar {
language = "udev";
version = "0.0.0+rev=18a1d18";
version = "0.0.0+rev=2fcb563";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-udev";
rev = "18a1d183c4c0cc40438bae2ebf8191aaf2dee8dc";
hash = "sha256-ySo+vS+il1tmTPZ6OJMduyJxsjjI3eIkYSMYs10Bcnk=";
rev = "2fcb563a4d56a6b8e8c129252325fc6335e4acbf";
hash = "sha256-EZwYyhMOPlQoeIRCbHOIfMaO5WEK6eKIVeC1NQgm+is=";
};
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-udev";
};
@@ -3332,12 +3354,12 @@
};
vhdl = buildGrammar {
language = "vhdl";
version = "0.0.0+rev=eacafa5";
version = "0.0.0+rev=73ff9d3";
src = fetchFromGitHub {
owner = "jpt13653903";
repo = "tree-sitter-vhdl";
rev = "eacafa5d612fdea1d12332fe0f83e089e5571cf3";
hash = "sha256-vASRBGtcsqH8LqmSh/UVTsyr6ndpVQQhLn1tnIQxTAw=";
rev = "73ff9d3e7bc42b8cc123bf5f0b2db12a900ee9b7";
hash = "sha256-8Fp/x3TC+bq4nJdbeVdBrnz7QnBSD1sc5CC0TRh0mGc=";
};
meta.homepage = "https://github.com/jpt13653903/tree-sitter-vhdl";
};
@@ -3354,12 +3376,12 @@
};
vim = buildGrammar {
language = "vim";
version = "0.0.0+rev=a93e834";
version = "0.0.0+rev=3dd4747";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-vim";
rev = "a93e834bea0975ec0ccb3f6d18540e9bd8170a4d";
hash = "sha256-LMQhbSScd9uFRmVun/c3hatmbDgXurDmRfMNgSQu7xI=";
rev = "3dd4747082d1b717b8978211c06ef7b6cd16125b";
hash = "sha256-HOf35dd+zcpXHxFuWjJ6ju/5UZzALe0fUPPuAWXUIHM=";
};
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-vim";
};
@@ -3442,12 +3464,12 @@
};
xcompose = buildGrammar {
language = "xcompose";
version = "0.0.0+rev=fff3e72";
version = "0.0.0+rev=a51d636";
src = fetchFromGitHub {
owner = "tree-sitter-grammars";
repo = "tree-sitter-xcompose";
rev = "fff3e72242aa110ebba6441946ea4d12d200fa68";
hash = "sha256-PNg1z+7CuvpQdksKJOCQ59dZrv4PORdYo6CSw3GrBtk=";
rev = "a51d6366f041dbefec4da39a7eb3168a9b1cbc0e";
hash = "sha256-3V+elXkVBk2aZnDy5Q/MDpBWEWb/mvjh2t2pnjnzgA0=";
};
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xcompose";
};
@@ -3465,12 +3487,12 @@
};
xresources = buildGrammar {
language = "xresources";
version = "0.0.0+rev=db9bf1a";
version = "0.0.0+rev=b0822f2";
src = fetchFromGitHub {
owner = "ValdezFOmar";
repo = "tree-sitter-xresources";
rev = "db9bf1aeca3e54dd390ae1d3994c665ca7ef5fa2";
hash = "sha256-tp14NEo4KhiBTIgGGVNxhlwXuspi0bH9EaRzj9xfG2s=";
rev = "b0822f2ea47600c6e11ee64b2dec8353c9684e8d";
hash = "sha256-fO0MtUEg3he+DbJcdZQpkdvRcBOmiHw5d+4Cn5E5erA=";
};
meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-xresources";
};
@@ -3531,12 +3553,12 @@
};
ziggy = buildGrammar {
language = "ziggy";
version = "0.0.0+rev=eeb21ac";
version = "0.0.0+rev=de70337";
src = fetchFromGitHub {
owner = "kristoff-it";
repo = "ziggy";
rev = "eeb21acc0a369dca503167fe963f4f5a7eda2659";
hash = "sha256-5gW1hpJcnayA6veLWCiksGpfZBZX3UsQmYC4XlZRaEo=";
rev = "de703372b2da6fd2c25a8a3c424663ff6bece4ac";
hash = "sha256-O4IV9V+Xn1DL/gZ7UoAKZTtlv/QToRsmJizQwQZZRqc=";
};
location = "tree-sitter-ziggy";
meta.homepage = "https://github.com/kristoff-it/ziggy";
@@ -2823,6 +2823,13 @@ in
otter-nvim = super.otter-nvim.overrideAttrs {
dependencies = [ self.nvim-lspconfig ];
nvimSkipModules = [
# requires config setup
"otter.keeper"
"otter.lsp.handlers"
"otter.lsp.init"
"otter.diagnostics"
];
};
outline-nvim = super.outline-nvim.overrideAttrs {
@@ -2949,6 +2956,15 @@ in
];
};
python-mode = super.python-mode.overrideAttrs {
postPatch = ''
# NOTE: Fix broken symlink - the pytoolconfig directory was moved to src/
# https://github.com/python-mode/python-mode/pull/1189#issuecomment-3109528360
rm -f pymode/libs/pytoolconfig
ln -sf ../../submodules/pytoolconfig/src/pytoolconfig pymode/libs/pytoolconfig
'';
};
pywal-nvim = super.pywal-nvim.overrideAttrs {
# Optional feline integration
nvimSkipModules = "pywal.feline";
@@ -2977,9 +2993,9 @@ in
nvim-lspconfig
otter-nvim
];
};
quicker-nvim = super.quicker-nvim.overrideAttrs {
nvimSkipModules = [
"quarto.runner.init"
];
};
range-highlight-nvim = super.range-highlight-nvim.overrideAttrs {
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "mednafen-pce-fast";
version = "0-unstable-2025-06-27";
version = "0-unstable-2025-07-18";
src = fetchFromGitHub {
owner = "libretro";
repo = "beetle-pce-fast-libretro";
rev = "04a6f2e85c7b4e79bb1bb402a8ea7d8f55132ad3";
hash = "sha256-xA2owDEe9o0+roxZ+GBM4LD7sBDGC9ZY5atwWVA8HC8=";
rev = "71675959c7df0f4235a90e6eeb271bf7c1bde019";
hash = "sha256-4pHPNRc34IEj+4YkKsXuUWK5yZri3+AJasn0aSOpfYY=";
};
makefile = "Makefile";
+12 -7
View File
@@ -5,14 +5,15 @@
autoreconfHook,
fetchurl,
fetchpatch,
directoryListingUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "alsa-firmware";
version = "1.2.4";
src = fetchurl {
url = "mirror://alsa/firmware/alsa-firmware-${version}.tar.bz2";
url = "mirror://alsa/firmware/alsa-firmware-${finalAttrs.version}.tar.bz2";
hash = "sha256-tnttfQi8/CR+9v8KuIqZwYgwWjz1euLf0LzZpbNs1bs=";
};
@@ -47,11 +48,15 @@ stdenv.mkDerivation rec {
rm -rf $out/bin
'';
meta = with lib; {
passthru.updateScript = directoryListingUpdater {
url = "https://alsa-project.org/files/pub/firmware/";
};
meta = {
homepage = "http://www.alsa-project.org/";
description = "Soundcard firmwares from the alsa project";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ l-as ];
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ l-as ];
};
}
})
+11 -5
View File
@@ -5,6 +5,7 @@
alsa-topology-conf,
alsa-ucm-conf,
testers,
directoryListingUpdater,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -36,9 +37,14 @@ stdenv.mkDerivation (finalAttrs: {
"dev"
];
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
passthru = {
tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
updateScript = directoryListingUpdater {
url = "https://www.alsa-project.org/files/pub/lib/";
};
};
meta = with lib; {
meta = {
homepage = "http://www.alsa-project.org/";
description = "ALSA, the Advanced Linux Sound Architecture libraries";
mainProgram = "aserver";
@@ -48,12 +54,12 @@ stdenv.mkDerivation (finalAttrs: {
MIDI functionality to the Linux-based operating system.
'';
license = licenses.lgpl21Plus;
license = lib.licenses.lgpl21Plus;
pkgConfigModules = [
"alsa"
"alsa-topology"
];
platforms = platforms.linux ++ platforms.freebsd;
maintainers = with maintainers; [ l-as ];
platforms = with lib.platforms; linux ++ freebsd;
maintainers = with lib.maintainers; [ l-as ];
};
})
+12 -7
View File
@@ -9,14 +9,15 @@
libogg,
libpulseaudio,
speexdsp,
directoryListingUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "alsa-plugins";
version = "1.2.12";
src = fetchurl {
url = "mirror://alsa/plugins/alsa-plugins-${version}.tar.bz2";
url = "mirror://alsa/plugins/alsa-plugins-${finalAttrs.version}.tar.bz2";
hash = "sha256-e9ioPTBOji2GoliV2Nyw7wJFqN8y4nGVnNvcavObZvI=";
};
@@ -31,11 +32,15 @@ stdenv.mkDerivation rec {
speexdsp
];
meta = with lib; {
passthru.updateScript = directoryListingUpdater {
url = "https://alsa-project.org/files/pub/plugins/";
};
meta = {
description = "Various plugins for ALSA";
homepage = "http://alsa-project.org/";
license = licenses.lgpl21;
maintainers = [ maintainers.marcweber ];
platforms = platforms.linux;
license = lib.licenses.lgpl21;
maintainers = [ lib.maintainers.marcweber ];
platforms = lib.platforms.linux;
};
}
})
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "api-linter";
version = "1.70.0";
version = "1.70.1";
src = fetchFromGitHub {
owner = "googleapis";
repo = "api-linter";
tag = "v${version}";
hash = "sha256-1OBsNuQuCxm+79K29NBwJ0Mj+kLiSEQSZk6Ovrh5sQY=";
hash = "sha256-Jztu8xQWLeJVSk+yx3julu0wkQNpgQtzZvrKP71T7Eg=";
};
vendorHash = "sha256-WfSr70YA6klj3iNQl1mLzpzJGGvybfFPkxaB4jBdsTg=";
vendorHash = "sha256-wIZdL393uPVqz0rJV5NU6SHm8RU5orrHREhKbjBHTYU=";
subPackages = [ "cmd/api-linter" ];
@@ -26,9 +26,9 @@
azure-devops = mkAzExtension rec {
pname = "azure-devops";
version = "1.0.1";
url = "https://github.com/Azure/azure-devops-cli-extension/releases/download/20240206.1/azure_devops-${version}-py2.py3-none-any.whl";
hash = "sha256-ZYooVNjID4dPk4LUIfpFq/ajjQAzRzfdoAb43sZM9wo=";
version = "1.0.2";
url = "https://github.com/Azure/azure-cli-extensions/releases/download/azure-devops-${version}/azure_devops-${version}-py2.py3-none-any.whl";
hash = "sha256-4rDeAqOnRRKMP26MJxG4u9vBuos6/SQIoVgfNbBpulk=";
description = "Tools for managing Azure DevOps";
propagatedBuildInputs = with python3Packages; [ distro ];
meta.maintainers = with lib.maintainers; [ katexochen ];
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "bazel-remote";
version = "2.5.1";
version = "2.5.2";
src = fetchFromGitHub {
owner = "buchgr";
repo = "bazel-remote";
rev = "v${version}";
hash = "sha256-PjhLybiZoq7Uies2bWdlLKAbKcG3+AQZ55Qp706u7hc=";
hash = "sha256-qsNIfl3Y+2MaflTCL+uKV1T6tMe1AFIt+fOz/bB3EEQ=";
};
vendorHash = "sha256-okXGqPN/Do7Ht3zW8jVWo+8YquUEqNhirr9pPqMelmk=";
vendorHash = "sha256-cZe1jFJZnZy960lyV3nMO0+ZotwjMn1tSyeFj05tZao=";
subPackages = [ "." ];
+3 -3
View File
@@ -6,17 +6,17 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-expand";
version = "1.0.113";
version = "1.0.114";
src = fetchFromGitHub {
owner = "dtolnay";
repo = "cargo-expand";
rev = version;
hash = "sha256-u5AQR0kMTNb6x1x7rvtF1jCne9Nqbkl7oiD9rkwhdRE=";
hash = "sha256-blq/5ObzHxYjNx0TPiuF1OuDPHNDBV7jBkt1r+ISnVE=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-TdzccMtXp5/KeYiO+vdukMO3hllBNeZAtO66eAUdbgA=";
cargoHash = "sha256-HNmmu9TF7p94bRF/IsStIE5XPdcUM6d505G+wbFNTls=";
meta = {
description = "Cargo subcommand to show result of macro expansion";
@@ -64,8 +64,6 @@ let
license = lib.licenses.gpl3Only;
mainProgram = "clash-verge";
maintainers = with lib.maintainers; [
Guanran928
bot-wxt1221
hhr2020
];
platforms = lib.platforms.linux;
+3 -3
View File
@@ -6,18 +6,18 @@
buildGoModule rec {
pname = "cnquery";
version = "11.60.0";
version = "11.64.0";
src = fetchFromGitHub {
owner = "mondoohq";
repo = "cnquery";
tag = "v${version}";
hash = "sha256-Vu7UfTinjuyc49Kb5GW8uXrP5/bszGt9ktxilGDqY0M=";
hash = "sha256-olfkzuAgXjlxDQCaLqnu6V9tenFjBBYvIzxuo2phtns=";
};
subPackages = [ "apps/cnquery" ];
vendorHash = "sha256-5vNLaOG4vYgetiQLRIzFkrlFgH6Dwa/VHCv0HWWow30=";
vendorHash = "sha256-b+E8thljWxRwbBca2TdTINQERnOvfQncSEJ0+Nxuk8M=";
ldflags = [
"-w"
+15 -9
View File
@@ -18,6 +18,7 @@
pkg-config,
bash-completion,
help2man,
nix-update-script,
sendmailPath ? "/run/wrappers/bin/sendmail",
}:
@@ -29,14 +30,14 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "debian-devscripts";
version = "2.25.15";
version = "2.25.16";
src = fetchFromGitLab {
domain = "salsa.debian.org";
owner = "debian";
repo = "devscripts";
tag = "v${finalAttrs.version}";
hash = "sha256-s2QSfJyHsFr1eiia/yFj3jsS5k38xNewEe/g5PFpqag=";
hash = "sha256-cbaG7yNZt+205fa6HGEjLOjLsW3HloLQHvcGGjmnXDM=";
};
patches = [
@@ -51,10 +52,13 @@ stdenv.mkDerivation (finalAttrs: {
substituteInPlace scripts/debrebuild.pl \
--replace-fail "/usr/bin/perl" "${perlPackages.perl}/bin/perl"
patchShebangs scripts
''
+
# Remove man7 target to avoid missing *.7 file error
substituteInPlace doc/Makefile \
--replace-fail " install_man7" ""
'';
''
substituteInPlace doc/Makefile \
--replace-fail " install_man7" ""
'';
nativeBuildInputs = [
makeWrapper
@@ -95,11 +99,11 @@ stdenv.mkDerivation (finalAttrs: {
mkdir -p "$tgtpy"
export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$tgtpy"
find lib po4a scripts -type f -exec sed -r \
-e "s@/usr/bin/gpg(2|)@${gnupg}/bin/gpg@g" \
-e "s@/usr/bin/gpg(2|)@${lib.getExe' gnupg "gpg"}@g" \
-e "s@/usr/(s|)bin/sendmail@${sendmailPath}@g" \
-e "s@/usr/bin/diff@${diffutils}/bin/diff@g" \
-e "s@/usr/bin/gpgv(2|)@${gnupg}/bin/gpgv@g" \
-e "s@(command -v|/usr/bin/)curl@${curl.bin}/bin/curl@g" \
-e "s@/usr/bin/diff@${lib.getExe' diffutils "diff"}@g" \
-e "s@/usr/bin/gpgv(2|)@${lib.getExe' gnupg "gpgv"}@g" \
-e "s@(command -v|/usr/bin/)curl@${lib.getExe curl}@g" \
-e "s@sensible-editor@${sensible-editor}@g" \
-e "s@(^|\W)/bin/bash@\1${stdenv.shell}@g" \
-i {} +
@@ -131,6 +135,8 @@ stdenv.mkDerivation (finalAttrs: {
ln -s pts-subscribe $out/bin/pts-unsubscribe
'';
passthru.updateScript = nix-update-script { };
meta = {
description = "Debian package maintenance scripts";
license = lib.licenses.free; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... TODO
+93 -75
View File
@@ -16,15 +16,11 @@ with lib;
let
unpackZigArtifact =
{ name, artifact }:
runCommandLocal name
{
nativeBuildInputs = [ zig ];
}
''
hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})"
mv "$TMPDIR/p/$hash" "$out"
chmod 755 "$out"
'';
runCommandLocal name { nativeBuildInputs = [ zig ]; } ''
hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})"
mv "$TMPDIR/p/$hash" "$out"
chmod 755 "$out"
'';
fetchZig =
{
@@ -42,13 +38,12 @@ let
name,
url,
hash,
rev ? throw "rev is required, remove and regenerate the zon2json-lock file",
}:
let
parts = splitString "#" url;
url_base = elemAt parts 0;
url_without_query = elemAt (splitString "?" url_base) 0;
rev_base = elemAt parts 1;
rev = if match "^[a-fA-F0-9]{40}$" rev_base != null then rev_base else "refs/heads/${rev_base}";
in
fetchgit {
inherit name rev hash;
@@ -61,20 +56,25 @@ let
name,
url,
hash,
}:
...
}@args:
let
parts = splitString "://" url;
proto = elemAt parts 0;
path = elemAt parts 1;
fetcher = {
"git+http" = fetchGitZig {
inherit name hash;
url = "http://${path}";
};
"git+https" = fetchGitZig {
inherit name hash;
url = "https://${path}";
};
"git+http" = fetchGitZig (
args
// {
url = "http://${path}";
}
);
"git+https" = fetchGitZig (
args
// {
url = "https://${path}";
}
);
http = fetchZig {
inherit name hash;
url = "http://${path}";
@@ -89,31 +89,31 @@ let
in
linkFarm name [
{
name = "1220930a42f8da3fb7f723e3ad3f6dcc6db76327dd8d26274566423192d53e91b2bb";
name = "N-V-__8AANMzUiemOR2eNnrtlMmAGHFqij6VYtDUiaFfn6Dw";
path = fetchZigArtifact {
name = "tree_sitter";
url = "https://github.com/neurocyte/tree-sitter/releases/download/master-1c3ad59bd98ee430b166054030dac4c46d641e39/source.tar.gz";
hash = "sha256-pIgKBT8RUAS4oeaSot9Rvy4FpYVHeG3oeaBM0rsJg+k=";
};
}
{
name = "cbor-1.0.0-RcQE_HvqAACcrLH7t3IDZOshgY2xqJA_UX330MvwSepb";
path = fetchZigArtifact {
name = "cbor";
url = "https://github.com/neurocyte/cbor/archive/1fccb83c70cd84e1dff57cc53f7db8fb99909a94.tar.gz";
hash = "sha256-c0wlwa+jdqC2b2CfbLsb/l3vXVBnK7WkzUH7F49xqic=";
};
}
{
name = "flags-0.8.0-AAAAAJV0AACuGBBnpUnHqZzAhoGTp4ibFROBQQQZGRqx";
path = fetchZigArtifact {
name = "flags";
url = "https://github.com/n0s4/flags/archive/b3905aa990719ff567f1c5a2f89e6dd3292d8533.tar.gz";
hash = "sha256-2lN2goQgjU5Hf18tvDV/csS83A20nA9Iu2/fKXtpZok=";
url = "https://github.com/n0s4/flags/archive/372501d1576b5723829bcba98e41361132c7b618.tar.gz";
hash = "sha256-PBwUqM4wTYwKyY584K0MPo5aorYflYrYi1dJm8zwI2Y=";
};
}
{
name = "1220d0fb2bff7b453dbb39d1db3eb472b6680e2564f2b23b0e947671be47bbdd188f";
path = fetchZigArtifact {
name = "tracy";
url = "https://github.com/neurocyte/zig-tracy/archive/e04e31c64498149a324491b8534758e6af43a5c2.tar.gz";
hash = "sha256-otvs9tKc8zMRFng0VJDn5iNf7lvbozjrtH0q8IFnP0w=";
};
}
{
name = "122051b30656170b4628580e571d98b1fe45d7c0d581bc2d45e894c75c6376294ede";
path = fetchZigArtifact {
name = "tracy_src";
url = "https://github.com/neurocyte/tracy/archive/0ff0a1b324f497cf313a445637b7df25aabefb47.tar.gz";
hash = "sha256-dzMilJsOSdjNyvhyDb1v5dPWcR5uvhnQmsBynAJH74I=";
};
}
{
name = "1220220dbc7fe91c1c54438193ca765cebbcb7d58f35cdcaee404a9d2245a42a4362";
name = "dizzy-1.0.0-AAAAAM1wAAAiDbx_6RwcVEOBk8p2XOu8t9WPNc3K7kBK";
path = fetchZigArtifact {
name = "dizzy";
url = "https://github.com/neurocyte/dizzy/archive/455d18369cbb2a0458ba70be919cd378338d695e.tar.gz";
@@ -121,83 +121,101 @@ linkFarm name [
};
}
{
name = "1220bbfd147f41fa49d2e5406096f3529c62e9335f4d2a89ae381e679a76ce398f1f";
name = "thespian-0.0.1-owFOjlgaBgCqc3FCnB4Xyg8-9jyIDWgHSJMGx_nt5Kcc";
path = fetchZigArtifact {
name = "thespian";
url = "https://github.com/neurocyte/thespian/archive/db3ad5f45e707a04eaa51aa657995abe43ce967a.tar.gz";
hash = "sha256-La5pv08xPAnkNxBHjpTmLpKxrcifRFWcqm8NYp92iRA=";
url = "https://github.com/neurocyte/thespian/archive/ccdcbbff09f945eec063ebf889581db3e1312107.tar.gz";
hash = "sha256-qY/9CVgD6btprY4alo5/21EBJ9ORIivlcKY8wPPHa4k=";
};
}
{
name = "1220c85e0d9438ec518849c84e3ea66633a0e191e49c4ae4bbb3bc46626cd8dfad75";
name = "cbor-1.0.0-RcQE_GDyAABovyRXoYFX8zD_NVOLGDc9l5g09-W-svMR";
path = fetchZigArtifact {
name = "cbor";
url = "https://github.com/neurocyte/cbor/archive/5ea4b7319146f29bb1aa9acf65982feaba9edc3d.tar.gz";
hash = "sha256-0QN34UG28U3lnlb9sVWV6otrpHBN2Kv2GZwZ3BYz2GQ=";
};
}
{
name = "asio-1.30.2-tLhDdyKA4QBqQFDrsuK_hO1HfqX-DQMl-Sku7yy4vUfM";
path = fetchZigArtifact {
name = "asio";
url = "https://github.com/neurocyte/asio/archive/b9c9c23ef2e6f11b6123535ec33e5a23ed0c59da.tar.gz";
hash = "sha256-tD9lxE6RRAptBE9suZA4ANpT5x/B3e4YINay9Se78XY=";
url = "https://github.com/neurocyte/asio/archive/24d28864ec5aae6146d88a172288e3bf3f099734.tar.gz";
hash = "sha256-CPU+Ka5V+2ooaY8kfKM9q1AjJ11rujHFFnCjyn5hZFo=";
};
}
{
name = "1220e4f3baf09dc23e48616f7dbf00bd45c3034faa2eddede7bb45ef4c23a19b962b";
name = "zig_tracy-0.0.3-5-cp3JZ2AAC6j-gWFhPKXyF6WASJpCzQeNy7Bi712t1a";
path = fetchZigArtifact {
name = "tracy";
url = "https://github.com/neurocyte/zig-tracy/archive/82f18a661af17089198fb7c489ef253f02b939b5.tar.gz";
hash = "sha256-87iK+rmBvZY70c8ypqgtRgw5YWoahZ0ss+0HDzdQgaM=";
};
}
{
name = "N-V-__8AAO2QjgFRswZWFwtGKFgOVx2Ysf5F18DVgbwtReiU";
path = fetchZigArtifact {
name = "tracy_src";
url = "https://github.com/neurocyte/tracy/archive/0ff0a1b324f497cf313a445637b7df25aabefb47.tar.gz";
hash = "sha256-dzMilJsOSdjNyvhyDb1v5dPWcR5uvhnQmsBynAJH74I=";
};
}
{
name = "N-V-__8AAJiAIgDMVIi8CRb_xko9_qVQ-UiQzd5FTBBr0aPa";
path = fetchZigArtifact {
name = "themes";
url = "https://github.com/neurocyte/flow-themes/releases/download/master-8b79cf6d79373c142393ec26a81b19f4701f4372/flow-themes.tar.gz";
hash = "sha256-xy0cTVc85U6JpI+oca2XKXE7GAs0EId21DeQCDa8+n0=";
url = "https://github.com/neurocyte/flow-themes/releases/download/master-952f9f630ea9544088fd30293666ee0650b7a690/flow-themes.tar.gz";
hash = "sha256-yFgIYMmdYoqnysAZ4MaawFAtAJk0ktXXD0IR287LTYw=";
};
}
{
name = "122019f077d09686b1ec47928ca2b4bf264422f3a27afc5b49dafb0129a4ceca0d01";
name = "fuzzig-0.1.1-AAAAALNIAQBmbHr-MPalGuR393Vem2pTQXI7_LXeNJgX";
path = fetchZigArtifact {
name = "fuzzig";
url = "https://github.com/fjebaker/fuzzig/archive/0fd156d5097365151e85a85eef9d8cf0eebe7b00.tar.gz";
hash = "sha256-XVOKqHX2X8HvRDJgnqVEPN/A0hFvCk8Fgsss0CKInYQ=";
url = "https://github.com/fjebaker/fuzzig/archive/44c04733c7c0fee3db83672aaaaf4ed03e943156.tar.gz";
hash = "sha256-wGcJpiW0unNSgX5i9sNuUyqKVFDECcadN7dgbx/SKVg=";
};
}
{
name = "12207e33747072d878fce61f587c133124dc95f4ae8aab7d2b3f467699586af07c77";
name = "vaxis-0.1.0-BWNV_HwOCQCw5wTV63hQGSc1QJzsNcytH6sGf1GBc0hP";
path = fetchZigArtifact {
name = "vaxis";
url = "https://github.com/neurocyte/libvaxis/archive/d899244bc0a3775b59c18e90eb41acee11675f96.tar.gz";
hash = "sha256-8bK0zM6rD/mqTaHDZKMgS3+qV1VviImM9jr9D0lkPdw=";
url = "https://github.com/neurocyte/libvaxis/archive/6137cb4c44a7350996f0946a069739e5075d1f23.tar.gz";
hash = "sha256-EVvjwYTIw6SKeqqGHNMm9zRVgpo+TRjtrUl1Mg8tJ8M=";
};
}
{
name = "1220dd654ef941fc76fd96f9ec6adadf83f69b9887a0d3f4ee5ac0a1a3e11be35cf5";
name = "zigimg-0.1.0-lly-O6N2EABOxke8dqyzCwhtUCAafqP35zC7wsZ4Ddxj";
path = fetchZigArtifact {
name = "zigimg";
url = "git+https://github.com/zigimg/zigimg#3a667bdb3d7f0955a5a51c8468eac83210c1439e";
hash = "sha256-oLf3YH3yeg4ikVO/GahMCDRMTU31AHkfSnF4rt7xTKo=";
url = "git+https://github.com/TUSF/zigimg#31268548fe3276c0e95f318a6c0d2ab10565b58d";
hash = "sha256-oblfr2FIzuqq0FLo/RrzCwUX1NJJuT53EwD3nP3KwN0=";
rev = "31268548fe3276c0e95f318a6c0d2ab10565b58d";
};
}
{
name = "122055beff332830a391e9895c044d33b15ea21063779557024b46169fb1984c6e40";
name = "zg-0.14.0-oGqU3KEFswIffnDu8eAE2XlhzwcfgjwtM6akIc5L7cEV";
path = fetchZigArtifact {
name = "zg";
url = "https://github.com/neurocyte/zg/archive/refs/tags/v0.13.2.tar.gz";
hash = "sha256-Hd8HlYEkkA/2BLW+4d/0Ibw7r7U533us3n2QR+XG/PQ=";
url = "git+https://codeberg.org/atman/zg#0b05141b033043c5f7bcd72048a48eef6531ea6c";
hash = "sha256-PLntlktC5RI4CN88oo5+0CliUu4b4O65Ubf6jr8U9xY=";
rev = "0b05141b033043c5f7bcd72048a48eef6531ea6c";
};
}
{
name = "1220755ea2a5aa6bb3713437aaafefd44812169fe43f1da755c3ee6101b85940f441";
name = "zeit-0.0.0-AAAAACVbAgAiIzg1rccZU1qOfO_dKQKme7-37xmEQcqc";
path = fetchZigArtifact {
name = "zeit";
url = "https://github.com/rockorager/zeit/archive/9cca8ec620a54c3b07cd249f25e5bcb3153d03d7.tar.gz";
hash = "sha256-4bxyQKbVUtYzZixUq2d+iiSPGkcwg+dG4WLaDYYQzn8=";
url = "https://github.com/rockorager/zeit/archive/8fd203f85f597f16e0a525c1f1ca1e0bffded809.tar.gz";
hash = "sha256-2UIdeG6QTZoLL6NkUQIvaO+O6xpoy9nWhua/5Qyv4To=";
};
}
{
name = "1220925614447b54ccc9894bbba8b202c6a8b750267890edab7732064867e46f3217";
name = "zigwin32-25.0.28-preview-AAAAAEEl_AMhnKSs-lgEyjmUX5JVTpNQewd8A2Bbekwc";
path = fetchZigArtifact {
name = "win32";
url = "https://github.com/marlersoft/zigwin32/archive/259b6f353a48968d7e3171573db4fd898b046188.tar.gz";
hash = "sha256-N9Jp2vmq1+xPWByb+VZkbS2lm9FCrUW4UBAPhSP+dUw=";
};
}
{
name = "1220f9702ca6257f5464b31e576b1e92b0f441bf0e61733c4a2fbf95b7c0c55a3e22";
path = fetchZigArtifact {
name = "tree-sitter";
url = "https://github.com/neurocyte/tree-sitter/releases/download/master-69775ce3ba8a5e331bba9feb760d1ba31394eea7/source.tar.gz";
hash = "sha256-0ZLcPuhUV6Z3EsXfU7gXRrG/nRP9zuLRSL00Q5OGnus=";
url = "https://github.com/marlersoft/zigwin32/archive/e8739b32a33ce48a3286aba31918b26a9dfc6ef0.tar.gz";
hash = "sha256-WSN9jOkey4dzLnhT68tOJyfnws/Ki7fnb4W+LDrPLwc=";
};
}
]
+5 -5
View File
@@ -2,30 +2,30 @@
lib,
fetchFromGitHub,
stdenv,
zig_0_13,
zig_0_14,
callPackage,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "flow-control";
version = "0.3.2";
version = "0.4.0";
src = fetchFromGitHub {
owner = "neurocyte";
repo = "flow";
tag = "v${finalAttrs.version}";
hash = "sha256-D1pFP5tw323UJgWvLvh2sTiZG1hq5DP0FakdXEISRxs=";
hash = "sha256-I7wty82zyuwZjzhfUBPd+7sx20cmRpQt1V6eCK7o0oQ=";
};
postPatch = ''
ln -s ${
callPackage ./build.zig.zon.nix {
zig = zig_0_13;
zig = zig_0_14;
}
} $ZIG_GLOBAL_CACHE_DIR/p
'';
nativeBuildInputs = [
zig_0_13.hook
zig_0_14.hook
];
passthru.updateScript = ./update.sh;
+6 -5
View File
@@ -1,19 +1,20 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p bash common-updater-scripts gnused
#!nix-shell -i bash -p bash wget common-updater-scripts gnused
latest_tag=$(list-git-tags --url=https://github.com/neurocyte/flow | sed 's/^v//' | tail -n 1)
update-source-version flow-editor "$latest_tag"
update-source-version flow-control "$latest_tag"
mkdir -p src/syntax
wget "https://raw.githubusercontent.com/neurocyte/flow/v${latest_tag}/build.zig.zon"
wget -P src/syntax "https://raw.githubusercontent.com/neurocyte/flow/v${latest_tag}/src/syntax/build.zig.zon"
nix --extra-experimental-features 'nix-command flakes' run github:Cloudef/zig2nix#zon2nix -- build.zig.zon >pkgs/by-name/fl/flow-editor/build.zig.zon.nix
nix --extra-experimental-features 'nix-command flakes' run github:Cloudef/zig2nix#zon2nix -- build.zig.zon
mv build.zig.zon.nix pkgs/by-name/fl/flow-control/build.zig.zon.nix
# strip file protocol
sed -i '\|file = unpackZigArtifact { inherit name; artifact = /. + path; };|d' pkgs/by-name/fl/flow-editor/build.zig.zon.nix
nixfmt pkgs/by-name/fl/flow-editor/build.zig.zon.nix
sed -i '\|file = unpackZigArtifact { inherit name; artifact = /. + path; };|d' pkgs/by-name/fl/flow-control/build.zig.zon.nix
nixfmt pkgs/by-name/fl/flow-control/build.zig.zon.nix
rm -rf build.zig.zon build.zig.zon2json-lock src/
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "hermit";
version = "0.44.9";
version = "0.44.12";
src = fetchFromGitHub {
rev = "v${version}";
owner = "cashapp";
repo = "hermit";
hash = "sha256-nnDpwVYQvNxCH05DQboRTeyDBIWmdgU9qQD1mD9cSqE=";
hash = "sha256-duIIZsLTeHqL0ipK8lFYgK+2talXMaazMWIWrl6I1WQ=";
};
vendorHash = "sha256-9WaAyf1DHoQRW+m8sgH9eQoHBSDDvqDsGy40mkmdhFA=";
vendorHash = "sha256-DT7Jv5VkqHPqJgi1n4wEa3z59il1mdp8JKjFs26fC2A=";
subPackages = [ "cmd/hermit" ];
+3 -3
View File
@@ -22,19 +22,19 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "heroic-unwrapped";
version = "2.17.2";
version = "2.18.0";
src = fetchFromGitHub {
owner = "Heroic-Games-Launcher";
repo = "HeroicGamesLauncher";
tag = "v${finalAttrs.version}";
hash = "sha256-oJIs+tsE0PUbX+2pyvH7gPdFuevN8sfrXASu0SxDkBU=";
hash = "sha256-DrE1gwer1pozTPWSzc5PpTWacDHhdNk/o6pA62E0uPA=";
};
pnpmDeps = pnpm_10.fetchDeps {
inherit (finalAttrs) pname version src;
fetcherVersion = 1;
hash = "sha256-9WCIdQ91IU8pfq6kpbmmn6APBTNwpCi9ovgRuWYUad8=";
hash = "sha256-VaPWB5nUvmnGW6gkW2FwoqcHk/rMfObuhR7RwsyNghk=";
};
nativeBuildInputs = [
+8 -10
View File
@@ -36,12 +36,14 @@
stdenv.mkDerivation {
pname = "io";
version = "2017.09.06";
version = "2019.05.22-alpha";
src = fetchFromGitHub {
owner = "stevedekorte";
repo = "io";
rev = "b8a18fc199758ed09cd2f199a9bc821f6821072a";
sha256 = "07rg1zrz6i6ghp11cm14w7bbaaa1s8sb0y5i7gr2sds0ijlpq223";
tag = "2019.05.22-alpha";
fetchSubmodules = true;
hash = "sha256-6w0JZE9H30X5j83YgSn7hG2l0LdhdRZfe/kWpx1/aoM=";
};
patches = [
@@ -107,15 +109,11 @@ stdenv.mkDerivation {
$out/bin/io_static
'';
# for gcc5; c11 inline semantics breaks the build
env.NIX_CFLAGS_COMPILE = "-fgnu89-inline";
meta = with lib; {
meta = {
description = "Io programming language";
homepage = "https://iolanguage.org/";
license = licenses.bsd3;
maintainers = with maintainers; [
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [
raskin
maggesi
];
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "kics";
version = "2.1.10";
version = "2.1.11";
src = fetchFromGitHub {
owner = "Checkmarx";
repo = "kics";
tag = "v${version}";
hash = "sha256-mGWUlJhOv/aYdAWaN3isqJCKKos7epJArjNk7yTlFso=";
hash = "sha256-WtqP+6mMzVT/boKuMVWJadUNQanIQDrh50RqrdMM/FM=";
};
vendorHash = "sha256-H+k3CtzyxXOCw12Fo1EdAckj0fS+Py9QOdMxYiR56Fo=";
vendorHash = "sha256-5Am4iJpAKdU00hP5BBrd57ULXs/h/Ja9sm29HmYVOYw=";
subPackages = [ "cmd/console" ];
+2 -2
View File
@@ -49,14 +49,14 @@
stdenv.mkDerivation (finalAttrs: {
# LAMMPS has weird versioning convention. Updates should go smoothly with:
# nix-update --commit lammps --version-regex 'stable_(.*)'
version = "29Aug2024_update3";
version = "29Aug2024_update4";
pname = "lammps";
src = fetchFromGitHub {
owner = "lammps";
repo = "lammps";
rev = "stable_${finalAttrs.version}";
hash = "sha256-nvUkRkO58Hmrsieyd9ALRUA7Q80AcZffW85ipH4NF/U=";
hash = "sha256-eoRD6wYuMda3EJvdeKvNuHNHW/UthZ5oe7KE15LniFk=";
};
preConfigure = ''
cd cmake
+3 -3
View File
@@ -13,17 +13,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "laze";
version = "0.1.37";
version = "0.1.38";
src = fetchFromGitHub {
owner = "kaspar030";
repo = "laze";
tag = finalAttrs.version;
hash = "sha256-jO9GVC4wfMUCpS77tgjcU/1rau5ho+2949gtd1S7GxA=";
hash = "sha256-8n22euQquEuMDcF7TN7rJkBK6jrZuYlRWegiXccWXFY=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-jUIvVUQTDNsaIjwt1fFqeUjMNfw342pQByWvNPbgGts=";
cargoHash = "sha256-M0RrtEAs7nYNr3nnISGX+/49PLdxNU0CkIhZn9wRJjU=";
passthru.updateScript = nix-update-script { };
@@ -8,11 +8,11 @@
let
pname = "ledger-live-desktop";
version = "2.120.1";
version = "2.122.1";
src = fetchurl {
url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
hash = "sha256-zr+m0ytG5wcdI6IvCklpcQVmiaTUaQb5a90lRl1+YxQ=";
hash = "sha256-Cy74WFxNX5cJhkx3FmiIgCLoWFos2BXntl6mEeK6MQ8=";
};
appimageContents = appimageTools.extractType2 {
@@ -0,0 +1,64 @@
diff --git a/cmd/litestream/main.go b/cmd/litestream/main.go
index 1234567..abcdefg 100644
--- a/cmd/litestream/main.go
+++ b/cmd/litestream/main.go
@@ -362,6 +362,7 @@ type ReplicaConfig struct {
Host string `yaml:"host"`
User string `yaml:"user"`
Password string `yaml:"password"`
KeyPath string `yaml:"key-path"`
+ HostKeyPath string `yaml:"host-key-path"`
// Encryption identities and recipients
@@ -664,6 +665,7 @@ func NewReplicaFromConfig(c *ReplicaConfig, dbc *DBConfig) (_ litestream.Replic
client.Password = password
client.Path = path
client.KeyPath = c.KeyPath
+ client.HostKeyPath = c.HostKeyPath
return client, nil
}
diff --git a/sftp/replica_client.go b/sftp/replica_client.go
index 30d8fa87..8b651e97 100644
--- a/sftp/replica_client.go
+++ b/sftp/replica_client.go
@@ -41,6 +41,7 @@ type ReplicaClient struct {
Password string
Path string
KeyPath string
+ HostKeyPath string
DialTimeout time.Duration
}
@@ -71,14 +72,28 @@ func (c *ReplicaClient) Init(ctx context.Context) (_ *sftp.Client, err error) {
// Build SSH configuration & auth methods
config := &ssh.ClientConfig{
- User: c.User,
- HostKeyCallback: ssh.InsecureIgnoreHostKey(),
- BannerCallback: ssh.BannerDisplayStderr(),
+ User: c.User,
+ BannerCallback: ssh.BannerDisplayStderr(),
}
if c.Password != "" {
config.Auth = append(config.Auth, ssh.Password(c.Password))
}
+ if c.HostKeyPath == "" {
+ config.HostKeyCallback = ssh.InsecureIgnoreHostKey()
+ } else {
+ buf, err := os.ReadFile(c.HostKeyPath)
+ if err != nil {
+ return nil, fmt.Errorf("cannot read sftp host key path: %w", err)
+ }
+
+ key, _, _, _, err := ssh.ParseAuthorizedKey(buf)
+ if err != nil {
+ return nil, fmt.Errorf("cannot parse sftp host key path: path=%s len=%d err=%w", c.HostKeyPath, len(buf), err)
+ }
+ config.HostKeyCallback = ssh.FixedHostKey(key)
+ }
+
if c.KeyPath != "" {
buf, err := os.ReadFile(c.KeyPath)
if err != nil {
+2 -1
View File
@@ -23,6 +23,8 @@ buildGoModule rec {
vendorHash = "sha256-sYIY3Z3VrCqbjEbQtEY7q6Jljg8jMoa2qWEB/IkDjzM=";
patches = [ ./fix-cve-2024-41254.patch ];
passthru.tests = { inherit (nixosTests) litestream; };
meta = with lib; {
@@ -31,6 +33,5 @@ buildGoModule rec {
license = licenses.asl20;
homepage = "https://litestream.io/";
maintainers = with maintainers; [ fbrs ];
knownVulnerabilities = [ "CVE-2024-41254" ];
};
}
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "mieru";
version = "3.16.1";
version = "3.16.2";
src = fetchFromGitHub {
owner = "enfein";
repo = "mieru";
rev = "v${version}";
hash = "sha256-Bf8/NT/CvoP2c4uBBgv+aZ7/Z3GGyn1E1RjytNf5fWc=";
hash = "sha256-zpnAGYiJpVvjEFfxWT4lbDJn5W0wGRK0CDjpRNedjuk=";
};
vendorHash = "sha256-pKcdvP38fZ2KFYNDx6I4TfmnnvWKzFDvz80xMkUojqM=";
+2 -2
View File
@@ -7,14 +7,14 @@
python3Packages.buildPythonApplication rec {
pname = "nvitop";
version = "1.5.1";
version = "1.5.2";
pyproject = true;
src = fetchFromGitHub {
owner = "XuehaiPan";
repo = "nvitop";
tag = "v${version}";
hash = "sha256-FQbY9j6eJtupBiYTSCEJHAAlpDltb6U5hgWet42AKho=";
hash = "sha256-kUlKb5L8dzT4ESi0rO2v0kQILjnVy+zcoePwqckyfbk=";
};
build-system = with python3Packages; [ setuptools ];
+6 -2
View File
@@ -101,6 +101,8 @@ stdenv.mkDerivation (finalAttrs: {
libnl
numactl
pmix
]
++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform ucx) [
ucx
ucc
]
@@ -153,8 +155,10 @@ stdenv.mkDerivation (finalAttrs: {
p = [
"mpi"
]
++ lib.optionals stdenv.hostPlatform.isLinux [
++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform ucx) [
"shmem"
]
++ lib.optionals stdenv.hostPlatform.isLinux [
"osh"
];
s = [
@@ -201,7 +205,7 @@ stdenv.mkDerivation (finalAttrs: {
part1 = [
"mpi"
]
++ lib.optionals stdenv.hostPlatform.isLinux [ "shmem" ];
++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform ucx) [ "shmem" ];
part2 = builtins.attrNames wrapperDataSubstitutions;
};
in
+4 -4
View File
@@ -18,17 +18,17 @@
}:
rustPlatform.buildRustPackage rec {
pname = "owmods-gui";
version = "0.15.0";
version = "0.15.3";
src = fetchFromGitHub {
owner = "ow-mods";
repo = "ow-mod-man";
tag = "gui_v${version}";
hash = "sha256-rTANG+yHE8YfWYUyELoKgj4El+1ZW6vI9NkgADD40pw=";
hash = "sha256-mR4CKcdwlkJPyYK0KPSGbWMaSmHlGo5kOGHoZybduco=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-Y57EGKl/wJnZ/eTlKL984GlxMWTq/ZUT5Rns/MEGOCE=";
cargoHash = "sha256-KcJAbhIeScFHLjEboQmt0NiqoIen2TihtDJaJwsVuEQ=";
buildFeatures = [
"tauri/custom-protocol"
@@ -64,7 +64,7 @@ rustPlatform.buildRustPackage rec {
src = "${src}/owmods_gui/frontend";
packageJSON = "${src}/owmods_gui/frontend/package.json";
npmDepsHash = "sha256-h6e+hQzd52G3XtufioEYlBuXNu6I+ZTQcNgJaQdaAck=";
npmDepsHash = "sha256-puDgzzzYy9HsuMo5V/E8Z8k6blCkl01JdfbpdhtnvS0=";
postBuild = ''
cp -r ../dist/ $out
-70
View File
@@ -1,70 +0,0 @@
{
autoPatchelfHook,
lib,
fetchFromGitHub,
flutter324,
mpv,
alsa-lib,
makeDesktopItem,
copyDesktopItems,
}:
flutter324.buildFlutterApplication rec {
pname = "pilipalax";
version = "1.1.2-beta";
src = fetchFromGitHub {
owner = "orz12";
repo = "PiliPalaX";
tag = "${version}+187";
hash = "sha256-8GQtPYgeYM7yTw3i5H9REWfM5j3G0aQz3oHxz8i9p2Y=";
};
pubspecLock = lib.importJSON ./pubspec.lock.json;
desktopItems = [
(makeDesktopItem {
name = "pilipalax";
exec = "pilipala";
icon = "pilipalax";
genericName = "PiliPalaX";
desktopName = "PiliPalaX";
})
];
nativeBuildInputs = [
autoPatchelfHook
copyDesktopItems
];
buildInputs = [
mpv
alsa-lib
];
gitHashes = {
auto_orientation = "sha256-0QOEW8+0PpBIELmzilZ8+z7ozNRxKgI0BzuBS8c1Fng=";
canvas_danmaku = "sha256-HjTGFdbPeAGuGdgoTbW9q/soYey+DkPKdZrSKloQ6jA=";
fl_pip = "sha256-vBIxU/FjcGPBpnHP/wZMEI8VX71RWuUi9LQJ89dBnvg=";
flutter_floating = "sha256-V+RhmCD/Vb/G2Zr8FPgwSzzYlAcJcbqy0sYXyhXRwP8=";
};
postInstall = ''
install -Dm644 ./assets/images/logo/logo_android_2.png $out/share/pixmaps/pilipalax.png
'';
extraWrapProgramArgs = ''
--prefix LD_LIBRARY_PATH : $out/app/pilipalax/lib
'';
passthru.updateScript = ./update.sh;
meta = {
description = "Third-party BiliBili client developed with Flutter";
homepage = "https://github.com/orz12/PiliPalaX";
mainProgram = "pilipala";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
};
}
File diff suppressed because it is too large Load Diff
-24
View File
@@ -1,24 +0,0 @@
#!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=./. -i bash -p curl jq yq nix bash coreutils common-updater-scripts
set -eou pipefail
ROOT="$(dirname "$(readlink -f "$0")")"
latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/orz12/PiliPalaX/releases/latest | jq --raw-output .tag_name)
latestVersion=$(echo "$latestTag" | awk -F'+' '{print $1}')
RunNumber=$(echo "$latestTag" | grep -o '[^+]*$')
currentVersion=$(nix-instantiate --eval -E "with import ./. {}; pilipalax.version or (lib.getVersion pilipalax)" | tr -d '"')
if [[ "$currentVersion" == "$latestVersion" ]]; then
echo "package is up-to-date: $currentVersion"
exit 0
fi
sed -i "s/\(tag = \"\${version}+\)[0-9]\+/\1${RunNumber}/" "$ROOT/package.nix"
hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri $(nix-prefetch-url --unpack "https://github.com/orz12/PiliPalaX/archive/refs/tags/${latestTag}.tar.gz"))
update-source-version pilipalax $latestVersion $hash
curl https://raw.githubusercontent.com/orz12/PiliPalaX/${latestTag}/pubspec.lock | yq . >$ROOT/pubspec.lock.json
@@ -9,7 +9,7 @@
}:
let
mainProgram = "proton-mail";
version = "1.8.0";
version = "1.8.1";
in
stdenv.mkDerivation {
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://proton.me/download/mail/linux/${version}/ProtonMail-desktop-beta.deb";
sha256 = "sha256-ti00RSMnSwrGNUys7mO0AmK+OSq4SZmCsfPKm7RRm2g=";
sha256 = "sha256-Qzl0OaPO2OAgKb7tMWfkSyDyxvFdiOnL9CWI5z2ndMM=";
};
dontConfigure = true;
+2 -2
View File
@@ -18,11 +18,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "qownnotes";
appname = "QOwnNotes";
version = "25.7.7";
version = "25.7.8";
src = fetchurl {
url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";
hash = "sha256-9ldUIT3pQlkO2YhQ3cF9H6Soe8IU4AGEGNRWg0LA1MQ=";
hash = "sha256-NPejWX8/Wekbp6ht1i0MayC6R/9TBykQ2cqXAsqR1CY=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -11,17 +11,17 @@
rustPlatform.buildRustPackage rec {
pname = "release-plz";
version = "0.3.138";
version = "0.3.139";
src = fetchFromGitHub {
owner = "MarcoIeni";
repo = "release-plz";
rev = "release-plz-v${version}";
hash = "sha256-qGbLT46NFMXLJncC4ZSkjo2oDISDTsAWVvevwHTaASU=";
hash = "sha256-s2PvMJu0RLO2AOMMonq4xdZlQXHrvKoqh4v9tp72Ud0=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-lMtZQNC3hix65Y1s5LqNdpY8u0TnJvnrhTm64lql4R8=";
cargoHash = "sha256-S5YhAcEhTbiM0VCAy3IiObc1uCPbsIi0QqeFxocVqw4=";
nativeBuildInputs = [
installShellFiles
+3 -3
View File
@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "roxctl";
version = "4.7.4";
version = "4.8.0";
src = fetchFromGitHub {
owner = "stackrox";
repo = "stackrox";
rev = version;
sha256 = "sha256-X5yNo0Q0mB8ews9axhLie2BiEEoYKjLxVe5h8urhoH0=";
sha256 = "sha256-IIvHQFhdQiOtdceW6GhgeJ2yqXdL+FDeE7Y9VkTShJA=";
};
vendorHash = "sha256-eTxcJnAZUKk6VDQhbjxnsiQWEpM2jA228SAhrCqjbF4=";
vendorHash = "sha256-nobE6QJfzFLFgWzzy04uynOtFoYHx8iv8RMcX8F2JOY=";
nativeBuildInputs = [ installShellFiles ];
+3 -3
View File
@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "rymdport";
version = "3.8.0";
version = "3.9.0";
src = fetchFromGitHub {
owner = "Jacalz";
repo = "rymdport";
rev = "v${version}";
hash = "sha256-WWLs0gzFo1+scG+2JfNMd28jIP1BMMJOK4fhQ726mHY=";
hash = "sha256-Eezitq66NkTYUxGt5/sVrB486irPigeCARjZVW6nTK4=";
};
vendorHash = "sha256-+FVERz1PVZSG8jqffUlglL+3VHsRNxHH0g2GYpYNQ9g=";
vendorHash = "sha256-WPJj3zlEJeghRw0lHHUXm7n0a6d8Yf78s7jnBwmAZ4U=";
nativeBuildInputs = [
pkg-config
+10 -7
View File
@@ -36,14 +36,14 @@ let
# rocm build fails with gcc stdenv due to unrecognised arg parallel-jobs
stdenv' = if enableRocm then rocmPackages.stdenv else stdenv;
in
stdenv'.mkDerivation rec {
stdenv'.mkDerivation (finalAttrs: {
pname = "ucx";
version = "1.18.1";
src = fetchFromGitHub {
owner = "openucx";
repo = "ucx";
rev = "v${version}";
rev = "v${finalAttrs.version}";
sha256 = "sha256-LW57wbQFwW14Z86p9jo1ervkCafVy+pnIQQ9t0i8enY=";
};
@@ -103,11 +103,14 @@ stdenv'.mkDerivation rec {
enableParallelBuilding = true;
meta = with lib; {
meta = {
description = "Unified Communication X library";
homepage = "https://www.openucx.org";
license = licenses.bsd3;
platforms = platforms.linux;
maintainers = [ maintainers.markuskowa ];
license = lib.licenses.bsd3;
platforms = lib.platforms.linux;
# LoongArch64 is not supported.
# See: https://github.com/openucx/ucx/issues/9873
badPlatforms = lib.platforms.loongarch64;
maintainers = with lib.maintainers; [ markuskowa ];
};
}
})
+3 -3
View File
@@ -6,18 +6,18 @@
rustPlatform.buildRustPackage rec {
pname = "worker-build";
version = "0.6.0";
version = "0.6.1";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "workers-rs";
tag = "v${version}";
hash = "sha256-wsH16hkiaTthE2FwQ8Ma2qQhkunq2rxkZXPEYR7P0Io=";
hash = "sha256-eP54+M6eXp251QHF9YX5f19yL7gC+zsZfbphac363Wo=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-ZuO020orJBJWm3Q+39MnkQ96rsv9juicUeMtBBVWxcg=";
cargoHash = "sha256-1KVpcghdGG6gcDz5rvydYLXXh/5Yiq1Z2Rtbc66DWrM=";
buildAndTestSubdir = "worker-build";
@@ -114,6 +114,11 @@ with haskellLib;
self.syb
self.HUnit
] super.ghc-exactprint_1_12_0_0;
timezone-series = doJailbreak super.timezone-series; # time <1.14
timezone-olson = doJailbreak super.timezone-olson; # time <1.14
cabal-plan = doJailbreak super.cabal-plan; # base <4.21
dbus = doJailbreak super.dbus; # template-haskell <2.23
xmobar = doJailbreak super.xmobar; # base <4.21
#
# Test suite issues
@@ -1,48 +0,0 @@
{
lib,
fetchFromGitLab,
buildDunePackage,
integers_stubs_js,
ctypes,
ppx_expect,
js_of_ocaml-compiler,
nodejs,
stdenv,
}:
buildDunePackage rec {
pname = "ctypes_stubs_js";
version = "0.1";
minimalOCamlVersion = "4.08";
src = fetchFromGitLab {
owner = "nomadic-labs";
repo = pname;
rev = version;
hash = "sha256-OJIzg2hnwkXkQHd4bRR051eLf4HNWa/XExxbj46SyUs=";
};
propagatedBuildInputs = [ integers_stubs_js ];
nativeCheckInputs = [
nodejs
(
if lib.versionAtLeast js_of_ocaml-compiler.version "6.0" then
js_of_ocaml-compiler.override { version = "5.9.1"; }
else
js_of_ocaml-compiler
)
];
checkInputs = [
ctypes
ppx_expect
];
doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
meta = {
description = "Js_of_ocaml Javascript stubs for the OCaml ctypes library";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ bezmuth ];
homepage = "https://gitlab.com/nomadic-labs/ctypes_stubs_js";
};
}
@@ -21,14 +21,14 @@
buildPythonPackage rec {
pname = "databricks-sdk";
version = "0.58.0";
version = "0.59.0";
pyproject = true;
src = fetchFromGitHub {
owner = "databricks";
repo = "databricks-sdk-py";
tag = "v${version}";
hash = "sha256-MWv+gNueH+Docz19YVhTNOW8e5KEPrI91eUE+UGRUwg=";
hash = "sha256-yH/hePmPc+CG4cqcMwFUuNoJxzZUCXryQlr2Pc8CoqI=";
};
build-system = [
@@ -22,14 +22,14 @@
buildPythonPackage rec {
pname = "pymc";
version = "5.25.0";
version = "5.25.1";
pyproject = true;
src = fetchFromGitHub {
owner = "pymc-devs";
repo = "pymc";
tag = "v${version}";
hash = "sha256-/BSnDi34hhn7lFuLO/arMn018BU09PaQqmaLbYG3en4=";
hash = "sha256-zh6FsCEviuyqapguTrUDsWKq70ef0IKRhnn2dkgQ/KA=";
};
build-system = [
@@ -1,4 +1,5 @@
{
lib,
fetchFromGitHub,
buildPythonPackage,
cargo,
@@ -10,9 +11,6 @@
fixtures,
networkx,
testtools,
libiconv,
stdenv,
lib,
pytestCheckHook,
}:
@@ -44,7 +42,7 @@ buildPythonPackage rec {
setuptools-rust
];
buildInputs = [ numpy ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
dependencies = [ numpy ];
nativeCheckInputs = [
fixtures
@@ -22,14 +22,14 @@
}:
buildPythonPackage rec {
pname = "stable-baselines3";
version = "2.6.0";
version = "2.7.0";
pyproject = true;
src = fetchFromGitHub {
owner = "DLR-RM";
repo = "stable-baselines3";
tag = "v${version}";
hash = "sha256-VnoQ8cKqPcZPpR9c3M6xJDdG7gnO9fxIa4v2kxd9Nzg=";
hash = "sha256-Ms2qoq1fokhUQ1/Wus786oYPT6C2lnHOZ+D7E7qUbjI=";
};
postPatch =
+2 -2
View File
@@ -884,8 +884,8 @@ stdenv.mkDerivation (finalAttrs: {
lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform)
# 'or p' is for manually specified buildPackages as they dont have __spliced
(
builtins.map (p: p.__spliced.buildHost or p) (
builtins.filter (p: p != null) finalAttrs.nativeBuildInputs
builtins.filter (p: p != null) (
builtins.map (p: p.__spliced.buildHost or p) finalAttrs.nativeBuildInputs
)
);
@@ -2,8 +2,8 @@
grafanaPlugin {
pname = "frser-sqlite-datasource";
version = "3.5.0";
zipHash = "sha256-BwAurFpMyyR318HMzVXCnOEQWM8W2vPPisXhhklFLBY=";
version = "3.8.0";
zipHash = "sha256-wk0zEGQjDdz8bIc7e5aiaqg7AaTS6u8zp+WJy5YlWlQ=";
meta = with lib; {
description = "Use a SQLite database as a data source in Grafana";
license = licenses.asl20;
@@ -2,8 +2,8 @@
grafanaPlugin {
pname = "volkovlabs-echarts-panel";
version = "6.6.0";
zipHash = "sha256-SjZl33xoHVmE6y0D7FT9x2wVPil7HK1rYVgTXICpXZ4=";
version = "7.0.0";
zipHash = "sha256-ibM4h96R+hvqoG9k6xz+2xlhK1xQPb2F1BLt+mQVSxo=";
meta = with lib; {
description = "Visualization panel for Grafana that allows you to incorporate the popular Apache ECharts library into your Grafana dashboard";
license = licenses.asl20;
@@ -2,8 +2,8 @@
grafanaPlugin {
pname = "volkovlabs-form-panel";
version = "5.1.0";
zipHash = "sha256-aFIrKrfcTk4dGBaGVMv6mMLQqys5QaD9XgZIGmtgA5s=";
version = "6.0.0";
zipHash = "sha256-oSoprdWcpXypTMM4d3MuPXA/hcqd/3sSxuTluL7JW4Y=";
meta = with lib; {
description = "Plugin that allows inserting and updating application data, as well as modifying configuration directly from your Grafana dashboard";
license = licenses.asl20;
@@ -2,8 +2,8 @@
grafanaPlugin {
pname = "volkovlabs-rss-datasource";
version = "4.3.0";
zipHash = "sha256-HF37azbhlYp8RndUMr7Xs1ajgOTJplVP7rQzGQ0GrU4=";
version = "4.4.0";
zipHash = "sha256-0/B5E1DSjVq9e+1FAFw0J3Kuc7oud6apP9b07icg1Hk=";
meta = with lib; {
description = "Plugin for Grafana that retrieves RSS/Atom feeds and allows visualizing them using Dynamic Text and other panels";
license = licenses.asl20;
@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "ipmi_exporter";
version = "1.10.0";
version = "1.10.1";
src = fetchFromGitHub {
owner = "prometheus-community";
repo = "ipmi_exporter";
rev = "v${version}";
hash = "sha256-Go47Txf/NX9ytMvvFQeNVCw0ORWqbsg2sIWK4MVRyIA=";
hash = "sha256-U4vkOKxHKJyfsngn2JqZncq71BohBnGM7Z1hA79YhKA=";
};
vendorHash = "sha256-OXVUFamFv1BZTXuIfmaYHc1y9B9j4ndo1/2CGLNavh0=";
vendorHash = "sha256-8ebarbsaHiufPEghgOlaRMouGdI1c1Yo8pjqG2bPdK8=";
nativeBuildInputs = [ makeWrapper ];
@@ -1,5 +1,6 @@
{
aacgain,
chromaprint,
ffmpeg,
flac,
imagemagick,
@@ -55,6 +56,9 @@
chroma = {
propagatedBuildInputs = [ python3Packages.pyacoustid ];
testPaths = [ ];
wrapperBins = [
chromaprint
];
};
convert.wrapperBins = [ ffmpeg ];
deezer = {
+1
View File
@@ -16,6 +16,7 @@
# plugin deps, used indirectly by the @inputs when we `import ./builtin-plugins.nix`
aacgain,
chromaprint,
essentia-extractor,
ffmpeg,
flac,
+1 -1
View File
@@ -1575,7 +1575,7 @@ mapAliases {
phlare = throw "'phlare' has been removed as the upstream project was archived."; # Added 2025-03-27
picom-next = picom; # Added 2024-02-13
pict-rs_0_3 = throw "pict-rs_0_3 has been removed, as it was an outdated version and no longer compiled"; # Added 2024-08-20
pilipalax = throw "'pilipalax' has been removed from nixpkgs due to it not being maintained"; # Added 2025-07-25
pio = throw "pio has been removed due to lack of upstream maintenance"; # Added 2025-01-25
pipewire_0_2 = throw "pipewire_0_2 has been removed as it is outdated and no longer used"; # Added 2024-07-28
pipewire-media-session = throw "pipewire-media-session is no longer maintained and has been removed. Please use Wireplumber instead.";
+3 -9
View File
@@ -4035,9 +4035,7 @@ with pkgs;
parallel-full = callPackage ../tools/misc/parallel/wrapper.nix { };
parcellite = callPackage ../tools/misc/parcellite {
autoreconfHook = buildPackages.autoreconfHook269;
};
parcellite = callPackage ../tools/misc/parcellite { };
patchutils = callPackage ../tools/text/patchutils { };
@@ -10790,9 +10788,7 @@ with pkgs;
tomcat = tomcat11;
torque = callPackage ../servers/computing/torque {
autoreconfHook = buildPackages.autoreconfHook269;
};
torque = callPackage ../servers/computing/torque { };
virtualenv = with python3Packages; toPythonApplication virtualenv;
@@ -12045,9 +12041,7 @@ with pkgs;
elf-dissector = libsForQt5.callPackage ../applications/misc/elf-dissector { };
elinks = callPackage ../applications/networking/browsers/elinks {
autoreconfHook = buildPackages.autoreconfHook269;
};
elinks = callPackage ../applications/networking/browsers/elinks { };
inherit (recurseIntoAttrs (callPackage ../applications/editors/emacs { }))
emacs30
-4
View File
@@ -326,10 +326,6 @@ let
ctypes-foreign = callPackage ../development/ocaml-modules/ctypes/foreign.nix { };
ctypes_stubs_js = callPackage ../development/ocaml-modules/ctypes_stubs_js {
inherit (pkgs) nodejs;
};
cudf = callPackage ../development/ocaml-modules/cudf { };
curly = callPackage ../development/ocaml-modules/curly {