Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
e4fb0591c3
113
lib/modules.nix
113
lib/modules.nix
@ -539,59 +539,74 @@ let
|
||||
|
||||
mergeModules' = prefix: options: configs:
|
||||
let
|
||||
/* byName is like foldAttrs, but will look for attributes to merge in the
|
||||
specified attribute name.
|
||||
|
||||
byName "foo" (module: value: ["module.hidden=${module.hidden},value=${value}"])
|
||||
[
|
||||
{
|
||||
hidden="baz";
|
||||
foo={qux="bar"; gla="flop";};
|
||||
}
|
||||
{
|
||||
hidden="fli";
|
||||
foo={qux="gne"; gli="flip";};
|
||||
}
|
||||
]
|
||||
===>
|
||||
{
|
||||
gla = [ "module.hidden=baz,value=flop" ];
|
||||
gli = [ "module.hidden=fli,value=flip" ];
|
||||
qux = [ "module.hidden=baz,value=bar" "module.hidden=fli,value=gne" ];
|
||||
}
|
||||
*/
|
||||
byName = attr: f: modules:
|
||||
zipAttrsWith (n: concatLists)
|
||||
(map (module: let subtree = module.${attr}; in
|
||||
# an attrset 'name' => list of submodules that declare ‘name’.
|
||||
declsByName =
|
||||
zipAttrsWith
|
||||
(n: concatLists)
|
||||
(map
|
||||
(module: let subtree = module.options; in
|
||||
if !(builtins.isAttrs subtree) then
|
||||
throw (if attr == "config" then ''
|
||||
You're trying to define a value of type `${builtins.typeOf subtree}'
|
||||
rather than an attribute set for the option
|
||||
`${builtins.concatStringsSep "." prefix}'!
|
||||
|
||||
This usually happens if `${builtins.concatStringsSep "." prefix}' has option
|
||||
definitions inside that are not matched. Please check how to properly define
|
||||
this option by e.g. referring to `man 5 configuration.nix'!
|
||||
'' else ''
|
||||
throw ''
|
||||
An option declaration for `${builtins.concatStringsSep "." prefix}' has type
|
||||
`${builtins.typeOf subtree}' rather than an attribute set.
|
||||
Did you mean to define this outside of `options'?
|
||||
'')
|
||||
''
|
||||
else
|
||||
mapAttrs (n: f module) subtree
|
||||
) modules);
|
||||
# an attrset 'name' => list of submodules that declare ‘name’.
|
||||
declsByName = byName "options" (module: option:
|
||||
[{ inherit (module) _file; options = option; }]
|
||||
) options;
|
||||
mapAttrs
|
||||
(n: option:
|
||||
[{ inherit (module) _file; options = option; }]
|
||||
)
|
||||
subtree
|
||||
)
|
||||
options);
|
||||
|
||||
# The root of any module definition must be an attrset.
|
||||
checkedConfigs =
|
||||
assert
|
||||
lib.all
|
||||
(c:
|
||||
# TODO: I have my doubts that this error would occur when option definitions are not matched.
|
||||
# The implementation of this check used to be tied to a superficially similar check for
|
||||
# options, so maybe that's why this is here.
|
||||
isAttrs c.config || throw ''
|
||||
In module `${c.file}', you're trying to define a value of type `${builtins.typeOf c.config}'
|
||||
rather than an attribute set for the option
|
||||
`${builtins.concatStringsSep "." prefix}'!
|
||||
|
||||
This usually happens if `${builtins.concatStringsSep "." prefix}' has option
|
||||
definitions inside that are not matched. Please check how to properly define
|
||||
this option by e.g. referring to `man 5 configuration.nix'!
|
||||
''
|
||||
)
|
||||
configs;
|
||||
configs;
|
||||
|
||||
# an attrset 'name' => list of submodules that define ‘name’.
|
||||
defnsByName = byName "config" (module: value:
|
||||
map (config: { inherit (module) file; inherit config; }) (pushDownProperties value)
|
||||
) configs;
|
||||
pushedDownDefinitionsByName =
|
||||
zipAttrsWith
|
||||
(n: concatLists)
|
||||
(map
|
||||
(module:
|
||||
mapAttrs
|
||||
(n: value:
|
||||
map (config: { inherit (module) file; inherit config; }) (pushDownProperties value)
|
||||
)
|
||||
module.config
|
||||
)
|
||||
checkedConfigs);
|
||||
# extract the definitions for each loc
|
||||
defnsByName' = byName "config" (module: value:
|
||||
[{ inherit (module) file; inherit value; }]
|
||||
) configs;
|
||||
rawDefinitionsByName =
|
||||
zipAttrsWith
|
||||
(n: concatLists)
|
||||
(map
|
||||
(module:
|
||||
mapAttrs
|
||||
(n: value:
|
||||
[{ inherit (module) file; inherit value; }]
|
||||
)
|
||||
module.config
|
||||
)
|
||||
checkedConfigs);
|
||||
|
||||
# Convert an option tree decl to a submodule option decl
|
||||
optionTreeToOption = decl:
|
||||
@ -613,8 +628,8 @@ let
|
||||
# We're descending into attribute ‘name’.
|
||||
let
|
||||
loc = prefix ++ [name];
|
||||
defns = defnsByName.${name} or [];
|
||||
defns' = defnsByName'.${name} or [];
|
||||
defns = pushedDownDefinitionsByName.${name} or [];
|
||||
defns' = rawDefinitionsByName.${name} or [];
|
||||
optionDecls = filter (m: isOption m.options) decls;
|
||||
in
|
||||
if length optionDecls == length decls then
|
||||
@ -657,7 +672,7 @@ let
|
||||
# Propagate all unmatched definitions from nested option sets
|
||||
mapAttrs (n: v: v.unmatchedDefns) resultsByName
|
||||
# Plus the definitions for the current prefix that don't have a matching option
|
||||
// removeAttrs defnsByName' (attrNames matchedOptions);
|
||||
// removeAttrs rawDefinitionsByName (attrNames matchedOptions);
|
||||
in {
|
||||
inherit matchedOptions;
|
||||
|
||||
|
||||
@ -207,7 +207,7 @@ checkConfigOutput '^"foo"$' config.submodule.foo ./declare-submoduleWith-special
|
||||
## shorthandOnlyDefines config behaves as expected
|
||||
checkConfigOutput '^true$' config.submodule.config ./declare-submoduleWith-shorthand.nix ./define-submoduleWith-shorthand.nix
|
||||
checkConfigError 'is not of type `boolean' config.submodule.config ./declare-submoduleWith-shorthand.nix ./define-submoduleWith-noshorthand.nix
|
||||
checkConfigError "You're trying to define a value of type \`bool'\n\s*rather than an attribute set for the option" config.submodule.config ./declare-submoduleWith-noshorthand.nix ./define-submoduleWith-shorthand.nix
|
||||
checkConfigError "In module ..*define-submoduleWith-shorthand.nix., you're trying to define a value of type \`bool'\n\s*rather than an attribute set for the option" config.submodule.config ./declare-submoduleWith-noshorthand.nix ./define-submoduleWith-shorthand.nix
|
||||
checkConfigOutput '^true$' config.submodule.config ./declare-submoduleWith-noshorthand.nix ./define-submoduleWith-noshorthand.nix
|
||||
|
||||
## submoduleWith should merge all modules in one swoop
|
||||
|
||||
@ -22,14 +22,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deja-dup";
|
||||
version = "44.1";
|
||||
version = "44.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = pname;
|
||||
repo = "deja-dup";
|
||||
rev = version;
|
||||
sha256 = "sha256-+Z8o45ZJOmYN+G4viGJW+9BPL6gNitfFBu76qx+sOF0=";
|
||||
hash = "sha256-TnyH2tIvzG1B2hbDPyFyaTArfuMJaP6GKw6yahwsQ1Q=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -87,7 +87,6 @@ stdenv.mkDerivation rec {
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = "gedit";
|
||||
attrPath = "gnome.gedit";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -47,6 +47,7 @@ mapAliases (with prev; {
|
||||
solarized = vim-colors-solarized;
|
||||
colors-solarized = vim-colors-solarized;
|
||||
caw = caw-vim;
|
||||
chad = chadtree;
|
||||
colorsamplerpack = Colour-Sampler-Pack;
|
||||
Colour_Sampler_Pack = Colour-Sampler-Pack;
|
||||
command_T = command-t; # backwards compat, added 2014-10-18
|
||||
|
||||
@ -185,12 +185,12 @@ final: prev:
|
||||
|
||||
LeaderF = buildVimPluginFrom2Nix {
|
||||
pname = "LeaderF";
|
||||
version = "2023-07-07";
|
||||
version = "2023-07-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Yggdroot";
|
||||
repo = "LeaderF";
|
||||
rev = "5d94b8ce87c8e9eff7d3b9476b2657c081d0e853";
|
||||
sha256 = "178jvc7gdw57afniisllmi2sn31diclpxglc0dkhdd4q9z3qpapm";
|
||||
rev = "92bbe71f0ffa1a1d8c6b871ae4841a1b9e3af079";
|
||||
sha256 = "131c7qcb3khlkp40kg3ii45ch1hf3cmfcfr56vi1fqm14h0aldib";
|
||||
};
|
||||
meta.homepage = "https://github.com/Yggdroot/LeaderF/";
|
||||
};
|
||||
@ -305,12 +305,12 @@ final: prev:
|
||||
|
||||
SchemaStore-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "SchemaStore.nvim";
|
||||
version = "2023-07-05";
|
||||
version = "2023-07-07";
|
||||
src = fetchFromGitHub {
|
||||
owner = "b0o";
|
||||
repo = "SchemaStore.nvim";
|
||||
rev = "2c14f75d92d2e68392b4b9957a02040b28004779";
|
||||
sha256 = "1hshbzchifqvck03nrvzy1687hzhsvgxi2wv29czs1dly2d8c74m";
|
||||
rev = "78c53f2ce05b7209bf5e2e2b2e25c72a3c1444b2";
|
||||
sha256 = "1y1aji722vvv8q5l27lk7ljqpby48nv6y0fq2vbwashvdhlc6imm";
|
||||
};
|
||||
meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
|
||||
};
|
||||
@ -377,12 +377,12 @@ final: prev:
|
||||
|
||||
SpaceVim = buildVimPluginFrom2Nix {
|
||||
pname = "SpaceVim";
|
||||
version = "2023-07-06";
|
||||
version = "2023-07-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "SpaceVim";
|
||||
repo = "SpaceVim";
|
||||
rev = "b3906e4eaf53c5931b33c9cd26a847093642a5e7";
|
||||
sha256 = "0svg2n2l680zaszr3r16rrdchv7yj61kxd3b1hkqzh6sj14chr36";
|
||||
rev = "eed6a4bea69aa7ff117957570cd0f739533e88af";
|
||||
sha256 = "12zf58va1jzi8iyfzxlv1sysykzf29zjijgd74a7gmiq050y2g06";
|
||||
};
|
||||
meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
|
||||
};
|
||||
@ -1075,12 +1075,12 @@ final: prev:
|
||||
|
||||
boole-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "boole.nvim";
|
||||
version = "2023-01-14";
|
||||
version = "2023-07-08";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nat-418";
|
||||
repo = "boole.nvim";
|
||||
rev = "f4f9996f91159e54b8f1893b20e2e599c91bc1bd";
|
||||
sha256 = "0kilw1g57nrwxp07qpycig4bswafwg751kaiqnlnn70xbb88xppg";
|
||||
rev = "7b4a3dae28e3b2497747aa840439e9493cabdc49";
|
||||
sha256 = "01244kg58z0s1h78vh9dxawfprr70f2m58ywga72mm2v0hz6ysvn";
|
||||
};
|
||||
meta.homepage = "https://github.com/nat-418/boole.nvim/";
|
||||
};
|
||||
@ -1229,6 +1229,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/uga-rosa/ccc.nvim/";
|
||||
};
|
||||
|
||||
chadtree = buildVimPluginFrom2Nix {
|
||||
pname = "chadtree";
|
||||
version = "2023-07-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "chadtree";
|
||||
rev = "99e0d388e0cfc265d98a1eb228e7e8708bef5219";
|
||||
sha256 = "1a2dahpqm9nvpk58a8jppnmhdj22yd03a1b9a17nks174cvbjdkv";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/chadtree/";
|
||||
};
|
||||
|
||||
changeColorScheme-vim = buildVimPluginFrom2Nix {
|
||||
pname = "changeColorScheme.vim";
|
||||
version = "2010-10-18";
|
||||
@ -1987,12 +1999,12 @@ final: prev:
|
||||
|
||||
codeium-vim = buildVimPluginFrom2Nix {
|
||||
pname = "codeium.vim";
|
||||
version = "2023-07-06";
|
||||
version = "2023-07-08";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Exafunction";
|
||||
repo = "codeium.vim";
|
||||
rev = "7e0054abd2e63bc295bf0ba3aba5ce0d39d11752";
|
||||
sha256 = "1fqcl3npfgzb1z1lh9fv6chsdcgih3dqb3cxwgdzr0q1ciz1xbqy";
|
||||
rev = "276c424ac5c9e94117efb902d75a5580ce4ccc9a";
|
||||
sha256 = "1bqy6z6qph01f7afnzy01hkyl2669zv463zx1ygxbnljbvswzdvw";
|
||||
};
|
||||
meta.homepage = "https://github.com/Exafunction/codeium.vim/";
|
||||
};
|
||||
@ -2287,24 +2299,24 @@ final: prev:
|
||||
|
||||
coq-artifacts = buildVimPluginFrom2Nix {
|
||||
pname = "coq.artifacts";
|
||||
version = "2023-07-04";
|
||||
version = "2023-07-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "coq.artifacts";
|
||||
rev = "6070a67e52212060f6b64646a254cc0c4ee29758";
|
||||
sha256 = "10p3cxlys6vfjf583y93gwab43afr1sn683mc3j9q0nchfy4dz6r";
|
||||
rev = "e6a2ec767a98a21ebe9b247d80e462544e3f9397";
|
||||
sha256 = "1rg3w4v6q1kl14jkfiamwmmq4a6spz7s5piznhdsn1j21d0l3b1f";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/coq.artifacts/";
|
||||
};
|
||||
|
||||
coq-thirdparty = buildVimPluginFrom2Nix {
|
||||
pname = "coq.thirdparty";
|
||||
version = "2023-07-06";
|
||||
version = "2023-07-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "coq.thirdparty";
|
||||
rev = "813bd80f2233314aa6756ae747cc9bf41d816e49";
|
||||
sha256 = "0r2sb0qfivvy26mpvkzd3xlkzmv7vydmv1kw4aqfds1zad59pn2q";
|
||||
rev = "ac313e324861e353bf6ddf5286160d10cb202da3";
|
||||
sha256 = "107jsagw15ab7whjxaygmd2aqd3a3jkm6d6vz513r5b7jrhclcbh";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/";
|
||||
};
|
||||
@ -2323,12 +2335,12 @@ final: prev:
|
||||
|
||||
coq_nvim = buildVimPluginFrom2Nix {
|
||||
pname = "coq_nvim";
|
||||
version = "2023-07-05";
|
||||
version = "2023-07-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "coq_nvim";
|
||||
rev = "6027cc975c976de5e96318cbde185e11843a8fbb";
|
||||
sha256 = "14i443hj3bk95nimwfdcrs4pajylp7ks7krmlyd47qr7f0fnabv3";
|
||||
rev = "02cf0fc1fb5af0805d87c7c4ecb396ffe92b8dc2";
|
||||
sha256 = "057ym4bhfich5hfbnsx7lb82d1rrsa3a3nzblfzhvaipb6sn05by";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
|
||||
};
|
||||
@ -2877,12 +2889,12 @@ final: prev:
|
||||
|
||||
diffview-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "diffview.nvim";
|
||||
version = "2023-07-06";
|
||||
version = "2023-07-08";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sindrets";
|
||||
repo = "diffview.nvim";
|
||||
rev = "94f5f40543e393d9028bae9ce2fedf6da3af701a";
|
||||
sha256 = "0bbj9fr2ijcdj91qf8vw8zm4q3whb7z28mbzazwgw7wm155rg8c4";
|
||||
rev = "b0cc22f5708f6b2b4f873b44fbc5eb93020f4e0c";
|
||||
sha256 = "0hzpcwv02yvqxzf2ldhdx6icsffi93r24rjzpipm0b1i6bspg2mw";
|
||||
};
|
||||
meta.homepage = "https://github.com/sindrets/diffview.nvim/";
|
||||
};
|
||||
@ -2925,12 +2937,12 @@ final: prev:
|
||||
|
||||
dracula-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "dracula.nvim";
|
||||
version = "2023-06-11";
|
||||
version = "2023-07-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Mofiqul";
|
||||
repo = "dracula.nvim";
|
||||
rev = "5716b1395b32a5865476dd3314bd8888e5f91532";
|
||||
sha256 = "1z011hnbmr0r99r0v920ywfdn2v1dqair2py0h19v6xxgw50cd0n";
|
||||
rev = "608ebc389514674213a74f1d173c00f85bebc008";
|
||||
sha256 = "0h43r4zlh14pwxzm8d76xm68vaxwdpn6z56ybzzmv7vcr9kpgm50";
|
||||
};
|
||||
meta.homepage = "https://github.com/Mofiqul/dracula.nvim/";
|
||||
};
|
||||
@ -2949,12 +2961,12 @@ final: prev:
|
||||
|
||||
dropbar-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "dropbar.nvim";
|
||||
version = "2023-07-06";
|
||||
version = "2023-07-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bekaboo";
|
||||
repo = "dropbar.nvim";
|
||||
rev = "62590d609c806563b9ff9a8e8818d3ce60e4a049";
|
||||
sha256 = "0pzq4vq263vwngykw1zm0p3rs7mby5q347qwr0d17kr37b3sh9m7";
|
||||
rev = "03bfd620f4d98a889bc7a0059ddb21dd24abdd7f";
|
||||
sha256 = "1lq5ap7izg3nrj8i2nh5hxgxmdfsv705b409ryd529dkx7klsdar";
|
||||
};
|
||||
meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/";
|
||||
};
|
||||
@ -3288,12 +3300,12 @@ final: prev:
|
||||
|
||||
flash-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "flash.nvim";
|
||||
version = "2023-07-06";
|
||||
version = "2023-07-07";
|
||||
src = fetchFromGitHub {
|
||||
owner = "folke";
|
||||
repo = "flash.nvim";
|
||||
rev = "21f8e9613bacb7a70ced583d4bcf04ae8067916d";
|
||||
sha256 = "0cv7q900a3rgv68n3vmh4wncvz0ghry6ypyn84xhzb0mkp0d66yf";
|
||||
rev = "a8da6ff212c1885ecde26af477207742959c67d7";
|
||||
sha256 = "1x7nrncpd9fj3mk74m1x0n1jzdyi6h5sw53mghd3ydyb4cqrg2pj";
|
||||
};
|
||||
meta.homepage = "https://github.com/folke/flash.nvim/";
|
||||
};
|
||||
@ -3408,12 +3420,12 @@ final: prev:
|
||||
|
||||
friendly-snippets = buildVimPluginFrom2Nix {
|
||||
pname = "friendly-snippets";
|
||||
version = "2023-07-06";
|
||||
version = "2023-07-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rafamadriz";
|
||||
repo = "friendly-snippets";
|
||||
rev = "a94db1ee6ddfd238e725b0f90163fdd65d382464";
|
||||
sha256 = "0y8lrwnrm3xza6mh329fd3xcnwmiqlvsycksiqr3am8gjmd3ir4z";
|
||||
rev = "6e0afe3be0ba43ef03d495a529de8fb22721c0d0";
|
||||
sha256 = "1rzipwl5slmv56fb84yy2isxfqydjydx2ns8sxydkhkk0pz25wrp";
|
||||
};
|
||||
meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
|
||||
};
|
||||
@ -3516,12 +3528,12 @@ final: prev:
|
||||
|
||||
fzf-lua = buildVimPluginFrom2Nix {
|
||||
pname = "fzf-lua";
|
||||
version = "2023-07-07";
|
||||
version = "2023-07-08";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ibhagwan";
|
||||
repo = "fzf-lua";
|
||||
rev = "d04bbd91d2d96869071d965564aae34cae103ca1";
|
||||
sha256 = "0b94m1sb3mwkw8zh82f2i7v3irz67b18g1c0khch1vkh710kdqcs";
|
||||
rev = "ea4c5e98d8797ff14f24350459aa29b0f800dad4";
|
||||
sha256 = "0jkiis5rn4zyybwb1gjcgssigdvksxxkv3a50yk3xisgrli2i51d";
|
||||
};
|
||||
meta.homepage = "https://github.com/ibhagwan/fzf-lua/";
|
||||
};
|
||||
@ -3756,12 +3768,12 @@ final: prev:
|
||||
|
||||
godbolt-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "godbolt.nvim";
|
||||
version = "2023-06-18";
|
||||
version = "2023-07-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "p00f";
|
||||
repo = "godbolt.nvim";
|
||||
rev = "d6c6b201da39b8f8235fe6f5f239dc99aca4ad27";
|
||||
sha256 = "0c0fxbpx3d63q6z2z39q66mgw7m296ccx32ribwpra1xbbmbl9zr";
|
||||
rev = "8b1eeb26697d4fffba217194fdd6545cbfe40598";
|
||||
sha256 = "1qb5kyx3gvfybjz8nlmp5yv08sqx8rnd1bi33n8l3xpsz48c5kmf";
|
||||
};
|
||||
meta.homepage = "https://github.com/p00f/godbolt.nvim/";
|
||||
};
|
||||
@ -3947,12 +3959,12 @@ final: prev:
|
||||
|
||||
haskell-tools-nvim = buildNeovimPlugin {
|
||||
pname = "haskell-tools.nvim";
|
||||
version = "2023-07-06";
|
||||
version = "2023-07-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "MrcJkb";
|
||||
repo = "haskell-tools.nvim";
|
||||
rev = "a258726a71cf9f874ba997f49929360232a1eda4";
|
||||
sha256 = "16qxzxaa19kv62s3qxbyplrxb30b2gagz2n72v3pdmf57fgwssl8";
|
||||
rev = "b2e3ecdc3d94bf489126c040be27a8af80733453";
|
||||
sha256 = "1yhnib92inqs3ww00bwimidpbzfi17xiv2ifjyprpfyx1kk76h33";
|
||||
};
|
||||
meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
|
||||
};
|
||||
@ -4102,12 +4114,12 @@ final: prev:
|
||||
|
||||
hotpot-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "hotpot.nvim";
|
||||
version = "2023-02-14";
|
||||
version = "2023-07-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rktjmp";
|
||||
repo = "hotpot.nvim";
|
||||
rev = "9fd5d6e341861c776ec9c69a2fc524deae67b541";
|
||||
sha256 = "0cysw3852wgnaahw1fwbmq72m0pi4yqf9r1kqi4gzim1fva7sy61";
|
||||
rev = "026eba9596b506ab6f807fd4aa93cd5f76255725";
|
||||
sha256 = "0dhwg6h03bx35d9k0nmybacq0dik1rj67ilbr7170934df9ryg2k";
|
||||
};
|
||||
meta.homepage = "https://github.com/rktjmp/hotpot.nvim/";
|
||||
};
|
||||
@ -4583,12 +4595,12 @@ final: prev:
|
||||
|
||||
lazy-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lazy.nvim";
|
||||
version = "2023-07-06";
|
||||
version = "2023-07-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "folke";
|
||||
repo = "lazy.nvim";
|
||||
rev = "5af331ea65418dc9361769891921fdee4bcc837a";
|
||||
sha256 = "1sfwn7bczp15mz8risxlg5nmqyhnd6xzr5184sjsz4d0qy1gclbn";
|
||||
rev = "da8b00581a52f5f87ad2aba9f52171fda7491f18";
|
||||
sha256 = "1b2h6fzj54jwjqkqhd51lfw4mdqdiam9426zdxaic9nbjai7rjps";
|
||||
};
|
||||
meta.homepage = "https://github.com/folke/lazy.nvim/";
|
||||
};
|
||||
@ -4655,12 +4667,12 @@ final: prev:
|
||||
|
||||
legendary-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "legendary.nvim";
|
||||
version = "2023-07-07";
|
||||
version = "2023-07-08";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mrjones2014";
|
||||
repo = "legendary.nvim";
|
||||
rev = "9327bb22e9095d05f50dd64b202c71247b958491";
|
||||
sha256 = "1n8fnx4hh59ca26vxp0k0nfcwnnc5rabcn132apg1k2qmbw7kl8d";
|
||||
rev = "3db15cae08d63bab40d0c38474e368f97414f090";
|
||||
sha256 = "1gkaj6baynds4nlas4i0kwd6w68byyclxp1slghccjfamaqlv3sn";
|
||||
};
|
||||
meta.homepage = "https://github.com/mrjones2014/legendary.nvim/";
|
||||
};
|
||||
@ -5207,12 +5219,12 @@ final: prev:
|
||||
|
||||
mason-lspconfig-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "mason-lspconfig.nvim";
|
||||
version = "2023-07-06";
|
||||
version = "2023-07-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "williamboman";
|
||||
repo = "mason-lspconfig.nvim";
|
||||
rev = "82685fdd0f67a694b244cb058b83761f54664d68";
|
||||
sha256 = "0j8mc4mx666a2x6w4cgqsa0l8xkmaib6in2s7ks49hyd4svy7d56";
|
||||
rev = "fa50cc2540210845fccc3c0b9762417189a563a2";
|
||||
sha256 = "088p71mfsnv99il8ahyl5x04rn8w4xg4vvylk67ic2ngki7f7d8d";
|
||||
};
|
||||
meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/";
|
||||
};
|
||||
@ -5303,24 +5315,24 @@ final: prev:
|
||||
|
||||
melange-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "melange-nvim";
|
||||
version = "2023-04-06";
|
||||
version = "2023-07-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "savq";
|
||||
repo = "melange-nvim";
|
||||
rev = "f15922543dd70b360335effb61411c05c710b99c";
|
||||
sha256 = "19swmv0xzlxp7bcmgdm2qfam28wi9igqvfn5q7wq8qshb2wqzph1";
|
||||
rev = "e4958aa60ec6e1c5ecb487b9028da3a33e753b34";
|
||||
sha256 = "0ck5f47hww48msqq7qpbd3rcg5mjwf87lf4zwg9k27vfln1sfg90";
|
||||
};
|
||||
meta.homepage = "https://github.com/savq/melange-nvim/";
|
||||
};
|
||||
|
||||
mini-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "mini.nvim";
|
||||
version = "2023-07-03";
|
||||
version = "2023-07-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "echasnovski";
|
||||
repo = "mini.nvim";
|
||||
rev = "bb8ef7cfaf7b0c4492836f318df0b61e92ea3de1";
|
||||
sha256 = "1s3lnbjz3rgrplpyc6f7a67ahcql34hy6v5z6qjh18gb2r449sfk";
|
||||
rev = "760c1f3619418f769526884a3de47f0b76245887";
|
||||
sha256 = "01vqrf4j5jxfr1304hblgfsmzb1w6b4djxlqndsm6yad2xl8vivr";
|
||||
};
|
||||
meta.homepage = "https://github.com/echasnovski/mini.nvim/";
|
||||
};
|
||||
@ -5711,12 +5723,12 @@ final: prev:
|
||||
|
||||
neodev-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "neodev.nvim";
|
||||
version = "2023-07-06";
|
||||
version = "2023-07-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "folke";
|
||||
repo = "neodev.nvim";
|
||||
rev = "0705c72c281626f45c78d0916151d3e2bfb53fae";
|
||||
sha256 = "09drcn241msk956qpils11dhajj2sh7f2dnrs6s2867z25112a3g";
|
||||
rev = "a1c48c5761cc579927bfb09896c8bf37894b80e8";
|
||||
sha256 = "1hq1p1rwb0r44w86p4ljnwc410ly0d0c7l3ldxgddr2bp9jb3fm4";
|
||||
};
|
||||
meta.homepage = "https://github.com/folke/neodev.nvim/";
|
||||
};
|
||||
@ -5747,12 +5759,12 @@ final: prev:
|
||||
|
||||
neogit = buildVimPluginFrom2Nix {
|
||||
pname = "neogit";
|
||||
version = "2023-07-05";
|
||||
version = "2023-07-07";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NeogitOrg";
|
||||
repo = "neogit";
|
||||
rev = "72824006f2dcf775cc498cc4a046ddd2c99d20a3";
|
||||
sha256 = "1a21ybxxw9wsx8d27bpr9zw41w3c7w471mpiv0r5zynby5a36cfl";
|
||||
rev = "1b6edb56e8c754494be1564912d33e50ddd8a023";
|
||||
sha256 = "0qm74hapfq4lghka7ipkppxlan1c37gjf89wqslclj7q40cplm32";
|
||||
};
|
||||
meta.homepage = "https://github.com/NeogitOrg/neogit/";
|
||||
};
|
||||
@ -5807,12 +5819,12 @@ final: prev:
|
||||
|
||||
neorg = buildVimPluginFrom2Nix {
|
||||
pname = "neorg";
|
||||
version = "2023-07-07";
|
||||
version = "2023-07-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-neorg";
|
||||
repo = "neorg";
|
||||
rev = "32bae172814611f82e90b696b72cac99ff8de0e9";
|
||||
sha256 = "1jq69ijpz7bf37m6kahqpqyxwdmnka7qafnrgkwrbw8bmrhvzhrx";
|
||||
rev = "c801ae5165423f4c70841e548208c74da86acf72";
|
||||
sha256 = "0gi9mmf24x8v97gg4f562pl9pn675lvwc2l1rdlrxk2w3ng28aad";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-neorg/neorg/";
|
||||
};
|
||||
@ -5951,12 +5963,12 @@ final: prev:
|
||||
|
||||
neotest-haskell = buildVimPluginFrom2Nix {
|
||||
pname = "neotest-haskell";
|
||||
version = "2023-07-02";
|
||||
version = "2023-07-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "MrcJkb";
|
||||
repo = "neotest-haskell";
|
||||
rev = "3dd8e3d96bb4b793525ea3d26ca231fc005bd1bd";
|
||||
sha256 = "0flq4rk54cn5kvfzwwxd1zq73dr75pqpb2x4p7ch2pxhppm5qx64";
|
||||
rev = "f7d028916583af59e554bbc7b01255f53b931417";
|
||||
sha256 = "1wwxfwa9vqphr9qkpg2y195dqdk5qy3apivmja5abb98kvp761xx";
|
||||
};
|
||||
meta.homepage = "https://github.com/MrcJkb/neotest-haskell/";
|
||||
};
|
||||
@ -6395,12 +6407,12 @@ final: prev:
|
||||
|
||||
nvchad = buildVimPluginFrom2Nix {
|
||||
pname = "nvchad";
|
||||
version = "2023-07-06";
|
||||
version = "2023-07-08";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvchad";
|
||||
repo = "nvchad";
|
||||
rev = "08f3deb9010c259dc3e6e060bbc49568cbcc50ba";
|
||||
sha256 = "0rfqpi8pbjz4yhrg08dldf4zm7id2g688afn9bpg7msbxbsvh7hf";
|
||||
rev = "720d71b546b8300bf3951c839f52db6cb83c3dc5";
|
||||
sha256 = "0byhs3711k9ji1vwvc2zgv75jvj7njfcmg47ipw28hl3nmhv3h67";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvchad/nvchad/";
|
||||
};
|
||||
@ -6515,12 +6527,12 @@ final: prev:
|
||||
|
||||
nvim-cmp = buildNeovimPlugin {
|
||||
pname = "nvim-cmp";
|
||||
version = "2023-06-30";
|
||||
version = "2023-07-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrsh7th";
|
||||
repo = "nvim-cmp";
|
||||
rev = "2743dd989e9b932e1b4813a4927d7b84272a14e2";
|
||||
sha256 = "13k2y9ggfvpzm463dhivy70j8vpzbv8j2nmscqs1l5y0rad93bww";
|
||||
rev = "c4e491a87eeacf0408902c32f031d802c7eafce8";
|
||||
sha256 = "1m1xnirxhkgqa2qa3lyz9znxwa8qkvcgrdxcl73mm8qhyd8ribhy";
|
||||
};
|
||||
meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
|
||||
};
|
||||
@ -6635,12 +6647,12 @@ final: prev:
|
||||
|
||||
nvim-dap = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-dap";
|
||||
version = "2023-06-30";
|
||||
version = "2023-07-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mfussenegger";
|
||||
repo = "nvim-dap";
|
||||
rev = "bb1ddce6cd951ef3c1319e4fd8596131113163c3";
|
||||
sha256 = "0jqbc4fgg7agzzfpgm80vvlfrsmpvy38mkxkpnf1kk31ig11mlms";
|
||||
rev = "3bde6f786057fa29d8356559b2ae3a52d9317fba";
|
||||
sha256 = "0mm3yhbidknz0rkbmsa32j4jnws9vfss8c6il833v0c4q7zm1jl5";
|
||||
};
|
||||
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
|
||||
};
|
||||
@ -6767,12 +6779,12 @@ final: prev:
|
||||
|
||||
nvim-highlite = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-highlite";
|
||||
version = "2023-07-05";
|
||||
version = "2023-07-07";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Iron-E";
|
||||
repo = "nvim-highlite";
|
||||
rev = "2121a3bdb9b5d8dcfdd60f0892b5a73bc280c220";
|
||||
sha256 = "1wxzqq2dz0c0m2vj61p69fra52xvqd9gc4m3wk60744hzg60kn5c";
|
||||
rev = "67729d0c6218749937b9ec075650f336ad0a446b";
|
||||
sha256 = "0w286h8y3bzk19gc5rshccp005pg8vb7yv7c0s815c9dp7lbg1va";
|
||||
};
|
||||
meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
|
||||
};
|
||||
@ -6803,12 +6815,12 @@ final: prev:
|
||||
|
||||
nvim-jdtls = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-jdtls";
|
||||
version = "2023-06-29";
|
||||
version = "2023-07-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mfussenegger";
|
||||
repo = "nvim-jdtls";
|
||||
rev = "0261cf5a76cf2ef807c4ae0ede18fc9d791ebf02";
|
||||
sha256 = "1r49yyrl7a6x41gyw1c486wwcw6b2619d1cca4kirswmxbk3c9gy";
|
||||
rev = "6e6352f671fca4bb31e7e2394c592e623120292e";
|
||||
sha256 = "05rg9d4p6fj9jxa705ln2k4xr4ichy098cqy3p062ckr7javpga0";
|
||||
};
|
||||
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
|
||||
};
|
||||
@ -6839,12 +6851,12 @@ final: prev:
|
||||
|
||||
nvim-lightbulb = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-lightbulb";
|
||||
version = "2023-04-15";
|
||||
version = "2023-07-08";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kosayoda";
|
||||
repo = "nvim-lightbulb";
|
||||
rev = "ca5b44a8efffb5fec1963ccd21f25ec04cc778b7";
|
||||
sha256 = "0885z0fv3q77jbn9zfzfng2s9l8k4x8y8l49dd9rrlfwvkl6bhdw";
|
||||
rev = "189c8ef70a44a23c6e9e1d0f95abcda2d07e109d";
|
||||
sha256 = "18l6pqkymqhm5rv27ngb874vy6lxr5lqrg0s2hszh2ixydq3r4w8";
|
||||
};
|
||||
meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/";
|
||||
};
|
||||
@ -6899,12 +6911,12 @@ final: prev:
|
||||
|
||||
nvim-lspconfig = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-lspconfig";
|
||||
version = "2023-07-07";
|
||||
version = "2023-07-08";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neovim";
|
||||
repo = "nvim-lspconfig";
|
||||
rev = "51739a8bc531542079698c58512feb68469f5d27";
|
||||
sha256 = "05xpc6zysb9ydkvsxjz3s7k0d5fq4ryg6fdgshfx81ns8mdrjqmh";
|
||||
rev = "deade69789089c3da15237697156334fb3e943f0";
|
||||
sha256 = "09m1ix3wv3n7r5i5sakh3c7gh3zlvsnckjy4gkxhhpx5sdckw1h6";
|
||||
};
|
||||
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
|
||||
};
|
||||
@ -6995,12 +7007,12 @@ final: prev:
|
||||
|
||||
nvim-navic = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-navic";
|
||||
version = "2023-07-06";
|
||||
version = "2023-07-08";
|
||||
src = fetchFromGitHub {
|
||||
owner = "smiteshp";
|
||||
repo = "nvim-navic";
|
||||
rev = "e3b9d8a974bec71b88d5640f1c87bf5b4a7e4113";
|
||||
sha256 = "0yx03zl48djvlz4g33xgidz4av2grznl1j9dlf9nbv16xg2cn1k7";
|
||||
rev = "6e8850a524307814decc1b195a2c8a51482a9886";
|
||||
sha256 = "1js5vdjc9rs2gi0g7b2lkwxs9assnykbc9i2f144b3ky7yhiisbw";
|
||||
};
|
||||
meta.homepage = "https://github.com/smiteshp/nvim-navic/";
|
||||
};
|
||||
@ -7115,12 +7127,12 @@ final: prev:
|
||||
|
||||
nvim-scrollview = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-scrollview";
|
||||
version = "2023-07-06";
|
||||
version = "2023-07-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dstein64";
|
||||
repo = "nvim-scrollview";
|
||||
rev = "0559908210bd6da1b8c7fab5be1cfe5606fb89a2";
|
||||
sha256 = "1hwkdffxaww51j4bgxx8l4dal50ywi9pyx40k42s2b4mjkv989hq";
|
||||
rev = "8f51941e8bda2982497118dfa2a4dd9fc4a42e75";
|
||||
sha256 = "1pzvjhbvs7a9llzcmgz9ky3b0i96ffs5ca7rn6l9g84f4zhplm3r";
|
||||
};
|
||||
meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
|
||||
};
|
||||
@ -7151,12 +7163,12 @@ final: prev:
|
||||
|
||||
nvim-spectre = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-spectre";
|
||||
version = "2023-07-01";
|
||||
version = "2023-07-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-pack";
|
||||
repo = "nvim-spectre";
|
||||
rev = "dc3f0bd41e09148924ef04a4746cb708539d08db";
|
||||
sha256 = "1zhb6hh6bqigil26x74s426a7ymfndflm2abw6wpfzmdqd7zaf0l";
|
||||
rev = "6edac44e10b94b88bf3067fae937915172a3f825";
|
||||
sha256 = "1l954rr5ckf6dr3qcpiambd8ikhrs80i75x9sdvsw99ccrjdfgph";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-pack/nvim-spectre/";
|
||||
};
|
||||
@ -7223,24 +7235,24 @@ final: prev:
|
||||
|
||||
nvim-tree-lua = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-tree.lua";
|
||||
version = "2023-07-02";
|
||||
version = "2023-07-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-tree";
|
||||
repo = "nvim-tree.lua";
|
||||
rev = "4af572246ce49883e2a52c49203a19984454f2e0";
|
||||
sha256 = "1z7n13qrd2i53m8ysgm5x880gzwk0wd9kpf3nbqax6xc45n6r33k";
|
||||
rev = "a708bd2413d467929b5019ec1bce7b1f428438bc";
|
||||
sha256 = "1ss2dy68144jsf5ynfmv2nik2yklb3qxb547qq9nd04l3wj8f5n9";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
|
||||
};
|
||||
|
||||
nvim-treesitter = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-treesitter";
|
||||
version = "2023-07-07";
|
||||
version = "2023-07-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-treesitter";
|
||||
repo = "nvim-treesitter";
|
||||
rev = "1ef286e5b0cfd17f56586a8445cd83d61647f851";
|
||||
sha256 = "0ani5vi127zyhznqzjs0ghr5x1xnlpv53443mcry1nj30wslgdia";
|
||||
rev = "572a15f171ce1a69ed91ea642ae77af5b5d295fb";
|
||||
sha256 = "1vndcc5bnbb4l68lk0pm6gray1f7jf9vxhpxh71mq2lzzpjah8v3";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
|
||||
};
|
||||
@ -7343,11 +7355,11 @@ final: prev:
|
||||
|
||||
nvim-ts-rainbow2 = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-ts-rainbow2";
|
||||
version = "2023-07-03";
|
||||
version = "2023-07-09";
|
||||
src = fetchgit {
|
||||
url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2";
|
||||
rev = "d6e82e23f877f488563437237abbc85d7cededea";
|
||||
sha256 = "1pyjqmf3sxalzdxpf9hq9ph66izbdb2j50828glg24d5rg7y4xy3";
|
||||
rev = "d2ea7b31b805cf4b7a05d032d0ec9d356345d3df";
|
||||
sha256 = "1xa6khjjq6l9269dnhsgkiq18hjf52f4dp0n622x8bmmxifql9ja";
|
||||
};
|
||||
meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2";
|
||||
};
|
||||
@ -9848,12 +9860,12 @@ final: prev:
|
||||
|
||||
undotree = buildVimPluginFrom2Nix {
|
||||
pname = "undotree";
|
||||
version = "2023-02-25";
|
||||
version = "2023-07-07";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mbbill";
|
||||
repo = "undotree";
|
||||
rev = "485f01efde4e22cb1ce547b9e8c9238f36566f21";
|
||||
sha256 = "13bpnacif1r40ncln14m013gnh6n9dnbvawnnna44splr6x39dan";
|
||||
rev = "0e11ba7325efbbb3f3bebe06213afa3e7ec75131";
|
||||
sha256 = "15x5vsvvnr3sa78mh3gq0vagjcf3qv53b9hpni368p4m0f9a47b8";
|
||||
};
|
||||
meta.homepage = "https://github.com/mbbill/undotree/";
|
||||
};
|
||||
@ -9872,12 +9884,12 @@ final: prev:
|
||||
|
||||
unison = buildVimPluginFrom2Nix {
|
||||
pname = "unison";
|
||||
version = "2023-07-07";
|
||||
version = "2023-07-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "unisonweb";
|
||||
repo = "unison";
|
||||
rev = "9fb8bc0df971de1939bae160f820b215a4db9195";
|
||||
sha256 = "1rwpynfbf4aa1ii12c6il6jcfgla4wa5gl1n8mzbhf2056d34csy";
|
||||
rev = "ed45b8c1b9a9e5ada96bca4402be2b25c2290715";
|
||||
sha256 = "00k8fy6hdsv2wfyfsbms4hls3p3k9h9s8kpdvakfvcsml2ngihr7";
|
||||
};
|
||||
meta.homepage = "https://github.com/unisonweb/unison/";
|
||||
};
|
||||
@ -11480,12 +11492,12 @@ final: prev:
|
||||
|
||||
vim-floaterm = buildVimPluginFrom2Nix {
|
||||
pname = "vim-floaterm";
|
||||
version = "2023-05-14";
|
||||
version = "2023-07-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "voldikss";
|
||||
repo = "vim-floaterm";
|
||||
rev = "bd0aee3c861d613f56b85bd9eaffdcab459071fd";
|
||||
sha256 = "08jnirzgqjj17l6nhr9wdp6zvi280pmdb762c8sz1i77fkb0vpm3";
|
||||
rev = "bcaeabf89a92a924031d471395054d84bd88ce2f";
|
||||
sha256 = "0sf3imx44igw7ih0xah9c2ssqsfjsilk9z4ws6pfv5c4qxz32gn0";
|
||||
};
|
||||
meta.homepage = "https://github.com/voldikss/vim-floaterm/";
|
||||
};
|
||||
@ -12286,12 +12298,12 @@ final: prev:
|
||||
|
||||
vim-just = buildVimPluginFrom2Nix {
|
||||
pname = "vim-just";
|
||||
version = "2023-07-03";
|
||||
version = "2023-07-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NoahTheDuke";
|
||||
repo = "vim-just";
|
||||
rev = "f3f03c7ab7e1bf9555704a9d6bc11c6ba621c373";
|
||||
sha256 = "1x2fsy8dw37s6crlirad30d2z48b4wma3405y4jfw149pzkb19bi";
|
||||
rev = "ceabb579cf085cee5ebd361625c237cb565f5af3";
|
||||
sha256 = "04vs5zl8l5pvddk267jfkzlkghiddn5pqgjf2aw86yfaaxg6i8r4";
|
||||
};
|
||||
meta.homepage = "https://github.com/NoahTheDuke/vim-just/";
|
||||
};
|
||||
@ -15374,12 +15386,12 @@ final: prev:
|
||||
|
||||
zk-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "zk-nvim";
|
||||
version = "2023-05-20";
|
||||
version = "2023-07-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mickael-menu";
|
||||
repo = "zk-nvim";
|
||||
rev = "5ddb53688035d115f941f0c8255f6e6618e608ac";
|
||||
sha256 = "1zy6ar1cw4q8l4yk9lfsl56xk8jsv61d6p7s6pfrjvgrksh5jk5m";
|
||||
rev = "797618aa07f58ceba6f79fb6e777e8e45c51e1ce";
|
||||
sha256 = "1hr1k3h3pwh7iga7zdd62hkwgnvivsr6z9nbs8ypks3r34rw60xx";
|
||||
};
|
||||
meta.homepage = "https://github.com/mickael-menu/zk-nvim/";
|
||||
};
|
||||
@ -15414,8 +15426,8 @@ final: prev:
|
||||
src = fetchFromGitHub {
|
||||
owner = "catppuccin";
|
||||
repo = "nvim";
|
||||
rev = "15043d363729f1ef20e615c41bbd8b7e92c1453e";
|
||||
sha256 = "0wncps157mw0mazmz4qcv9314qbnlcvq6vglhw471i68805kqiqi";
|
||||
rev = "278bfeb61bd627dc2a8885180a0441a1ebe65a41";
|
||||
sha256 = "0kb5177zix86n6b8simqnkx35mpsrfpf8mppvn6iwvpl33f81q05";
|
||||
};
|
||||
meta.homepage = "https://github.com/catppuccin/nvim/";
|
||||
};
|
||||
@ -15432,18 +15444,6 @@ final: prev:
|
||||
meta.homepage = "https://github.com/catppuccin/vim/";
|
||||
};
|
||||
|
||||
chad = buildVimPluginFrom2Nix {
|
||||
pname = "chad";
|
||||
version = "2023-07-07";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "chadtree";
|
||||
rev = "a47aa0967967e2b07dce61b54645eeccf4f7a498";
|
||||
sha256 = "1440qj7bfi16ay1il60g04pcj9fpsgm772xqm3dplzlx2dkkc88f";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/chadtree/";
|
||||
};
|
||||
|
||||
dracula-vim = buildVimPluginFrom2Nix {
|
||||
pname = "dracula-vim";
|
||||
version = "2023-06-19";
|
||||
@ -15482,12 +15482,12 @@ final: prev:
|
||||
|
||||
lspsaga-nvim-original = buildVimPluginFrom2Nix {
|
||||
pname = "lspsaga-nvim-original";
|
||||
version = "2023-06-06";
|
||||
version = "2023-07-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvimdev";
|
||||
repo = "lspsaga.nvim";
|
||||
rev = "4f075452c466df263e69ae142f6659dcf9324bf6";
|
||||
sha256 = "0p7lqf8562z7wnjiijniqs9pn36n16gywpm940lbz724g5lykm4q";
|
||||
rev = "8a05cb18092d49075cf533aaf17d312e2ad61d77";
|
||||
sha256 = "0413ylml6c4cqq3bqi6z94sb5axxinv9d32lrdvpmnjlbc1b4kzs";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/";
|
||||
};
|
||||
|
||||
@ -27,12 +27,12 @@
|
||||
};
|
||||
arduino = buildGrammar {
|
||||
language = "arduino";
|
||||
version = "0.0.0+rev=bf0db73";
|
||||
version = "0.0.0+rev=787bc6e";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ObserverOfTime";
|
||||
repo = "tree-sitter-arduino";
|
||||
rev = "bf0db73db96ec02f872cb7b5058dcc8bfd8fe714";
|
||||
hash = "sha256-7naUhZ1xhJfirA4gYYVc36YuvY66PLGRLCqRLQie11o=";
|
||||
rev = "787bc6e1ca23092821231f6096438343f728ee6f";
|
||||
hash = "sha256-PKjSNEy27Snu9B2eBZcOQYNXI/cnKhFdrBrePqcp7Rk=";
|
||||
};
|
||||
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino";
|
||||
};
|
||||
@ -49,12 +49,12 @@
|
||||
};
|
||||
awk = buildGrammar {
|
||||
language = "awk";
|
||||
version = "0.0.0+rev=16e6fd8";
|
||||
version = "0.0.0+rev=476b1a0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Beaglefoot";
|
||||
repo = "tree-sitter-awk";
|
||||
rev = "16e6fd822a5efa654d0a1ad7122aa1cc5e489cff";
|
||||
hash = "sha256-TbDVyXBcg/0jzs3cFMZCRw7v2iqTfPXmRVBZM4kp0m8=";
|
||||
rev = "476b1a0f3de58c31cde57317c744059ca6792e52";
|
||||
hash = "sha256-B3bJg/RaeNeKhfnkWYutQeBynYkdphtJoUA1OHehb/8=";
|
||||
};
|
||||
meta.homepage = "https://github.com/Beaglefoot/tree-sitter-awk";
|
||||
};
|
||||
@ -146,6 +146,17 @@
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp";
|
||||
};
|
||||
cairo = buildGrammar {
|
||||
language = "cairo";
|
||||
version = "0.0.0+rev=02ec146";
|
||||
src = fetchFromGitHub {
|
||||
owner = "amaanq";
|
||||
repo = "tree-sitter-cairo";
|
||||
rev = "02ec1461f11aa126d3c16abb2da284ca3ba15631";
|
||||
hash = "sha256-xtGIywLt+sOx82id3/9Me1WTJam8b9gPJfx+2xo7lgg=";
|
||||
};
|
||||
meta.homepage = "https://github.com/amaanq/tree-sitter-cairo";
|
||||
};
|
||||
capnp = buildGrammar {
|
||||
language = "capnp";
|
||||
version = "0.0.0+rev=7d5fa4e";
|
||||
@ -986,12 +997,12 @@
|
||||
};
|
||||
julia = buildGrammar {
|
||||
language = "julia";
|
||||
version = "0.0.0+rev=4d4dc7d";
|
||||
version = "0.0.0+rev=784364c";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-julia";
|
||||
rev = "4d4dc7d8a4ad3856200a9ef151f9056fc14cec8b";
|
||||
hash = "sha256-v61uykCKr7QAeqex3JIbnv1EOTEGdOssfNcMrwlkLwI=";
|
||||
rev = "784364cb9185ef8dc245de4b0b51e3a22503419d";
|
||||
hash = "sha256-MPdDEVbIUsEQu84AB9k2Bhi3Oa47e9/tItGhKMfZLyU=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia";
|
||||
};
|
||||
@ -1231,12 +1242,12 @@
|
||||
};
|
||||
nix = buildGrammar {
|
||||
language = "nix";
|
||||
version = "0.0.0+rev=02878b4";
|
||||
version = "0.0.0+rev=14b5361";
|
||||
src = fetchFromGitHub {
|
||||
owner = "cstrahan";
|
||||
repo = "tree-sitter-nix";
|
||||
rev = "02878b40ac77d2889833519c6b6e9e63cfc690e6";
|
||||
hash = "sha256-9E4iQ7jr52ckmQJBrF9Vdwanrgm2I+Gi1lbC46I+4/g=";
|
||||
rev = "14b53610c9038500066c509b2e67de04775b97fe";
|
||||
hash = "sha256-FNq/+Voqg534Nnm7rnv2daPwc9uFxNi1ce0m091jmRk=";
|
||||
};
|
||||
meta.homepage = "https://github.com/cstrahan/tree-sitter-nix";
|
||||
};
|
||||
@ -1264,24 +1275,24 @@
|
||||
};
|
||||
ocaml = buildGrammar {
|
||||
language = "ocaml";
|
||||
version = "0.0.0+rev=82e103c";
|
||||
version = "0.0.0+rev=7a61e11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-ocaml";
|
||||
rev = "82e103cee0ffb61ee59f9b654b8e1d4b8e9cab74";
|
||||
hash = "sha256-ukfW16Se3HH5n0NRPhp0oaCHULDpUqvOlvgeTMQUVwE=";
|
||||
rev = "7a61e11f8e44b4edee23adb15a187c9dd2beecef";
|
||||
hash = "sha256-YW4JaTUkyUnj7X7bQ4hZqa1xjkn3pxSnwUZYkoQVJow=";
|
||||
};
|
||||
location = "ocaml";
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml";
|
||||
};
|
||||
ocaml_interface = buildGrammar {
|
||||
language = "ocaml_interface";
|
||||
version = "0.0.0+rev=82e103c";
|
||||
version = "0.0.0+rev=7a61e11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-ocaml";
|
||||
rev = "82e103cee0ffb61ee59f9b654b8e1d4b8e9cab74";
|
||||
hash = "sha256-ukfW16Se3HH5n0NRPhp0oaCHULDpUqvOlvgeTMQUVwE=";
|
||||
rev = "7a61e11f8e44b4edee23adb15a187c9dd2beecef";
|
||||
hash = "sha256-YW4JaTUkyUnj7X7bQ4hZqa1xjkn3pxSnwUZYkoQVJow=";
|
||||
};
|
||||
location = "interface";
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml";
|
||||
@ -2033,12 +2044,12 @@
|
||||
};
|
||||
verilog = buildGrammar {
|
||||
language = "verilog";
|
||||
version = "0.0.0+rev=4457145";
|
||||
version = "0.0.0+rev=22f9b84";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-verilog";
|
||||
rev = "4457145e795b363f072463e697dfe2f6973c9a52";
|
||||
hash = "sha256-l4DgThuP9EFU55YQ9lgvVP/8pXojOllQ870gRsBF3FE=";
|
||||
rev = "22f9b845c77c52b86b21adaebe689864957f4e31";
|
||||
hash = "sha256-X3wIZ9AFc6Cxm4E3NYxRRO8vDfVDuSsupkcLhwkf+QI=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-verilog";
|
||||
};
|
||||
@ -2110,12 +2121,12 @@
|
||||
};
|
||||
wing = buildGrammar {
|
||||
language = "wing";
|
||||
version = "0.0.0+rev=c4a42cd";
|
||||
version = "0.0.0+rev=8b4843a";
|
||||
src = fetchFromGitHub {
|
||||
owner = "winglang";
|
||||
repo = "wing";
|
||||
rev = "c4a42cd02490e52cb9ba517f88f6636327f2bc82";
|
||||
hash = "sha256-idzWuw5MgP3ayMfKTl+sX6sOVH8Lpk4Lnkz+JUi30XI=";
|
||||
rev = "8b4843a1c432d42e00a28f7eafb81a9f591fecb3";
|
||||
hash = "sha256-hEV8avT3lr1fui1dyON6I2hQPU+Ox8h2h9adNeHdiFI=";
|
||||
};
|
||||
location = "libs/tree-sitter-wing";
|
||||
generate = true;
|
||||
|
||||
@ -149,6 +149,17 @@ self: super: {
|
||||
};
|
||||
};
|
||||
|
||||
chadtree = super.chadtree.overrideAttrs {
|
||||
passthru.python3Dependencies = ps: with ps; [
|
||||
pynvim-pp
|
||||
pyyaml
|
||||
std2
|
||||
];
|
||||
|
||||
# We need some patches so it stops complaining about not being in a venv
|
||||
patches = [ ./patches/chadtree/emulate-venv.patch ];
|
||||
};
|
||||
|
||||
ChatGPT-nvim = super.ChatGPT-nvim.overrideAttrs {
|
||||
dependencies = with self; [ nui-nvim plenary-nvim telescope-nvim ];
|
||||
};
|
||||
@ -335,45 +346,9 @@ self: super: {
|
||||
|
||||
coq_nvim = super.coq_nvim.overrideAttrs {
|
||||
passthru.python3Dependencies = ps: with ps; [
|
||||
pynvim
|
||||
pynvim-pp
|
||||
pyyaml
|
||||
(buildPythonPackage {
|
||||
pname = "pynvim_pp";
|
||||
version = "unstable-2023-05-17";
|
||||
format = "pyproject";
|
||||
propagatedBuildInputs = [ setuptools pynvim ];
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "pynvim_pp";
|
||||
rev = "91d91ec0cb173ce19d8c93c7999f5038cf08c046";
|
||||
fetchSubmodules = false;
|
||||
hash = "sha256-wycN9U3f3o0onmx60Z4Ws4DbBxsNwHjLTCB9UgjssLI=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/ms-jpq/pynvim_pp";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ GaetanLepage ];
|
||||
};
|
||||
})
|
||||
(buildPythonPackage {
|
||||
pname = "std2";
|
||||
version = "unstable-2023-05-17";
|
||||
format = "pyproject";
|
||||
propagatedBuildInputs = [ setuptools ];
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "std2";
|
||||
rev = "d6a7a719ef902e243b7bbd162defed762a27416f";
|
||||
fetchSubmodules = false;
|
||||
hash = "sha256-dtQaeB4Xkz+wcF0UkM+SajekSkVVPdoJs9n1hHQLR1k=";
|
||||
};
|
||||
doCheck = true;
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/ms-jpq/std2";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ GaetanLepage ];
|
||||
};
|
||||
})
|
||||
std2
|
||||
];
|
||||
|
||||
# We need some patches so it stops complaining about not being in a venv
|
||||
|
||||
@ -0,0 +1,41 @@
|
||||
diff --git a/chadtree/__main__.py b/chadtree/__main__.py
|
||||
index 83341fc..af8c9b0 100644
|
||||
--- a/chadtree/__main__.py
|
||||
+++ b/chadtree/__main__.py
|
||||
@@ -73,7 +73,7 @@ _EXEC_PATH = Path(executable)
|
||||
_EXEC_PATH = _EXEC_PATH.parent.resolve(strict=True) / _EXEC_PATH.name
|
||||
_REQ = REQUIREMENTS.read_text()
|
||||
|
||||
-_IN_VENV = _RT_PY == _EXEC_PATH
|
||||
+_IN_VENV = True
|
||||
|
||||
|
||||
if command == "deps":
|
||||
@@ -129,7 +129,7 @@ elif command == "run":
|
||||
try:
|
||||
if not _IN_VENV:
|
||||
raise ImportError()
|
||||
- elif lock != _REQ:
|
||||
+ elif False:
|
||||
raise ImportError()
|
||||
else:
|
||||
import pynvim_pp
|
||||
diff --git a/chadtree/consts.py b/chadtree/consts.py
|
||||
index e2d3aa0..e77a129 100644
|
||||
--- a/chadtree/consts.py
|
||||
+++ b/chadtree/consts.py
|
||||
@@ -1,4 +1,5 @@
|
||||
from os import environ, name
|
||||
+from pathlib import Path
|
||||
|
||||
from chad_types import TOP_LEVEL
|
||||
|
||||
@@ -24,7 +25,7 @@ SETTINGS_VAR = "chadtree_settings"
|
||||
STORAGE
|
||||
"""
|
||||
|
||||
-_VARS = TOP_LEVEL / ".vars"
|
||||
+_VARS = Path.home() / ".cache/chadtree/vars"
|
||||
RT_DIR = _VARS / "runtime"
|
||||
RT_PY = RT_DIR / "Scripts" / "python.exe" if IS_WIN else RT_DIR / "bin" / "python3"
|
||||
SESSION_DIR = _VARS / "sessions"
|
||||
@ -102,7 +102,7 @@ https://github.com/itchyny/calendar.vim/,,
|
||||
https://github.com/bkad/camelcasemotion/,,
|
||||
https://github.com/tyru/caw.vim/,,
|
||||
https://github.com/uga-rosa/ccc.nvim/,HEAD,
|
||||
https://github.com/ms-jpq/chadtree/,,chad
|
||||
https://github.com/ms-jpq/chadtree/,HEAD,
|
||||
https://github.com/vim-scripts/changeColorScheme.vim/,,
|
||||
https://github.com/sudormrfbin/cheatsheet.nvim/,,
|
||||
https://github.com/yunlingz/ci_dark/,,
|
||||
|
||||
@ -2178,6 +2178,22 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
mgt19937.typst-preview = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "typst-preview";
|
||||
publisher = "mgt19937";
|
||||
version = "0.6.0";
|
||||
sha256 = "sha256-ZrsTtbD3oIUjxSC1osGYwTynwvDFQxuGeDglopBJGxA=";
|
||||
};
|
||||
meta = {
|
||||
description = "Typst Preview is an extension for previewing your Typst files in vscode instantly";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=mgt19937.typst-preview";
|
||||
homepage = "https://github.com/Enter-tainer/typst-preview-vscode";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.drupol ];
|
||||
};
|
||||
};
|
||||
|
||||
mhutchie.git-graph = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "git-graph";
|
||||
|
||||
@ -28,13 +28,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "ryujinx";
|
||||
version = "1.1.952"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
|
||||
version = "1.1.958"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ryujinx";
|
||||
repo = "Ryujinx";
|
||||
rev = "1c7a90ef359d9974e5bd257c4d8e9bf526a6966c";
|
||||
sha256 = "0yx8gw31vfvmfwmbkckgpbyyzk3kkgm0q124wf6c9i8sqiyqmpp1";
|
||||
rev = "fa32ef92755a51a2567a1bcbb35fb34886b5f979";
|
||||
sha256 = "1g7q5c4cx2l41vs92p6a8rw1c0wvrydm9p962mjddckk6hf1bixq";
|
||||
};
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_7_0;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -3,10 +3,10 @@
|
||||
{
|
||||
firefox = buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "115.0.1";
|
||||
version = "115.0.2";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "4368b3fa4ad4eb65752ab706f19175758bfa202c51a4c31d6512ab8e4f19dfdd0bd6fb8d845990d3c0aaad0e96a5c86e4ef699149ba2630c7a3c7dc4a5bc509c";
|
||||
sha512 = "de6ce8a2512e862c69a7d5c557d6168498d0d40e9c4b54b775f81c444e863a64c43130d57b51b360db4224c34b64a93f3ad263441caee713243b97750ec1eb4b";
|
||||
};
|
||||
|
||||
meta = {
|
||||
@ -113,11 +113,11 @@
|
||||
|
||||
firefox-esr-115 = buildMozillaMach rec {
|
||||
pname = "firefox-esr-115";
|
||||
version = "115.0esr";
|
||||
version = "115.0.2esr";
|
||||
applicationName = "Mozilla Firefox ESR";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "377ab48989ec17b64bd06fed8dd80dde50c06dd4120a6ca1c2fe90a20c85d1c0ef6143a73daeb0271fb20a04b0fb53d837e116b56c63718d517b07ed4243a3e9";
|
||||
sha512 = "f145d0e0e63032367af4198d4ca046589689b5852cb2451efbdcabeae37dfeda88dd0a2c317120ae5785228a6d7df21aa2d18c18ed7bf4b180823af37326a458";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{
|
||||
"packageVersion": "115.0-1",
|
||||
"packageVersion": "115.0.1-1",
|
||||
"source": {
|
||||
"rev": "115.0-1",
|
||||
"sha256": "0bnimayxsd1f2h2jx123w3kwmvyw3yp0r25714bfaf70njnrzlmw"
|
||||
"rev": "115.0.1-1",
|
||||
"sha256": "0ali3jj57m46gcdq3ar4sdr8ppfvz4c77kwmpjbqf7p9r30q74v6"
|
||||
},
|
||||
"firefox": {
|
||||
"version": "115.0",
|
||||
"sha512": "ed5d150e4dfdc01026beb3ae502a0b04321dd130084fdef63afce79a8a7a4898741d08f77716ba720c24f31b9c732c00ad0f1cd408b35b5eb6601a10014fb1a2"
|
||||
"version": "115.0.1",
|
||||
"sha512": "4368b3fa4ad4eb65752ab706f19175758bfa202c51a4c31d6512ab8e4f19dfdd0bd6fb8d845990d3c0aaad0e96a5c86e4ef699149ba2630c7a3c7dc4a5bc509c"
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fn";
|
||||
version = "0.6.25";
|
||||
version = "0.6.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fnproject";
|
||||
repo = "cli";
|
||||
rev = version;
|
||||
hash = "sha256-hXWsEg4GJ9AGiZBRLKp7yOJ8o3m4EOvb/g8rVUVHFEM=";
|
||||
hash = "sha256-Tj64/8uYEy4qZISjmtpOGTMzgSkBB516/Dej6/biYRY=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "karmor";
|
||||
version = "0.13.7";
|
||||
version = "0.13.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubearmor";
|
||||
repo = "kubearmor-client";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-IZUDVw41AfugqVG2hsxoKO7zl1FraVzME/GUxZwaAG4=";
|
||||
hash = "sha256-/EPORKpEQEPyt+iSzJ6gpM6VICJPal5oWAyxCOnjLCU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-VT0CiaG5AODAL6nhoPmpulPApgTUiH0mXI6mS1eK14k=";
|
||||
vendorHash = "sha256-DXMD7X1Fdqg0Yr6YE+hgWFuuLSjY9HjrEV2ZrLys8fg=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
(callPackage ./generic.nix { }) {
|
||||
channel = "edge";
|
||||
version = "23.6.3";
|
||||
sha256 = "0h1pwfqf6y3cfhyx1srrr0dv25d5fxk10qfqzx0hl64h2dp6srr6";
|
||||
version = "23.7.1";
|
||||
sha256 = "1lvangia0hllnlccxv0f9mlp3ym8l54wmqihicd44p9nyxbwbx3d";
|
||||
vendorSha256 = "sha256-1ir+IjyT9P+D3AbPo/7wWyZRFiKqZLJ/hoFUM1jtM0A=";
|
||||
}
|
||||
|
||||
@ -24,13 +24,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dino";
|
||||
version = "0.4.2";
|
||||
version = "0.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dino";
|
||||
repo = "dino";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-85Sh3UwoMaa+bpL81gIKtkpCeRl1mXbs8Odux1FURdQ=";
|
||||
sha256 = "sha256-smy/t6wTCnG0kuRFKwyeLENKqOQDhL0fZTtj3BHo6kw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -48,23 +48,23 @@ let
|
||||
# and often with different versions. We write them on three lines
|
||||
# like this (rather than using {}) so that the updater script can
|
||||
# find where to edit them.
|
||||
versions.aarch64-darwin = "5.15.2.19786";
|
||||
versions.x86_64-darwin = "5.15.2.19786";
|
||||
versions.x86_64-linux = "5.15.2.4260";
|
||||
versions.aarch64-darwin = "5.15.3.20121";
|
||||
versions.x86_64-darwin = "5.15.3.20121";
|
||||
versions.x86_64-linux = "5.15.3.4839";
|
||||
|
||||
srcs = {
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
|
||||
name = "zoomusInstallerFull.pkg";
|
||||
hash = "sha256-vERhyaNVxam6ypi9nU2t6RfBZgtzD6YECkSrxkxl/4E=";
|
||||
hash = "sha256-FEgLtKhjODZGuwzOWUK//TilXM3Gvka7B5E48eyrBuw=";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
|
||||
hash = "sha256-Yx5seUks6s+NEBIxgltUQiNU3tjWpmNKMJwgAj9izh4=";
|
||||
hash = "sha256-q4//skfKwAuPqPxJedVACbSQQiTKmc8J24t7mCY6c/w=";
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
|
||||
hash = "sha256-R6M180Gcqu4yZC+CtWnixSkjPe8CvgoTPWSz7B6ZAlE=";
|
||||
hash = "sha256-4r1jayWHg+5Oerksj7DSc5xV15l7miA0a+CgPDUkpa0=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "desync";
|
||||
version = "0.9.4";
|
||||
version = "0.9.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "folbricht";
|
||||
repo = "desync";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-kwYRspzfTBl9FtPrpd55VBYiCzaG7M83EM5nbqdBG/Q=";
|
||||
hash = "sha256-FeZhLY0fUUNNqa6qZZnh2z06+NgcAI6gY8LRR4xI5sM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1RuqlDU809mtGn0gOFH/AW6HJo1cQqt8spiLp3/FpcI=";
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "treesheets";
|
||||
version = "unstable-2023-05-18";
|
||||
version = "unstable-2023-07-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aardappel";
|
||||
repo = "treesheets";
|
||||
rev = "750530c925da889834a69689e067dda1a8d8cdeb";
|
||||
sha256 = "4yN/ZS0f7En/LJzf2lJBqAB60Oy5+5UX+ROlUWAARKs=";
|
||||
rev = "7c0967ed28e3d5b100a668015e38993dab7e3e34";
|
||||
sha256 = "969Ogxcoto2pNVr5itijeYXqytJxgUJ8rH97P6K8O1A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,37 +1,42 @@
|
||||
{ lib
|
||||
, mkDerivation
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, qmake
|
||||
, qtbase
|
||||
, qtwebengine
|
||||
, qtx11extras
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vnote";
|
||||
version = "3.13.0";
|
||||
version = "3.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vnotex";
|
||||
repo = pname;
|
||||
repo = "vnote";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-osJvoi7oyZupJ/bnqpm0TdZ5cMYEeOw9DHOIAzONKLg=";
|
||||
hash = "sha256-A0OJzhvHP+muPI8N23zD4RTiyK0m3JGr/3uJ0Tqz97c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtwebengine
|
||||
qtx11extras
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://vnotex.github.io/vnote";
|
||||
description = "A pleasant note-taking platform";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = platforms.linux;
|
||||
changelog = "https://github.com/vnotex/vnote/releases/tag/v${finalAttrs.src.rev}";
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cbmc";
|
||||
version = "5.86.0";
|
||||
version = "5.87.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "diffblue";
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "sha256-7nlon04EAaAmoTme15PNl2RwTfayXo0YokRLtQLN9/s=";
|
||||
sha256 = "sha256-aBqJqsZK5O3yWTQ1BEej0eeDI8JcsnO6sIv7eH6wnkw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,27 +1,29 @@
|
||||
source 'https://rubygems.org'
|
||||
|
||||
ruby '>= 2.7.0', '< 3.3.0'
|
||||
ruby '>= 2.5.0', '< 3.2.0'
|
||||
gem 'bundler', '>= 1.12.0'
|
||||
|
||||
gem 'rails', '6.1.7.3'
|
||||
gem 'rouge', '~> 4.1.0'
|
||||
gem 'rails', '6.1.7.2'
|
||||
gem 'globalid', '~> 0.4.2' if Gem.ruby_version < Gem::Version.new('2.6.0')
|
||||
gem 'rouge', '~> 3.28.0'
|
||||
gem 'request_store', '~> 1.5.0'
|
||||
gem 'mini_mime', '~> 1.1.0'
|
||||
gem "actionpack-xml_parser"
|
||||
gem 'roadie-rails', '~> 3.0.0'
|
||||
gem 'roadie-rails', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 2.2.0' : '~> 3.0.0')
|
||||
gem 'marcel'
|
||||
gem 'mail', '~> 2.8.1'
|
||||
gem 'nokogiri', '~> 1.14.0'
|
||||
gem 'i18n', '~> 1.13.0'
|
||||
gem 'rbpdf', '~> 1.21.1'
|
||||
gem "mail", "~> 2.7.1"
|
||||
gem 'csv', '~> 3.2.0'
|
||||
gem 'nokogiri', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 1.12.5' : '~> 1.13.10')
|
||||
gem "rexml"
|
||||
gem 'i18n', '~> 1.10.0'
|
||||
gem 'rbpdf', '~> 1.21.0'
|
||||
gem 'addressable'
|
||||
gem 'rubyzip', '~> 2.3.0'
|
||||
|
||||
# Ruby Standard Gems
|
||||
gem 'csv', '~> 3.2.6'
|
||||
gem 'net-imap', '~> 0.3.4'
|
||||
gem 'net-pop', '~> 0.1.2'
|
||||
gem 'net-smtp', '~> 0.3.3'
|
||||
gem 'rexml', require: false if Gem.ruby_version >= Gem::Version.new('3.0')
|
||||
gem 'net-smtp', '~> 0.3.0'
|
||||
gem 'net-imap', '~> 0.2.2'
|
||||
gem 'net-pop', '~> 0.1.1'
|
||||
# Rails 6.1.6.1 does not work with Pysch 3.0.2, which is installed by default with Ruby 2.5. See https://github.com/rails/rails/issues/45590
|
||||
gem 'psych', '>= 3.1.0' if Gem.ruby_version < Gem::Version.new('2.6.0')
|
||||
|
||||
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
|
||||
gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin]
|
||||
@ -30,10 +32,6 @@ gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin]
|
||||
gem 'rotp', '>= 5.0.0'
|
||||
gem 'rqrcode'
|
||||
|
||||
# HTML pipeline and sanitization
|
||||
gem "html-pipeline", "~> 2.13.2"
|
||||
gem "sanitize", "~> 6.0"
|
||||
|
||||
# Optional gem for LDAP authentication
|
||||
group :ldap do
|
||||
gem 'net-ldap', '~> 0.17.0'
|
||||
@ -41,17 +39,18 @@ end
|
||||
|
||||
# Optional gem for exporting the gantt to a PNG file
|
||||
group :minimagick do
|
||||
gem 'mini_magick', '~> 4.12.0'
|
||||
gem 'mini_magick', '~> 4.11.0'
|
||||
end
|
||||
|
||||
# Optional Markdown support
|
||||
group :markdown do
|
||||
gem 'redcarpet', '~> 3.6.0'
|
||||
end
|
||||
# Optional Markdown support, not for JRuby
|
||||
# ToDo: Remove common_mark group when common_mark is decoupled from markdown. See defect (#36892) for more details.
|
||||
gem 'redcarpet', '~> 3.5.1', groups: [:markdown, :common_mark]
|
||||
|
||||
# Optional CommonMark support, not for JRuby
|
||||
group :common_mark do
|
||||
gem "commonmarker", '~> 0.23.8'
|
||||
gem "html-pipeline", "~> 2.13.2"
|
||||
gem "commonmarker", (Gem.ruby_version < Gem::Version.new('2.6.0') ? '0.21.0' : '~> 0.23.8')
|
||||
gem "sanitize", "~> 6.0"
|
||||
gem 'deckar01-task_list', '2.3.2'
|
||||
end
|
||||
|
||||
@ -71,18 +70,23 @@ end
|
||||
|
||||
group :test do
|
||||
gem "rails-dom-testing"
|
||||
gem 'mocha', '>= 1.4.0'
|
||||
gem 'simplecov', '~> 0.22.0', :require => false
|
||||
gem 'mocha', (Gem.ruby_version < Gem::Version.new('2.7.0') ? ['>= 1.4.0', '< 2.0.0'] : '>= 1.4.0')
|
||||
gem 'simplecov', '~> 0.21.2', :require => false
|
||||
gem "ffi", platforms: [:mri, :mingw, :x64_mingw, :mswin]
|
||||
# For running system tests
|
||||
gem 'puma'
|
||||
gem 'capybara', '~> 3.38.0'
|
||||
gem 'puma', (Gem.ruby_version < Gem::Version.new('2.7') ? '< 6.0.0' : '>= 0')
|
||||
gem 'capybara', (if Gem.ruby_version < Gem::Version.new('2.6')
|
||||
'~> 3.35.3'
|
||||
elsif Gem.ruby_version < Gem::Version.new('2.7')
|
||||
'~> 3.36.0'
|
||||
else
|
||||
'~> 3.38.0'
|
||||
end)
|
||||
gem "selenium-webdriver", "~> 3.142.7"
|
||||
gem 'webdrivers', '4.6.1', require: false
|
||||
# RuboCop
|
||||
gem 'rubocop', '~> 1.51.0', require: false
|
||||
gem 'rubocop-performance', '~> 1.17.1', require: false
|
||||
gem 'rubocop-rails', '~> 2.19.1', require: false
|
||||
gem 'rubocop', '~> 1.26.0'
|
||||
gem 'rubocop-performance', '~> 1.13.0'
|
||||
gem 'rubocop-rails', '~> 2.14.0'
|
||||
end
|
||||
|
||||
local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
|
||||
|
||||
@ -1,28 +1,28 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
actioncable (6.1.7.3)
|
||||
actionpack (= 6.1.7.3)
|
||||
activesupport (= 6.1.7.3)
|
||||
actioncable (6.1.7.2)
|
||||
actionpack (= 6.1.7.2)
|
||||
activesupport (= 6.1.7.2)
|
||||
nio4r (~> 2.0)
|
||||
websocket-driver (>= 0.6.1)
|
||||
actionmailbox (6.1.7.3)
|
||||
actionpack (= 6.1.7.3)
|
||||
activejob (= 6.1.7.3)
|
||||
activerecord (= 6.1.7.3)
|
||||
activestorage (= 6.1.7.3)
|
||||
activesupport (= 6.1.7.3)
|
||||
actionmailbox (6.1.7.2)
|
||||
actionpack (= 6.1.7.2)
|
||||
activejob (= 6.1.7.2)
|
||||
activerecord (= 6.1.7.2)
|
||||
activestorage (= 6.1.7.2)
|
||||
activesupport (= 6.1.7.2)
|
||||
mail (>= 2.7.1)
|
||||
actionmailer (6.1.7.3)
|
||||
actionpack (= 6.1.7.3)
|
||||
actionview (= 6.1.7.3)
|
||||
activejob (= 6.1.7.3)
|
||||
activesupport (= 6.1.7.3)
|
||||
actionmailer (6.1.7.2)
|
||||
actionpack (= 6.1.7.2)
|
||||
actionview (= 6.1.7.2)
|
||||
activejob (= 6.1.7.2)
|
||||
activesupport (= 6.1.7.2)
|
||||
mail (~> 2.5, >= 2.5.4)
|
||||
rails-dom-testing (~> 2.0)
|
||||
actionpack (6.1.7.3)
|
||||
actionview (= 6.1.7.3)
|
||||
activesupport (= 6.1.7.3)
|
||||
actionpack (6.1.7.2)
|
||||
actionview (= 6.1.7.2)
|
||||
activesupport (= 6.1.7.2)
|
||||
rack (~> 2.0, >= 2.0.9)
|
||||
rack-test (>= 0.6.3)
|
||||
rails-dom-testing (~> 2.0)
|
||||
@ -30,34 +30,34 @@ GEM
|
||||
actionpack-xml_parser (2.0.1)
|
||||
actionpack (>= 5.0)
|
||||
railties (>= 5.0)
|
||||
actiontext (6.1.7.3)
|
||||
actionpack (= 6.1.7.3)
|
||||
activerecord (= 6.1.7.3)
|
||||
activestorage (= 6.1.7.3)
|
||||
activesupport (= 6.1.7.3)
|
||||
actiontext (6.1.7.2)
|
||||
actionpack (= 6.1.7.2)
|
||||
activerecord (= 6.1.7.2)
|
||||
activestorage (= 6.1.7.2)
|
||||
activesupport (= 6.1.7.2)
|
||||
nokogiri (>= 1.8.5)
|
||||
actionview (6.1.7.3)
|
||||
activesupport (= 6.1.7.3)
|
||||
actionview (6.1.7.2)
|
||||
activesupport (= 6.1.7.2)
|
||||
builder (~> 3.1)
|
||||
erubi (~> 1.4)
|
||||
rails-dom-testing (~> 2.0)
|
||||
rails-html-sanitizer (~> 1.1, >= 1.2.0)
|
||||
activejob (6.1.7.3)
|
||||
activesupport (= 6.1.7.3)
|
||||
activejob (6.1.7.2)
|
||||
activesupport (= 6.1.7.2)
|
||||
globalid (>= 0.3.6)
|
||||
activemodel (6.1.7.3)
|
||||
activesupport (= 6.1.7.3)
|
||||
activerecord (6.1.7.3)
|
||||
activemodel (= 6.1.7.3)
|
||||
activesupport (= 6.1.7.3)
|
||||
activestorage (6.1.7.3)
|
||||
actionpack (= 6.1.7.3)
|
||||
activejob (= 6.1.7.3)
|
||||
activerecord (= 6.1.7.3)
|
||||
activesupport (= 6.1.7.3)
|
||||
activemodel (6.1.7.2)
|
||||
activesupport (= 6.1.7.2)
|
||||
activerecord (6.1.7.2)
|
||||
activemodel (= 6.1.7.2)
|
||||
activesupport (= 6.1.7.2)
|
||||
activestorage (6.1.7.2)
|
||||
actionpack (= 6.1.7.2)
|
||||
activejob (= 6.1.7.2)
|
||||
activerecord (= 6.1.7.2)
|
||||
activesupport (= 6.1.7.2)
|
||||
marcel (~> 1.0)
|
||||
mini_mime (>= 1.1.0)
|
||||
activesupport (6.1.7.3)
|
||||
activesupport (6.1.7.2)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 1.6, < 2)
|
||||
minitest (>= 5.1)
|
||||
@ -84,9 +84,9 @@ GEM
|
||||
css_parser (1.14.0)
|
||||
addressable
|
||||
csv (3.2.6)
|
||||
date (3.3.3)
|
||||
deckar01-task_list (2.3.2)
|
||||
html-pipeline
|
||||
digest (3.1.1)
|
||||
docile (1.4.0)
|
||||
erubi (1.12.0)
|
||||
ffi (1.15.5)
|
||||
@ -96,33 +96,30 @@ GEM
|
||||
activesupport (>= 2)
|
||||
nokogiri (>= 1.4)
|
||||
htmlentities (4.3.4)
|
||||
i18n (1.13.0)
|
||||
i18n (1.10.0)
|
||||
concurrent-ruby (~> 1.0)
|
||||
json (2.6.3)
|
||||
listen (3.8.0)
|
||||
rb-fsevent (~> 0.10, >= 0.10.3)
|
||||
rb-inotify (~> 0.9, >= 0.9.10)
|
||||
loofah (2.21.3)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.12.0)
|
||||
mail (2.8.1)
|
||||
mail (2.7.1)
|
||||
mini_mime (>= 0.1.1)
|
||||
net-imap
|
||||
net-pop
|
||||
net-smtp
|
||||
marcel (1.0.2)
|
||||
matrix (0.4.2)
|
||||
method_source (1.0.0)
|
||||
mini_magick (4.12.0)
|
||||
mini_magick (4.11.0)
|
||||
mini_mime (1.1.2)
|
||||
mini_portile2 (2.8.2)
|
||||
minitest (5.18.0)
|
||||
mocha (2.0.2)
|
||||
minitest (5.18.1)
|
||||
mocha (2.0.4)
|
||||
ruby2_keywords (>= 0.0.5)
|
||||
mysql2 (0.5.5)
|
||||
net-imap (0.3.4)
|
||||
date
|
||||
net-imap (0.2.3)
|
||||
digest
|
||||
net-protocol
|
||||
strscan
|
||||
net-ldap (0.17.1)
|
||||
net-pop (0.1.2)
|
||||
net-protocol
|
||||
@ -131,45 +128,46 @@ GEM
|
||||
net-smtp (0.3.3)
|
||||
net-protocol
|
||||
nio4r (2.5.9)
|
||||
nokogiri (1.14.4)
|
||||
nokogiri (1.13.10)
|
||||
mini_portile2 (~> 2.8.0)
|
||||
racc (~> 1.4)
|
||||
nokogiri (1.14.4-x86_64-linux)
|
||||
nokogiri (1.13.10-x86_64-linux)
|
||||
racc (~> 1.4)
|
||||
parallel (1.23.0)
|
||||
parser (3.2.2.1)
|
||||
parser (3.2.2.3)
|
||||
ast (~> 2.4.1)
|
||||
racc
|
||||
pg (1.4.6)
|
||||
public_suffix (5.0.1)
|
||||
puma (6.2.2)
|
||||
puma (6.3.0)
|
||||
nio4r (~> 2.0)
|
||||
racc (1.6.2)
|
||||
racc (1.7.1)
|
||||
rack (2.2.7)
|
||||
rack-test (2.1.0)
|
||||
rack (>= 1.3)
|
||||
rails (6.1.7.3)
|
||||
actioncable (= 6.1.7.3)
|
||||
actionmailbox (= 6.1.7.3)
|
||||
actionmailer (= 6.1.7.3)
|
||||
actionpack (= 6.1.7.3)
|
||||
actiontext (= 6.1.7.3)
|
||||
actionview (= 6.1.7.3)
|
||||
activejob (= 6.1.7.3)
|
||||
activemodel (= 6.1.7.3)
|
||||
activerecord (= 6.1.7.3)
|
||||
activestorage (= 6.1.7.3)
|
||||
activesupport (= 6.1.7.3)
|
||||
rails (6.1.7.2)
|
||||
actioncable (= 6.1.7.2)
|
||||
actionmailbox (= 6.1.7.2)
|
||||
actionmailer (= 6.1.7.2)
|
||||
actionpack (= 6.1.7.2)
|
||||
actiontext (= 6.1.7.2)
|
||||
actionview (= 6.1.7.2)
|
||||
activejob (= 6.1.7.2)
|
||||
activemodel (= 6.1.7.2)
|
||||
activerecord (= 6.1.7.2)
|
||||
activestorage (= 6.1.7.2)
|
||||
activesupport (= 6.1.7.2)
|
||||
bundler (>= 1.15.0)
|
||||
railties (= 6.1.7.3)
|
||||
railties (= 6.1.7.2)
|
||||
sprockets-rails (>= 2.0.0)
|
||||
rails-dom-testing (2.0.3)
|
||||
activesupport (>= 4.2.0)
|
||||
nokogiri (>= 1.6)
|
||||
rails-html-sanitizer (1.5.0)
|
||||
loofah (~> 2.19, >= 2.19.1)
|
||||
railties (6.1.7.3)
|
||||
actionpack (= 6.1.7.3)
|
||||
activesupport (= 6.1.7.3)
|
||||
railties (6.1.7.2)
|
||||
actionpack (= 6.1.7.2)
|
||||
activesupport (= 6.1.7.2)
|
||||
method_source
|
||||
rake (>= 12.2)
|
||||
thor (~> 1.0)
|
||||
@ -182,8 +180,8 @@ GEM
|
||||
htmlentities
|
||||
rbpdf-font (~> 1.19.0)
|
||||
rbpdf-font (1.19.1)
|
||||
redcarpet (3.6.0)
|
||||
regexp_parser (2.8.0)
|
||||
redcarpet (3.5.1)
|
||||
regexp_parser (2.8.1)
|
||||
request_store (1.5.1)
|
||||
rack (>= 1.4)
|
||||
rexml (3.2.5)
|
||||
@ -194,30 +192,29 @@ GEM
|
||||
railties (>= 5.1, < 7.1)
|
||||
roadie (~> 5.0)
|
||||
rotp (6.2.2)
|
||||
rouge (4.1.1)
|
||||
rouge (3.28.0)
|
||||
rqrcode (2.2.0)
|
||||
chunky_png (~> 1.0)
|
||||
rqrcode_core (~> 1.0)
|
||||
rqrcode_core (1.2.0)
|
||||
rubocop (1.51.0)
|
||||
json (~> 2.3)
|
||||
rubocop (1.26.1)
|
||||
parallel (~> 1.10)
|
||||
parser (>= 3.2.0.0)
|
||||
parser (>= 3.1.0.0)
|
||||
rainbow (>= 2.2.2, < 4.0)
|
||||
regexp_parser (>= 1.8, < 3.0)
|
||||
rexml (>= 3.2.5, < 4.0)
|
||||
rubocop-ast (>= 1.28.0, < 2.0)
|
||||
rexml
|
||||
rubocop-ast (>= 1.16.0, < 2.0)
|
||||
ruby-progressbar (~> 1.7)
|
||||
unicode-display_width (>= 2.4.0, < 3.0)
|
||||
rubocop-ast (1.28.1)
|
||||
unicode-display_width (>= 1.4.0, < 3.0)
|
||||
rubocop-ast (1.29.0)
|
||||
parser (>= 3.2.1.0)
|
||||
rubocop-performance (1.17.1)
|
||||
rubocop-performance (1.13.3)
|
||||
rubocop (>= 1.7.0, < 2.0)
|
||||
rubocop-ast (>= 0.4.0)
|
||||
rubocop-rails (2.19.1)
|
||||
rubocop-rails (2.14.2)
|
||||
activesupport (>= 4.2.0)
|
||||
rack (>= 1.1)
|
||||
rubocop (>= 1.33.0, < 2.0)
|
||||
rubocop (>= 1.7.0, < 2.0)
|
||||
ruby-progressbar (1.13.0)
|
||||
ruby2_keywords (0.0.5)
|
||||
rubyzip (2.3.2)
|
||||
@ -227,7 +224,7 @@ GEM
|
||||
selenium-webdriver (3.142.7)
|
||||
childprocess (>= 0.5, < 4.0)
|
||||
rubyzip (>= 1.2.2)
|
||||
simplecov (0.22.0)
|
||||
simplecov (0.21.2)
|
||||
docile (~> 1.1)
|
||||
simplecov-html (~> 0.11)
|
||||
simplecov_json_formatter (~> 0.1)
|
||||
@ -240,8 +237,9 @@ GEM
|
||||
actionpack (>= 5.2)
|
||||
activesupport (>= 5.2)
|
||||
sprockets (>= 3.0.0)
|
||||
strscan (3.0.6)
|
||||
thor (1.2.2)
|
||||
timeout (0.3.2)
|
||||
timeout (0.4.0)
|
||||
tzinfo (2.0.6)
|
||||
concurrent-ruby (~> 1.0)
|
||||
unicode-display_width (2.4.2)
|
||||
@ -264,43 +262,45 @@ PLATFORMS
|
||||
DEPENDENCIES
|
||||
actionpack-xml_parser
|
||||
addressable
|
||||
bundler (>= 1.12.0)
|
||||
capybara (~> 3.38.0)
|
||||
commonmarker (~> 0.23.8)
|
||||
csv (~> 3.2.6)
|
||||
csv (~> 3.2.0)
|
||||
deckar01-task_list (= 2.3.2)
|
||||
ffi
|
||||
html-pipeline (~> 2.13.2)
|
||||
i18n (~> 1.13.0)
|
||||
i18n (~> 1.10.0)
|
||||
listen (~> 3.3)
|
||||
mail (~> 2.8.1)
|
||||
mail (~> 2.7.1)
|
||||
marcel
|
||||
mini_magick (~> 4.12.0)
|
||||
mini_magick (~> 4.11.0)
|
||||
mini_mime (~> 1.1.0)
|
||||
mocha (>= 1.4.0)
|
||||
mysql2 (~> 0.5.0)
|
||||
net-imap (~> 0.3.4)
|
||||
net-imap (~> 0.2.2)
|
||||
net-ldap (~> 0.17.0)
|
||||
net-pop (~> 0.1.2)
|
||||
net-smtp (~> 0.3.3)
|
||||
nokogiri (~> 1.14.0)
|
||||
net-pop (~> 0.1.1)
|
||||
net-smtp (~> 0.3.0)
|
||||
nokogiri (~> 1.13.10)
|
||||
pg (~> 1.4.2)
|
||||
puma
|
||||
rails (= 6.1.7.3)
|
||||
rails (= 6.1.7.2)
|
||||
rails-dom-testing
|
||||
rbpdf (~> 1.21.1)
|
||||
redcarpet (~> 3.6.0)
|
||||
rbpdf (~> 1.21.0)
|
||||
redcarpet (~> 3.5.1)
|
||||
request_store (~> 1.5.0)
|
||||
rexml
|
||||
roadie-rails (~> 3.0.0)
|
||||
rotp (>= 5.0.0)
|
||||
rouge (~> 4.1.0)
|
||||
rouge (~> 3.28.0)
|
||||
rqrcode
|
||||
rubocop (~> 1.51.0)
|
||||
rubocop-performance (~> 1.17.1)
|
||||
rubocop-rails (~> 2.19.1)
|
||||
rubocop (~> 1.26.0)
|
||||
rubocop-performance (~> 1.13.0)
|
||||
rubocop-rails (~> 2.14.0)
|
||||
rubyzip (~> 2.3.0)
|
||||
sanitize (~> 6.0)
|
||||
selenium-webdriver (~> 3.142.7)
|
||||
simplecov (~> 0.22.0)
|
||||
simplecov (~> 0.21.2)
|
||||
tzinfo-data
|
||||
webdrivers (= 4.6.1)
|
||||
webrick
|
||||
|
||||
@ -5,10 +5,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0bndmmby5qxq8rs42fbb2ax3hhbjj2ds8wja08s0iadkbrn7shvf";
|
||||
sha256 = "1y9lj7ra9xf4q4mryydmd498grsndqmz1zwasb4ai9gv62igvw3s";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.7.3";
|
||||
version = "6.1.7.2";
|
||||
};
|
||||
actionmailbox = {
|
||||
dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"];
|
||||
@ -16,10 +16,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0cx00kf0syq5gdhlrmw0q9v92ki55drbsk4gzy86ls2q8xkd792s";
|
||||
sha256 = "0bzacsr93sxv90nljv3ajw54nmyz1v9k2v2wx1pxsi0jasqg5fvn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.7.3";
|
||||
version = "6.1.7.2";
|
||||
};
|
||||
actionmailer = {
|
||||
dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"];
|
||||
@ -27,10 +27,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0vbif021cyndq3v3m61dkmgdbbirqk9zcsszb9nisq24m3gx1aai";
|
||||
sha256 = "1rjddp1a5l4amsbibhnf7g2rb69qvq0nc0a2dvr6r57bpkf82hj4";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.7.3";
|
||||
version = "6.1.7.2";
|
||||
};
|
||||
actionpack = {
|
||||
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
|
||||
@ -38,10 +38,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0k6hc7klvn8m88b88vykl83jrpqhn4zz67l2zx9v266xga6fhala";
|
||||
sha256 = "0c2y6sqpan68lrx78pvhbxb2917m75s808r6cg1kyygwvg31niza";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.7.3";
|
||||
version = "6.1.7.2";
|
||||
};
|
||||
actionpack-xml_parser = {
|
||||
dependencies = ["actionpack" "railties"];
|
||||
@ -60,10 +60,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "16ldxyxlxl9scggpmkww2fxzim7sl2b4js610pvddcsr74z9fjs7";
|
||||
sha256 = "1jx8wi961i34v7x0j3h4wjw3qbyx9bkzb598vg42kidzk2f90dyj";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.7.3";
|
||||
version = "6.1.7.2";
|
||||
};
|
||||
actionview = {
|
||||
dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
|
||||
@ -71,10 +71,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0ck02cfc17s6g05qn0k7khwvvazwbf2rxbjcma8px2nw2j1ngvcn";
|
||||
sha256 = "10g5gk8h4mfhvgqylzbf591fqf5p78ca35cb97p9bclpv9jfy0za";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.7.3";
|
||||
version = "6.1.7.2";
|
||||
};
|
||||
activejob = {
|
||||
dependencies = ["activesupport" "globalid"];
|
||||
@ -82,10 +82,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "05bkw9qgjgj2nxzjj2fh6jp1fcvgff0aa4r77k0gcfmnzc1g8wdl";
|
||||
sha256 = "0ililjwy4x52a6x5fidh1iyllf6vx49nz93fd2hxypc5bpryx9mz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.7.3";
|
||||
version = "6.1.7.2";
|
||||
};
|
||||
activemodel = {
|
||||
dependencies = ["activesupport"];
|
||||
@ -93,10 +93,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "03hy5bwghdklcxbdylmsq70y0qzslck5slb2zkvp7g6mmvk86kwd";
|
||||
sha256 = "0nn17y72fhsynwn11bqg75bazqp6r1g8mpwwyv64harwvh3fh5qj";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.7.3";
|
||||
version = "6.1.7.2";
|
||||
};
|
||||
activerecord = {
|
||||
dependencies = ["activemodel" "activesupport"];
|
||||
@ -104,10 +104,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1alshkgbcxp9s4vqb2b0yrrnyg15kxhlp1slsb03a61w7h42pspw";
|
||||
sha256 = "1k69m3b0lb4jx20jx8vsvdqm1ki1r6riq9haabyddkcpvmgz1wh7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.7.3";
|
||||
version = "6.1.7.2";
|
||||
};
|
||||
activestorage = {
|
||||
dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"];
|
||||
@ -115,10 +115,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "06w4wlabqqr9bwdig44r5vdwkcbbivwgwn2fl775w7h05vrccgp8";
|
||||
sha256 = "0c3cvc01azfkccg5hsl96wafsxb5hf1nva3cn8rif2mlwx17p8n3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.7.3";
|
||||
version = "6.1.7.2";
|
||||
};
|
||||
activesupport = {
|
||||
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
|
||||
@ -126,10 +126,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "06mihpy83a5xmavvn7l8vbix472dsi0vh30xj6g594k0679m0ir6";
|
||||
sha256 = "14pjq2k761qaywaznpqq8ziivjk2ks1ma2cjwdflkxqgndxjmsr2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.7.3";
|
||||
version = "6.1.7.2";
|
||||
};
|
||||
addressable = {
|
||||
dependencies = ["public_suffix"];
|
||||
@ -214,7 +214,7 @@
|
||||
version = "1.2.2";
|
||||
};
|
||||
crass = {
|
||||
groups = ["default"];
|
||||
groups = ["common_mark" "default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
@ -244,16 +244,6 @@
|
||||
};
|
||||
version = "3.2.6";
|
||||
};
|
||||
date = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.3.3";
|
||||
};
|
||||
deckar01-task_list = {
|
||||
dependencies = ["html-pipeline"];
|
||||
groups = ["common_mark"];
|
||||
@ -265,6 +255,16 @@
|
||||
};
|
||||
version = "2.3.2";
|
||||
};
|
||||
digest = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "01qkpbkxq83ip3iysfh2kjrg9sh2n2q91prhyxh3vq10lcfzv9l1";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.1.1";
|
||||
};
|
||||
docile = {
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
@ -318,7 +318,7 @@
|
||||
};
|
||||
html-pipeline = {
|
||||
dependencies = ["activesupport" "nokogiri"];
|
||||
groups = ["common_mark" "default"];
|
||||
groups = ["common_mark"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
@ -343,20 +343,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1yk33slipi3i1kydzrrchbi7cgisaxym6pgwlzx7ir8vjk6wl90x";
|
||||
sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.13.0";
|
||||
};
|
||||
json = {
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.6.3";
|
||||
version = "1.10.0";
|
||||
};
|
||||
listen = {
|
||||
dependencies = ["rb-fsevent" "rb-inotify"];
|
||||
@ -381,15 +371,15 @@
|
||||
version = "2.21.3";
|
||||
};
|
||||
mail = {
|
||||
dependencies = ["mini_mime" "net-imap" "net-pop" "net-smtp"];
|
||||
dependencies = ["mini_mime"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1bf9pysw1jfgynv692hhaycfxa8ckay1gjw5hz3madrbrynryfzc";
|
||||
sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.8.1";
|
||||
version = "2.7.1";
|
||||
};
|
||||
marcel = {
|
||||
groups = ["default"];
|
||||
@ -426,10 +416,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0slh78f9z6n0l1i2km7m48yz7l4fjrk88sj1f4mh1wb39sl2yc37";
|
||||
sha256 = "1aj604x11d9pksbljh0l38f70b558rhdgji1s9i763hiagvvx2hs";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.12.0";
|
||||
version = "4.11.0";
|
||||
};
|
||||
mini_mime = {
|
||||
groups = ["default" "test"];
|
||||
@ -456,10 +446,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0ic7i5z88zcaqnpzprf7saimq2f6sad57g5mkkqsrqrcd6h3mx06";
|
||||
sha256 = "1kg9wh7jlc9zsr3hkhpzkbn0ynf4np5ap9m2d8xdrb8shy0y6pmb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.18.0";
|
||||
version = "5.18.1";
|
||||
};
|
||||
mocha = {
|
||||
dependencies = ["ruby2_keywords"];
|
||||
@ -467,10 +457,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "03bgnshh84hrw6f1sdj5srxnz0z50m0a7i93fa28fkbm52c2a1lg";
|
||||
sha256 = "18xn9gm9yypavy9yck71fplan19hy5697mwd1rwzz7vizh3ip7bd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.2";
|
||||
version = "2.0.4";
|
||||
};
|
||||
mysql2 = {
|
||||
groups = ["default"];
|
||||
@ -491,15 +481,15 @@
|
||||
version = "0.5.5";
|
||||
};
|
||||
net-imap = {
|
||||
dependencies = ["date" "net-protocol"];
|
||||
dependencies = ["digest" "net-protocol" "strscan"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1d996zf3g8xz244791b0qsl9vr7zg4lqnnmf9k2kshr9lki5jam8";
|
||||
sha256 = "1rl79ykmxa2k4dlk6ykrb9l0a4h101q1gd8c4qv3cl0p9h68zmbn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.3.4";
|
||||
version = "0.2.3";
|
||||
};
|
||||
net-ldap = {
|
||||
groups = ["ldap"];
|
||||
@ -560,10 +550,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "03g0hwp3z8m442nq8ag4lrbcgwcc7hhi8d1s0y7ipic0m50szl9b";
|
||||
sha256 = "0n79k78c5vdcyl0m3y3l5x9kxl6xf5lgriwi2vd665qmdkr01vnk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.14.4";
|
||||
version = "1.13.10";
|
||||
};
|
||||
parallel = {
|
||||
groups = ["default" "test"];
|
||||
@ -576,15 +566,15 @@
|
||||
version = "1.23.0";
|
||||
};
|
||||
parser = {
|
||||
dependencies = ["ast"];
|
||||
dependencies = ["ast" "racc"];
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "08f89nssj7ws7sjfvc2fcjpfm83sjgmniyh0npnmpqf5sfv44r8x";
|
||||
sha256 = "1swigds85jddb5gshll1g8lkmbcgbcp9bi1d4nigwvxki8smys0h";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2.2.1";
|
||||
version = "3.2.2.3";
|
||||
};
|
||||
pg = {
|
||||
groups = ["default"];
|
||||
@ -620,20 +610,20 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0yf4jmkyy8das7pj1xzwllfvzkhq2p6p534j61d9h4wz3nfyf0s5";
|
||||
sha256 = "1v7fmv0n4bhdcwh60dgza44iqai5pg34f5pzm4vh4i5fwx7mpqxh";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.2.2";
|
||||
version = "6.3.0";
|
||||
};
|
||||
racc = {
|
||||
groups = ["common_mark" "default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq";
|
||||
sha256 = "11v3l46mwnlzlc371wr3x6yylpgafgwdf0q7hc7c1lzx6r414r5g";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.6.2";
|
||||
version = "1.7.1";
|
||||
};
|
||||
rack = {
|
||||
groups = ["default" "test"];
|
||||
@ -662,10 +652,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "07cs7qdkx6vwp66diwdy9g6mx52rsd8rxhbnsqf9bqam58g2aynj";
|
||||
sha256 = "1b7ggchi3d7pwzmj8jn9fhbazr5fr4dy304f0hz7kqbg23s9c1ym";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.7.3";
|
||||
version = "6.1.7.2";
|
||||
};
|
||||
rails-dom-testing = {
|
||||
dependencies = ["activesupport" "nokogiri"];
|
||||
@ -695,10 +685,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1d2snjnx1j848axppj2napy3zjgbka3fnw2528rcamhm6dp694nd";
|
||||
sha256 = "0mm3nf3y715ln6v8k6g4351ggkr1bcwc5637vr979yw8vsmdi42k";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.7.3";
|
||||
version = "6.1.7.2";
|
||||
};
|
||||
rainbow = {
|
||||
groups = ["default" "test"];
|
||||
@ -763,24 +753,24 @@
|
||||
version = "1.19.1";
|
||||
};
|
||||
redcarpet = {
|
||||
groups = ["markdown"];
|
||||
groups = ["common_mark" "markdown"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1sg9sbf9pm91l7lac7fs4silabyn0vflxwaa2x3lrzsm0ff8ilca";
|
||||
sha256 = "0bvk8yyns5s1ls437z719y5sdv9fr8kfs8dmr6g8s761dv5n8zvi";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.6.0";
|
||||
version = "3.5.1";
|
||||
};
|
||||
regexp_parser = {
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "17xizkw5ryw8hhq64iqxmzdrrdxpc5lhkqc1fgm1aj0zsk1r2950";
|
||||
sha256 = "136br91alxdwh1s85z912dwz23qlhm212vy6i3wkinz3z8mkxxl3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.8.0";
|
||||
version = "2.8.1";
|
||||
};
|
||||
request_store = {
|
||||
dependencies = ["rack"];
|
||||
@ -840,10 +830,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0jzx6ni3bjdajc9y4w6mclq165jwiypbxkav2k0gbag7ip93xk21";
|
||||
sha256 = "080fswzii68wnbsg7pgq55ba7p289sqjlxwp4vch0h32qy1f8v8d";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.1.1";
|
||||
version = "3.28.0";
|
||||
};
|
||||
rqrcode = {
|
||||
dependencies = ["chunky_png" "rqrcode_core"];
|
||||
@ -867,15 +857,15 @@
|
||||
version = "1.2.0";
|
||||
};
|
||||
rubocop = {
|
||||
dependencies = ["json" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
|
||||
dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
|
||||
groups = ["test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0013mnzj6ql3v8nif7fm8n2832jnwa46azync6azsg9d4iblrfmy";
|
||||
sha256 = "06105yrqajpm5l07fng1nbk55y9490hny542zclnan8hg841pjgl";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.51.0";
|
||||
version = "1.26.1";
|
||||
};
|
||||
rubocop-ast = {
|
||||
dependencies = ["parser"];
|
||||
@ -883,10 +873,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0gs8zjigzdqj0kcmmrhvd4zavwr6kz6h9qvrh9m7bhy56f4aqljs";
|
||||
sha256 = "188bs225kkhrb17dsf3likdahs2p1i1sqn0pr3pvlx50g6r2mnni";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.28.1";
|
||||
version = "1.29.0";
|
||||
};
|
||||
rubocop-performance = {
|
||||
dependencies = ["rubocop" "rubocop-ast"];
|
||||
@ -894,10 +884,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1z6i24r0485fxa5n4g3rhp88w589fifszhd1khbzya2iiknkjxkr";
|
||||
sha256 = "17ny81dy5gjrvris8mni7la8yjg57snphyg9nmvnc3al7yhwr74x";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.17.1";
|
||||
version = "1.13.3";
|
||||
};
|
||||
rubocop-rails = {
|
||||
dependencies = ["activesupport" "rack" "rubocop"];
|
||||
@ -905,10 +895,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0j6dn8pz70bngx6van8yzsimpdd93gm7c8lr93wz1j4ahm6q4hn9";
|
||||
sha256 = "14xagb3jbms5mlcf932kx1djn2q4k952d4xia75ll36vh7xf2fpp";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.19.1";
|
||||
version = "2.14.2";
|
||||
};
|
||||
ruby-progressbar = {
|
||||
groups = ["default" "test"];
|
||||
@ -942,7 +932,7 @@
|
||||
};
|
||||
sanitize = {
|
||||
dependencies = ["crass" "nokogiri"];
|
||||
groups = ["default"];
|
||||
groups = ["common_mark"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
@ -968,10 +958,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "198kcbrjxhhzca19yrdcd6jjj9sb51aaic3b0sc3pwjghg3j49py";
|
||||
sha256 = "1hrv046jll6ad1s964gsmcq4hvkr3zzr6jc7z1mns22mvfpbc3cr";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.22.0";
|
||||
version = "0.21.2";
|
||||
};
|
||||
simplecov-html = {
|
||||
groups = ["default" "test"];
|
||||
@ -1015,6 +1005,16 @@
|
||||
};
|
||||
version = "3.4.2";
|
||||
};
|
||||
strscan = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1d74lidgbvs0s7lrxvrjs5ljk6jfc970s3pr0djgmz0y6nzhx3nn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.0.6";
|
||||
};
|
||||
thor = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
@ -1030,10 +1030,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1pfddf51n5fnj4f9ggwj3wbf23ynj0nbxlxqpz12y1gvl9g7d6r6";
|
||||
sha256 = "1d9cvm0f4zdpwa795v3zv4973y5zk59j7s1x3yn90jjrhcz1yvfd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.3.2";
|
||||
version = "0.4.0";
|
||||
};
|
||||
tzinfo = {
|
||||
dependencies = ["concurrent-ruby"];
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flowblade";
|
||||
version = "2.10.0.3";
|
||||
version = "2.10.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jliljebl";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WsSW0DZS1tkUkwUPLgZJUXlztRQXwYau2UMKKRqXfJ0=";
|
||||
sha256 = "sha256-IjutDCp+wrvXSQzvELuPMdW/16Twi0ee8VjdAFyi+OE=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -31,13 +31,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fvwm3";
|
||||
version = "1.0.6a";
|
||||
version = "1.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fvwmorg";
|
||||
repo = "fvwm3";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-uYkIuMzhaWeCZm5aJF4oBYD72OLgwCBuUhDqpg6HQUM=";
|
||||
hash = "sha256-CPEGwZuYDh0zDXVKLn806c4DfZZJVaMlmIsVAZl20S4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -67,13 +67,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell";
|
||||
version = "44.2";
|
||||
version = "44.3";
|
||||
|
||||
outputs = [ "out" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "VfJ57GMDt8DIkkbs7YEkfIf8HHOUj0XrISpkchjRtj8=";
|
||||
sha256 = "VWlLccLuTq72DZNCgAPy6qTPABhoSPXja0XP5Qb8Mb8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -66,13 +66,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mutter";
|
||||
version = "44.2";
|
||||
version = "44.3";
|
||||
|
||||
outputs = [ "out" "dev" "man" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "N1ZtflXJPciJTpx/I6e6WHmoswuvZVWCIwCdK0Z0AqE=";
|
||||
sha256 = "GFy+vyFQ0+RQVQ43G9sTqLTbCWl4sU+ZUh6WbqzHBVE=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch2
|
||||
, pkg-config
|
||||
, gtk3
|
||||
, vala
|
||||
@ -48,26 +47,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "geary";
|
||||
version = "43.0";
|
||||
version = "44.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "SJFm+H3Z0pAR9eW3lpTyWItHP34ZHFnOkBPIyODjY+c=";
|
||||
sha256 = "gBSsWorTxURMpWl32a0QBr1vTvXJLkNzXFEw3o7ckJ0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with Vala 0.56.7 & 0.57+
|
||||
# https://hydra.nixos.org/build/217892787
|
||||
(fetchpatch2 {
|
||||
url = "https://gitlab.gnome.org/GNOME/geary/-/commit/4a7ca820b1d3d6130fedf254dc5b4cd7efb58f2c.patch";
|
||||
sha256 = "L63TMOkxTYu8jxX+IIc9owoa1TBmaeGXgW+8gfMtFw4=";
|
||||
})
|
||||
(fetchpatch2 {
|
||||
url = "https://gitlab.gnome.org/GNOME/geary/-/commit/10f9c133a2ad515127d65f3bba13a0d91b75f4af.patch";
|
||||
sha256 = "0yohy+FZyHW4MkImLQYNlcZyMekH7mXvO2yEuAm3fXw=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream-glib
|
||||
desktop-file-utils
|
||||
|
||||
@ -244,11 +244,6 @@ let
|
||||
++ lib.optionals (langD) [
|
||||
"--with-target-system-zlib=yes"
|
||||
]
|
||||
# Clang 11 performs an optimization on x86_64 that is sensitive to the presence of debug info.
|
||||
# This causes GCC to fail to bootstrap due to object file differences between stages 2 and 3.
|
||||
++ lib.optionals (targetPlatform.isDarwin && targetPlatform.isx86_64) [
|
||||
"--with-as=${targetPackages.darwin.cctools-port}/bin/${targetPrefix}as"
|
||||
]
|
||||
;
|
||||
|
||||
in configureFlags
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "babl";
|
||||
version = "0.1.102";
|
||||
version = "0.1.106";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "a88bb28506575f95158c8c89df6e23686e50c8b9fea412bf49fe8b80002d84f0";
|
||||
url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/babl-${version}.tar.xz";
|
||||
hash = "sha256-0yUTXTME8IjBNMxiABOs8DXeLl0SWlCi2RBU5zd8QV8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gcab";
|
||||
version = "1.5";
|
||||
version = "1.6";
|
||||
|
||||
outputs = [ "bin" "out" "dev" "devdoc" "installedTests" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "Rr90QkkfqkFIJCuewqB4al9unv+xsFZuUpDozIbwDww=";
|
||||
url = "mirror://gnome/sources/gcab/${lib.versions.majorMinor version}/gcab-${version}.tar.xz";
|
||||
hash = "sha256-LwyWFVd8QSaQniUfneBibD7noVI3bBW1VE3xD8h+Vgs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -45,11 +45,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gvfs";
|
||||
version = "1.50.4";
|
||||
version = "1.50.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "q5BZpnalN+2+ohOIwqr+Gn4sjxrC39xtZFUCMwdUV/0=";
|
||||
url = "mirror://gnome/sources/gvfs/${lib.versions.majorMinor version}/gvfs-${version}.tar.xz";
|
||||
hash = "sha256-uG8JtzMchkLs6/RqPNoGkvXrJghvEyMmpUg8Lr+GpMs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libshumate";
|
||||
version = "1.0.3";
|
||||
version = "1.0.4";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
outputBin = "devdoc"; # demo app
|
||||
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "GNOME";
|
||||
repo = "libshumate";
|
||||
rev = version;
|
||||
sha256 = "gT6jpFN0mkSdDs+8GQa0qKuL5KLzxanBMGwA4EATW7Y=";
|
||||
sha256 = "yiPHrI0QU6AcyPWlJoMlI3GvGZU+7+3mFcyR3ViJGzc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
commit 363c5be465dd6dde35c3d31abd7b5cca9b1f3a9f
|
||||
commit 05666e70f1ef63632aea8b1aed84351a6e30d0d5
|
||||
Author: Jan Tojnar <jtojnar@gmail.com>
|
||||
Date: Thu Jul 23 18:49:03 2020 +0200
|
||||
|
||||
@ -22,7 +22,7 @@ Date: Thu Jul 23 18:49:03 2020 +0200
|
||||
https://gitlab.freedesktop.org/pwithnall/malcontent/merge_requests/38#note_437946
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 6e1dfa5..196350b 100644
|
||||
index 038dd35..e3c77f0 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -123,9 +123,8 @@ test_env = [
|
||||
@ -36,8 +36,8 @@ index 6e1dfa5..196350b 100644
|
||||
subdir('libmalcontent')
|
||||
else
|
||||
libmalcontent_api_version = '0'
|
||||
@@ -136,11 +135,16 @@ endif
|
||||
if get_option('ui').enabled()
|
||||
@@ -143,14 +142,19 @@ if get_option('ui').enabled()
|
||||
)
|
||||
subdir('libmalcontent-ui')
|
||||
endif
|
||||
-subdir('malcontent-client')
|
||||
@ -47,12 +47,15 @@ index 6e1dfa5..196350b 100644
|
||||
if get_option('ui').enabled()
|
||||
subdir('malcontent-control')
|
||||
+ subdir('help')
|
||||
+endif
|
||||
+if not get_option('use_system_libmalcontent')
|
||||
+ subdir('pam')
|
||||
+ subdir('po')
|
||||
|
||||
gnome.post_install(
|
||||
gtk_update_icon_cache: true,
|
||||
update_desktop_database: true,
|
||||
)
|
||||
endif
|
||||
-subdir('pam')
|
||||
-subdir('po')
|
||||
|
||||
meson.add_install_script('build-aux/meson_post_install.py')
|
||||
+if not get_option('use_system_libmalcontent')
|
||||
+ subdir('pam')
|
||||
+ subdir('po')
|
||||
+endif
|
||||
|
||||
@ -19,16 +19,16 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "malcontent";
|
||||
version = "0.11.0";
|
||||
version = "0.11.1";
|
||||
|
||||
outputs = [ "bin" "out" "lib" "pam" "dev" "man" "installedTests" ];
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "pwithnall";
|
||||
repo = pname;
|
||||
repo = "malcontent";
|
||||
rev = version;
|
||||
sha256 = "sha256-92F30DfdSJvO5C9EmNtiC/H6Fa6qQHecYSx59JKp8vA=";
|
||||
hash = "sha256-NZwVCnQrEG2gecUjuWe1+cyWFR3OdYJCmj87V14Uwjw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -66,12 +66,6 @@ stdenv.mkDerivation rec {
|
||||
"-Dui=enabled"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# https://gitlab.freedesktop.org/pwithnall/malcontent/-/merge_requests/148
|
||||
substituteInPlace build-aux/meson_post_install.py \
|
||||
--replace gtk-update-icon-cache gtk4-update-icon-cache
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "UI components for parental controls library";
|
||||
homepage = "https://gitlab.freedesktop.org/pwithnall/malcontent";
|
||||
|
||||
@ -41,19 +41,19 @@ let
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "poppler";
|
||||
repo = "test";
|
||||
rev = "920c89f8f43bdfe8966c8e397e7f67f5302e9435";
|
||||
hash = "sha256-ySP7zcVI3HW4lk8oqVMPTlFh5pgvBwqcE0EXE71iWos=";
|
||||
rev = "e3cdc82782941a8d7b8112f83b4a81b3d334601a";
|
||||
hash = "sha256-i/NjVWC/PXAXnv88qNaHFBQQNEjRgjdV224NgENaESo=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: rec {
|
||||
pname = "poppler-${suffix}";
|
||||
version = "23.02.0"; # beware: updates often break cups-filters build, check texlive and scribus too!
|
||||
version = "23.07.0"; # beware: updates often break cups-filters build, check texlive and scribus too!
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz";
|
||||
hash = "sha256-MxXdonD+KzXPH0HSdZSMOWUvqGO5DeB2b2spPZpVj8k=";
|
||||
hash = "sha256-8ptLS/R1cmERdkVMjyFQbXHSfspQEaOapEA4swuVfbA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -27,11 +27,11 @@ let
|
||||
inherit (python3Packages) python pyxdg wrapPython;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "speech-dispatcher";
|
||||
version = "0.11.2";
|
||||
version = "0.11.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/brailcom/speechd/releases/download/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-i0ZJkl5oy+GntMCge7BBznc4s1yQamAr+CmG2xqg82Q=";
|
||||
sha256 = "sha256-jAkiG7ctnbXInP17kZdxgyuGw6N3LWRWAWlklO31Zrk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -1,9 +1,11 @@
|
||||
diff --git a/speech-dispatcherd.service.in b/speech-dispatcherd.service.in
|
||||
index ab14b99d..12521b1b 100644
|
||||
--- a/speech-dispatcherd.service.in
|
||||
+++ b/speech-dispatcherd.service.in
|
||||
@@ -19,7 +19,7 @@
|
||||
@@ -19,7 +19,7 @@ Description=Speech-Dispatcher, common interface to speech synthesizers
|
||||
[Service]
|
||||
Type=forking
|
||||
ExecStart=@bindir@/speech-dispatcher -d
|
||||
ExecStart=@bindir@/speech-dispatcher -d -t 0
|
||||
-ExecReload=/bin/kill -HUP $MAINPID
|
||||
+ExecReload=@utillinux@/bin/kill -HUP $MAINPID
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hydrus-api";
|
||||
version = "5.0.0";
|
||||
version = "5.0.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "hydrus_api";
|
||||
inherit version;
|
||||
hash = "sha256-s6gS1rVcbg7hcE63hGdPhJCcgS4N4d58MpSrECAfe0U=";
|
||||
hash = "sha256-3Roeab9/woGF/aZYm9nbqrcyYN8CKA1k66cTRxx6jM4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -38,14 +38,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mlflow";
|
||||
version = "2.4.1";
|
||||
version = "2.4.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-ZZj3j37OWalIBXOvV7CXCKMoPs6I8Zbl0XLCBAzsMj8=";
|
||||
hash = "sha256-CxpxsP9Gedzo/yrpcz6ZbsC2wQbbk0EuDfhgb3kYZ8g=";
|
||||
};
|
||||
|
||||
# Remove currently broken dependency `shap`, a model explainability package.
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib
|
||||
{ stdenv
|
||||
, lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, numpy
|
||||
@ -48,6 +49,9 @@ buildPythonPackage rec {
|
||||
# AssertionError pydevd_tracing.set_trace_to_threads(tracing_func) == 0
|
||||
"test_tracing_other_threads"
|
||||
"test_tracing_basic"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"test_multiprocessing_simple"
|
||||
"test_evaluate_exception_trace"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
31
pkgs/development/python-modules/pynvim-pp/default.nix
Normal file
31
pkgs/development/python-modules/pynvim-pp/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pynvim
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
pname = "pynvim-pp";
|
||||
version = "unstable-2023-07-05";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "pynvim_pp";
|
||||
rev = "e9ac3171c7edcc0be020d63840d6af4222b69540";
|
||||
hash = "sha256-H1sCwU2wl9HO92LNkvkCb1iLbZrTNMmYA/8qy9uCgyU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [ pynvim ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/ms-jpq/pynvim_pp";
|
||||
description = "Dependency to chadtree and coq_nvim plugins";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ GaetanLepage ];
|
||||
};
|
||||
}
|
||||
36
pkgs/development/python-modules/pytest-pudb/default.nix
Normal file
36
pkgs/development/python-modules/pytest-pudb/default.nix
Normal file
@ -0,0 +1,36 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pytest
|
||||
, pudb
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-pudb";
|
||||
version = "0.7.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wronglink";
|
||||
repo = "pytest-pudb";
|
||||
# Repo missing tags for releases https://github.com/wronglink/pytest-pudb/issues/24
|
||||
rev = "a6b3d2f4d35e558d72bccff472ecde9c9d9c69e5";
|
||||
hash = "sha256-gI9p6sXCQaQjWBXaHJCFli6lBh8+pr+KPhz50fv1F7A=";
|
||||
};
|
||||
|
||||
buildInputs = [ pytest ];
|
||||
|
||||
propagatedBuildInputs = [ pudb ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "pytest_pudb" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Pytest PuDB debugger integration";
|
||||
homepage = "https://github.com/wronglink/pytest-pudb";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ thornycrackers ];
|
||||
};
|
||||
}
|
||||
28
pkgs/development/python-modules/std2/default.nix
Normal file
28
pkgs/development/python-modules/std2/default.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
pname = "std2";
|
||||
version = "unstable-2023-07-05";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "std2";
|
||||
rev = "1080b7b657f75352481808a906939d16b6d956a1";
|
||||
hash = "sha256-shAuCZvyFGrW26uTnNeyvlAIABb1d9oeKpk9hQbtuEQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/ms-jpq/std2";
|
||||
description = "Dependency to chadtree and coq_nvim plugins";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ GaetanLepage ];
|
||||
};
|
||||
}
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dagger";
|
||||
version = "0.6.2";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dagger";
|
||||
repo = "dagger";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-cBaHj50j1jh2ASDbYHVw12GLD4afTVtyLeGrZtcdylY=";
|
||||
hash = "sha256-9Mv+We4VtsnnZJJF5P3+1EhrX6QrcV7hEzYaLqai5IU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-fX6Lhc/OhPH1g2ANoxZmkADKhoDA3WsSb3cu1tKBjjw=";
|
||||
vendorHash = "sha256-ptfrcsE3YQBqChxbOjkO3xia6ZTI0fGJNXA+q32m9wY=";
|
||||
proxyVendor = true;
|
||||
|
||||
subPackages = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "earthly";
|
||||
version = "0.7.10";
|
||||
version = "0.7.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "earthly";
|
||||
repo = "earthly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Agg1r/5QYk5U9ZblVO/WvLCBy9od7vQuDYKOJeR93XA=";
|
||||
sha256 = "sha256-iIMTDdWO//H8BXEbYMx15vo48IQ15AJjNvMg8Y2oFUY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-tEhUywjJtNaWLPSRNeHTcNsPNCZtXzqjg0VG4g4N9E0=";
|
||||
|
||||
@ -18,13 +18,13 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "faas-cli";
|
||||
version = "0.16.11";
|
||||
version = "0.16.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openfaas";
|
||||
repo = "faas-cli";
|
||||
rev = version;
|
||||
sha256 = "sha256-B418oQpwB1yhsWRo58TGc2PonTlx3Lrcx1pJrbdJ2KM=";
|
||||
sha256 = "sha256-1vjqSHm4/MrlbdPTNlFznQqgtu4aYsHnlw366gBgaHA=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "act";
|
||||
version = "0.2.46";
|
||||
version = "0.2.48";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nektos";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-74ap3UgAFrt/ZrSMECdL3Mu26/53VWUEAUnqHw3oJDU=";
|
||||
hash = "sha256-fEV7WiWoI0TGEAAG0HVRW42TEOlHbB91BZcn9h9G5c8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-OYBFaosO1PKoN236pMFauC0ensnoFDlmAKVWd9OwLHU=";
|
||||
vendorHash = "sha256-r6eJl9KhOWPLqCqe3OTjUbENbZU/1NjOoxssaAh0g78=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ast-grep";
|
||||
version = "0.6.6";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ast-grep";
|
||||
repo = "ast-grep";
|
||||
rev = version;
|
||||
hash = "sha256-iU7UtyF5isyc4G3vYu7f1bU7U38HsgkzNF+LctE08ds=";
|
||||
hash = "sha256-jLb2xMrsBuw+ty1S4X+YdvPfiDyDUuLdJH5dw+e+9Pk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-30cYsRj10uFUlxhr7kgOy3I0m9qtq6kVNednX7OSQUk=";
|
||||
cargoHash = "sha256-ayzR0LjKPXWgtMFznjDDFJM4Ef2HW1HK8aOCcDiwvAA=";
|
||||
|
||||
# error: linker `aarch64-linux-gnu-gcc` not found
|
||||
postPatch = ''
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, meson
|
||||
, ninja
|
||||
, vala
|
||||
@ -19,28 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "msitools";
|
||||
version = "0.101";
|
||||
version = "0.102";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "DMTS4NEI+m8rQIW5qX3VvG2fyt7N2TPyCU+Guv2+hf4=";
|
||||
url = "mirror://gnome/sources/msitools/${lib.versions.majorMinor version}/msitools-${version}.tar.xz";
|
||||
hash = "sha256-+khaQhOX71/gLfWrk/ztkav2hXMPQPlMcVe0MNJKNJg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix executable bit on tools (regression in Meson migration).
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/msitools/commit/25c4353cf173cddeb76c0a2dd6621bcb753cabf8.patch";
|
||||
sha256 = "VknfZCCn4jxwn9l9noXdGczv2kV+IbOsw9cNBE67P1U=";
|
||||
})
|
||||
|
||||
# Fix failure on big-endian platforms.
|
||||
# https://gitlab.gnome.org/GNOME/msitools/issues/31
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/skitt/msitools/commit/3668c8288085d5beefae7c1387330ce9599b8365.patch";
|
||||
sha256 = "x3Mp+9TRqBAJIdzVn68HyYt0lujyMk5h5xSBUQHe9Oo=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
|
||||
@ -20,6 +20,10 @@ let
|
||||
# not appear to have issues, but the source is not available yet (as of June 2023).
|
||||
useLLVMStrip = lib.versionAtLeast llvmVersion "15" || lib.versionAtLeast cctoolsVersion "1005.2";
|
||||
|
||||
# Clang 11 performs an optimization on x86_64 that is sensitive to the presence of debug info.
|
||||
# This causes GCC to fail to bootstrap due to object file differences between stages 2 and 3.
|
||||
useClangAssembler = lib.versionAtLeast llvmVersion "12" || !stdenv.isx86_64;
|
||||
|
||||
llvm_bins = [
|
||||
"dwarfdump"
|
||||
"nm"
|
||||
@ -52,7 +56,8 @@ let
|
||||
]
|
||||
++ lib.optional (!useLLVMBitcodeStrip) "bitcode_strip"
|
||||
++ lib.optional (!useLLVMOtool) "otool"
|
||||
++ lib.optional (!useLLVMStrip) "strip";
|
||||
++ lib.optional (!useLLVMStrip) "strip"
|
||||
++ lib.optional (!useClangAssembler) "as";
|
||||
|
||||
targetPrefix = lib.optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-";
|
||||
|
||||
@ -79,10 +84,12 @@ stdenv.mkDerivation {
|
||||
mkdir -p "$out/bin" "$man"
|
||||
ln -s ${lib.getDev cctools-port} "$dev"
|
||||
|
||||
'' + lib.optionalString useClangAssembler ''
|
||||
# Use the clang-integrated assembler instead of using `as` from cctools.
|
||||
makeWrapper "${lib.getBin llvmPackages.clang-unwrapped}/bin/clang" "$out/bin/${targetPrefix}as" \
|
||||
--add-flags "-x assembler -integrated-as -c"
|
||||
|
||||
'' + ''
|
||||
ln -s "${lib.getBin llvmPackages.bintools-unwrapped}/bin/${targetPrefix}llvm-ar" "$out/bin/${targetPrefix}ar"
|
||||
${linkManPages llvmPackages.llvm-manpages "llvm-ar" "ar"}
|
||||
|
||||
|
||||
@ -1,24 +1,25 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitea,
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitea
|
||||
, bash
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "game-devices-udev-rules";
|
||||
version = "0.21";
|
||||
version = "0.22";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "fabiscafe";
|
||||
repo = "game-devices-udev";
|
||||
rev = version;
|
||||
hash = "sha256-Yy91yDF5BSDTTlr/Pj8e0UklPooEdzvRW8mkhdHtHVo=";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-1aOb8pJxB+/PM7spcvZcy/cwdEolHQ4+lwBLij+6iDk=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
postInstall = ''
|
||||
install -Dm444 -t "$out/lib/udev/rules.d" *.rules
|
||||
runHook postInstall
|
||||
substituteInPlace $out/lib/udev/rules.d/71-powera-controllers.rules \
|
||||
--replace "/bin/sh" "${bash}/bin/bash"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
@ -32,6 +33,6 @@ stdenv.mkDerivation rec {
|
||||
Additionally, you may need to enable 'hardware.uinput'.
|
||||
'';
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [keenanweaver];
|
||||
maintainers = with maintainers; [ keenanweaver ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -16,20 +16,20 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "evcc";
|
||||
version = "0.118.7";
|
||||
version = "0.118.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evcc-io";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-1mE3PZDC3IikVvgHYK0RQ6gheGdZcwxwQRLo7f8h9F0=";
|
||||
hash = "sha256-VEXmPqvWAXS39USXqJi8wWsqFa3HphB6zYgFeMA9s2g=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1c+0EoTM/K0Bq0/eg4J/qNyslo7MP3VSwFgGn5DOWto=";
|
||||
vendorHash = "sha256-0NTOit1nhX/zxQjHwU7ZOY1GsoIu959/KICCEWyfIQ4=";
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit src;
|
||||
hash = "sha256-Kwt6YzaqJhEF90+r4+BjYwgmD5xXQBSEzwp6dg3X9GQ=";
|
||||
hash = "sha256-/zpyU7x3cdmKrS7YiMe2BVJm0AC0P+yspiG9C3dMVAk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "blesh";
|
||||
version = "0.3.4";
|
||||
version = "0.4.0-devel3";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/akinomyoga/ble.sh/releases/download/v${version}/ble-${version}.tar.xz";
|
||||
sha256 = "sha256-MGCQirZvqGfjTTsbDfihY2il/u2suWBaZ6dX8mF1zLk=";
|
||||
sha256 = "sha256-kGLp8RaInYSrJEi3h5kWEOMAbZV/gEPFUjOLgBuMhCI=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ lib, stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "1.8.9";
|
||||
version = "1.9.0";
|
||||
pname = "antidote";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattmc3";
|
||||
repo = "antidote";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-grKbMYPEo/OygTTLm+igGtHJpHWSELVQFRO9HxijHUY=";
|
||||
hash = "sha256-YKFG66Kjw/S0YkvPlJK3HC9v00SHEW1Wng6+xcy41Hg=";
|
||||
};
|
||||
|
||||
dontPatch = true;
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
, openblas
|
||||
, blas
|
||||
, lapack
|
||||
, openfst
|
||||
, icu
|
||||
, cmake
|
||||
, pkg-config
|
||||
@ -11,27 +10,23 @@
|
||||
, git
|
||||
, python3
|
||||
, Accelerate
|
||||
, _experimental-update-script-combinators
|
||||
, common-updater-scripts
|
||||
, ripgrep
|
||||
, unstableGitUpdater
|
||||
, writeShellScript
|
||||
}:
|
||||
|
||||
assert blas.implementation == "openblas" && lapack.implementation == "openblas";
|
||||
let
|
||||
# rev from https://github.com/kaldi-asr/kaldi/blob/master/cmake/third_party/openfst.cmake
|
||||
openfst = fetchFromGitHub {
|
||||
owner = "kkm000";
|
||||
repo = "openfst";
|
||||
rev = "338225416178ac36b8002d70387f5556e44c8d05";
|
||||
sha256 = "sha256-MGEUuw7ex+WcujVdxpO2Bf5sB6Z0edcAeLGqW/Lo1Hs=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kaldi";
|
||||
version = "unstable-2022-09-26";
|
||||
version = "unstable-2023-05-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kaldi-asr";
|
||||
repo = "kaldi";
|
||||
rev = "f6f4ccaf213f0fe8b26e633a7dc0c802150626a0";
|
||||
sha256 = "sha256-ybW2J4lWf6YaQGZZvxEVDUMAg84DC17W+yX6ZsuBDac=";
|
||||
rev = "71f38e62cad01c3078555bfe78d0f3a527422d75";
|
||||
sha256 = "sha256-2xm0F80cjovy/G9Ytq/iwa1eexZk0mromv6PPuNIT8U=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
@ -39,42 +34,11 @@ stdenv.mkDerivation {
|
||||
"-DBUILD_SHARED_LIBS=on"
|
||||
"-DBLAS_LIBRARIES=-lblas"
|
||||
"-DLAPACK_LIBRARIES=-llapack"
|
||||
"-DFETCHCONTENT_SOURCE_DIR_OPENFST:PATH=${finalAttrs.passthru.sources.openfst}"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preConfigure = ''
|
||||
mkdir bin
|
||||
cat > bin/git <<'EOF'
|
||||
#!${stdenv.shell}
|
||||
if [[ "$1" == "--version" ]]; then
|
||||
# cmake checks this
|
||||
${git}/bin/git --version
|
||||
elif [[ "$1" == "clone" ]]; then
|
||||
# mock this call:
|
||||
|
||||
# https://github.com/kaldi-asr/kaldi/blob/c9d8b9ad3fef89237ba5517617d977b7d70a7ed5/cmake/third_party/openfst.cmake#L5
|
||||
cp -r ${openfst} ''${@: -1}
|
||||
chmod -R +w ''${@: -1}
|
||||
elif [[ "$1" == "rev-list" ]]; then
|
||||
# fix up this call:
|
||||
# https://github.com/kaldi-asr/kaldi/blob/c9d8b9ad3fef89237ba5517617d977b7d70a7ed5/cmake/VersionHelper.cmake#L8
|
||||
echo 0
|
||||
elif [[ "$1" == "rev-parse" ]]; then
|
||||
echo ${openfst.rev}
|
||||
echo 0
|
||||
fi
|
||||
true
|
||||
EOF
|
||||
chmod +x bin/git
|
||||
export PATH=$(pwd)/bin:$PATH
|
||||
'';
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
buildInputs = [
|
||||
openblas
|
||||
openfst
|
||||
icu
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
Accelerate
|
||||
@ -86,11 +50,46 @@ stdenv.mkDerivation {
|
||||
python3
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
cmakeFlagsArray+=(
|
||||
# Extract version without the need for git.
|
||||
# https://github.com/kaldi-asr/kaldi/blob/71f38e62cad01c3078555bfe78d0f3a527422d75/cmake/VersionHelper.cmake
|
||||
# Patch number is not actually used by default so we can just ignore it.
|
||||
# https://github.com/kaldi-asr/kaldi/blob/71f38e62cad01c3078555bfe78d0f3a527422d75/CMakeLists.txt#L214
|
||||
"-DKALDI_VERSION=$(cat src/.version)"
|
||||
)
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/kaldi
|
||||
cp -r ../egs $out/share/kaldi
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
sources = {
|
||||
# rev from https://github.com/kaldi-asr/kaldi/blob/master/cmake/third_party/openfst.cmake
|
||||
openfst = fetchFromGitHub {
|
||||
owner = "kkm000";
|
||||
repo = "openfst";
|
||||
rev = "338225416178ac36b8002d70387f5556e44c8d05";
|
||||
hash = "sha256-MGEUuw7ex+WcujVdxpO2Bf5sB6Z0edcAeLGqW/Lo1Hs=";
|
||||
};
|
||||
};
|
||||
|
||||
updateScript =
|
||||
let
|
||||
updateSource = unstableGitUpdater {};
|
||||
updateOpenfst = writeShellScript "update-openfst" ''
|
||||
hash=$(${ripgrep}/bin/rg --multiline --pcre2 --only-matching 'FetchContent_Declare\(\s*openfst[^)]*GIT_TAG\s*([0-9a-f]{40})' --replace '$1' "${finalAttrs.src}/cmake/third_party/openfst.cmake")
|
||||
${common-updater-scripts}/bin/update-source-version kaldi.sources.openfst "$hash" --source-key=out "--version-key=rev"
|
||||
'';
|
||||
in
|
||||
_experimental-update-script-combinators.sequence [
|
||||
updateSource
|
||||
updateOpenfst
|
||||
];
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Speech Recognition Toolkit";
|
||||
homepage = "https://kaldi-asr.org";
|
||||
@ -98,4 +97,4 @@ stdenv.mkDerivation {
|
||||
maintainers = with maintainers; [ mic92 ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
, writeShellScriptBin
|
||||
, runtimeShell
|
||||
, installShellFiles
|
||||
, bc
|
||||
, ncurses
|
||||
, perl
|
||||
, glibcLocales
|
||||
@ -60,6 +61,9 @@ buildGoModule rec {
|
||||
# Include first args to make sure we're patching the right thing
|
||||
substituteInPlace shell/key-bindings.bash \
|
||||
--replace " perl -n " " ${ourPerl}/bin/perl -n "
|
||||
# fzf-tmux depends on bc
|
||||
substituteInPlace bin/fzf-tmux \
|
||||
--replace "bc" "${bc}/bin/bc"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@ -6,17 +6,17 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "goose";
|
||||
version = "3.13.0";
|
||||
version = "3.13.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pressly";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-F8VfyxcacNSrjjBScrEk1QC5CQGifum0ZHgb4gYRmpY=";
|
||||
hash = "sha256-mz7kB8ygDm23bsuQy9mYnWSGF6DDGqBtvj82s2PLDR0=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-eE21EU09X6E2EDai3R7l916A3DDVj3bDAvB2VXagv48=";
|
||||
vendorHash = "sha256-lWlv6+Auj9YGxyJXr5WGbe4AWqJSpHE9RTY+9ZXyPVQ=";
|
||||
|
||||
# end-to-end tests require a docker daemon
|
||||
postPatch = ''
|
||||
|
||||
@ -256,6 +256,20 @@ in {
|
||||
description = "Correlate proton density to the response time of your app and the ion temperature to your exception rate.";
|
||||
};
|
||||
};
|
||||
splunk = glPlugin rec {
|
||||
name = "graylog-splunk-${version}";
|
||||
pluginName = "graylog-plugin-splunk";
|
||||
version = "0.5.0-rc.1";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/graylog-labs/graylog-plugin-splunk/releases/download/0.5.0-rc.1/graylog-plugin-splunk-0.5.0-rc.1.jar";
|
||||
sha256 = "sha256-EwF/Dc8GmMJBTxH9xGZizUIMTGSPedT4bprorN6X9Os=";
|
||||
};
|
||||
meta = {
|
||||
homepage = "https://github.com/graylog-labs/graylog-plugin-splunk";
|
||||
description = "Graylog output plugin that forwards one or more streams of data to Splunk via TCP.";
|
||||
license = lib.licenses.gpl3Only;
|
||||
};
|
||||
};
|
||||
twiliosms = glPlugin rec {
|
||||
name = "graylog-twiliosms-${version}";
|
||||
pluginName = "graylog-plugin-twiliosms";
|
||||
|
||||
@ -49,8 +49,8 @@ let
|
||||
|
||||
src = fetchFromSavannah {
|
||||
repo = "grub";
|
||||
rev = "6425c12cd77ad51ad24be84c092aefacf0875089";
|
||||
hash = "sha256-PSCa993Reph6w9+leE4a/9E6vIALdOqU3FZEPwasFyk=";
|
||||
rev = "grub-2.12-rc1";
|
||||
hash = "sha256-DrNFzi2o7ZUfL3bMdG63xivZIjcTgv8RODJz7hLJ3WY=";
|
||||
};
|
||||
|
||||
# HACK: the translations are stored on a different server,
|
||||
@ -77,7 +77,7 @@ assert !(efiSupport && xenSupport);
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "grub";
|
||||
version = "unstable-2023-07-03";
|
||||
version = "2.12-rc1";
|
||||
inherit src;
|
||||
|
||||
patches = [
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
python3.pkgs.buildPythonPackage rec {
|
||||
pname = "hid-tools";
|
||||
version = "0.3.1";
|
||||
version = "0.4";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
@ -14,7 +14,7 @@ python3.pkgs.buildPythonPackage rec {
|
||||
owner = "libevdev";
|
||||
repo = "hid-tools";
|
||||
rev = version;
|
||||
sha256 = "r496SKBGgHriIhriWYhhCSiChQUKhnHT/lEx9sEoT/0=";
|
||||
hash = "sha256-pxU1BvB+rjc5sptafMGnWi+vWPNDyCyUv8gTWg6z5hU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
||||
29
pkgs/tools/misc/vrc-get/default.nix
Normal file
29
pkgs/tools/misc/vrc-get/default.nix
Normal file
@ -0,0 +1,29 @@
|
||||
{ fetchFromGitHub, lib, rustPlatform, pkg-config, openssl, stdenv, Security }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "vrc-get";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anatawa12";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "16r3b2w4xfw1lwxp8ib23f76i4zgl8hk7q2g82yw6hxjimq69sy2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
# Make openssl-sys use pkg-config.
|
||||
OPENSSL_NO_VENDOR = 1;
|
||||
|
||||
cargoSha256 = "1f76y7hzh4pk7gj0w5gqb65w8qvkfx1bxx9z3w9vdqdkz39439rf";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command line client of VRChat Package Manager, the main feature of VRChat Creator Companion (VCC)";
|
||||
homepage = "https://github.com/anatawa12/vrc-get";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ bddvlpr ];
|
||||
};
|
||||
}
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "redli";
|
||||
version = "0.7.0";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IBM-Cloud";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-AeIGlRsUWK6q0GJJFmvJwpuGy312VPsMhkxMqDDzay4=";
|
||||
hash = "sha256-AeIGlRsUWK6q0GJJFmvJwpuGy312VPsMhkxMqDDzay4=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A humane alternative to the Redis-cli and TLS";
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "sish";
|
||||
version = "2.8.1";
|
||||
version = "2.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "antoniomika";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BzWpEkhLhTNt5C/1G0Hnkli2kMvRwGbRc1bCgsWdRUo=";
|
||||
hash = "sha256-6PCZtiXsDQfPZFw3r1n3rwgxigSnWgggHXzZdBT/fxA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-SQKkhyUYuOuPb8SOtjgRTsGKg6T75Zcot5ufHSUaiCM=";
|
||||
vendorHash = "sha256-RnvkEUvL/bQTTTlg0RF0xjjvVniltequNKRD3z0H3O8=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "HTTP(S)/WS(S)/TCP Tunnels to localhost";
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{ lib
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, python3
|
||||
, wrapGAppsHook
|
||||
, gobject-introspection
|
||||
@ -11,32 +10,16 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "gnome-keysign";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = pname;
|
||||
repo = "gnome-keysign";
|
||||
rev = version;
|
||||
sha256 = "1sjphi1lsivg9jmc8khbcqa9w6608pkrccz4nz3rlcc54hn0k0sj";
|
||||
hash = "sha256-k77z8Yligzs4rHpPckRGcC5qnCHynHQRjdDkzxwt1Ss=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix build failure due to missing import
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-keysign/commit/216c3677e68960afc517edc00529323e85909323.patch";
|
||||
sha256 = "1w410gvcridbq26sry7fxn49v59ss2lc0w5ab7csva8rzs1nc990";
|
||||
})
|
||||
|
||||
# stop requiring lxml (no longer used)
|
||||
# https://gitlab.gnome.org/GNOME/gnome-keysign/merge_requests/23
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-keysign/commit/ffc6f40584d7564951e1c8b6d18d4f8a6a3fa09d.patch";
|
||||
sha256 = "1hs6mmhi2f21kvy26llzvp37yf0i0dr69d18r641139nr6qg6kwy";
|
||||
includes = [ "setup.py" ];
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook
|
||||
gobject-introspection
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gotrue";
|
||||
version = "2.78.0";
|
||||
version = "2.82.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "supabase";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-1BINewYK6dDyzhrt3lhTb3KeYm2xlux3nyQOO348CMM=";
|
||||
hash = "sha256-x/ae7iTfwyEJ7JwNr6US+LJfVt1rZSGpf26LN5MU52o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-S/uedmoqTOmbIeotdky+s/eENDi2knKIW0rMMcQr2zU=";
|
||||
vendorHash = "sha256-eG6zB/nfsYYvvLf5i8AySkTfXv9rIGTTmyMA4PtcGjg=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "epubcheck";
|
||||
version = "5.0.1";
|
||||
version = "5.1.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/w3c/epubcheck/releases/download/v${version}/epubcheck-${version}.zip";
|
||||
sha256 = "sha256-X4/aIcGd/heNjpTurRHYcawcoZW/utTxYHcUtktsH8o=";
|
||||
sha256 = "sha256-gskQ02lGka3nBHSDXO3TpKSQzaoaJUQY9AvWG7L+1YM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -45,11 +45,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sile";
|
||||
version = "0.14.9";
|
||||
version = "0.14.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0528835iir2ws14fwb7w4dqs3wlzzcv5arjxs8v13drb194rlwcs";
|
||||
sha256 = "05jqr9lqy33zgi1wb0gn3j9w78sswznwbpaaz8i3jvrs1l1wd2i0";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@ -1867,6 +1867,10 @@ with pkgs;
|
||||
|
||||
vopono = callPackage ../tools/networking/vopono { };
|
||||
|
||||
vrc-get = callPackage ../tools/misc/vrc-get {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
winbox = callPackage ../tools/admin/winbox {
|
||||
wine = wineWowPackages.staging;
|
||||
};
|
||||
@ -23231,7 +23235,8 @@ with pkgs;
|
||||
in pkgs.buildEnv { # slightly hacky
|
||||
name = "libxml2+py-${res.libxml2.version}";
|
||||
paths = with libxml2; [ dev bin py ];
|
||||
inherit (libxml2) passthru;
|
||||
# Avoid update.nix conflicts with libxml2.
|
||||
passthru = builtins.removeAttrs libxml2.passthru [ "updateScript" ];
|
||||
# the hook to find catalogs is hidden by buildEnv
|
||||
postBuild = ''
|
||||
mkdir "$out/nix-support"
|
||||
|
||||
@ -7969,6 +7969,8 @@ self: super: with self; {
|
||||
|
||||
pytest-mockito = callPackage ../development/python-modules/pytest-mockito { };
|
||||
|
||||
pytest-pudb = callPackage ../development/python-modules/pytest-pudb { };
|
||||
|
||||
python-codon-tables = callPackage ../development/python-modules/python-codon-tables { };
|
||||
|
||||
python-creole = callPackage ../development/python-modules/python-creole { };
|
||||
@ -9199,6 +9201,8 @@ self: super: with self; {
|
||||
|
||||
pynvim = callPackage ../development/python-modules/pynvim { };
|
||||
|
||||
pynvim-pp = callPackage ../development/python-modules/pynvim-pp { };
|
||||
|
||||
pynvml = callPackage ../development/python-modules/pynvml { };
|
||||
|
||||
pynzb = callPackage ../development/python-modules/pynzb { };
|
||||
@ -11943,6 +11947,8 @@ self: super: with self; {
|
||||
|
||||
statsmodels = callPackage ../development/python-modules/statsmodels { };
|
||||
|
||||
std2 = callPackage ../development/python-modules/std2 { };
|
||||
|
||||
stdiomask = callPackage ../development/python-modules/stdiomask { };
|
||||
|
||||
stdlib-list = callPackage ../development/python-modules/stdlib-list { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user