Merge master into staging-next
This commit is contained in:
commit
46cc80cc78
|
@ -171,6 +171,7 @@ let
|
||||||
inherit src version;
|
inherit src version;
|
||||||
# nix will complain and tell you the right value to replace this with
|
# nix will complain and tell you the right value to replace this with
|
||||||
hash = lib.fakeHash;
|
hash = lib.fakeHash;
|
||||||
|
mixEnv = ""; # default is "prod", when empty includes all dependencies, such as "dev", "test".
|
||||||
# if you have build time environment variables add them here
|
# if you have build time environment variables add them here
|
||||||
MY_ENV_VAR="my_value";
|
MY_ENV_VAR="my_value";
|
||||||
};
|
};
|
||||||
|
|
|
@ -932,6 +932,12 @@
|
||||||
githubId = 106511;
|
githubId = 106511;
|
||||||
name = "Andrew Kelley";
|
name = "Andrew Kelley";
|
||||||
};
|
};
|
||||||
|
andrewsmith = {
|
||||||
|
email = "andrew@velvet.software";
|
||||||
|
github = "andrewsmith";
|
||||||
|
githubId = 29887;
|
||||||
|
name = "Andrew Smith";
|
||||||
|
};
|
||||||
andsild = {
|
andsild = {
|
||||||
email = "andsild@gmail.com";
|
email = "andsild@gmail.com";
|
||||||
github = "andsild";
|
github = "andsild";
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -27,12 +27,12 @@
|
||||||
};
|
};
|
||||||
arduino = buildGrammar {
|
arduino = buildGrammar {
|
||||||
language = "arduino";
|
language = "arduino";
|
||||||
version = "c473c09";
|
version = "257efff";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ObserverOfTime";
|
owner = "ObserverOfTime";
|
||||||
repo = "tree-sitter-arduino";
|
repo = "tree-sitter-arduino";
|
||||||
rev = "c473c09f23b13d9404ec5208fad3eddea89d70f8";
|
rev = "257efffa387da3283a37816b71dedfecf4af5222";
|
||||||
hash = "sha256-aAw1ZgKuMWozQzmENUhkdkHV0BjSGmTdH4Bna7EfDaQ=";
|
hash = "sha256-Yc3oFzOMyQwW2URyEzSIe6wBNAu9J2vPFIXk43sVUv8=";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino";
|
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino";
|
||||||
};
|
};
|
||||||
|
@ -115,23 +115,23 @@
|
||||||
};
|
};
|
||||||
c_sharp = buildGrammar {
|
c_sharp = buildGrammar {
|
||||||
language = "c_sharp";
|
language = "c_sharp";
|
||||||
version = "a29bac0";
|
version = "18e4343";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "tree-sitter";
|
owner = "tree-sitter";
|
||||||
repo = "tree-sitter-c-sharp";
|
repo = "tree-sitter-c-sharp";
|
||||||
rev = "a29bac0681802139710b4d3875540901504d15cb";
|
rev = "18e434383a4582b4fd183a30e55022c2923764e1";
|
||||||
hash = "sha256-TpOaxR0Do7oGjAZ8IrbXJAP6//Kt7VxhkrWEz7yNiLY=";
|
hash = "sha256-ggvCj2yGDINuGr8Jb+aOoRxlKa5LaXCoiQC/Y5Hrcn0=";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp";
|
meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp";
|
||||||
};
|
};
|
||||||
capnp = buildGrammar {
|
capnp = buildGrammar {
|
||||||
language = "capnp";
|
language = "capnp";
|
||||||
version = "740c757";
|
version = "cb85cdd";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "amaanq";
|
owner = "amaanq";
|
||||||
repo = "tree-sitter-capnp";
|
repo = "tree-sitter-capnp";
|
||||||
rev = "740c757b9585925b1ed27cef7d61ac39b7824304";
|
rev = "cb85cddfdf398530110c807ba046822dbaee6afb";
|
||||||
hash = "sha256-0zCSWV3afsEIhN6XavMnn4LrLenjerhdnTfQ/EaL4aA=";
|
hash = "sha256-VB8fNF8EtTAkKBLIAByazczPHJYdBULCeoGQ1ZLLRhI=";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/amaanq/tree-sitter-capnp";
|
meta.homepage = "https://github.com/amaanq/tree-sitter-capnp";
|
||||||
};
|
};
|
||||||
|
@ -159,12 +159,12 @@
|
||||||
};
|
};
|
||||||
cmake = buildGrammar {
|
cmake = buildGrammar {
|
||||||
language = "cmake";
|
language = "cmake";
|
||||||
version = "a322653";
|
version = "399605a";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "uyha";
|
owner = "uyha";
|
||||||
repo = "tree-sitter-cmake";
|
repo = "tree-sitter-cmake";
|
||||||
rev = "a32265307aa2d31941056d69e8b6633e61750b2f";
|
rev = "399605a02bcd5daa309ce63a6459c600dce3473f";
|
||||||
hash = "sha256-LBd3SMem1dxZr/dOdJdEFTQxI6d+H8uYE46yN02E/6Y=";
|
hash = "sha256-7pzKyfR9RmfgzuX9/elUesmsdbLlwgrfiRP73YQu+gM=";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/uyha/tree-sitter-cmake";
|
meta.homepage = "https://github.com/uyha/tree-sitter-cmake";
|
||||||
};
|
};
|
||||||
|
@ -304,12 +304,12 @@
|
||||||
};
|
};
|
||||||
ebnf = buildGrammar {
|
ebnf = buildGrammar {
|
||||||
language = "ebnf";
|
language = "ebnf";
|
||||||
version = "ef241bc";
|
version = "8e635b0";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "RubixDev";
|
owner = "RubixDev";
|
||||||
repo = "ebnf";
|
repo = "ebnf";
|
||||||
rev = "ef241bc09f2f105c35f5e4f2ccd8a522dd99071c";
|
rev = "8e635b0b723c620774dfb8abf382a7f531894b40";
|
||||||
hash = "sha256-N5TGYJnYNjYIdFXspGn+dDRm0wmJymXHY+Io43wSKlI=";
|
hash = "sha256-Cch6WCYq9bsWGypzDGapxBLJ0ZB432uAl6YjEjBJ5yg=";
|
||||||
};
|
};
|
||||||
location = "crates/tree-sitter-ebnf";
|
location = "crates/tree-sitter-ebnf";
|
||||||
meta.homepage = "https://github.com/RubixDev/ebnf.git";
|
meta.homepage = "https://github.com/RubixDev/ebnf.git";
|
||||||
|
@ -371,12 +371,12 @@
|
||||||
};
|
};
|
||||||
embedded_template = buildGrammar {
|
embedded_template = buildGrammar {
|
||||||
language = "embedded_template";
|
language = "embedded_template";
|
||||||
version = "a130858";
|
version = "203f7bd";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "tree-sitter";
|
owner = "tree-sitter";
|
||||||
repo = "tree-sitter-embedded-template";
|
repo = "tree-sitter-embedded-template";
|
||||||
rev = "a13085849cf69e2401ec44e38cffc3d73f22f3df";
|
rev = "203f7bd3c1bbfbd98fc19add4b8fcb213c059205";
|
||||||
hash = "sha256-JNyLOW/na8J0WEsLDv3BuC+UXxGpYMYvAlywq4z6Wzo=";
|
hash = "sha256-SaZkyy2wKYoK0+pdHLVpQrdXjEeX/uR5XxgahcAdwz0=";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-embedded-template";
|
meta.homepage = "https://github.com/tree-sitter/tree-sitter-embedded-template";
|
||||||
};
|
};
|
||||||
|
@ -426,12 +426,12 @@
|
||||||
};
|
};
|
||||||
fortran = buildGrammar {
|
fortran = buildGrammar {
|
||||||
language = "fortran";
|
language = "fortran";
|
||||||
version = "edcb337";
|
version = "bfa6fd4";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "stadelmanma";
|
owner = "stadelmanma";
|
||||||
repo = "tree-sitter-fortran";
|
repo = "tree-sitter-fortran";
|
||||||
rev = "edcb3374f4698aaedf24bc572f6b2f5ef0e89ac7";
|
rev = "bfa6fd4c4aa0bb9b39ad33daa004ad4637a91d20";
|
||||||
hash = "sha256-xZfWtRHWy3MQtkzN9jSwx+sAwLlcRiVLTJjYXyWEIs8=";
|
hash = "sha256-5Lf/6jhgRPgSPNCHqiYT8OeI7UUnTfQqH8rzf8ggHj0=";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran";
|
meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran";
|
||||||
};
|
};
|
||||||
|
@ -448,12 +448,12 @@
|
||||||
};
|
};
|
||||||
func = buildGrammar {
|
func = buildGrammar {
|
||||||
language = "func";
|
language = "func";
|
||||||
version = "88ee7d0";
|
version = "f161cfe";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "amaanq";
|
owner = "amaanq";
|
||||||
repo = "tree-sitter-func";
|
repo = "tree-sitter-func";
|
||||||
rev = "88ee7d0f569af10ab8c78a12f37217a8d15a0ffa";
|
rev = "f161cfe22452b386eeeab29ba0d2c14893f1a31f";
|
||||||
hash = "sha256-SLI59AtprfCQr6VccCVr+2sazEtUSXnAwHcclWrkXxA=";
|
hash = "sha256-Swyg5EdBWVT6P9vgS7h/fmK0ySRwiFlynJEZT9I10qg=";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/amaanq/tree-sitter-func";
|
meta.homepage = "https://github.com/amaanq/tree-sitter-func";
|
||||||
};
|
};
|
||||||
|
@ -470,12 +470,12 @@
|
||||||
};
|
};
|
||||||
gdscript = buildGrammar {
|
gdscript = buildGrammar {
|
||||||
language = "gdscript";
|
language = "gdscript";
|
||||||
version = "4849e65";
|
version = "5d43d78";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "PrestonKnopp";
|
owner = "PrestonKnopp";
|
||||||
repo = "tree-sitter-gdscript";
|
repo = "tree-sitter-gdscript";
|
||||||
rev = "4849e657b98945cd040ffa7fd833d6130259dbab";
|
rev = "5d43d78c276570f76773685f08baf9e4ada09639";
|
||||||
hash = "sha256-Rs1W2jahp+J42JzICi+QLAqfHYXth47g4LjejJnJypo=";
|
hash = "sha256-SNyZutgab3T1UaD/D6jnhF3QmAR/UVtlXTpNjYlf2+Y=";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-gdscript";
|
meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-gdscript";
|
||||||
};
|
};
|
||||||
|
@ -537,12 +537,12 @@
|
||||||
};
|
};
|
||||||
glimmer = buildGrammar {
|
glimmer = buildGrammar {
|
||||||
language = "glimmer";
|
language = "glimmer";
|
||||||
version = "c0bfd26";
|
version = "40cfb72";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "alexlafroscia";
|
owner = "alexlafroscia";
|
||||||
repo = "tree-sitter-glimmer";
|
repo = "tree-sitter-glimmer";
|
||||||
rev = "c0bfd260cdcbe2976f4633547c218f09f7222a89";
|
rev = "40cfb72a53654cbd666451ca04ffd500257c7b73";
|
||||||
hash = "sha256-Goj900MJxO44KYkzD0UpGFEGHAwr6qhe2bmCzpx5BhE=";
|
hash = "sha256-h9ZZz6mbkErLIG/BamNRRoRdqmuBO3v17W0uvmpbm7A=";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/alexlafroscia/tree-sitter-glimmer";
|
meta.homepage = "https://github.com/alexlafroscia/tree-sitter-glimmer";
|
||||||
};
|
};
|
||||||
|
@ -637,12 +637,12 @@
|
||||||
};
|
};
|
||||||
haskell = buildGrammar {
|
haskell = buildGrammar {
|
||||||
language = "haskell";
|
language = "haskell";
|
||||||
version = "aee3725";
|
version = "3bdba07";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "tree-sitter";
|
owner = "tree-sitter";
|
||||||
repo = "tree-sitter-haskell";
|
repo = "tree-sitter-haskell";
|
||||||
rev = "aee3725d02cf3bca5f307b35dd3a96a97e109b4e";
|
rev = "3bdba07c7a8eec23f87fa59ce9eb2ea4823348b3";
|
||||||
hash = "sha256-DmrrRht3g0hG+OsJCHRL+xW4jflLqtG57AuFf7zd26c=";
|
hash = "sha256-/aGUdyVxXqXCvjruI8rqiKzfTsyxzOKaXSAUG5xK4cE=";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell";
|
meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell";
|
||||||
};
|
};
|
||||||
|
@ -835,12 +835,12 @@
|
||||||
};
|
};
|
||||||
jsonnet = buildGrammar {
|
jsonnet = buildGrammar {
|
||||||
language = "jsonnet";
|
language = "jsonnet";
|
||||||
version = "505f5bd";
|
version = "fdc7757";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "sourcegraph";
|
owner = "sourcegraph";
|
||||||
repo = "tree-sitter-jsonnet";
|
repo = "tree-sitter-jsonnet";
|
||||||
rev = "505f5bd90053ae895aa3d6f2bac8071dd9abd8b2";
|
rev = "fdc775714afa27fdef823adbaba6ab98f5ae66f2";
|
||||||
hash = "sha256-XZqywAzM+UCKto/OFn50hhRpEyFVLpFV7Q1Z0NKoPsI=";
|
hash = "sha256-KVpSB3LiC1qpF05Y1ScIglaXWIrAL+m7G4Q4/EVn0U8=";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/sourcegraph/tree-sitter-jsonnet";
|
meta.homepage = "https://github.com/sourcegraph/tree-sitter-jsonnet";
|
||||||
};
|
};
|
||||||
|
@ -857,12 +857,12 @@
|
||||||
};
|
};
|
||||||
kdl = buildGrammar {
|
kdl = buildGrammar {
|
||||||
language = "kdl";
|
language = "kdl";
|
||||||
version = "f83f394";
|
version = "b50d6c8";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "amaanq";
|
owner = "amaanq";
|
||||||
repo = "tree-sitter-kdl";
|
repo = "tree-sitter-kdl";
|
||||||
rev = "f83f3943568c7e7b4f5e0de1b04d722223bd4d80";
|
rev = "b50d6c8b77d311639ecbf2b803ffb720c2b4cee2";
|
||||||
hash = "sha256-BakY6V4A2N/ZZCkyr7KU04/DWeGTAkkJua5TyZ6uNW4=";
|
hash = "sha256-dE2SqRSjy05Un3DPkrVDN0+na1ahddY57RYPMtaWynA=";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/amaanq/tree-sitter-kdl";
|
meta.homepage = "https://github.com/amaanq/tree-sitter-kdl";
|
||||||
};
|
};
|
||||||
|
@ -956,24 +956,24 @@
|
||||||
};
|
};
|
||||||
markdown = buildGrammar {
|
markdown = buildGrammar {
|
||||||
language = "markdown";
|
language = "markdown";
|
||||||
version = "abea13b";
|
version = "7e7aa9a";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "MDeiml";
|
owner = "MDeiml";
|
||||||
repo = "tree-sitter-markdown";
|
repo = "tree-sitter-markdown";
|
||||||
rev = "abea13b86c404564991244b69b7afc4ca362d0c0";
|
rev = "7e7aa9a25ca9729db9fe22912f8f47bdb403a979";
|
||||||
hash = "sha256-gdRl+jTSGlijc3/hn1BYClAlpYljzSRVpRoi9Q446PU=";
|
hash = "sha256-KsE9oYzD+vVqgR35JdL0NmPfNGJqpC12sEsZVIs7NX0=";
|
||||||
};
|
};
|
||||||
location = "tree-sitter-markdown";
|
location = "tree-sitter-markdown";
|
||||||
meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
|
meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
|
||||||
};
|
};
|
||||||
markdown_inline = buildGrammar {
|
markdown_inline = buildGrammar {
|
||||||
language = "markdown_inline";
|
language = "markdown_inline";
|
||||||
version = "abea13b";
|
version = "7e7aa9a";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "MDeiml";
|
owner = "MDeiml";
|
||||||
repo = "tree-sitter-markdown";
|
repo = "tree-sitter-markdown";
|
||||||
rev = "abea13b86c404564991244b69b7afc4ca362d0c0";
|
rev = "7e7aa9a25ca9729db9fe22912f8f47bdb403a979";
|
||||||
hash = "sha256-gdRl+jTSGlijc3/hn1BYClAlpYljzSRVpRoi9Q446PU=";
|
hash = "sha256-KsE9oYzD+vVqgR35JdL0NmPfNGJqpC12sEsZVIs7NX0=";
|
||||||
};
|
};
|
||||||
location = "tree-sitter-markdown-inline";
|
location = "tree-sitter-markdown-inline";
|
||||||
meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
|
meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
|
||||||
|
@ -1126,12 +1126,12 @@
|
||||||
};
|
};
|
||||||
php = buildGrammar {
|
php = buildGrammar {
|
||||||
language = "php";
|
language = "php";
|
||||||
version = "973694f";
|
version = "f860e59";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "tree-sitter";
|
owner = "tree-sitter";
|
||||||
repo = "tree-sitter-php";
|
repo = "tree-sitter-php";
|
||||||
rev = "973694ffcdeebca245b7ecf0d7c4cadd4f41b3c9";
|
rev = "f860e598194f4a71747f91789bf536b393ad4a56";
|
||||||
hash = "sha256-upJ8WwosOe4Xv/H9LUFVUVThLSLS+5Htr71Lyc/ZTJo=";
|
hash = "sha256-j4RJUBbp2zvCHsZwnz62t2Tf6Cy1LOKrhg/pi8cqzAs=";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
|
meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
|
||||||
};
|
};
|
||||||
|
@ -1192,12 +1192,12 @@
|
||||||
};
|
};
|
||||||
pug = buildGrammar {
|
pug = buildGrammar {
|
||||||
language = "pug";
|
language = "pug";
|
||||||
version = "26f6ac8";
|
version = "884e225";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "zealot128";
|
owner = "zealot128";
|
||||||
repo = "tree-sitter-pug";
|
repo = "tree-sitter-pug";
|
||||||
rev = "26f6ac805e11e19c4492089f24aa44fe71be7c1f";
|
rev = "884e225b5ecca5d885ae627275f16ef648acd42e";
|
||||||
hash = "sha256-KUIjt8p4B3LrU9vRQGL9Pf3ZYMfdDrazC2kNwTpRAgg=";
|
hash = "sha256-qPfVSnsw9bDznq7rhzftGyv9cGi2OiF6DCh55Lxk8xA=";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/zealot128/tree-sitter-pug";
|
meta.homepage = "https://github.com/zealot128/tree-sitter-pug";
|
||||||
};
|
};
|
||||||
|
@ -1311,6 +1311,17 @@
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/bamonroe/tree-sitter-rnoweb";
|
meta.homepage = "https://github.com/bamonroe/tree-sitter-rnoweb";
|
||||||
};
|
};
|
||||||
|
ron = buildGrammar {
|
||||||
|
language = "ron";
|
||||||
|
version = "049a3ef";
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "amaanq";
|
||||||
|
repo = "tree-sitter-ron";
|
||||||
|
rev = "049a3ef4e271089107dd08e4aeb195abd1f77103";
|
||||||
|
hash = "sha256-ITWls8kp/UvwWOBE19v1UWQ1/BEiDhsK5VIFHicJM84=";
|
||||||
|
};
|
||||||
|
meta.homepage = "https://github.com/amaanq/tree-sitter-ron";
|
||||||
|
};
|
||||||
rst = buildGrammar {
|
rst = buildGrammar {
|
||||||
language = "rst";
|
language = "rst";
|
||||||
version = "25e6328";
|
version = "25e6328";
|
||||||
|
@ -1434,12 +1445,12 @@
|
||||||
};
|
};
|
||||||
sql = buildGrammar {
|
sql = buildGrammar {
|
||||||
language = "sql";
|
language = "sql";
|
||||||
version = "c508e60";
|
version = "7be06f4";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "derekstride";
|
owner = "derekstride";
|
||||||
repo = "tree-sitter-sql";
|
repo = "tree-sitter-sql";
|
||||||
rev = "c508e6044adf4298d7b321f966c90cbe32d75d23";
|
rev = "7be06f4d5eabace883dd45959c13dc740f1f1b98";
|
||||||
hash = "sha256-Ed+6pwxwvwLKOVB9XVHF+IftEiO4bG0yZAe77xBcazI=";
|
hash = "sha256-Hi/4/Aou85MYCMMFqf5xqAyKECTzfeiaksJxdv9MVCU=";
|
||||||
};
|
};
|
||||||
generate = true;
|
generate = true;
|
||||||
meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
|
meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
|
||||||
|
@ -1538,12 +1549,12 @@
|
||||||
};
|
};
|
||||||
thrift = buildGrammar {
|
thrift = buildGrammar {
|
||||||
language = "thrift";
|
language = "thrift";
|
||||||
version = "634a73f";
|
version = "763ae3d";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "duskmoon314";
|
owner = "duskmoon314";
|
||||||
repo = "tree-sitter-thrift";
|
repo = "tree-sitter-thrift";
|
||||||
rev = "634a73fd2c80e169f302917ba665c07ec0b6ff7b";
|
rev = "763ae3d760b7a7719b57568bdf9ffae2d896680f";
|
||||||
hash = "sha256-pB7zd48aonYYKdvD3+35zsD76+F/lqBYveFBxBQISvA=";
|
hash = "sha256-LXHXCaD76H9kWjOwCPfrpO2ZEv3mlq0IpWnwzV/qr2M=";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/duskmoon314/tree-sitter-thrift";
|
meta.homepage = "https://github.com/duskmoon314/tree-sitter-thrift";
|
||||||
};
|
};
|
||||||
|
@ -1560,12 +1571,12 @@
|
||||||
};
|
};
|
||||||
tlaplus = buildGrammar {
|
tlaplus = buildGrammar {
|
||||||
language = "tlaplus";
|
language = "tlaplus";
|
||||||
version = "6fd16d8";
|
version = "6d2ec89";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "tlaplus-community";
|
owner = "tlaplus-community";
|
||||||
repo = "tree-sitter-tlaplus";
|
repo = "tree-sitter-tlaplus";
|
||||||
rev = "6fd16d8469c6898317423d61738d97e2b3f5caf7";
|
rev = "6d2ec894aef843fc89312c904e20c5f555aec4e3";
|
||||||
hash = "sha256-s5mYc/kPZ4wHhm1ZeC5WBjBfzTFnANPRAZeE8UOVE1I=";
|
hash = "sha256-5V4sMnjVsdSJdeYspxn0nYqq73lVHvz7eGRfD/orqo4=";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus";
|
meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus";
|
||||||
};
|
};
|
||||||
|
@ -1639,12 +1650,12 @@
|
||||||
};
|
};
|
||||||
v = buildGrammar {
|
v = buildGrammar {
|
||||||
language = "v";
|
language = "v";
|
||||||
version = "719cf0c";
|
version = "136f3a0";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "vlang";
|
owner = "vlang";
|
||||||
repo = "vls";
|
repo = "vls";
|
||||||
rev = "719cf0cd297f9b2f45ecfbeb0115379fb8cfa9c3";
|
rev = "136f3a0ad91ab8a781c2d4eb419df0a981839f69";
|
||||||
hash = "sha256-4xb5x/JZN1pFvPVqazcZMdZm8DTpBb5nW5AgOrB3YHc=";
|
hash = "sha256-zmbR2Of/XEJuGvNmXAJ+C4aAMem51LVS3e1rSqjaSb0=";
|
||||||
};
|
};
|
||||||
location = "tree_sitter_v";
|
location = "tree_sitter_v";
|
||||||
meta.homepage = "https://github.com/vlang/vls";
|
meta.homepage = "https://github.com/vlang/vls";
|
||||||
|
@ -1684,12 +1695,12 @@
|
||||||
};
|
};
|
||||||
vim = buildGrammar {
|
vim = buildGrammar {
|
||||||
language = "vim";
|
language = "vim";
|
||||||
version = "55ff1b0";
|
version = "e39a7bb";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "vigoux";
|
owner = "vigoux";
|
||||||
repo = "tree-sitter-viml";
|
repo = "tree-sitter-viml";
|
||||||
rev = "55ff1b080c09edeced9b748cf4c16d0b49d17fb9";
|
rev = "e39a7bbcfdcfc7900629962b785c7e14503ae590";
|
||||||
hash = "sha256-bMh6RPP0+zpNkMS/mpbKTaug9EL6u4kTcztnEXaNGyA=";
|
hash = "sha256-f3UAHwCL5yerEjmuDp+guzX4/ik4h7ProH5P8AmdO10=";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/vigoux/tree-sitter-viml";
|
meta.homepage = "https://github.com/vigoux/tree-sitter-viml";
|
||||||
};
|
};
|
||||||
|
@ -1750,12 +1761,12 @@
|
||||||
};
|
};
|
||||||
zig = buildGrammar {
|
zig = buildGrammar {
|
||||||
language = "zig";
|
language = "zig";
|
||||||
version = "b0693dd";
|
version = "6b3f578";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "maxxnino";
|
owner = "maxxnino";
|
||||||
repo = "tree-sitter-zig";
|
repo = "tree-sitter-zig";
|
||||||
rev = "b0693dd473efd91d6085acd8e0ff9c627d37e077";
|
rev = "6b3f5788f38be900b45f5af5a753bf6a37d614b8";
|
||||||
hash = "sha256-Jmz2XDI+mrBYE2TEhxPJZbICbhs5AOC0tyC4OOgT61U=";
|
hash = "sha256-KwMo1gwre8/AXkXXwQqPHZIEPXM26PK8SI0p3tmkt24=";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/maxxnino/tree-sitter-zig";
|
meta.homepage = "https://github.com/maxxnino/tree-sitter-zig";
|
||||||
};
|
};
|
||||||
|
|
|
@ -941,6 +941,10 @@ self: super: {
|
||||||
dependencies = with self; [ telescope-nvim ];
|
dependencies = with self; [ telescope-nvim ];
|
||||||
});
|
});
|
||||||
|
|
||||||
|
telescope-undo-nvim = super.telescope-undo-nvim.overrideAttrs (old: {
|
||||||
|
dependencies = with self; [ telescope-nvim ];
|
||||||
|
});
|
||||||
|
|
||||||
telescope-z-nvim = super.telescope-z-nvim.overrideAttrs (old: {
|
telescope-z-nvim = super.telescope-z-nvim.overrideAttrs (old: {
|
||||||
dependencies = with self; [ telescope-nvim ];
|
dependencies = with self; [ telescope-nvim ];
|
||||||
});
|
});
|
||||||
|
@ -1088,7 +1092,7 @@ self: super: {
|
||||||
libiconv
|
libiconv
|
||||||
];
|
];
|
||||||
|
|
||||||
cargoSha256 = "sha256-jpO26OXaYcWirQ5tTKIwlva7dHIfdmnruF4WdwSq0nI=";
|
cargoSha256 = "sha256-JQwT7IFYC/K+t3YO34hoalxdt1TEsmEcBXtDKFVdles=";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
''
|
''
|
||||||
|
|
|
@ -699,6 +699,7 @@ https://github.com/nvim-telescope/telescope-project.nvim/,,
|
||||||
https://github.com/nvim-telescope/telescope-symbols.nvim/,,
|
https://github.com/nvim-telescope/telescope-symbols.nvim/,,
|
||||||
https://github.com/nvim-telescope/telescope-ui-select.nvim/,,
|
https://github.com/nvim-telescope/telescope-ui-select.nvim/,,
|
||||||
https://github.com/fhill2/telescope-ultisnips.nvim/,,
|
https://github.com/fhill2/telescope-ultisnips.nvim/,,
|
||||||
|
https://github.com/debugloop/telescope-undo.nvim/,HEAD,
|
||||||
https://github.com/tom-anders/telescope-vim-bookmarks.nvim/,,
|
https://github.com/tom-anders/telescope-vim-bookmarks.nvim/,,
|
||||||
https://github.com/nvim-telescope/telescope-z.nvim/,,
|
https://github.com/nvim-telescope/telescope-z.nvim/,,
|
||||||
https://github.com/jvgrootveld/telescope-zoxide/,,
|
https://github.com/jvgrootveld/telescope-zoxide/,,
|
||||||
|
|
|
@ -927,8 +927,8 @@ let
|
||||||
mktplcRef = {
|
mktplcRef = {
|
||||||
name = "gitlens";
|
name = "gitlens";
|
||||||
publisher = "eamodio";
|
publisher = "eamodio";
|
||||||
version = "2022.12.604";
|
version = "2023.2.1204";
|
||||||
sha256 = "sha256-yfqGITviASp5ZDEJA+zyVz1LpPWV4FM/4fU4eq52Xng=";
|
sha256 = "sha256-FurYfkw+mOjyymR1VCGf0jJ2JCZJ8eGb1J7zD2peBjw=";
|
||||||
};
|
};
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";
|
changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";
|
||||||
|
|
|
@ -32,15 +32,15 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"dev": {
|
"dev": {
|
||||||
"version": "111.0.5563.19",
|
"version": "112.0.5582.0",
|
||||||
"sha256": "0hrapzi45jpkb1b87nzlb896jd2h2jbz1mq91md5r2y6ag6fc55w",
|
"sha256": "139g5cpqxvh6bf2x3aqs4md379rwrx143f8lcsym8hgpqdwq5sfk",
|
||||||
"sha256bin64": "02aaqny23dcdp611n6jr7swkjnx1wd0lb8dgxq53b806f0s374cp",
|
"sha256bin64": "1npksnnxcni62wx517xy64ysk3ja868gw48vgx4q8xc93g15n89c",
|
||||||
"deps": {
|
"deps": {
|
||||||
"gn": {
|
"gn": {
|
||||||
"version": "2022-12-12",
|
"version": "2023-01-30",
|
||||||
"url": "https://gn.googlesource.com/gn",
|
"url": "https://gn.googlesource.com/gn",
|
||||||
"rev": "5e19d2fb166fbd4f6f32147fbb2f497091a54ad8",
|
"rev": "84c8431f3e03cc6226c59dd49637c15ea31169a1",
|
||||||
"sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30"
|
"sha256": "15dqiy1bf1cixqg23bqpfb8mrlcxqbarjwzajc5hjmivykrjn2s3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
python3Packages.buildPythonApplication rec {
|
python3Packages.buildPythonApplication rec {
|
||||||
pname = "flexget";
|
pname = "flexget";
|
||||||
version = "3.5.22";
|
version = "3.5.23";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
# Fetch from GitHub in order to use `requirements.in`
|
# Fetch from GitHub in order to use `requirements.in`
|
||||||
|
@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
|
||||||
owner = "flexget";
|
owner = "flexget";
|
||||||
repo = "flexget";
|
repo = "flexget";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-I+7fTSyw5oKrad6HMxhex2wI4JLXDtoxHL4pxO3w2l8=";
|
hash = "sha256-VWpcXwiQHpQ3X/rmm6fWfPfuUoUmWQMfOq5A87nED3A=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -10,7 +10,10 @@
|
||||||
, openssl
|
, openssl
|
||||||
, libusb1
|
, libusb1
|
||||||
, AppKit
|
, AppKit
|
||||||
|
, git
|
||||||
, openssh
|
, openssh
|
||||||
|
, testers
|
||||||
|
, radicle-cli
|
||||||
}:
|
}:
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
|
@ -50,11 +53,18 @@ rustPlatform.buildRustPackage rec {
|
||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeCheckInputs = [ openssh ];
|
nativeCheckInputs = [
|
||||||
|
git
|
||||||
|
openssh
|
||||||
|
];
|
||||||
preCheck = ''
|
preCheck = ''
|
||||||
eval $(ssh-agent)
|
eval $(ssh-agent)
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
passthru.tests = {
|
||||||
|
version = testers.testVersion { package = radicle-cli; };
|
||||||
|
};
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Command-line tooling for Radicle, a decentralized code collaboration network";
|
description = "Command-line tooling for Radicle, a decentralized code collaboration network";
|
||||||
homepage = "https://radicle.xyz";
|
homepage = "https://radicle.xyz";
|
||||||
|
|
|
@ -28,13 +28,13 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "jellyfin-media-player";
|
pname = "jellyfin-media-player";
|
||||||
version = "1.7.1";
|
version = "1.8.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "jellyfin";
|
owner = "jellyfin";
|
||||||
repo = "jellyfin-media-player";
|
repo = "jellyfin-media-player";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-piMqI4qxcNUSNC+0JE2KZ/cvlNgtxUOnSfrcWnBVzC0=";
|
sha256 = "sha256-/FqxZd0cFSfkeBQmZ2gU+5FUZZ+WbQ8c2IjaZ4/uGt8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|
|
@ -18,11 +18,11 @@
|
||||||
|
|
||||||
buildPythonApplication rec {
|
buildPythonApplication rec {
|
||||||
pname = "jellyfin-mpv-shim";
|
pname = "jellyfin-mpv-shim";
|
||||||
version = "2.2.0";
|
version = "2.3.1";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "sha256-JiSC6WjrLsWk3/m/EHq7KNXaJ6rqT2fG9TT1jPvYlK0=";
|
sha256 = "sha256-v5enaNcZ0aoyEcOFfkAsOIwEpVZ2oqYGMkLlDepBY7c=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -45,7 +45,7 @@ stdenvNoCC.mkDerivation (attrs // {
|
||||||
|
|
||||||
installPhase = attrs.installPhase or ''
|
installPhase = attrs.installPhase or ''
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
mix deps.get --only ${mixEnv}
|
mix deps.get ''${mixEnv:+--only $mixEnv}
|
||||||
find "$TEMPDIR/deps" -path '*/.git/*' -a ! -name HEAD -exec rm -rf {} +
|
find "$TEMPDIR/deps" -path '*/.git/*' -a ! -name HEAD -exec rm -rf {} +
|
||||||
cp -r --no-preserve=mode,ownership,timestamps $TEMPDIR/deps $out
|
cp -r --no-preserve=mode,ownership,timestamps $TEMPDIR/deps $out
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
|
|
|
@ -262,7 +262,7 @@ stdenv.mkDerivation rec {
|
||||||
description = "A cross-language development platform for in-memory data";
|
description = "A cross-language development platform for in-memory data";
|
||||||
homepage = "https://arrow.apache.org/docs/cpp/";
|
homepage = "https://arrow.apache.org/docs/cpp/";
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; # waiting on gtest changes in staging
|
broken = stdenv.isLinux && stdenv.isAarch64; # waiting on gtest changes in staging
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
maintainers = with maintainers; [ tobim veprbl cpcloud ];
|
maintainers = with maintainers; [ tobim veprbl cpcloud ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,4 +1,10 @@
|
||||||
{ lib, stdenv, cmake, ninja, fetchFromGitHub }:
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, fetchFromGitHub
|
||||||
|
, cmake
|
||||||
|
, ninja
|
||||||
|
, static ? stdenv.hostPlatform.isStatic,
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "gtest";
|
pname = "gtest";
|
||||||
|
@ -20,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||||
nativeBuildInputs = [ cmake ninja ];
|
nativeBuildInputs = [ cmake ninja ];
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DBUILD_SHARED_LIBS=ON"
|
"-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}"
|
||||||
] ++ lib.optionals (stdenv.cc.isClang && (lib.versionOlder stdenv.cc.version "16.0")) [
|
] ++ lib.optionals (stdenv.cc.isClang && (lib.versionOlder stdenv.cc.version "16.0")) [
|
||||||
# Enable C++17 support
|
# Enable C++17 support
|
||||||
# https://github.com/google/googletest/issues/3081
|
# https://github.com/google/googletest/issues/3081
|
||||||
|
|
|
@ -4,12 +4,12 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "liburing";
|
pname = "liburing";
|
||||||
version = "2.2";
|
version = "2.3";
|
||||||
|
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "http://git.kernel.dk/${pname}";
|
url = "http://git.kernel.dk/${pname}";
|
||||||
rev = "liburing-${version}";
|
rev = "liburing-${version}";
|
||||||
sha256 = "sha256-M/jfxZ+5DmFvlAt8sbXrjBTPf2gLd9UyTNymtjD+55g";
|
sha256 = "sha256-vN6lLb5kpgHTKDxwibJPS61sdelILETVtJE2BYgp79k=";
|
||||||
};
|
};
|
||||||
|
|
||||||
separateDebugInfo = true;
|
separateDebugInfo = true;
|
||||||
|
|
|
@ -1,70 +0,0 @@
|
||||||
{ lib
|
|
||||||
, buildPythonPackage
|
|
||||||
, pythonOlder
|
|
||||||
, fetchFromGitHub
|
|
||||||
, configargparse
|
|
||||||
, aiohttp
|
|
||||||
, async-timeout
|
|
||||||
, appdirs
|
|
||||||
, readlike
|
|
||||||
, requests
|
|
||||||
, reparser
|
|
||||||
, protobuf
|
|
||||||
, urwid
|
|
||||||
, mechanicalsoup
|
|
||||||
, httpretty
|
|
||||||
, pytestCheckHook
|
|
||||||
}:
|
|
||||||
|
|
||||||
buildPythonPackage rec {
|
|
||||||
pname = "hangups";
|
|
||||||
version = "0.4.18";
|
|
||||||
|
|
||||||
disabled = pythonOlder "3.6";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "tdryer";
|
|
||||||
repo = "hangups";
|
|
||||||
rev = "v${version}";
|
|
||||||
hash = "sha256-vq1OrOUPMQtezBFlisP2f/bvvYprDjhOuwUcT8rmIvw=";
|
|
||||||
};
|
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
substituteInPlace setup.py \
|
|
||||||
--replace "protobuf>=3.1.0,<4" "protobuf" \
|
|
||||||
--replace "MechanicalSoup>=0.6.0,<0.13" "MechanicalSoup"
|
|
||||||
'';
|
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
|
||||||
configargparse
|
|
||||||
aiohttp
|
|
||||||
async-timeout
|
|
||||||
appdirs
|
|
||||||
readlike
|
|
||||||
requests
|
|
||||||
reparser
|
|
||||||
protobuf
|
|
||||||
urwid
|
|
||||||
mechanicalsoup
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeCheckInputs = [
|
|
||||||
httpretty
|
|
||||||
pytestCheckHook
|
|
||||||
];
|
|
||||||
|
|
||||||
pythonImportsCheck = [
|
|
||||||
"hangups"
|
|
||||||
"hangups.client"
|
|
||||||
"hangups.event"
|
|
||||||
"hangups.parsers"
|
|
||||||
"hangups.user"
|
|
||||||
];
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "The first third-party instant messaging client for Google Hangouts";
|
|
||||||
homepage = "https://github.com/tdryer/hangups";
|
|
||||||
license = licenses.mit;
|
|
||||||
maintainers = with maintainers; [ dotlambda ];
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -2,6 +2,7 @@
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchPypi
|
, fetchPypi
|
||||||
, pythonOlder
|
, pythonOlder
|
||||||
|
, pythonAtLeast
|
||||||
, subunit
|
, subunit
|
||||||
, testrepository
|
, testrepository
|
||||||
, testtools
|
, testtools
|
||||||
|
@ -13,7 +14,7 @@
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "mox3";
|
pname = "mox3";
|
||||||
version = "1.1.0";
|
version = "1.1.0";
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6" || pythonAtLeast "3.11";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
|
|
|
@ -1,35 +1,42 @@
|
||||||
{ lib
|
{ lib
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
|
, python3
|
||||||
, bash
|
, bash
|
||||||
, cmake
|
, cmake
|
||||||
, fetchPypi
|
, fetchFromGitHub
|
||||||
|
, gtest
|
||||||
, isPy27
|
, isPy27
|
||||||
, nbval
|
, nbval
|
||||||
, numpy
|
, numpy
|
||||||
, protobuf
|
, protobuf
|
||||||
|
, pybind11
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
, six
|
, six
|
||||||
, tabulate
|
, tabulate
|
||||||
, typing-extensions
|
, typing-extensions
|
||||||
, pythonRelaxDepsHook
|
, pythonRelaxDepsHook
|
||||||
, pytest-runner
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
let
|
||||||
|
gtestStatic = gtest.override { static = true; };
|
||||||
|
in buildPythonPackage rec {
|
||||||
pname = "onnx";
|
pname = "onnx";
|
||||||
version = "1.13.0";
|
version = "1.13.0";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = isPy27;
|
disabled = isPy27;
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchFromGitHub {
|
||||||
inherit pname version;
|
owner = pname;
|
||||||
sha256 = "sha256-QQs5lQNnhX+XtlCTaB/iSVouI9Y3d6is6vlsVqFtFm4=";
|
repo = pname;
|
||||||
|
rev = "refs/tags/v${version}";
|
||||||
|
sha256 = "sha256-D8POBAkZVr0O5i4qsSuYRkDfL8WsDTqzgNACmmkFwGs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
pythonRelaxDepsHook
|
pythonRelaxDepsHook
|
||||||
|
pybind11
|
||||||
];
|
];
|
||||||
|
|
||||||
pythonRelaxDeps = [ "protobuf" ];
|
pythonRelaxDeps = [ "protobuf" ];
|
||||||
|
@ -44,30 +51,36 @@ buildPythonPackage rec {
|
||||||
nativeCheckInputs = [
|
nativeCheckInputs = [
|
||||||
nbval
|
nbval
|
||||||
pytestCheckHook
|
pytestCheckHook
|
||||||
pytest-runner
|
|
||||||
tabulate
|
tabulate
|
||||||
];
|
];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
chmod +x tools/protoc-gen-mypy.sh.in
|
chmod +x tools/protoc-gen-mypy.sh.in
|
||||||
patchShebangs tools/protoc-gen-mypy.sh.in
|
patchShebangs tools/protoc-gen-mypy.sh.in
|
||||||
|
|
||||||
|
substituteInPlace setup.py \
|
||||||
|
--replace 'setup_requires.append("pytest-runner")' ""
|
||||||
|
|
||||||
|
# prevent from fetching & building own gtest
|
||||||
|
substituteInPlace CMakeLists.txt \
|
||||||
|
--replace 'include(googletest)' ""
|
||||||
|
substituteInPlace cmake/unittest.cmake \
|
||||||
|
--replace 'googletest)' ')'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# Set CMAKE_INSTALL_LIBDIR to lib explicitly, because otherwise it gets set
|
|
||||||
# to lib64 and cmake incorrectly looks for the protobuf library in lib64
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
|
# Set CMAKE_INSTALL_LIBDIR to lib explicitly, because otherwise it gets set
|
||||||
|
# to lib64 and cmake incorrectly looks for the protobuf library in lib64
|
||||||
export CMAKE_ARGS="-DCMAKE_INSTALL_LIBDIR=lib -DONNX_USE_PROTOBUF_SHARED_LIBS=ON"
|
export CMAKE_ARGS="-DCMAKE_INSTALL_LIBDIR=lib -DONNX_USE_PROTOBUF_SHARED_LIBS=ON"
|
||||||
|
'' + lib.optionalString doCheck ''
|
||||||
|
export CMAKE_ARGS+=" -Dgoogletest_STATIC_LIBRARIES=${gtestStatic}/lib/libgtest.a -Dgoogletest_INCLUDE_DIRS=${lib.getDev gtestStatic}/include"
|
||||||
|
export ONNX_BUILD_TESTS=1
|
||||||
'';
|
'';
|
||||||
|
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
export MAX_JOBS=$NIX_BUILD_CORES
|
export MAX_JOBS=$NIX_BUILD_CORES
|
||||||
'';
|
'';
|
||||||
|
|
||||||
disabledTestPaths = [
|
|
||||||
# Unexpected output fields from running code: {'stderr'}
|
|
||||||
"onnx/examples/np_array_tensorproto.ipynb"
|
|
||||||
];
|
|
||||||
|
|
||||||
# The executables are just utility scripts that aren't too important
|
# The executables are just utility scripts that aren't too important
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
rm -r $out/bin
|
rm -r $out/bin
|
||||||
|
@ -76,6 +89,35 @@ buildPythonPackage rec {
|
||||||
# The setup.py does all the configuration
|
# The setup.py does all the configuration
|
||||||
dontUseCmakeConfigure = true;
|
dontUseCmakeConfigure = true;
|
||||||
|
|
||||||
|
doCheck = true;
|
||||||
|
preCheck = ''
|
||||||
|
export HOME=$(mktemp -d)
|
||||||
|
|
||||||
|
# detecting source dir as a python package confuses pytest
|
||||||
|
mv onnx/__init__.py onnx/__init__.py.hidden
|
||||||
|
'';
|
||||||
|
pytestFlagsArray = [ "onnx/test" "onnx/examples" ];
|
||||||
|
disabledTests = [
|
||||||
|
# attempts to fetch data from web
|
||||||
|
"test_bvlc_alexnet_cpu"
|
||||||
|
"test_densenet121_cpu"
|
||||||
|
"test_inception_v1_cpu"
|
||||||
|
"test_inception_v2_cpu"
|
||||||
|
"test_resnet50_cpu"
|
||||||
|
"test_shufflenet_cpu"
|
||||||
|
"test_squeezenet_cpu"
|
||||||
|
"test_vgg19_cpu"
|
||||||
|
"test_zfnet512_cpu"
|
||||||
|
];
|
||||||
|
disabledTestPaths = [
|
||||||
|
# Unexpected output fields from running code: {'stderr'}
|
||||||
|
"onnx/examples/np_array_tensorproto.ipynb"
|
||||||
|
];
|
||||||
|
postCheck = ''
|
||||||
|
# run "cpp" tests
|
||||||
|
.setuptools-cmake-build/onnx_gtests
|
||||||
|
'';
|
||||||
|
|
||||||
pythonImportsCheck = [
|
pythonImportsCheck = [
|
||||||
"onnx"
|
"onnx"
|
||||||
];
|
];
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pefile";
|
pname = "pefile";
|
||||||
version = "2022.5.30";
|
version = "2023.2.7";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
|
@ -16,8 +16,8 @@ buildPythonPackage rec {
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "erocarrera";
|
owner = "erocarrera";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-Cv20hJsErHFSuS5Q1kqLNp4DAsPXv/eFhaU9oYECSeI=";
|
hash = "sha256-lD8GpNl+cVNYTZUKFRF1/2kDwEbn/ekRBNBTYuFmFW0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -38,6 +38,7 @@ buildPythonPackage rec {
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Multi-platform Python module to parse and work with Portable Executable (aka PE) files";
|
description = "Multi-platform Python module to parse and work with Portable Executable (aka PE) files";
|
||||||
homepage = "https://github.com/erocarrera/pefile";
|
homepage = "https://github.com/erocarrera/pefile";
|
||||||
|
changelog = "https://github.com/erocarrera/pefile/releases/tag/v${version}";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ pamplemousse ];
|
maintainers = with maintainers; [ pamplemousse ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -3,14 +3,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "python-mpv-jsonipc";
|
pname = "python-mpv-jsonipc";
|
||||||
version = "1.1.11";
|
version = "1.1.14";
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "iwalton3";
|
owner = "iwalton3";
|
||||||
repo = "python-mpv-jsonipc";
|
repo = "python-mpv-jsonipc";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "034vc2j54dciiq80k7jn6kx4g7i58sjk0ykma039k5rihj2rblpk";
|
sha256 = "sha256-kOC6FsLYTVx/cCL8AZuGkKarHqAESjJA+2BUagbiy3A=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# 'mpv-jsonipc' does not have any tests
|
# 'mpv-jsonipc' does not have any tests
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
{ lib
|
{ lib
|
||||||
|
, stdenv
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, loguru
|
, loguru
|
||||||
|
@ -10,7 +11,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "python-utils";
|
pname = "python-utils";
|
||||||
version = "3.4.5";
|
version = "3.5.2";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -19,7 +20,7 @@ buildPythonPackage rec {
|
||||||
owner = "WoLpH";
|
owner = "WoLpH";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-O/+jvdzzxUFaQdAfUM9p40fPPDNN+stTauCD993HH6Y=";
|
hash = "sha256-FFBWkq7ct4JWSTH4Ldg+pbG/BAiW33puB7lqFPBjptw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
@ -47,6 +48,11 @@ buildPythonPackage rec {
|
||||||
"_python_utils_tests"
|
"_python_utils_tests"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
disabledTests = lib.optionals stdenv.isDarwin [
|
||||||
|
# Flaky tests on darwin
|
||||||
|
"test_timeout_generator"
|
||||||
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Module with some convenient utilities";
|
description = "Module with some convenient utilities";
|
||||||
homepage = "https://github.com/WoLpH/python-utils";
|
homepage = "https://github.com/WoLpH/python-utils";
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
{ lib
|
{ lib
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, pythonAtLeast
|
|
||||||
, fetchPypi
|
, fetchPypi
|
||||||
, flit
|
, flit
|
||||||
, hypothesis
|
, hypothesis
|
||||||
|
@ -9,15 +8,12 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "validobj";
|
pname = "validobj";
|
||||||
version = "0.6";
|
version = "0.7";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
# https://github.com/Zaharid/validobj/issues/8
|
|
||||||
disabled = pythonAtLeast "3.11";
|
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "sha256-BvnHn0Erk87Ce3tYwYf0tBwRJMrG19Af/Y568VJ02uo=";
|
sha256 = "cbij55HZKVLO3MLoDTtFT2YYNVZwbNaYEk+35gIcGdo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ flit ];
|
nativeBuildInputs = [ flit ];
|
||||||
|
|
|
@ -16,14 +16,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "versioningit";
|
pname = "versioningit";
|
||||||
version = "2.1.0";
|
version = "2.2.0";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-c/KWXjDS6/1/+ra/JjaPIjdXBiLdKknH+8GZXenGdtY=";
|
hash = "sha256-6xjnunJoqIC/HM/pLlNOlqs04Dl/KNy8s/wNpPaltr0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "lua-language-server";
|
pname = "lua-language-server";
|
||||||
version = "3.6.10";
|
version = "3.6.11";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "luals";
|
owner = "luals";
|
||||||
repo = "lua-language-server";
|
repo = "lua-language-server";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-QnkWEf1Uv+CZwEyv1b3WMPvaOZEn+mKH5w3CPyw02CQ=";
|
sha256 = "sha256-NMybClvpTLad7xnd8uPhUHmv6fvaYIKkFHsv7SSDi2M=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -77,6 +77,7 @@ stdenv.mkDerivation rec {
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A language server that offers Lua language support";
|
description = "A language server that offers Lua language support";
|
||||||
homepage = "https://github.com/luals/lua-language-server";
|
homepage = "https://github.com/luals/lua-language-server";
|
||||||
|
changelog = "https://github.com/LuaLS/lua-language-server/blob/${version}/changelog.md";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ figsoda sei40kr ];
|
maintainers = with maintainers; [ figsoda sei40kr ];
|
||||||
platforms = platforms.linux ++ platforms.darwin;
|
platforms = platforms.linux ++ platforms.darwin;
|
||||||
|
|
|
@ -10,16 +10,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "cargo-semver-checks";
|
pname = "cargo-semver-checks";
|
||||||
version = "0.17.1";
|
version = "0.18.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "obi1kenobi";
|
owner = "obi1kenobi";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-zObflf9BKq24km54LW7It4Lvff0OKYNDb02uatdX7g4=";
|
sha256 = "sha256-ugcmsm1j2a1wOnUe9u70yoRXALCmtXSnb80N4B4IUWE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "sha256-itL6WpM4OLn4mzdB0ytM2J7F1fRDrXwCaI/8WdLo6y0=";
|
cargoSha256 = "sha256-PxnPCevjVvmFMlmYv6qwIBZk2MThz65hgUyVhm2tzlc=";
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
||||||
|
@ -29,9 +29,9 @@ rustPlatform.buildRustPackage rec {
|
||||||
|
|
||||||
checkFlags = [
|
checkFlags = [
|
||||||
# requires nightly version of cargo-rustdoc
|
# requires nightly version of cargo-rustdoc
|
||||||
"--skip=dump::tests"
|
|
||||||
"--skip=query::tests"
|
"--skip=query::tests"
|
||||||
"--skip=verify_binary_contains_lints"
|
"--skip=verify_binary_contains_lints"
|
||||||
|
"--skip=rustdoc_cmd::tests"
|
||||||
];
|
];
|
||||||
|
|
||||||
# use system openssl
|
# use system openssl
|
||||||
|
|
13
pkgs/development/tools/squawk/correct-Cargo.lock.patch
Normal file
13
pkgs/development/tools/squawk/correct-Cargo.lock.patch
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
diff --git a/Cargo.lock b/Cargo.lock
|
||||||
|
index d5803a8..384224d 100644
|
||||||
|
--- a/Cargo.lock
|
||||||
|
+++ b/Cargo.lock
|
||||||
|
@@ -1585,7 +1585,7 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "squawk"
|
||||||
|
-version = "0.19.0"
|
||||||
|
+version = "0.20.0"
|
||||||
|
dependencies = [
|
||||||
|
"atty",
|
||||||
|
"base64 0.12.3",
|
67
pkgs/development/tools/squawk/default.nix
Normal file
67
pkgs/development/tools/squawk/default.nix
Normal file
|
@ -0,0 +1,67 @@
|
||||||
|
{ darwin
|
||||||
|
, fetchFromGitHub
|
||||||
|
, lib
|
||||||
|
, libiconv
|
||||||
|
, libpg_query
|
||||||
|
, openssl
|
||||||
|
, pkg-config
|
||||||
|
, rustPlatform
|
||||||
|
, stdenv
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
# The query parser produces a slightly different AST between major versions
|
||||||
|
# and Squawk is not capable of handling >=14 correctly yet.
|
||||||
|
libpg_query13 = libpg_query.overrideAttrs (_: rec {
|
||||||
|
version = "13-2.2.0";
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "pganalyze";
|
||||||
|
repo = "libpg_query";
|
||||||
|
rev = version;
|
||||||
|
hash = "sha256-gEkcv/j8ySUYmM9lx1hRF/SmuQMYVHwZAIYOaCQWAFs=";
|
||||||
|
};
|
||||||
|
});
|
||||||
|
in
|
||||||
|
rustPlatform.buildRustPackage rec {
|
||||||
|
pname = "squawk";
|
||||||
|
version = "0.20.0";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "sbdchd";
|
||||||
|
repo = pname;
|
||||||
|
rev = "v${version}";
|
||||||
|
hash = "sha256-v9F+HfscX4dIExIP1YvxOldZPPtmxh8lO3SREu6M+C0=";
|
||||||
|
};
|
||||||
|
|
||||||
|
cargoHash = "sha256-kSaQxqom8LSCOQBoIZ1iv+q2+Ih8l61L97xXv5c4a0k=";
|
||||||
|
|
||||||
|
cargoPatches = [
|
||||||
|
./correct-Cargo.lock.patch
|
||||||
|
];
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
./fix-postgresql-version-in-snapshot-test.patch
|
||||||
|
];
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
pkg-config
|
||||||
|
rustPlatform.bindgenHook
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = lib.optionals (!stdenv.isDarwin) [
|
||||||
|
libiconv
|
||||||
|
openssl
|
||||||
|
] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
|
||||||
|
CoreFoundation
|
||||||
|
Security
|
||||||
|
]);
|
||||||
|
|
||||||
|
LIBPG_QUERY_PATH = libpg_query13;
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Linter for PostgreSQL, focused on migrations";
|
||||||
|
homepage = "https://squawkhq.com/";
|
||||||
|
changelog = "https://github.com/sbdchd/squawk/blob/v${version}/CHANGELOG.md";
|
||||||
|
license = licenses.gpl3Only;
|
||||||
|
maintainers = with lib.maintainers; [ andrewsmith ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -0,0 +1,13 @@
|
||||||
|
diff --git a/parser/src/snapshots/squawk_parser__parse__tests__parse_sql_query_json.snap b/parser/src/snapshots/squawk_parser__parse__tests__parse_sql_query_json.snap
|
||||||
|
index 7273b74..ae94927 100644
|
||||||
|
--- a/parser/src/snapshots/squawk_parser__parse__tests__parse_sql_query_json.snap
|
||||||
|
+++ b/parser/src/snapshots/squawk_parser__parse__tests__parse_sql_query_json.snap
|
||||||
|
@@ -133,7 +133,7 @@ Ok(
|
||||||
|
}),
|
||||||
|
]),
|
||||||
|
"version": Number(
|
||||||
|
- 130003,
|
||||||
|
+ 130008,
|
||||||
|
),
|
||||||
|
}),
|
||||||
|
)
|
|
@ -8,16 +8,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "vsmtp";
|
pname = "vsmtp";
|
||||||
version = "2.1.0";
|
version = "2.1.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "viridIT";
|
owner = "viridIT";
|
||||||
repo = "vsmtp";
|
repo = "vsmtp";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-FI4BvU+83nTzRLJQZ1l1eOn41ZeA62Db+p3d//5o0Wk=";
|
hash = "sha256-iyjtSeus1gctylYfXAEqpwZNPg/KU/lXv82Wi0h5mAM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-Qhhh0riM1qeD3/JZINvY0t5fEOj+prI0fyXagdR43sc=";
|
cargoHash = "sha256-N4cxAFAFtYnd1/wdomm0VYosDY5uy+0z9pRGThSMbG4=";
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
|
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
buildNpmPackage rec {
|
buildNpmPackage rec {
|
||||||
pname = "uptime-kuma";
|
pname = "uptime-kuma";
|
||||||
version = "1.19.6";
|
version = "1.20.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "louislam";
|
owner = "louislam";
|
||||||
repo = "uptime-kuma";
|
repo = "uptime-kuma";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-Hk0me4VPP8vKp4IhzQKjjhM2BWLGSHnN7JiDJu2WlE8=";
|
sha256 = "sha256-dMjhCsTjXOwxhvJeL25KNkFhRCbCuxG7Ccz8mP7P38A=";
|
||||||
};
|
};
|
||||||
|
|
||||||
npmDepsHash = "sha256-lVMPxUe+W/FlFQS2L+/UfpC21pIKJE89clmJywSv7w4=";
|
npmDepsHash = "sha256-Ks6KYHP6+ym9PGJ1a5nMxT7JXZyknHeaCmAkjJuCTXU=";
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# Fixes the permissions of the database being not set correctly
|
# Fixes the permissions of the database being not set correctly
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, fetchurl
|
, fetchurl
|
||||||
, cmake
|
, cmake
|
||||||
|
, ffmpeg
|
||||||
, libdrm
|
, libdrm
|
||||||
, libglvnd
|
, libglvnd
|
||||||
, libffi
|
, libffi
|
||||||
|
@ -29,6 +30,7 @@ let
|
||||||
# does not search for system-wide installations.
|
# does not search for system-wide installations.
|
||||||
# It also expects the version specified in the repository, which can be incompatible
|
# It also expects the version specified in the repository, which can be incompatible
|
||||||
# with the version in nixpkgs (e.g. for SPIRV-Headers), so we don't want to patch in our packages.
|
# with the version in nixpkgs (e.g. for SPIRV-Headers), so we don't want to patch in our packages.
|
||||||
|
# The revisions are extracted from https://github.com/KhronosGroup/VK-GL-CTS/blob/main/external/fetch_sources.py#L290
|
||||||
amber = fetchFromGitHub {
|
amber = fetchFromGitHub {
|
||||||
owner = "google";
|
owner = "google";
|
||||||
repo = "amber";
|
repo = "amber";
|
||||||
|
@ -44,43 +46,49 @@ let
|
||||||
glslang = fetchFromGitHub {
|
glslang = fetchFromGitHub {
|
||||||
owner = "KhronosGroup";
|
owner = "KhronosGroup";
|
||||||
repo = "glslang";
|
repo = "glslang";
|
||||||
rev = "22d39cd684d136a81778cc17a0226ffad40d1cee";
|
rev = "a0ad0d7067521fff880e36acfb8ce453421c3f25";
|
||||||
hash = "sha256-6LplxN7HOMK1NfeD32P5JAMpCBlouttxLEOT/XTVpLw=";
|
hash = "sha256-ZKkFHGitLjw5LPJW1TswIJ+KulkrS8C4G3dUF5U/F2c=";
|
||||||
};
|
};
|
||||||
spirv-tools = fetchFromGitHub {
|
spirv-tools = fetchFromGitHub {
|
||||||
owner = "KhronosGroup";
|
owner = "KhronosGroup";
|
||||||
repo = "SPIRV-Tools";
|
repo = "SPIRV-Tools";
|
||||||
rev = "b930e734ea198b7aabbbf04ee1562cf6f57962f0";
|
rev = "f98473ceeb1d33700d01e20910433583e5256030";
|
||||||
hash = "sha256-NWpFSRoxtYWi+hLUt9gpw0YScM3shcUwv9yUmbivRb0=";
|
hash = "sha256-RSUmfp9QZ7yRbLdFygz9mDfrgUUT8og+ZD9/6VkghMo=";
|
||||||
};
|
};
|
||||||
spirv-headers = fetchFromGitHub {
|
spirv-headers = fetchFromGitHub {
|
||||||
owner = "KhronosGroup";
|
owner = "KhronosGroup";
|
||||||
repo = "SPIRV-Headers";
|
repo = "SPIRV-Headers";
|
||||||
rev = "36c0c1596225e728bd49abb7ef56a3953e7ed468";
|
rev = "87d5b782bec60822aa878941e6b13c0a9a954c9b";
|
||||||
hash = "sha256-t1UMJnYONWOtOxc9zUgxr901QFNvqkgurjpFA8UzhYc=";
|
hash = "sha256-Bv10LM6YXaH2V64oqAcrps23higHzCjlIYYBob5zS4A=";
|
||||||
|
};
|
||||||
|
video-parser = fetchFromGitHub {
|
||||||
|
owner = "nvpro-samples";
|
||||||
|
repo = "vk_video_samples";
|
||||||
|
rev = "7d68747d3524842afaf050c5e00a10f5b8c07904";
|
||||||
|
hash = "sha256-L5IYDm0bLq+NlNrzozu0VQx8zL1na6AhrkjZKxOWSnU=";
|
||||||
};
|
};
|
||||||
vulkan-docs = fetchFromGitHub {
|
vulkan-docs = fetchFromGitHub {
|
||||||
owner = "KhronosGroup";
|
owner = "KhronosGroup";
|
||||||
repo = "Vulkan-Docs";
|
repo = "Vulkan-Docs";
|
||||||
rev = "135da3a538263ef0d194cab25e2bb091119bdc42";
|
rev = "9a2e576a052a1e65a5d41b593e693ff02745604b";
|
||||||
hash = "sha256-VZ8JxIuOEG7IjsVcsJOcC+EQeZbd16/+czLcO9t7dY4=";
|
hash = "sha256-DBA2FeV0G/HI8GUMtGYO52jk7wM4HMlKLDA4b+Wmo+k=";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "vulkan-cts";
|
pname = "vulkan-cts";
|
||||||
version = "1.3.4.1";
|
version = "1.3.5.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "KhronosGroup";
|
owner = "KhronosGroup";
|
||||||
repo = "VK-GL-CTS";
|
repo = "VK-GL-CTS";
|
||||||
rev = "${finalAttrs.pname}-${finalAttrs.version}";
|
rev = "${finalAttrs.pname}-${finalAttrs.version}";
|
||||||
hash = "sha256-XUFlYdudyRqa6iupB8N5QkUpumasyLLQEWcr4M4uP1g=";
|
hash = "sha256-RPuhcLJ5Ad41SFPjJBdghcNBPIGzZBeVWTjySWOp0KA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "out" "lib" ];
|
outputs = [ "out" "lib" ];
|
||||||
|
|
||||||
prePatch = ''
|
prePatch = ''
|
||||||
mkdir -p external/renderdoc/src external/spirv-headers external/vulkan-docs
|
mkdir -p external/renderdoc/src external/spirv-headers external/video-parser external/vulkan-docs
|
||||||
|
|
||||||
cp -r ${renderdoc} external/renderdoc/src/renderdoc_app.h
|
cp -r ${renderdoc} external/renderdoc/src/renderdoc_app.h
|
||||||
|
|
||||||
|
@ -89,11 +97,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
cp -r ${glslang} external/glslang/src
|
cp -r ${glslang} external/glslang/src
|
||||||
cp -r ${spirv-tools} external/spirv-tools/src
|
cp -r ${spirv-tools} external/spirv-tools/src
|
||||||
cp -r ${spirv-headers} external/spirv-headers/src
|
cp -r ${spirv-headers} external/spirv-headers/src
|
||||||
|
cp -r ${video-parser} external/video-parser/src
|
||||||
cp -r ${vulkan-docs} external/vulkan-docs/src
|
cp -r ${vulkan-docs} external/vulkan-docs/src
|
||||||
chmod u+w -R external
|
chmod u+w -R external
|
||||||
'';
|
'';
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
ffmpeg
|
||||||
libdrm
|
libdrm
|
||||||
libffi
|
libffi
|
||||||
libglvnd
|
libglvnd
|
||||||
|
|
|
@ -8,16 +8,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "noti";
|
pname = "noti";
|
||||||
version = "3.6.0";
|
version = "3.7.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "variadico";
|
owner = "variadico";
|
||||||
repo = "noti";
|
repo = "noti";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-FhVpw6PJcm0aYQBlN7AUjOkJgCzleOHXIXumSegtxfA=";
|
hash = "sha256-8CHSbKOiWNYqKBU1kqQm5t02DJq0JfoIaPsU6Ylc46E=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = null;
|
vendorHash = null;
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
|
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "pspg";
|
pname = "pspg";
|
||||||
version = "5.7.2";
|
version = "5.7.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "okbob";
|
owner = "okbob";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-IwkvQ3zKdnZ0lefmRQCxD5aeMw7aFbUzfFQZG7GtXlo=";
|
sha256 = "sha256-HZ771Q1UXnRds6o3EnZMyeu7Lt3IDFVFiUTc5snU0Bo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config installShellFiles ];
|
nativeBuildInputs = [ pkg-config installShellFiles ];
|
||||||
|
@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
|
||||||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
|
installManPage pspg.1
|
||||||
installShellCompletion --bash --cmd pspg bash-completion.sh
|
installShellCompletion --bash --cmd pspg bash-completion.sh
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{ lib, fetchurl, jdk, buildFHSUserEnv, unzip, makeDesktopItem }:
|
{ lib, fetchurl, jdk, buildFHSUserEnv, unzip, makeDesktopItem }:
|
||||||
let
|
let
|
||||||
version = "2022.12.7";
|
version = "2023.1.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
name = "burpsuite.jar";
|
name = "burpsuite.jar";
|
||||||
|
@ -8,7 +8,7 @@ let
|
||||||
"https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar"
|
"https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar"
|
||||||
"https://web.archive.org/web/https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar"
|
"https://web.archive.org/web/https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar"
|
||||||
];
|
];
|
||||||
sha256 = "2e354c2aadc58267bc282dde462d20b3aca7108077eb141d49f89a16172763cf";
|
sha256 = "620829b1a7bf9228e8671273d2f56f6dee4f16662712bcb4370923cb9d9a7540";
|
||||||
};
|
};
|
||||||
|
|
||||||
name = "burpsuite-${version}";
|
name = "burpsuite-${version}";
|
||||||
|
|
|
@ -21,13 +21,13 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
pname = "mozillavpn";
|
pname = "mozillavpn";
|
||||||
version = "2.13.0";
|
version = "2.13.1";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "mozilla-mobile";
|
owner = "mozilla-mobile";
|
||||||
repo = "mozilla-vpn-client";
|
repo = "mozilla-vpn-client";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
hash = "sha256-EwHuNJZpTb7oFOKKDv0zWgklUe95Th97KP9G5DqRokA=";
|
hash = "sha256-moXCtAFJyNkotYxBZSRP24tNHy5Rb6YW7mSKHDn9oXk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
netfilter-go-modules = (buildGoModule {
|
netfilter-go-modules = (buildGoModule {
|
||||||
|
@ -40,19 +40,19 @@ let
|
||||||
inherit src;
|
inherit src;
|
||||||
name = "${pname}-${version}-extension-bridge";
|
name = "${pname}-${version}-extension-bridge";
|
||||||
preBuild = "cd extension/bridge";
|
preBuild = "cd extension/bridge";
|
||||||
hash = "sha256-q6Wf+jrGjGMiDEmnErnDau6Li64Dyq8t2SN1I4rspBY=";
|
hash = "sha256-/gRP7Th2HnoEQU8psf0797Tq6md4+P5zR13z3U9xlrI=";
|
||||||
};
|
};
|
||||||
signatureDeps = rustPlatform.fetchCargoTarball {
|
signatureDeps = rustPlatform.fetchCargoTarball {
|
||||||
inherit src;
|
inherit src;
|
||||||
name = "${pname}-${version}-signature";
|
name = "${pname}-${version}-signature";
|
||||||
preBuild = "cd signature";
|
preBuild = "cd signature";
|
||||||
hash = "sha256-Dbu4WX2u3uDDUuZzS/hczypSFkQNnvuj2Su2X0QvSN4=";
|
hash = "sha256-IBT7qTNbGVutR90wUhm7+9tLehDfrYDHTDkBz8hD6G0=";
|
||||||
};
|
};
|
||||||
vpngleanDeps = rustPlatform.fetchCargoTarball {
|
vpngleanDeps = rustPlatform.fetchCargoTarball {
|
||||||
inherit src;
|
inherit src;
|
||||||
name = "${pname}-${version}-vpnglean";
|
name = "${pname}-${version}-vpnglean";
|
||||||
preBuild = "cd vpnglean";
|
preBuild = "cd vpnglean";
|
||||||
hash = "sha256-FDkziDDup+D7Bh+Wclqxn8Dhm/T2DanhjKXIAEFDhzc=";
|
hash = "sha256-vQDXsoKyawdVFIQZfH8LD+ehGk692ZcAwtou4OoqLNI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
in
|
in
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
, openresolv
|
, openresolv
|
||||||
, procps
|
, procps
|
||||||
|
, bash
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -24,6 +25,8 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
||||||
|
buildInputs = [ bash ];
|
||||||
|
|
||||||
makeFlags = [
|
makeFlags = [
|
||||||
"DESTDIR=$(out)"
|
"DESTDIR=$(out)"
|
||||||
"PREFIX=/"
|
"PREFIX=/"
|
||||||
|
|
|
@ -13,18 +13,18 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "gopass";
|
pname = "gopass";
|
||||||
version = "1.15.3";
|
version = "1.15.4";
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "gopasspw";
|
owner = "gopasspw";
|
||||||
repo = pname;
|
repo = "gopass";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-xXXlpr+qwks+hWTPMu9xJVIamLriipzm0XQqOpg8Ipw=";
|
hash = "sha256-Jm5H36DI6Mqdnm34+GUMEYxEefXLxgnwWo4fhKOayxY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-Tb7eIv2G/VfRP1J6taJjAOtZQakA2pcocZ9kZemcZo0=";
|
vendorHash = "sha256-IJSEU6a3AhA/cVTWXhVtNtvA/D0hyRlqL7pec1Tlyio=";
|
||||||
|
|
||||||
subPackages = [ "." ];
|
subPackages = [ "." ];
|
||||||
|
|
||||||
|
|
|
@ -7,16 +7,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "git-credential-gopass";
|
pname = "git-credential-gopass";
|
||||||
version = "1.15.3";
|
version = "1.15.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "gopasspw";
|
owner = "gopasspw";
|
||||||
repo = pname;
|
repo = "git-credential-gopass";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-x8hf1cZw+Hhizp8/vA8qJ+A6ERJUenjMeiuW8IFb/N0=";
|
hash = "sha256-S97KQ/yCyE1wBDao5KBKWPvoH+DmwpEJRiB6uJCGyFA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-YZoz7B12/VhWZRTDEVs2P36FrZoZs4OdPJMkR9H7D5I=";
|
vendorHash = "sha256-MLnfTdYR4/1qtnNCUs0TwGf5wMqE+V8jNCefeClQKfw=";
|
||||||
|
|
||||||
subPackages = [ "." ];
|
subPackages = [ "." ];
|
||||||
|
|
||||||
|
|
|
@ -7,16 +7,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "gopass-hibp";
|
pname = "gopass-hibp";
|
||||||
version = "1.15.3";
|
version = "1.15.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "gopasspw";
|
owner = "gopasspw";
|
||||||
repo = pname;
|
repo = "gopass-hibp";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-KqW1q3CnniNeQFypeZ6x/ov58SOMfAX5P2MMDKjMYBg=";
|
hash = "sha256-tqZVzYO3yKyUxfC+pxG+QuW9GBoPBteOdJMchepZ1jo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-w1Kxocrwcgn0g6ZBJ7obHraHK397bJltUFkm+/p4H5Y=";
|
vendorHash = "sha256-48KwEcB5KRUwrKCuyNhhuSVRXE3U5/yVYE2xO05AeF8=";
|
||||||
|
|
||||||
subPackages = [ "." ];
|
subPackages = [ "." ];
|
||||||
|
|
||||||
|
|
|
@ -8,16 +8,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "gopass-jsonapi";
|
pname = "gopass-jsonapi";
|
||||||
version = "1.15.3";
|
version = "1.15.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "gopasspw";
|
owner = "gopasspw";
|
||||||
repo = pname;
|
repo = "gopass-jsonapi";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-5thMhZr/ZlMHMKS2ZOyuua1ZfQ2od7QGSDBQsVsf9Os=";
|
hash = "sha256-gizUFoe+oAmEKHMlua/zsR+fUltGw2cp98XAgXzCm0U=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-Gt5nd+3BkNQrdcq5+a70rdBXvCang/2ayZuyyZWON64=";
|
vendorHash = "sha256-vMrP6rC0uPsRyFZdU2E9mPp031eob+36NcGueNP1Y7o=";
|
||||||
|
|
||||||
subPackages = [ "." ];
|
subPackages = [ "." ];
|
||||||
|
|
||||||
|
|
|
@ -7,16 +7,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "gopass-summon-provider";
|
pname = "gopass-summon-provider";
|
||||||
version = "1.15.3";
|
version = "1.15.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "gopasspw";
|
owner = "gopasspw";
|
||||||
repo = pname;
|
repo = "gopass-summon-provider";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-YnCX+DDZoKbiwbT8lNvAh0ANNCtEPvaLr9LCvLX8nwo=";
|
hash = "sha256-gwvrwLJTh58PiRsEC3juhnA/q6cX3nRh/hiunKnPvDQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-YZoz7B12/VhWZRTDEVs2P36FrZoZs4OdPJMkR9H7D5I=";
|
vendorHash = "sha256-MLnfTdYR4/1qtnNCUs0TwGf5wMqE+V8jNCefeClQKfw=";
|
||||||
|
|
||||||
subPackages = [ "." ];
|
subPackages = [ "." ];
|
||||||
|
|
||||||
|
|
|
@ -6,16 +6,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "vault";
|
pname = "vault";
|
||||||
version = "1.12.2";
|
version = "1.12.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hashicorp";
|
owner = "hashicorp";
|
||||||
repo = "vault";
|
repo = "vault";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-P/mQoW4lG6U83WEjn5urpFa7q5mN+XOrIOkzf2pslwQ=";
|
sha256 = "sha256-ZNk9bmZwD1aUY3fYT5Qngoq+9qXgvH/nWSWc30st7nE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-Z1iwJXbnSqIu/zo7iKLnh0yy1Dh0e5HwXoBkkt9xaqA=";
|
vendorHash = "sha256-sPpTB3N1w0JppHcwdyLYwSxjzzUAJcBJ5zJ2u4rXXkQ=";
|
||||||
|
|
||||||
subPackages = [ "." ];
|
subPackages = [ "." ];
|
||||||
|
|
||||||
|
|
|
@ -8,16 +8,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "d2";
|
pname = "d2";
|
||||||
version = "0.1.6";
|
version = "0.2.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "terrastruct";
|
owner = "terrastruct";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-bPEEL4t5R/2DnO1IKaTV5NIfT+RL9MVRuoBLlsSPJgM=";
|
hash = "sha256-1AFioXDIh+qQYhhIaQky2SkGd+amnYdOeoNDU+1+poI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-IKISxtAo9zKV6nLGAUNjtNb/YzRK2QO7Wa4RSNthzPU=";
|
vendorHash = "sha256-PtKKGHzxshahecbfvvo1nGCseap4o8r8raBpFDUSbx4=";
|
||||||
|
|
||||||
ldflags = [
|
ldflags = [
|
||||||
"-s"
|
"-s"
|
||||||
|
|
|
@ -9,14 +9,14 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "mdbook-pdf";
|
pname = "mdbook-pdf";
|
||||||
version = "0.1.4";
|
version = "0.1.5";
|
||||||
|
|
||||||
src = fetchCrate {
|
src = fetchCrate {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-v57Geqd1YCzR9oM97K+Y9OdeokzNc4Kbh0sDP0+vxjU=";
|
hash = "sha256-822RQKgedxQ+VFNDv20tFUc2Xl56Ivub+/EXNrLRfGM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-mZUif1qBREM/5GYJU9m20p3rC3fnbZELcEKatwhoQEU=";
|
cargoHash = "sha256-mX2EKjuWM1KW8DXFdYFKQfASjdqZCW78F1twZNQQr7o=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkg-config
|
pkg-config
|
||||||
|
|
|
@ -5664,6 +5664,8 @@ with pkgs;
|
||||||
|
|
||||||
sqlint = callPackage ../development/tools/sqlint { };
|
sqlint = callPackage ../development/tools/sqlint { };
|
||||||
|
|
||||||
|
squawk = callPackage ../development/tools/squawk { };
|
||||||
|
|
||||||
antibody = callPackage ../shells/zsh/antibody { };
|
antibody = callPackage ../shells/zsh/antibody { };
|
||||||
|
|
||||||
antigen = callPackage ../shells/zsh/antigen { };
|
antigen = callPackage ../shells/zsh/antigen { };
|
||||||
|
|
|
@ -102,6 +102,7 @@ mapAliases ({
|
||||||
grpc_google_iam_v1 = grpc-google-iam-v1; # added 2021-08-21
|
grpc_google_iam_v1 = grpc-google-iam-v1; # added 2021-08-21
|
||||||
ha-av = throw "ha-av was removed, because it is no longer maintained"; # added 2022-04-06
|
ha-av = throw "ha-av was removed, because it is no longer maintained"; # added 2022-04-06
|
||||||
HAP-python = hap-python; # added 2021-06-01
|
HAP-python = hap-python; # added 2021-06-01
|
||||||
|
hangups = throw "hangups was removed because Google Hangouts has been shut down"; # added 2023-02-13
|
||||||
hbmqtt = throw "hbmqtt was removed because it is no longer maintained"; # added 2021-11-07
|
hbmqtt = throw "hbmqtt was removed because it is no longer maintained"; # added 2021-11-07
|
||||||
hdlparse = throw "hdlparse has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
|
hdlparse = throw "hdlparse has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
|
||||||
hyperkitty = throw "Please use pkgs.mailmanPackages.hyperkitty"; # added 2022-04-29
|
hyperkitty = throw "Please use pkgs.mailmanPackages.hyperkitty"; # added 2022-04-29
|
||||||
|
|
|
@ -4242,8 +4242,6 @@ self: super: with self; {
|
||||||
|
|
||||||
handout = callPackage ../development/python-modules/handout { };
|
handout = callPackage ../development/python-modules/handout { };
|
||||||
|
|
||||||
hangups = callPackage ../development/python-modules/hangups { };
|
|
||||||
|
|
||||||
hap-python = callPackage ../development/python-modules/hap-python { };
|
hap-python = callPackage ../development/python-modules/hap-python { };
|
||||||
|
|
||||||
hass-nabucasa = callPackage ../development/python-modules/hass-nabucasa { };
|
hass-nabucasa = callPackage ../development/python-modules/hass-nabucasa { };
|
||||||
|
|
Loading…
Reference in a new issue