Merge master into staging-next
This commit is contained in:
commit
8faf32ac60
|
@ -8349,6 +8349,12 @@
|
|||
name = "John Soo";
|
||||
githubId = 10039785;
|
||||
};
|
||||
jtbx = {
|
||||
email = "jtbx@duck.com";
|
||||
name = "Jeremy Baxter";
|
||||
github = "jtbx";
|
||||
githubId = 92071952;
|
||||
};
|
||||
jtcoolen = {
|
||||
email = "jtcoolen@pm.me";
|
||||
name = "Julien Coolen";
|
||||
|
@ -9035,6 +9041,12 @@
|
|||
githubId = 524268;
|
||||
name = "Koral";
|
||||
};
|
||||
koralowiec = {
|
||||
email = "qnlgzyrw@anonaddy.me";
|
||||
github = "koralowiec";
|
||||
githubId = 36413794;
|
||||
name = "Arek Kalandyk";
|
||||
};
|
||||
koslambrou = {
|
||||
email = "koslambrou@gmail.com";
|
||||
github = "koslambrou";
|
||||
|
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rehex";
|
||||
version = "0.5.4";
|
||||
version = "0.60.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "solemnwarning";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-UgwCfy2ssaPuSWeN2SXHBDXv/uLdrDoGr/Q9wXiuCnc=";
|
||||
hash = "sha256-oF8XtxKqyo6c2lNH6WDq6aEPeZw8RqBinDVhPpaDAWg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config which zip ]
|
||||
|
|
|
@ -173,12 +173,12 @@ final: prev:
|
|||
|
||||
LazyVim = buildVimPluginFrom2Nix {
|
||||
pname = "LazyVim";
|
||||
version = "2023-07-25";
|
||||
version = "2023-07-26";
|
||||
src = fetchFromGitHub {
|
||||
owner = "LazyVim";
|
||||
repo = "LazyVim";
|
||||
rev = "aa1cccf230a01bd85d5173f7d87f782fd83caa88";
|
||||
sha256 = "1kx8n6rn9vgsp7j9kmdz2f6yg812i64nclii0y2cjpnb8h1aa0cf";
|
||||
rev = "9264c54ae96d1d56f029ad9b561326c7b991c53b";
|
||||
sha256 = "1lcq6gwh31w1fg2cw5bzihjalfvagr6gf86kprd83vpjzwvp3237";
|
||||
};
|
||||
meta.homepage = "https://github.com/LazyVim/LazyVim/";
|
||||
};
|
||||
|
@ -305,12 +305,12 @@ final: prev:
|
|||
|
||||
SchemaStore-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "SchemaStore.nvim";
|
||||
version = "2023-07-23";
|
||||
version = "2023-07-27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "b0o";
|
||||
repo = "SchemaStore.nvim";
|
||||
rev = "f33af3051c79f084824753f9852ed4db95b43c8d";
|
||||
sha256 = "00jqh51jmc3xbfpsanhkln1bmrbr65ipbcnaicsac97751xclymr";
|
||||
rev = "fba131b5ef7a54a8f8d71ef2a2e8d2263b87daac";
|
||||
sha256 = "138k6slpv8xxjl8sggqcgmly2byifwa9842y2w73hwc956fx9clr";
|
||||
};
|
||||
meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
|
||||
};
|
||||
|
@ -967,12 +967,12 @@ final: prev:
|
|||
|
||||
base46 = buildVimPluginFrom2Nix {
|
||||
pname = "base46";
|
||||
version = "2023-07-25";
|
||||
version = "2023-07-27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvchad";
|
||||
repo = "base46";
|
||||
rev = "cb012feef7ce8c0bb8cdcb2b858393aa92834f46";
|
||||
sha256 = "1zg0pw2jhx8w21yfky3icai0wq87884ybls34hhn9rwkzn78m4n9";
|
||||
rev = "a88ada931feecc22dfdcaae00ff98f412b863f9a";
|
||||
sha256 = "1zqaqd2byzfqgy36jwjimcrvgs2wds9dx18kza41c3in9b9243rd";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvchad/base46/";
|
||||
};
|
||||
|
@ -1231,12 +1231,12 @@ final: prev:
|
|||
|
||||
chadtree = buildVimPluginFrom2Nix {
|
||||
pname = "chadtree";
|
||||
version = "2023-07-23";
|
||||
version = "2023-07-26";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "chadtree";
|
||||
rev = "3664cb28461a30f8b1627180a19b8b22a10331ab";
|
||||
sha256 = "13941i4860gkj0vri7zxs7wj2lf9q04scn3v0c57lcbn9ca1kk70";
|
||||
rev = "a12f2d375a06b0b10137462820efd5962425333e";
|
||||
sha256 = "02p1wfkc6d5ysgv05ifazk3yswikan3j16fdcc07mfjp2y2cs5vk";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/chadtree/";
|
||||
};
|
||||
|
@ -1987,12 +1987,12 @@ final: prev:
|
|||
|
||||
coc-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "coc.nvim";
|
||||
version = "2023-01-29";
|
||||
version = "2023-07-26";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neoclide";
|
||||
repo = "coc.nvim";
|
||||
rev = "bbaa1d5d1ff3cbd9d26bb37cfda1a990494c4043";
|
||||
sha256 = "116h45vnz98ni60i12f2z6rwz9gkpp1k4ysp1ry0qpjgmb5fcbsy";
|
||||
rev = "9332d2ab1154dedc9dbcd3e1c873886abaf061a6";
|
||||
sha256 = "1aq1bz2pl6wfhxawkdwkrcvc18dgs0x3p5fwivfmnhaqislkx4lf";
|
||||
};
|
||||
meta.homepage = "https://github.com/neoclide/coc.nvim/";
|
||||
};
|
||||
|
@ -2011,12 +2011,12 @@ final: prev:
|
|||
|
||||
codeium-vim = buildVimPluginFrom2Nix {
|
||||
pname = "codeium.vim";
|
||||
version = "2023-07-24";
|
||||
version = "2023-07-28";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Exafunction";
|
||||
repo = "codeium.vim";
|
||||
rev = "9bf87e33fdb85d9f423f49450079561557ea6f3d";
|
||||
sha256 = "0kighzhclzx7gd2kqzsy28483spr36pnl3m4p7b4cdrkgn9g99rh";
|
||||
rev = "ddf848e8647e85774766ea8bdcd5a2258ea44006";
|
||||
sha256 = "0l0bp9d4z0i8yfbnrpydvagzk3q0wc82r5wp3kbqk195qzykflx3";
|
||||
};
|
||||
meta.homepage = "https://github.com/Exafunction/codeium.vim/";
|
||||
};
|
||||
|
@ -2311,12 +2311,12 @@ final: prev:
|
|||
|
||||
coq-artifacts = buildVimPluginFrom2Nix {
|
||||
pname = "coq.artifacts";
|
||||
version = "2023-07-23";
|
||||
version = "2023-07-28";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "coq.artifacts";
|
||||
rev = "39bdecdcb3df41ba7f93c2b5acd4c6e25d80ba07";
|
||||
sha256 = "0axs9fk6i81zp748zb9ldvg914w94j38kk04adma6b75py5r9max";
|
||||
rev = "2b27da78d6eb74fa9fd565e845e2381c51e59675";
|
||||
sha256 = "0mawmz0i4nny1vdvahfb0b6hymil5vc4sa5yhj38yqcnwzbndzzv";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/coq.artifacts/";
|
||||
};
|
||||
|
@ -2347,12 +2347,12 @@ final: prev:
|
|||
|
||||
coq_nvim = buildVimPluginFrom2Nix {
|
||||
pname = "coq_nvim";
|
||||
version = "2023-07-23";
|
||||
version = "2023-07-28";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "coq_nvim";
|
||||
rev = "a8ff103b50a9a4ba3dec9a485699b3382b59ab92";
|
||||
sha256 = "1ia2ibqvmv89ijn8xkdrh7n1j4mg6majami4cj1smvrn1jscbjg5";
|
||||
rev = "8ad8815816657e6be07f6c47ae50f6e8a70e9a59";
|
||||
sha256 = "1i1264czx49qs30i788nr8ryawrlk8gnvyw3p7psb58p6mc6gsih";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
|
||||
};
|
||||
|
@ -2503,12 +2503,12 @@ final: prev:
|
|||
|
||||
dashboard-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "dashboard-nvim";
|
||||
version = "2023-06-14";
|
||||
version = "2023-07-26";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvimdev";
|
||||
repo = "dashboard-nvim";
|
||||
rev = "ab84915f7cfd7bc7a5bfe7409c3eccf8d09c162a";
|
||||
sha256 = "1bmi9hxchjs1s0d5gc02akyxzixq1f0k2hhr2jisj9xx8d0x8fjh";
|
||||
rev = "c17d3210b3dec8798b4fc82a11c542989251f85d";
|
||||
sha256 = "1ay3jap0darihkwd71iszw939k8vpjb0chs58p75kxh07212wlv9";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvimdev/dashboard-nvim/";
|
||||
};
|
||||
|
@ -2997,12 +2997,12 @@ final: prev:
|
|||
|
||||
edge = buildVimPluginFrom2Nix {
|
||||
pname = "edge";
|
||||
version = "2023-04-24";
|
||||
version = "2023-07-28";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sainnhe";
|
||||
repo = "edge";
|
||||
rev = "358cb6688ac577470a4eafcb53bdd63899dfc937";
|
||||
sha256 = "1jz3c5z4cdgi5a50c6wlhz23rapfqchm79n9f3mgc9ss1aisqv0y";
|
||||
rev = "4fead634946186a21ca7f406b213896e596fbd93";
|
||||
sha256 = "02xbjblsy384ld1002hc6mc9b9i9rxlsi692s8qp1sks0v0bjmag";
|
||||
};
|
||||
meta.homepage = "https://github.com/sainnhe/edge/";
|
||||
};
|
||||
|
@ -3058,12 +3058,12 @@ final: prev:
|
|||
|
||||
elixir-tools-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "elixir-tools.nvim";
|
||||
version = "2023-07-20";
|
||||
version = "2023-07-28";
|
||||
src = fetchFromGitHub {
|
||||
owner = "elixir-tools";
|
||||
repo = "elixir-tools.nvim";
|
||||
rev = "1c7452bd93cf77946cb838a39f0cbd02c782f1e6";
|
||||
sha256 = "0k8j0wcm1xxwlsb5q6iww84yx2fkh76dk6dhj63vxyfpg473snzi";
|
||||
rev = "0930654e8c83c6adbb479f75882ae5fd0caf9723";
|
||||
sha256 = "1w0367p2hrhknka2kald0c35bzmvdn1h3b8gvqrl6k3mpr4v8qal";
|
||||
};
|
||||
meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/";
|
||||
};
|
||||
|
@ -3131,12 +3131,12 @@ final: prev:
|
|||
|
||||
everforest = buildVimPluginFrom2Nix {
|
||||
pname = "everforest";
|
||||
version = "2023-05-19";
|
||||
version = "2023-07-27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sainnhe";
|
||||
repo = "everforest";
|
||||
rev = "1db527e770deb8cbb3b5b60d8921f80bd2a4c12c";
|
||||
sha256 = "0jg53zzgv417v8c079cay11nwy8mi6v5svdslcl4iq84cr7l5qfq";
|
||||
rev = "b8ef2d0bde98645250a8997393aefba38e8c6ff3";
|
||||
sha256 = "0q8jji19abfqmbd30iha2h0bf15k12az6wh2b9nlcdhjzki81cdl";
|
||||
};
|
||||
meta.homepage = "https://github.com/sainnhe/everforest/";
|
||||
};
|
||||
|
@ -3708,12 +3708,12 @@ final: prev:
|
|||
|
||||
gitsigns-nvim = buildNeovimPlugin {
|
||||
pname = "gitsigns.nvim";
|
||||
version = "2023-07-25";
|
||||
version = "2023-07-27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lewis6991";
|
||||
repo = "gitsigns.nvim";
|
||||
rev = "11b80e7eea249affc8776483272bcfc627b5552a";
|
||||
sha256 = "0mwmyci65w4rzrvlcws7s6yw4m801vdcqr585harccifyrvpslls";
|
||||
rev = "5d73da785a3c05fd63ac31769079db05169a6ec7";
|
||||
sha256 = "16xdc4nf9i39bi9diin5v3782gnlp0ln95aphydv2s7rcg88mdlj";
|
||||
};
|
||||
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
|
||||
};
|
||||
|
@ -3756,24 +3756,24 @@ final: prev:
|
|||
|
||||
glow-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "glow.nvim";
|
||||
version = "2023-05-05";
|
||||
version = "2023-07-28";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ellisonleao";
|
||||
repo = "glow.nvim";
|
||||
rev = "bbd0473d72a45094495ee5600b5577823543eefe";
|
||||
sha256 = "13l7xd71nnvm643pc15zvi5yc2hig2x6s8dfv7bz9ygf3q7wyzy4";
|
||||
rev = "0bd87753b052205d271a790b48a09882a9e79f35";
|
||||
sha256 = "1sgarwqc8l8gygz90f408cljpcqrw1gsyzvfg6afih90214nfk95";
|
||||
};
|
||||
meta.homepage = "https://github.com/ellisonleao/glow.nvim/";
|
||||
};
|
||||
|
||||
go-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "go.nvim";
|
||||
version = "2023-07-25";
|
||||
version = "2023-07-27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ray-x";
|
||||
repo = "go.nvim";
|
||||
rev = "816fbe43b5dc15edcafa0b32785a4972fb34e67f";
|
||||
sha256 = "0fs3rf3l0dp0141rc0g75alq89z9khjcvhfz7brn291bik7xm56b";
|
||||
rev = "7e5602dd51a230581f43c42559d7acc2fbca23cf";
|
||||
sha256 = "1090n4rdgjfgzfabdmmi0rxd4xk1h2y5jmhy9z7ncs0qpplhnbq2";
|
||||
};
|
||||
meta.homepage = "https://github.com/ray-x/go.nvim/";
|
||||
};
|
||||
|
@ -3888,12 +3888,12 @@ final: prev:
|
|||
|
||||
gruvbox-material = buildVimPluginFrom2Nix {
|
||||
pname = "gruvbox-material";
|
||||
version = "2023-04-24";
|
||||
version = "2023-07-28";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sainnhe";
|
||||
repo = "gruvbox-material";
|
||||
rev = "3fff63b0d6a425ad1076a260cd4f6da61d1632b1";
|
||||
sha256 = "0207p4qg6s31957jbfb0k5yabgadzn6wf3z43m5skvp5w1al5a2b";
|
||||
rev = "b17daceec6ed9a5fb46e0f293f2ac666c90e5459";
|
||||
sha256 = "16kg8plbav8vd97a3kix5043f538kkqiv29kmwq6aa971vjxyp9g";
|
||||
};
|
||||
meta.homepage = "https://github.com/sainnhe/gruvbox-material/";
|
||||
};
|
||||
|
@ -4017,6 +4017,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/travitch/hasksyn/";
|
||||
};
|
||||
|
||||
headlines-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "headlines.nvim";
|
||||
version = "2023-07-27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lukas-reineke";
|
||||
repo = "headlines.nvim";
|
||||
rev = "74a083a3c32a08be24f7dfcc6f448ecf47857f46";
|
||||
sha256 = "1ak7j159c0lv6pxiq4nld6svzx3465r6f1xwpawwrxlzhi5a14yz";
|
||||
};
|
||||
meta.homepage = "https://github.com/lukas-reineke/headlines.nvim/";
|
||||
};
|
||||
|
||||
heirline-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "heirline.nvim";
|
||||
version = "2023-07-24";
|
||||
|
@ -4643,12 +4655,12 @@ final: prev:
|
|||
|
||||
lean-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lean.nvim";
|
||||
version = "2023-07-19";
|
||||
version = "2023-07-27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Julian";
|
||||
repo = "lean.nvim";
|
||||
rev = "bb2ac98df0ca24b334d0d634a12c7ce90c8f4b4d";
|
||||
sha256 = "0w7h0ilypwf3skqd750bpg66kxrzkv1i3av0k4zjwc1r6q9g24ap";
|
||||
rev = "b82d1e8d5f6f33bd89af95e795f6877a7a6cbf7c";
|
||||
sha256 = "0npa97h0d31p0sagkssc2gag239gssawjd0n0q3mxbhfs6jyayck";
|
||||
};
|
||||
meta.homepage = "https://github.com/Julian/lean.nvim/";
|
||||
};
|
||||
|
@ -5027,12 +5039,12 @@ final: prev:
|
|||
|
||||
lsp-zero-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lsp-zero.nvim";
|
||||
version = "2023-07-16";
|
||||
version = "2023-07-28";
|
||||
src = fetchFromGitHub {
|
||||
owner = "VonHeikemen";
|
||||
repo = "lsp-zero.nvim";
|
||||
rev = "7e1675e9e90ee08b859d75aa65609e480e55f752";
|
||||
sha256 = "0qfznb6zc5gd65zz04h6qzd214xwaqgb7828fpnml7r5a2jnqv18";
|
||||
rev = "7bcbd67298237d4c7a958715bc99f25f20702c6e";
|
||||
sha256 = "0q61hfk3dsa6pgx25iqxz4r1r25mcizi0lbyvv88nn5fdvg8lv74";
|
||||
};
|
||||
meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/";
|
||||
};
|
||||
|
@ -5146,12 +5158,12 @@ final: prev:
|
|||
|
||||
luasnip = buildVimPluginFrom2Nix {
|
||||
pname = "luasnip";
|
||||
version = "2023-07-18";
|
||||
version = "2023-07-26";
|
||||
src = fetchFromGitHub {
|
||||
owner = "l3mon4d3";
|
||||
repo = "luasnip";
|
||||
rev = "0b4950a237ce441a6a3a947d501622453f6860ea";
|
||||
sha256 = "062cfa2ckfca2i87l8p6k1lagrygb0lnbihp4y3dpxp4sbdppyl0";
|
||||
rev = "e81cbe6004051c390721d8570a4a0541ceb0df10";
|
||||
sha256 = "1smr62hm7id8j2j7cra8rcjn9xwdpayak9cfgyx4hs58w5g8hvbj";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
|
||||
|
@ -5699,12 +5711,12 @@ final: prev:
|
|||
|
||||
neo-tree-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "neo-tree.nvim";
|
||||
version = "2023-07-19";
|
||||
version = "2023-07-26";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-neo-tree";
|
||||
repo = "neo-tree.nvim";
|
||||
rev = "3c68ae5968b75aea8d445b3bb024e007b0bd0b65";
|
||||
sha256 = "04c3lirpywwc7qlwgh8r5d1x01ggnb5f1ma3m62q9xpqd04hxmaz";
|
||||
rev = "93fcf0a3056c60829c0a210fe35523cda7ef0369";
|
||||
sha256 = "1gyb0y0dalam3s7gj8179kkgpjkn05wv15gkjhy0r16b7xyfk6vh";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/";
|
||||
};
|
||||
|
@ -5747,12 +5759,12 @@ final: prev:
|
|||
|
||||
neodev-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "neodev.nvim";
|
||||
version = "2023-07-22";
|
||||
version = "2023-07-27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "folke";
|
||||
repo = "neodev.nvim";
|
||||
rev = "866b6b6e687a93ba98851a03a74bf6d9211b7299";
|
||||
sha256 = "1a99622n34h855fw3ayib40zv7v3w05qldwa44gy69zfbvgw8z4s";
|
||||
rev = "f57e5210d450b47aa02ea6d9e50a37414f570b4c";
|
||||
sha256 = "1mx41pwdrnxbzgwx478fcdp8v7qljh9z06jn5qs0706lsw05pkci";
|
||||
};
|
||||
meta.homepage = "https://github.com/folke/neodev.nvim/";
|
||||
};
|
||||
|
@ -5783,12 +5795,12 @@ final: prev:
|
|||
|
||||
neogit = buildVimPluginFrom2Nix {
|
||||
pname = "neogit";
|
||||
version = "2023-07-25";
|
||||
version = "2023-07-27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NeogitOrg";
|
||||
repo = "neogit";
|
||||
rev = "e94b15969e65eafbf31749700828cac117cc1336";
|
||||
sha256 = "1anzm10mc94lwnhlcxp4qkxnvf1kwr1bxb4kjq1a2c6v05sx5jfb";
|
||||
rev = "2118729749a5b500e6d52bfeac22559c5a0866cc";
|
||||
sha256 = "1qfh68md3wv5bchpip450fnmgwzxlylgb8kf5p7i8gkkzz7qdg3q";
|
||||
};
|
||||
meta.homepage = "https://github.com/NeogitOrg/neogit/";
|
||||
};
|
||||
|
@ -5999,12 +6011,12 @@ final: prev:
|
|||
|
||||
neotest-jest = buildVimPluginFrom2Nix {
|
||||
pname = "neotest-jest";
|
||||
version = "2023-04-16";
|
||||
version = "2023-07-28";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-neotest";
|
||||
repo = "neotest-jest";
|
||||
rev = "22b1050dda3ebd401780ec4b8e193cf52523a4da";
|
||||
sha256 = "0vg433x68c9h0nzws6lwb4xcgqzm8ss5dkmi8df4fa55m2ll8iaw";
|
||||
rev = "e60280f53ef9f84fd827aecae1e2f732ba4326b1";
|
||||
sha256 = "1j4q8z3vpbcmgsmv2nvlr7dziqr4kl65prapqlr6zj0w30lr3gzn";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-neotest/neotest-jest/";
|
||||
};
|
||||
|
@ -6431,12 +6443,12 @@ final: prev:
|
|||
|
||||
nvchad = buildVimPluginFrom2Nix {
|
||||
pname = "nvchad";
|
||||
version = "2023-07-24";
|
||||
version = "2023-07-26";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvchad";
|
||||
repo = "nvchad";
|
||||
rev = "f18488d41cb74321377631f691a3247bc59cb064";
|
||||
sha256 = "1sz57jxzv64g1669pj5xa1kp64bbkr8gksq0wkrrmp5cjdky31bm";
|
||||
rev = "0e27cb4b44fbba69f8646d1f88555737d2b6aedf";
|
||||
sha256 = "00a4wazmxmrnb2da0x4im4iwr0df0kh5jn73hclp517r73m3fi4w";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvchad/nvchad/";
|
||||
};
|
||||
|
@ -6515,12 +6527,12 @@ final: prev:
|
|||
|
||||
nvim-bqf = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-bqf";
|
||||
version = "2023-06-24";
|
||||
version = "2023-07-27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kevinhwang91";
|
||||
repo = "nvim-bqf";
|
||||
rev = "3460a1ccf4dc92a52ed7fe2012f02a9194cd84d2";
|
||||
sha256 = "02z00d4ah393agcpp0ihzz19z2kgnqnz3l6vwrg9qgln5k21q5fq";
|
||||
rev = "65397976cec59a1e9892b93e3ab1ea987064b0dc";
|
||||
sha256 = "0yih7p37gm3ipx6vixb89iq7wwf85id8ff49hrs4v6y020s4sny5";
|
||||
};
|
||||
meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";
|
||||
};
|
||||
|
@ -6575,12 +6587,12 @@ final: prev:
|
|||
|
||||
nvim-cokeline = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-cokeline";
|
||||
version = "2023-07-24";
|
||||
version = "2023-07-26";
|
||||
src = fetchFromGitHub {
|
||||
owner = "willothy";
|
||||
repo = "nvim-cokeline";
|
||||
rev = "056da2596e20959d0fd6d9f713c10c6884e5ece0";
|
||||
sha256 = "0fvyss1xn1w9vrrsx6vxpcawh3zpw03qd4iibgswqpgbkdxzxa9w";
|
||||
rev = "c2842a51df781d357cd3408c411a7bec147b57ae";
|
||||
sha256 = "14nv3rvcy7fznxqdk2xbxfsjp8dg9kzv27zakpq352l4w9i4qfv0";
|
||||
};
|
||||
meta.homepage = "https://github.com/willothy/nvim-cokeline/";
|
||||
};
|
||||
|
@ -6671,12 +6683,12 @@ final: prev:
|
|||
|
||||
nvim-dap = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-dap";
|
||||
version = "2023-07-17";
|
||||
version = "2023-07-27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mfussenegger";
|
||||
repo = "nvim-dap";
|
||||
rev = "d17d1bba23ec72a157bd183c57840c39e323f515";
|
||||
sha256 = "172wwzl1rmxn0as549kf7gm9hzpxarz6nxsb4wsaaxab0980idik";
|
||||
rev = "2f28ea843bcdb378b171a66ddcd568516e431d55";
|
||||
sha256 = "12b72xhz3ha18xpcnc54s4ic19jg4i6v8dka8lxky6hymzw408ir";
|
||||
};
|
||||
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
|
||||
};
|
||||
|
@ -6767,12 +6779,12 @@ final: prev:
|
|||
|
||||
nvim-gdb = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-gdb";
|
||||
version = "2023-07-22";
|
||||
version = "2023-07-26";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sakhnik";
|
||||
repo = "nvim-gdb";
|
||||
rev = "7c92e203224ef3e24a2d07546bd56b4520cd9633";
|
||||
sha256 = "034c35a4dg3pr5ffhpw87gq6b7bdvhqqlcn9rwgjhslnsqx0h8cq";
|
||||
rev = "571f25463a2a4c512b7c2617c976beb8190d2621";
|
||||
sha256 = "1wxy0nwzg72i586a1zq8q17rbl116njbrwnbyd2xn1g21887myhm";
|
||||
};
|
||||
meta.homepage = "https://github.com/sakhnik/nvim-gdb/";
|
||||
};
|
||||
|
@ -6791,24 +6803,24 @@ final: prev:
|
|||
|
||||
nvim-highlight-colors = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-highlight-colors";
|
||||
version = "2023-07-13";
|
||||
version = "2023-07-27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "brenoprata10";
|
||||
repo = "nvim-highlight-colors";
|
||||
rev = "e1c976a31d19c10e77b89e054310b1061acb5158";
|
||||
sha256 = "0vw7314dz3ig5yd3msb0vp77x544sw27f2z54va7qwbwhx4125a3";
|
||||
rev = "231547093a788b925b8fc36351ad422701c3a8c8";
|
||||
sha256 = "186bpqmb1w18zq5sgzy0xj1cs24sb5sqpm3rqsqyhjbybgcf56yn";
|
||||
};
|
||||
meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/";
|
||||
};
|
||||
|
||||
nvim-highlite = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-highlite";
|
||||
version = "2023-07-24";
|
||||
version = "2023-07-26";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Iron-E";
|
||||
repo = "nvim-highlite";
|
||||
rev = "1973cb1cdf39a3e2005326713dbb1192fd977c22";
|
||||
sha256 = "1xxn6ys2c7vmhaig9280p7zd8mqfml6d5df9dzyw814f8bp5brqm";
|
||||
rev = "7e67fa948e32ad54f790023ae7ab0bac1a1d10fa";
|
||||
sha256 = "17r8adn2rw6b7914sk2i3407qj4ji8ph4b2dsjmfwrar6mixg411";
|
||||
};
|
||||
meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
|
||||
};
|
||||
|
@ -6863,12 +6875,12 @@ final: prev:
|
|||
|
||||
nvim-lastplace = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-lastplace";
|
||||
version = "2023-06-05";
|
||||
version = "2023-07-27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ethanholz";
|
||||
repo = "nvim-lastplace";
|
||||
rev = "aeb0e0bd399288092729da89a9e51dda4ccbc9ec";
|
||||
sha256 = "16b14l4k9lwlhbjzqqj0dn4726jdfwa5iz0sd2a1akvwq5r83rm5";
|
||||
rev = "0bb6103c506315044872e0f84b1f736c4172bb20";
|
||||
sha256 = "0a5bplxsds8y054jbgcwd0j0hzj0knazdmir54byd2bm57l78qcf";
|
||||
};
|
||||
meta.homepage = "https://github.com/ethanholz/nvim-lastplace/";
|
||||
};
|
||||
|
@ -6899,12 +6911,12 @@ final: prev:
|
|||
|
||||
nvim-lint = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-lint";
|
||||
version = "2023-07-20";
|
||||
version = "2023-07-27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mfussenegger";
|
||||
repo = "nvim-lint";
|
||||
rev = "606d1eb9506627253b98cba3fd7efad255e33ee4";
|
||||
sha256 = "1hshhzvhfd033nq03h09jkl88m3b6zcssvr1xdzzxhgx3533a7yi";
|
||||
rev = "3db039fb36bba925f096a659fc4d1b4a93f7fb70";
|
||||
sha256 = "1kwy1rc2nd6krvy3n4dkyxl0a2dzfl3viyrfrbzypv321p60jyyf";
|
||||
};
|
||||
meta.homepage = "https://github.com/mfussenegger/nvim-lint/";
|
||||
};
|
||||
|
@ -6935,12 +6947,12 @@ final: prev:
|
|||
|
||||
nvim-lspconfig = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-lspconfig";
|
||||
version = "2023-07-25";
|
||||
version = "2023-07-26";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neovim";
|
||||
repo = "nvim-lspconfig";
|
||||
rev = "6f426c34c8e21af2f934e56be9d1198a507ecc9f";
|
||||
sha256 = "167d9df5a3sh69frklk70ff3aw9ks33cc1v6y32iky8i16479zfi";
|
||||
rev = "b6091272422bb0fbd729f7f5d17a56d37499c54f";
|
||||
sha256 = "1miar4bdf60s4gp55rc9918v0k33w2mnqym9b44mqkxzn2fbsrh2";
|
||||
};
|
||||
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
|
||||
};
|
||||
|
@ -7151,12 +7163,12 @@ final: prev:
|
|||
|
||||
nvim-scrollview = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-scrollview";
|
||||
version = "2023-07-24";
|
||||
version = "2023-07-28";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dstein64";
|
||||
repo = "nvim-scrollview";
|
||||
rev = "5a8a24a80774236bde6557ce3a98346b3e4133f9";
|
||||
sha256 = "0k9m2vmb2xhhv7a5dr1yxv7hwhwnl1x4m6f2y3caylrhdydq0l57";
|
||||
rev = "d83bf0bf21349d396f365f86a8126747cb72d89c";
|
||||
sha256 = "0miw0mw3s73iv7inwhqcndcw4v759d5kvl74yd49n6qn28y0cj86";
|
||||
};
|
||||
meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
|
||||
};
|
||||
|
@ -7271,12 +7283,12 @@ final: prev:
|
|||
|
||||
nvim-treesitter = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-treesitter";
|
||||
version = "2023-07-25";
|
||||
version = "2023-07-27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-treesitter";
|
||||
repo = "nvim-treesitter";
|
||||
rev = "74a7da4e4be5ee71e9efb6d7bdffa16ad620cc57";
|
||||
sha256 = "017fp6rmqqf60br9fzc0xkndxcbq68s092k80ac4p47cqwr3blqn";
|
||||
rev = "f09bcffe0c29a464db24ad8124dd1f0be3fe9ce5";
|
||||
sha256 = "07lkgkwnzibsx0syd1js4j5rgpxqb2vpkn0x37zb8x2dxzdfv0i8";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
|
||||
};
|
||||
|
@ -7355,12 +7367,12 @@ final: prev:
|
|||
|
||||
nvim-ts-context-commentstring = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-ts-context-commentstring";
|
||||
version = "2023-06-22";
|
||||
version = "2023-07-27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "joosepalviste";
|
||||
repo = "nvim-ts-context-commentstring";
|
||||
rev = "7f625207f225eea97ef7a6abe7611e556c396d2f";
|
||||
sha256 = "0rr0kqr4v2pf9r31sw5mk8xhrlp1nq8bhbmghi18gxxg2qc58p65";
|
||||
rev = "e9062e2dfb9854e6a927370f2d720de354c88524";
|
||||
sha256 = "198mh7n08824mxnqhxa74fvv0nlsy179qigjzla4fny5y3yxrjq0";
|
||||
};
|
||||
meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/";
|
||||
};
|
||||
|
@ -7571,12 +7583,12 @@ final: prev:
|
|||
|
||||
onedarkpro-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "onedarkpro.nvim";
|
||||
version = "2023-07-23";
|
||||
version = "2023-07-25";
|
||||
src = fetchFromGitHub {
|
||||
owner = "olimorris";
|
||||
repo = "onedarkpro.nvim";
|
||||
rev = "fdd6d80011ad7b1496ce758af0fc1bcd147dc2b1";
|
||||
sha256 = "10mw26pa9v3gk77jxcwir4ci2n8y496rldjj7ghlpxcc572aybaw";
|
||||
rev = "5b447b2d5937a66033084b05ced0f79bcf6e6f64";
|
||||
sha256 = "1czja1d558f303s9dbsr724a3vxgw0lhglzq4n614ljzwy2bwqx5";
|
||||
};
|
||||
meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
|
||||
};
|
||||
|
@ -8173,12 +8185,12 @@ final: prev:
|
|||
|
||||
refactoring-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "refactoring.nvim";
|
||||
version = "2023-07-23";
|
||||
version = "2023-07-26";
|
||||
src = fetchFromGitHub {
|
||||
owner = "theprimeagen";
|
||||
repo = "refactoring.nvim";
|
||||
rev = "7d57e01a9ae012c7aedd73f518d45608a772eb1f";
|
||||
sha256 = "12r8qd6c0c3ij4md3vvbl4kyfw91j3lb3kl10hknaar5kjibs2kg";
|
||||
rev = "5359e74291164fcaeaaecdea9ba753ad54eb53d0";
|
||||
sha256 = "1jskfd63n3r1slwhbv1qv239nd0mp3q7h4r9fardkc4xf7nsy1jb";
|
||||
};
|
||||
meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";
|
||||
};
|
||||
|
@ -8353,12 +8365,12 @@ final: prev:
|
|||
|
||||
satellite-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "satellite.nvim";
|
||||
version = "2023-07-16";
|
||||
version = "2023-07-26";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lewis6991";
|
||||
repo = "satellite.nvim";
|
||||
rev = "723b893a5a2c1e2b77a82df229c19b57f33638e8";
|
||||
sha256 = "0skzfg4y3ws4904b0kxlzzlqs0k6s072drhhiwrddlr6fjglpk5f";
|
||||
rev = "8a84a2ab739d0cb5eff461f2635a32bf9a0c508d";
|
||||
sha256 = "0x5kc8r6z8m7arhxv2nq723fzdn7c5xvmsxpp5jndvbk6nmh6n78";
|
||||
};
|
||||
meta.homepage = "https://github.com/lewis6991/satellite.nvim/";
|
||||
};
|
||||
|
@ -8485,12 +8497,12 @@ final: prev:
|
|||
|
||||
sg-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "sg.nvim";
|
||||
version = "2023-07-25";
|
||||
version = "2023-07-27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sourcegraph";
|
||||
repo = "sg.nvim";
|
||||
rev = "3fdedc7f14ee3967e2b0a49d51fdef1f92b802af";
|
||||
sha256 = "14lf8izgkr5m0w41k63vp2r2b2ll0zvjkm5c6lqrm3i7cmmln229";
|
||||
rev = "7de5e1577800560b2a94c0618fdccc67b74fa620";
|
||||
sha256 = "1prq9q4mcy9035n8vganwgcmdxr7xpg8dscrracd4mrny5bhx20j";
|
||||
};
|
||||
meta.homepage = "https://github.com/sourcegraph/sg.nvim/";
|
||||
};
|
||||
|
@ -8630,12 +8642,12 @@ final: prev:
|
|||
|
||||
sonokai = buildVimPluginFrom2Nix {
|
||||
pname = "sonokai";
|
||||
version = "2023-04-24";
|
||||
version = "2023-07-28";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sainnhe";
|
||||
repo = "sonokai";
|
||||
rev = "a9b2a3e83ed4fa7a5541e41be9becaa7b436edcf";
|
||||
sha256 = "0zfgi04c42n1bf5l9zj4g5k60fnsp2njf12vkpfnq2vqdcj1563i";
|
||||
rev = "adb066ac5250556ccfca22f901c9710a735f23c2";
|
||||
sha256 = "081ccy3s94js343ywr24jwky3qrmk508vddm5vrhpdgrpni2z2zm";
|
||||
};
|
||||
meta.homepage = "https://github.com/sainnhe/sonokai/";
|
||||
};
|
||||
|
@ -8787,12 +8799,12 @@ final: prev:
|
|||
|
||||
srcery-vim = buildVimPluginFrom2Nix {
|
||||
pname = "srcery-vim";
|
||||
version = "2023-04-25";
|
||||
version = "2023-07-26";
|
||||
src = fetchFromGitHub {
|
||||
owner = "srcery-colors";
|
||||
repo = "srcery-vim";
|
||||
rev = "6545397ee8119c43f5717600a42ad4b44be0f572";
|
||||
sha256 = "1i71l565kmfqrl691ccs1p12v3rig00j4bvl9qg9fhwwxk61bcpx";
|
||||
rev = "cf2c61ff3448be41b264ee850eeac16cacd7e5a9";
|
||||
sha256 = "0gpdsnzwk9hvr2302rc62nxsvv895525q6iy7pzracjqlh29ljbq";
|
||||
};
|
||||
meta.homepage = "https://github.com/srcery-colors/srcery-vim/";
|
||||
};
|
||||
|
@ -9233,12 +9245,12 @@ final: prev:
|
|||
|
||||
telescope-file-browser-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "telescope-file-browser.nvim";
|
||||
version = "2023-07-01";
|
||||
version = "2023-07-28";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-telescope";
|
||||
repo = "telescope-file-browser.nvim";
|
||||
rev = "e03ff55962417b69c85ef41424079bb0580546ba";
|
||||
sha256 = "1agwrhwb6w0qpcgcmffibnip61g6dqjzmchngb1a9fwxqvzrgfll";
|
||||
rev = "6c234e863444c246611ad7458185c771ad8cd6e6";
|
||||
sha256 = "05bd8yw22hp6lj732dhffq8wpy13qslwv2wf8rlmza2m7am4jfiy";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/";
|
||||
};
|
||||
|
@ -9463,12 +9475,12 @@ final: prev:
|
|||
|
||||
telescope-nvim = buildNeovimPlugin {
|
||||
pname = "telescope.nvim";
|
||||
version = "2023-07-22";
|
||||
version = "2023-07-27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-telescope";
|
||||
repo = "telescope.nvim";
|
||||
rev = "1228f3b15ca3d9b95dcb92efda6a3448871030bd";
|
||||
sha256 = "0qqvh3dq86djb8jf4p6icmbkswj5024a6ll1nkyjmmqm04k74q0m";
|
||||
rev = "22735947d84d78f29436c203f0a4b8dc15dda204";
|
||||
sha256 = "09vy6kmqrnk503vxa7v9z526lv7p3h76fcpcacq1n2196hrjdrxx";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
|
||||
};
|
||||
|
@ -9511,12 +9523,12 @@ final: prev:
|
|||
|
||||
term-edit-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "term-edit.nvim";
|
||||
version = "2023-05-28";
|
||||
version = "2023-07-28";
|
||||
src = fetchFromGitHub {
|
||||
owner = "chomosuke";
|
||||
repo = "term-edit.nvim";
|
||||
rev = "3c2385d5d058720928a96e77c405466478fb711a";
|
||||
sha256 = "06qkld6i542p0hh2jxk80n5xfrf0jklg4b7vmkm6imvkcj705hdc";
|
||||
rev = "07bfebde433d3de5d3f53494417413d5a3f7292b";
|
||||
sha256 = "15mm09wqn83pnqp0k6js0j8g0v71bmf7wda64vbyicxc9xsrxn7q";
|
||||
};
|
||||
meta.homepage = "https://github.com/chomosuke/term-edit.nvim/";
|
||||
};
|
||||
|
@ -9932,12 +9944,12 @@ final: prev:
|
|||
|
||||
unison = buildVimPluginFrom2Nix {
|
||||
pname = "unison";
|
||||
version = "2023-07-24";
|
||||
version = "2023-07-28";
|
||||
src = fetchFromGitHub {
|
||||
owner = "unisonweb";
|
||||
repo = "unison";
|
||||
rev = "6d050d5bc74645cb572c01a0a5c8d2eb28479c71";
|
||||
sha256 = "07w8lskf4scx7knkaknc9ba1g7hk3b1jmx7mn6qfxmxf4kx5i2vd";
|
||||
rev = "3a2d7d78b310f6ddde939042fa04b553012d2c7b";
|
||||
sha256 = "10741mmqls1ys0cd7kab1cn7sjby8f9fhap57jh01nhjkkqbfz86";
|
||||
};
|
||||
meta.homepage = "https://github.com/unisonweb/unison/";
|
||||
};
|
||||
|
@ -11036,12 +11048,12 @@ final: prev:
|
|||
|
||||
vim-css-color = buildVimPluginFrom2Nix {
|
||||
pname = "vim-css-color";
|
||||
version = "2023-03-08";
|
||||
version = "2023-07-26";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ap";
|
||||
repo = "vim-css-color";
|
||||
rev = "5687a7978bc80263cd03d0a667c2f56890cfb940";
|
||||
sha256 = "1bm5ay1c9jw34ax9bxivq9b3crfgizphfq40rd406jdyg72ahgbk";
|
||||
rev = "6cc65734bc7105d9677ca54e2255fcbc953ba6bf";
|
||||
sha256 = "1mjry4xiaxhjgzajsbmh4iph9hhxbwgdj3raaxlqzmmnyjsz03iy";
|
||||
};
|
||||
meta.homepage = "https://github.com/ap/vim-css-color/";
|
||||
};
|
||||
|
@ -12358,12 +12370,12 @@ final: prev:
|
|||
|
||||
vim-just = buildVimPluginFrom2Nix {
|
||||
pname = "vim-just";
|
||||
version = "2023-07-24";
|
||||
version = "2023-07-28";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NoahTheDuke";
|
||||
repo = "vim-just";
|
||||
rev = "8e5c882f8d6fb213b160ac2cbb5b28fea620ed0b";
|
||||
sha256 = "17k073vbx4b2cll0n4pj33c3znmd7df4ln6fr3l6yswlcd6byabh";
|
||||
rev = "2a94aecd8eb53e1147392da33df8ee4ea6e482d6";
|
||||
sha256 = "0n8vq3a4z9yl3xidg2gbclwwwjdd82kixqjjdm8z03d8vy59qg9r";
|
||||
};
|
||||
meta.homepage = "https://github.com/NoahTheDuke/vim-just/";
|
||||
};
|
||||
|
@ -12731,12 +12743,12 @@ final: prev:
|
|||
|
||||
vim-matchup = buildVimPluginFrom2Nix {
|
||||
pname = "vim-matchup";
|
||||
version = "2023-07-20";
|
||||
version = "2023-07-27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "andymass";
|
||||
repo = "vim-matchup";
|
||||
rev = "ca8971739e3908973c5912cb3a0ffb6cf7bd83e7";
|
||||
sha256 = "1b9jqympkq0aw9mjpl5gny2xal0cmg3kxwxafpd3i4l8hw5qrwzh";
|
||||
rev = "0646093e07b1f89b16536cfb3dc4993e3f0ac653";
|
||||
sha256 = "117zdg6ibnnnpl03r6dhb71hm3dw6h0y2lxbkj8kl5b0gk8lapph";
|
||||
};
|
||||
meta.homepage = "https://github.com/andymass/vim-matchup/";
|
||||
};
|
||||
|
@ -13919,12 +13931,12 @@ final: prev:
|
|||
|
||||
vim-slime = buildVimPluginFrom2Nix {
|
||||
pname = "vim-slime";
|
||||
version = "2023-06-23";
|
||||
version = "2023-07-27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jpalardy";
|
||||
repo = "vim-slime";
|
||||
rev = "a096a2969fcb807fd5c6a75d943c6227dd9e6a38";
|
||||
sha256 = "1jhkrir48kbdhd95659b7rmbavb75c05zqjvzz4f633i33j32bf3";
|
||||
rev = "99cc4af89014971ca65748b32128d15b008c979c";
|
||||
sha256 = "1sh5k3w3d81gnyvsfy70vygvvi3rsk8wbyh1n30k0fl6b30j4pb6";
|
||||
};
|
||||
meta.homepage = "https://github.com/jpalardy/vim-slime/";
|
||||
};
|
||||
|
@ -15049,12 +15061,12 @@ final: prev:
|
|||
|
||||
vimtex = buildVimPluginFrom2Nix {
|
||||
pname = "vimtex";
|
||||
version = "2023-07-24";
|
||||
version = "2023-07-25";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lervag";
|
||||
repo = "vimtex";
|
||||
rev = "9da5481ca32d4c903228e4e30b5d8ccdd46e6a94";
|
||||
sha256 = "1hayvndfzvr839zv76mhkqr7vyi2q3y140hxrc5vz0bkk0hc6w8w";
|
||||
rev = "877de3ba5de5f766e5bfa1c3fb0d2ecfcd18f868";
|
||||
sha256 = "1yyz90a84n6npa35ngb9hb8fv7ir89f1nv89c5ps59fxmdivh9sq";
|
||||
};
|
||||
meta.homepage = "https://github.com/lervag/vimtex/";
|
||||
};
|
||||
|
@ -15506,12 +15518,12 @@ final: prev:
|
|||
|
||||
catppuccin-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "catppuccin-nvim";
|
||||
version = "2023-07-21";
|
||||
version = "2023-07-26";
|
||||
src = fetchFromGitHub {
|
||||
owner = "catppuccin";
|
||||
repo = "nvim";
|
||||
rev = "6425df128d46f2db2cccf9aa7a66ca2823c1d153";
|
||||
sha256 = "0abchc41rpfrhda9i3yjn08ngm785vxznmn3zkl2886gak0a9l34";
|
||||
rev = "737f60a3a25c79d9bb9574092f6c6c958a3d747a";
|
||||
sha256 = "0n2jwxzprgn4lryaivrfds78dri9h24q7ablf5lyfj6wcrmcqgk7";
|
||||
};
|
||||
meta.homepage = "https://github.com/catppuccin/nvim/";
|
||||
};
|
||||
|
@ -15566,12 +15578,12 @@ final: prev:
|
|||
|
||||
lspsaga-nvim-original = buildVimPluginFrom2Nix {
|
||||
pname = "lspsaga-nvim-original";
|
||||
version = "2023-07-25";
|
||||
version = "2023-07-27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvimdev";
|
||||
repo = "lspsaga.nvim";
|
||||
rev = "31b4b4336d05e7c8ff0f833a493de2a2875f1b38";
|
||||
sha256 = "0m426zxd6liah3xfdnxjs289c27z31fw8r0fdw8dvnvgsbhz1a2v";
|
||||
rev = "557e6fd7fbca325a4bea582576fe36bec903367c";
|
||||
sha256 = "0cxg1ahl9la3m8cd3sb7s456kmvrxjjsf411imyfgl0rp7632bf5";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/";
|
||||
};
|
||||
|
@ -15614,24 +15626,24 @@ final: prev:
|
|||
|
||||
nvchad-extensions = buildVimPluginFrom2Nix {
|
||||
pname = "nvchad-extensions";
|
||||
version = "2023-07-25";
|
||||
version = "2023-07-27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvchad";
|
||||
repo = "extensions";
|
||||
rev = "0abb3ead8ce6ffa0e03b596a000d231b5e5d406b";
|
||||
sha256 = "13bngm38j90n21szilc27bpdzgjk4g41a6a8yz1bc60rddxxjxr3";
|
||||
rev = "0bfeb74229ad973ce600088997ac8421980f79bb";
|
||||
sha256 = "1jh5728mwfpg9pzgd9pvb177ssdzfvs8bsms1mrjcjx7xj2iv33m";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvchad/extensions/";
|
||||
};
|
||||
|
||||
nvchad-ui = buildVimPluginFrom2Nix {
|
||||
pname = "nvchad-ui";
|
||||
version = "2023-07-23";
|
||||
version = "2023-07-28";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvchad";
|
||||
repo = "ui";
|
||||
rev = "c4c1f41deb8102bb68f168795d1dcc036e098f98";
|
||||
sha256 = "0ddkq6dnk45n2rnzjvfkr2r1iq67fbdg8s61r1cpk7a7dgq9j2v3";
|
||||
rev = "47ef4046504e5562a3daf30db50b7d4a1552fcb5";
|
||||
sha256 = "1hx7i8z31avpfngqi21izl740p0ryhkf3ys1g76drnzqi6gan8d7";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvchad/ui/";
|
||||
};
|
||||
|
|
|
@ -27,12 +27,12 @@
|
|||
};
|
||||
arduino = buildGrammar {
|
||||
language = "arduino";
|
||||
version = "0.0.0+rev=4de2f3e";
|
||||
version = "0.0.0+rev=3446bac";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ObserverOfTime";
|
||||
repo = "tree-sitter-arduino";
|
||||
rev = "4de2f3e6235ee8659ecb7467c16ed13bde7fb272";
|
||||
hash = "sha256-DeUp7M96PHQ652tvWSnsu1rSaQJyCCojAYfplccbJTc=";
|
||||
rev = "3446bac828d5db2a6cf60ab31813c02ab53547a7";
|
||||
hash = "sha256-E4mRE+CtuI/s3LlVcT/VFhFdFakRXvSr7/v4gaB4H+U=";
|
||||
};
|
||||
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino";
|
||||
};
|
||||
|
@ -126,12 +126,12 @@
|
|||
};
|
||||
c = buildGrammar {
|
||||
language = "c";
|
||||
version = "0.0.0+rev=6adee19";
|
||||
version = "0.0.0+rev=ad09589";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-c";
|
||||
rev = "6adee194587678b250608cdb808544f06bcd26e7";
|
||||
hash = "sha256-A3bLZxkCru7uAOtz9J3I/nsIoRRWmoUUiPGaLtljrqw=";
|
||||
rev = "ad095896dd223f1c22b85ac5ec84ab11fb732b07";
|
||||
hash = "sha256-0SqgOjsSFQkDeJMmF9mAgvbgnm9CCuFTYCUJo4zjCEU=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-c";
|
||||
};
|
||||
|
@ -258,12 +258,12 @@
|
|||
};
|
||||
cpp = buildGrammar {
|
||||
language = "cpp";
|
||||
version = "0.0.0+rev=0e7b7a0";
|
||||
version = "0.0.0+rev=f88bf81";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-cpp";
|
||||
rev = "0e7b7a02b6074859b51c1973eb6a8275b3315b1d";
|
||||
hash = "sha256-s5QRDs4W8TpB+kWtwXIvanP+Ii7hQgUI/yu0rvDUIg4=";
|
||||
rev = "f88bf81238ec2842682e4d1dac0acf3b43b686e9";
|
||||
hash = "sha256-9GOzjjIA/RXNLGlFSyvir4cHAl075TSW10AsOlJec0k=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp";
|
||||
};
|
||||
|
@ -280,12 +280,12 @@
|
|||
};
|
||||
cuda = buildGrammar {
|
||||
language = "cuda";
|
||||
version = "0.0.0+rev=c5befe0";
|
||||
version = "0.0.0+rev=2af3d43";
|
||||
src = fetchFromGitHub {
|
||||
owner = "theHamsta";
|
||||
repo = "tree-sitter-cuda";
|
||||
rev = "c5befe09c99f5e88190574676ffa8eb29775d410";
|
||||
hash = "sha256-wdv5TuNQl81n9CSyNkvAwCSPhfOs+DPwOT675WAphZE=";
|
||||
rev = "2af3d43cd96dd3f3c3868095222c7f5e2462b3ab";
|
||||
hash = "sha256-ZwinNfhFM1u4qplHOFR8xKphtSjENS+o4u9RUgEnOHg=";
|
||||
};
|
||||
meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda";
|
||||
};
|
||||
|
@ -645,12 +645,12 @@
|
|||
};
|
||||
glsl = buildGrammar {
|
||||
language = "glsl";
|
||||
version = "0.0.0+rev=7d76863";
|
||||
version = "0.0.0+rev=34e0657";
|
||||
src = fetchFromGitHub {
|
||||
owner = "theHamsta";
|
||||
repo = "tree-sitter-glsl";
|
||||
rev = "7d76863f2126ed3b246fead68f9591760d546c94";
|
||||
hash = "sha256-X0Lqq7xrKEFVRAOh1AfvzeJQ5zv6RNwv583p69VkEpY=";
|
||||
rev = "34e0657e37323874c6b67c718a0f83410c4602cf";
|
||||
hash = "sha256-tOIwOy0XmDpDPxLWXZQNqxgoycA03oaqbdp+PxJfn+0=";
|
||||
};
|
||||
meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl";
|
||||
};
|
||||
|
@ -777,12 +777,12 @@
|
|||
};
|
||||
hcl = buildGrammar {
|
||||
language = "hcl";
|
||||
version = "0.0.0+rev=becebeb";
|
||||
version = "0.0.0+rev=b553906";
|
||||
src = fetchFromGitHub {
|
||||
owner = "MichaHoffmann";
|
||||
repo = "tree-sitter-hcl";
|
||||
rev = "becebebd3509c02e871c99be55556269be1def1b";
|
||||
hash = "sha256-GR2a+VuhZVMGmLW9Mg7bSALNsy0SyfG+YVaRz1qY6a0=";
|
||||
rev = "b5539065432c08e4118eb3ee7c94902fdda85708";
|
||||
hash = "sha256-okLwoDGgK6aM5+8oelfRnuKqIimTs8Hc0N8Ikrm2eY0=";
|
||||
};
|
||||
meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl";
|
||||
};
|
||||
|
@ -810,12 +810,12 @@
|
|||
};
|
||||
hlsl = buildGrammar {
|
||||
language = "hlsl";
|
||||
version = "0.0.0+rev=b8fab02";
|
||||
version = "0.0.0+rev=20c40a3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "theHamsta";
|
||||
repo = "tree-sitter-hlsl";
|
||||
rev = "b8fab02e808bab41c49829fb5e4fb0ce7eab8d1a";
|
||||
hash = "sha256-b/8KKGFqYj0gwDo3EgrRAufvXeuAEz6xvIBHBeVW0KE=";
|
||||
rev = "20c40a3f1bb68c596f56bb0c0290008b9d4f58dd";
|
||||
hash = "sha256-mLcl73XNDjkKUvFixPjW4EAO9y++gpitu7e+oym/Mpc=";
|
||||
};
|
||||
meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl";
|
||||
};
|
||||
|
@ -832,12 +832,12 @@
|
|||
};
|
||||
hoon = buildGrammar {
|
||||
language = "hoon";
|
||||
version = "0.0.0+rev=89271df";
|
||||
version = "0.0.0+rev=dfa565f";
|
||||
src = fetchFromGitHub {
|
||||
owner = "urbit-pilled";
|
||||
repo = "tree-sitter-hoon";
|
||||
rev = "89271dfe18f20aa71cbe5ef813252a8f98901240";
|
||||
hash = "sha256-UdYucPGeAFexjSxx1RHMWPPJ7KFQs41c+Vi8BSM+Yj0=";
|
||||
rev = "dfa565f87c8997d43cec725d41f023cc3577ca46";
|
||||
hash = "sha256-ogNgjvRRR0KevOlB1PH+cI+HHftq/JrS6pQuIwR5m2A=";
|
||||
};
|
||||
meta.homepage = "https://github.com/urbit-pilled/tree-sitter-hoon";
|
||||
};
|
||||
|
@ -898,12 +898,12 @@
|
|||
};
|
||||
ispc = buildGrammar {
|
||||
language = "ispc";
|
||||
version = "0.0.0+rev=848e588";
|
||||
version = "0.0.0+rev=0bdbb03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "fab4100";
|
||||
repo = "tree-sitter-ispc";
|
||||
rev = "848e58874ffa2f7e540a6ec01ab9652b26995f37";
|
||||
hash = "sha256-xHX7N3pJbU8c4apoDXEm2VXOn9NH9atG8YfwSMyhHZ4=";
|
||||
rev = "0bdbb03d9abde78d8be2f2199e57119b2c7f8fd7";
|
||||
hash = "sha256-udsVK0FCbq6hFl0iLgWdTNbZdKps2avHk0SfJ/DIUxY=";
|
||||
};
|
||||
meta.homepage = "https://github.com/fab4100/tree-sitter-ispc";
|
||||
};
|
||||
|
@ -1275,12 +1275,12 @@
|
|||
};
|
||||
objc = buildGrammar {
|
||||
language = "objc";
|
||||
version = "0.0.0+rev=6d876af";
|
||||
version = "0.0.0+rev=77e28ae";
|
||||
src = fetchFromGitHub {
|
||||
owner = "amaanq";
|
||||
repo = "tree-sitter-objc";
|
||||
rev = "6d876afade2d5e70d394aaf994321c78297e3607";
|
||||
hash = "sha256-1LJ5pFslYqgPYoBptSw6SY7pt6syXJoxQUJ5KsybjSk=";
|
||||
rev = "77e28aeaede824a5f4aa501fb5f3138ab1019b9f";
|
||||
hash = "sha256-lK0wy6cEf9RSD9G96ywkUFZrRTk1WYtkdNbI7OBGRtg=";
|
||||
};
|
||||
meta.homepage = "https://github.com/amaanq/tree-sitter-objc";
|
||||
};
|
||||
|
@ -1465,12 +1465,12 @@
|
|||
};
|
||||
promql = buildGrammar {
|
||||
language = "promql";
|
||||
version = "0.0.0+rev=655afc4";
|
||||
version = "0.0.0+rev=4b6b9f3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "MichaHoffmann";
|
||||
repo = "tree-sitter-promql";
|
||||
rev = "655afc4fe6813f38bde087d6493d8fd4920d6d4a";
|
||||
hash = "sha256-eqpWHPlCoQqMXL4hgLXaakQ0fP/U5tK7p+QAZgq24KI=";
|
||||
rev = "4b6b9f399dc58e408c81da8d8fd7e66ab617eef3";
|
||||
hash = "sha256-CaNCxgKL/N6TUcO838iR09tFTYS/kWJLf8whQF/3hAg=";
|
||||
};
|
||||
meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-promql";
|
||||
};
|
||||
|
@ -1498,12 +1498,12 @@
|
|||
};
|
||||
pug = buildGrammar {
|
||||
language = "pug";
|
||||
version = "0.0.0+rev=884e225";
|
||||
version = "0.0.0+rev=a7ff31a";
|
||||
src = fetchFromGitHub {
|
||||
owner = "zealot128";
|
||||
repo = "tree-sitter-pug";
|
||||
rev = "884e225b5ecca5d885ae627275f16ef648acd42e";
|
||||
hash = "sha256-qPfVSnsw9bDznq7rhzftGyv9cGi2OiF6DCh55Lxk8xA=";
|
||||
rev = "a7ff31a38908df9b9f34828d21d6ca5e12413e18";
|
||||
hash = "sha256-WDx2Y1LxuJJuAaeTxfqQrxRXxVd4Cn3niQeherh+5Uc=";
|
||||
};
|
||||
meta.homepage = "https://github.com/zealot128/tree-sitter-pug";
|
||||
};
|
||||
|
@ -1575,12 +1575,12 @@
|
|||
};
|
||||
r = buildGrammar {
|
||||
language = "r";
|
||||
version = "0.0.0+rev=80efda5";
|
||||
version = "0.0.0+rev=c55f8b4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "r-lib";
|
||||
repo = "tree-sitter-r";
|
||||
rev = "80efda55672d1293aa738f956c7ae384ecdc31b4";
|
||||
hash = "sha256-qUfyITSZRnSm4zZHfkM/Dm5AeFEFLcCtRrInx0Xs/tg=";
|
||||
rev = "c55f8b4dfaa32c80ddef6c0ac0e79b05cb0cbf57";
|
||||
hash = "sha256-NWnEk0FixC7pBdNLwJUGvKifwZj8nzX7VWv8AhgaI2o=";
|
||||
};
|
||||
meta.homepage = "https://github.com/r-lib/tree-sitter-r";
|
||||
};
|
||||
|
@ -1705,6 +1705,18 @@
|
|||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala";
|
||||
};
|
||||
scfg = buildGrammar {
|
||||
language = "scfg";
|
||||
version = "0.0.0+rev=6deae0c";
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~rockorager";
|
||||
repo = "tree-sitter-scfg";
|
||||
rev = "6deae0cbb458c849a4d1e2985093e9c9c32d7fd0";
|
||||
hash = "sha256-2ubRvjpvRJEBZXpM7ZIkWAwSZARCzP/klydQ6IVpCSk=";
|
||||
};
|
||||
generate = true;
|
||||
meta.homepage = "https://git.sr.ht/~rockorager/tree-sitter-scfg";
|
||||
};
|
||||
scheme = buildGrammar {
|
||||
language = "scheme";
|
||||
version = "0.0.0+rev=ca8af22";
|
||||
|
@ -1919,12 +1931,12 @@
|
|||
};
|
||||
terraform = buildGrammar {
|
||||
language = "terraform";
|
||||
version = "0.0.0+rev=becebeb";
|
||||
version = "0.0.0+rev=b553906";
|
||||
src = fetchFromGitHub {
|
||||
owner = "MichaHoffmann";
|
||||
repo = "tree-sitter-hcl";
|
||||
rev = "becebebd3509c02e871c99be55556269be1def1b";
|
||||
hash = "sha256-GR2a+VuhZVMGmLW9Mg7bSALNsy0SyfG+YVaRz1qY6a0=";
|
||||
rev = "b5539065432c08e4118eb3ee7c94902fdda85708";
|
||||
hash = "sha256-okLwoDGgK6aM5+8oelfRnuKqIimTs8Hc0N8Ikrm2eY0=";
|
||||
};
|
||||
location = "dialects/terraform";
|
||||
meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl";
|
||||
|
@ -2154,12 +2166,12 @@
|
|||
};
|
||||
wgsl_bevy = buildGrammar {
|
||||
language = "wgsl_bevy";
|
||||
version = "0.0.0+rev=7cd38d6";
|
||||
version = "0.0.0+rev=9e3273e";
|
||||
src = fetchFromGitHub {
|
||||
owner = "theHamsta";
|
||||
repo = "tree-sitter-wgsl-bevy";
|
||||
rev = "7cd38d6895060b023353e04f7af099ec64add5d1";
|
||||
hash = "sha256-QzfeFzGhWJGD+l+MeKyedRpdZsH+dGKE7UxRmh2uMH0=";
|
||||
rev = "9e3273e64bdd3f74d1514674286838f9075ee9e4";
|
||||
hash = "sha256-bBGunOcFPrHWLsP1ISgdFBNDIBbB0uhwxKAwmQZg7/k=";
|
||||
};
|
||||
meta.homepage = "https://github.com/theHamsta/tree-sitter-wgsl-bevy";
|
||||
};
|
||||
|
|
|
@ -932,7 +932,7 @@ self: super: {
|
|||
pname = "sg-nvim-rust";
|
||||
inherit (old) version src;
|
||||
|
||||
cargoHash = "sha256-KhUCIAGSgf7TxabEzcjo582VgbSU79QSGlaEP7BbJCE=";
|
||||
cargoHash = "sha256-bgroNNFRoKiySTC6Rldoy8Unepxd2OXwqcy3fA+CETs=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
@ -336,6 +336,7 @@ https://github.com/MrcJkb/haskell-tools.nvim/,HEAD,
|
|||
https://github.com/neovimhaskell/haskell-vim/,,
|
||||
https://github.com/wenzel-hoffman/haskell-with-unicode.vim/,HEAD,
|
||||
https://github.com/travitch/hasksyn/,,
|
||||
https://github.com/lukas-reineke/headlines.nvim/,HEAD,
|
||||
https://github.com/rebelot/heirline.nvim/,,
|
||||
https://github.com/RaafatTurki/hex.nvim/,HEAD,
|
||||
https://github.com/Yggdroot/hiPairs/,,
|
||||
|
|
|
@ -507,6 +507,22 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
bierner.docs-view = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "docs-view";
|
||||
publisher = "bierner";
|
||||
version = "0.0.11";
|
||||
sha256 = "sha256-3njIL2SWGFp87cvQEemABJk2nXzwI1Il/WG3E0ZYZxw=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/bierner.docs-view/changelog";
|
||||
description = "A VSCode extension that displays documentation in the sidebar or panel";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=bierner.docs-view";
|
||||
homepage = "https://github.com/mattbierner/vscode-docs-view#readme";
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
bierner.emojisense = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "emojisense";
|
||||
|
@ -1091,6 +1107,22 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
dotenv.dotenv-vscode = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "dotenv-vscode";
|
||||
publisher = "dotenv";
|
||||
version = "0.28.0";
|
||||
sha256 = "sha256-KiQgFvbfLsA/ADROoG6y6c/i0XHuTNH2AN+6mWEm0P8=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/dotenv.dotenv-vscode/changelog";
|
||||
description = "Official Dotenv extension for VSCode. Offers syntax highlighting, auto-cloaking, auto-completion, in-code secret peeking, and optionally dotenv-vault";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=dotenv.dotenv-vscode";
|
||||
homepage = "https://github.com/dotenv-org/dotenv-vscode";
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
dotjoshjohnson.xml = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "xml";
|
||||
|
@ -1234,6 +1266,38 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
emroussel.atomize-atom-one-dark-theme = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "atomize-atom-one-dark-theme";
|
||||
publisher = "emroussel";
|
||||
version = "2.0.2";
|
||||
sha256 = "sha256-GwuFtBVj0Z2rHryst/7cegskvZIMPsrAH12+K942+JA=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/emroussel.atomize-atom-one-dark-theme/changelog";
|
||||
description = "A detailed and accurate Atom One Dark theme for VSCode";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=emroussel.atomize-atom-one-dark-theme";
|
||||
homepage = "https://github.com/emroussel/atomize/blob/main/README.md";
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
enkia.tokyo-night = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "tokyo-night";
|
||||
publisher = "enkia";
|
||||
version = "1.0.0";
|
||||
sha256 = "sha256-/fM+aUDUzVJ6P38i+GrxhLv2eLJNa8OFkKsM4yPBy4c=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/enkia.tokyo-night/changelog";
|
||||
description = "A clean Visual Studio Code theme that celebrates the lights of Downtown Tokyo at night";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=enkia.tokyo-night";
|
||||
homepage = "https://github.com/enkia/tokyo-night-vscode-theme";
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
equinusocio.vsc-material-theme = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vsc-material-theme";
|
||||
|
@ -3378,6 +3442,22 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
unifiedjs.vscode-mdx = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-mdx";
|
||||
publisher = "unifiedjs";
|
||||
version = "1.4.0";
|
||||
sha256 = "sha256-qqqq0QKTR0ZCLdPltsnQh5eTqGOh9fV1OSOZMjj4xXg=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/unifiedjs.vscode-mdx/changelog";
|
||||
description = "VSCode language support for MDX";
|
||||
downloadPage = "https://github.com/mdx-js/mdx-analyzer";
|
||||
homepage = "https://github.com/mdx-js/mdx-analyzer#readme";
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
usernamehw.errorlens = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "errorlens";
|
||||
|
@ -3633,6 +3713,21 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
wmaurer.change-case = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "change-case";
|
||||
publisher = "wmaurer";
|
||||
version = "1.0.0";
|
||||
sha256 = "sha256-tN/jlG2PzuiCeERpgQvdqDoa3UgrUaM7fKHv6KFqujc=";
|
||||
};
|
||||
meta = {
|
||||
description = "A VSCode extension for quickly changing the case (camelCase, CONSTANT_CASE, snake_case, etc) of the current selection or current word";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=wmaurer.change-case";
|
||||
homepage = "https://github.com/wmaurer/vscode-change-case";
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
xadillax.viml = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "viml";
|
||||
|
|
|
@ -47,13 +47,13 @@ in
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "imagemagick";
|
||||
version = "7.1.1-14";
|
||||
version = "7.1.1-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ImageMagick";
|
||||
repo = "ImageMagick";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-vZ3ILHIRxwB3ho7hlJpC7hlo7Nhb56SjZ/hgdoh1rwY=";
|
||||
hash = "sha256-/fI/RrwcgvKX5loIrDAur60VF5O4FgyPYN7BbcPP/bU=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
|
||||
|
|
|
@ -40,7 +40,6 @@ mavenJdk17.buildMavenPackage rec {
|
|||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
makeWrapper
|
||||
mavenJdk17
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
@ -39,7 +39,6 @@ maven.buildMavenPackage rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
maven
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
|
|
|
@ -0,0 +1,24 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubectl-explore";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "keisku";
|
||||
repo = "kubectl-explore";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4WxvVsA05Mta7AcrGe26B+Up+x/gwdlCnb/PN9Ehu18=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-z/bPfY9UVqOnrA9jNUtM7jg53/URAMAJQAqH9D5KVPQ=";
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A better kubectl explain with the fuzzy finder";
|
||||
homepage = "https://github.com/keisku/kubectl-explore";
|
||||
changelog = "https://github.com/keisku/kubectl-explore/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.koralowiec ];
|
||||
};
|
||||
}
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nerdctl";
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containerd";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-30T5HXQz57Uwgly6HcMroEC/qwynm6nB4B3uwDC2WHo=";
|
||||
hash = "sha256-ngR+xlhTy3oxPN34+MoT9TSOI0+Epp8QG3KiiPmRUts=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-zsIRdPNoUrlN2FWSlHN8+8yi74CGxW6pX8TYNHtPJ3A=";
|
||||
vendorHash = "sha256-lsD8AtbREVKFXiPsteSFA7xntRlNgOQ1y5c44vOqMa8=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||
|
||||
|
|
|
@ -1,28 +1,32 @@
|
|||
{ stdenv, lib, buildGoModule, fetchFromGitHub }:
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tilt";
|
||||
/* Do not use "dev" as a version. If you do, Tilt will consider itself
|
||||
running in development environment and try to serve assets from the
|
||||
source tree, which is not there once build completes. */
|
||||
version = "0.33.1";
|
||||
version = "0.33.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tilt-dev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3CRE+gpifV3MHyKdiiHmGwGre0ne3IjheYH0r6NMKY8=";
|
||||
owner = "tilt-dev";
|
||||
repo = "tilt";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-TNZE335tH50E96yJzD26U+JbVxjU746Wa/8YDGHFeto=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
subPackages = [ "cmd/tilt" ];
|
||||
|
||||
ldflags = [ "-X main.version=${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Local development tool to manage your developer instance when your team deploys to Kubernetes in production";
|
||||
homepage = "https://tilt.dev/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ anton-dessiatov ];
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ anton-dessiatov ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -95,6 +95,7 @@ let
|
|||
'';
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ ncfavier ];
|
||||
mainProgram = "weechat";
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -39,9 +39,9 @@ maven.buildMavenPackage rec {
|
|||
};
|
||||
|
||||
inherit mvnParameters;
|
||||
mvnHash = "sha256-Ej/JePvd9Ieni8FqSaXBDc2T6Cwr8WP54iko8wYiT68=";
|
||||
mvnHash = "sha256-wm/axWJucoW9P98dKqHI4bjrUnmBTfosCOdJg9VBJ+4=";
|
||||
|
||||
nativeBuildInputs = [ copyDesktopItems maven makeWrapper ];
|
||||
nativeBuildInputs = [ copyDesktopItems makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
|
|
|
@ -18,7 +18,7 @@ mavenJdk11.buildMavenPackage rec {
|
|||
|
||||
mvnHash = "sha256-/2/Yb26Ry0NHQQ3j0LXnjwC0wQqJiztvTgWixyMJqvg=";
|
||||
|
||||
nativeBuildInputs = [ jdk11 mavenJdk11 ];
|
||||
nativeBuildInputs = [ jdk11 ];
|
||||
|
||||
installPhase = ''
|
||||
cp -r modules/application/target/gephi $out
|
||||
|
|
|
@ -47,6 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
];
|
||||
|
||||
doCheck = true;
|
||||
mesonFlags = lib.optional (!finalAttrs.finalPackage.doCheck) "-Dtests=disabled";
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
|
|
|
@ -142,7 +142,19 @@ let
|
|||
# trying to build binaries statically.
|
||||
++ lib.optional static "no-ct"
|
||||
++ lib.optional withZlib "zlib"
|
||||
;
|
||||
++ lib.optionals (stdenv.hostPlatform.isMips && stdenv.hostPlatform ? gcc.arch) [
|
||||
# This is necessary in order to avoid openssl adding -march
|
||||
# flags which ultimately conflict with those added by
|
||||
# cc-wrapper. Openssl assumes that it can scan CFLAGS to
|
||||
# detect any -march flags, using this perl code:
|
||||
#
|
||||
# && !grep { $_ =~ /-m(ips|arch=)/ } (@{$config{CFLAGS}})
|
||||
#
|
||||
# The following bogus CFLAGS environment variable triggers the
|
||||
# the code above, inhibiting `./Configure` from adding the
|
||||
# conflicting flags.
|
||||
"CFLAGS=-march=${stdenv.hostPlatform.gcc.arch}"
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"MANDIR=$(man)/share/man"
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiopvpc";
|
||||
version = "4.2.1";
|
||||
version = "4.2.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "azogue";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-gfF/SFfiZgkWH0cQZF3hxEp6xxRi46nfDBB23Gerv5g=";
|
||||
hash = "sha256-k02lNjFjOcMfHa1jLJlMFUOOVrdTrACNoEXDSZ693K8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mwdblib";
|
||||
version = "4.4.0";
|
||||
version = "4.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "CERT-Polska";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-WwSKWfnSDJT8kIAk4e8caeL2UztFaIpNCDy1j46IbzM=";
|
||||
hash = "sha256-+hh7SJFITpLumIuzNgBbXtFh+26tUG66UFv6DLDk5ag=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mypy-boto3-s3";
|
||||
version = "1.28.12";
|
||||
version = "1.28.15.post1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-fVSwPgvXLMH+aQ79zp7qyeKFXfuvoVOQoPUYyunigNI=";
|
||||
hash = "sha256-ZVAr6CV4n9FuTKzxCuzWQIVUtgrl0mG+YP1GvuadhZI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
# originally extracted from dbeaver
|
||||
# created to allow using maven packages in the same style as rust
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
let
|
||||
fetchedMavenDeps = stdenv.mkDerivation ({
|
||||
name = "${pname}-${version}-maven-deps";
|
||||
inherit src patches;
|
||||
|
@ -44,6 +44,13 @@ stdenv.mkDerivation (rec {
|
|||
outputHashMode = "recursive";
|
||||
outputHash = mvnHash;
|
||||
} // mvnFetchExtraArgs);
|
||||
in
|
||||
stdenv.mkDerivation (builtins.removeAttrs args [ "mvnFetchExtraArgs" ] // {
|
||||
inherit fetchedMavenDeps;
|
||||
|
||||
nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [
|
||||
maven
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
@ -53,4 +60,8 @@ stdenv.mkDerivation (rec {
|
|||
|
||||
runHook postBuild
|
||||
'';
|
||||
} // builtins.removeAttrs args [ "mvnFetchExtraArgs" ])
|
||||
|
||||
meta = args.meta or { } // {
|
||||
platforms = args.meta.platforms or maven.meta.platforms;
|
||||
};
|
||||
})
|
||||
|
|
|
@ -33,7 +33,6 @@ maven.buildMavenPackage rec {
|
|||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
git
|
||||
maven
|
||||
|
||||
# springframework boot gets angry about 1970 sources
|
||||
# fix from https://github.com/nix-community/mavenix/issues/25
|
||||
|
|
|
@ -17,9 +17,9 @@ mavenJdk8.buildMavenPackage rec {
|
|||
sha256 = "1vws6cbgm3mrwc2xz9j1y262vw21x3hjc9m7rqc4hn3m7gjpwsvg";
|
||||
};
|
||||
|
||||
mvnHash = "sha256-rRLsCTY3fEAvGRDvNXqpjac2Gb5fdlyhK2wTK5CVN9k=";
|
||||
mvnHash = "sha256-xFcEZpJ0+ApJTDTuA63LgvUwLrxATVKoj5Mh3WZyfq8=";
|
||||
|
||||
nativeBuildInputs = [ jdk8 mavenJdk8 makeWrapper ];
|
||||
nativeBuildInputs = [ jdk8 makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/lib/java" "$out/share/java"
|
||||
|
@ -41,11 +41,10 @@ mavenJdk8.buildMavenPackage rec {
|
|||
homepage = "https://github.com/martinpaljak/GlobalPlatformPro";
|
||||
sourceProvenance = with sourceTypes; [
|
||||
fromSource
|
||||
binaryBytecode # deps
|
||||
binaryBytecode # deps
|
||||
];
|
||||
license = with licenses; [ lgpl3 ];
|
||||
maintainers = with maintainers; [ ekleog ];
|
||||
mainProgram = "gp";
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -24,9 +24,9 @@ maven.buildMavenPackage rec {
|
|||
|
||||
mvnFetchExtraArgs.dontConfigure = true;
|
||||
mvnParameters = "-DskipTests";
|
||||
mvnHash = "sha256-bzYBSrCS9Kp+qnVO60h915Or1VWabphwLEu6lcBULuc=";
|
||||
mvnHash = "sha256-XhAqd67RtETd9XvqbiEuTOwPUsUtoLkhXy2Dde7NLTo=";
|
||||
|
||||
nativeBuildInputs = [ maven jdk makeWrapper ];
|
||||
nativeBuildInputs = [ jdk makeWrapper ];
|
||||
|
||||
dontConfigure = true;
|
||||
preBuild = ''
|
||||
|
@ -56,6 +56,5 @@ maven.buildMavenPackage rec {
|
|||
homepage = "https://github.com/georgewfraser/java-language-server";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ hqurve ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -6,11 +6,11 @@ else
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dune";
|
||||
version = "3.9.2";
|
||||
version = "3.10.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
|
||||
hash = "sha256-TzrL1F09zbu9qJE3L0PwVpQra5btl37FKBupqHUTSt8=";
|
||||
hash = "sha256-n/AzhKmKjfeYUsxnTwtHOLqK7BcCm24u61FPiV5xA1U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ocaml findlib ];
|
||||
|
|
|
@ -9,18 +9,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "minify";
|
||||
version = "2.12.7";
|
||||
version = "2.12.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tdewolff";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-V3lFM58ciU9RrIp5s+ZMaCUAfRJxbTuQxusXhLCiGmI=";
|
||||
hash = "sha256-5p1HWXx9kKKaiC0dTQDd1JpRDhKkDGdnDpuz+I0kgpo=";
|
||||
};
|
||||
|
||||
patches = [ ./update-go-version-mod.patch ];
|
||||
|
||||
vendorHash = "sha256-v3ZPaeE1YW9BRXHxGsmN8tHv3ApOY+NivfePctOmYlM=";
|
||||
vendorHash = "sha256-RBBCcqahIF1KjnK/Kxr0TZlRJirFffo9Dt40gNk5EQE=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
@ -47,5 +45,6 @@ buildGoModule rec {
|
|||
downloadPage = "https://github.com/tdewolff/minify";
|
||||
changelog = "https://github.com/tdewolff/minify/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ gaelreyrol ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,12 +0,0 @@
|
|||
diff --git a/go.mod b/go.mod
|
||||
index cebe363..f9ae9c8 100644
|
||||
--- a/go.mod
|
||||
+++ b/go.mod
|
||||
@@ -1,6 +1,6 @@
|
||||
module github.com/tdewolff/minify/v2
|
||||
|
||||
-go 1.13
|
||||
+go 1.18
|
||||
|
||||
require (
|
||||
github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927 // indirect
|
|
@ -29,7 +29,7 @@ maven.buildMavenPackage {
|
|||
mvnParameters = "-DskipTests";
|
||||
mvnHash = "sha256-ajrHnaiJS7ZnR9BjLaXK2bnAKCp5UWQqYpjWbz3z6bw=";
|
||||
|
||||
nativeBuildInputs = [ maven makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
@ -59,7 +59,6 @@ maven.buildMavenPackage {
|
|||
meta = with lib; {
|
||||
description = "Magic: the Gathering card game with rules enforcement";
|
||||
homepage = "https://www.slightlymagic.net/forum/viewforum.php?f=26";
|
||||
platforms = openjdk.meta.platforms;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ eigengrau ];
|
||||
};
|
||||
|
|
|
@ -1,19 +1,29 @@
|
|||
{ lib, stdenv, fetchFromGitHub, Carbon }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, Carbon
|
||||
, Cocoa
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "skhd";
|
||||
version = "0.3.5";
|
||||
version = "0.3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "koekeishiya";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0x099979kgpim18r0vi9vd821qnv0rl3rkj0nd1nx3wljxgf7mrg";
|
||||
repo = "skhd";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-fnkWws/g4BdHKDRhqoCpdPFUavOHdk8R7h7H1dAdAYI=";
|
||||
};
|
||||
|
||||
buildInputs = [ Carbon ];
|
||||
buildInputs = [
|
||||
Carbon
|
||||
Cocoa
|
||||
];
|
||||
|
||||
makeFlags = [ "BUILD_PATH=$(out)/bin" ];
|
||||
makeFlags = [
|
||||
"BUILD_PATH=$(out)/bin"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/Library/LaunchDaemons
|
||||
|
@ -21,11 +31,11 @@ stdenv.mkDerivation rec {
|
|||
substituteInPlace $out/Library/LaunchDaemons/org.nixos.skhd.plist --subst-var out
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Simple hotkey daemon for macOS";
|
||||
homepage = "https://github.com/koekeishiya/skhd";
|
||||
platforms = platforms.darwin;
|
||||
maintainers = with maintainers; [ cmacrae lnl7 periklis ];
|
||||
license = licenses.mit;
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ cmacrae lnl7 periklis khaneliman];
|
||||
platforms = lib.platforms.darwin;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
@ -1,51 +1,58 @@
|
|||
{ lib, stdenv, fetchFromGitLab, autoconf-archive, gettext, libtool, intltool, autoconf, automake
|
||||
, glib, gtk3, gtk-doc, libgudev, pkg-config, systemd }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, cmake
|
||||
, libxml2
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, libgudev
|
||||
, systemd
|
||||
, polkit
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "iio-sensor-proxy";
|
||||
version = "3.0";
|
||||
version = "3.5";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "hadess";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0ngbz1vkbjci3ml6p47jh6c6caipvbkm8mxrc8ayr6vc2p9l1g49";
|
||||
owner = "hadess";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-pFu+nJzj45s7yIKoLWLeiv2AT5vLf6JpdWWQ0JZfnvY=";
|
||||
};
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
|
||||
./autogen.sh --prefix=$out \
|
||||
--with-udevrulesdir=$out/lib/udev/rules.d \
|
||||
--with-systemdsystemunitdir=$out/lib/systemd/system
|
||||
|
||||
runHook postConfigure
|
||||
postPatch = ''
|
||||
# upstream meson.build currently doesn't have an option to change the default polkit dir
|
||||
substituteInPlace data/meson.build \
|
||||
--replace 'polkit_policy_directory' "'$out/share/polkit-1/actions'"
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk3
|
||||
gtk-doc
|
||||
libgudev
|
||||
systemd
|
||||
polkit
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
autoconf-archive
|
||||
automake
|
||||
gettext
|
||||
intltool
|
||||
libtool
|
||||
meson
|
||||
cmake
|
||||
libxml2
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
(lib.mesonOption "udevrulesdir" "${placeholder "out"}/lib/udev/rules.d")
|
||||
(lib.mesonOption "systemdsystemunitdir" "${placeholder "out"}/lib/systemd/system")
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Proxy for sending IIO sensor data to D-Bus";
|
||||
homepage = "https://gitlab.freedesktop.org/hadess/iio-sensor-proxy";
|
||||
license = licenses.gpl3 ;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ _999eagle ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -4,16 +4,16 @@ let
|
|||
# comments with variant added for update script
|
||||
# ./update-zen.py zen
|
||||
zenVariant = {
|
||||
version = "6.4.2"; #zen
|
||||
version = "6.4.6"; #zen
|
||||
suffix = "zen1"; #zen
|
||||
sha256 = "1swd3y97w55wh9vl6k1bsrx6fqi6b6ssbw306h87nxn36xwzx8cd"; #zen
|
||||
sha256 = "0vsdqyb5416004dq0r03q2j6x3z8lw7a9632ji6acjhc5rd84s6a"; #zen
|
||||
isLqx = false;
|
||||
};
|
||||
# ./update-zen.py lqx
|
||||
lqxVariant = {
|
||||
version = "6.4.2"; #lqx
|
||||
version = "6.4.6"; #lqx
|
||||
suffix = "lqx1"; #lqx
|
||||
sha256 = "14hr88lbwm2pz3knw6nxlahdk4pwwb4ya63mrd7zg7g1x2xhfb59"; #lqx
|
||||
sha256 = "1xz2z1smy7xmwkc0l23nabz7sgbp8ipkcbxhnb91azql006mz80h"; #lqx
|
||||
isLqx = true;
|
||||
};
|
||||
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
|
||||
|
|
|
@ -13,8 +13,6 @@ maven.buildMavenPackage rec {
|
|||
|
||||
mvnHash = "sha256-rwAc2KtKo4vJ0JWwPquMyt+FHVNTmMpzBPbo8lWDN/A=";
|
||||
|
||||
nativeBuildInputs = [ maven ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm444 -t "$out" target/keycloak-metrics-spi-*.jar
|
||||
|
|
|
@ -16,10 +16,6 @@ maven.buildMavenPackage rec {
|
|||
|
||||
mvnHash = "sha256-MWxm2q6tx8YcdEsleC2h+s+lp9whi11VQ1yFr8AZUyQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
maven
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
EAR=$(find -iname "*.ear")
|
||||
install -D "$EAR" "$out/$(basename $EAR)"
|
||||
|
|
|
@ -16,10 +16,6 @@ maven.buildMavenPackage {
|
|||
|
||||
mvnHash = "sha256-vNPSNoOmtD1UMfWvLm8CH7RRatyeu3fnX9zteZpkay0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
maven
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
install -D "target/scim-user-spi-0.0.1-SNAPSHOT.jar" "$out/scim-user-spi-0.0.1-SNAPSHOT.jar"
|
||||
'';
|
||||
|
|
|
@ -37,20 +37,20 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "389-ds-base";
|
||||
version = "2.4.1";
|
||||
version = "2.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "389ds";
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
hash = "sha256-LoM2iztWC/HEq0jBKzzi+T6euXcNIDqsEzAeWfQSr90=";
|
||||
hash = "sha256-3wePHYA2z4qwW0KTECTDN8X9yJuUB0n14KjKbWN0Knk=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
sourceRoot = "source/src";
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-+eJgWeLVoJ8j8J2QNM91EY3DBy4zicTwKAU1rcLr8R4=";
|
||||
hash = "sha256-972tJ8aKNxC3O8VxbAau7OSej873IBXsP3isMXAXKcU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -1,39 +1,42 @@
|
|||
{ pkgs
|
||||
, lib
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildGoModule
|
||||
, callPackage
|
||||
, fetchFromGitHub
|
||||
, fetchNpmDeps
|
||||
, nixosTests
|
||||
, nodejs_18
|
||||
, nodejs
|
||||
, npmHooks
|
||||
}:
|
||||
|
||||
let
|
||||
uiNodeDependencies = (import ./node-composition.nix {
|
||||
inherit pkgs;
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
# pin nodejs version
|
||||
nodejs = nodejs_18;
|
||||
}).nodeDependencies;
|
||||
in
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "karma";
|
||||
version = "0.114";
|
||||
version = "0.115";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prymitive";
|
||||
repo = "karma";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ZstBumK2ywwdr1ksMN7P8mHdYUiMOpfpYnvt0v0Io4w=";
|
||||
hash = "sha256-SW/nmJcSk/LmoKLuD5stsSaRGaJctl6hVSODNCT9i64=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZsXPA4KyKbc/bwkidyHNDg62mE8KlE+yIssOBZLmHVg=";
|
||||
vendorHash = "sha256-Y55AaB8KRV+Tq/Trg1BOOwziyt+yJ2b3iVYA6bDebQY=";
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
src = "${src}/ui";
|
||||
hash = "sha256-/L+eU0xwaopL2im9epiZiZ23dUqJ+3OwhWw/rIZC6hI=";
|
||||
};
|
||||
|
||||
npmRoot = "ui";
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs_18
|
||||
nodejs
|
||||
npmHooks.npmConfigHook
|
||||
];
|
||||
|
||||
overrideModAttrs = oldAttrs: {
|
||||
nativeBuildInputs = lib.filter (drv: drv != npmHooks.npmConfigHook) oldAttrs.nativeBuildInputs;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Since we're using node2nix packages, the NODE_INSTALL hook isn't needed in the makefile
|
||||
sed -i \
|
||||
|
@ -43,32 +46,11 @@ buildGoModule rec {
|
|||
'';
|
||||
|
||||
buildPhase = ''
|
||||
# node will fail without this
|
||||
export HOME=$(mktemp -d)
|
||||
runHook preBuild
|
||||
|
||||
# build requires a writable .cache directory, so we'll create a
|
||||
# temporary writable node_modules dir and link every package to it
|
||||
|
||||
# simply linking the node_modules directory would increase the closure size for uiNodeDependencies to >700MB
|
||||
cp -r ${uiNodeDependencies}/lib/node_modules ./ui/
|
||||
chmod -R +w ./ui/node_modules
|
||||
mkdir -p ./ui/node_modules/.bin
|
||||
|
||||
pushd ./ui/node_modules/.bin
|
||||
|
||||
for x in ${uiNodeDependencies}/lib/node_modules/.bin/*; do
|
||||
ln -sfv ./$(readlink "$x") ./$(basename "$x")
|
||||
done
|
||||
|
||||
popd
|
||||
|
||||
mkdir -p ./ui/node_modules/.cache
|
||||
|
||||
# build package
|
||||
VERSION="v${version}" make -j$NIX_BUILD_CORES
|
||||
|
||||
# clean up
|
||||
rm -rf ./ui/node_modules
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
@ -78,6 +60,7 @@ buildGoModule rec {
|
|||
passthru.tests.karma = nixosTests.karma;
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/prymitive/karma/blob/${src.rev}/CHANGELOG.md";
|
||||
description = "Alert dashboard for Prometheus Alertmanager";
|
||||
homepage = "https://karma-dashboard.io/";
|
||||
license = licenses.asl20;
|
||||
|
|
|
@ -1,30 +0,0 @@
|
|||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p nodePackages.node2nix nodejs_18 gnused wget
|
||||
|
||||
# Usage: ./generate-dependencies.sh <version>
|
||||
# Use the same version format as in ./default.nix (without the 'v')
|
||||
|
||||
set -eou pipefail
|
||||
|
||||
version=$1
|
||||
|
||||
|
||||
echo "Karma version: $version"
|
||||
cd "$(dirname $(readlink -f $0))"
|
||||
|
||||
wget -O ./package-lock.json https://raw.githubusercontent.com/prymitive/karma/v$version/ui/package-lock.json
|
||||
wget -O ./package.json https://raw.githubusercontent.com/prymitive/karma/v$version/ui/package.json
|
||||
|
||||
sed -i -e 's/"name": "ui",/"name": "karma-ui",/g' ./package.json
|
||||
sed -i -e 's/"name": "ui",/"name": "karma-ui",/g' ./package-lock.json
|
||||
|
||||
node2nix \
|
||||
--nodejs-18 \
|
||||
--development \
|
||||
-l ./package-lock.json \
|
||||
-i ./package.json \
|
||||
-o ./node-packages.nix \
|
||||
-c ./node-composition.nix \
|
||||
-e ./node-env.nix
|
||||
|
||||
rm package-lock.json
|
|
@ -1,17 +0,0 @@
|
|||
# This file has been generated by node2nix 1.11.1. Do not edit!
|
||||
|
||||
{pkgs ? import <nixpkgs> {
|
||||
inherit system;
|
||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_18"}:
|
||||
|
||||
let
|
||||
nodeEnv = import ./node-env.nix {
|
||||
inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
|
||||
inherit pkgs nodejs;
|
||||
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
||||
};
|
||||
in
|
||||
import ./node-packages.nix {
|
||||
inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
|
||||
inherit nodeEnv;
|
||||
}
|
|
@ -1,686 +0,0 @@
|
|||
# This file originates from node2nix
|
||||
|
||||
{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}:
|
||||
|
||||
let
|
||||
# Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master
|
||||
utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux;
|
||||
|
||||
python = if nodejs ? python then nodejs.python else python2;
|
||||
|
||||
# Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
|
||||
tarWrapper = runCommand "tarWrapper" {} ''
|
||||
mkdir -p $out/bin
|
||||
|
||||
cat > $out/bin/tar <<EOF
|
||||
#! ${stdenv.shell} -e
|
||||
$(type -p tar) "\$@" --warning=no-unknown-keyword --delay-directory-restore
|
||||
EOF
|
||||
|
||||
chmod +x $out/bin/tar
|
||||
'';
|
||||
|
||||
# Function that generates a TGZ file from a NPM project
|
||||
buildNodeSourceDist =
|
||||
{ name, version, src, ... }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "node-tarball-${name}-${version}";
|
||||
inherit src;
|
||||
buildInputs = [ nodejs ];
|
||||
buildPhase = ''
|
||||
export HOME=$TMPDIR
|
||||
tgzFile=$(npm pack | tail -n 1) # Hooks to the pack command will add output (https://docs.npmjs.com/misc/scripts)
|
||||
'';
|
||||
installPhase = ''
|
||||
mkdir -p $out/tarballs
|
||||
mv $tgzFile $out/tarballs
|
||||
mkdir -p $out/nix-support
|
||||
echo "file source-dist $out/tarballs/$tgzFile" >> $out/nix-support/hydra-build-products
|
||||
'';
|
||||
};
|
||||
|
||||
# Common shell logic
|
||||
installPackage = writeShellScript "install-package" ''
|
||||
installPackage() {
|
||||
local packageName=$1 src=$2
|
||||
|
||||
local strippedName
|
||||
|
||||
local DIR=$PWD
|
||||
cd $TMPDIR
|
||||
|
||||
unpackFile $src
|
||||
|
||||
# Make the base dir in which the target dependency resides first
|
||||
mkdir -p "$(dirname "$DIR/$packageName")"
|
||||
|
||||
if [ -f "$src" ]
|
||||
then
|
||||
# Figure out what directory has been unpacked
|
||||
packageDir="$(find . -maxdepth 1 -type d | tail -1)"
|
||||
|
||||
# Restore write permissions to make building work
|
||||
find "$packageDir" -type d -exec chmod u+x {} \;
|
||||
chmod -R u+w "$packageDir"
|
||||
|
||||
# Move the extracted tarball into the output folder
|
||||
mv "$packageDir" "$DIR/$packageName"
|
||||
elif [ -d "$src" ]
|
||||
then
|
||||
# Get a stripped name (without hash) of the source directory.
|
||||
# On old nixpkgs it's already set internally.
|
||||
if [ -z "$strippedName" ]
|
||||
then
|
||||
strippedName="$(stripHash $src)"
|
||||
fi
|
||||
|
||||
# Restore write permissions to make building work
|
||||
chmod -R u+w "$strippedName"
|
||||
|
||||
# Move the extracted directory into the output folder
|
||||
mv "$strippedName" "$DIR/$packageName"
|
||||
fi
|
||||
|
||||
# Change to the package directory to install dependencies
|
||||
cd "$DIR/$packageName"
|
||||
}
|
||||
'';
|
||||
|
||||
# Bundle the dependencies of the package
|
||||
#
|
||||
# Only include dependencies if they don't exist. They may also be bundled in the package.
|
||||
includeDependencies = {dependencies}:
|
||||
lib.optionalString (dependencies != []) (
|
||||
''
|
||||
mkdir -p node_modules
|
||||
cd node_modules
|
||||
''
|
||||
+ (lib.concatMapStrings (dependency:
|
||||
''
|
||||
if [ ! -e "${dependency.packageName}" ]; then
|
||||
${composePackage dependency}
|
||||
fi
|
||||
''
|
||||
) dependencies)
|
||||
+ ''
|
||||
cd ..
|
||||
''
|
||||
);
|
||||
|
||||
# Recursively composes the dependencies of a package
|
||||
composePackage = { name, packageName, src, dependencies ? [], ... }@args:
|
||||
builtins.addErrorContext "while evaluating node package '${packageName}'" ''
|
||||
installPackage "${packageName}" "${src}"
|
||||
${includeDependencies { inherit dependencies; }}
|
||||
cd ..
|
||||
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
||||
'';
|
||||
|
||||
pinpointDependencies = {dependencies, production}:
|
||||
let
|
||||
pinpointDependenciesFromPackageJSON = writeTextFile {
|
||||
name = "pinpointDependencies.js";
|
||||
text = ''
|
||||
var fs = require('fs');
|
||||
var path = require('path');
|
||||
|
||||
function resolveDependencyVersion(location, name) {
|
||||
if(location == process.env['NIX_STORE']) {
|
||||
return null;
|
||||
} else {
|
||||
var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json");
|
||||
|
||||
if(fs.existsSync(dependencyPackageJSON)) {
|
||||
var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON));
|
||||
|
||||
if(dependencyPackageObj.name == name) {
|
||||
return dependencyPackageObj.version;
|
||||
}
|
||||
} else {
|
||||
return resolveDependencyVersion(path.resolve(location, ".."), name);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function replaceDependencies(dependencies) {
|
||||
if(typeof dependencies == "object" && dependencies !== null) {
|
||||
for(var dependency in dependencies) {
|
||||
var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency);
|
||||
|
||||
if(resolvedVersion === null) {
|
||||
process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n");
|
||||
} else {
|
||||
dependencies[dependency] = resolvedVersion;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Read the package.json configuration */
|
||||
var packageObj = JSON.parse(fs.readFileSync('./package.json'));
|
||||
|
||||
/* Pinpoint all dependencies */
|
||||
replaceDependencies(packageObj.dependencies);
|
||||
if(process.argv[2] == "development") {
|
||||
replaceDependencies(packageObj.devDependencies);
|
||||
}
|
||||
else {
|
||||
packageObj.devDependencies = {};
|
||||
}
|
||||
replaceDependencies(packageObj.optionalDependencies);
|
||||
replaceDependencies(packageObj.peerDependencies);
|
||||
|
||||
/* Write the fixed package.json file */
|
||||
fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2));
|
||||
'';
|
||||
};
|
||||
in
|
||||
''
|
||||
node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
|
||||
|
||||
${lib.optionalString (dependencies != [])
|
||||
''
|
||||
if [ -d node_modules ]
|
||||
then
|
||||
cd node_modules
|
||||
${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
|
||||
cd ..
|
||||
fi
|
||||
''}
|
||||
'';
|
||||
|
||||
# Recursively traverses all dependencies of a package and pinpoints all
|
||||
# dependencies in the package.json file to the versions that are actually
|
||||
# being used.
|
||||
|
||||
pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args:
|
||||
''
|
||||
if [ -d "${packageName}" ]
|
||||
then
|
||||
cd "${packageName}"
|
||||
${pinpointDependencies { inherit dependencies production; }}
|
||||
cd ..
|
||||
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
||||
fi
|
||||
'';
|
||||
|
||||
# Extract the Node.js source code which is used to compile packages with
|
||||
# native bindings
|
||||
nodeSources = runCommand "node-sources" {} ''
|
||||
tar --no-same-owner --no-same-permissions -xf ${nodejs.src}
|
||||
mv node-* $out
|
||||
'';
|
||||
|
||||
# Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty)
|
||||
addIntegrityFieldsScript = writeTextFile {
|
||||
name = "addintegrityfields.js";
|
||||
text = ''
|
||||
var fs = require('fs');
|
||||
var path = require('path');
|
||||
|
||||
function augmentDependencies(baseDir, dependencies) {
|
||||
for(var dependencyName in dependencies) {
|
||||
var dependency = dependencies[dependencyName];
|
||||
|
||||
// Open package.json and augment metadata fields
|
||||
var packageJSONDir = path.join(baseDir, "node_modules", dependencyName);
|
||||
var packageJSONPath = path.join(packageJSONDir, "package.json");
|
||||
|
||||
if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored
|
||||
console.log("Adding metadata fields to: "+packageJSONPath);
|
||||
var packageObj = JSON.parse(fs.readFileSync(packageJSONPath));
|
||||
|
||||
if(dependency.integrity) {
|
||||
packageObj["_integrity"] = dependency.integrity;
|
||||
} else {
|
||||
packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads.
|
||||
}
|
||||
|
||||
if(dependency.resolved) {
|
||||
packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided
|
||||
} else {
|
||||
packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories.
|
||||
}
|
||||
|
||||
if(dependency.from !== undefined) { // Adopt from property if one has been provided
|
||||
packageObj["_from"] = dependency.from;
|
||||
}
|
||||
|
||||
fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2));
|
||||
}
|
||||
|
||||
// Augment transitive dependencies
|
||||
if(dependency.dependencies !== undefined) {
|
||||
augmentDependencies(packageJSONDir, dependency.dependencies);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(fs.existsSync("./package-lock.json")) {
|
||||
var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
|
||||
|
||||
if(![1, 2].includes(packageLock.lockfileVersion)) {
|
||||
process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
if(packageLock.dependencies !== undefined) {
|
||||
augmentDependencies(".", packageLock.dependencies);
|
||||
}
|
||||
}
|
||||
'';
|
||||
};
|
||||
|
||||
# Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes
|
||||
reconstructPackageLock = writeTextFile {
|
||||
name = "reconstructpackagelock.js";
|
||||
text = ''
|
||||
var fs = require('fs');
|
||||
var path = require('path');
|
||||
|
||||
var packageObj = JSON.parse(fs.readFileSync("package.json"));
|
||||
|
||||
var lockObj = {
|
||||
name: packageObj.name,
|
||||
version: packageObj.version,
|
||||
lockfileVersion: 2,
|
||||
requires: true,
|
||||
packages: {
|
||||
"": {
|
||||
name: packageObj.name,
|
||||
version: packageObj.version,
|
||||
license: packageObj.license,
|
||||
bin: packageObj.bin,
|
||||
dependencies: packageObj.dependencies,
|
||||
engines: packageObj.engines,
|
||||
optionalDependencies: packageObj.optionalDependencies
|
||||
}
|
||||
},
|
||||
dependencies: {}
|
||||
};
|
||||
|
||||
function augmentPackageJSON(filePath, packages, dependencies) {
|
||||
var packageJSON = path.join(filePath, "package.json");
|
||||
if(fs.existsSync(packageJSON)) {
|
||||
var packageObj = JSON.parse(fs.readFileSync(packageJSON));
|
||||
packages[filePath] = {
|
||||
version: packageObj.version,
|
||||
integrity: "sha1-000000000000000000000000000=",
|
||||
dependencies: packageObj.dependencies,
|
||||
engines: packageObj.engines,
|
||||
optionalDependencies: packageObj.optionalDependencies
|
||||
};
|
||||
dependencies[packageObj.name] = {
|
||||
version: packageObj.version,
|
||||
integrity: "sha1-000000000000000000000000000=",
|
||||
dependencies: {}
|
||||
};
|
||||
processDependencies(path.join(filePath, "node_modules"), packages, dependencies[packageObj.name].dependencies);
|
||||
}
|
||||
}
|
||||
|
||||
function processDependencies(dir, packages, dependencies) {
|
||||
if(fs.existsSync(dir)) {
|
||||
var files = fs.readdirSync(dir);
|
||||
|
||||
files.forEach(function(entry) {
|
||||
var filePath = path.join(dir, entry);
|
||||
var stats = fs.statSync(filePath);
|
||||
|
||||
if(stats.isDirectory()) {
|
||||
if(entry.substr(0, 1) == "@") {
|
||||
// When we encounter a namespace folder, augment all packages belonging to the scope
|
||||
var pkgFiles = fs.readdirSync(filePath);
|
||||
|
||||
pkgFiles.forEach(function(entry) {
|
||||
if(stats.isDirectory()) {
|
||||
var pkgFilePath = path.join(filePath, entry);
|
||||
augmentPackageJSON(pkgFilePath, packages, dependencies);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
augmentPackageJSON(filePath, packages, dependencies);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
processDependencies("node_modules", lockObj.packages, lockObj.dependencies);
|
||||
|
||||
fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2));
|
||||
'';
|
||||
};
|
||||
|
||||
# Script that links bins defined in package.json to the node_modules bin directory
|
||||
# NPM does not do this for top-level packages itself anymore as of v7
|
||||
linkBinsScript = writeTextFile {
|
||||
name = "linkbins.js";
|
||||
text = ''
|
||||
var fs = require('fs');
|
||||
var path = require('path');
|
||||
|
||||
var packageObj = JSON.parse(fs.readFileSync("package.json"));
|
||||
|
||||
var nodeModules = Array(packageObj.name.split("/").length).fill("..").join(path.sep);
|
||||
|
||||
if(packageObj.bin !== undefined) {
|
||||
fs.mkdirSync(path.join(nodeModules, ".bin"))
|
||||
|
||||
if(typeof packageObj.bin == "object") {
|
||||
Object.keys(packageObj.bin).forEach(function(exe) {
|
||||
if(fs.existsSync(packageObj.bin[exe])) {
|
||||
console.log("linking bin '" + exe + "'");
|
||||
fs.symlinkSync(
|
||||
path.join("..", packageObj.name, packageObj.bin[exe]),
|
||||
path.join(nodeModules, ".bin", exe)
|
||||
);
|
||||
}
|
||||
else {
|
||||
console.log("skipping non-existent bin '" + exe + "'");
|
||||
}
|
||||
})
|
||||
}
|
||||
else {
|
||||
if(fs.existsSync(packageObj.bin)) {
|
||||
console.log("linking bin '" + packageObj.bin + "'");
|
||||
fs.symlinkSync(
|
||||
path.join("..", packageObj.name, packageObj.bin),
|
||||
path.join(nodeModules, ".bin", packageObj.name.split("/").pop())
|
||||
);
|
||||
}
|
||||
else {
|
||||
console.log("skipping non-existent bin '" + packageObj.bin + "'");
|
||||
}
|
||||
}
|
||||
}
|
||||
else if(packageObj.directories !== undefined && packageObj.directories.bin !== undefined) {
|
||||
fs.mkdirSync(path.join(nodeModules, ".bin"))
|
||||
|
||||
fs.readdirSync(packageObj.directories.bin).forEach(function(exe) {
|
||||
if(fs.existsSync(path.join(packageObj.directories.bin, exe))) {
|
||||
console.log("linking bin '" + exe + "'");
|
||||
fs.symlinkSync(
|
||||
path.join("..", packageObj.name, packageObj.directories.bin, exe),
|
||||
path.join(nodeModules, ".bin", exe)
|
||||
);
|
||||
}
|
||||
else {
|
||||
console.log("skipping non-existent bin '" + exe + "'");
|
||||
}
|
||||
})
|
||||
}
|
||||
'';
|
||||
};
|
||||
|
||||
prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}:
|
||||
let
|
||||
forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
|
||||
in
|
||||
''
|
||||
# Pinpoint the versions of all dependencies to the ones that are actually being used
|
||||
echo "pinpointing versions of dependencies..."
|
||||
source $pinpointDependenciesScriptPath
|
||||
|
||||
# Patch the shebangs of the bundled modules to prevent them from
|
||||
# calling executables outside the Nix store as much as possible
|
||||
patchShebangs .
|
||||
|
||||
# Deploy the Node.js package by running npm install. Since the
|
||||
# dependencies have been provided already by ourselves, it should not
|
||||
# attempt to install them again, which is good, because we want to make
|
||||
# it Nix's responsibility. If it needs to install any dependencies
|
||||
# anyway (e.g. because the dependency parameters are
|
||||
# incomplete/incorrect), it fails.
|
||||
#
|
||||
# The other responsibilities of NPM are kept -- version checks, build
|
||||
# steps, postprocessing etc.
|
||||
|
||||
export HOME=$TMPDIR
|
||||
cd "${packageName}"
|
||||
runHook preRebuild
|
||||
|
||||
${lib.optionalString bypassCache ''
|
||||
${lib.optionalString reconstructLock ''
|
||||
if [ -f package-lock.json ]
|
||||
then
|
||||
echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!"
|
||||
echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!"
|
||||
rm package-lock.json
|
||||
else
|
||||
echo "No package-lock.json file found, reconstructing..."
|
||||
fi
|
||||
|
||||
node ${reconstructPackageLock}
|
||||
''}
|
||||
|
||||
node ${addIntegrityFieldsScript}
|
||||
''}
|
||||
|
||||
npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild
|
||||
|
||||
runHook postRebuild
|
||||
|
||||
if [ "''${dontNpmInstall-}" != "1" ]
|
||||
then
|
||||
# NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
|
||||
rm -f npm-shrinkwrap.json
|
||||
|
||||
npm ${forceOfflineFlag} --nodedir=${nodeSources} --no-bin-links --ignore-scripts ${npmFlags} ${lib.optionalString production "--production"} install
|
||||
fi
|
||||
|
||||
# Link executables defined in package.json
|
||||
node ${linkBinsScript}
|
||||
'';
|
||||
|
||||
# Builds and composes an NPM package including all its dependencies
|
||||
buildNodePackage =
|
||||
{ name
|
||||
, packageName
|
||||
, version ? null
|
||||
, dependencies ? []
|
||||
, buildInputs ? []
|
||||
, production ? true
|
||||
, npmFlags ? ""
|
||||
, dontNpmInstall ? false
|
||||
, bypassCache ? false
|
||||
, reconstructLock ? false
|
||||
, preRebuild ? ""
|
||||
, dontStrip ? true
|
||||
, unpackPhase ? "true"
|
||||
, buildPhase ? "true"
|
||||
, meta ? {}
|
||||
, ... }@args:
|
||||
|
||||
let
|
||||
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ];
|
||||
in
|
||||
stdenv.mkDerivation ({
|
||||
name = "${name}${if version == null then "" else "-${version}"}";
|
||||
buildInputs = [ tarWrapper python nodejs ]
|
||||
++ lib.optional (stdenv.isLinux) utillinux
|
||||
++ lib.optional (stdenv.isDarwin) libtool
|
||||
++ buildInputs;
|
||||
|
||||
inherit nodejs;
|
||||
|
||||
inherit dontStrip; # Stripping may fail a build for some package deployments
|
||||
inherit dontNpmInstall preRebuild unpackPhase buildPhase;
|
||||
|
||||
compositionScript = composePackage args;
|
||||
pinpointDependenciesScript = pinpointDependenciesOfPackage args;
|
||||
|
||||
passAsFile = [ "compositionScript" "pinpointDependenciesScript" ];
|
||||
|
||||
installPhase = ''
|
||||
source ${installPackage}
|
||||
|
||||
# Create and enter a root node_modules/ folder
|
||||
mkdir -p $out/lib/node_modules
|
||||
cd $out/lib/node_modules
|
||||
|
||||
# Compose the package and all its dependencies
|
||||
source $compositionScriptPath
|
||||
|
||||
${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
|
||||
|
||||
# Create symlink to the deployed executable folder, if applicable
|
||||
if [ -d "$out/lib/node_modules/.bin" ]
|
||||
then
|
||||
ln -s $out/lib/node_modules/.bin $out/bin
|
||||
|
||||
# Patch the shebang lines of all the executables
|
||||
ls $out/bin/* | while read i
|
||||
do
|
||||
file="$(readlink -f "$i")"
|
||||
chmod u+rwx "$file"
|
||||
patchShebangs "$file"
|
||||
done
|
||||
fi
|
||||
|
||||
# Create symlinks to the deployed manual page folders, if applicable
|
||||
if [ -d "$out/lib/node_modules/${packageName}/man" ]
|
||||
then
|
||||
mkdir -p $out/share
|
||||
for dir in "$out/lib/node_modules/${packageName}/man/"*
|
||||
do
|
||||
mkdir -p $out/share/man/$(basename "$dir")
|
||||
for page in "$dir"/*
|
||||
do
|
||||
ln -s $page $out/share/man/$(basename "$dir")
|
||||
done
|
||||
done
|
||||
fi
|
||||
|
||||
# Run post install hook, if provided
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
# default to Node.js' platforms
|
||||
platforms = nodejs.meta.platforms;
|
||||
} // meta;
|
||||
} // extraArgs);
|
||||
|
||||
# Builds a node environment (a node_modules folder and a set of binaries)
|
||||
buildNodeDependencies =
|
||||
{ name
|
||||
, packageName
|
||||
, version ? null
|
||||
, src
|
||||
, dependencies ? []
|
||||
, buildInputs ? []
|
||||
, production ? true
|
||||
, npmFlags ? ""
|
||||
, dontNpmInstall ? false
|
||||
, bypassCache ? false
|
||||
, reconstructLock ? false
|
||||
, dontStrip ? true
|
||||
, unpackPhase ? "true"
|
||||
, buildPhase ? "true"
|
||||
, ... }@args:
|
||||
|
||||
let
|
||||
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
|
||||
in
|
||||
stdenv.mkDerivation ({
|
||||
name = "node-dependencies-${name}${if version == null then "" else "-${version}"}";
|
||||
|
||||
buildInputs = [ tarWrapper python nodejs ]
|
||||
++ lib.optional (stdenv.isLinux) utillinux
|
||||
++ lib.optional (stdenv.isDarwin) libtool
|
||||
++ buildInputs;
|
||||
|
||||
inherit dontStrip; # Stripping may fail a build for some package deployments
|
||||
inherit dontNpmInstall unpackPhase buildPhase;
|
||||
|
||||
includeScript = includeDependencies { inherit dependencies; };
|
||||
pinpointDependenciesScript = pinpointDependenciesOfPackage args;
|
||||
|
||||
passAsFile = [ "includeScript" "pinpointDependenciesScript" ];
|
||||
|
||||
installPhase = ''
|
||||
source ${installPackage}
|
||||
|
||||
mkdir -p $out/${packageName}
|
||||
cd $out/${packageName}
|
||||
|
||||
source $includeScriptPath
|
||||
|
||||
# Create fake package.json to make the npm commands work properly
|
||||
cp ${src}/package.json .
|
||||
chmod 644 package.json
|
||||
${lib.optionalString bypassCache ''
|
||||
if [ -f ${src}/package-lock.json ]
|
||||
then
|
||||
cp ${src}/package-lock.json .
|
||||
chmod 644 package-lock.json
|
||||
fi
|
||||
''}
|
||||
|
||||
# Go to the parent folder to make sure that all packages are pinpointed
|
||||
cd ..
|
||||
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
||||
|
||||
${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
|
||||
|
||||
# Expose the executables that were installed
|
||||
cd ..
|
||||
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
||||
|
||||
mv ${packageName} lib
|
||||
ln -s $out/lib/node_modules/.bin $out/bin
|
||||
'';
|
||||
} // extraArgs);
|
||||
|
||||
# Builds a development shell
|
||||
buildNodeShell =
|
||||
{ name
|
||||
, packageName
|
||||
, version ? null
|
||||
, src
|
||||
, dependencies ? []
|
||||
, buildInputs ? []
|
||||
, production ? true
|
||||
, npmFlags ? ""
|
||||
, dontNpmInstall ? false
|
||||
, bypassCache ? false
|
||||
, reconstructLock ? false
|
||||
, dontStrip ? true
|
||||
, unpackPhase ? "true"
|
||||
, buildPhase ? "true"
|
||||
, ... }@args:
|
||||
|
||||
let
|
||||
nodeDependencies = buildNodeDependencies args;
|
||||
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ];
|
||||
in
|
||||
stdenv.mkDerivation ({
|
||||
name = "node-shell-${name}${if version == null then "" else "-${version}"}";
|
||||
|
||||
buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
|
||||
buildCommand = ''
|
||||
mkdir -p $out/bin
|
||||
cat > $out/bin/shell <<EOF
|
||||
#! ${stdenv.shell} -e
|
||||
$shellHook
|
||||
exec ${stdenv.shell}
|
||||
EOF
|
||||
chmod +x $out/bin/shell
|
||||
'';
|
||||
|
||||
# Provide the dependencies in a development shell through the NODE_PATH environment variable
|
||||
inherit nodeDependencies;
|
||||
shellHook = lib.optionalString (dependencies != []) ''
|
||||
export NODE_PATH=${nodeDependencies}/lib/node_modules
|
||||
export PATH="${nodeDependencies}/bin:$PATH"
|
||||
'';
|
||||
} // extraArgs);
|
||||
in
|
||||
{
|
||||
buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist;
|
||||
buildNodePackage = lib.makeOverridable buildNodePackage;
|
||||
buildNodeDependencies = lib.makeOverridable buildNodeDependencies;
|
||||
buildNodeShell = lib.makeOverridable buildNodeShell;
|
||||
}
|
21059
pkgs/servers/monitoring/karma/node-packages.nix
generated
21059
pkgs/servers/monitoring/karma/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
@ -1,138 +0,0 @@
|
|||
{
|
||||
"name": "karma-ui",
|
||||
"version": "0.0.1",
|
||||
"license": "Apache-2.0",
|
||||
"private": true,
|
||||
"engines": {
|
||||
"npm": ">=8.3 <9.0",
|
||||
"node": "18.8.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"@floating-ui/react-dom": "1.0.0",
|
||||
"@fortawesome/fontawesome-svg-core": "6.2.0",
|
||||
"@fortawesome/free-regular-svg-icons": "6.2.0",
|
||||
"@fortawesome/free-solid-svg-icons": "6.2.0",
|
||||
"@fortawesome/react-fontawesome": "0.2.0",
|
||||
"@juggle/resize-observer": "3.4.0",
|
||||
"body-scroll-lock": "3.1.5",
|
||||
"bootstrap": "5.2.0",
|
||||
"bootswatch": "5.2.0",
|
||||
"bricks.js": "1.8.0",
|
||||
"copy-to-clipboard": "3.3.2",
|
||||
"csshake": "1.7.0",
|
||||
"date-fns": "2.29.2",
|
||||
"downshift": "6.1.9",
|
||||
"favico.js": "0.3.10",
|
||||
"fontfaceobserver": "2.3.0",
|
||||
"intersection-observer": "0.12.2",
|
||||
"lodash.debounce": "4.0.8",
|
||||
"lodash.merge": "4.6.2",
|
||||
"lodash.throttle": "4.1.1",
|
||||
"lodash.uniqueid": "4.0.1",
|
||||
"mobx": "6.6.1",
|
||||
"mobx-react-lite": "3.4.0",
|
||||
"mobx-stored": "1.1.0",
|
||||
"promise-retry": "2.0.1",
|
||||
"qs": "6.11.0",
|
||||
"react": "17.0.2",
|
||||
"react-app-polyfill": "3.0.0",
|
||||
"react-cool-dimensions": "2.0.7",
|
||||
"react-day-picker": "8.2.0",
|
||||
"react-dom": "17.0.2",
|
||||
"react-hotkeys-hook": "3.4.7",
|
||||
"react-idle-timer": "4.6.4",
|
||||
"react-intersection-observer": "9.4.0",
|
||||
"react-json-pretty": "2.2.0",
|
||||
"react-linkify": "0.2.2",
|
||||
"react-media-hook": "0.4.9",
|
||||
"react-range": "1.8.14",
|
||||
"react-select": "5.4.0",
|
||||
"react-transition-group": "4.4.5",
|
||||
"typeface-open-sans": "1.1.13"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@percy/cli": "1.10.1",
|
||||
"@percy/storybook": "4.3.3",
|
||||
"@storybook/builder-webpack5": "6.5.10",
|
||||
"@storybook/manager-webpack5": "6.5.10",
|
||||
"@storybook/preset-create-react-app": "4.1.2",
|
||||
"@storybook/react": "6.5.10",
|
||||
"@testing-library/jest-dom": "5.16.5",
|
||||
"@testing-library/react": "12.1.5",
|
||||
"@testing-library/react-hooks": "8.0.1",
|
||||
"@testing-library/user-event": "14.4.3",
|
||||
"@types/body-scroll-lock": "3.1.0",
|
||||
"@types/bricks.js": "1.8.2",
|
||||
"@types/enzyme": "3.10.12",
|
||||
"@types/fontfaceobserver": "2.1.0",
|
||||
"@types/jest": "29.0.0",
|
||||
"@types/lodash.debounce": "4.0.7",
|
||||
"@types/lodash.merge": "4.6.7",
|
||||
"@types/lodash.throttle": "4.1.7",
|
||||
"@types/lodash.uniqueid": "4.0.7",
|
||||
"@types/node": "16.11.56",
|
||||
"@types/promise-retry": "1.1.3",
|
||||
"@types/qs": "6.9.7",
|
||||
"@types/react": "17.0.49",
|
||||
"@types/react-dom": "17.0.17",
|
||||
"@wojtekmaj/enzyme-adapter-react-17": "0.6.7",
|
||||
"diffable-html": "5.0.0",
|
||||
"enzyme": "3.11.0",
|
||||
"eslint-config-prettier": "8.5.0",
|
||||
"eslint-config-react-app": "7.0.1",
|
||||
"eslint-plugin-jest": "27.0.1",
|
||||
"eslint-plugin-prettier": "4.2.1",
|
||||
"fetch-mock": "9.11.0",
|
||||
"prettier": "2.7.1",
|
||||
"purgecss": "4.1.3",
|
||||
"react-scripts": "5.0.1",
|
||||
"sass": "1.54.8",
|
||||
"timemachine": "0.3.2",
|
||||
"typescript": "4.8.2"
|
||||
},
|
||||
"overrides": {
|
||||
"react-scripts@5.0.1": {
|
||||
"autoprefixer": "10.4.5"
|
||||
}
|
||||
},
|
||||
"scripts": {
|
||||
"start": "REACT_APP_BACKEND_URI=http://localhost:8080 react-scripts start",
|
||||
"build": "react-scripts build",
|
||||
"postbuild": "make backup-css && purgecss -c purgecss.config.js -o build/static/css",
|
||||
"test": "react-scripts test",
|
||||
"storybook": "start-storybook",
|
||||
"snapshot": "build-storybook --quiet && percy storybook --verbose ./storybook-static",
|
||||
"analyze": "npx source-map-explorer 'build/static/js/*.js'"
|
||||
},
|
||||
"jest": {
|
||||
"collectCoverageFrom": [
|
||||
"src/**/*.{js,ts,tsx}",
|
||||
"!src/**/*.stories.{js,ts,tsx}",
|
||||
"!src/__fixtures__/Stories.{js,ts,tsx}",
|
||||
"!src/react-app-env.d.ts",
|
||||
"!src/Models/*.ts"
|
||||
]
|
||||
},
|
||||
"browserslist": [
|
||||
">= 1%",
|
||||
"last 1 major version",
|
||||
"not dead",
|
||||
"Chrome >= 49",
|
||||
"Firefox >= 52",
|
||||
"Edge >= 12",
|
||||
"iOS >= 9",
|
||||
"Safari >= 10",
|
||||
"Android >= 4.4"
|
||||
],
|
||||
"percy": {
|
||||
"version": 2,
|
||||
"snapshot": {
|
||||
"widths": [
|
||||
700,
|
||||
1280
|
||||
],
|
||||
"min-height": 200,
|
||||
"enable-javascript": true
|
||||
}
|
||||
}
|
||||
}
|
|
@ -13,9 +13,9 @@ mavenWithJdk.buildMavenPackage rec {
|
|||
hash = "sha256-F+o94Oh9qxVdfgwdmyOv+WZl1BjQuzhQWaVrAgScgIU=";
|
||||
};
|
||||
|
||||
mvnHash = "sha256-oDtUitsfZPiDtyfzzw1yMNBCKyP6rHczKZT/SPPJYGE=";
|
||||
mvnHash = "sha256-8i3OVSy8RUGVoQzwADszVvNYe50f4nsJie1y7tsOK4U=";
|
||||
|
||||
nativeBuildInputs = [ mavenWithJdk makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
@ -44,6 +44,5 @@ mavenWithJdk.buildMavenPackage rec {
|
|||
homepage = "https://github.com/Vhati/Slipstream-Mod-Manager";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ mib ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
46
pkgs/tools/misc/farge/default.nix
Normal file
46
pkgs/tools/misc/farge/default.nix
Normal file
|
@ -0,0 +1,46 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, bash
|
||||
, bc
|
||||
, feh
|
||||
, grim
|
||||
, imagemagick
|
||||
, slurp
|
||||
, wl-clipboard
|
||||
, xcolor
|
||||
, waylandSupport ? true
|
||||
, x11Support ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "farge";
|
||||
version = "1.0.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sdushantha";
|
||||
repo = "farge";
|
||||
rev = "2ff6669e2350644d4f0b1bd84526efe5eae3c302";
|
||||
hash = "sha256-vCMuFMGcI4D4EzbSsXeNGKNS6nBFkfTcAmSzb9UMArc=";
|
||||
};
|
||||
|
||||
buildInputs = [ bash bc feh imagemagick ]
|
||||
++ lib.optionals waylandSupport [ grim slurp wl-clipboard ]
|
||||
++ lib.optionals x11Support [ xcolor ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
install -m755 farge $out/bin
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool that shows the color value of a given pixel on your screen";
|
||||
homepage = "https://github.com/sdushantha/farge";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ jtbx ];
|
||||
mainProgram = "farge";
|
||||
};
|
||||
})
|
|
@ -24,19 +24,16 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = hwatch;
|
||||
command = "hwatch --version";
|
||||
version = version;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/blacknon/hwatch";
|
||||
description= "Modern alternative to the watch command";
|
||||
description = "Modern alternative to the watch command";
|
||||
longDescription = ''
|
||||
A modern alternative to the watch command, records the differences in
|
||||
execution results and can check this differences at after.
|
||||
'';
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ hamburger1984 ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nixdoc";
|
||||
version = "2.3.0";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = "nixdoc";
|
||||
repo = "nixdoc";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8pp6xlmdb3kZ6unTiO4yRruyEZ//GIHZF1k8f4kQr9Q=";
|
||||
sha256 = "sha256-cEMehtxkqXAar/fDy3CnzsDEAuC1ABBaYqzqVBGnTrs=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-k8/+BBMjQCsrgCi33fTdiSukaAZlg6XU3NwXaJdGYVw=";
|
||||
cargoHash = "sha256-QFDHIqXyTWTdqNrLcwWw3plX6EDH/k043nay5opjtws=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ darwin.Security ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ darwin.Security ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Generate documentation for Nix functions";
|
||||
|
|
|
@ -67,7 +67,6 @@ maven.buildMavenPackage rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
maven
|
||||
makeShellWrapper
|
||||
wrapGAppsHook
|
||||
jdk
|
||||
|
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "grype";
|
||||
version = "0.64.0";
|
||||
version = "0.64.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anchore";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Cq7Swgwbtfku+ZvoMeXmLpTbic6Fm/EdGi8C9R2J+X0=";
|
||||
hash = "sha256-jCGeSAG97RojLidxJK8yCN1ldStpG9b57rUR5JkQGuE=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
|
@ -28,7 +28,7 @@ buildGoModule rec {
|
|||
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-txC+2I50Zf0xP/FGFoCLNLVVaXg/MfQKMgDSFTNg0eU=";
|
||||
vendorHash = "sha256-X3AqiW8wHGBkl/xlh1pPiDfQkZ9lDRyv0FTxWy2hT8E=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
@ -38,16 +38,16 @@ buildGoModule rec {
|
|||
openssl
|
||||
];
|
||||
|
||||
subPackages = [ "." ];
|
||||
subPackages = [ "cmd/grype" ];
|
||||
|
||||
excludedPackages = "test/integration";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/anchore/grype/internal/version.version=${version}"
|
||||
"-X github.com/anchore/grype/internal/version.gitDescription=v${version}"
|
||||
"-X github.com/anchore/grype/internal/version.gitTreeState=clean"
|
||||
"-X=github.com/anchore/grype/internal/version.version=${version}"
|
||||
"-X=github.com/anchore/grype/internal/version.gitDescription=v${version}"
|
||||
"-X=github.com/anchore/grype/internal/version.gitTreeState=clean"
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
|
@ -80,8 +80,7 @@ buildGoModule rec {
|
|||
--replace "TestRegistryAuth" "SkipRegistryAuth"
|
||||
substituteInPlace test/cli/sbom_input_test.go \
|
||||
--replace "TestSBOMInput_FromStdin" "SkipSBOMInput_FromStdin" \
|
||||
--replace "TestSBOMInput_AsArgument" "SkipSBOMInput_AsArgument" \
|
||||
--replace "TestAttestationInput_AsArgument" "SkipAttestationInput_AsArgument"
|
||||
--replace "TestSBOMInput_AsArgument" "SkipSBOMInput_AsArgument"
|
||||
substituteInPlace test/cli/subprocess_test.go \
|
||||
--replace "TestSubprocessStdin" "SkipSubprocessStdin"
|
||||
|
||||
|
|
|
@ -11,9 +11,9 @@ maven.buildMavenPackage rec {
|
|||
hash = "sha256-rRttA5H0A0c44loBzbKH7Waoted3IsOgxGCD2VM0U/Q=";
|
||||
};
|
||||
|
||||
mvnHash = "sha256-kLpjMj05uC94/5vGMwMlFzLKNFOKeyNvq/vmB6pHTAo=";
|
||||
mvnHash = "sha256-1zn980QP48fWvm45HR1yDHdyzHYPkl/P0RpII+Zu+xc=";
|
||||
|
||||
nativeBuildInputs = [ maven makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/share/jd-cli
|
||||
|
@ -27,7 +27,6 @@ maven.buildMavenPackage rec {
|
|||
description = "Simple command line wrapper around JD Core Java Decompiler project";
|
||||
homepage = "https://github.com/intoolswetrust/jd-cli";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ majiir ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -3944,8 +3944,8 @@ with pkgs;
|
|||
|
||||
reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace { };
|
||||
|
||||
skhd = callPackage ../os-specific/darwin/skhd {
|
||||
inherit (darwin.apple_sdk.frameworks) Carbon;
|
||||
skhd = darwin.apple_sdk_11_0.callPackage ../os-specific/darwin/skhd {
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa;
|
||||
};
|
||||
|
||||
qes = callPackage ../os-specific/darwin/qes {
|
||||
|
@ -7984,6 +7984,8 @@ with pkgs;
|
|||
|
||||
faraday-cli = callPackage ../tools/security/faraday-cli { };
|
||||
|
||||
farge = callPackage ../tools/misc/farge { };
|
||||
|
||||
fastlane = callPackage ../tools/admin/fastlane { };
|
||||
|
||||
fatresize = callPackage ../tools/filesystems/fatresize { };
|
||||
|
@ -32793,6 +32795,8 @@ with pkgs;
|
|||
|
||||
kubectl-example = callPackage ../applications/networking/cluster/kubectl-example { };
|
||||
|
||||
kubectl-explore = callPackage ../applications/networking/cluster/kubectl-explore { };
|
||||
|
||||
kubectl-gadget = callPackage ../applications/networking/cluster/kubectl-gadget { };
|
||||
|
||||
kubectl-images = callPackage ../applications/networking/cluster/kubectl-images { };
|
||||
|
|
Loading…
Reference in a new issue