diff options
Diffstat (limited to 'pkgs/misc')
125 files changed, 5578 insertions, 2996 deletions
diff --git a/pkgs/misc/autotiling/default.nix b/pkgs/misc/autotiling/default.nix new file mode 100644 index 000000000000..b104f359363b --- /dev/null +++ b/pkgs/misc/autotiling/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonApplication, fetchPypi, i3ipc, importlib-metadata }: + +buildPythonApplication rec { + pname = "autotiling"; + version = "1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0hwvy9bxwv9fakqqiyrkmpckxgm0z85c240p84ibdhja9sm086v0"; + }; + + propagatedBuildInputs = [ i3ipc importlib-metadata ]; + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/nwg-piotr/autotiling"; + description = "Script for sway and i3 to automatically switch the horizontal / vertical window split orientation"; + license = licenses.gpl3Plus; + platforms= platforms.linux; + maintainers = with maintainers; [ artturin ]; + }; +} + diff --git a/pkgs/misc/base16-builder/node-packages-generated.nix b/pkgs/misc/base16-builder/node-packages-generated.nix index bbbe6e3b20a6..426b6229e1c8 100644 --- a/pkgs/misc/base16-builder/node-packages-generated.nix +++ b/pkgs/misc/base16-builder/node-packages-generated.nix @@ -10,7 +10,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; - sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; + sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy"; }; }; "ansi-regex-2.1.1" = { @@ -46,7 +46,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; - sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; + sha512 = "13mgnbmdhdq0qncijvpip1l39q1a8labcvj3hc3n1yl2zch106mdkn7p7bd5knvmfkkn1js9nd47nzyjk1himbm8ry8i8gd6mk7mlk3"; }; }; "are-we-there-yet-1.1.5" = { @@ -55,7 +55,7 @@ let version = "1.1.5"; src = fetchurl { url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; - sha512 = "5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w=="; + sha512 = "3mizm1yfxynlhaavbimv7n9qljrbhni22v4fch6zr89x6ps0gpjcxm5yfvv05n8vc3r17hmglyswgq9w0s598xv70nnyw358q11s5p6"; }; }; "argparse-1.0.10" = { @@ -64,7 +64,7 @@ let version = "1.0.10"; src = fetchurl { url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"; - sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; + sha512 = "17fhywmdjcp8g0ys089i5xg26yajkkg9zg8hyry3fghz75b2pq5vdx997dk5p2sc15r9nsj8rmf4f27g81hi92kzj5q86sdmg5ni553"; }; }; "array-find-index-1.0.2" = { @@ -100,7 +100,7 @@ let version = "1.1.11"; src = fetchurl { url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; + sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8"; }; }; "bulk-replace-0.0.1" = { @@ -136,7 +136,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz"; - sha512 = "mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw=="; + sha512 = "2mv8dgq8fr86zs5mam6bkp0j241lpb5rbwpq8zc5gkj7f8zir1cd71m0yyy8zy46hvf86b9k7pbhvkz08ii4mhxh14xshkrgik0p14r"; }; }; "chalk-1.1.3" = { @@ -154,7 +154,7 @@ let version = "1.1.4"; src = fetchurl { url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"; - sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; + sha512 = "1b03acmav1awkygrda5h64pn8msd6wda119q553hik728i1j72bfqyq7yzn1x7nmw28hvg9mcyh7krsj8vwsq3karnn55mj6smip7cc"; }; }; "code-point-at-1.1.0" = { @@ -235,7 +235,7 @@ let version = "3.2.6"; src = fetchurl { url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz"; - sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ=="; + sha512 = "1cyv14044rfh792n1hhsa44kk8dk95zk14w96i49gwq6g9wi6h9vn90xaragfy7rvggqvj178l5f16c78g47xgrwhjx3bp7zs6pxscr"; }; }; "decamelize-1.2.0" = { @@ -253,7 +253,7 @@ let version = "0.6.0"; src = fetchurl { url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz"; - sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; + sha512 = "0wc0sqg1aqx864bxf8xa4j8ncrc8rcvmiaj1sp3x1np2i8hdjybzjfd0w9gbf1yasmwycwzzg1mz6smr3q42hhv4pjx2qcgwqhg3q9c"; }; }; "delegates-1.0.0" = { @@ -298,7 +298,7 @@ let version = "2.7.4"; src = fetchurl { url = "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz"; - sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="; + sha512 = "2ad39acbba96hqbgf714pacri515xjn8jd43bkfb1wwp04vflpjj0qhnnmsq074g7d1kycyj1bmf620s43qb3x74hrfb4ky3v5axygf"; }; }; "error-ex-1.3.2" = { @@ -307,7 +307,7 @@ let version = "1.3.2"; src = fetchurl { url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"; - sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; + sha512 = "3igrl2amb9mpa9d2z6qghz3ljqd7amjla8ahfs5fdgl0w52pw6gz3y32q5fk229yvfyg3x9kpfygadcm2w0lv4hv4nj25cyd8v4glgd"; }; }; "escape-string-regexp-1.0.5" = { @@ -325,7 +325,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"; - sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; + sha512 = "3h999di4dnwxb22lxlb7cbz42nalrv8g8sqdvrkkl5c27gnwhp1rva4039hmq6g1i0y4mfjgx6p4i2vwxxl0zlahfzdd9fl1qbqasvq"; }; }; "filled-array-1.1.0" = { @@ -352,7 +352,7 @@ let version = "1.2.7"; src = fetchurl { url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz"; - sha512 = "GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA=="; + sha512 = "1644yfnzfqikaff5s68dm4qfrblxrz68ynigkyzyixjqazxlli0svj1nxkawz35sv2vb3vjh41f1rhg0j4nr770a53fzqbjc4j94r0r"; }; }; "fs-promise-0.3.1" = { @@ -397,7 +397,7 @@ let version = "7.1.6"; src = fetchurl { url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; - sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; + sha512 = "020qv13jbi1v4y5xavf6fw08h9svy4q9p67m4avkrrhgdjmk0c5k3h19bv7k6yn1vfxljpjw9kg81fbdg9v83cjplxvkn3v4v1v21ig"; }; }; "got-5.7.1" = { @@ -415,7 +415,7 @@ let version = "4.2.3"; src = fetchurl { url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz"; - sha512 = "a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="; + sha512 = "12xdl6ai5jdxcpcavw2hk4zpiknz7g7f2cvgawzwlzv7cy7qf7riq8ymkgqdqxjkpl1mg627dxa65zc9b0yqhflsmqlfg5q3481azbb"; }; }; "has-ansi-2.0.0" = { @@ -442,7 +442,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/hepburn/-/hepburn-1.1.1.tgz"; - sha512 = "Ok3ZmMJN3ek4WFAL4f5t8k+BmrDRlS5qGjI4um+3cHH0SrYVzJgUTYwIfGvU8s/eWqOEY+gsINwjJSoaBG3A9g=="; + sha512 = "3vc0v8438m2a8yw40nfhqw4ldddxkzjsimpq24c9la9ik0mnr5g8wbhnxpvlf1j39m2x5fin2d82kzjdpzf22shb0wfkpadqacdjk9s"; }; }; "hosted-git-info-2.8.8" = { @@ -451,7 +451,7 @@ let version = "2.8.8"; src = fetchurl { url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz"; - sha512 = "f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="; + sha512 = "19a25b4xb3hg00d1nsirc3xfcc07rplbh6msa49rgc8xg5rg38y1z8rfrf0dmll8k4jaml8z337bi6y2cgah66jnwxinn0sch5k7z3z"; }; }; "iconv-lite-0.4.24" = { @@ -460,7 +460,7 @@ let version = "0.4.24"; src = fetchurl { url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"; - sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; + sha512 = "2n3ygx6km56rdcd5kq52bs2113xqm3vlw2kb9r7pnmxd2qhxrfahp2ngc4w7x8x76fyfpapnixnbjq1i24nc11mj6q7rghwj2fifwxz"; }; }; "ignore-walk-3.0.3" = { @@ -469,7 +469,7 @@ let version = "3.0.3"; src = fetchurl { url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz"; - sha512 = "m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw=="; + sha512 = "0mlk9s23jc3avly1bv6s5j7hs0aafxabmgn7iqi0bjag4b03nqckvcdrgnarpmysdq8yr1rgxh6k7p82vzjj1z6hnm5ckwswg33mflv"; }; }; "imurmurhash-0.1.4" = { @@ -505,7 +505,7 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; - sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; + sha512 = "30rw2i1k63pbf0n5dbwly05h95cdp1kj8c9r15gv1cwha141g61k56fx4qwsvhpm1ksnf7agch1wxirs3s0m31wbfvmcqizgrlwdywk"; }; }; "ini-1.3.5" = { @@ -514,7 +514,7 @@ let version = "1.3.5"; src = fetchurl { url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz"; - sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="; + sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5"; }; }; "is-arrayish-0.2.1" = { @@ -532,7 +532,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz"; - sha512 = "cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w=="; + sha512 = "3gj0k3vlpbc7zg5xkl8yjnilqs2dmk3ks67shchrfmnzkj6r4aad994xwfczx99ccjx6cixdqg4sawk2m92lqhh6jmfl17zlnv8rp3i"; }; }; "is-fullwidth-code-point-1.0.0" = { @@ -577,7 +577,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz"; - sha512 = "RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg=="; + sha512 = "134jdgzg4p15g5jvwsmb0bmglmymn1pyk6r2w8q1fm728f15l7k12sqmfngn0mg3vs34gzg12v684fp9c99l6jnv737b6rgmiwd8ij5"; }; }; "is-stream-1.1.0" = { @@ -613,7 +613,7 @@ let version = "3.13.1"; src = fetchurl { url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz"; - sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw=="; + sha512 = "0kkjjrr0znm2ka89ywc5518c8dw0210z91fm94c7v11l8c96mkjh0ddld5mb7jmmnpzap7vn0fhvr29lma63c9is2ixq3fpp0xxrxk1"; }; }; "keypress-0.1.0" = { @@ -640,7 +640,7 @@ let version = "1.7.0"; src = fetchurl { url = "https://registry.npmjs.org/limax/-/limax-1.7.0.tgz"; - sha512 = "ibcGylOXT5vry2JKfKwLWx2tZudRYWm4SzG9AE/cc5zqwW+3nQy/uPLUvfAUChRdmqxVrK6SNepmO7ZY8RoKfA=="; + sha512 = "1y0l6pib2v3nrpa6n9axb2mmjd5s50a2kqbvm7jp2zhr7dpdz0ym73kvi7h1g9i9fw6jqaiwxkas7av1fn7qjk2rgmrnkwpag50ddw9"; }; }; "load-json-file-1.1.0" = { @@ -667,7 +667,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; - sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="; + sha512 = "1a7qa1zn5zl1nf7i6w3299lc3biabfb0w2c30cl770l2dbldvi72nwvjdlinhx7j0ldip82sj710aprdjbmbg782i2pa3jpbgmy6qhv"; }; }; "map-obj-1.0.1" = { @@ -694,7 +694,7 @@ let version = "3.0.4"; src = fetchurl { url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; + sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8"; }; }; "minimist-0.0.8" = { @@ -712,7 +712,7 @@ let version = "1.2.5"; src = fetchurl { url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"; - sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; + sha512 = "0pif0kjsr0cdm73cyicn9xdx9zkly45w4akmyfa39lkaf6lzysfr8kr145p54wjk26pbsk0w0qfdds3k4bxy4wl5l210i1b8qsngkql"; }; }; "minipass-2.9.0" = { @@ -721,7 +721,7 @@ let version = "2.9.0"; src = fetchurl { url = "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz"; - sha512 = "wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg=="; + sha512 = "1x0k2ycn1r5fig2zy7jj5vjsc7sxdl2a8lidvzsfyhcbrmvyvlbkmb3ga6l8njclvhjz2yrcx57jn26bckzrms017zb2yan1y7d85y3"; }; }; "minizlib-1.3.3" = { @@ -730,7 +730,7 @@ let version = "1.3.3"; src = fetchurl { url = "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz"; - sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q=="; + sha512 = "3slcgy5kqasjl8k1n2indaaw0k6j2ipapzxrcqyy2zrwpv8z9w2im5i8c2c73pqdgkd31rwf5bajgv4pm2i6m9jg51cfmp694w0r5p9"; }; }; "mkdirp-0.5.1" = { @@ -748,7 +748,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; - sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; + sha512 = "3dqfiiw6nxvvi24fndbzlccnjcas99bsd1kz5m2r78lzgpp6vx57jzbmxq3k1m7bsw88rwra0n4848l720fxxn5x20djck3wp3hysdh"; }; }; "nan-2.14.0" = { @@ -757,7 +757,7 @@ let version = "2.14.0"; src = fetchurl { url = "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz"; - sha512 = "INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="; + sha512 = "115f4m91pjscflwskc29clsspd2z02gdbz0dbj63ja8bf67nraw14gvppl4872y9z2f5vbjlkpg1i4625zvalx3gp04vvn2gs7qblr0"; }; }; "needle-2.4.0" = { @@ -766,7 +766,7 @@ let version = "2.4.0"; src = fetchurl { url = "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz"; - sha512 = "4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg=="; + sha512 = "1k9220dhvc3m78hzd1xh2135p19z15y964hmhsajayvj11j2p3rv5w0gii7lmgr8w57bqkjg0xby5f1gkcph60kxvyr52z6pp7g0yg0"; }; }; "node-pre-gyp-0.14.0" = { @@ -775,7 +775,7 @@ let version = "0.14.0"; src = fetchurl { url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz"; - sha512 = "+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA=="; + sha512 = "32drv6q9sh4i2ff2djd1dhxxxiaiymmgycbm12wpkz9vxspnldxgmppf9sazp3c72771a1p5s4kkzgwn4w1csyz9bn4zdbdnq5w6azq"; }; }; "node-status-codes-1.0.0" = { @@ -793,7 +793,7 @@ let version = "2.4.1"; src = fetchurl { url = "https://registry.npmjs.org/nodejieba/-/nodejieba-2.4.1.tgz"; - sha512 = "fxlVloaO5baDBmpnQ2egDCe6FT9SJdfbFak7tK7dKH16d7SxA5bLdv47EdTwtKS9DRbnXnMlyX5Wc33XAnaQuA=="; + sha512 = "2w90xh2sxyp6mkyr4jp6pp72q6vv95ly3a12fzyfv5rc0xinivplz98vnpb8fx92pdxf9aj7wavl9qcl1kl6rva0s1vdrcfhsb5a6bz"; }; }; "nopt-4.0.3" = { @@ -802,7 +802,7 @@ let version = "4.0.3"; src = fetchurl { url = "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz"; - sha512 = "CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg=="; + sha512 = "0mb9va0ag1n8v5c2lhza37prcw4iyrmbw5n6yglk1kcg95xwqi9ng5dqwr17h63sl5dba2rnwwrzz7dnfvkx5z75h4j7d9kag0qdxha"; }; }; "normalize-package-data-2.5.0" = { @@ -811,7 +811,7 @@ let version = "2.5.0"; src = fetchurl { url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; - sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; + sha512 = "1wbwhlsm965n61y23wrm50ric9l7rig90wvx7hjdl34np6n1bbqcc67wgm494z303s6y5aj4xjyism3n6kikp40iz9qaizlfhvqr47z"; }; }; "npm-bundled-1.1.1" = { @@ -820,7 +820,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz"; - sha512 = "gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA=="; + sha512 = "1yb9l8jnxwicz0fsdv434y395b0x11mlc1mgbbhnx21pvs58a4p43f0swvi6q0rakdgzdiyf0yylnmb3i41hb052903m1cgcy01zac2"; }; }; "npm-normalize-package-bin-1.0.1" = { @@ -829,7 +829,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz"; - sha512 = "EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA=="; + sha512 = "149ypqf1mxqw0gcjr4xf4h65q6vx41z1abm27cwbsj7fn07wsx588f9gsykjzfybwrn4mmr6lyaj825w3yyhbgaagmrybw9brzdmxqh"; }; }; "npm-packlist-1.4.8" = { @@ -838,7 +838,7 @@ let version = "1.4.8"; src = fetchurl { url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz"; - sha512 = "5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A=="; + sha512 = "3s585jx92awjb52bs1jwq8r4swv8mgfl685if5wwpbsigwb362adizzpi58a5kgqfpf605mf6a0v7074mc9qpcn2ypqgr7f1a1ikq77"; }; }; "npmlog-4.1.2" = { @@ -847,7 +847,7 @@ let version = "4.1.2"; src = fetchurl { url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; - sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; + sha512 = "2967mavp7zw0aawf5fadqf4pmn7vy5gya1yx2s9wwppvivhd9q4mpdnszfqvd7p6yks649bwbpj8iviw86g0hpp4f93d5ca7dmjmrfs"; }; }; "number-is-nan-1.0.1" = { @@ -910,7 +910,7 @@ let version = "0.1.5"; src = fetchurl { url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz"; - sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; + sha512 = "3ddw0y41pxv08ls5xhmq1bi81hppjbr45k78cjfx99vznh5znrj5g1b1wab9caj1mqlsvmfms0zm9cfb47ygm0d8wv5fccx8049q9fh"; }; }; "package-json-2.4.0" = { @@ -955,7 +955,7 @@ let version = "1.0.6"; src = fetchurl { url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"; - sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; + sha512 = "37qw5986wccpwwqckqky509s4nd6zwv200s9r2v6mcf5nsyxgf2x00m4yp918mkkz84sdh4q0kjbg0hhfq4flpz0l6v47hvc57qwa8r"; }; }; "path-type-1.1.0" = { @@ -1000,7 +1000,7 @@ let version = "2.9.0"; src = fetchurl { url = "https://registry.npmjs.org/pinyin/-/pinyin-2.9.0.tgz"; - sha512 = "TZYQ+2uE12arC1EfCeDmN5KgwIOuNMIweOotKvBZdhVOUuQc5RJsGEGf+BaSvxfVtu9ViYEFJmH0xTaj9t4n3Q=="; + sha512 = "3fjgppnlcvcbx314q2q32amxyvda5xzj8bgi7s131n15r8wwi94w5bnb7q2lbgag0qc4d5fhg0a14ipwvh0j7si1fmndmw4dgxi15jd"; }; }; "prepend-http-1.0.4" = { @@ -1018,7 +1018,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; - sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; + sha512 = "1mgan8li4i2l4y7lsr7snks85n6xg5x693cqmzpid3fkk9br7v5xzgvh1zlfs08zkxn6s0n6qhykr64mszjfyxd77dhmdi1jhx992yy"; }; }; "rc-1.2.8" = { @@ -1027,7 +1027,7 @@ let version = "1.2.8"; src = fetchurl { url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz"; - sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; + sha512 = "0xhy1n9n3y6cp28f8f0f2mi0xzc7ay1g5nhbp64fyvcwv9q30zq2zvyc5q2d0al8aa0hx101yq2y6d2ln4r5jxnqifh1pd3la1ccxnb"; }; }; "read-all-stream-3.1.0" = { @@ -1063,7 +1063,7 @@ let version = "2.3.7"; src = fetchurl { url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"; - sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; + sha512 = "0zrh6gjjzwwycwydra51xcrgjgzyqv6dq38bfpwzmlqn702mwb4nj4sjjn499rycqndfk6rby0dksnq72x8pcbvqv0b2893mvq6if0i"; }; }; "redent-1.0.0" = { @@ -1081,7 +1081,7 @@ let version = "3.4.0"; src = fetchurl { url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz"; - sha512 = "4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A=="; + sha512 = "3w8zjx5s044i7wr9bqqgjfkjawg0cajc9j9gmzkqs0i420algjvkd5k27j9pvhx1yq7nvdchsl96zcyjf64n14765q0f18y1wbkmcz0"; }; }; "registry-url-3.1.0" = { @@ -1108,7 +1108,7 @@ let version = "1.15.1"; src = fetchurl { url = "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz"; - sha512 = "84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w=="; + sha512 = "3pr5zjp8nh6qfllxnpqx531srx1igzdm28j4zg1y53yzc8qxp16yx01pw8cp7y4frla90gnpv622d6bi6aayi03iqlkb8gdjklji2pk"; }; }; "rimraf-2.7.1" = { @@ -1117,7 +1117,7 @@ let version = "2.7.1"; src = fetchurl { url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz"; - sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; + sha512 = "3ixwnv4h7x38jd12vyzhx6m6adnfhz1zv881allalyqs8sy3q3zgwldngk4cqslnn2d46l0g91yz8wprmzcsvas9573vp8al9ldns5r"; }; }; "safe-buffer-5.1.2" = { @@ -1126,7 +1126,7 @@ let version = "5.1.2"; src = fetchurl { url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; - sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; + sha512 = "3xbm0dkya4bc3zwfwpdzbl8ngq0aai5ihlp2v3s39y7162c7wyvv9izj3g8hv6dy6vm2lq48lmfzygk0kxwbjb6xic7k4a329j99p8r"; }; }; "safer-buffer-2.1.2" = { @@ -1135,7 +1135,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; + sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1"; }; }; "sax-1.2.4" = { @@ -1144,7 +1144,7 @@ let version = "1.2.4"; src = fetchurl { url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"; - sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; + sha512 = "1dn291mjsda42w8kldlbmngk6dhjxfbvvd5lckyqmwbjaj6069iq3wx0nvcfglwnpddz2qa93lzf4hv77iz43bd2qixa079sjzl799n"; }; }; "semver-5.7.1" = { @@ -1153,7 +1153,7 @@ let version = "5.7.1"; src = fetchurl { url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; - sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; + sha512 = "0cl68vp0ymkjpvim4s24v3awyk37d1bfbqrqv4ybwfi8yxga3d8fma2d6bh8dd4i2dsfwca324vaxm5dms61kdlmihdarfgzw6rmaxi"; }; }; "semver-diff-2.1.0" = { @@ -1198,7 +1198,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz"; - sha512 = "lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q=="; + sha512 = "3qslnh3c2x2g8lar94rladm2rz692d5ds1bp1cpl223jf67jnazl9ipy4n17n7vqvgwimij36gz740nfqr5pyxq8x6n02rd4xj89gcn"; }; }; "spdx-exceptions-2.2.0" = { @@ -1207,7 +1207,7 @@ let version = "2.2.0"; src = fetchurl { url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz"; - sha512 = "2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="; + sha512 = "12c442riig2hk7014ahh40chwirmmsl9dr4cnm2dr2bdbv1lnal8xxwsfx403pqkx7ib06gm2hyyd98kn30kxanjm92yai5y44h0x6r"; }; }; "spdx-expression-parse-3.0.0" = { @@ -1216,7 +1216,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz"; - sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg=="; + sha512 = "351djgqvsgqmfg6h764c2k09dmixczw5073jirm8km6i1yym4xjrzc7g5ckwkidi3gls7s910m4ahl8sh37dsb478j8j3sigbfq63k2"; }; }; "spdx-license-ids-3.0.5" = { @@ -1225,7 +1225,7 @@ let version = "3.0.5"; src = fetchurl { url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz"; - sha512 = "J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q=="; + sha512 = "3sk6sk6r05ikn5qslbh04h54mv4a34wn4d76s800h94padnjydfvvq73ij6jh81yrigspyr50ay878jjwpj2mcq38br371jkb6mdq97"; }; }; "speakingurl-14.0.1" = { @@ -1234,7 +1234,7 @@ let version = "14.0.1"; src = fetchurl { url = "https://registry.npmjs.org/speakingurl/-/speakingurl-14.0.1.tgz"; - sha512 = "1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ=="; + sha512 = "2nmh1645i59b0ij75rjrps837iipz5m67bwbv5hfn34wjcvzwsrysvdwd1ykdbd1njwazh8prbqsm0dm4lh8sb1r3l0bnmgpfzriwyl"; }; }; "sprintf-js-1.0.3" = { @@ -1261,7 +1261,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; - sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; + sha512 = "315yd4vzwrwk3vwj1klf46y1cj2jbvf88066y2rnwhksb98phj46jkxixbwsp3h607w7czy7cby522s7sx8mvspdpdm3s72y2ga3x4z"; }; }; "strip-ansi-3.0.1" = { @@ -1315,7 +1315,7 @@ let version = "4.4.13"; src = fetchurl { url = "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz"; - sha512 = "w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA=="; + sha512 = "10gwhmgx7fh619zv48r2lnm42qr7rw4qa9ph7142rizcn8in9dpi49jbmmv8ism60rcg1a7b4103r598jngi1rcn50sw7b8n1570rf3"; }; }; "timed-out-3.1.3" = { @@ -1387,7 +1387,7 @@ let version = "3.0.4"; src = fetchurl { url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; - sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; + sha512 = "09vn7gn5jp2c07pxplc11lvk7ybfaz0rp3qzflyiyhnahkfgh76bij31ll5rg01ranlmljrky2q25d1f6bbd0h23pzxxi5z93csd4hf"; }; }; "wide-align-1.1.3" = { @@ -1396,7 +1396,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz"; - sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; + sha512 = "2224a32flpf40nhq6rj4idzkcdz0vx65bfxp90hd06db18l6fiqgxz1xnaygm3pbfb1a6v73hl8ryq4996b09zwwins0bqprx0hwsa0"; }; }; "widest-line-1.0.0" = { @@ -1441,7 +1441,7 @@ let version = "3.1.1"; src = fetchurl { url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"; - sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; + sha512 = "3ig31a6zfbdlrs3l77a8avpp17hajryhyq2xk4h3ayc4dmxch146rdk7q1s1jgx9qvmxq125r0xq2bvnq0rq63m75k9y7wglm0hd1bb"; }; }; }; diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix index 052339d11ea0..bb6ff246daac 100644 --- a/pkgs/misc/base16-builder/node-packages.nix +++ b/pkgs/misc/base16-builder/node-packages.nix @@ -10,7 +10,7 @@ let inherit (pkgs) fetchurl fetchgit; }); nodeEnv = import ../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; + inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; inherit nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/misc/base16-builder/supplement.nix b/pkgs/misc/base16-builder/supplement.nix index 05fd5e70207f..8183eb1a1e80 100644 --- a/pkgs/misc/base16-builder/supplement.nix +++ b/pkgs/misc/base16-builder/supplement.nix @@ -10,7 +10,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; - sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; + sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy"; }; }; "ansi-regex-2.1.1" = { @@ -28,7 +28,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; - sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; + sha512 = "13mgnbmdhdq0qncijvpip1l39q1a8labcvj3hc3n1yl2zch106mdkn7p7bd5knvmfkkn1js9nd47nzyjk1himbm8ry8i8gd6mk7mlk3"; }; }; "are-we-there-yet-1.1.5" = { @@ -37,7 +37,7 @@ let version = "1.1.5"; src = fetchurl { url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; - sha512 = "5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w=="; + sha512 = "3mizm1yfxynlhaavbimv7n9qljrbhni22v4fch6zr89x6ps0gpjcxm5yfvv05n8vc3r17hmglyswgq9w0s598xv70nnyw358q11s5p6"; }; }; "balanced-match-1.0.0" = { @@ -55,7 +55,7 @@ let version = "1.1.11"; src = fetchurl { url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; + sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8"; }; }; "chownr-1.1.4" = { @@ -64,7 +64,7 @@ let version = "1.1.4"; src = fetchurl { url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"; - sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; + sha512 = "1b03acmav1awkygrda5h64pn8msd6wda119q553hik728i1j72bfqyq7yzn1x7nmw28hvg9mcyh7krsj8vwsq3karnn55mj6smip7cc"; }; }; "code-point-at-1.1.0" = { @@ -109,7 +109,7 @@ let version = "3.2.6"; src = fetchurl { url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz"; - sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ=="; + sha512 = "1cyv14044rfh792n1hhsa44kk8dk95zk14w96i49gwq6g9wi6h9vn90xaragfy7rvggqvj178l5f16c78g47xgrwhjx3bp7zs6pxscr"; }; }; "deep-extend-0.6.0" = { @@ -118,7 +118,7 @@ let version = "0.6.0"; src = fetchurl { url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz"; - sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; + sha512 = "0wc0sqg1aqx864bxf8xa4j8ncrc8rcvmiaj1sp3x1np2i8hdjybzjfd0w9gbf1yasmwycwzzg1mz6smr3q42hhv4pjx2qcgwqhg3q9c"; }; }; "delegates-1.0.0" = { @@ -145,7 +145,7 @@ let version = "1.2.7"; src = fetchurl { url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz"; - sha512 = "GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA=="; + sha512 = "1644yfnzfqikaff5s68dm4qfrblxrz68ynigkyzyixjqazxlli0svj1nxkawz35sv2vb3vjh41f1rhg0j4nr770a53fzqbjc4j94r0r"; }; }; "fs.realpath-1.0.0" = { @@ -172,7 +172,7 @@ let version = "7.1.6"; src = fetchurl { url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; - sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; + sha512 = "020qv13jbi1v4y5xavf6fw08h9svy4q9p67m4avkrrhgdjmk0c5k3h19bv7k6yn1vfxljpjw9kg81fbdg9v83cjplxvkn3v4v1v21ig"; }; }; "has-unicode-2.0.1" = { @@ -190,7 +190,7 @@ let version = "0.4.24"; src = fetchurl { url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"; - sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; + sha512 = "2n3ygx6km56rdcd5kq52bs2113xqm3vlw2kb9r7pnmxd2qhxrfahp2ngc4w7x8x76fyfpapnixnbjq1i24nc11mj6q7rghwj2fifwxz"; }; }; "ignore-walk-3.0.3" = { @@ -199,7 +199,7 @@ let version = "3.0.3"; src = fetchurl { url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz"; - sha512 = "m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw=="; + sha512 = "0mlk9s23jc3avly1bv6s5j7hs0aafxabmgn7iqi0bjag4b03nqckvcdrgnarpmysdq8yr1rgxh6k7p82vzjj1z6hnm5ckwswg33mflv"; }; }; "inflight-1.0.6" = { @@ -217,7 +217,7 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; - sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; + sha512 = "30rw2i1k63pbf0n5dbwly05h95cdp1kj8c9r15gv1cwha141g61k56fx4qwsvhpm1ksnf7agch1wxirs3s0m31wbfvmcqizgrlwdywk"; }; }; "ini-1.3.5" = { @@ -226,7 +226,7 @@ let version = "1.3.5"; src = fetchurl { url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz"; - sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="; + sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5"; }; }; "is-fullwidth-code-point-1.0.0" = { @@ -253,7 +253,7 @@ let version = "3.0.4"; src = fetchurl { url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; + sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8"; }; }; "minimist-0.0.8" = { @@ -271,7 +271,7 @@ let version = "1.2.5"; src = fetchurl { url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"; - sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; + sha512 = "0pif0kjsr0cdm73cyicn9xdx9zkly45w4akmyfa39lkaf6lzysfr8kr145p54wjk26pbsk0w0qfdds3k4bxy4wl5l210i1b8qsngkql"; }; }; "minipass-2.9.0" = { @@ -280,7 +280,7 @@ let version = "2.9.0"; src = fetchurl { url = "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz"; - sha512 = "wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg=="; + sha512 = "1x0k2ycn1r5fig2zy7jj5vjsc7sxdl2a8lidvzsfyhcbrmvyvlbkmb3ga6l8njclvhjz2yrcx57jn26bckzrms017zb2yan1y7d85y3"; }; }; "minizlib-1.3.3" = { @@ -289,7 +289,7 @@ let version = "1.3.3"; src = fetchurl { url = "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz"; - sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q=="; + sha512 = "3slcgy5kqasjl8k1n2indaaw0k6j2ipapzxrcqyy2zrwpv8z9w2im5i8c2c73pqdgkd31rwf5bajgv4pm2i6m9jg51cfmp694w0r5p9"; }; }; "mkdirp-0.5.1" = { @@ -307,7 +307,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; - sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; + sha512 = "3dqfiiw6nxvvi24fndbzlccnjcas99bsd1kz5m2r78lzgpp6vx57jzbmxq3k1m7bsw88rwra0n4848l720fxxn5x20djck3wp3hysdh"; }; }; "needle-2.4.0" = { @@ -316,7 +316,7 @@ let version = "2.4.0"; src = fetchurl { url = "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz"; - sha512 = "4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg=="; + sha512 = "1k9220dhvc3m78hzd1xh2135p19z15y964hmhsajayvj11j2p3rv5w0gii7lmgr8w57bqkjg0xby5f1gkcph60kxvyr52z6pp7g0yg0"; }; }; "nopt-4.0.3" = { @@ -325,7 +325,7 @@ let version = "4.0.3"; src = fetchurl { url = "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz"; - sha512 = "CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg=="; + sha512 = "0mb9va0ag1n8v5c2lhza37prcw4iyrmbw5n6yglk1kcg95xwqi9ng5dqwr17h63sl5dba2rnwwrzz7dnfvkx5z75h4j7d9kag0qdxha"; }; }; "npm-bundled-1.1.1" = { @@ -334,7 +334,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz"; - sha512 = "gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA=="; + sha512 = "1yb9l8jnxwicz0fsdv434y395b0x11mlc1mgbbhnx21pvs58a4p43f0swvi6q0rakdgzdiyf0yylnmb3i41hb052903m1cgcy01zac2"; }; }; "npm-normalize-package-bin-1.0.1" = { @@ -343,7 +343,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz"; - sha512 = "EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA=="; + sha512 = "149ypqf1mxqw0gcjr4xf4h65q6vx41z1abm27cwbsj7fn07wsx588f9gsykjzfybwrn4mmr6lyaj825w3yyhbgaagmrybw9brzdmxqh"; }; }; "npm-packlist-1.4.8" = { @@ -352,7 +352,7 @@ let version = "1.4.8"; src = fetchurl { url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz"; - sha512 = "5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A=="; + sha512 = "3s585jx92awjb52bs1jwq8r4swv8mgfl685if5wwpbsigwb362adizzpi58a5kgqfpf605mf6a0v7074mc9qpcn2ypqgr7f1a1ikq77"; }; }; "npmlog-4.1.2" = { @@ -361,7 +361,7 @@ let version = "4.1.2"; src = fetchurl { url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; - sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; + sha512 = "2967mavp7zw0aawf5fadqf4pmn7vy5gya1yx2s9wwppvivhd9q4mpdnszfqvd7p6yks649bwbpj8iviw86g0hpp4f93d5ca7dmjmrfs"; }; }; "number-is-nan-1.0.1" = { @@ -415,7 +415,7 @@ let version = "0.1.5"; src = fetchurl { url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz"; - sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; + sha512 = "3ddw0y41pxv08ls5xhmq1bi81hppjbr45k78cjfx99vznh5znrj5g1b1wab9caj1mqlsvmfms0zm9cfb47ygm0d8wv5fccx8049q9fh"; }; }; "path-is-absolute-1.0.1" = { @@ -433,7 +433,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; - sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; + sha512 = "1mgan8li4i2l4y7lsr7snks85n6xg5x693cqmzpid3fkk9br7v5xzgvh1zlfs08zkxn6s0n6qhykr64mszjfyxd77dhmdi1jhx992yy"; }; }; "rc-1.2.8" = { @@ -442,7 +442,7 @@ let version = "1.2.8"; src = fetchurl { url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz"; - sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; + sha512 = "0xhy1n9n3y6cp28f8f0f2mi0xzc7ay1g5nhbp64fyvcwv9q30zq2zvyc5q2d0al8aa0hx101yq2y6d2ln4r5jxnqifh1pd3la1ccxnb"; }; }; "readable-stream-2.3.7" = { @@ -451,7 +451,7 @@ let version = "2.3.7"; src = fetchurl { url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"; - sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; + sha512 = "0zrh6gjjzwwycwydra51xcrgjgzyqv6dq38bfpwzmlqn702mwb4nj4sjjn499rycqndfk6rby0dksnq72x8pcbvqv0b2893mvq6if0i"; }; }; "rimraf-2.7.1" = { @@ -460,7 +460,7 @@ let version = "2.7.1"; src = fetchurl { url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz"; - sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; + sha512 = "3ixwnv4h7x38jd12vyzhx6m6adnfhz1zv881allalyqs8sy3q3zgwldngk4cqslnn2d46l0g91yz8wprmzcsvas9573vp8al9ldns5r"; }; }; "safe-buffer-5.1.2" = { @@ -469,7 +469,7 @@ let version = "5.1.2"; src = fetchurl { url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; - sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; + sha512 = "3xbm0dkya4bc3zwfwpdzbl8ngq0aai5ihlp2v3s39y7162c7wyvv9izj3g8hv6dy6vm2lq48lmfzygk0kxwbjb6xic7k4a329j99p8r"; }; }; "safer-buffer-2.1.2" = { @@ -478,7 +478,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; + sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1"; }; }; "sax-1.2.4" = { @@ -487,7 +487,7 @@ let version = "1.2.4"; src = fetchurl { url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"; - sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; + sha512 = "1dn291mjsda42w8kldlbmngk6dhjxfbvvd5lckyqmwbjaj6069iq3wx0nvcfglwnpddz2qa93lzf4hv77iz43bd2qixa079sjzl799n"; }; }; "semver-5.7.1" = { @@ -496,7 +496,7 @@ let version = "5.7.1"; src = fetchurl { url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; - sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; + sha512 = "0cl68vp0ymkjpvim4s24v3awyk37d1bfbqrqv4ybwfi8yxga3d8fma2d6bh8dd4i2dsfwca324vaxm5dms61kdlmihdarfgzw6rmaxi"; }; }; "set-blocking-2.0.0" = { @@ -532,7 +532,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; - sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; + sha512 = "315yd4vzwrwk3vwj1klf46y1cj2jbvf88066y2rnwhksb98phj46jkxixbwsp3h607w7czy7cby522s7sx8mvspdpdm3s72y2ga3x4z"; }; }; "strip-ansi-3.0.1" = { @@ -559,7 +559,7 @@ let version = "4.4.13"; src = fetchurl { url = "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz"; - sha512 = "w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA=="; + sha512 = "10gwhmgx7fh619zv48r2lnm42qr7rw4qa9ph7142rizcn8in9dpi49jbmmv8ism60rcg1a7b4103r598jngi1rcn50sw7b8n1570rf3"; }; }; "util-deprecate-1.0.2" = { @@ -577,7 +577,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz"; - sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; + sha512 = "2224a32flpf40nhq6rj4idzkcdz0vx65bfxp90hd06db18l6fiqgxz1xnaygm3pbfb1a6v73hl8ryq4996b09zwwins0bqprx0hwsa0"; }; }; "wrappy-1.0.2" = { @@ -595,7 +595,7 @@ let version = "3.1.1"; src = fetchurl { url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"; - sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; + sha512 = "3ig31a6zfbdlrs3l77a8avpp17hajryhyq2xk4h3ayc4dmxch146rdk7q1s1jgx9qvmxq125r0xq2bvnq0rq63m75k9y7wglm0hd1bb"; }; }; }; @@ -607,7 +607,7 @@ in version = "0.14.0"; src = fetchurl { url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz"; - sha512 = "+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA=="; + sha512 = "32drv6q9sh4i2ff2djd1dhxxxiaiymmgycbm12wpkz9vxspnldxgmppf9sazp3c72771a1p5s4kkzgwn4w1csyz9bn4zdbdnq5w6azq"; }; dependencies = [ sources."abbrev-1.1.1" diff --git a/pkgs/misc/calaos/installer/default.nix b/pkgs/misc/calaos/installer/default.nix index 6254c9c24f4b..ee7c089bc8ee 100644 --- a/pkgs/misc/calaos/installer/default.nix +++ b/pkgs/misc/calaos/installer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, stdenv, fetchFromGitHub, qmake, qttools, qtbase }: mkDerivation rec { - name = "calaos_installer-3.1"; - version = "3.1"; + pname = "calaos_installer"; + version = "3.5"; src = fetchFromGitHub { owner = "calaos"; repo = "calaos_installer"; rev = "v${version}"; - sha256 = "0g8igj5sax5vjqzrpbil7i6329708lqqwvg5mwiqd0zzzha9sawd"; + sha256 = "hx7XVF2iueKFR67U0EvSK1vYZnJBnuOpUOkSjx7h1XY="; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/misc/cbeams/default.nix b/pkgs/misc/cbeams/default.nix index ec045ebf3efd..928b03df09f7 100644 --- a/pkgs/misc/cbeams/default.nix +++ b/pkgs/misc/cbeams/default.nix @@ -16,6 +16,6 @@ buildPythonApplication rec { homepage = "https://github.com/tartley/cbeams"; description = "Command-line program to draw animated colored circles in the terminal"; license = licenses.bsd3; - maintainers = with maintainers; [ geistesk ]; + maintainers = with maintainers; [ oxzi ]; }; } diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/misc/cups/drivers/cnijfilter2/default.nix index b04ef89d215c..ce11f4a0551b 100644 --- a/pkgs/misc/cups/drivers/cnijfilter2/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter2/default.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - description = "Canon InkJet printer drivers for the MG7500, MG6700, MG6600, MG5600, MG2900, MB2000, MB2300, iB4000, MB5000, MB5300, iP110, E450, MX490, E480, MG7700, MG6900, MG6800, MG5700, MG3600, and G3000 series."; + description = "Canon InkJet printer drivers for the MG7500, MG6700, MG6600, MG5600, MG2900, MB2000, MB2300, iB4000, MB5000, MB5300, iP110, E450, MX490, E480, MG7700, MG6900, MG6800, MG5700, MG3600, and G3000 series"; homepage = "http://support-th.canon-asia.com/contents/TH/EN/0100712901.html"; license = licenses.unfree; platforms = platforms.linux; diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix index 9b328c20b713..f6504b598cb0 100644 --- a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix @@ -141,7 +141,7 @@ in stdenv.mkDerivation { dontPatchELF = true; meta = with lib; { - description = "Canon InkJet printer drivers for the MG2400 MG2500 MG3500 MG5500 MG6400 MG6500 MG7100 and P200 series."; + description = "Canon InkJet printer drivers for the MG2400 MG2500 MG3500 MG5500 MG6400 MG6500 MG7100 and P200 series"; homepage = "https://www.canon-europe.com/support/consumer_products/products/fax__multifunctionals/inkjet/pixma_mg_series/pixma_mg5550.aspx?type=drivers&driverdetailid=tcm:13-1094072"; license = licenses.unfree; platforms = platforms.linux; diff --git a/pkgs/misc/cups/drivers/cups-bjnp/default.nix b/pkgs/misc/cups/drivers/cups-bjnp/default.nix index e9fac1c73e2f..9dbfdd8b8030 100644 --- a/pkgs/misc/cups/drivers/cups-bjnp/default.nix +++ b/pkgs/misc/cups/drivers/cups-bjnp/default.nix @@ -11,7 +11,11 @@ stdenv.mkDerivation rec { preConfigure = ''configureFlags="--with-cupsbackenddir=$out/lib/cups/backend"''; buildInputs = [cups]; - NIX_CFLAGS_COMPILE = [ "-include stdio.h" "-Wno-error=stringop-truncation" ]; + NIX_CFLAGS_COMPILE = [ + "-include stdio.h" + "-Wno-error=stringop-truncation" + "-Wno-error=deprecated-declarations" + ]; meta = { description = "CUPS back-end for Canon printers"; diff --git a/pkgs/misc/cups/drivers/hl1210w/default.nix b/pkgs/misc/cups/drivers/hl1210w/default.nix new file mode 100644 index 000000000000..88947ed33394 --- /dev/null +++ b/pkgs/misc/cups/drivers/hl1210w/default.nix @@ -0,0 +1,62 @@ +{stdenv, pkgsi686Linux, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk}: + +let + version = "3.0.1-1"; + cupsdeb = fetchurl { + url = "https://download.brother.com/welcome/dlf101546/hl1210wcupswrapper-${version}.i386.deb"; + sha256 = "0395mnw6c7qpjgjch9in5q9p2fjdqvz9bwfwp6q1hzhs08ryk7w0"; + }; + lprdeb = fetchurl { + url = "https://download.brother.com/welcome/dlf101547/hl1210wlpr-${version}.i386.deb"; + sha256 = "1sl3g2cd4a2gygryrr27ax3qaa65cbirz3kzskd8afkwqpmjyv7j"; + }; +in +stdenv.mkDerivation { + name = "cups-brother-hl1210W"; + + srcs = [ lprdeb cupsdeb ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ cups ghostscript dpkg a2ps ]; + dontUnpack = true; + + installPhase = '' + # install lpr + dpkg-deb -x ${lprdeb} $out + + substituteInPlace $out/opt/brother/Printers/HL1210W/lpd/filter_HL1210W \ + --replace /opt "$out/opt" + + sed -i '/GHOST_SCRIPT=/c\GHOST_SCRIPT=gs' $out/opt/brother/Printers/HL1210W/lpd/psconvert2 + + patchelf --set-interpreter ${pkgsi686Linux.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1210W/lpd/brprintconflsr3 + patchelf --set-interpreter ${pkgsi686Linux.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1210W/lpd/rawtobr3 + patchelf --set-interpreter ${pkgsi686Linux.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1210W/inf/braddprinter + + wrapProgram $out/opt/brother/Printers/HL1210W/lpd/psconvert2 \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] } + wrapProgram $out/opt/brother/Printers/HL1210W/lpd/filter_HL1210W \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ ghostscript a2ps file gnused coreutils ] } + + # install cups + dpkg-deb -x ${cupsdeb} $out + + substituteInPlace $out/opt/brother/Printers/HL1210W/cupswrapper/brother_lpdwrapper_HL1210W --replace /opt "$out/opt" + + mkdir -p $out/lib/cups/filter + ln -s $out/opt/brother/Printers/HL1210W/cupswrapper/brother_lpdwrapper_HL1210W $out/lib/cups/filter/brother_lpdwrapper_HL1210W + ln -s $out/opt/brother/Printers/HL1210W/cupswrapper/brother-HL1210W-cups-en.ppd $out/lib/cups/filter/brother-HL1210W-cups-en.ppd + # cp brcupsconfig4 $out/opt/brother/Printers/HL1110/cupswrapper/ + ln -s $out/opt/brother/Printers/HL1210W/cupswrapper/brcupsconfig4 $out/lib/cups/filter/brcupsconfig4 + + wrapProgram $out/opt/brother/Printers/HL1210W/cupswrapper/brother_lpdwrapper_HL1210W \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] } + ''; + + meta = { + homepage = "http://www.brother.com/"; + description = "Brother HL1210W printer driver"; + license = stdenv.lib.licenses.unfree; + platforms = stdenv.lib.platforms.linux; + downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=nz&lang=en&prod=hl1210w_eu_as&os=128"; + }; +} diff --git a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix index 46ce7abb28e6..8f07d4b41970 100644 --- a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgsi686Linux, dpkg, makeWrapper, coreutils, gnused, gawk, file, cups, utillinux, xxd, runtimeShell +{ stdenv, fetchurl, pkgsi686Linux, dpkg, makeWrapper, coreutils, gnused, gawk, file, cups, util-linux, xxd, runtimeShell , ghostscript, a2ps }: # Why: @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { patchelf --set-interpreter ${pkgsi686Linux.stdenv.cc.libc.out}/lib/ld-linux.so.2 $out/usr/bin/brprintconf_mfcj6510dw #stripping the hardcoded path. - ${utillinux}/bin/hexdump -ve '1/1 "%.2X"' $out/usr/bin/brprintconf_mfcj6510dw | \ + ${util-linux}/bin/hexdump -ve '1/1 "%.2X"' $out/usr/bin/brprintconf_mfcj6510dw | \ sed 's.2F6F70742F62726F746865722F5072696E746572732F25732F696E662F6272257366756E63.62726d66636a36353130647766756e63000000000000000000000000000000000000000000.' | \ sed 's.2F6F70742F62726F746865722F5072696E746572732F25732F696E662F627225737263.62726D66636A3635313064777263000000000000000000000000000000000000000000.' | \ ${xxd}/bin/xxd -r -p > $out/usr/bin/brprintconf_mfcj6510dw_patched diff --git a/pkgs/misc/documentation-highlighter/default.nix b/pkgs/misc/documentation-highlighter/default.nix index 72f1da6b0de5..16b47d01f24f 100644 --- a/pkgs/misc/documentation-highlighter/default.nix +++ b/pkgs/misc/documentation-highlighter/default.nix @@ -1,7 +1,7 @@ { stdenv, runCommand }: runCommand "documentation-highlighter" { meta = { - description = "Highlight.js sources for the Nix Ecosystem's documentation."; + description = "Highlight.js sources for the Nix Ecosystem's documentation"; homepage = "https://highlightjs.org"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index 9724e68a04df..eb88476432bf 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -1,20 +1,27 @@ -{stdenv, fetchurl, fetchpatch, makeWrapper, symlinkJoin, -pkgconfig, libtool, -gtk2, -libxml2, -libxslt, -libusb-compat-0_1, -sane-backends, -rpm, cpio, -getopt, -patchelf, autoPatchelfHook, gcc +{ stdenv +, fetchurl +, fetchpatch +, makeWrapper +, symlinkJoin +, pkgconfig +, libtool +, gtk2 +, libxml2 +, libxslt +, libusb-compat-0_1 +, sane-backends +, rpm +, cpio +, getopt +, patchelf +, autoPatchelfHook +, gcc }: - let common_meta = { - homepage = "http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"; - license = with stdenv.lib.licenses; epson; - platforms = with stdenv.lib.platforms; linux; - }; + homepage = "http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"; + license = with stdenv.lib.licenses; epson; + platforms = with stdenv.lib.platforms; linux; +}; in ############################ # @@ -23,7 +30,6 @@ in ############################ # adding a plugin for another printer shouldn't be too difficult, but you need the firmware to test... - let plugins = { v330 = stdenv.mkDerivation rec { name = "iscan-v330-bundle"; @@ -33,13 +39,13 @@ let plugins = { # To find new versions, visit # http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for # some printer like for instance "WF-7210" to get to the most recent - # version. + # version. # NOTE: Don't forget to update the webarchive link too! urls = [ "https://download2.ebz.epson.net/iscan/plugin/perfection-v330/rpm/x64/iscan-perfection-v330-bundle-${version}.x64.rpm.tar.gz" "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/perfection-v330/rpm/x64/iscan-perfection-v330-bundle-${version}.x64.rpm.tar.gz" ]; - sha256 = "16iq5gmfcgkvcx5hixggxgb8lwin5gjdhnq0zabgpfqg11n2w21q"; + sha256 = "056c04pfsf98nnknphg28l489isqb6y4l2c8g7wqhclwgj7m338i"; }; nativeBuildInputs = [ autoPatchelfHook rpm ]; @@ -49,17 +55,17 @@ let plugins = { mkdir $out{,/share,/lib} cp -r ./usr/share/{iscan-data,esci}/ $out/share/ cp -r ./usr/lib64/esci $out/lib - ''; + ''; passthru = { registrationCommand = '' $registry --add interpreter usb 0x04b8 0x0142 "$plugin/lib/esci/libesci-interpreter-perfection-v330 $plugin/share/esci/esfwad.bin" - ''; + ''; hw = "Perfection V330 Photo"; - }; - meta = common_meta // { description = "Plugin to support "+passthru.hw+" scanner in sane."; }; + }; + meta = common_meta // { description = "Plugin to support " + passthru.hw + " scanner in sane"; }; }; - x770 = stdenv.mkDerivation rec { + x770 = stdenv.mkDerivation rec { pname = "iscan-gt-x770-bundle"; version = "2.30.4"; @@ -69,7 +75,7 @@ let plugins = { "https://download2.ebz.epson.net/iscan/plugin/gt-x770/rpm/x64/iscan-gt-x770-bundle-${version}.x64.rpm.tar.gz" "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-x770/rpm/x64/iscan-gt-x770-bundle-${version}.x64.rpm.tar.gz" ]; - sha256 = "1cz4z3wz216s77z185m665jcgdslil5gn4dsi118nv1fm17z3jik"; + sha256 = "1chxdm6smv2d14pn2jl9xyd0vr42diy7vpskd3b9a61gf5h3gj03"; }; installPhase = '' cd plugins @@ -79,27 +85,27 @@ let plugins = { cp -r usr/lib64 $out/lib mv $out/share/iscan $out/share/esci mv $out/lib/iscan $out/lib/esci - ''; + ''; passthru = { registrationCommand = '' $registry --add interpreter usb 0x04b8 0x0130 "$plugin/lib/esci/libesint7C $plugin/share/esci/esfw7C.bin" - ''; + ''; hw = "Perfection V500 Photo"; - }; - meta = common_meta // { description = "iscan esci x770 plugin for "+passthru.hw; }; }; + meta = common_meta // { description = "iscan esci x770 plugin for " + passthru.hw; }; + }; f720 = stdenv.mkDerivation rec { pname = "iscan-gt-f720-bundle"; version = "2.30.4"; - nativeBuildInputs= [ autoPatchelfHook ]; + nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = [ gcc.cc.lib ]; src = fetchurl { urls = [ "https://download2.ebz.epson.net/iscan/plugin/gt-f720/rpm/x64/iscan-gt-f720-bundle-${version}.x64.rpm.tar.gz" "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-f720/rpm/x64/iscan-gt-f720-bundle-${version}.x64.rpm.tar.gz" ]; - sha256 = "12rivh00n9mhagy5yjl1m0bv7ypbig6brqkxm0a12xy0mjq7yv8y"; + sha256 = "1xnbmb2rn610kqpg1x6k1cc13zlmx2f3l2xnj6809rnhg96qqn20"; }; installPhase = '' cd plugins @@ -107,16 +113,16 @@ let plugins = { mkdir $out cp -r usr/share $out cp -r usr/lib64 $out/lib - ''; + ''; passthru = { registrationCommand = '' $registry --add interpreter usb 0x04b8 0x0131 "$plugin/lib/esci/libesci-interpreter-gt-f720 $plugin/share/esci/esfw8b.bin" - ''; + ''; hw = "GT-F720, GT-S620, Perfection V30, Perfection V300 Photo"; - }; + }; - meta = common_meta // { description = "iscan esci f720 plugin for "+passthru.hw; }; + meta = common_meta // { description = "iscan esci f720 plugin for " + passthru.hw; }; }; s80 = stdenv.mkDerivation rec { pname = "iscan-gt-s80-bundle"; @@ -129,7 +135,7 @@ let plugins = { "https://download2.ebz.epson.net/iscan/plugin/gt-s80/rpm/x64/iscan-gt-s80-bundle-${version}.x64.rpm.tar.gz" "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-s80/rpm/x64/iscan-gt-s80-bundle-${version}.x64.rpm.tar.gz" ]; - sha256 = "1ran75zsxcdci00jakngkz6p9lj4q483hjapmf80p68rzhpmdr5y"; + sha256 = "00qfdgs03k7bbs67zjrk8hbxvlyinsmk890amp9cmpfjfzdxgg58"; }; installPhase = '' cd plugins @@ -139,7 +145,7 @@ let plugins = { cp -r usr/share $out cp -r usr/lib64 $out/lib mkdir $out/share/esci - ''; + ''; passthru = { registrationCommand = '' @@ -147,11 +153,11 @@ let plugins = { $registry --add interpreter usb 0x04b8 0x0137 "$plugin/lib/esci/libesci-interpreter-gt-s50.so" $registry --add interpreter usb 0x04b8 0x0143 "$plugin/lib/esci/libesci-interpreter-gt-s50.so" $registry --add interpreter usb 0x04b8 0x0144 "$plugin/lib/esci/libesci-interpreter-gt-s80.so" - ''; + ''; hw = "ES-D200, ED-D350, ES-D400, GT-S50, GT-S55, GT-S80, GT-S85"; - }; + }; - meta = common_meta // { description = "iscan esci s80 plugin for "+passthru.hw; }; + meta = common_meta // { description = "iscan esci s80 plugin for " + passthru.hw; }; }; s650 = stdenv.mkDerivation rec { name = "iscan-gt-s650-bundle"; @@ -162,7 +168,7 @@ let plugins = { "https://download2.ebz.epson.net/iscan/plugin/gt-s650/rpm/x64/iscan-gt-s650-bundle-${version}.x64.rpm.tar.gz" "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-s650/rpm/x64/iscan-gt-s650-bundle-${version}.x64.rpm.tar.gz" ]; - sha256 = "1ffddf488c5fc1eb39452499951bd13a2dc1971980c0551176076c81af363038"; + sha256 = "0fn4lz4g0a8l301v6yv7fwl37wgwhz5y90nf681f655xxc91hqh7"; }; nativeBuildInputs = [ autoPatchelfHook rpm ]; @@ -175,16 +181,16 @@ let plugins = { cp -r usr/lib64 $out/lib mv $out/share/iscan $out/share/esci mv $out/lib/iscan $out/lib/esci - ''; + ''; passthru = { registrationCommand = '' $registry --add interpreter usb 0x04b8 0x013c "$plugin/lib/esci/libiscan-plugin-gt-s650 $plugin/share/esci/esfw010c.bin" $registry --add interpreter usb 0x04b8 0x013d "$plugin/lib/esci/libiscan-plugin-gt-s650 $plugin/share/esci/esfw010c.bin" - ''; + ''; hw = "GT-S650, Perfection V19, Perfection V39"; }; - meta = common_meta // { description = "iscan GT-S650 for "+passthru.hw; }; + meta = common_meta // { description = "iscan GT-S650 for " + passthru.hw; }; }; network = stdenv.mkDerivation rec { pname = "iscan-nt-bundle"; @@ -199,7 +205,7 @@ let plugins = { "https://download2.ebz.epson.net/iscan/general/rpm/x64/iscan-bundle-${version}.x64.rpm.tar.gz" "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/general/rpm/x64/iscan-bundle-${version}.x64.rpm.tar.gz" ]; - sha256 = "1l0y4dy88y91jdq66pxrxqmiwsxwy0rd7x4bh0cw08r4iyhjqprz"; + sha256 = "0jssigsgkxb9i7qa7db291a1gbvwl795i4ahvb7bnqp33czkj85k"; }; installPhase = '' cd plugins @@ -209,7 +215,7 @@ let plugins = { cp -r usr/share $out cp -r usr/lib64 $out/lib mkdir $out/share/esci - ''; + ''; passthru = { registrationCommand = ""; hw = "network"; @@ -219,9 +225,6 @@ let plugins = { }; }; in - - - let fwdir = symlinkJoin { name = "esci-firmware-dir"; paths = stdenv.lib.mapAttrsToList (name: value: value + /share/esci) plugins; @@ -278,14 +281,14 @@ stdenv.mkDerivation rec { }) ./firmware_location.patch ./sscanf.patch - ]; + ]; patchFlags = [ "-p0" ]; - configureFlags = [ "--enable-dependency-reduction" "--disable-frontend"]; + configureFlags = [ "--enable-dependency-reduction" "--disable-frontend" ]; postConfigure = '' echo '#define NIX_ESCI_PREFIX "'${fwdir}'"' >> config.h - ''; + ''; postInstall = '' mkdir -p $out/etc/sane.d @@ -294,18 +297,20 @@ stdenv.mkDerivation rec { ln -s ${iscan-data}/share/iscan-data $out/share/iscan-data mkdir -p $out/lib/iscan ln -s ${plugins.network}/lib/iscan/network $out/lib/iscan/network - ''; + ''; postFixup = '' # iscan-registry is a shell script requiring getopt wrapProgram $out/bin/iscan-registry --prefix PATH : ${getopt}/bin registry=$out/bin/iscan-registry; - '' + - stdenv.lib.concatStrings (stdenv.lib.mapAttrsToList (name: value: '' - plugin=${value}; - ${value.passthru.registrationCommand} - '') plugins); + '' + + stdenv.lib.concatStrings (stdenv.lib.mapAttrsToList + (name: value: '' + plugin=${value}; + ${value.passthru.registrationCommand} + '') + plugins); meta = common_meta // { - description = "sane-epkowa backend for some epson scanners."; + description = "sane-epkowa backend for some epson scanners"; longDescription = '' Includes gui-less iscan (aka. Image Scan! for Linux). Supported hardware: at least : diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index 94b840776207..afde25ee6b4e 100644 --- a/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/pkgs/misc/drivers/epson-escpr2/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; - version = "1.1.12"; + version = "1.1.24"; src = fetchurl { # To find new versions, visit @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { # some printer like for instance "WF-7210" to get to the most recent # version. # NOTE: Don't forget to update the webarchive link too! - urls = [ - "https://download3.ebz.epson.net/dsc/f/03/00/11/12/33/f7e44f924a4f479e4c74f8f587e07c57de3abd85/epson-inkjet-printer-escpr2-1.1.12-1lsb3.2.src.rpm" - "https://web.archive.org/web/20200523220202if_/https://download3.ebz.epson.net/dsc/f/03/00/11/12/33/f7e44f924a4f479e4c74f8f587e07c57de3abd85/epson-inkjet-printer-escpr2-1.1.12-1lsb3.2.src.rpm" + urls = [ + "https://download3.ebz.epson.net/dsc/f/03/00/12/09/63/b7d2bb6a97c9ad99a96ebc68f8abcb1254888e94/epson-inkjet-printer-escpr2-1.1.24-1lsb3.2.src.rpm" + "https://web.archive.org/web/20201112163802if_/https://download3.ebz.epson.net/dsc/f/03/00/12/09/63/b7d2bb6a97c9ad99a96ebc68f8abcb1254888e94/epson-inkjet-printer-escpr2-1.1.24-1lsb3.2.src.rpm" ]; - sha256 = "07sq5xlmidqiycv0qwvpk2xf22vbkbk4fclnjlnx7s08d2jl75kv"; + sha256 = "sha256-DPzjKKsTWbfDk1MsVPXNsO5D7C/RiNegmwq2sEMx2co="; }; patches = [ ./cups-filter-ppd-dirs.patch ]; diff --git a/pkgs/misc/drivers/hplip/3.16.11.nix b/pkgs/misc/drivers/hplip/3.16.11.nix index 452c2c425c1d..4b9f47d88f94 100644 --- a/pkgs/misc/drivers/hplip/3.16.11.nix +++ b/pkgs/misc/drivers/hplip/3.16.11.nix @@ -2,7 +2,7 @@ , pkgconfig , cups, libjpeg, libusb1, python2Packages, sane-backends, dbus, usbutils , net-snmp, openssl, nettools -, bash, coreutils, utillinux +, bash, coreutils, util-linux , qtSupport ? true , withPlugin ? false }: @@ -175,7 +175,7 @@ python2Packages.buildPythonApplication { substituteInPlace $out/etc/udev/rules.d/56-hpmud.rules \ --replace {,${bash}}/bin/sh \ --replace /usr/bin/nohup "" \ - --replace {,${utillinux}/bin/}logger \ + --replace {,${util-linux}/bin/}logger \ --replace {/usr,$out}/bin ''; diff --git a/pkgs/misc/drivers/hplip/3.18.5.nix b/pkgs/misc/drivers/hplip/3.18.5.nix index 80cd39b92334..59b3d2b9d634 100644 --- a/pkgs/misc/drivers/hplip/3.18.5.nix +++ b/pkgs/misc/drivers/hplip/3.18.5.nix @@ -3,7 +3,7 @@ , cups, zlib, libjpeg, libusb1, python2Packages, sane-backends , dbus, file, ghostscript, usbutils , net-snmp, openssl, perl, nettools -, bash, coreutils, utillinux +, bash, coreutils, util-linux , withQt5 ? true , withPlugin ? false , withStaticPPDInstall ? false @@ -199,6 +199,11 @@ python2Packages.buildPythonApplication { done ''; + # There are some binaries there, which reference gcc-unwrapped otherwise. + stripDebugList = [ + "share/hplip" + ]; + postFixup = '' substituteInPlace $out/etc/hp/hplip.conf --replace /usr $out # Patch udev rules: @@ -207,7 +212,7 @@ python2Packages.buildPythonApplication { substituteInPlace $out/etc/udev/rules.d/56-hpmud.rules \ --replace {,${bash}}/bin/sh \ --replace /usr/bin/nohup "" \ - --replace {,${utillinux}/bin/}logger \ + --replace {,${util-linux}/bin/}logger \ --replace {/usr,$out}/bin ''; diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index b1853e28589c..b740f5091fa7 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -3,7 +3,9 @@ , cups, zlib, libjpeg, libusb1, python3Packages, sane-backends , dbus, file, ghostscript, usbutils , net-snmp, openssl, perl, nettools -, bash, coreutils, utillinux +, bash, coreutils, util-linux +# To remove references to gcc-unwrapped +, removeReferencesTo, qt5 , withQt5 ? true , withPlugin ? false , withStaticPPDInstall ? false @@ -12,16 +14,16 @@ let name = "hplip-${version}"; - version = "3.20.3"; + version = "3.20.5"; src = fetchurl { url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "0sh6cg7yjc11x1cm4477iaslj9n8ksghs85hqwgfbk7m5b2pw2a1"; + sha256 = "004bbd78487b7803cdcf2a96b00de938797227068c4de43ee7ad7d174c4e475a"; }; plugin = fetchurl { url = "https://developers.hp.com/sites/default/files/${name}-plugin.run"; - sha256 = "13xyv30jqjysfk7gh0gyn7qj0pb0qvk2rlbhm85a3lw7bjycal8g"; + sha256 = "ff3dedda3158be64b985efbf636890ddda5b271ae1f1fbd788219e1344a9c2e7"; }; hplipState = substituteAll { @@ -65,12 +67,15 @@ python3Packages.buildPythonApplication { zlib ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + pkgconfig + removeReferencesTo + ] ++ stdenv.lib.optional withQt5 qt5.wrapQtAppsHook; pythonPath = with python3Packages; [ dbus pillow - pygobject2 + pygobject3 reportlab usbutils sip @@ -214,10 +219,20 @@ python3Packages.buildPythonApplication { substituteInPlace $out/etc/udev/rules.d/56-hpmud.rules \ --replace {,${bash}}/bin/sh \ --replace /usr/bin/nohup "" \ - --replace {,${utillinux}/bin/}logger \ + --replace {,${util-linux}/bin/}logger \ --replace {/usr,$out}/bin + remove-references-to -t ${stdenv.cc.cc} $(readlink -f $out/lib/*.so) + '' + stdenv.lib.optionalString withQt5 '' + for f in $out/bin/hp-*;do + wrapQtApp $f + done ''; + # There are some binaries there, which reference gcc-unwrapped otherwise. + stripDebugList = [ + "share/hplip" "lib/cups/backend" "lib/cups/filter" python3Packages.python.sitePackages "lib/sane" + ]; + meta = with stdenv.lib; { description = "Print, scan and fax HP drivers for Linux"; homepage = "https://developers.hp.com/hp-linux-imaging-and-printing"; diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix index 4de6e54cd5fb..23c5e3f9dc8c 100644 --- a/pkgs/misc/drivers/sc-controller/default.nix +++ b/pkgs/misc/drivers/sc-controller/default.nix @@ -16,6 +16,9 @@ buildPythonApplication rec { sha256 = "1dskjh5qcjf4x21n4nk1zvdfivbgimsrc2lq1id85bibzps29499"; }; + # see https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; + nativeBuildInputs = [ wrapGAppsHook ]; buildInputs = [ gtk3 gobject-introspection libappindicator-gtk3 librsvg ]; @@ -34,9 +37,6 @@ buildPythonApplication rec { preFixup = '' gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH") - # gdk-pixbuf setup hook can not choose between propagated librsvg - # and our librsvg with GObject introspection. - GDK_PIXBUF_MODULE_FILE=$(echo ${librsvg}/lib/gdk-pixbuf-2.0/*/loaders.cache) ''; postFixup = '' @@ -55,6 +55,7 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/kozec/sc-controller"; # donations: https://www.patreon.com/kozec + broken = true; description = "User-mode driver and GUI for Steam Controller and other controllers"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/misc/drivers/utsushi/default.nix b/pkgs/misc/drivers/utsushi/default.nix index 294bb8a0203e..20701c5cc4df 100644 --- a/pkgs/misc/drivers/utsushi/default.nix +++ b/pkgs/misc/drivers/utsushi/default.nix @@ -1,20 +1,32 @@ -{ stdenv, fetchFromGitLab, autoreconfHook, pkg-config, boost, gtkmm2 -, imagemagick, sane-backends, tesseract4, udev, libusb1}: +{ stdenv, writeScriptBin, fetchFromGitLab, autoreconfHook, pkg-config +, autoconf-archive, libxslt, boost , gtkmm2 , imagemagick, sane-backends +, tesseract4, udev, libusb1, gnum4 }: -stdenv.mkDerivation rec { + +let + fakegit = writeScriptBin "git" '' + #! ${stdenv.shell} -e + if [ "$1" = "describe" ]; then + [ -r .rev ] && cat .rev || true + fi + ''; +in stdenv.mkDerivation rec { pname = "utsushi"; - version = "3.59.2"; + version = "unstable-2020-11-10"; - src = fetchFromGitLab{ + src = fetchFromGitLab { owner = pname; - repo = "imagescan"; - rev = version; - sha256 = "06gp97dfnf43l6kb988scmm66q9n5rc7ndwv3rykrdpyhy8rbi05"; + repo = pname; + rev = "04700043e2d16062eb8bd27f4efff3024f387d32"; + sha256 = "0rxv5n0985d414i6hwichsn7hybwgwsimpy5s4hmcsvxqcpks4li"; }; nativeBuildInputs = [ autoreconfHook pkg-config + autoconf-archive + fakegit + libxslt ]; buildInputs = [ @@ -26,19 +38,21 @@ stdenv.mkDerivation rec { libusb1.dev ]; - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=parentheses -Wno-error=unused-variable"; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=deprecated-declarations" + "-Wno-error=parentheses" + "-Wno-error=unused-variable" + ]; + postPatch = '' - # remove vendored dependencies - rm -r upstream/boost - # create fake udev and sane config mkdir -p $out/etc/{sane.d,udev/rules.d} touch $out/etc/sane.d/dll.conf - - # absolute paths to conver & tesseract + # absolute paths to convert & tesseract + sed -i '/\[AC_DEFINE(\[HAVE_IMAGE_MAGICK\], \[1\])/a \ MAGICK_CONVERT="${imagemagick}/bin/convert"' configure.ac substituteInPlace filters/magick.cpp \ - --replace '"convert' '"${imagemagick}/bin/convert' + --replace 'convert ' '${imagemagick}/bin/convert ' substituteInPlace filters/reorient.cpp \ --replace '"tesseract' '"${tesseract4}/bin/tesseract' substituteInPlace filters/get-text-orientation \ @@ -61,7 +75,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doInstallCheck = true; + doInstallCheck = false; meta = with stdenv.lib; { description = "SANE utsushi backend for some Epson scanners"; @@ -132,7 +146,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://gitlab.com/utsushi/imagescan"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ wucke13 ]; + maintainers = with maintainers; [ wucke13 maxwilson ]; platforms = platforms.linux; }; } diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix index eb0511b0c4ec..f7fd59fd9fd1 100644 --- a/pkgs/misc/drivers/xboxdrv/default.nix +++ b/pkgs/misc/drivers/xboxdrv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, scons, libX11, pkgconfig +{ stdenv, fetchurl, sconsPackages, libX11, pkgconfig , libusb1, boost, glib, dbus-glib }: let @@ -13,7 +13,7 @@ in stdenv.mkDerivation { }; makeFlags = [ "PREFIX=$(out)" ]; - nativeBuildInputs = [ pkgconfig scons.py2 ]; + nativeBuildInputs = [ pkgconfig sconsPackages.scons_3_1_2 ]; buildInputs = [ libX11 libusb1 boost glib dbus-glib ]; dontUseSconsInstall = true; diff --git a/pkgs/misc/drivers/xow/default.nix b/pkgs/misc/drivers/xow/default.nix index 8702c480457d..785f7f396e9d 100644 --- a/pkgs/misc/drivers/xow/default.nix +++ b/pkgs/misc/drivers/xow/default.nix @@ -1,14 +1,19 @@ -{ stdenv, fetchFromGitHub, libusb1 }: +{ stdenv, cabextract, fetchurl, fetchFromGitHub, libusb1 }: stdenv.mkDerivation rec { pname = "xow"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "medusalix"; repo = "xow"; rev = "v${version}"; - sha256 = "1xkwcx2gqip9v2h3zjmrn7sgcck3midl5alhsmr3zivgdipamynv"; + sha256 = "071r2kx44k1sc49cad3i607xg618mf34ki1ykr5lnfx9y6qyz075"; + }; + + firmware = fetchurl { + url = "http://download.windowsupdate.com/c/msdownload/update/driver/drvs/2017/07/1cd6a87c-623f-4407-a52d-c31be49e925c_e19f60808bdcbfbd3c3df6be3e71ffc52e43261e.cab"; + sha256 = "013g1zngxffavqrk5jy934q3bdhsv6z05ilfixdn8dj0zy26lwv5"; }; makeFlags = [ @@ -20,7 +25,14 @@ stdenv.mkDerivation rec { "MODPDIR=${placeholder ''out''}/lib/modprobe.d" "SYSDDIR=${placeholder ''out''}/lib/systemd/system" ]; + + postUnpack = '' + cabextract -F FW_ACC_00U.bin ${firmware} + mv FW_ACC_00U.bin source/firmware.bin + ''; + enableParallelBuilding = true; + nativeBuildInputs = [ cabextract ]; buildInputs = [ libusb1 ]; meta = with stdenv.lib; { diff --git a/pkgs/misc/emulators/atari++/default.nix b/pkgs/misc/emulators/atari++/default.nix index 80765f458f80..9d7a477be61d 100644 --- a/pkgs/misc/emulators/atari++/default.nix +++ b/pkgs/misc/emulators/atari++/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libSM, libX11, libICE, SDL, alsaLib, gcc-unwrapped, libXext }: -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { pname = "atari++"; version = "1.83"; diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/misc/emulators/atari800/default.nix index bb6323d18e01..6c846e2f0ab3 100644 --- a/pkgs/misc/emulators/atari800/default.nix +++ b/pkgs/misc/emulators/atari800/default.nix @@ -2,7 +2,7 @@ , unzip, zlib, SDL, readline, libGLU, libGL, libX11 }: with stdenv.lib; -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { pname = "atari800"; version = "4.2.0"; diff --git a/pkgs/misc/emulators/attract-mode/default.nix b/pkgs/misc/emulators/attract-mode/default.nix index 18c78c84d6cf..ac87190b0507 100644 --- a/pkgs/misc/emulators/attract-mode/default.nix +++ b/pkgs/misc/emulators/attract-mode/default.nix @@ -1,4 +1,4 @@ -{ expat, fetchFromGitHub, ffmpeg, fontconfig, freetype, libarchive, libjpeg +{ expat, fetchFromGitHub, ffmpeg_3, fontconfig, freetype, libarchive, libjpeg , libGLU, libGL, openal, pkgconfig, sfml, stdenv, zlib }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - expat ffmpeg fontconfig freetype libarchive libjpeg libGLU libGL openal sfml zlib + expat ffmpeg_3 fontconfig freetype libarchive libjpeg libGLU libGL openal sfml zlib ]; meta = with stdenv.lib; { diff --git a/pkgs/misc/emulators/caprice32/default.nix b/pkgs/misc/emulators/caprice32/default.nix index 8694d4d2d5ae..4b2b6208bb40 100644 --- a/pkgs/misc/emulators/caprice32/default.nix +++ b/pkgs/misc/emulators/caprice32/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { description = "A complete emulation of CPC464, CPC664 and CPC6128"; homepage = "https://github.com/ColinPitrat/caprice32"; license = licenses.gpl2; - maintainers = [ maintainers.genesis ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/misc/emulators/ccemux/default.nix b/pkgs/misc/emulators/ccemux/default.nix index fc5d4c813882..2313a63dc698 100644 --- a/pkgs/misc/emulators/ccemux/default.nix +++ b/pkgs/misc/emulators/ccemux/default.nix @@ -29,7 +29,7 @@ let comment = "A modular ComputerCraft emulator"; desktopName = "CCEmuX"; genericName = "ComputerCraft Emulator"; - categories = "Application;Emulator;"; + categories = "Emulator;"; }; in diff --git a/pkgs/misc/emulators/cdemu/libmirage.nix b/pkgs/misc/emulators/cdemu/libmirage.nix index cc3118ace151..e824e19347a6 100644 --- a/pkgs/misc/emulators/cdemu/libmirage.nix +++ b/pkgs/misc/emulators/cdemu/libmirage.nix @@ -1,6 +1,6 @@ { callPackage, gobject-introspection, cmake, pkgconfig , glib, libsndfile, zlib, bzip2, lzma, libsamplerate, intltool -, pcre, utillinux, libselinux, libsepol }: +, pcre, util-linux, libselinux, libsepol }: let pkg = import ./base.nix { version = "3.2.3"; @@ -13,6 +13,6 @@ in callPackage pkg { PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "out"}/share/gir-1.0"; PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; nativeBuildInputs = [ cmake gobject-introspection pkgconfig ]; - propagatedBuildInputs = [ pcre utillinux libselinux libsepol ]; + propagatedBuildInputs = [ pcre util-linux libselinux libsepol ]; }; } diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix index b460aa7a485b..0053079d992c 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/misc/emulators/dolphin-emu/default.nix @@ -4,7 +4,7 @@ , pkgconfig , cmake , bluez -, ffmpeg +, ffmpeg_3 , libao , gtk2 , glib @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { buildInputs = [ bluez - ffmpeg + ffmpeg_3 libao libGLU libGL diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index aa77356600be..8ef7b610a25d 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, makeDesktopItem, pkgconfig, cmake -, wrapQtAppsHook, qtbase, bluez, ffmpeg, libao, libGLU, libGL, pcre, gettext +, wrapQtAppsHook, qtbase, bluez, ffmpeg_3, libao, libGLU, libGL, pcre, gettext , libXrandr, libusb1, lzo, libpthreadstubs, libXext, libXxf86vm, libXinerama , libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsaLib , miniupnpc, enet, mbedtls, soundtouch, sfml @@ -21,13 +21,13 @@ let }; in stdenv.mkDerivation rec { pname = "dolphin-emu"; - version = "5.0-11824"; + version = "5.0-12716"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "1b97f081b8eff9012132a4124537968bdb0e03e0"; - sha256 = "1v96hcn34040vjsw83k8p0r0nb8rrdcz80h4ngirxzm36b3l7w6m"; + rev = "31524288e3b2450eaefff8202c6d26c4ba3f7333"; + sha256 = "0vv3ahk6zdx2hx5diq4jkhl289wjybqcr4lwinrkfiywb83hcabg"; }; enableParallelBuilding = true; @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { ++ lib.optional stdenv.isLinux wrapQtAppsHook; buildInputs = [ - curl ffmpeg libao libGLU libGL pcre gettext libpthreadstubs libpulseaudio + curl ffmpeg_3 libao libGLU libGL pcre gettext libpthreadstubs libpulseaudio libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp lzo portaudio libusb1 libpng hidapi miniupnpc enet mbedtls soundtouch sfml qtbase diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix index b70f0e058c07..160c8733ff5c 100644 --- a/pkgs/misc/emulators/dosbox/default.nix +++ b/pkgs/misc/emulators/dosbox/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { comment = "x86 emulator with internal DOS"; desktopName = "DOSBox"; genericName = "DOS emulator"; - categories = "Application;Emulator;"; + categories = "Emulator;"; }; postInstall = '' diff --git a/pkgs/misc/emulators/emu2/default.nix b/pkgs/misc/emulators/emu2/default.nix new file mode 100644 index 000000000000..fb13b602b6a6 --- /dev/null +++ b/pkgs/misc/emulators/emu2/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "emu2"; + version = "unstable-2020-06-04"; + + src = fetchFromGitHub { + owner = "dmsc"; + repo = "emu2"; + rev = "f9599d347aab07d9281400ec8b214aabd187fbcd"; + sha256 = "0d8fb3wp477kfi0p4mmr69lxsbgb4gl9pqmm68g9ixzrfch837v4"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/dmsc/emu2/"; + description = "A simple text-mode x86 + DOS emulator"; + platforms = platforms.linux; + maintainers = with maintainers; [ dramaturg ]; + license = licenses.gpl2; + }; +} diff --git a/pkgs/misc/emulators/gxemul/default.nix b/pkgs/misc/emulators/gxemul/default.nix index e742fde90ac9..8671056d14eb 100644 --- a/pkgs/misc/emulators/gxemul/default.nix +++ b/pkgs/misc/emulators/gxemul/default.nix @@ -2,26 +2,24 @@ stdenv.mkDerivation rec { pname = "gxemul"; - version = "0.6.0.1"; + version = "0.6.2"; src = fetchurl { - url = "http://gxemul.sourceforge.net/src/${pname}-${version}.tar.gz"; - sha256 = "1afd9l0igyv7qgc0pn3rkdgrl5d0ywlyib0qhg4li23zilyq5407"; + url = "http://gavare.se/gxemul/src/gxemul-${version}.tar.gz"; + sha256 = "0iqmazfn7ss5n27m1a9n9nps3vzhag1phzb7qw0wgczycmwsq0x7"; }; configurePhase = "./configure"; installPhase = '' - mkdir -p $out/bin; - mkdir -p $out/share/${pname}-${version}; - cp gxemul $out/bin; - cp -r doc $out/share/${pname}-${version}; - cp -r demos $out/share/${pname}-${version}; - cp -r ./man $out/; + mkdir -p {$out/bin,$out/share/${pname}-${version}} + cp -r {doc,demos} $out/share/${pname}-${version} + cp gxemul $out/bin + cp -r ./man $out ''; - meta = { - license = stdenv.lib.licenses.bsd3; + meta = with stdenv.lib; { + homepage = "http://gavare.se/gxemul/"; description = "Gavare's experimental emulator"; longDescription = '' GXemul is a framework for full-system computer architecture @@ -32,6 +30,6 @@ stdenv.mkDerivation rec { and serial controllers. The emulation is working well enough to allow several unmodified "guest" operating systems to run. ''; - homepage = "http://gxemul.sourceforge.net/"; + license = licenses.bsd3; }; } diff --git a/pkgs/misc/emulators/libdsk/default.nix b/pkgs/misc/emulators/libdsk/default.nix index 6a2f94e77e6c..219875ba6fcb 100644 --- a/pkgs/misc/emulators/libdsk/default.nix +++ b/pkgs/misc/emulators/libdsk/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { description = "A library for accessing discs and disc image files"; homepage = "http://www.seasip.info/Unix/LibDsk/"; license = licenses.gpl2Plus; - maintainers = [ maintainers.genesis ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/misc/emulators/mame/default.nix b/pkgs/misc/emulators/mame/default.nix index d72af71f6634..ddf0a129ab82 100644 --- a/pkgs/misc/emulators/mame/default.nix +++ b/pkgs/misc/emulators/mame/default.nix @@ -7,7 +7,7 @@ with stdenv; let majorVersion = "0"; - minorVersion = "221"; + minorVersion = "226"; desktopItem = makeDesktopItem { name = "MAME"; @@ -26,7 +26,7 @@ in mkDerivation { owner = "mamedev"; repo = "mame"; rev = "mame${majorVersion}${minorVersion}"; - sha256 = "1pqwa5qcrk0wgbyns6fkv7j3pn7byf216cixc3phhhgvfidgr8ww"; + sha256 = "0pnsvz4vkjkqb1ac5wzwz31vx0iknyg5ffly90nhl13kcr656jrj"; }; hardeningDisable = [ "fortify" ]; @@ -51,7 +51,9 @@ in mkDerivation { # by default MAME assumes that paths with stock resources # are relative and that you run MAME changing to # install directory, so we add absolute paths here - patches = [ ./emuopts.patch ]; + patches = [ + ./emuopts.patch + ]; postPatch = '' substituteInPlace src/emu/emuopts.cpp \ diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix index e356e636c5a2..cb4b7997383f 100644 --- a/pkgs/misc/emulators/mednafen/default.nix +++ b/pkgs/misc/emulators/mednafen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "mednafen"; - version = "1.24.3"; + version = "1.26.1"; src = fetchurl { url = "https://mednafen.github.io/releases/files/${pname}-${version}.tar.xz"; - sha256 = "03zplcfvmnnv7grhacmr1zy789pb2wda36wylmzmar23g0zqbsix"; + sha256 = "1x7xhxjhwsdbak8l0iyb497f043xkhibk73w96xck4j2bk10fac4"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/misc/emulators/mednaffe/default.nix b/pkgs/misc/emulators/mednaffe/default.nix index 7e231c5edd3a..60b0bfe1223b 100644 --- a/pkgs/misc/emulators/mednaffe/default.nix +++ b/pkgs/misc/emulators/mednaffe/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "AmatCoder"; repo = "mednaffe"; - rev = "${version}"; + rev = version; sha256 = "15qk3a3l1phr8bap2ayh3c0vyvw2jwhny1iz1ajq2adyjpm9fhr7"; }; diff --git a/pkgs/misc/emulators/melonDS/default.nix b/pkgs/misc/emulators/melonDS/default.nix new file mode 100644 index 000000000000..94fbeba0e075 --- /dev/null +++ b/pkgs/misc/emulators/melonDS/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, gtk3, libpcap, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "melonDS"; + version = "0.8.3"; + ## When updating to the release after 0.8.3, + ## - Uncomment: + ## cmakeFlags = [ "-UUNIX_PORTABLE" ]; + ## - Remove the postInstall, since cmake should then take care of installing icons, .desktop file, and romlist.bin + ## (see https://github.com/Arisotura/melonDS/pull/546) + + src = fetchFromGitHub { + owner = "Arisotura"; + repo = pname; + rev = version; + sha256 = "1lqmfwjpkdqfkns1aaxlp4yrg6i0r66mxfr4rrj7b5286k44hqwn"; + }; + + enableParallelBuilding = true; + nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ]; + buildInputs = [ SDL2 gtk3 libpcap ]; + + postInstall = '' + install -Dm644 -t $out/share/melonDS/ ../romlist.bin + install -Dm644 -t $out/share/applications/ ../flatpak/*.desktop + + for i in ../icon/melon_*.png; do + d="''${i##*_}" + d="$out/share/icons/hicolor/''${d%.png}/apps" + install -D $i "$d/net.kuribo64.melonds.png" + done + ''; + + meta = with stdenv.lib; { + homepage = "http://melonds.kuribo64.net/"; + description = "Work in progress Nintendo DS emulator"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ artemist benley ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index 5611b344cb1c..9efe47cc250e 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, makeDesktopItem, wrapQtAppsHook, pkgconfig -, cmake, epoxy, libzip, libelf, libedit, ffmpeg, SDL2, imagemagick +, cmake, epoxy, libzip, libelf, libedit, ffmpeg_3, SDL2, imagemagick , qtbase, qtmultimedia, qttools, minizip }: let @@ -15,20 +15,20 @@ let }; in stdenv.mkDerivation rec { pname = "mgba"; - version = "0.8.1"; + version = "0.8.4"; src = fetchFromGitHub { owner = "mgba-emu"; repo = "mgba"; rev = version; - sha256 = "1if82mfaak3696w5d5yshynpzywrxgvg3ifdfi2rwlpvq1gpd429"; + sha256 = "0nqj4bnn5c2z1bq4bnbw1wznc0wpmq4sy3w8pipd6n6620b9m4qq"; }; enableParallelBuilding = true; nativeBuildInputs = [ wrapQtAppsHook pkgconfig cmake ]; buildInputs = [ - epoxy libzip libelf libedit ffmpeg SDL2 imagemagick + epoxy libzip libelf libedit ffmpeg_3 SDL2 imagemagick qtbase qtmultimedia qttools minizip ]; diff --git a/pkgs/misc/emulators/np2kai/default.nix b/pkgs/misc/emulators/np2kai/default.nix new file mode 100644 index 000000000000..0ed47af8f5bf --- /dev/null +++ b/pkgs/misc/emulators/np2kai/default.nix @@ -0,0 +1,196 @@ +{ stdenv +, lib +, fetchFromGitHub +, enable16Bit ? true +, enable32Bit ? true + +, enableSDL ? true +, withSDLVersion ? "2" +, SDL +, SDL_ttf +, SDL_mixer +, SDL2 +, SDL2_ttf +, SDL2_mixer + +, enableX11 ? stdenv.hostPlatform.isLinux +, automake +, autoconf +, autoconf-archive +, libtool +, pkg-config +, unzip +, gtk2 +, libusb1 +, libXxf86vm +, nasm +, libICE +, libSM + + # HAXM build succeeds but the binary segfaults, seemingly due to the missing HAXM kernel module + # Enable once there is a HAXM kernel module option in NixOS? Or somehow bind it to the system kernel having HAXM? + # Or leave it disabled by default? + # https://github.com/intel/haxm/blob/master/docs/manual-linux.md +, enableHAXM ? false +}: + +assert lib.assertMsg (enable16Bit || enable32Bit) + "Must enable 16-Bit and/or 32-Bit system variant."; +assert lib.assertMsg (enableSDL || enableX11) + "Must enable SDL and/or X11 graphics interfaces."; +assert lib.assertOneOf "withSDLVersion" withSDLVersion [ "1" "2" ]; +assert enableHAXM -> (lib.assertMsg enableX11 + "Must enable X11 graphics interface for HAXM build."); +let + inherit (lib) optional optionals optionalString; + inherit (lib.strings) concatStringsSep concatMapStringsSep; + isSDL2 = (withSDLVersion == "2"); + sdlInfix = optionalString isSDL2 "2"; + sdlDeps1 = [ + SDL + SDL_ttf + SDL_mixer + ]; + sdlDeps2 = [ + SDL2 + SDL2_ttf + SDL2_mixer + ]; + sdlDepsBuildonly = if isSDL2 then sdlDeps1 else sdlDeps2; + sdlDepsTarget = if isSDL2 then sdlDeps2 else sdlDeps1; + sdlMakefileSuffix = + if stdenv.hostPlatform.isWindows then "win" + else if stdenv.hostPlatform.isDarwin then "mac" + else "unix"; + sdlMakefiles = concatMapStringsSep " " (x: x + "." + sdlMakefileSuffix) + (optionals enable16Bit [ + "Makefile" + ] ++ optionals enable32Bit [ + "Makefile21" + ]); + sdlBuildFlags = concatStringsSep " " + (optionals enableSDL [ + "SDL_VERSION=${withSDLVersion}" + ]); + sdlBins = concatStringsSep " " + (optionals enable16Bit [ + "np2kai" + ] ++ optionals enable32Bit [ + "np21kai" + ]); + x11ConfigureFlags = concatStringsSep " " + (( + if ((enableHAXM && (enable16Bit || enable32Bit)) || (enable16Bit && enable32Bit)) then [ + "--enable-build-all" + ] else if enableHAXM then [ + "--enable-haxm" + ] else if enable32Bit then [ + "--enable-ia32" + ] else [ ] + ) ++ optionals (!isSDL2) [ + "--enable-sdl" + "--enable-sdlmixer" + "--enable-sdlttf" + + "--enable-sdl2=no" + "--enable-sdl2mixer=no" + "--enable-sdl2ttf=no" + ]); + x11BuildFlags = concatStringsSep " " [ + "SDL2_CONFIG=sdl2-config" + "SDL_CONFIG=sdl-config" + "SDL_CFLAGS=\"$(sdl${sdlInfix}-config --cflags)\"" + "SDL_LIBS=\"$(sdl${sdlInfix}-config --libs) -lSDL${sdlInfix}_mixer -lSDL${sdlInfix}_ttf\"" + ]; + x11Bins = concatStringsSep " " + (optionals enable16Bit [ + "xnp2kai" + ] ++ optionals enable32Bit [ + "xnp21kai" + ] ++ optionals enableHAXM [ + "xnp21kai_haxm" + ]); +in +stdenv.mkDerivation rec { + pname = "np2kai"; + version = "0.86rev22"; #update src.rev to commit rev accordingly + + src = fetchFromGitHub rec { + owner = "AZO234"; + repo = "NP2kai"; + rev = "4a317747724669343e4c33ebdd34783fb7043221"; + sha256 = "0kxysxhx6jyk82mx30ni0ydzmwdcbnlxlnarrlq018rsnwb4md72"; + }; + + configurePhase = '' + export GIT_VERSION=${builtins.substring 0 7 src.rev} + buildFlags="$buildFlags ''${enableParallelBuilding:+-j$NIX_BUILD_CORES -l$NIX_BUILD_CORES}" + '' + optionalString enableX11 '' + cd x11 + substituteInPlace Makefile.am \ + --replace 'GIT_VERSION :=' 'GIT_VERSION ?=' + ./autogen.sh ${x11ConfigureFlags} + ./configure ${x11ConfigureFlags} + cd .. + ''; + + nativeBuildInputs = sdlDepsBuildonly + ++ optionals enableX11 [ + automake + autoconf + autoconf-archive + libtool + pkg-config + unzip + nasm + ]; + + buildInputs = sdlDepsTarget + ++ optionals enableX11 [ + gtk2 + libICE + libSM + libusb1 + libXxf86vm + ]; + + enableParallelBuilding = true; + + buildPhase = optionalString enableSDL '' + cd sdl2 + for mkfile in ${sdlMakefiles}; do + substituteInPlace $mkfile \ + --replace 'GIT_VERSION :=' 'GIT_VERSION ?=' + echo make -f $mkfile $buildFlags ${sdlBuildFlags} clean + make -f $mkfile $buildFlags ${sdlBuildFlags} clean + make -f $mkfile $buildFlags ${sdlBuildFlags} + done + cd .. + '' + optionalString enableX11 '' + cd x11 + make $buildFlags ${x11BuildFlags} + cd .. + ''; + + installPhase = optionalString enableSDL '' + cd sdl2 + for emu in ${sdlBins}; do + install -D -m 755 $emu $out/bin/$emu + done + cd .. + '' + optionalString enableX11 '' + cd x11 + for emu in ${x11Bins}; do + install -D -m 755 $emu $out/bin/$emu + done + cd .. + ''; + + meta = with lib; { + description = "A PC-9801 series emulator"; + homepage = "https://github.com/AZO234/NP2kai"; + license = licenses.mit; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.x86; + }; +} diff --git a/pkgs/misc/emulators/openmsx/custom-nixos.mk b/pkgs/misc/emulators/openmsx/custom-nix.mk index 9098762e40d5..9098762e40d5 100644 --- a/pkgs/misc/emulators/openmsx/custom-nixos.mk +++ b/pkgs/misc/emulators/openmsx/custom-nix.mk diff --git a/pkgs/misc/emulators/openmsx/default.nix b/pkgs/misc/emulators/openmsx/default.nix index 68b464f4d358..dc533c4f17ce 100644 --- a/pkgs/misc/emulators/openmsx/default.nix +++ b/pkgs/misc/emulators/openmsx/default.nix @@ -2,21 +2,19 @@ , python , alsaLib, glew, libGL, libpng , libogg, libtheora, libvorbis -, SDL, SDL_image, SDL_ttf +, SDL2, SDL2_image, SDL2_ttf , freetype, tcl, zlib }: -with stdenv.lib; stdenv.mkDerivation rec { - pname = "openmsx"; - version = "0.15.0"; + version = "16.0"; src = fetchFromGitHub { owner = "openMSX"; repo = "openMSX"; - rev = "RELEASE_0_15_0"; - sha256 = "1lv5kdw0812mkf7k20z2djzk0pbs792xq2mibbnz9rfjf02whi7l"; + rev = "RELEASE_${builtins.replaceStrings ["."] ["_"] version}"; + sha256 = "04sphn9ph378r0qv881riv90cgz58650jcqcwmi1mv6gbcb3img5"; fetchSubmodules = true; }; @@ -24,10 +22,10 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib glew libGL libpng libogg libtheora libvorbis freetype - SDL SDL_image SDL_ttf tcl zlib ]; + SDL2 SDL2_image SDL2_ttf tcl zlib ]; postPatch = '' - cp ${./custom-nixos.mk} build/custom.mk + cp ${./custom-nix.mk} build/custom.mk ''; dontAddPrefix = true; @@ -36,8 +34,8 @@ stdenv.mkDerivation rec { # for providing support to Nixpkgs :) TCL_CONFIG="${tcl}/lib/"; - meta = { - description = "A MSX emulator"; + meta = with stdenv.lib;{ + description = "The MSX emulator that aims for perfection"; longDescription = '' OpenMSX is an emulator for the MSX home computer system. Its goal is to emulate all aspects of the MSX with 100% accuracy. @@ -45,5 +43,6 @@ stdenv.mkDerivation rec { homepage = "https://openmsx.org"; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; + license = with licenses; [ bsd2 boost gpl2 ]; }; } diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix index 3faba2ee467c..5bbf70004abe 100644 --- a/pkgs/misc/emulators/pcsx2/default.nix +++ b/pkgs/misc/emulators/pcsx2/default.nix @@ -1,21 +1,43 @@ -{ alsaLib, cmake, fetchFromGitHub, glib, gettext, gtk2, harfbuzz, lib, libaio -, libpng, libpcap, libxml2, makeWrapper, perl, pkgconfig, portaudio -, SDL2, soundtouch, stdenv, udev, wxGTK, zlib +{ alsaLib +, cmake +, fetchFromGitHub +, fmt +, gcc-unwrapped +, gettext +, glib +, gtk3 +, harfbuzz +, libaio +, libpcap +, libpng +, libpulseaudio +, libsamplerate +, libxml2 +, makeWrapper +, perl +, pkgconfig +, portaudio +, SDL2 +, soundtouch +, stdenv +, udev +, wrapGAppsHook +, wxGTK +, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pcsx2"; - version = "1.6.0-rc"; + version = "unstable-2020-11-13"; src = fetchFromGitHub { owner = "PCSX2"; repo = "pcsx2"; - rev = "v${version}"; - sha256 = "1mdv1dgwawb4k6bs1jh6j2jaaxg168fbssm1lwnlk5di0gz31h23"; + fetchSubmodules = true; + rev = "319287dbe552c8405720b25dfdf5fa518deeee0b"; + sha256 = "1kswc8vw9hbv2nigp8cxrgf2s0ik7p4i203cbqci8zjmnkaqpsai"; }; - postPatch = "sed '1i#include \"x86intrin.h\"' -i common/src/x86emitter/cpudetect.cpp"; - cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" "-DDISABLE_ADVANCE_SIMD=TRUE" @@ -23,35 +45,43 @@ stdenv.mkDerivation rec { "-DDOC_DIR=${placeholder "out"}/share/doc/pcsx2" "-DGAMEINDEX_DIR=${placeholder "out"}/share/pcsx2" "-DGLSL_SHADER_DIR=${placeholder "out"}/share/pcsx2" - "-DwxWidgets_LIBRARIES=${wxGTK}/lib" - "-DwxWidgets_INCLUDE_DIRS=${wxGTK}/include" - "-DwxWidgets_CONFIG_EXECUTABLE=${wxGTK}/bin/wx-config" + "-DGTK3_API=TRUE" "-DPACKAGE_MODE=TRUE" "-DPLUGIN_DIR=${placeholder "out"}/lib/pcsx2" "-DREBUILD_SHADER=TRUE" + "-DUSE_LTO=TRUE" + "-DwxWidgets_CONFIG_EXECUTABLE=${wxGTK}/bin/wx-config" + "-DwxWidgets_INCLUDE_DIRS=${wxGTK}/include" + "-DwxWidgets_LIBRARIES=${wxGTK}/lib" "-DXDG_STD=TRUE" - "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" - "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" - "-DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0" - "-DGTK3_API=FALSE" ]; + postPatch = '' + substituteInPlace cmake/BuildParameters.cmake \ + --replace /usr/bin/gcc-ar ${gcc-unwrapped}/bin/gcc-ar \ + --replace /usr/bin/gcc-nm ${gcc-unwrapped}/bin/gcc-nm \ + --replace /usr/bin/gcc-ranlib ${gcc-unwrapped}/bin/gcc-ranlib + ''; + postFixup = '' wrapProgram $out/bin/PCSX2 \ --set __GL_THREADED_OPTIMIZATIONS 1 ''; - nativeBuildInputs = [ cmake makeWrapper perl pkgconfig ]; + nativeBuildInputs = [ cmake makeWrapper perl pkgconfig wrapGAppsHook ]; buildInputs = [ alsaLib - glib + fmt gettext - gtk2 + glib + gtk3 harfbuzz libaio libpcap libpng + libpulseaudio + libsamplerate libxml2 portaudio SDL2 @@ -71,13 +101,13 @@ stdenv.mkDerivation rec { PC, with many additional features and benefits. ''; homepage = "https://pcsx2.net"; - maintainers = with maintainers; [ hrdinka ]; + maintainers = with maintainers; [ hrdinka samuelgrf govanify ]; # PCSX2's source code is released under LGPLv3+. It However ships # additional data files and code that are licensed differently. # This might be solved in future, for now we should stick with # license.free license = licenses.free; - platforms = platforms.i686; + platforms = platforms.x86; }; } diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix index b2aa81124dae..effc34accf2c 100644 --- a/pkgs/misc/emulators/ppsspp/default.nix +++ b/pkgs/misc/emulators/ppsspp/default.nix @@ -1,7 +1,7 @@ { SDL2 , cmake , fetchFromGitHub -, ffmpeg +, ffmpeg_3 , glew , lib , libzip @@ -16,28 +16,26 @@ mkDerivation rec { pname = "ppsspp"; - version = "1.9.4"; + version = "1.10.3"; src = fetchFromGitHub { owner = "hrydgard"; - repo = "ppsspp"; + repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "0ivi0dcfxwa4nz19amki80qacnjhqr42f0ihyby1scxafl3nq55c"; + sha256 = "sha256-W41Poq5S+opkasIGYo13SQZWQF1HjfFnH7u9DW5HNA0="; }; postPatch = '' - substituteInPlace git-version.cmake \ - --replace unknown ${src.rev} - substituteInPlace UI/NativeApp.cpp \ - --replace /usr/share $out/share + substituteInPlace git-version.cmake --replace unknown ${src.rev} + substituteInPlace UI/NativeApp.cpp --replace /usr/share $out/share ''; nativeBuildInputs = [ cmake pkgconfig python3 ]; buildInputs = [ SDL2 - ffmpeg + ffmpeg_3 glew libzip qtbase @@ -52,6 +50,7 @@ mkDerivation rec { "-DUSE_SYSTEM_LIBZIP=ON" "-DUSE_SYSTEM_SNAPPY=ON" "-DUSING_QT_UI=ON" + "-DHEADLESS=OFF" ]; installPhase = '' @@ -61,9 +60,11 @@ mkDerivation rec { ''; meta = with lib; { - description = "A PSP emulator for Android, Windows, Mac and Linux, written in C++"; + description = "A HLE Playstation Portable emulator, written in C++"; homepage = "https://www.ppsspp.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.linux; }; } +# TODO: add SDL headless port diff --git a/pkgs/misc/emulators/qmc2/default.nix b/pkgs/misc/emulators/qmc2/default.nix index 1242a1ef11ac..5a813c5d2efe 100644 --- a/pkgs/misc/emulators/qmc2/default.nix +++ b/pkgs/misc/emulators/qmc2/default.nix @@ -3,7 +3,7 @@ , minizip, zlib , qtbase, qtsvg, qtmultimedia, qtwebkit, qttranslations, qtxmlpatterns , rsync, SDL2, xwininfo -, utillinux +, util-linux , xorg }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/project/qmc2/qmc2/${version}/${pname}-${version}.tar.gz"; sha256 = "1dzmjlfk8pdspns6zg1jmd5fqzg8igd4q38cz4a1vf39lx74svns"; }; - + preBuild = '' patchShebangs scripts ''; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qttools pkgconfig ]; buildInputs = [ minizip qtbase qtsvg qtmultimedia qtwebkit qttranslations qtxmlpatterns rsync SDL2 - xwininfo zlib utillinux xorg.libxcb ]; + xwininfo zlib util-linux xorg.libxcb ]; makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "A Qt frontend for MAME/MESS"; homepage = "https://qmc2.batcom-it.net"; license = licenses.gpl2; - maintainers = [ maintainers.genesis ]; + maintainers = [ ]; platforms = platforms.linux; broken = true; }; diff --git a/pkgs/misc/emulators/resim/default.nix b/pkgs/misc/emulators/resim/default.nix index 81acdf81f2ec..ba7ac6212576 100644 --- a/pkgs/misc/emulators/resim/default.nix +++ b/pkgs/misc/emulators/resim/default.nix @@ -15,4 +15,6 @@ stdenv.mkDerivation { cp -v libresim/libarmsim.so $out/lib/libarmsim.so cp -v vc4emul/vc4emul $out/bin/vc4emul ''; + + meta.license = stdenv.lib.licenses.mit; } diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 0ebd2b82a9a9..2b9cb5e6d27e 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, cmake, pkgconfig, makeWrapper, python27, python37, retroarch +{ stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, fetchpatch, cmake, pkgconfig, makeWrapper, python27, python37, retroarch , alsaLib, fluidsynth, curl, hidapi, libGLU, gettext, glib, gtk2, portaudio, SDL, SDL_net, SDL2, SDL2_image, libGL -, ffmpeg, pcre, libevdev, libpng, libjpeg, libzip, udev, libvorbis, snappy, which, hexdump +, ffmpeg_3, pcre, libevdev, libpng, libjpeg, libzip, udev, libvorbis, snappy, which, hexdump , miniupnpc, sfml, xorg, zlib, nasm, libpcap, boost, icu, openssl , buildPackages }: @@ -630,6 +630,13 @@ in with stdenv.lib.licenses; rev = "02987af9b81a9c3294af8fb9d5a34f9826a2cf4d"; sha256 = "0gl7irmn5d8lk7kf484vgw6kb325fq4ghwsni3il4nm5n2a8yglh"; }; + patches = [ + (fetchpatch { + name = "fix_mame_build_on_make-4.3.patch"; + url = "https://github.com/libretro/mame2016-libretro/commit/5874fae3d124f5e7c8a91634f5473a8eac902e47.patch"; + sha256 = "061f1lcm72glksf475ikl8w10pnbgqa7049ylw06nikis2qdjlfn"; + }) + ]; description = "Port of MAME ~2016 to libretro"; license = gpl2Plus; extraNativeBuildInputs = [ python27 ]; @@ -718,6 +725,25 @@ in with stdenv.lib.licenses; preBuild = "cd libretro"; }; + np2kai = mkLibRetroCore rec { + core = "np2kai"; + src = fetchFromGitHub rec { + owner = "AZO234"; + repo = "NP2kai"; + rev = "4a317747724669343e4c33ebdd34783fb7043221"; + sha256 = "0kxysxhx6jyk82mx30ni0ydzmwdcbnlxlnarrlq018rsnwb4md72"; + }; + description = "Neko Project II kai libretro port"; + license = mit; + makefile = "Makefile.libretro"; + preBuild = '' + cd sdl2 + substituteInPlace ${makefile} \ + --replace 'GIT_VERSION :=' 'GIT_VERSION ?=' + export GIT_VERSION=${builtins.substring 0 7 src.rev} + ''; + }; + o2em = mkLibRetroCore rec { core = "o2em"; src = fetchRetro { @@ -815,7 +841,7 @@ in with stdenv.lib.licenses; description = "ppsspp libretro port"; license = gpl2; extraNativeBuildInputs = [ cmake pkgconfig ]; - extraBuildInputs = [ libGLU libGL libzip ffmpeg python37 snappy xorg.libX11 ]; + extraBuildInputs = [ libGLU libGL libzip ffmpeg_3 python37 snappy xorg.libX11 ]; makefile = "Makefile"; cmakeFlags = [ "-DLIBRETRO=ON -DUSE_SYSTEM_FFMPEG=ON -DUSE_SYSTEM_SNAPPY=ON -DUSE_SYSTEM_LIBZIP=ON -DOpenGL_GL_PREFERENCE=GLVND" ]; postBuild = "mv lib/ppsspp_libretro${stdenv.hostPlatform.extensions.sharedLibrary} ppsspp_libretro${stdenv.hostPlatform.extensions.sharedLibrary}"; diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index 28a641ec9701..bfc2c338769c 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, which, pkgconfig, makeWrapper -, ffmpeg, libGLU, libGL, freetype, libxml2, python3 +, ffmpeg_3, libGLU, libGL, freetype, libxml2, python3 , libobjc, AppKit, Foundation , alsaLib ? null , libdrm ? null @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wayland ] ++ optional withVulkan makeWrapper; - buildInputs = [ ffmpeg freetype libxml2 libGLU libGL python3 SDL2 which ] + buildInputs = [ ffmpeg_3 freetype libxml2 libGLU libGL python3 SDL2 which ] ++ optional enableNvidiaCgToolkit nvidia_cg_toolkit ++ optional withVulkan vulkan-loader ++ optionals stdenv.isDarwin [ libobjc AppKit Foundation ] @@ -43,9 +43,6 @@ stdenv.mkDerivation rec { libXdmcp libXext libXxf86vm mesa udev wayland libxkbcommon ]; - # we use prefix-less pkg-config - PKG_CONF_PATH = "pkg-config"; - enableParallelBuilding = true; configureFlags = stdenv.lib.optionals stdenv.isLinux [ "--enable-kms" "--enable-egl" ]; diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix index 4e022b2868fa..f71420674e5c 100644 --- a/pkgs/misc/emulators/rpcs3/default.nix +++ b/pkgs/misc/emulators/rpcs3/default.nix @@ -1,5 +1,6 @@ { mkDerivation, lib, fetchgit, cmake, pkgconfig, git -, qtbase, qtquickcontrols, openal, glew, vulkan-loader, libpng, ffmpeg, libevdev, python3 +, qtbase, qtquickcontrols, openal, glew, vulkan-headers, vulkan-loader, libpng +, ffmpeg, libevdev, python3 , pulseaudioSupport ? true, libpulseaudio , waylandSupport ? true, wayland , alsaSupport ? true, alsaLib @@ -15,7 +16,7 @@ mkDerivation { src = fetchgit { url = "https://github.com/RPCS3/rpcs3"; - rev = "341fdf7eb14763fd06e2eab9a4b2b8f1adf9fdbd"; + rev = "v${majorVersion}"; sha256 = "1qx97zkkjl6bmv5rhfyjqynbz0v8h40b2wxqnl59g287wj0yk3y1"; }; @@ -36,7 +37,8 @@ mkDerivation { nativeBuildInputs = [ cmake pkgconfig git ]; buildInputs = [ - qtbase qtquickcontrols openal glew vulkan-loader libpng ffmpeg libevdev python3 + qtbase qtquickcontrols openal glew vulkan-headers vulkan-loader libpng ffmpeg + libevdev python3 ] ++ lib.optional pulseaudioSupport libpulseaudio ++ lib.optional alsaSupport alsaLib ++ lib.optional waylandSupport wayland; diff --git a/pkgs/misc/emulators/ryujinx/default.nix b/pkgs/misc/emulators/ryujinx/default.nix new file mode 100644 index 000000000000..0e6784e69eab --- /dev/null +++ b/pkgs/misc/emulators/ryujinx/default.nix @@ -0,0 +1,106 @@ +{ stdenv, fetchFromGitHub, fetchurl, makeWrapper, makeDesktopItem, linkFarmFromDrvs +, dotnet-sdk_3, dotnetPackages, dotnetCorePackages +, SDL2, libX11, openal +, gtk3, gobject-introspection, wrapGAppsHook +}: + +let + runtimeDeps = [ + SDL2 + gtk3 + libX11 + openal + ]; +in stdenv.mkDerivation rec { + pname = "ryujinx"; + version = "1.0.5551"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx + + src = fetchFromGitHub { + owner = "Ryujinx"; + repo = "Ryujinx"; + rev = "2dcc6333f8cbb959293832f52857bdaeab1918bf"; + sha256 = "1hfa498fr9mdxas9s02y25ncb982wa1sqhl06jpnkhqsiicbkgcf"; + }; + + nativeBuildInputs = [ dotnet-sdk_3 dotnetPackages.Nuget makeWrapper wrapGAppsHook gobject-introspection ]; + + nugetDeps = linkFarmFromDrvs "${pname}-nuget-deps" (import ./deps.nix { + fetchNuGet = { name, version, sha256 }: fetchurl { + name = "nuget-${name}-${version}.nupkg"; + url = "https://www.nuget.org/api/v2/package/${name}/${version}"; + inherit sha256; + }; + }); + + patches = [ ./log.patch ]; # Without this, Ryujinx tries to write logs to the nix store. This patch makes it write to "~/.config/Ryujinx/Logs" on Linux. + + configurePhase = '' + runHook preConfigure + + export HOME=$(mktemp -d) + export DOTNET_CLI_TELEMETRY_OPTOUT=1 + export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + + nuget sources Add -Name nixos -Source "$PWD/nixos" + nuget init "$nugetDeps" "$PWD/nixos" + + # FIXME: https://github.com/NuGet/Home/issues/4413 + mkdir -p $HOME/.nuget/NuGet + cp $HOME/.config/NuGet/NuGet.Config $HOME/.nuget/NuGet + + dotnet restore --source "$PWD/nixos" Ryujinx.sln + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + dotnet build Ryujinx.sln \ + --no-restore \ + --configuration Release \ + -p:Version=${version} + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + dotnet publish Ryujinx.sln \ + --no-build \ + --configuration Release \ + --no-self-contained \ + --output $out/lib/ryujinx + shopt -s extglob + + makeWrapper $out/lib/ryujinx/Ryujinx $out/bin/Ryujinx \ + --set DOTNET_ROOT "${dotnetCorePackages.netcore_3_1}" \ + --suffix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath runtimeDeps}" \ + ''${gappsWrapperArgs[@]} + + for i in 16 32 48 64 96 128 256 512 1024; do + install -D ${src}/Ryujinx/Ui/assets/Icon.png $out/share/icons/hicolor/''${i}x$i/apps/ryujinx.png + done + cp -r ${makeDesktopItem { + desktopName = "Ryujinx"; + name = "ryujinx"; + exec = "Ryujinx"; + icon = "ryujinx"; + comment = meta.description; + type = "Application"; + categories = "Game;"; + }}/share/applications $out/share + + runHook postInstall + ''; + + # Strip breaks the executable. + dontStrip = true; + + meta = with stdenv.lib; { + description = "Experimental Nintendo Switch Emulator written in C#"; + homepage = "https://ryujinx.org/"; + license = licenses.mit; + maintainers = [ maintainers.ivar ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/misc/emulators/ryujinx/deps.nix b/pkgs/misc/emulators/ryujinx/deps.nix new file mode 100644 index 000000000000..4f30b159a280 --- /dev/null +++ b/pkgs/misc/emulators/ryujinx/deps.nix @@ -0,0 +1,1072 @@ +{ fetchNuGet }: [ + (fetchNuGet { + name = "AtkSharp"; + version = "3.22.25.56"; + sha256 = "069fm4wplxb4s1i6mdj00b22zqpz6pg9miglcj8mkf1b4lnn09g0"; + }) + (fetchNuGet { + name = "CairoSharp"; + version = "3.22.25.56"; + sha256 = "0b7p4yj88wgayh464j3rkbc4js8z57wxy3mprgvx86i3rc2v5jd9"; + }) + (fetchNuGet { + name = "Concentus"; + version = "1.1.7"; + sha256 = "0y5z444wrbhlmsqpy2sxmajl1fbf74843lvgj3y6vz260dn2q0l0"; + }) + (fetchNuGet { + name = "Crc32.NET"; + version = "1.2.0"; + sha256 = "0qaj3192k1vfji87zf50rhydn5mrzyzybrs2k4v7ap29k8i0vi5h"; + }) + (fetchNuGet { + name = "DiscordRichPresence"; + version = "1.0.150"; + sha256 = "0qmbi4sccia3w80q8xfvj3bw62nvz047wq198n2b2aflkf47bq79"; + }) + (fetchNuGet { + name = "FFmpeg.AutoGen"; + version = "4.3.0"; + sha256 = "03lb3xzgwxik8nljq87pr1b9bsxbsl3a4kvy0kqkw9f57n29ihvk"; + }) + (fetchNuGet { + name = "GdkSharp"; + version = "3.22.25.56"; + sha256 = "0f708dwy6i9hghxs711scwkww28lvfjd6gykk7xv921vich5xvy6"; + }) + (fetchNuGet { + name = "GioSharp"; + version = "3.22.25.56"; + sha256 = "1i7x1bakv5sq27ppl6w79c1wbvnfhf1713plc9ixaznh1fclcnwr"; + }) + (fetchNuGet { + name = "GLibSharp"; + version = "3.22.25.56"; + sha256 = "12czfm0lgjcy9hgqsiycwfv124dq619svrnsi036246i5hycj37w"; + }) + (fetchNuGet { + name = "GLWidget"; + version = "1.0.2"; + sha256 = "0nb46jiscnsywwdfy7zhx1bw4jfmca3s6l8dhbi99gc4bvp8ar7p"; + }) + (fetchNuGet { + name = "GtkSharp"; + version = "3.22.25.56"; + sha256 = "18dbn834wimdmxmgsqd81hyvjyyzgbnayzvz9f714cgw4yjkjyqs"; + }) + (fetchNuGet { + name = "GtkSharp.Dependencies"; + version = "1.1.0"; + sha256 = "1g1rhcn38ww97638rds6l5bysra43hkhv47fy71fvq89623zgyxn"; + }) + (fetchNuGet { + name = "LibHac"; + version = "0.12.0"; + sha256 = "08r9b9cdcbz6339sw8r5dfy2a8iw53df0j3xq9rygkg02xspimld"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; + version = "3.1.8"; + sha256 = "140zr3nwkmf6xc52gq4iz6ycyh95fxy0jpgn637pkd9z423z8135"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.App.Runtime.osx-x64"; + version = "3.1.8"; + sha256 = "0dkib4r4v5wqxsi6zca6x3zin1x4lha53dqbgsaiah961h1yhpp4"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.App.Runtime.win-x64"; + version = "3.1.8"; + sha256 = "05sv39b6sc8fhh3m8kwq0lp58n8mrv5ivxa60rfqk6v6i7gs8b0f"; + }) + (fetchNuGet { + name = "Microsoft.CodeCoverage"; + version = "16.7.0"; + sha256 = "10f6y1q8w61vc8ffqd7jsndwfskkfqbdzfqswyxnrr0qkkqx29v1"; + }) + (fetchNuGet { + name = "Microsoft.CSharp"; + version = "4.0.1"; + sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; + }) + (fetchNuGet { + name = "Microsoft.DotNet.InternalAbstractions"; + version = "1.0.0"; + sha256 = "0mp8ihqlb7fsa789frjzidrfjc1lrhk88qp3xm5qvr7vf4wy4z8x"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.App.Host.osx-x64"; + version = "3.1.8"; + sha256 = "1ip8pgra9z6ha3yc4xqkb85cl9kx2jbwhwzdi3dp8bkqbvlirvkb"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.App.Host.win-x64"; + version = "3.1.8"; + sha256 = "1d7wlnibf9fgq57hwnjqhlh33hxg417ljf1djb9yan4xik1wl4hb"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.App.Runtime.linux-x64"; + version = "3.1.8"; + sha256 = "1bv9n9wzsqf9g8h6z10p61xkcx8ad4nnip83qv8yyfvhr4kdmbsa"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.App.Runtime.osx-x64"; + version = "3.1.8"; + sha256 = "1iabp5czrz9wmsqcl0gi8r580vlhky3aak5ndz9fw065wlsqpv7w"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.App.Runtime.win-x64"; + version = "3.1.8"; + sha256 = "010c514ls1q9gdnyj0kvknx7a0z034lfbbcxqa8cjiv0snax4pqz"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "1.0.1"; + sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "1.1.0"; + sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "2.0.0"; + sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "3.1.0"; + sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Targets"; + version = "1.0.1"; + sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Targets"; + version = "1.1.0"; + sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; + }) + (fetchNuGet { + name = "Microsoft.NET.Test.Sdk"; + version = "16.7.0"; + sha256 = "1vkp6b82566z2pxn9035wrh4339kz3ki17g5qlwmwdbn4br6lcfy"; + }) + (fetchNuGet { + name = "Microsoft.TestPlatform.ObjectModel"; + version = "16.7.0"; + sha256 = "0nmw80ap2rn9h4i1x7qb15n763sh3wy8hjp1i5n0av7100g0yjqz"; + }) + (fetchNuGet { + name = "Microsoft.TestPlatform.TestHost"; + version = "16.7.0"; + sha256 = "0485nv0wcwdwjhif5a7d1i0znaf9acqyawhpqcwschw827chqzrs"; + }) + (fetchNuGet { + name = "Microsoft.Win32.Primitives"; + version = "4.0.1"; + sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; + }) + (fetchNuGet { + name = "Microsoft.Win32.Primitives"; + version = "4.3.0"; + sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; + }) + (fetchNuGet { + name = "Microsoft.Win32.Registry"; + version = "4.3.0"; + sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; + }) + (fetchNuGet { + name = "Microsoft.Win32.Registry"; + version = "4.5.0"; + sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; + }) + (fetchNuGet { + name = "Microsoft.Win32.Registry"; + version = "4.7.0"; + sha256 = "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs"; + }) + (fetchNuGet { + name = "Microsoft.Win32.SystemEvents"; + version = "4.5.0"; + sha256 = "0fnkv3ky12227zqg4zshx4kw2mvysq2ppxjibfw02cc3iprv4njq"; + }) + (fetchNuGet { + name = "Mono.Posix.NETStandard"; + version = "1.0.0"; + sha256 = "0xlja36hwpjm837haq15mjh2prcf68lyrmn72nvgpz8qnf9vappw"; + }) + (fetchNuGet { + name = "MsgPack.Cli"; + version = "1.0.1"; + sha256 = "1dk2bs3g16lsxcjjm7gfx6jxa4667wccw94jlh2ql7y7smvh9z8r"; + }) + (fetchNuGet { + name = "NETStandard.Library"; + version = "1.6.0"; + sha256 = "0nmmv4yw7gw04ik8ialj3ak0j6pxa9spih67hnn1h2c38ba8h58k"; + }) + (fetchNuGet { + name = "NETStandard.Library"; + version = "2.0.0"; + sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "12.0.2"; + sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "9.0.1"; + sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; + }) + (fetchNuGet { + name = "NuGet.Frameworks"; + version = "5.0.0"; + sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; + }) + (fetchNuGet { + name = "NUnit"; + version = "3.12.0"; + sha256 = "1880j2xwavi8f28vxan3hyvdnph4nlh5sbmh285s4lc9l0b7bdk2"; + }) + (fetchNuGet { + name = "NUnit3TestAdapter"; + version = "3.17.0"; + sha256 = "0kxc6z3b8ccdrcyqz88jm5yh5ch9nbg303v67q8sp5hhs8rl8nk6"; + }) + (fetchNuGet { + name = "OpenTK.NetStandard"; + version = "1.0.5.22"; + sha256 = "10bdhc4qbffac862zg03ab5j3iqrr33bydxmnmrxn82brldahm23"; + }) + (fetchNuGet { + name = "PangoSharp"; + version = "3.22.25.56"; + sha256 = "12b0761nfsci4rvzcba4hrh5rcn6q24qaxwwz66myb82c999qj8w"; + }) + (fetchNuGet { + name = "runtime.any.System.Collections"; + version = "4.3.0"; + sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; + }) + (fetchNuGet { + name = "runtime.any.System.Diagnostics.Tools"; + version = "4.3.0"; + sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; + }) + (fetchNuGet { + name = "runtime.any.System.Diagnostics.Tracing"; + version = "4.3.0"; + sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; + }) + (fetchNuGet { + name = "runtime.any.System.Globalization"; + version = "4.3.0"; + sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; + }) + (fetchNuGet { + name = "runtime.any.System.Globalization.Calendars"; + version = "4.3.0"; + sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; + }) + (fetchNuGet { + name = "runtime.any.System.IO"; + version = "4.3.0"; + sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; + }) + (fetchNuGet { + name = "runtime.any.System.Reflection"; + version = "4.3.0"; + sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; + }) + (fetchNuGet { + name = "runtime.any.System.Reflection.Extensions"; + version = "4.3.0"; + sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; + }) + (fetchNuGet { + name = "runtime.any.System.Reflection.Primitives"; + version = "4.3.0"; + sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; + }) + (fetchNuGet { + name = "runtime.any.System.Resources.ResourceManager"; + version = "4.3.0"; + sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; + }) + (fetchNuGet { + name = "runtime.any.System.Runtime"; + version = "4.3.0"; + sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; + }) + (fetchNuGet { + name = "runtime.any.System.Runtime.Handles"; + version = "4.3.0"; + sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; + }) + (fetchNuGet { + name = "runtime.any.System.Runtime.InteropServices"; + version = "4.3.0"; + sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; + }) + (fetchNuGet { + name = "runtime.any.System.Text.Encoding"; + version = "4.3.0"; + sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; + }) + (fetchNuGet { + name = "runtime.any.System.Text.Encoding.Extensions"; + version = "4.3.0"; + sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; + }) + (fetchNuGet { + name = "runtime.any.System.Threading.Tasks"; + version = "4.3.0"; + sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; + }) + (fetchNuGet { + name = "runtime.any.System.Threading.Timer"; + version = "4.3.0"; + sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; + }) + (fetchNuGet { + name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; + }) + (fetchNuGet { + name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; + }) + (fetchNuGet { + name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; + }) + (fetchNuGet { + name = "runtime.native.System"; + version = "4.0.0"; + sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; + }) + (fetchNuGet { + name = "runtime.native.System"; + version = "4.3.0"; + sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; + }) + (fetchNuGet { + name = "runtime.native.System.IO.Compression"; + version = "4.1.0"; + sha256 = "0d720z4lzyfcabmmnvh0bnj76ll7djhji2hmfh3h44sdkjnlkknk"; + }) + (fetchNuGet { + name = "runtime.native.System.Net.Http"; + version = "4.0.1"; + sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; + }) + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography"; + version = "4.0.0"; + sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; + }) + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; + }) + (fetchNuGet { + name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; + }) + (fetchNuGet { + name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; + }) + (fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; + }) + (fetchNuGet { + name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; + }) + (fetchNuGet { + name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; + }) + (fetchNuGet { + name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; + }) + (fetchNuGet { + name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; + }) + (fetchNuGet { + name = "runtime.unix.Microsoft.Win32.Primitives"; + version = "4.3.0"; + sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; + }) + (fetchNuGet { + name = "runtime.unix.System.Console"; + version = "4.3.0"; + sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; + }) + (fetchNuGet { + name = "runtime.unix.System.Diagnostics.Debug"; + version = "4.3.0"; + sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; + }) + (fetchNuGet { + name = "runtime.unix.System.IO.FileSystem"; + version = "4.3.0"; + sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; + }) + (fetchNuGet { + name = "runtime.unix.System.Net.Primitives"; + version = "4.3.0"; + sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; + }) + (fetchNuGet { + name = "runtime.unix.System.Net.Sockets"; + version = "4.3.0"; + sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; + }) + (fetchNuGet { + name = "runtime.unix.System.Private.Uri"; + version = "4.3.0"; + sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; + }) + (fetchNuGet { + name = "runtime.unix.System.Runtime.Extensions"; + version = "4.3.0"; + sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; + }) + (fetchNuGet { + name = "runtime.win.Microsoft.Win32.Primitives"; + version = "4.3.0"; + sha256 = "0k1h8nnp1s0p8rjwgjyj1387cc1yycv0k22igxc963lqdzrx2z36"; + }) + (fetchNuGet { + name = "runtime.win.System.Console"; + version = "4.3.0"; + sha256 = "0x2yajfrbc5zc6g7nmlr44xpjk6p1hxjq47jn3xki5j7i33zw9jc"; + }) + (fetchNuGet { + name = "runtime.win.System.Diagnostics.Debug"; + version = "4.3.0"; + sha256 = "16fbn4bcynad1ygdq0yk1wmckvs8jvrrf104xa5dc2hlc8y3x58f"; + }) + (fetchNuGet { + name = "runtime.win.System.IO.FileSystem"; + version = "4.3.0"; + sha256 = "1c01nklbxywszsbfaxc76hsz7gdxac3jkphrywfkdsi3v4bwd6g8"; + }) + (fetchNuGet { + name = "runtime.win.System.Net.Primitives"; + version = "4.3.0"; + sha256 = "1dixh195bi7473n17hspll6i562gghdz9m4jk8d4kzi1mlzjk9cf"; + }) + (fetchNuGet { + name = "runtime.win.System.Net.Sockets"; + version = "4.3.0"; + sha256 = "0lr3zki831vs6qhk5wckv2b9qbfk9rcj0ds2926qvj1b9y9m6sck"; + }) + (fetchNuGet { + name = "runtime.win.System.Runtime.Extensions"; + version = "4.3.0"; + sha256 = "1700famsxndccfbcdz9q14qb20p49lax67mqwpgy4gx3vja1yczr"; + }) + (fetchNuGet { + name = "Ryujinx.Graphics.Nvdec.Dependencies"; + version = "4.3.0"; + sha256 = "0szgbdhyhvzpw8nb9k2ww37p5qipab1pdll8idkk57y5xnl2f7ll"; + }) + (fetchNuGet { + name = "SharpZipLib"; + version = "1.2.0"; + sha256 = "0ynhx1qkjm723bwjwsrdviw1d2s9azndpa12dagrjshhma3igqm5"; + }) + (fetchNuGet { + name = "System.AppContext"; + version = "4.1.0"; + sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; + }) + (fetchNuGet { + name = "System.Buffers"; + version = "4.0.0"; + sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr"; + }) + (fetchNuGet { + name = "System.Buffers"; + version = "4.3.0"; + sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; + }) + (fetchNuGet { + name = "System.CodeDom"; + version = "4.4.0"; + sha256 = "1zgbafm5p380r50ap5iddp11kzhr9khrf2pnai6k593wjar74p1g"; + }) + (fetchNuGet { + name = "System.CodeDom"; + version = "4.7.0"; + sha256 = "1lch8gwmw420wsvbv9ir4v5g1ij2ag23cbgi3c9gramj1h4vhlz2"; + }) + (fetchNuGet { + name = "System.Collections"; + version = "4.0.11"; + sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; + }) + (fetchNuGet { + name = "System.Collections"; + version = "4.3.0"; + sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; + }) + (fetchNuGet { + name = "System.Collections.Concurrent"; + version = "4.0.12"; + sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; + }) + (fetchNuGet { + name = "System.Collections.NonGeneric"; + version = "4.3.0"; + sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; + }) + (fetchNuGet { + name = "System.Collections.Specialized"; + version = "4.3.0"; + sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; + }) + (fetchNuGet { + name = "System.ComponentModel"; + version = "4.3.0"; + sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; + }) + (fetchNuGet { + name = "System.ComponentModel.EventBasedAsync"; + version = "4.3.0"; + sha256 = "1rv9bkb8yyhqqqrx6x95njv6mdxlbvv527b44mrd93g8fmgkifl7"; + }) + (fetchNuGet { + name = "System.ComponentModel.Primitives"; + version = "4.3.0"; + sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; + }) + (fetchNuGet { + name = "System.ComponentModel.TypeConverter"; + version = "4.3.0"; + sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; + }) + (fetchNuGet { + name = "System.Console"; + version = "4.0.0"; + sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; + }) + (fetchNuGet { + name = "System.Diagnostics.Debug"; + version = "4.0.11"; + sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; + }) + (fetchNuGet { + name = "System.Diagnostics.Debug"; + version = "4.3.0"; + sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; + }) + (fetchNuGet { + name = "System.Diagnostics.DiagnosticSource"; + version = "4.0.0"; + sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; + }) + (fetchNuGet { + name = "System.Diagnostics.Process"; + version = "4.3.0"; + sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tools"; + version = "4.0.1"; + sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tracing"; + version = "4.1.0"; + sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tracing"; + version = "4.3.0"; + sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; + }) + (fetchNuGet { + name = "System.Drawing.Common"; + version = "4.5.0"; + sha256 = "0knqa0zsm91nfr34br8gx5kjqq4v81zdhqkacvs2hzc8nqk0ddhc"; + }) + (fetchNuGet { + name = "System.Dynamic.Runtime"; + version = "4.0.11"; + sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; + }) + (fetchNuGet { + name = "System.Globalization"; + version = "4.0.11"; + sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; + }) + (fetchNuGet { + name = "System.Globalization"; + version = "4.3.0"; + sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; + }) + (fetchNuGet { + name = "System.Globalization.Calendars"; + version = "4.0.1"; + sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; + }) + (fetchNuGet { + name = "System.Globalization.Extensions"; + version = "4.0.1"; + sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; + }) + (fetchNuGet { + name = "System.Globalization.Extensions"; + version = "4.3.0"; + sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; + }) + (fetchNuGet { + name = "System.IO"; + version = "4.1.0"; + sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; + }) + (fetchNuGet { + name = "System.IO"; + version = "4.3.0"; + sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; + }) + (fetchNuGet { + name = "System.IO.Compression"; + version = "4.1.0"; + sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; + }) + (fetchNuGet { + name = "System.IO.Compression.ZipFile"; + version = "4.0.1"; + sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; + }) + (fetchNuGet { + name = "System.IO.FileSystem"; + version = "4.0.1"; + sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; + }) + (fetchNuGet { + name = "System.IO.FileSystem"; + version = "4.3.0"; + sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; + }) + (fetchNuGet { + name = "System.IO.FileSystem.Primitives"; + version = "4.0.1"; + sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; + }) + (fetchNuGet { + name = "System.IO.FileSystem.Primitives"; + version = "4.3.0"; + sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; + }) + (fetchNuGet { + name = "System.Linq"; + version = "4.1.0"; + sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; + }) + (fetchNuGet { + name = "System.Linq"; + version = "4.3.0"; + sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; + }) + (fetchNuGet { + name = "System.Linq.Expressions"; + version = "4.1.0"; + sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; + }) + (fetchNuGet { + name = "System.Management"; + version = "4.7.0"; + sha256 = "0aw61jl6l78liiq04afxplz0ad5qbyg6vmyjaqrlnrv7whb58n66"; + }) + (fetchNuGet { + name = "System.Net.Http"; + version = "4.1.0"; + sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; + }) + (fetchNuGet { + name = "System.Net.NameResolution"; + version = "4.3.0"; + sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; + }) + (fetchNuGet { + name = "System.Net.Primitives"; + version = "4.0.11"; + sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; + }) + (fetchNuGet { + name = "System.Net.Sockets"; + version = "4.1.0"; + sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls"; + }) + (fetchNuGet { + name = "System.Numerics.Vectors"; + version = "4.3.0"; + sha256 = "05kji1mv4sl75iwmc613p873145nynm02xiajx8pn0h2kx53d23s"; + }) + (fetchNuGet { + name = "System.ObjectModel"; + version = "4.0.12"; + sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; + }) + (fetchNuGet { + name = "System.Private.Uri"; + version = "4.3.0"; + sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; + }) + (fetchNuGet { + name = "System.Reflection"; + version = "4.1.0"; + sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; + }) + (fetchNuGet { + name = "System.Reflection"; + version = "4.3.0"; + sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; + }) + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.0.1"; + sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; + }) + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.3.0"; + sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.ILGeneration"; + version = "4.0.1"; + sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.ILGeneration"; + version = "4.3.0"; + sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.Lightweight"; + version = "4.0.1"; + sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.Lightweight"; + version = "4.3.0"; + sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; + }) + (fetchNuGet { + name = "System.Reflection.Extensions"; + version = "4.0.1"; + sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; + }) + (fetchNuGet { + name = "System.Reflection.Extensions"; + version = "4.3.0"; + sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; + }) + (fetchNuGet { + name = "System.Reflection.Primitives"; + version = "4.0.1"; + sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; + }) + (fetchNuGet { + name = "System.Reflection.Primitives"; + version = "4.3.0"; + sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; + }) + (fetchNuGet { + name = "System.Reflection.TypeExtensions"; + version = "4.1.0"; + sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; + }) + (fetchNuGet { + name = "System.Reflection.TypeExtensions"; + version = "4.3.0"; + sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; + }) + (fetchNuGet { + name = "System.Resources.ResourceManager"; + version = "4.0.1"; + sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; + }) + (fetchNuGet { + name = "System.Resources.ResourceManager"; + version = "4.3.0"; + sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; + }) + (fetchNuGet { + name = "System.Runtime"; + version = "4.1.0"; + sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; + }) + (fetchNuGet { + name = "System.Runtime"; + version = "4.3.0"; + sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; + }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.6.0"; + sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m"; + }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "5.0.0-preview.7.20364.11"; + sha256 = "19sl184f6rjhfsizq0vapysazd6yd66lf638rszvrdhqlsxssz2m"; + }) + (fetchNuGet { + name = "System.Runtime.Extensions"; + version = "4.1.0"; + sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; + }) + (fetchNuGet { + name = "System.Runtime.Extensions"; + version = "4.3.0"; + sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; + }) + (fetchNuGet { + name = "System.Runtime.Handles"; + version = "4.0.1"; + sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; + }) + (fetchNuGet { + name = "System.Runtime.Handles"; + version = "4.3.0"; + sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices"; + version = "4.1.0"; + sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices"; + version = "4.3.0"; + sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices.RuntimeInformation"; + version = "4.0.0"; + sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices.RuntimeInformation"; + version = "4.3.0"; + sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; + }) + (fetchNuGet { + name = "System.Runtime.Numerics"; + version = "4.0.1"; + sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; + }) + (fetchNuGet { + name = "System.Runtime.Serialization.Primitives"; + version = "4.1.1"; + sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; + }) + (fetchNuGet { + name = "System.Security.AccessControl"; + version = "4.5.0"; + sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; + }) + (fetchNuGet { + name = "System.Security.AccessControl"; + version = "4.7.0"; + sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz"; + }) + (fetchNuGet { + name = "System.Security.Claims"; + version = "4.3.0"; + sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Algorithms"; + version = "4.2.0"; + sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Cng"; + version = "4.2.0"; + sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Csp"; + version = "4.0.0"; + sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Encoding"; + version = "4.0.0"; + sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.OpenSsl"; + version = "4.0.0"; + sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Primitives"; + version = "4.0.0"; + sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.X509Certificates"; + version = "4.1.0"; + sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; + }) + (fetchNuGet { + name = "System.Security.Principal"; + version = "4.3.0"; + sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; + }) + (fetchNuGet { + name = "System.Security.Principal.Windows"; + version = "4.3.0"; + sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; + }) + (fetchNuGet { + name = "System.Security.Principal.Windows"; + version = "4.5.0"; + sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; + }) + (fetchNuGet { + name = "System.Security.Principal.Windows"; + version = "4.7.0"; + sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; + }) + (fetchNuGet { + name = "System.Text.Encoding"; + version = "4.0.11"; + sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; + }) + (fetchNuGet { + name = "System.Text.Encoding"; + version = "4.3.0"; + sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; + }) + (fetchNuGet { + name = "System.Text.Encoding.Extensions"; + version = "4.0.11"; + sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; + }) + (fetchNuGet { + name = "System.Text.Encoding.Extensions"; + version = "4.3.0"; + sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; + }) + (fetchNuGet { + name = "System.Text.RegularExpressions"; + version = "4.1.0"; + sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; + }) + (fetchNuGet { + name = "System.Text.RegularExpressions"; + version = "4.3.0"; + sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; + }) + (fetchNuGet { + name = "System.Threading"; + version = "4.0.11"; + sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; + }) + (fetchNuGet { + name = "System.Threading"; + version = "4.3.0"; + sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; + }) + (fetchNuGet { + name = "System.Threading.Overlapped"; + version = "4.3.0"; + sha256 = "1nahikhqh9nk756dh8p011j36rlcp1bzz3vwi2b4m1l2s3vz8idm"; + }) + (fetchNuGet { + name = "System.Threading.Tasks"; + version = "4.0.11"; + sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; + }) + (fetchNuGet { + name = "System.Threading.Tasks"; + version = "4.3.0"; + sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; + }) + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.0.0"; + sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; + }) + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.3.0"; + sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; + }) + (fetchNuGet { + name = "System.Threading.Thread"; + version = "4.3.0"; + sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; + }) + (fetchNuGet { + name = "System.Threading.ThreadPool"; + version = "4.3.0"; + sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; + }) + (fetchNuGet { + name = "System.Threading.Timer"; + version = "4.0.1"; + sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; + }) + (fetchNuGet { + name = "System.Xml.ReaderWriter"; + version = "4.0.11"; + sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; + }) + (fetchNuGet { + name = "System.Xml.ReaderWriter"; + version = "4.3.0"; + sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; + }) + (fetchNuGet { + name = "System.Xml.XDocument"; + version = "4.0.11"; + sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; + }) + (fetchNuGet { + name = "System.Xml.XmlDocument"; + version = "4.3.0"; + sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; + }) + (fetchNuGet { + name = "System.Xml.XPath"; + version = "4.3.0"; + sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; + }) + (fetchNuGet { + name = "System.Xml.XPath.XmlDocument"; + version = "4.3.0"; + sha256 = "1h9lh7qkp0lff33z847sdfjj8yaz98ylbnkbxlnsbflhj9xyfqrm"; + }) +] diff --git a/pkgs/misc/emulators/ryujinx/fetch-deps.sh b/pkgs/misc/emulators/ryujinx/fetch-deps.sh new file mode 100755 index 000000000000..ce9873a16929 --- /dev/null +++ b/pkgs/misc/emulators/ryujinx/fetch-deps.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq common-updater-scripts dotnet-sdk_3 +set -eo pipefail +cd "$(dirname "${BASH_SOURCE[0]}")" + +deps_file="$(realpath "./deps.nix")" + +# Setup empty nuget package folder to force reinstall. +mkdir ./nuget_tmp.packages +cat >./nuget_tmp.config <<EOF +<?xml version="1.0" encoding="utf-8"?> +<configuration> + <packageSources> + <add key="nuget" value="https://api.nuget.org/v3/index.json" /> + </packageSources> + <config> + <add key="globalPackagesFolder" value="$(realpath ./nuget_tmp.packages)" /> + </config> +</configuration> +EOF + +dotnet restore Ryujinx.sln --configfile ./nuget_tmp.config + +echo "{ fetchNuGet }: [" >"$deps_file" +while read pkg_spec; do + { read pkg_name; read pkg_version; } < <( + # Build version part should be ignored: `3.0.0-beta2.20059.3+77df2220` -> `3.0.0-beta2.20059.3` + sed -nE 's/.*<id>([^<]*).*/\1/p; s/.*<version>([^<+]*).*/\1/p' "$pkg_spec") + pkg_sha256="$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkg_spec")"/*.nupkg)" + cat >>"$deps_file" <<EOF + (fetchNuGet { + name = "$pkg_name"; + version = "$pkg_version"; + sha256 = "$pkg_sha256"; + }) +EOF +done < <(find ./nuget_tmp.packages -name '*.nuspec' | sort) +echo "]" >>"$deps_file" + +popd +rm -r "$src" diff --git a/pkgs/misc/emulators/ryujinx/log.patch b/pkgs/misc/emulators/ryujinx/log.patch new file mode 100644 index 000000000000..7283ef9e7d5d --- /dev/null +++ b/pkgs/misc/emulators/ryujinx/log.patch @@ -0,0 +1,13 @@ +diff --git a/Ryujinx.Common/Configuration/LoggerModule.cs b/Ryujinx.Common/Configuration/LoggerModule.cs +index 20c0fb46..534576bc 100644 +--- a/Ryujinx.Common/Configuration/LoggerModule.cs ++++ b/Ryujinx.Common/Configuration/LoggerModule.cs +@@ -75,7 +75,7 @@ namespace Ryujinx.Configuration + if (e.NewValue) + { + Logger.AddTarget(new AsyncLogTargetWrapper( +- new FileLogTarget(AppDomain.CurrentDomain.BaseDirectory, "file"), ++ new FileLogTarget(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Ryujinx"), "file"), + 1000, + AsyncLogTargetOverflowAction.Block + )); diff --git a/pkgs/misc/emulators/sameboy/default.nix b/pkgs/misc/emulators/sameboy/default.nix new file mode 100644 index 000000000000..e90cc5a00f50 --- /dev/null +++ b/pkgs/misc/emulators/sameboy/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchFromGitHub, gtk3, rgbds, SDL2, wrapGAppsHook, glib }: + +stdenv.mkDerivation rec { + pname = "sameboy"; + version = "0.13.6"; + + src = fetchFromGitHub { + owner = "LIJI32"; + repo = "SameBoy"; + rev = "v${version}"; + sha256 = "04w8lybi7ssnax37ka4qw7pmcm7cgnmk90p9m73zbyp5chgpqqzc"; + }; + + enableParallelBuilding = true; + # glib and wrapGAppsHook are needed to make the Open ROM menu work. + nativeBuildInputs = [ rgbds glib wrapGAppsHook ]; + buildInputs = [ SDL2 ]; + + makeFlags = "CONF=release DATA_DIR=$(out)/share/sameboy/"; + + patchPhase = '' + sed 's/-Werror //g' -i Makefile + sed 's@"libgtk-3.so"@"${gtk3}/lib/libgtk-3.so"@g' -i OpenDialog/gtk.c + ''; + + installPhase = '' + pushd build/bin/SDL + install -Dm755 sameboy $out/bin/sameboy + rm sameboy + mkdir -p $out/share/sameboy + cp -r * $out/share/sameboy + popd + ''; + + meta = with stdenv.lib; { + homepage = "https://sameboy.github.io"; + description = "Game Boy, Game Boy Color, and Super Game Boy emulator"; + + longDescription = '' + SameBoy is a user friendly Game Boy, Game Boy Color and Super + Game Boy emulator for macOS, Windows and Unix-like platforms. + SameBoy is extremely accurate and includes a wide range of + powerful debugging features, making it ideal for both casual + players and developers. In addition to accuracy and developer + capabilities, SameBoy has all the features one would expect from + an emulator – from save states to scaling filters. + ''; + + license = licenses.mit; + maintainers = with maintainers; [ NieDzejkob ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/emulators/simh/default.nix b/pkgs/misc/emulators/simh/default.nix new file mode 100644 index 000000000000..50e02a8f2403 --- /dev/null +++ b/pkgs/misc/emulators/simh/default.nix @@ -0,0 +1,62 @@ +{ stdenv +, fetchFromGitHub +, SDL2 +, SDL2_ttf +, libpcap +, vde2 +, pcre +}: + +stdenv.mkDerivation rec { + pname = "simh"; + version = "3.11-1"; + + src = fetchFromGitHub { + owner = "simh"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-65+YfOWpVXPeT64TZcSaWJY+ODQ0q/pwF9jb8xGdpIs="; + }; + + buildInputs = [ SDL2 SDL2_ttf libpcap vde2 pcre ]; + + dontConfigure = true; + + makeFlags = [ "GCC=cc" "CC_STD=-std=c99" "LDFLAGS=-lm" ]; + + preInstall = '' + install -d ${placeholder "out"}/bin + install -d ${placeholder "out"}/share/simh + ''; + + installPhase = '' + runHook preInstall + for i in BIN/*; do + install -D $i ${placeholder "out"}/bin + done + for i in VAX/*bin; do + install -D $i ${placeholder "out"}/share/simh + done + runHook postInstall + ''; + + postInstall = '' + (cd $out/bin; for i in *; do ln -s $i simh-$i; done) + ''; + + meta = with stdenv.lib; { + homepage = "http://simh.trailing-edge.com/"; + description = "A collection of simulators of historic hardware"; + longDescription = '' + SimH (History Simulator) is a collection of simulators for historically + significant or just plain interesting computer hardware and software from + the past. The goal of the project is to create highly portable system + simulators and to publish them as freeware on the Internet, with freely + available copies of significant or representative software. + ''; + license = with licenses; mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; + }; +} +# TODO: install documentation diff --git a/pkgs/misc/emulators/simplenes/default.nix b/pkgs/misc/emulators/simplenes/default.nix new file mode 100644 index 000000000000..d4805a62d761 --- /dev/null +++ b/pkgs/misc/emulators/simplenes/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, fetchFromGitHub +, cmake +, sfml +}: + +stdenv.mkDerivation rec { + pname = "simplenes"; + version = "unstable-2019-03-13"; + + src = fetchFromGitHub { + owner = "amhndu"; + repo = "SimpleNES"; + rev = "4edb7117970c21a33b3bfe11a6606764fffc5173"; + sha256 = "1nmwj431iwqzzcykxd4xinqmg0rm14mx7zsjyhcc5skz7pihz86g"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ sfml ]; + + installPhase = '' + mkdir -p $out/bin + cp ./SimpleNES $out/bin + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/amhndu/SimpleNES"; + description = "An NES emulator written in C++"; + license = licenses.gpl3; + maintainers = with maintainers; [ ivar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix index 6560024b19e0..f33af245f710 100644 --- a/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, wrapGAppsHook , SDL2, zlib, gtk3, libxml2, libXv, epoxy, minizip, pulseaudio, portaudio }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkgconfig wrapGAppsHook ]; buildInputs = [ SDL2 zlib gtk3 libxml2 libXv epoxy minizip pulseaudio portaudio ]; preConfigure = "cd gtk"; diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix index 14189e5b3871..ece734ef4bca 100644 --- a/pkgs/misc/emulators/stella/default.nix +++ b/pkgs/misc/emulators/stella/default.nix @@ -1,33 +1,31 @@ -{ stdenv, fetchFromGitHub, pkgconfig, SDL2 }: +{ stdenv, fetchFromGitHub, pkg-config, SDL2 }: -with stdenv.lib; stdenv.mkDerivation rec { - pname = "stella"; - version = "6.1.2"; + version = "6.4"; src = fetchFromGitHub { owner = "stella-emu"; - repo = "stella"; + repo = pname; rev = version; - sha256 = "0m4vdgn7gqhga7hamy4djnlkfgz78gfkmg8by3mai5lw0cps7hr1"; + sha256 = "0gva6pw5c1pplcf2g48zmm24h1134v0vr705rbzj4v6ifp3adrsl"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL2 ]; - + enableParallelBuilding = true; - meta = { + meta = with stdenv.lib;{ description = "An open-source Atari 2600 VCS emulator"; longDescription = '' Stella is a multi-platform Atari 2600 VCS emulator released under the GNU General Public License (GPL). Stella was originally developed for Linux by Bradford W. Mott, and is currently maintained by Stephen Anthony. - As of its 3.5 release, Stella is officially donationware. + As of its 3.5 release, Stella is officially donationware. ''; - homepage = "http://stella-emu.github.io/"; + homepage = "https://stella-emu.github.io/"; license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/misc/emulators/tilem/default.nix b/pkgs/misc/emulators/tilem/default.nix new file mode 100644 index 000000000000..8a6c5075c9b3 --- /dev/null +++ b/pkgs/misc/emulators/tilem/default.nix @@ -0,0 +1,78 @@ +{ stdenv +, fetchurl +, lib +, libarchive +, autoreconfHook +, pkgconfig +, glib +, libusb1 +, darwin +, acl +, lzma +, bzip2 +, gnome2 +}: +let + libticonv = stdenv.mkDerivation rec { + pname = "libticonv"; + version = "1.1.5"; + src = fetchurl { + url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; + sha256 = "0y080v12bm81wgjm6fnw7q0yg7scphm8hhrls9njcszj7fkscv9i"; + }; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ glib ]; + configureFlags = [ "--enable-iconv" ]; + }; + libticables2 = stdenv.mkDerivation rec { + pname = "libticables2"; + version = "1.3.5"; + src = fetchurl { + url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; + sha256 = "08j5di0cgix9vcpdv7b8xhxdjkk9zz7fqfnv3l4apk3jdr8vcvqc"; + }; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ glib libusb1 ]; + configureFlags = [ "--enable-libusb10" ]; + }; + libticalcs2 = stdenv.mkDerivation rec { + pname = "libticalcs2"; + version = "1.1.9"; + src = fetchurl { + url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; + sha256 = "08c9wgrdnyqcs45mx1bjb8riqq81bzfkhgaijxzn96rhpj40fy3n"; + }; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ glib libticables2 libticonv libtifiles2 lzma bzip2 ] + ++ lib.optionals stdenv.isLinux [ acl ] + ++ lib.optionals stdenv.isDarwin [ darwin.libobjc ]; + }; + libtifiles2 = stdenv.mkDerivation rec { + pname = "libtifiles2"; + version = "1.1.7"; + src = fetchurl { + url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; + sha256 = "10n9mhlabmaw3ha5ckllxfy6fygs2pmlmj5v6w5v62bvx54kpils"; + }; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ glib libticonv libarchive lzma bzip2 ]; + }; +in +stdenv.mkDerivation rec { + pname = "tilem"; + version = "2.0"; + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; + sha256 = "1ba38xzhp3yf21ip3cgql6jzy49jc34sfnjsl4syxyrd81d269zw"; + }; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gnome2.gtk libticonv libtifiles2 libticables2 libticalcs2 ]; + NIX_CFLAGS_COMPILE = [ "-lm" ]; + meta = with stdenv.lib; { + homepage = "http://lpg.ticalc.org/prj_tilem/"; + description = "Emulator and debugger for Texas Instruments Z80-based graphing calculators"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ siraben ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix index ca3149785a4d..c80d820059fa 100644 --- a/pkgs/misc/emulators/vice/default.nix +++ b/pkgs/misc/emulators/vice/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { comment = "Commodore 64 emulator"; desktopName = "VICE"; genericName = "Commodore 64 emulator"; - categories = "Application;Emulator;"; + categories = "Emulator;"; }; preBuild = '' diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 025158b07173..0be36daac9f9 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -1,7 +1,8 @@ { stdenv, lib, pkgArches, callPackage, - name, version, src, monos, geckos, platforms, + name, version, src, mingwGccs, monos, geckos, platforms, pkgconfig, fontforge, makeWrapper, flex, bison, supportFlags, + patches, buildScript ? null, configureFlags ? [] }: @@ -9,15 +10,21 @@ with import ./util.nix { inherit lib; }; let vkd3d = callPackage ./vkd3d.nix {}; + patches' = patches; in stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { builder = buildScript; }) // rec { inherit name src configureFlags; + # Fixes "Compiler cannot create executables" building wineWow with mingwSupport + # FIXME Breaks wineStaging builds + strictDeps = supportFlags.mingwSupport; + nativeBuildInputs = [ pkgconfig fontforge makeWrapper flex bison - ]; + ] + ++ lib.optionals supportFlags.mingwSupport mingwGccs; buildInputs = toBuildInputs pkgArches (with supportFlags; (pkgs: [ pkgs.freetype ] @@ -68,10 +75,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ]) ++ [ pkgs.xorg.libX11 pkgs.perl ])); - patches = [ - # Also look for root certificates at $NIX_SSL_CERT_FILE - ./cert-path.patch - ]; + patches = [ ] ++ patches'; # Wine locates a lot of libraries dynamically through dlopen(). Add # them to the RPATH so that the user doesn't have to set them in @@ -92,6 +96,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { # drive_c/windows/system32 will only contain a few files instead of # hundreds, there will be an error about winemenubuilder and MountMgr # on startup of Wine, and the Drives tab in winecfg will show an error. + # TODO: binutils 2.34 contains a fix for this bug, re-enable stripping once available. dontStrip = true; ## FIXME @@ -136,7 +141,8 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { # https://bugs.winehq.org/show_bug.cgi?id=43530 # https://github.com/NixOS/nixpkgs/issues/31989 hardeningDisable = [ "bindnow" ] - ++ lib.optional (stdenv.hostPlatform.isDarwin) "fortify"; + ++ lib.optional (stdenv.hostPlatform.isDarwin) "fortify" + ++ lib.optional (supportFlags.mingwSupport) "format"; passthru = { inherit pkgArches; }; meta = { diff --git a/pkgs/misc/emulators/wine/cert-path-stable.patch b/pkgs/misc/emulators/wine/cert-path-stable.patch new file mode 100644 index 000000000000..da01a4778102 --- /dev/null +++ b/pkgs/misc/emulators/wine/cert-path-stable.patch @@ -0,0 +1,24 @@ +diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c +index f795181..fb4926a 100644 +--- a/dlls/crypt32/rootstore.c ++++ b/dlls/crypt32/rootstore.c +@@ -18,6 +18,7 @@ + #include "config.h" + #include <stdarg.h> + #include <stdio.h> ++#include <stdlib.h> /* getenv */ + #include <sys/types.h> + #ifdef HAVE_SYS_STAT_H + #include <sys/stat.h> +@@ -916,6 +917,11 @@ static void read_trusted_roots_from_known_locations(HCERTSTORE store) + + for (i = 0; !ret && i < ARRAY_SIZE(CRYPT_knownLocations); i++) + ret = import_certs_from_path(CRYPT_knownLocations[i], from, TRUE); ++ ++ char *nix_cert_file = getenv("NIX_SSL_CERT_FILE"); ++ if (nix_cert_file != NULL) ++ ret = import_certs_from_path(nix_cert_file, from, TRUE); ++ + check_and_store_certs(from, store); + } + CertCloseStore(from, 0); diff --git a/pkgs/misc/emulators/wine/cert-path.patch b/pkgs/misc/emulators/wine/cert-path.patch index da01a4778102..18a90e1a9af8 100644 --- a/pkgs/misc/emulators/wine/cert-path.patch +++ b/pkgs/misc/emulators/wine/cert-path.patch @@ -1,24 +1,23 @@ -diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c -index f795181..fb4926a 100644 ---- a/dlls/crypt32/rootstore.c -+++ b/dlls/crypt32/rootstore.c -@@ -18,6 +18,7 @@ - #include "config.h" +diff --git a/dlls/crypt32/unixlib.c b/dlls/crypt32/unixlib.c +index 035f2d936bb..959716d727a 100644 +--- a/dlls/crypt32/unixlib.c ++++ b/dlls/crypt32/unixlib.c +@@ -24,6 +24,7 @@ + #include "wine/port.h" + #include <stdarg.h> - #include <stdio.h> -+#include <stdlib.h> /* getenv */ - #include <sys/types.h> - #ifdef HAVE_SYS_STAT_H - #include <sys/stat.h> -@@ -916,6 +917,11 @@ static void read_trusted_roots_from_known_locations(HCERTSTORE store) ++#include <stdlib.h> + #include <dirent.h> + #include <fcntl.h> + #include <unistd.h> +@@ -605,6 +606,10 @@ static void load_root_certs(void) - for (i = 0; !ret && i < ARRAY_SIZE(CRYPT_knownLocations); i++) - ret = import_certs_from_path(CRYPT_knownLocations[i], from, TRUE); -+ -+ char *nix_cert_file = getenv("NIX_SSL_CERT_FILE"); -+ if (nix_cert_file != NULL) -+ ret = import_certs_from_path(nix_cert_file, from, TRUE); + for (i = 0; i < ARRAY_SIZE(CRYPT_knownLocations) && list_empty(&root_cert_list); i++) + import_certs_from_path( CRYPT_knownLocations[i], TRUE ); + - check_and_store_certs(from, store); - } - CertCloseStore(from, 0); ++ char *nix_cert_file = getenv("NIX_SSL_CERT_FILE"); ++ if (nix_cert_file != NULL) ++ import_certs_from_path(nix_cert_file, TRUE); + } + + static BOOL WINAPI enum_root_certs( void *buffer, SIZE_T size, SIZE_T *needed ) diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 368e2845ca40..24f827b25ffe 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -44,6 +44,7 @@ sdlSupport ? false, faudioSupport ? false, vkd3dSupport ? false, + mingwSupport ? false, }: let wine-build = build: release: @@ -56,7 +57,7 @@ let wine-build = build: release: gsmSupport gphoto2Support ldapSupport fontconfigSupport alsaSupport pulseaudioSupport xineramaSupport gtkSupport openclSupport xmlSupport tlsSupport openglSupport gstreamerSupport udevSupport vulkanSupport sdlSupport faudioSupport - vkd3dSupport; + vkd3dSupport mingwSupport; }; }); diff --git a/pkgs/misc/emulators/wine/packages.nix b/pkgs/misc/emulators/wine/packages.nix index 3ea60e62c665..c4fec3360e1f 100644 --- a/pkgs/misc/emulators/wine/packages.nix +++ b/pkgs/misc/emulators/wine/packages.nix @@ -1,4 +1,4 @@ -{ stdenv_32bit, lib, pkgs, pkgsi686Linux, callPackage, +{ stdenv_32bit, lib, pkgs, pkgsi686Linux, pkgsCross, callPackage, wineRelease ? "stable", supportFlags }: @@ -7,16 +7,18 @@ let src = lib.getAttr wineRelease (callPackage ./sources.nix {}); in with src; { wine32 = pkgsi686Linux.callPackage ./base.nix { name = "wine-${version}"; - inherit src version supportFlags; + inherit src version supportFlags patches; pkgArches = [ pkgsi686Linux ]; geckos = [ gecko32 ]; + mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc ]; monos = [ mono ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; wine64 = callPackage ./base.nix { name = "wine64-${version}"; - inherit src version supportFlags; + inherit src version supportFlags patches; pkgArches = [ pkgs ]; + mingwGccs = with pkgsCross; [ mingwW64.buildPackages.gcc ]; geckos = [ gecko64 ]; monos = [ mono ]; configureFlags = [ "--enable-win64" ]; @@ -24,10 +26,11 @@ in with src; { }; wineWow = callPackage ./base.nix { name = "wine-wow-${version}"; - inherit src version supportFlags; + inherit src version supportFlags patches; stdenv = stdenv_32bit; pkgArches = [ pkgs pkgsi686Linux ]; geckos = [ gecko32 gecko64 ]; + mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc mingwW64.buildPackages.gcc ]; monos = [ mono ]; buildScript = ./builder-wow.sh; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 964e08674ca6..4b16e78cd736 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -13,9 +13,9 @@ let fetchurl = args@{url, sha256, ...}: in rec { stable = fetchurl rec { - version = "5.0"; + version = "5.0.3"; url = "https://dl.winehq.org/wine/source/5.0/wine-${version}.tar.xz"; - sha256 = "1d0kcy338radq07hrnzcpc9lc9j2fvzjh37q673002x8d6x5058q"; + sha256 = "sha256-nBo1Ni/VE9/1yEW/dtpj6hBaeUrHFEqlA/cTYa820i8="; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { @@ -31,27 +31,48 @@ in rec { ## see http://wiki.winehq.org/Mono mono = fetchurl rec { - version = "4.9.4"; - url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}.msi"; - sha256 = "1p8g45xphxnns7dkg9rbaknarbjy5cjhrngaf0fsgk9z68wgz9ji"; + version = "5.1.1"; + url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; + sha256 = "09wjrfxbw0072iv6d2vqnkc3y7dzj15vp8mv4ay44n1qp5ji4m3l"; }; + + patches = [ + # Also look for root certificates at $NIX_SSL_CERT_FILE + ./cert-path-stable.patch + ]; }; unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "5.5"; + version = "5.22"; url = "https://dl.winehq.org/wine/source/5.x/wine-${version}.tar.xz"; - sha256 = "1z7mvl6fgk7cg8vmy157r8azcz89srnckbzvsc6cva7a1fdi7qx0"; + sha256 = "sha256-Cb0GyHyMl05q00UHzsh11yF+tW/Anfg41UU+DrvOTSE="; inherit (stable) mono gecko32 gecko64; + + patches = [ + # Also look for root certificates at $NIX_SSL_CERT_FILE + ./cert-path.patch + + # Hotfix picked from master for https://bugs.winehq.org/show_bug.cgi?id=50163 + (pkgs.fetchpatch { + url = "https://bugs.winehq.org/attachment.cgi?id=68680"; + sha256 = "sha256-GTPQhRWeu6DPadqgFiuVUjI6MzJPaTN4l//8DSG6hpo="; + }) + ]; }; staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "0wcj73xcxsk5897m5fg14cjir2md167m09jjjv9z9n6157bfr9fw"; + sha256 = "sha256-HzAKLPlybO1lrkHo4Q1Y9H0vmjiqo9HiT05TcX08Ubk="; owner = "wine-staging"; repo = "wine-staging"; - rev = "v${version}"; + #rev = "v${version}"; # revert back to this statement on next release + # Include hotfix for https://bugs.winehq.org/show_bug.cgi?id=50162 + rev = "f257f37b92041fc718de04aa83ec3139b748ffa2"; + + # Just keep list empty, if current release haven't broken patchsets + disabledPatchsets = [ ]; }; winetricks = fetchFromGitHub rec { diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix index 5c2469f8f44e..a628f5ded58b 100644 --- a/pkgs/misc/emulators/wine/staging.nix +++ b/pkgs/misc/emulators/wine/staging.nix @@ -7,8 +7,8 @@ let patch = (callPackage ./sources.nix {}).staging; (mkBuildInputs wineUnstable.pkgArches pkgNames) ++ extra; in assert stdenv.lib.getVersion wineUnstable == patch.version; -stdenv.lib.overrideDerivation wineUnstable (self: { - buildInputs = build-inputs [ "perl" "utillinux" "autoconf" ] self.buildInputs; +(stdenv.lib.overrideDerivation wineUnstable (self: { + buildInputs = build-inputs [ "perl" "util-linux" "autoconf" "gitMinimal" ] self.buildInputs; name = "${self.name}-staging"; @@ -18,7 +18,11 @@ stdenv.lib.overrideDerivation wineUnstable (self: { chmod +w patches cd patches patchShebangs gitapply.sh - ./patchinstall.sh DESTDIR="$PWD/.." --all + ./patchinstall.sh DESTDIR="$PWD/.." --all ${stdenv.lib.concatMapStringsSep " " (ps: "-W ${ps}") patch.disabledPatchsets} cd .. ''; -}) +})) // { + meta = wineUnstable.meta // { + description = wineUnstable.meta.description + " (with staging patches)"; + }; +} diff --git a/pkgs/misc/emulators/wine/vkd3d.nix b/pkgs/misc/emulators/wine/vkd3d.nix index 082eb0b90c67..91bef28559d5 100644 --- a/pkgs/misc/emulators/wine/vkd3d.nix +++ b/pkgs/misc/emulators/wine/vkd3d.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "vkd3d"; - version = "1.1"; + version = "1.2"; src = fetchurl { url = "https://dl.winehq.org/vkd3d/source/vkd3d-${version}.tar.xz"; - sha256 = "1dkayp95g1691w7n2yn1q9y7klq5xa921dgmn9a5vil0rihxqnj9"; + sha256 = "0szr1lw3xbgi9qjm13d1q4gyzzwv8i5wfxiwjg6dmwphrc7h6jxh"; }; buildInputs = [ vulkan-headers spirv-headers vulkan-loader ]; diff --git a/pkgs/misc/emulators/xcpc/default.nix b/pkgs/misc/emulators/xcpc/default.nix index 3806d25e5d00..75c30280e21f 100644 --- a/pkgs/misc/emulators/xcpc/default.nix +++ b/pkgs/misc/emulators/xcpc/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "A portable Amstrad CPC 464/664/6128 emulator written in C"; homepage = "https://www.xcpc-emulator.net"; license = licenses.gpl2Plus; - maintainers = [ maintainers.genesis ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/misc/flashfocus/default.nix b/pkgs/misc/flashfocus/default.nix new file mode 100644 index 000000000000..98f368132a91 --- /dev/null +++ b/pkgs/misc/flashfocus/default.nix @@ -0,0 +1,28 @@ +{ lib, buildPythonApplication, fetchPypi, xcffib, pyyaml, click, i3ipc, marshmallow, cffi, xpybutil, pytestrunner }: + + +buildPythonApplication rec { + pname = "flashfocus"; + version = "2.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1z20d596rnc7cs0rrd221gjn14dmbr11djv94y9p4v7rr788sswv"; + }; + + nativeBuildInputs = [ pytestrunner ]; + propagatedBuildInputs = [ i3ipc xcffib click cffi xpybutil marshmallow pyyaml ]; + + # Tests require access to a X session + doCheck = false; + + pythonImportsCheck = [ "flashfocus" ]; + + meta = with lib; { + homepage = "https://github.com/fennerm/flashfocus"; + description = "Simple focus animations for tiling window managers"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ artturin ]; + }; +} diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix index 830d5bea36a0..82a3aa8c7bef 100644 --- a/pkgs/misc/frescobaldi/default.nix +++ b/pkgs/misc/frescobaldi/default.nix @@ -29,9 +29,9 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://frescobaldi.org/"; - description = ''Frescobaldi is a LilyPond sheet music text editor''; + description = "A LilyPond sheet music text editor"; longDescription = '' - Powerful text editor with syntax highlighting and automatic completion, + Powerful text editor with syntax highlighting and automatic completion, Music view with advanced Point & Click, Midi player to proof-listen LilyPond-generated MIDI files, Midi capturing to enter music, Powerful Score Wizard to quickly setup a music score, Snippet Manager diff --git a/pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch b/pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch deleted file mode 100644 index c914634f579c..000000000000 --- a/pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch +++ /dev/null @@ -1,862 +0,0 @@ -From 9f56e78d111d726ca95a59b2d64e5c3298451505 Mon Sep 17 00:00:00 2001 -From: Chris Liddell <chris.liddell@artifex.com> -Date: Mon, 27 Apr 2020 11:04:57 +0100 -Subject: [PATCH] Bug 702364: Fix missing echogs dependencies - -Rebased version of http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=1b4c3669a20c -to fix parallel build ---- - contrib/contrib.mak | 281 ++++++++++++++++++++++---------------------- - 1 file changed, 143 insertions(+), 138 deletions(-) - -diff --git a/contrib/contrib.mak b/contrib/contrib.mak -index 5411ae902..7dd9822a9 100644 ---- a/contrib/contrib.mak -+++ b/contrib/contrib.mak -@@ -22,6 +22,10 @@ - CONTRIB_MAK=$(CONTRIBDIR)$(D)contrib.mak $(TOP_MAKEFILES) - CONTRIBSRC=$(CONTRIBDIR)$(D) - -+# Almost all device drivers depend on the following: -+CONTDEVH=$(gserrors_h) $(gx_h) $(gxdevice_h) -+CONTDEV=$(AK) $(ECHOGS_XE) $(GDEVH) -+ - ###### --------------------------- Catalog -------------------------- ###### - - # The following drivers are user-contributed, and maintained (if at all) by -@@ -161,19 +165,19 @@ $(DEVOBJ)gdevbjca.$(OBJ) : $(CONTRIBSRC)gdevbjca.c $(PDEVH) $(bjc_h) \ - $(DEVCC) $(DEVO_)gdevbjca.$(OBJ) $(C_) $(CONTRIBSRC)gdevbjca.c - - $(DD)bjcmono.dev : $(bjc_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)bjcmono $(bjc_) - - $(DD)bjcgray.dev : $(bjc_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)bjcgray $(bjc_) - - $(DD)bjccmyk.dev : $(bjc_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)bjccmyk $(bjc_) - - $(DD)bjccolor.dev : $(bjc_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)bjccolor $(bjc_) - - -@@ -184,25 +188,25 @@ cdeskjet8_=$(DEVOBJ)gdevcd8.$(OBJ) $(HPPCL) - # Author: Uli Wortmann (uliw@erdw.ethz.ch), Martin Gerbershagen (ger@ulm.temic.de) - # Printer: HP 670 - $(DD)cdj670.dev : $(cdeskjet8_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV2) $(DD)cdj670 $(cdeskjet8_) - - # Author: Uli Wortmann (uliw@erdw.ethz.ch) - # Printer: HP 850 - $(DD)cdj850.dev : $(cdeskjet8_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV2) $(DD)cdj850 $(cdeskjet8_) - - # Author: Uli Wortmann (uliw@erdw.ethz.ch), Martin Gerbershagen (ger@ulm.temic.de) - # Printer: HP 890 - $(DD)cdj890.dev : $(cdeskjet8_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV2) $(DD)cdj890 $(cdeskjet8_) - - # Author: Uli Wortmann (uliw@erdw.ethz.ch), Martin Gerbershagen (ger@ulm.temic.de) - # Printer: HP 1600 - $(DD)cdj1600.dev : $(cdeskjet8_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV2) $(DD)cdj1600 $(cdeskjet8_) - - $(DEVOBJ)gdevcd8.$(OBJ) : $(CONTRIBSRC)gdevcd8.c $(PDEVH) $(math__h)\ -@@ -220,7 +224,8 @@ $(DEVOBJ)gdevcd8.$(OBJ) : $(CONTRIBSRC)gdevcd8.c $(PDEVH) $(math__h)\ - - # Author: Matthew Gelhaus (mgelhaus@proaxis.com) - # Printer: HP 880c --$(DD)cdj880.dev : $(cdeskjet8_) $(DD)page.dev -+$(DD)cdj880.dev : $(cdeskjet8_) $(DD)page.dev $(CONTDEV) \ -+ $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV2) $(DD)cdj880 $(cdeskjet8_) - - -@@ -231,7 +236,7 @@ cdeskjet9_=$(DEVOBJ)gdevdj9.$(OBJ) $(HPPCL) - # Author: Rene Harsch (rene@harsch.net) - # Printer: HP 970Cxi - $(DD)cdj970.dev : $(cdeskjet9_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV2) $(DD)cdj970 $(cdeskjet9_) - - $(DEVOBJ)gdevdj9.$(OBJ) : $(CONTRIBSRC)gdevdj9.c $(PDEVH) $(math__h) $(string__h)\ -@@ -244,7 +249,7 @@ $(DEVOBJ)gdevdj9.$(OBJ) : $(CONTRIBSRC)gdevdj9.c $(PDEVH) $(math__h) $(string__h - ### NOTE: Same as chp2200 (some PJL and CRD changes). - - $(DD)cdnj500.dev : $(cdeskjet8_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV2) $(DD)cdnj500 $(cdeskjet8_) - - -@@ -253,7 +258,7 @@ $(DD)cdnj500.dev : $(cdeskjet8_) $(DD)page.dev \ - ### NOTE: Depends on the presence of the cdj850 section. - - $(DD)chp2200.dev : $(cdeskjet8_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV2) $(DD)chp2200 $(cdeskjet8_) - - -@@ -264,11 +269,11 @@ $(DD)chp2200.dev : $(cdeskjet8_) $(DD)page.dev \ - GDIMONO=$(DEVOBJ)gdevgdi.$(OBJ) $(HPPCL) - - $(DD)gdi.dev : $(GDIMONO) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)gdi $(GDIMONO) - - $(DD)samsunggdi.dev : $(GDIMONO) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)samsunggdi $(GDIMONO) - - $(DEVOBJ)gdevgdi.$(OBJ) : $(CONTRIBSRC)gdevgdi.c $(PDEVH) $(gdevpcl_h) \ -@@ -282,17 +287,17 @@ $(DEVOBJ)gdevgdi.$(OBJ) : $(CONTRIBSRC)gdevgdi.c $(PDEVH) $(gdevpcl_h) \ - - hl1250_=$(DEVOBJ)gdevhl12.$(OBJ) $(HPDLJM) - $(DD)hl1250.dev : $(hl1250_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hl1250 $(hl1250_) - - $(DD)hl1240.dev : $(hl1250_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hl1240 $(hl1250_) - - # Author: Marek Michalkiewicz <marekm@linux.org.pl> - # Printer: Brother HL-1250 (may work with some other models too) - $(DEVOBJ)gdevhl12.$(OBJ) : $(CONTRIBSRC)gdevhl12.c $(PDEVH) $(gdevdljm_h) \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(DEVCC) $(DEVO_)gdevhl12.$(OBJ) $(C_) $(CONTRIBSRC)gdevhl12.c - - -@@ -303,37 +308,37 @@ ln03_=$(DEVOBJ)gdevln03.$(OBJ) - # Author: Ulrich Mueller (ulm@vsnhd1.cern.ch) - # Printer: DEC LN03 - $(DD)ln03.dev : $(ln03_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)ln03 $(ln03_) - - # Author: Nick Brown (nick.brown@coe.int) - # Printer: DEClaser 2100 - $(DD)dl2100.dev : $(ln03_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)dl2100 $(ln03_) - - # Author: Ian MacPhedran (macphed@dvinci.USask.CA) - # Printer: DEC LA50 - $(DD)la50.dev : $(ln03_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)la50 $(ln03_) - - # Author: Bruce Lowekamp (lowekamp@csugrad.cs.vt.edu) - # Printer: DEC LA70 - $(DD)la70.dev : $(ln03_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)la70 $(ln03_) - - # Author: Ian MacPhedran (macphed@dvinci.USask.CA) - # Printer: DEC LA75 - $(DD)la75.dev : $(ln03_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)la75 $(ln03_) - - # Author: Andre' Beck (Andre_Beck@IRS.Inf.TU-Dresden.de) - # Printer: DEC LA75plus - $(DD)la75plus.dev : $(ln03_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)la75plus $(ln03_) - - $(DEVOBJ)gdevln03.$(OBJ) : $(CONTRIBSRC)gdevln03.c $(PDEVH) \ -@@ -356,27 +361,27 @@ $(DEVOBJ)gdevescv.$(OBJ) : $(ESCV_SRC)gdevescv.c $(ESCV_SRC)gdevescv.h $(PDEVH) - $(DEVCC) -DA4 $(DEVO_)gdevescv.$(OBJ) $(C_) $(escv_opts) $(ESCV_SRC)gdevescv.c - - $(DD)alc1900.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)alc1900 $(escv_) - - $(DD)alc2000.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)alc2000 $(escv_) - - $(DD)alc4000.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)alc4000 $(escv_) - - $(DD)alc4100.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)alc4100 $(escv_) - - $(DD)alc8500.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)alc8500 $(escv_) - - $(DD)alc8600.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)alc8600 $(escv_) - - $(DD)alc9100.dev : $(escv_) $(DD)page.dev \ -@@ -384,11 +389,11 @@ $(DD)alc9100.dev : $(escv_) $(DD)page.dev \ - $(SETPDEV) $(DD)alc9100 $(escv_) - - $(DD)lp3000c.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp3000c $(escv_) - - $(DD)lp8000c.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp8000c $(escv_) - - $(DD)lp8200c.dev : $(escv_) $(DD)page.dev \ -@@ -396,15 +401,15 @@ $(DD)lp8200c.dev : $(escv_) $(DD)page.dev \ - $(SETPDEV) $(DD)lp8200c $(escv_) - - $(DD)lp8300c.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp8300c $(escv_) - - $(DD)lp8500c.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp8500c $(escv_) - - $(DD)lp8800c.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp8800c $(escv_) - - $(DD)lp9000c.dev : $(escv_) $(DD)page.dev \ -@@ -412,177 +417,177 @@ $(DD)lp9000c.dev : $(escv_) $(DD)page.dev \ - $(SETPDEV) $(DD)lp9000c $(escv_) - - $(DD)lp9200c.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp9200c $(escv_) - - $(DD)lp9500c.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp9500c $(escv_) - - $(DD)lp9800c.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp9800c $(escv_) - - $(DD)lps6500.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lps6500 $(escv_) - - $(DD)epl2050.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)epl2050 $(escv_) - - $(DD)epl2050p.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)epl2050p $(escv_) - - $(DD)epl2120.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)epl2120 $(escv_) - - $(DD)epl2500.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)epl2500 $(escv_) - - $(DD)epl2750.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)epl2750 $(escv_) - - $(DD)epl5800.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)epl5800 $(escv_) - - $(DD)epl5900.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)epl5900 $(escv_) - - $(DD)epl6100.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)epl6100 $(escv_) - - $(DD)epl6200.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)epl6200 $(escv_) - - $(DD)lp1800.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp1800 $(escv_) - - $(DD)lp1900.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp1900 $(escv_) - - $(DD)lp2200.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp2200 $(escv_) - - $(DD)lp2400.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp2400 $(escv_) - - $(DD)lp2500.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp2500 $(escv_) - - $(DD)lp7500.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp7500 $(escv_) - - $(DD)lp7700.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp7700 $(escv_) - - $(DD)lp7900.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp7900 $(escv_) - - $(DD)lp8100.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp8100 $(escv_) - - $(DD)lp8300f.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp8300f $(escv_) - - $(DD)lp8400f.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp8400f $(escv_) - - $(DD)lp8600.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp8600 $(escv_) - - $(DD)lp8600f.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp8600f $(escv_) - - $(DD)lp8700.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp8700 $(escv_) - - $(DD)lp8900.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp8900 $(escv_) - - $(DD)lp9000b.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp9000b $(escv_) - - $(DD)lp9100.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp9100 $(escv_) - - $(DD)lp9200b.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp9200b $(escv_) - - $(DD)lp9300.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp9300 $(escv_) - - $(DD)lp9400.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp9400 $(escv_) - - $(DD)lp9600.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp9600 $(escv_) - - $(DD)lp9600s.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp9600s $(escv_) - - $(DD)lps4500.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lps4500 $(escv_) - - $(DD)eplcolor.dev: $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)eplcolor $(escv_) - - $(DD)eplmono.dev: $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)eplmono $(escv_) - - # ------ The Lexmark 5700 and 7000 devices ------ # - - lex7000_=$(DEVOBJ)gdevlx7.$(OBJ) - $(DD)lex7000.dev : $(lex7000_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lex7000 $(lex7000_) - - lex5700_=$(DEVOBJ)gdevlx7.$(OBJ) - $(DD)lex5700.dev : $(lex5700_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lex5700 $(lex5700_) - - lex3200_=$(DEVOBJ)gdevlx7.$(OBJ) - $(DD)lex3200.dev : $(lex3200_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lex3200 $(lex3200_) - - lex2050_=$(DEVOBJ)gdevlx7.$(OBJ) - $(DD)lex2050.dev : $(lex2050_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lex2050 $(lex2050_) - - $(DEVOBJ)gdevlx7.$(OBJ) : $(CONTRIBSRC)gdevlx7.c $(PDEVH) \ -@@ -599,7 +604,7 @@ $(DEVOBJ)gdevlx32.$(OBJ) : $(CONTRIBSRC)gdevlx32.c $(PDEVH) $(gsparam_h) \ - $(DEVCC) $(DEVO_)gdevlx32.$(OBJ) $(C_) $(CONTRIBSRC)gdevlx32.c - - $(DD)lxm3200.dev : $(lxm3200_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lxm3200 $(lxm3200_) - - -@@ -625,13 +630,13 @@ $(DEVOBJ)gdevlips.$(OBJ) : $(GX) $(LIPS_SRC)gdevlips.c $(std_h) \ - $(DEVCC) $(DEVO_)gdevlips.$(OBJ) $(LIPS_OPT) $(C_) $(LIPS_SRC)gdevlips.c - - $(DD)lips4.dev : $(lipsr_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lips4 $(lipsr_) - - lipsv_=$(DEVOBJ)gdevl4v.$(OBJ) $(DEVOBJ)gdevlips.$(OBJ) - - $(DD)lips4v.dev : $(ECHOGS_XE) $(lipsv_) $(DD)vector.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETDEV) $(DD)lips4v $(lipsv_) - $(ADDMOD) $(DD)lips4v -include $(GLD)vector - -@@ -644,11 +649,11 @@ $(DEVOBJ)gdevl4v.$(OBJ) : $(LIPS_SRC)gdevl4v.c $(LIPS_SRC)gdevlips.h $(GDEV)\ - ### --------------- Some extra devices: lips2p, bjc880j ---------------- ### - - $(DD)lips2p.dev : $(lipsr_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lips2p $(lipsr_) - - $(DD)bjc880j.dev : $(lipsr_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)bjc880j $(lipsr_) - - -@@ -657,15 +662,15 @@ $(DD)bjc880j.dev : $(lipsr_) $(DD)page.dev \ - md2k_=$(DEVOBJ)gdevmd2k.$(OBJ) - - $(DD)md2k.dev : $(md2k_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)md2k $(md2k_) - - $(DD)md5k.dev : $(md2k_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)md5k $(md2k_) - - $(DEVOBJ)gdevmd2k.$(OBJ) : $(CONTRIBSRC)gdevmd2k.c $(PDEVH) $(gsparam_h) \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(DEVCC) $(DEVO_)gdevmd2k.$(OBJ) $(C_) $(CONTRIBSRC)gdevmd2k.c - - -@@ -673,7 +678,7 @@ $(DEVOBJ)gdevmd2k.$(OBJ) : $(CONTRIBSRC)gdevmd2k.c $(PDEVH) $(gsparam_h) \ - - oki4w_=$(DEVOBJ)gdevop4w.$(OBJ) - $(DD)oki4w.dev : $(oki4w_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)oki4w $(oki4w_) - - # Author: Ivan Schreter (ivan@shadow.sk) -@@ -696,11 +701,11 @@ $(DEVOBJ)gdevopvp.$(OBJ) : $(OPVP_SRC)gdevopvp.c $(OPVP_SRC)opvp_common.h\ - $(DEVCC) $(DEVO_)gdevopvp.$(OBJ) $(OPVP_OPT) $(C_) $(OPVP_SRC)gdevopvp.c - - $(DD)opvp.dev : $(opvp_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)opvp $(opvp_) - - $(DD)oprp.dev : $(opvp_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)oprp $(opvp_) - - -@@ -877,78 +882,78 @@ $(DEVOBJ)pclcomp.$(OBJ) : $(pcl3_src)pclcomp.c $(pcl3_src)pclgen.h \ - - # The generic pcl3 device with selectable subdevices - $(DD)pcl3.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)pcl3 $(pcl3_) - - # Fixed devices for specific printers - $(DD)hpdjplus.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdjplus $(pcl3_) - $(DD)hpdjportable.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdjportable $(pcl3_) - $(DD)hpdj310.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj310 $(pcl3_) - $(DD)hpdj320.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj320 $(pcl3_) - $(DD)hpdj340.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj340 $(pcl3_) - $(DD)hpdj400.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj400 $(pcl3_) - $(DD)hpdj500.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj500 $(pcl3_) - $(DD)hpdj500c.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj500c $(pcl3_) - $(DD)hpdj510.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj510 $(pcl3_) - $(DD)hpdj520.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj520 $(pcl3_) - $(DD)hpdj540.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj540 $(pcl3_) - $(DD)hpdj550c.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj550c $(pcl3_) - $(DD)hpdj560c.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj560c $(pcl3_) - $(DD)hpdj600.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj600 $(pcl3_) - $(DD)hpdj660c.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj660c $(pcl3_) - $(DD)hpdj670c.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj670c $(pcl3_) - $(DD)hpdj680c.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj680c $(pcl3_) - $(DD)hpdj690c.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj690c $(pcl3_) - $(DD)hpdj850c.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj850c $(pcl3_) - $(DD)hpdj855c.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj855c $(pcl3_) - $(DD)hpdj870c.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj870c $(pcl3_) - $(DD)hpdj890c.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj890c $(pcl3_) - $(DD)hpdj1120c.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj1120c $(pcl3_) - - #------------------------------------------------------------------------------ -@@ -985,7 +990,7 @@ pcl3-install: - - xes_=$(DEVOBJ)gdevxes.$(OBJ) - $(DD)xes.dev : $(xes_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)xes $(xes_) - - # Author: Peter Flass (flass@lbdrscs.bitnet) -@@ -1005,16 +1010,16 @@ JAPSRC=$(JAPDIR)$(D) - - pr201_=$(DEVOBJ)gdevp201.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) - --$(DD)pr201.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS) -+$(DD)pr201.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)pr201 $(pr201_) - --$(DD)pr150.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS) -+$(DD)pr150.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)pr150 $(pr201_) - --$(DD)pr1000.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS) -+$(DD)pr1000.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)pr1000 $(pr201_) - --$(DD)pr1000_4.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS) -+$(DD)pr1000_4.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)pr1000_4 $(pr201_) - - $(DEVOBJ)gdevp201.$(OBJ) : $(JAPSRC)gdevp201.c $(PDEVH) \ -@@ -1025,7 +1030,7 @@ $(DEVOBJ)gdevp201.$(OBJ) : $(JAPSRC)gdevp201.c $(PDEVH) \ - - jj100_=$(DEVOBJ)gdevj100.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) - --$(DD)jj100.dev : $(jj100_) $(CONTRIB_MAK) $(MAKEDIRS) -+$(DD)jj100.dev : $(jj100_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)jj100 $(jj100_) - - $(DEVOBJ)gdevj100.$(OBJ) : $(JAPSRC)gdevj100.c $(PDEVH) \ -@@ -1037,11 +1042,11 @@ $(DEVOBJ)gdevj100.$(OBJ) : $(JAPSRC)gdevj100.c $(PDEVH) \ - bj10v_=$(DEVOBJ)gdev10v.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) - - $(DD)bj10v.dev : $(bj10v_) \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)bj10v $(bj10v_) - - $(DD)bj10vh.dev : $(bj10v_) \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)bj10vh $(bj10v_) - - # Uncomment the following line if you are using MS-DOS on PC9801 series. -@@ -1056,7 +1061,7 @@ $(DEVOBJ)gdev10v.$(OBJ) : $(JAPSRC)gdev10v.c $(PDEVH) \ - dmprt_=$(DEVOBJ)gdevdmpr.$(OBJ) $(DEVOBJ)dviprlib.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) - - $(DD)dmprt.dev : $(dmprt_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETDEV) $(DD)dmprt $(dmprt_) - $(ADDMOD) $(DD)dmprt -ps dmp_init - -@@ -1086,19 +1091,19 @@ $(DEVOBJ)gdevmjc.$(OBJ) : $(JAPSRC)gdevmjc.c $(JAPSRC)gdevmjc.h $(PDEVH) $(gdevp - $(DEVCC) -DA4 $(DEVO_)gdevmjc.$(OBJ) $(C_) $(JAPSRC)gdevmjc.c - - $(DD)mj700v2c.dev : $(mj700v2c_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)mj700v2c $(mj700v2c_) - - $(DD)mj500c.dev : $(mj700v2c_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)mj500c $(mj700v2c_) - - $(DD)mj6000c.dev : $(mj700v2c_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)mj6000c $(mj700v2c_) - - $(DD)mj8000c.dev : $(mj700v2c_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)mj8000c $(mj700v2c_) - - ### ----------------- The Fujitsu FMPR printer device ----------------- ### -@@ -1106,7 +1111,7 @@ $(DD)mj8000c.dev : $(mj700v2c_) $(DD)page.dev \ - fmpr_=$(DEVOBJ)gdevfmpr.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) - - $(DD)fmpr.dev : $(fmpr_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)fmpr $(fmpr_) - - $(DEVOBJ)gdevfmpr.$(OBJ) : $(JAPSRC)gdevfmpr.c $(PDEVH) \ -@@ -1118,7 +1123,7 @@ $(DEVOBJ)gdevfmpr.$(OBJ) : $(JAPSRC)gdevfmpr.c $(PDEVH) \ - fmlbp_=$(DEVOBJ)gdevfmlbp.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) - - $(DD)fmlbp.dev : $(fmlbp_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)fmlbp $(fmlbp_) - - $(DEVOBJ)gdevfmlbp.$(OBJ) : $(JAPSRC)gdevfmlbp.c $(PDEVH) \ -@@ -1135,7 +1140,7 @@ $(DEVOBJ)gdevfmlbp.$(OBJ) : $(JAPSRC)gdevfmlbp.c $(PDEVH) \ - ml6_=$(DEVOBJ)gdevml6.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) - - $(DD)ml600.dev : $(ml6_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)ml600 $(ml6_) - - $(DEVOBJ)gdevml6.$(OBJ) : $(JAPSRC)gdevml6.c $(PDEVH) \ -@@ -1148,11 +1153,11 @@ $(DEVOBJ)gdevml6.$(OBJ) : $(JAPSRC)gdevml6.c $(PDEVH) \ - lbp3x0_=$(DEVOBJ)gdevlbp3.$(OBJ) - - $(DD)lbp310.dev :$(lbp3x0_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lbp310 $(lbp3x0_) - - $(DD)lbp320.dev :$(lbp3x0_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lbp320 $(lbp3x0_) - - $(DEVOBJ)gdevlbp3.$(OBJ) : $(JAPSRC)gdevlbp3.c $(PDEVH) -@@ -1167,7 +1172,7 @@ $(DEVOBJ)gdevnpdl.$(OBJ) : $(JAPSRC)gdevnpdl.c $(LIPS_SRC)gdevlprn.h $(PDEVH) \ - $(DEVCC) -DA4 $(DEVO_)gdevnpdl.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevnpdl.c - - $(DD)npdl.dev : $(npdl_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)npdl $(npdl_) - - ### ------- EPSON ESC/Page printer device ----------------- ### -@@ -1179,11 +1184,11 @@ $(DEVOBJ)gdevespg.$(OBJ) : $(JAPSRC)gdevespg.c $(LIPS_SRC)gdevlprn.h $(PDEVH) \ - $(DEVCC) -DA4 $(DEVO_)gdevespg.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevespg.c - - $(DD)escpage.dev : $(escpage_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)escpage $(escpage_) - - $(DD)lp2000.dev : $(escpage_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp2000 $(escpage_) - - ### --- The RICOH RPDL language printer device ------ ### -@@ -1194,7 +1199,7 @@ $(DEVOBJ)gdevrpdl.$(OBJ) : $(JAPSRC)gdevrpdl.c $(LIPS_SRC)gdevlprn.h $(PDEVH) \ - $(DEVCC) $(DEVO_)gdevrpdl.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevrpdl.c - - $(DD)rpdl.dev : $(rpdl_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)rpdl $(rpdl_) - - ### ---------- RICOH RPDL IV(600dpi) printer devices ---------- ### -@@ -1204,11 +1209,11 @@ $(DD)rpdl.dev : $(rpdl_) $(DD)page.dev \ - # $(DEVCC) $(DEVO_)gdevrpdl.$(OBJ) $(C_) $(JAPSRC)gdevrpdl.c - # - #$(DD)nx100f.dev : $(rpdl_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - # $(SETPDEV2) $(DD)nx100f $(rpdl_) - # - #$(DD)nx100v.dev : $(rpdl_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - # $(SETPDEV2) $(DD)nx100v $(rpdl_) - - ### ------------ The ALPS Micro Dry printer devices ------------ ### -@@ -1216,15 +1221,15 @@ $(DD)rpdl.dev : $(rpdl_) $(DD)page.dev \ - alps_=$(DEVOBJ)gdevalps.$(OBJ) - - $(DD)md50Mono.dev : $(alps_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)md50Mono $(alps_) - - $(DD)md50Eco.dev : $(alps_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)md50Eco $(alps_) - - $(DD)md1xMono.dev : $(alps_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)md1xMono $(alps_) - - $(DEVOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH) \ --- -2.26.2 - diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 7f6766cf4624..6f113bcd99cb 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, lib, fetchurl, pkgconfig, zlib, expat, openssl, autoconf +{ config, stdenv, lib, fetchurl, pkg-config, zlib, expat, openssl, autoconf , libjpeg, libpng, libtiff, freetype, fontconfig, libpaper, jbig2dec , libiconv, ijs, lcms2, fetchpatch , cupsSupport ? config.ghostscript.cups or (!stdenv.isDarwin), cups ? null @@ -9,10 +9,6 @@ assert x11Support -> xlibsWrapper != null; assert cupsSupport -> cups != null; let - version = "9.${ver_min}"; - ver_min = "50"; - sha512 = "3p46kzn6kh7z4qqnqydmmvdlgzy5730z3yyvyxv6i4yb22mgihzrwqmhmvfn3b7lypwf6fdkkndarzv7ly3zndqpyvg89x436sms7iw"; - fonts = stdenv.mkDerivation { name = "ghostscript-fonts"; @@ -37,31 +33,27 @@ let in stdenv.mkDerivation rec { pname = "ghostscript"; - inherit version; + version = "9.53.3"; src = fetchurl { - url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9${ver_min}/${pname}-${version}.tar.xz"; - inherit sha512; + url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9${lib.versions.minor version}${lib.versions.patch version}/${pname}-${version}.tar.xz"; + sha512 = "2vif3vgxa5wma16yxvhhkymk4p309y5204yykarq94r5rk890556d2lj5w7acnaa2ymkym6y0zd4vq9sy9ca2346igg2c6dxqkjr0zb"; }; patches = [ - ./urw-font-files.patch - ./doc-no-ref.diff (fetchpatch { - name = "CVE-2019-14869.patch"; - url = "https://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=485904772c5f0aa1140032746e5a0abfc40f4cef"; - sha256 = "0z5gnvgpp0dlzgvpw9a1yan7qyycv3mf88l93fvb1kyay893rshp"; + url = "https://github.com/ArtifexSoftware/ghostpdl/commit/41ef9a0bc36b9db7115fbe9623f989bfb47bbade.patch"; + sha256 = "1qpc6q1fpxshqc0mqgg36kng47kgljk50bmr8p7wn21jgfkh7m8w"; }) - # rebased version of upstream http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=1b4c3669a20c, - # Remove on update to version > 9.52 - ./0001-Bug-702364-Fix-missing-echogs-dependencies.patch + ./urw-font-files.patch + ./doc-no-ref.diff ]; outputs = [ "out" "man" "doc" ]; enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig autoconf ]; + nativeBuildInputs = [ pkg-config autoconf ]; buildInputs = [ zlib expat openssl libjpeg libpng libtiff freetype fontconfig libpaper jbig2dec @@ -104,9 +96,6 @@ stdenv.mkDerivation rec { cp -r Resource "$out/share/ghostscript/${version}" - mkdir -p "$doc/share/doc/ghostscript" - mv "$doc/share/doc/${version}" "$doc/share/doc/ghostscript/" - ln -s "${fonts}" "$out/share/ghostscript/fonts" '' + stdenv.lib.optionalString stdenv.isDarwin '' for file in $out/lib/*.dylib* ; do @@ -114,11 +103,21 @@ stdenv.mkDerivation rec { done ''; + # dynamic library name only contains maj.min, eg. '9.53' + dylib_version = lib.versions.majorMinor version; preFixup = lib.optionalString stdenv.isDarwin '' - install_name_tool -change libgs.dylib.${version} $out/lib/libgs.dylib.${version} $out/bin/gs + install_name_tool -change libgs.dylib.$dylib_version $out/lib/libgs.dylib.$dylib_version $out/bin/gs ''; - passthru = { inherit version; }; + # validate dynamic linkage + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/gs --version + + runHook postInstallCheck + ''; meta = { homepage = "https://www.ghostscript.com/"; diff --git a/pkgs/misc/hdt/default.nix b/pkgs/misc/hdt/default.nix new file mode 100644 index 000000000000..a8cf5c5d4d35 --- /dev/null +++ b/pkgs/misc/hdt/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, libtool, pkgconfig, zlib, serd }: + +stdenv.mkDerivation rec { + pname = "hdt"; + version = "1.3.3"; + + src = fetchFromGitHub { + owner = "rdfhdt"; + repo = "hdt-cpp"; + rev = "v${version}"; + sha256 = "1vsq80jnix6cy78ayag7v8ajyw7h8dqyad1q6xkf2hzz3skvr34z"; + }; + + buildInputs = [ zlib serd ]; + + nativeBuildInputs = [ autoreconfHook libtool pkgconfig ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "http://www.rdfhdt.org/"; + description = "Header Dictionary Triples (HDT) is a compression format for RDF data that can also be queried for Triple Patterns"; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = [ maintainers.koslambrou ]; + }; +} diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index d50075607627..556bb6a7408f 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation rec { name = "${prefix}jack2-${version}"; - version = "1.9.14"; + version = "1.9.16"; src = fetchFromGitHub { owner = "jackaudio"; repo = "jack2"; rev = "v${version}"; - sha256 = "1prxg1l8wrxfp2mh7l4mvjvmml6816fciq1la88ylhwm1qnfvnax"; + sha256 = "0pzgrjy5fi2nif2j442fs3j2bbshxpnmq9kzwcqz54wx1w8fzdfr"; }; nativeBuildInputs = [ pkgconfig python makeWrapper wafHook ]; diff --git a/pkgs/misc/lightspark/default.nix b/pkgs/misc/lightspark/default.nix index a821d430f6c6..86177892f431 100644 --- a/pkgs/misc/lightspark/default.nix +++ b/pkgs/misc/lightspark/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, curl, zlib, ffmpeg, glew, pcre -, rtmpdump, cairo, boost, SDL2, SDL2_mixer, libjpeg, gnome2, lzma, nasm +{ stdenv, fetchFromGitHub, pkgconfig, cmake, curl, zlib, ffmpeg_3, glew, pcre +, rtmpdump, cairo, boost, SDL2, SDL2_mixer, libjpeg, pango, lzma, nasm , llvm, glibmm }: @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ - curl zlib ffmpeg glew pcre rtmpdump cairo boost SDL2 SDL2_mixer libjpeg - gnome2.pango lzma nasm llvm glibmm + curl zlib ffmpeg_3 glew pcre rtmpdump cairo boost SDL2 SDL2_mixer libjpeg + pango lzma nasm llvm glibmm ]; enableParallelBuilding = true; diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index 9e76693ce8fd..44dbf086ca57 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -16,7 +16,14 @@ stdenv.mkDerivation rec { sha256 = "0qd6pd4siss016ffmcyw5qc6pr2wihnvrgd4kh1x725w7wr02nar"; }; - patches = [ ./findlib.patch ]; + patches = [ + ./findlib.patch + (fetchurl { + name = "CVE-2020-17353.patch"; + url = "https://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=commitdiff_plain;h=b84ea4740f3279516905c5db05f4074e777c16ff;hp=b97bd35ac99efd68569327f62f3c8a19511ebe43"; + sha256 = "1i79gy3if070rdgj7j6inw532j0f6ya5qc6kgcnlkbx02rqrhr7v"; + }) + ]; postInstall = '' for f in "$out/bin/"*; do diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix index c3bca18a9a44..2d01ea622612 100644 --- a/pkgs/misc/logging/beats/6.x.nix +++ b/pkgs/misc/logging/beats/6.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, elk6Version, buildGoPackage, libpcap, systemd }: +{ stdenv, lib, fetchFromGitHub, elk6Version, buildGoPackage, libpcap, systemd }: let beat = package : extraArgs : buildGoPackage (rec { name = "${package}-${version}"; @@ -46,7 +46,7 @@ in { journal entries from Linuxes with systemd. ''; buildInputs = [ systemd.dev ]; - postFixup = let libPath = stdenv.lib.makeLibraryPath [ systemd.lib ]; in '' + postFixup = let libPath = stdenv.lib.makeLibraryPath [ (lib.getLib systemd) ]; in '' patchelf --set-rpath ${libPath} "$out/bin/journalbeat" ''; }; diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix index 61c89339fe70..465051d3726e 100644 --- a/pkgs/misc/logging/beats/7.x.nix +++ b/pkgs/misc/logging/beats/7.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, elk7Version, buildGoPackage, libpcap, systemd }: +{ stdenv, lib, fetchFromGitHub, elk7Version, buildGoPackage, libpcap, systemd }: let beat = package : extraArgs : buildGoPackage (rec { name = "${package}-${version}"; @@ -45,7 +45,7 @@ in { journal entries from Linuxes with systemd. ''; buildInputs = [ systemd.dev ]; - postFixup = let libPath = stdenv.lib.makeLibraryPath [ systemd.lib ]; in '' + postFixup = let libPath = stdenv.lib.makeLibraryPath [ (lib.getLib systemd) ]; in '' patchelf --set-rpath ${libPath} "$out/bin/journalbeat" ''; }; diff --git a/pkgs/misc/mxt-app/default.nix b/pkgs/misc/mxt-app/default.nix index a5a621435ee3..6ceb4d6c1a3d 100644 --- a/pkgs/misc/mxt-app/default.nix +++ b/pkgs/misc/mxt-app/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, libtool }: -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { version="1.28"; pname = "mxt-app"; diff --git a/pkgs/misc/riscv-pk/default.nix b/pkgs/misc/riscv-pk/default.nix index 3e1f63e5e300..6ef50a33a5b7 100644 --- a/pkgs/misc/riscv-pk/default.nix +++ b/pkgs/misc/riscv-pk/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation { ''; meta = { - description = "RISC-V Proxy Kernel and Bootloader."; + description = "RISC-V Proxy Kernel and Bootloader"; homepage = "https://github.com/riscv/riscv-pk"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.riscv; diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix index b73c6d351a20..adebcbd633db 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/misc/scrcpy/default.nix @@ -10,10 +10,10 @@ }: let - version = "1.14"; + version = "1.15.1"; prebuilt_server = fetchurl { url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"; - sha256 = "082n57a9lw39lfjxybgim09qf0id9m0rpfb3zmqng58fp2i1h6qx"; + sha256 = "1hrp2rfwl06ff2b2i12ccka58l1brvn6xqgm1f38k36s61mbs1py"; }; in stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "Genymobile"; repo = pname; rev = "v${version}"; - sha256 = "1w06gsvgjdbpb9lvvhpjwmysxjl0daiigjfh3cxfgz88447bgw7j"; + sha256 = "0ijar1cycj42p39cgpnwdwr6nz5pyr6vacr1gvc0f6k92pl8vr13"; }; # postPatch: diff --git a/pkgs/misc/screensavers/betterlockscreen/default.nix b/pkgs/misc/screensavers/betterlockscreen/default.nix index 36f898195703..f090156a85c0 100644 --- a/pkgs/misc/screensavers/betterlockscreen/default.nix +++ b/pkgs/misc/screensavers/betterlockscreen/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Betterlockscreen is a simple minimal lock screen which allows you to cache images with different filters and lockscreen with blazing speed."; + description = "A simple minimal lock screen which allows you to cache images with different filters and lockscreen with blazing speed"; homepage = "https://github.com/pavanjadhaw/betterlockscreen"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index 71a248bcfa12..0d772da67905 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/pkgs/misc/screensavers/electricsheep/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "electricsheep"; - version = "2.7b33-2017-10-20"; + version = "3.0.2-2019-10-05"; src = fetchFromGitHub { owner = "scottdraves"; repo = pname; - rev = "c02c19b9364733fc73826e105fc983a89a8b4f40"; + rev = "37ba0fd692d6581f8fe009ed11c9650cd8174123"; sha256 = "1z49l53j1lhk7ahdy96lm9r0pklwpf2i5s6y2l2rn6l4z8dxkjmk"; }; @@ -29,6 +29,10 @@ stdenv.mkDerivation rec { "CPPFLAGS=-I${glee}/include/GL" ]; + makeFlags = [ + ''CXXFLAGS+="-DGL_GLEXT_PROTOTYPES"'' + ]; + preBuild = '' sed -i "s|/usr|$out|" Makefile ''; diff --git a/pkgs/misc/screensavers/i3lock-pixeled/default.nix b/pkgs/misc/screensavers/i3lock-pixeled/default.nix index 5ffe5f722651..39497917755f 100644 --- a/pkgs/misc/screensavers/i3lock-pixeled/default.nix +++ b/pkgs/misc/screensavers/i3lock-pixeled/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Simple i3lock helper which pixels a screenshot by scaling it down and up to get a pixeled version of the screen when the lock is active."; + description = "Simple i3lock helper which pixels a screenshot by scaling it down and up to get a pixeled version of the screen when the lock is active"; homepage = "https://gitlab.com/Ma27/i3lock-pixeled"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix index 4d257650338c..c4915bec8959 100644 --- a/pkgs/misc/screensavers/light-locker/default.nix +++ b/pkgs/misc/screensavers/light-locker/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , meson , ninja , pkgconfig @@ -65,7 +66,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/pkgs/misc/screensavers/multilockscreen/default.nix b/pkgs/misc/screensavers/multilockscreen/default.nix new file mode 100644 index 000000000000..3fa6dbc725e9 --- /dev/null +++ b/pkgs/misc/screensavers/multilockscreen/default.nix @@ -0,0 +1,47 @@ +{ + stdenv, makeWrapper, fetchFromGitHub, writeShellScriptBin, + imagemagick, i3lock-color, xdpyinfo, xrandr, bc, feh, procps, xrdb, xset, + gnused, gnugrep, coreutils +}: +let + i3lock = writeShellScriptBin "i3lock" '' + ${i3lock-color}/bin/i3lock-color "$@" + ''; + binPath = stdenv.lib.makeBinPath [ + imagemagick i3lock + xdpyinfo xrandr xset + bc feh procps xrdb + gnused gnugrep coreutils + ]; +in +stdenv.mkDerivation rec { + pname = "multilockscreen"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "jeffmhubbard"; + repo = pname; + rev = "v${version}"; + sha256 = "0gmnrq7ibbhiwsn7mfi2r71fwm6nvhiwf4wsyz44cscm474z83p0"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + cp multilockscreen $out/bin/multilockscreen + wrapProgram "$out/bin/multilockscreen" --prefix PATH : "${binPath}" + ''; + + meta = with stdenv.lib; { + description = "Wrapper script for i3lock-color"; + longDescription = '' + multilockscreen is a wrapper script for i3lock-color. + It allows you to cache background images for i3lock-color with a variety of different effects and adds a stylish indicator. + ''; + homepage = "https://github.com/jeffmhubbard/multilockscreen"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ kylesferrazza ]; + }; +} diff --git a/pkgs/misc/screensavers/pipes/default.nix b/pkgs/misc/screensavers/pipes/default.nix index 211b7614f3b8..94d6299d3832 100644 --- a/pkgs/misc/screensavers/pipes/default.nix +++ b/pkgs/misc/screensavers/pipes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgs }: +{ stdenv, fetchurl, makeWrapper, coreutils, ncurses }: stdenv.mkDerivation rec { pname = "pipes"; @@ -9,11 +9,14 @@ stdenv.mkDerivation rec { sha256 = "09m4alb3clp3rhnqga5v6070p7n1gmnwp2ssqhq87nf2ipfpcaak"; }; - buildInputs = with pkgs; [ bash ]; + buildInputs = [ makeWrapper ]; installPhase = '' mkdir $out -p make PREFIX=$out/ install + + wrapProgram $out/bin/pipes.sh \ + --set PATH "${stdenv.lib.makeBinPath [ coreutils ncurses ]}" ''; meta = with stdenv.lib; { diff --git a/pkgs/misc/screensavers/xautolock/default.nix b/pkgs/misc/screensavers/xautolock/default.nix index cefcdbc75a37..d46f772e4953 100644 --- a/pkgs/misc/screensavers/xautolock/default.nix +++ b/pkgs/misc/screensavers/xautolock/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install.man" ]; meta = with stdenv.lib; { - description = "Launch a given program when your X session has been idle for a given time."; + description = "Launch a given program when your X session has been idle for a given time"; homepage = "http://www.ibiblio.org/pub/linux/X11/screensavers"; maintainers = with maintainers; [ peti ]; platforms = platforms.linux; diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index 9cc093f222b3..b59ed85f6bc2 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -2,11 +2,11 @@ , libXdmcp, libXt }: stdenv.mkDerivation rec { - name = "xlockmore-5.63"; + name = "xlockmore-5.65"; src = fetchurl { url = "http://sillycycle.com/xlock/${name}.tar.xz"; - sha256 = "1qhbl6axffbajxzwg4xyf52hdxk5xvg63gxk0s9z8g0fdfj242wr"; + sha256 = "0d4l8ibbvc62whlq8rrbvqr3011a7h21l9na93r579g0dfwdbh6d"; curlOpts = "--user-agent 'Mozilla/5.0'"; }; diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 1dd09852d27c..71108c9c6899 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, bc, perl, perlPackages, pam, libXext, libXScrnSaver, libX11 , libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, libGLU, libGL, gtk2 -, libxml2, libglade, intltool, xorg, makeWrapper, gle +, libxml2, libglade, intltool, xorg, makeWrapper, gle, gdk-pixbuf, gdk-pixbuf-xlib , forceInstallAllHacks ? false }: @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig bc perl libjpeg libGLU libGL gtk2 libxml2 libglade pam libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender - libXxf86misc intltool xorg.appres makeWrapper gle + libXxf86misc intltool xorg.appres makeWrapper gle gdk-pixbuf + gdk-pixbuf-xlib ]; preConfigure = diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index 7546c7626ed8..8db6995b6fae 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "seafile-shared"; - version = "7.0.7"; + version = "7.0.9"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; rev = "v${version}"; - sha256 = "0vgzb923x2q2w1zgbc56d50a5qj9xm77lg7czfzg3va7vd921gy8"; + sha256 = "1n0jq6d6vgk58qmqgdr7w7jfgcrlicnaafz1za9qf76sbi5vc6fk"; }; nativeBuildInputs = [ diff --git a/pkgs/misc/sndio/default.nix b/pkgs/misc/sndio/default.nix index c415714f573c..34e60b8a4bb7 100644 --- a/pkgs/misc/sndio/default.nix +++ b/pkgs/misc/sndio/default.nix @@ -1,23 +1,17 @@ -{ stdenv, fetchurl, alsaLib }: +{ stdenv, fetchurl, alsaLib, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "sndio"; - version = "1.6.0"; + version = "1.7.0"; enableParallelBuilding = true; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ alsaLib ]; + nativeBuildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + buildInputs = stdenv.lib.optional stdenv.hostPlatform.isLinux alsaLib; src = fetchurl { url = "http://www.sndio.org/sndio-${version}.tar.gz"; - sha256 = "1havdx3q4mipgddmd2bnygr1yh6y64567m1yqwjapkhsq550dq4r"; + sha256 = "0ljmac0lnjn61admgbcwjfcr5fwccrsblx9rj9bys8wlhz8f796x"; }; - postFixup = stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -id $out/lib/libsndio.7.0.dylib $out/lib/libsndio.7.0.dylib - for file in $out/bin/*; do - install_name_tool -change libsndio.7.0.dylib $out/lib/libsndio.dylib $file - done - ''; - meta = with stdenv.lib; { homepage = "http://www.sndio.org"; description = "Small audio and MIDI framework part of the OpenBSD project"; diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix index 05e13f3c9aae..71d9d682be47 100644 --- a/pkgs/misc/solfege/default.nix +++ b/pkgs/misc/solfege/default.nix @@ -15,6 +15,7 @@ buildPythonApplication rec { patches = [ ./css.patch ./menubar.patch + ./texinfo.patch ./webbrowser.patch ]; @@ -38,7 +39,7 @@ buildPythonApplication rec { meta = with lib; { description = "Ear training program"; - homepage = "http://www.solfege.org/"; + homepage = "https://www.solfege.org/"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ bjornfor orivej ]; diff --git a/pkgs/misc/solfege/texinfo.patch b/pkgs/misc/solfege/texinfo.patch new file mode 100644 index 000000000000..d681b3e901bd --- /dev/null +++ b/pkgs/misc/solfege/texinfo.patch @@ -0,0 +1,20 @@ +Fix build with texinfo 6.7. Otherwise + + makeinfo -I topdocs --no-split --no-headers --output AUTHORS topdocs/AUTHORS.texi + +fails with + + utf8 "\xC1" does not map to Unicode at /nix/store/...-texinfo-6.7/share/texinfo/Texinfo/ParserNonXS.pm line 1796, <FH> line 38. + +--- a/topdocs/AUTHORS.texi ++++ b/topdocs/AUTHORS.texi +@@ -1,2 +1,3 @@ + \input texinfo ++@documentencoding ISO-8859-1 + @setfilename AUTHORS.info +--- a/topdocs/README.texi ++++ b/topdocs/README.texi +@@ -1,2 +1,3 @@ + \input texinfo ++@documentencoding ISO-8859-1 + @setfilename README.info diff --git a/pkgs/misc/sound-of-sorting/default.nix b/pkgs/misc/sound-of-sorting/default.nix index 07e50c8379e5..6b660232d52c 100644 --- a/pkgs/misc/sound-of-sorting/default.nix +++ b/pkgs/misc/sound-of-sorting/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "01bpzn38cwn9zlydzvnfz9k7mxdnjnvgnbcpx7i4al8fha7x9lw8"; }; - buildInputs = + buildInputs = [ wxGTK SDL2 ]; preConfigure = '' @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Audibilization and Visualization of Sorting Algorithms"; - homepage = "http://panthema.net/2013/sound-of-sorting/"; + homepage = "https://panthema.net/2013/sound-of-sorting/"; license = with licenses; gpl3; maintainers = with maintainers; [ AndersonTorres ]; }; diff --git a/pkgs/misc/stabber/default.nix b/pkgs/misc/stabber/default.nix index 17ef047ede73..2c63bf40d36b 100644 --- a/pkgs/misc/stabber/default.nix +++ b/pkgs/misc/stabber/default.nix @@ -6,13 +6,13 @@ with stdenv.lib; stdenv.mkDerivation { pname = "stabber-unstable"; - version = "2016-11-09"; + version = "2020-06-08"; src = fetchFromGitHub { owner = "boothj5"; repo = "stabber"; - rev = "ed75087e4483233eb2cc5472dbd85ddfb7a1d4d4"; - sha256 = "1l6cibggi9rx6d26j1g92r1m8zm1g899f6z7n4pfqp84mrfqgz0p"; + rev = "3e5c2200715666aad403d0076e8ab584b329965e"; + sha256 = "0042nbgagl4gcxa5fj7bikjdi1gbk0jwyqnzc5lswpb0l5y0i1ql"; }; preAutoreconf = '' @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "Stubbed XMPP Server"; - homepage = "https://github.com/boothj5/stabber"; + homepage = "https://github.com/profanity-im/stabber"; license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ hschaeidt ]; diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 23c513ea175c..5610b2c694ca 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -66,14 +66,32 @@ in rec { continuum = mkDerivation { pluginName = "continuum"; - version = "unstable-2018-02-23"; + version = "unstable-2020-10-16"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "tmux-continuum"; - rev = "1531b3770a7cf7373d15fedd239c5331b99342d1"; - sha256 = "1w3f7gzvv1k25yfr6d1snr2z88p8f87cahrbaslmyphdxpy0fa4m"; + rev = "26eb5ffce0b559d682b9f98c8d4b6c370ecb639b"; + sha256 = "1glwa89bv2r92qz579a49prk3jf612cpd5hw46j4wfb35xhnj3ab"; }; dependencies = [ resurrect ]; + meta = { + homepage = "https://github.com/tmux-plugins/tmux-continuum"; + description = "continous saving of tmux environment"; + longDescription = + '' + Features: + * continuous saving of tmux environment + * automatic tmux start when computer/server is turned on + * automatic restore when tmux is started + + Together, these features enable uninterrupted tmux usage. No matter the + computer or server restarts, if the machine is on, tmux will be there how + you left it off the last time it was used. + ''; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ ronanmacf ]; + }; }; copycat = mkDerivation { @@ -89,12 +107,12 @@ in rec { cpu = mkDerivation { pluginName = "cpu"; - version = "unstable-2020-04-05"; + version = "unstable-2020-07-25"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "tmux-cpu"; - rev = "8858050756e1fc3c081d37894b441f05ea893a67"; - sha256 = "1bydzrnd9y5y46hjr844p4ylx2dpijn6pv3w94yyvwbyswmirhff"; + rev = "20120a38ade17057441482b43eb5390e6ea2c1c1"; + sha256 = "1gdz2awyd9icvyiw2p40gwymh6ngjhb9mkiv63ix53snp9ii794i"; }; }; @@ -109,6 +127,20 @@ in rec { }; }; + fingers = mkDerivation rec { + pluginName = "fingers"; + rtpFilePath = "tmux-fingers.tmux"; + version = "1.0.1"; + src = fetchFromGitHub { + owner = "Morantron"; + repo = "tmux-fingers"; + rev = version; + sha256 = "0gp37m3d0irrsih96qv2yalvr1wmf1n64589d4qzyzq16lzyjcr0"; + fetchSubmodules = true; + }; + dependencies = [ pkgs.gawk ]; + }; + fpp = mkDerivation { pluginName = "fpp"; version = "unstable-2016-03-08"; @@ -170,6 +202,17 @@ in rec { }; }; + nord = mkDerivation rec { + pluginName = "nord"; + version = "0.3.0"; + src = pkgs.fetchFromGitHub { + owner = "arcticicestudio"; + repo = "nord-tmux"; + rev = "v${version}"; + sha256 = "14xhh49izvjw4ycwq5gx4if7a0bcnvgsf3irywc3qps6jjcf5ymk"; + }; + }; + maildir-counter = mkDerivation { pluginName = "maildir-counter"; version = "unstable-2016-11-25"; @@ -241,12 +284,38 @@ in rec { resurrect = mkDerivation { pluginName = "resurrect"; - version = "unstable-2020-03-21"; + version = "unstable-2020-09-18"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "tmux-resurrect"; - rev = "327c0481ad20c429b4e692e092659f8b3346b08f"; - sha256 = "0nxfqazww36wwv49dzd39kq4jfls20834hf1458sf5pvmv5cmbyw"; + rev = "e4825055c92e54b0c6ec572afc9b6c4723aba6c8"; + sha256 = "0a96drkx1kpadkbxabcnvb542p75xdh2dbizvlq2lac5ldpb4hmx"; + }; + meta = { + homepage = "https://github.com/tmux-plugins/tmux-resurrect"; + description = "Restore tmux environment after system restart"; + longDescription = + '' + This plugin goes to great lengths to save and restore all the details + from your tmux environment. Here's what's been taken care of: + + * all sessions, windows, panes and their order + * current working directory for each pane + * exact pane layouts within windows (even when zoomed) + * active and alternative session + * active and alternative window for each session + * windows with focus + * active pane for each window + * "grouped sessions" (useful feature when using tmux with multiple monitors) + * programs running within a pane! More details in the restoring programs doc. + + Optional: + * restoring vim and neovim sessions + * restoring pane contents + ''; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ ronanmacf ]; }; }; @@ -323,6 +392,25 @@ in rec { dependencies = [ pkgs.urlview ]; }; + vim-tmux-focus-events = mkDerivation { + pluginName = "vim-tmux-focus-events"; + version = "unstable-2020-10-05"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "vim-tmux-focus-events"; + rev = "a568192ca0de4ca0bd7b3cd0249aad491625c941"; + sha256 = "130l73v18md95djkc4s9d0fr018f8f183sjcgy7dgldwdaxlqdi1"; + }; + + meta = with stdenv.lib; { + homepage = "https://github.com/tmux-plugins/vim-tmux-focus-events"; + description = "Makes FocusGained and FocusLost autocommand events work in vim when using tmux"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ ronanmacf ]; + }; + }; + vim-tmux-navigator = mkDerivation { pluginName = "vim-tmux-navigator"; rtpFilePath = "vim-tmux-navigator.tmux"; diff --git a/pkgs/misc/tpm2-pkcs11/default.nix b/pkgs/misc/tpm2-pkcs11/default.nix index a089488b0e02..7533707ccf93 100644 --- a/pkgs/misc/tpm2-pkcs11/default.nix +++ b/pkgs/misc/tpm2-pkcs11/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "tpm2-pkcs11"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "tpm2-software"; repo = pname; rev = version; - sha256 = "0ydd88jc4pyf1v7008h2gf0napv6xpw4jn5w87slj9fphjdkwjiz"; + sha256 = "12zj8jfm8jrwbqm3cnay8gx28ladmpyv5d29lp8qlfjqgflvhkwh"; }; patches = lib.singleton ( @@ -74,6 +74,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/tpm2-software/tpm2-pkcs11"; license = licenses.bsd2; platforms = platforms.linux; - maintainers = with maintainers; [ lschuermann ]; + maintainers = with maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 321891892b7b..0a178b398006 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -18,10 +18,10 @@ }: let - defaultVersion = "2020.04"; + defaultVersion = "2020.10"; defaultSrc = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2"; - sha256 = "0wjkasnz87q86hx93inspdjfjsinmxi87bcvj30c773x0fpjlwzy"; + sha256 = "08m6f1bh4pdcqbxf983qdb66ccd5vak5cbzc114yf3jwq2yinj0d"; }; buildUBoot = { version ? null @@ -176,7 +176,7 @@ in { ubootNovena = buildUBoot { defconfig = "novena_defconfig"; extraMeta.platforms = ["armv7l-linux"]; - filesToInstall = ["u-boot.bin" "SPL"]; + filesToInstall = ["u-boot-dtb.img" "SPL"]; }; # Flashing instructions: @@ -271,6 +271,13 @@ in { filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; + ubootPinebookPro = buildUBoot { + defconfig = "pinebook-pro-rk3399_defconfig"; + extraMeta.platforms = ["aarch64-linux"]; + BL31 = "${armTrustedFirmwareRK3399}/bl31.elf"; + filesToInstall = [ "u-boot.itb" "idbloader.img"]; + }; + ubootQemuAarch64 = buildUBoot { defconfig = "qemu_arm64_defconfig"; extraMeta.platforms = ["aarch64-linux"]; @@ -350,6 +357,13 @@ in { filesToInstall = [ "u-boot.itb" "idbloader.img"]; }; + ubootROCPCRK3399 = buildUBoot { + defconfig = "roc-pc-rk3399_defconfig"; + extraMeta.platforms = ["aarch64-linux"]; + filesToInstall = [ "spl/u-boot-spl.bin" "u-boot.itb" "idbloader.img"]; + BL31 = "${armTrustedFirmwareRK3399}/bl31.elf"; + }; + ubootSheevaplug = buildUBoot { defconfig = "sheevaplug_defconfig"; extraMeta.platforms = ["armv5tel-linux"]; @@ -380,4 +394,11 @@ in { extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot.img" "SPL"]; }; + + ubootRockPi4 = buildUBoot { + defconfig = "rock-pi-4-rk3399_defconfig"; + extraMeta.platforms = ["aarch64-linux"]; + BL31 = "${armTrustedFirmwareRK3399}/bl31.elf"; + filesToInstall = [ "u-boot.itb" "idbloader.img"]; + }; } diff --git a/pkgs/misc/uboot/nanonote.nix b/pkgs/misc/uboot/nanonote.nix deleted file mode 100644 index fb3b98f478e6..000000000000 --- a/pkgs/misc/uboot/nanonote.nix +++ /dev/null @@ -1,59 +0,0 @@ -{stdenv, fetchurl, fetchgit}: - -# All this file is made for the Marvell Sheevaplug - -stdenv.mkDerivation { - name = "uboot-qb-2010.06"; - - src = fetchurl { - url = "ftp://ftp.denx.de/pub/u-boot/u-boot-2010.06.tar.bz2"; - sha256 = "1j0bl8x5i5m1pn62z450gbw30pbrj7sgs3fjp2l2giczv49cn33r"; - }; - - srcPatches = fetchgit { - url = "git://projects.qi-hardware.com/openwrt-xburst.git"; - rev = "3244d5ef9f93802f9b9b6f4405636424abf6fa83"; - sha256 = "0mg87s10hpz41dr1zbd3bcl8i64gwvh3f1nrz8cb8c49099miqla"; - }; - - patchPhase = '' - cp -R $srcPatches/package/uboot-xburst/files/* . - for a in $srcPatches/package/uboot-xburst/patches/*; do - patch -p1 < $a - done - chmod +w -R * - sed -i -e 's/console=ttyS0,57600n8//' include/configs/qi_lb60.h - # Load more than 2MiB for the kernel - sed -i -e 's/0x200000;bootm/0x400000;bootm/' include/configs/qi_lb60.h - ''; - - makeFlags = [ - "CROSS_COMPILE=${stdenv.cc.targetPrefix}" - ]; - - # Add reiserfs support - configurePhase = '' - make mrproper - make qi_lb60_config - ''; - - preBuild= '' - # A variable named 'src' used to affect the build in some uboot... - unset -v src - ''; - - dontStrip = true; - - installPhase = '' - mkdir -p $out - cp u-boot-nand.bin $out - cp u-boot u-boot.map $out - - mkdir -p $out/bin - cp tools/{envcrc,mkimage} $out/bin - ''; - - meta = { - platforms = stdenv.lib.platforms.mips; - }; -} diff --git a/pkgs/misc/uq/default.nix b/pkgs/misc/uq/default.nix index fe3a1e2a5d15..5c0fb9549100 100755 --- a/pkgs/misc/uq/default.nix +++ b/pkgs/misc/uq/default.nix @@ -21,6 +21,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/lostutils/uq"; license = licenses.mit; maintainers = with maintainers; [ doronbehar ]; - platforms = platforms.all; }; } diff --git a/pkgs/misc/vim-plugins/deprecated.json b/pkgs/misc/vim-plugins/deprecated.json index 218a1ab622fd..b95e91a19b2c 100644 --- a/pkgs/misc/vim-plugins/deprecated.json +++ b/pkgs/misc/vim-plugins/deprecated.json @@ -3,6 +3,10 @@ "date": "2020-03-27", "new": "vim-gist" }, + "nvim-lsp": { + "date": "2020-08-31", + "new": "nvim-lspconfig" + }, "vim-jade": { "date": "2020-03-27", "new": "vim-pug" diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 962c0eb9a034..9d721ef3eb00 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -41,12 +41,12 @@ let agda-vim = buildVimPluginFrom2Nix { pname = "agda-vim"; - version = "2020-04-06"; + version = "2020-07-26"; src = fetchFromGitHub { owner = "derekelkins"; repo = "agda-vim"; - rev = "3643fa185ebe3bf35cf690a4b3b90d36e36405b0"; - sha256 = "09lpg223l1s8zpsmbg1r18cnr7r3np32nsv185qgcv889mlildqn"; + rev = "3c92e212a05eb254849a597d8d002abf69699aa0"; + sha256 = "0m3kinhzjk0cky372j1kw6hhy14khshkh9jbw35a5q18c4xvy4pq"; }; meta.homepage = "https://github.com/derekelkins/agda-vim/"; }; @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2020-05-22"; + version = "2020-11-14"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "7265ceb6d050d1a4642741d248f11e4f2abd37e1"; - sha256 = "172ip0wbrmrwxhv5nvpgb0g982w9smyzlwg16gphrjiwnxllj1w7"; + rev = "48fe0dd4f629bb1282277ba8a6757a84c13a4dda"; + sha256 = "192wb50cv7yv6c4gmjmlmh8b5891v51xcxm396sm4d5y9pzw52mc"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -89,12 +89,12 @@ let ansible-vim = buildVimPluginFrom2Nix { pname = "ansible-vim"; - version = "2020-05-14"; + version = "2020-10-15"; src = fetchFromGitHub { owner = "pearofducks"; repo = "ansible-vim"; - rev = "fa0192fe508000d904e79d17706471732075c653"; - sha256 = "12nhiz5hnbi4l5ksb26xhj47r5g5z68zncgdlmqkkfqzqw1cj9c3"; + rev = "7abb04c115742ec9a5f90b86170f0118680cf8ec"; + sha256 = "185b4dari7y05p99756bqld4kk3d124ry4m4j7an8qm0zmpq648m"; }; meta.homepage = "https://github.com/pearofducks/ansible-vim/"; }; @@ -135,14 +135,26 @@ let meta.homepage = "https://github.com/vim-scripts/argtextobj.vim/"; }; + asyncomplete-vim = buildVimPluginFrom2Nix { + pname = "asyncomplete-vim"; + version = "2020-11-04"; + src = fetchFromGitHub { + owner = "prabirshrestha"; + repo = "asyncomplete.vim"; + rev = "ed75b1c92fb144bbe236bfb4d60a98dccf637c58"; + sha256 = "1szxam9hq3s1s542i5fk5pkr5kdpdlz5849yq68i2nnkkh8xwrar"; + }; + meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/"; + }; + ats-vim = buildVimPluginFrom2Nix { pname = "ats-vim"; - version = "2020-03-24"; + version = "2020-09-04"; src = fetchFromGitHub { owner = "vmchale"; repo = "ats-vim"; - rev = "a17576687217a2e8066356cc211afb99b5de65e8"; - sha256 = "0dv60za39v2w5d9mbk1r263fqpv11bdfyqp39b0snw40f0kh92z0"; + rev = "8e3e722b6d09ed81313573b4e7b108b265628ff1"; + sha256 = "1jj4q8dmal7rgizqm59dbgjf8by8lxjwnbg39gkbmjiwhdj8q67h"; }; meta.homepage = "https://github.com/vmchale/ats-vim/"; }; @@ -185,28 +197,40 @@ let awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; - version = "2020-03-26"; + version = "2020-10-24"; src = fetchFromGitHub { owner = "rafi"; repo = "awesome-vim-colorschemes"; - rev = "4ad0ce02b8efa3c6e014e224a34b67b927d31c88"; - sha256 = "0crg0gph8wmb412yvknh6ic42i3p5hd8c736rv61v52b2g0dgwxm"; + rev = "6ab7034fde6e6e4307df83d8735643b0fe1ff641"; + sha256 = "0ds3xxb2w645aspn2d1n5543h9vpn869aihq68z0ajkvvl8mr66z"; }; meta.homepage = "https://github.com/rafi/awesome-vim-colorschemes/"; }; ayu-vim = buildVimPluginFrom2Nix { pname = "ayu-vim"; - version = "2020-04-13"; + version = "2020-05-29"; src = fetchFromGitHub { owner = "ayu-theme"; repo = "ayu-vim"; - rev = "a3a2d2a4ce36e0f681236b3ab15043c0b09460b1"; - sha256 = "06lhfwh8z178bgbbcz4mxjpk6zajz19x1jhaahbsqg3641y5pj0p"; + rev = "0745635421688ce777f663d13531996cb4da6514"; + sha256 = "0w7ixhz72g3lr1hkn450k6x8sdgv95pp6pxbykka3s01i506rzmj"; }; meta.homepage = "https://github.com/ayu-theme/ayu-vim/"; }; + barbar-nvim = buildVimPluginFrom2Nix { + pname = "barbar-nvim"; + version = "2020-11-14"; + src = fetchFromGitHub { + owner = "romgrk"; + repo = "barbar.nvim"; + rev = "2122af3641f138281a351611861900ca823a2324"; + sha256 = "1wqkq6cwhwbr6cypn05mbb2n7ry6b5b7ic7ad8s1hmc4gxgfxk6h"; + }; + meta.homepage = "https://github.com/romgrk/barbar.nvim/"; + }; + base16-vim = buildVimPluginFrom2Nix { pname = "base16-vim"; version = "2019-06-07"; @@ -243,6 +267,18 @@ let meta.homepage = "https://github.com/rbgrouleff/bclose.vim/"; }; + BetterLua-vim = buildVimPluginFrom2Nix { + pname = "BetterLua-vim"; + version = "2020-08-14"; + src = fetchFromGitHub { + owner = "euclidianAce"; + repo = "BetterLua.vim"; + rev = "d2d6c115575d09258a794a6f20ac60233eee59d5"; + sha256 = "1rvlx21kw8865dg6q97hx9i2s1n8mn1nyhn0m7dkx625pghsx3js"; + }; + meta.homepage = "https://github.com/euclidianAce/BetterLua.vim/"; + }; + bufexplorer = buildVimPluginFrom2Nix { pname = "bufexplorer"; version = "2020-02-17"; @@ -269,12 +305,12 @@ let calendar-vim = buildVimPluginFrom2Nix { pname = "calendar-vim"; - version = "2020-05-24"; + version = "2020-10-16"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "b2e7a69945c2b452598a1d4fa25d8fc94aa8b02c"; - sha256 = "03fx03pdw4bwqyd4jyk0ixb5fhv900x0lg615ig0i4qg9nqjnc8n"; + rev = "84335b66be1e323002380280f265983dc635fd99"; + sha256 = "0p9f7hy751ayjh6pna8gi0vi09lk0dwpi69rh21nidiqiph6n5l5"; }; meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; @@ -293,12 +329,12 @@ let caw-vim = buildVimPluginFrom2Nix { pname = "caw-vim"; - version = "2020-05-12"; + version = "2020-11-04"; src = fetchFromGitHub { owner = "tyru"; repo = "caw.vim"; - rev = "2c6b9f2d9a2b4d172adde4c393b1a04c59a0b471"; - sha256 = "0137vs50xmdggc2nqclp6i7i640nkj31czm8cmqx19504b7hy8vw"; + rev = "41be34ca231c97d6be6c05e7ecb5b020f79cd37f"; + sha256 = "0da1v913nlf9kddyk1hqx4h6n95r67b0lxa71hkp8lhqzy9z0gw0"; }; meta.homepage = "https://github.com/tyru/caw.vim/"; }; @@ -327,14 +363,26 @@ let meta.homepage = "https://github.com/chrisbra/CheckAttach/"; }; + ci_dark = buildVimPluginFrom2Nix { + pname = "ci_dark"; + version = "2020-11-07"; + src = fetchFromGitHub { + owner = "chuling"; + repo = "ci_dark"; + rev = "8a53f6267dffd1dea3f50adc4b61653178c00115"; + sha256 = "1bwprg23d593pplm5cwfkg5yj0i8k2gqb3aj8yp8sdiccikfbswk"; + }; + meta.homepage = "https://github.com/chuling/ci_dark/"; + }; + clang_complete = buildVimPluginFrom2Nix { pname = "clang_complete"; - version = "2020-05-06"; + version = "2020-09-18"; src = fetchFromGitHub { owner = "xavierd"; repo = "clang_complete"; - rev = "10e5102af5d1b16ba7aa3fb51d67153041f82ed7"; - sha256 = "0crynvmdp9a5rws5hfnsn19kxqviyp29n8fz40wq7k1g5vrhvdl7"; + rev = "293a1062274a06be61797612034bd8d87851406e"; + sha256 = "1whipcrr4pcg1bkivq3l753v3f3glbhkdd6wp6f9czspr7hx2h2d"; }; meta.homepage = "https://github.com/xavierd/clang_complete/"; }; @@ -351,186 +399,54 @@ let meta.homepage = "https://github.com/bbchung/clighter8/"; }; - coc-css = buildVimPluginFrom2Nix { - pname = "coc-css"; - version = "2020-04-15"; + coc-clap = buildVimPluginFrom2Nix { + pname = "coc-clap"; + version = "2020-07-17"; src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-css"; - rev = "41fe3122753b62c4416eb5e4ca4bef1cb3d3ebd2"; - sha256 = "13xg0v2iwf8nrd1bba5nmwgav37fb8q4fqr5bsg3qxlbghpw0bbl"; + owner = "vn-ki"; + repo = "coc-clap"; + rev = "09d9059c243a25c5859fd73fff6b664d8bf5eed0"; + sha256 = "057kad7nwc75c92d2al6q25gs7vrf0l14529iclrgd61vg369sva"; }; - meta.homepage = "https://github.com/neoclide/coc-css/"; + meta.homepage = "https://github.com/vn-ki/coc-clap/"; }; coc-denite = buildVimPluginFrom2Nix { pname = "coc-denite"; - version = "2020-04-17"; + version = "2020-09-10"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-denite"; - rev = "50a573af21a9563f331f2711f3fd7a568c33907f"; - sha256 = "06h3if5sn5sqgrq1ql1j7g5xy658mwywd7ri1hajzi8s3mb5lanq"; + rev = "8ff425faab53e8bb8c53eec1afdf19a29c8086f6"; + sha256 = "06ddv9brb4zy8ylas36dkmblr93n6c5dp6vpp3c7asxc1kx58gc5"; }; meta.homepage = "https://github.com/neoclide/coc-denite/"; }; - coc-emmet = buildVimPluginFrom2Nix { - pname = "coc-emmet"; - version = "2020-05-19"; + coc-explorer = buildVimPluginFrom2Nix { + pname = "coc-explorer"; + version = "2020-11-18"; src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-emmet"; - rev = "5424c10fb8c451059cdcf04b10aa7c28178ce5b0"; - sha256 = "15zfmsy7ymcp3js3y8f6wvwj3r0p9a45v1zvq07ilwri91z6nkrl"; + owner = "weirongxu"; + repo = "coc-explorer"; + rev = "654fe4ece0ff49b62d3f19d678436522f92c3a08"; + sha256 = "1j38g0c81rnk502vr6n7zf7r1v3p48mimsd13dc7cqsvnhrh34ix"; }; - meta.homepage = "https://github.com/neoclide/coc-emmet/"; - }; - - coc-eslint = buildVimPluginFrom2Nix { - pname = "coc-eslint"; - version = "2020-05-21"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-eslint"; - rev = "eed42192dab175bbf249e21c18c85cbd5afdd92a"; - sha256 = "1a9csiyj7abksar917acfjgypmc28rcfsqga0p1550mjxvkjr2ia"; - }; - meta.homepage = "https://github.com/neoclide/coc-eslint/"; + meta.homepage = "https://github.com/weirongxu/coc-explorer/"; }; coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2020-05-28"; + version = "2020-11-17"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "ba8cf9afc8aae3ea4086d89a01bd414d42a6b8bc"; - sha256 = "13dv08kpp3cxqgikznyxkl7nsjzxn97aklk6k6s19cw3b5al15pn"; + rev = "f3d792518982d58a7d7f846f31f01f0ef0c5434a"; + sha256 = "10xl2gx1n9c34amca7zq4chczfc126dwz7733fi55ks29fdl708c"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; - coc-git = buildVimPluginFrom2Nix { - pname = "coc-git"; - version = "2020-05-12"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-git"; - rev = "b45372104d2234612f89658570887c55e6efea83"; - sha256 = "1p7ah0dr31h0pllx00ms46fd5pmkp604zlkk08z40w54hzhr5qhh"; - }; - meta.homepage = "https://github.com/neoclide/coc-git/"; - }; - - coc-go = buildVimPluginFrom2Nix { - pname = "coc-go"; - version = "2020-05-25"; - src = fetchFromGitHub { - owner = "josa42"; - repo = "coc-go"; - rev = "d9756fd65dc1d6740e797fa22d3f6f4fdb2b00d5"; - sha256 = "14qc9ny12y52rbxn0gcwh6cpqc2zpwgb4jlla5p72w9pfh9gfh6z"; - }; - meta.homepage = "https://github.com/josa42/coc-go/"; - }; - - coc-highlight = buildVimPluginFrom2Nix { - pname = "coc-highlight"; - version = "2019-10-18"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-highlight"; - rev = "b4e82ebd5fe855d004dd481e2ecf2fa88faed284"; - sha256 = "06h64jq8cgj5hc19inidns046kkb76750179jsw7xv5zbp93ygap"; - }; - meta.homepage = "https://github.com/neoclide/coc-highlight/"; - }; - - coc-html = buildVimPluginFrom2Nix { - pname = "coc-html"; - version = "2020-03-30"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-html"; - rev = "8ae5d2832761b5868f69c67f33ce26f9edb26c65"; - sha256 = "1rf9qfimnbxjr5s55pzm8npixan5cz2v17g4j34f18i9ky6yyk0b"; - }; - meta.homepage = "https://github.com/neoclide/coc-html/"; - }; - - coc-imselect = buildVimPluginFrom2Nix { - pname = "coc-imselect"; - version = "2020-02-18"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-imselect"; - rev = "01442d2fb7d344122e59755f59782a0e1bf7d294"; - sha256 = "1vqx9yna66njdw1my15ac6djr3yvnb6das96nx12mpingnw85kky"; - }; - meta.homepage = "https://github.com/neoclide/coc-imselect/"; - }; - - coc-java = buildVimPluginFrom2Nix { - pname = "coc-java"; - version = "2020-04-23"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-java"; - rev = "3c914c2b9e154889361d2631cd2188cf7e5fa020"; - sha256 = "0q7q2z7k2sxqgi6nyj669iq2p4h3962i8hv3gzg2mpi0p73xs98k"; - }; - meta.homepage = "https://github.com/neoclide/coc-java/"; - }; - - coc-jest = buildVimPluginFrom2Nix { - pname = "coc-jest"; - version = "2020-05-27"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-jest"; - rev = "431471caa9011868327fff0f9f7e0a944b7ca33b"; - sha256 = "0vcri3kp8njsp4zgl74vc6ydhxq5spzx6pm798jh2lvrid2byvg9"; - }; - meta.homepage = "https://github.com/neoclide/coc-jest/"; - }; - - coc-json = buildVimPluginFrom2Nix { - pname = "coc-json"; - version = "2020-05-12"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-json"; - rev = "66b482dbc8008b9a111e6141aa2e63baa16fb2d4"; - sha256 = "0ixqk417ba1yz7lnjkir5h9h8qm5jc9sh2190vmddxr8wgxhjhbb"; - }; - meta.homepage = "https://github.com/neoclide/coc-json/"; - }; - - coc-lists = buildVimPluginFrom2Nix { - pname = "coc-lists"; - version = "2020-04-28"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-lists"; - rev = "aaa16caf94c50e7c301cb3848e988639cf0599a3"; - sha256 = "1m8i8r7fl1csnx6f4mrbaf7ncng8yyfnprqax0zyiryc5i4nqjbg"; - }; - meta.homepage = "https://github.com/neoclide/coc-lists/"; - }; - - coc-metals = buildVimPluginFrom2Nix { - pname = "coc-metals"; - version = "2020-05-25"; - src = fetchFromGitHub { - owner = "ckipp01"; - repo = "coc-metals"; - rev = "99431ec2eb4e5a9a0309d63bd4167e5af2f1d781"; - sha256 = "13qqfhwv745svf5672hm7m4n3dk9c15py5l0znygn5a6gs5rjzzm"; - }; - meta.homepage = "https://github.com/ckipp01/coc-metals/"; - }; - coc-neco = buildVimPluginFrom2Nix { pname = "coc-neco"; version = "2020-04-07"; @@ -543,266 +459,50 @@ let meta.homepage = "https://github.com/neoclide/coc-neco/"; }; - coc-pairs = buildVimPluginFrom2Nix { - pname = "coc-pairs"; - version = "2020-03-09"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-pairs"; - rev = "79deeaabdc4f091c22f3dd67d439a0a336e8aa7e"; - sha256 = "1w6p2dk7yj8ldxg1qxh9zpn9ypm6gn66gi0vbax33wf5c0dmp0v9"; - }; - meta.homepage = "https://github.com/neoclide/coc-pairs/"; - }; - - coc-prettier = buildVimPluginFrom2Nix { - pname = "coc-prettier"; - version = "2020-05-27"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-prettier"; - rev = "1fbfe34dfce455111e3eae939fc8a37d2fd1ec42"; - sha256 = "170zhsq73shykxszwwcqakrnl5cawf9kkgc1mqy0l0jqmw3jk8qy"; - }; - meta.homepage = "https://github.com/neoclide/coc-prettier/"; - }; - - coc-python = buildVimPluginFrom2Nix { - pname = "coc-python"; - version = "2020-05-08"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-python"; - rev = "c4b450a62020ff37b27ea0b8d05de3e3c53344c6"; - sha256 = "1hk29c55nk21avhrk9i8dppcid62jnr1y2b9lml14c4y01yr4mpp"; - }; - meta.homepage = "https://github.com/neoclide/coc-python/"; - }; - - coc-r-lsp = buildVimPluginFrom2Nix { - pname = "coc-r-lsp"; - version = "2019-12-07"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-r-lsp"; - rev = "a1b97e36c601975a8d730b6965f25592b1ecd1e7"; - sha256 = "04g1kbgm8p0asrsibmg4w6wj8i2xzwc70g7rkcs2bj3pakbkvws6"; - }; - meta.homepage = "https://github.com/neoclide/coc-r-lsp/"; - }; - - coc-rls = buildVimPluginFrom2Nix { - pname = "coc-rls"; - version = "2020-05-13"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-rls"; - rev = "166fd05342d026759246594eb5fd8d0bc240505d"; - sha256 = "17x0h2g5791z5xmhl7kps09b9zrac2yni3r59rrx96rry50fkca5"; - }; - meta.homepage = "https://github.com/neoclide/coc-rls/"; - }; - - coc-rust-analyzer = buildVimPluginFrom2Nix { - pname = "coc-rust-analyzer"; - version = "2020-05-27"; - src = fetchFromGitHub { - owner = "fannheyward"; - repo = "coc-rust-analyzer"; - rev = "95fe45bb82f88a5da5461a2925c7daac1ff24155"; - sha256 = "1zczdz07fmcd7i05bz99m3a90v1dnbf4mjbh1iha0h2kyj0fj0sd"; - }; - meta.homepage = "https://github.com/fannheyward/coc-rust-analyzer/"; - }; - - coc-smartf = buildVimPluginFrom2Nix { - pname = "coc-smartf"; - version = "2019-07-26"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-smartf"; - rev = "d40714eab8e5fe26fac492ffd30e98cd1bfbdec5"; - sha256 = "0kfrq5hk8zn24cl7fiy48nyvd30a2dva93c61079axkdg9912yd7"; - }; - meta.homepage = "https://github.com/neoclide/coc-smartf/"; - }; - - coc-snippets = buildVimPluginFrom2Nix { - pname = "coc-snippets"; - version = "2020-05-20"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-snippets"; - rev = "f5e7a3575a04ee9cacd659380d0d0118fa4bb5cd"; - sha256 = "0zrllqqdgf1ckzgaxhk7459cbkv7x1vkfgwsvilcjspxaww1s1bv"; - }; - meta.homepage = "https://github.com/neoclide/coc-snippets/"; - }; - - coc-solargraph = buildVimPluginFrom2Nix { - pname = "coc-solargraph"; - version = "2020-02-14"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-solargraph"; - rev = "231447aae26a0e88aa6d9e207a7354c4ca37d564"; - sha256 = "0amcx519r9j8jr6ckglywsjlyph3m5jq4qvbfwyir8ihxhxa4b0d"; - }; - meta.homepage = "https://github.com/neoclide/coc-solargraph/"; - }; - coc-spell-checker = buildVimPluginFrom2Nix { pname = "coc-spell-checker"; - version = "2020-05-15"; + version = "2020-09-15"; src = fetchFromGitHub { owner = "iamcco"; repo = "coc-spell-checker"; - rev = "bc9802c667aac992fab2f47b0da096c28dca0dfd"; - sha256 = "1fsjf07w0z9l2zra46krpg1d6qxg51niz9zmxas66si90qb2j3d7"; + rev = "a76ebbff41fec61bb7a3c2556a670720db3f9ff9"; + sha256 = "0i2znngg8jyxgns1kqi5168c4899wj2b8h8n14yy6pxgidhgqvzp"; }; meta.homepage = "https://github.com/iamcco/coc-spell-checker/"; }; - coc-stylelint = buildVimPluginFrom2Nix { - pname = "coc-stylelint"; - version = "2019-08-20"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-stylelint"; - rev = "288a372261cbc23ae4a6e26b1621c6e3218d00ad"; - sha256 = "1qir8diqnv1a78lzw9p3jsbni52gdg38rx1lj5i4iyff9282ir2x"; - }; - meta.homepage = "https://github.com/neoclide/coc-stylelint/"; - }; - - coc-tabnine = buildVimPluginFrom2Nix { - pname = "coc-tabnine"; - version = "2020-01-06"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-tabnine"; - rev = "442c829185ecab2268d1b9fd076c5286bbd39562"; - sha256 = "0as4b33nnp7anqbxkkja8lp37y4a74b3507zyk3gmmna0my1ca3r"; - }; - meta.homepage = "https://github.com/neoclide/coc-tabnine/"; - }; - - coc-tslint = buildVimPluginFrom2Nix { - pname = "coc-tslint"; - version = "2019-07-03"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-tslint"; - rev = "6128761577806d7047fa05d1a527945490d6316c"; - sha256 = "1vi4vrawknkd5wjyb0j143jbfis9vaanl219a7argirwjs057vpd"; - }; - meta.homepage = "https://github.com/neoclide/coc-tslint/"; - }; - - coc-tslint-plugin = buildVimPluginFrom2Nix { - pname = "coc-tslint-plugin"; - version = "2019-07-18"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-tslint-plugin"; - rev = "acc1356253a5088f630d9910b5fc13dc5d108bbc"; - sha256 = "1cjgimqgd70x5zhw641z6g4hc54vrkg3r4sscg092gkrdpkq3969"; - }; - meta.homepage = "https://github.com/neoclide/coc-tslint-plugin/"; - }; - - coc-tsserver = buildVimPluginFrom2Nix { - pname = "coc-tsserver"; - version = "2020-05-22"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-tsserver"; - rev = "bac002caef532d6dc58c10a2885eeed463082d4f"; - sha256 = "1b10bdlqbj82rragymka691fz0phgk6v63diijkyb1ia302q1613"; - }; - meta.homepage = "https://github.com/neoclide/coc-tsserver/"; - }; - - coc-vetur = buildVimPluginFrom2Nix { - pname = "coc-vetur"; - version = "2020-05-14"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-vetur"; - rev = "679eb834ac8c16290a0cc50ab7c222e1144644f7"; - sha256 = "1jkz0qixrp7vzpv9l2ls0yl5kyqzi3bbvydpifdb858j8jqbk4dq"; - }; - meta.homepage = "https://github.com/neoclide/coc-vetur/"; - }; - - coc-vimtex = buildVimPluginFrom2Nix { - pname = "coc-vimtex"; - version = "2020-03-27"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-vimtex"; - rev = "0a4f8ee29afc4e1dcfdc8846f116a1db32fa9867"; - sha256 = "0z9kxm40kr8a5sa06vkg7xaai2n54y21xfkrsx774zzdkcrrkizk"; - }; - meta.homepage = "https://github.com/neoclide/coc-vimtex/"; - }; - - coc-wxml = buildVimPluginFrom2Nix { - pname = "coc-wxml"; - version = "2019-06-20"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-wxml"; - rev = "f02550939d33a0175c34186904c376bbae878e60"; - sha256 = "1448019dzdy55j4plhzlnp2qkfzk0zkqqs7kn94ndn60hn1x889m"; - }; - meta.homepage = "https://github.com/neoclide/coc-wxml/"; - }; - - coc-yaml = buildVimPluginFrom2Nix { - pname = "coc-yaml"; - version = "2020-03-06"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-yaml"; - rev = "338192a2434b96b139fb8c07d260da00b3100997"; - sha256 = "020jpsm9ss2v3x1g43m920w2yamv8khl7mg7wm4sx6qsl3rlfq4g"; - }; - meta.homepage = "https://github.com/neoclide/coc-yaml/"; - }; - - coc-yank = buildVimPluginFrom2Nix { - pname = "coc-yank"; - version = "2020-03-17"; - src = fetchFromGitHub { - owner = "neoclide"; - repo = "coc-yank"; - rev = "6cb8bc7f2d41b9fb75c797c5805444badeff3dd9"; - sha256 = "0s28684531ihczg5nf2m3f8z1vx9fw4yllfq7jz8g7ifw922ddxb"; - }; - meta.homepage = "https://github.com/neoclide/coc-yank/"; - }; - coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2020-05-28"; + version = "2020-11-17"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "60cd2a0935319ec7150006ce6457a9f10a5f04c2"; - sha256 = "1wanp845yv07gkyvl4kv7bd1l46mz8wy0mw7bmcxi4d6qqfjpdrv"; + rev = "103d5e995127937bdeb42cf248c2325cce93b9eb"; + sha256 = "1llgy5m8smrvbsaafirx4a0sdzvia2rxwk57jylm5hh376kll6kl"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; + codi-vim = buildVimPluginFrom2Nix { + pname = "codi-vim"; + version = "2020-07-25"; + src = fetchFromGitHub { + owner = "metakirby5"; + repo = "codi.vim"; + rev = "08e26f4dc4bdb0cbc790474beb29a48e7a9c8ceb"; + sha256 = "1qwacymipshfvvg7ya7gsfz1r65q44qjjsgya6wm81n04q9rpxfx"; + }; + meta.homepage = "https://github.com/metakirby5/codi.vim/"; + }; + colorizer = buildVimPluginFrom2Nix { pname = "colorizer"; - version = "2018-06-16"; + version = "2020-07-23"; src = fetchFromGitHub { owner = "lilydjwg"; repo = "colorizer"; - rev = "afc1491e5b9c36305ce710bdad2b48f069141183"; - sha256 = "1dpiv9z8h6196acncyjhzd1qa56y17468fpxbfzrx5q2266sajc7"; + rev = "1ddc68adbf45331158c61507a55fcc918bb61654"; + sha256 = "16zrpgnlb3v4yvpycq9spivs97vzv18m3jc47rl0hgpjdf6vhkxx"; }; meta.homepage = "https://github.com/lilydjwg/colorizer/"; }; @@ -821,12 +521,12 @@ let command-t = buildVimPluginFrom2Nix { pname = "command-t"; - version = "2020-05-09"; + version = "2020-06-02"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "9c7f81208a32fe4d26096d0d268ac6e802d945fd"; - sha256 = "0jmwhlcycb1hp65d2g54mdd7xmpmvr33lm0130c9yk16mv2ia65i"; + rev = "ea7a889bda2849ba87fc12053bf6dd14467d7b72"; + sha256 = "02rswhlkgbapnjzqi2nv95ag08p9cjlqscwv6i17f9kvba929hkl"; fetchSubmodules = true; }; meta.homepage = "https://github.com/wincent/command-t/"; @@ -834,16 +534,64 @@ let committia-vim = buildVimPluginFrom2Nix { pname = "committia-vim"; - version = "2020-05-14"; + version = "2020-08-27"; src = fetchFromGitHub { owner = "rhysd"; repo = "committia.vim"; - rev = "2cded48477a5e308c77a0d289cc9b540669b701f"; - sha256 = "1g6ykdh7d16q6nvpvmxx4ss8w7cisx5r8qmbrrvhpwmbb3894pxp"; + rev = "1d288281586d1e6b52646a4c412df3dd3a2fe231"; + sha256 = "11ik72qi7fvxkz7fnyisaa0xscy4pksq8l2pvclywzg3lcclhxp1"; }; meta.homepage = "https://github.com/rhysd/committia.vim/"; }; + completion-buffers = buildVimPluginFrom2Nix { + pname = "completion-buffers"; + version = "2020-09-26"; + src = fetchFromGitHub { + owner = "steelsojka"; + repo = "completion-buffers"; + rev = "441a58b77c04409e8ccb35fd4970598ae551462f"; + sha256 = "14q5n7h5kaqf71cfd9mlhwb0xsihm6d3kizrxhlfnzxk6zkn8p0s"; + }; + meta.homepage = "https://github.com/steelsojka/completion-buffers/"; + }; + + completion-nvim = buildVimPluginFrom2Nix { + pname = "completion-nvim"; + version = "2020-11-16"; + src = fetchFromGitHub { + owner = "nvim-lua"; + repo = "completion-nvim"; + rev = "8c028d007ca314d7734d83dcc05db1ed103db9b5"; + sha256 = "0ym17vamf5hk4lqmkfknkf0mm91vsjayhjnjyvnvc0qhyyhgsi67"; + }; + meta.homepage = "https://github.com/nvim-lua/completion-nvim/"; + }; + + completion-tabnine = buildVimPluginFrom2Nix { + pname = "completion-tabnine"; + version = "2020-10-03"; + src = fetchFromGitHub { + owner = "aca"; + repo = "completion-tabnine"; + rev = "a7e6e2e249fec79f4260f388cd0c8adb38c0b3ad"; + sha256 = "1hnbhr4sgl7a8mj2ygma9avc7hfsv18wxrxypik62x7vijsnv9aq"; + }; + meta.homepage = "https://github.com/aca/completion-tabnine/"; + }; + + completion-treesitter = buildVimPluginFrom2Nix { + pname = "completion-treesitter"; + version = "2020-06-26"; + src = fetchFromGitHub { + owner = "nvim-treesitter"; + repo = "completion-treesitter"; + rev = "45c9b2faff4785539a0d0c655440c2465fed985a"; + sha256 = "19pgdzzk7zq85b1grfjf0nncvs5vxrd4rj1p90iw2amq4mvqrx3l"; + }; + meta.homepage = "https://github.com/nvim-treesitter/completion-treesitter/"; + }; + concealedyank-vim = buildVimPluginFrom2Nix { pname = "concealedyank-vim"; version = "2013-03-24"; @@ -858,28 +606,40 @@ let conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2020-05-26"; + version = "2020-11-17"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "5cb5e37913fa6fe410ee150f5cd8c75e34b060c4"; - sha256 = "1h23qf0i97lcng1llc0q80jizsv7hkpnyvaj5dr3kfbwi84nfkmp"; + rev = "bcdaf3761b762dafb4314389d84294232dd61ed6"; + sha256 = "0ivbxr90h61zcw3ydkaajsmd5dbwcqqri3qw367kpmfsndk9k9s9"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; context_filetype-vim = buildVimPluginFrom2Nix { pname = "context_filetype-vim"; - version = "2020-04-27"; + version = "2020-09-17"; src = fetchFromGitHub { owner = "Shougo"; repo = "context_filetype.vim"; - rev = "a96f74ac35b77ebe2c5788ca31e66d87ab239adb"; - sha256 = "1pgb86cpv4649qnxfw4280sqghldm66s572pg610giqjxda4a52s"; + rev = "cf25d744ac35872364c49fac3cb6a546e8af92ce"; + sha256 = "0mq0wh6kihmn5izaz81zl274yxc1x4gr9qmz9sjdhh122i9gbfs8"; }; meta.homepage = "https://github.com/Shougo/context_filetype.vim/"; }; + Coqtail = buildVimPluginFrom2Nix { + pname = "Coqtail"; + version = "2020-11-13"; + src = fetchFromGitHub { + owner = "whonore"; + repo = "Coqtail"; + rev = "5e40da6c7119bfc31b3737d7ced2b8098f56a99f"; + sha256 = "0ggp8sw1dym9zlr8q0qhshjdgh83wr91cv5yh9b6im08rf89ddxf"; + }; + meta.homepage = "https://github.com/whonore/Coqtail/"; + }; + cosco-vim = buildVimPluginFrom2Nix { pname = "cosco-vim"; version = "2018-08-07"; @@ -894,12 +654,12 @@ let cpsm = buildVimPluginFrom2Nix { pname = "cpsm"; - version = "2018-09-08"; + version = "2020-08-01"; src = fetchFromGitHub { owner = "nixprime"; repo = "cpsm"; - rev = "900023c56dfdd200841d5c2f2f7000f332d2614f"; - sha256 = "1p1ry11f39fcz32i3b3p0p8n99qrnvrx4d7p0123123dj7wbxk3p"; + rev = "42cfb0f83083b33640619c208341629bff67bd8a"; + sha256 = "0wcq442wj73ra0agflljjkhcwlma7r703l7l9hn7zd8wfb4iv48s"; }; meta.homepage = "https://github.com/nixprime/cpsm/"; }; @@ -918,12 +678,12 @@ let csv-vim = buildVimPluginFrom2Nix { pname = "csv-vim"; - version = "2020-05-07"; + version = "2020-10-07"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "361e9c1190c53d78446743be308709bb1c253981"; - sha256 = "104qgkcvnvff59ydk18wwlsvsyw6l3nh6x49f1j2rpfmnlclamcs"; + rev = "350af4840991142230103e4f4fc58581d9c07812"; + sha256 = "1ibmrz1h51iy5ffvwalfydgjvdsfjvbpz1s1zmsalpv8mlswrhij"; }; meta.homepage = "https://github.com/chrisbra/csv.vim/"; }; @@ -966,72 +726,72 @@ let ctrlp-vim = buildVimPluginFrom2Nix { pname = "ctrlp-vim"; - version = "2020-05-26"; + version = "2020-11-12"; src = fetchFromGitHub { owner = "ctrlpvim"; repo = "ctrlp.vim"; - rev = "d93d97813dc839ef0782302a0debd7c4877f09f3"; - sha256 = "0lgw839xnmdsbaiflqp3i2liqhg4lp01iaz0jv380kbw9g6k666k"; + rev = "971c4d41880b72dbbf1620b3ad91418a6a6f6b9c"; + sha256 = "0n68hg59h4rjn0ziqbsh5pr03l3kr98zk54659ny6vq107af1w96"; }; meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/"; }; dart-vim-plugin = buildVimPluginFrom2Nix { pname = "dart-vim-plugin"; - version = "2020-05-20"; + version = "2020-11-10"; src = fetchFromGitHub { owner = "dart-lang"; repo = "dart-vim-plugin"; - rev = "70bc2f27d579d24e4973aea19df2fdffb1a8c95d"; - sha256 = "01agwm0scg7g5l04djxmj22rd5rd3di1z9g89hp2lr3rqp8ipdrn"; + rev = "8ff9e1abd264f16fd1d192024348f6c63b514a0d"; + sha256 = "15rkgh68j9agbj4144a0jis7qpcfjfspp6598laqjz1qzrx82pmf"; }; meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/"; }; defx-git = buildVimPluginFrom2Nix { pname = "defx-git"; - version = "2020-01-18"; + version = "2020-08-14"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "defx-git"; - rev = "b5d0b842064ddb7a7af0e790f4648cb1909ed43f"; - sha256 = "0i8vi6zhnv088qc3f3wa5h4b17xnpvmr603srhg44zx2clcjblnr"; + rev = "717b30addcd5204cf11c0736792c4b7c45005b88"; + sha256 = "1mx398lpzbzvrd1jawlxa4sd84ba60w3k9l46hg53hmbp1df4wff"; }; meta.homepage = "https://github.com/kristijanhusak/defx-git/"; }; defx-icons = buildVimPluginFrom2Nix { pname = "defx-icons"; - version = "2020-02-10"; + version = "2020-08-09"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "defx-icons"; - rev = "2e4df3b6302da537ac7df28fbc0e0991c6c1aa0e"; - sha256 = "0wkn02z75pvfl0xrhgq80sw0qfidjg5s0zm5mij632pq3dm7axiq"; + rev = "3259550f918b2cfb9794b62e7bb94b863f75f489"; + sha256 = "1a65p99f9f1idzkxl4fd1klxidf40lvs79bym1fydv1zw34x8qzv"; }; meta.homepage = "https://github.com/kristijanhusak/defx-icons/"; }; defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2020-05-26"; + version = "2020-11-16"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "56e0c4fd9ce28dce416420a0639792b0fc42115f"; - sha256 = "1nliphg9fjyga8p5b3flzqn7znxyazqakpzr03czzdm0vr96z9r1"; + rev = "c5b0eaa606af67fccd0d0e972ae5e8f16678ef9e"; + sha256 = "0d54gg0brcflijv2xq3x06d561z9vj2b2y658pcv9bwjmbr3pwyy"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; delimitMate = buildVimPluginFrom2Nix { pname = "delimitMate"; - version = "2017-06-19"; + version = "2020-07-29"; src = fetchFromGitHub { owner = "Raimondi"; repo = "delimitMate"; - rev = "728b57a6564c1d2bdfb9b9e0f2f8c5ba3d7e0c5c"; - sha256 = "0fskm9gz81dk8arcidrm71mv72a7isng1clssqkqn5wnygbiimsn"; + rev = "16687aec24d803bc76cae2d7bfe2b73b1cdda4ef"; + sha256 = "067bj6if0jyqy1x3hqjdc2d4jrgldz1ffppb4l9ih06m03zdqkjd"; }; meta.homepage = "https://github.com/Raimondi/delimitMate/"; }; @@ -1050,36 +810,36 @@ let denite-git = buildVimPluginFrom2Nix { pname = "denite-git"; - version = "2020-03-02"; + version = "2020-09-10"; src = fetchFromGitHub { owner = "neoclide"; repo = "denite-git"; - rev = "88b5323a6fc0ace197eed5205215d80f3b613f91"; - sha256 = "0b687i64hr8hll7pv7r1xz906b46cl2q62zm18ipikhkpva6iv13"; + rev = "2c80ef41fa56bbb4a0d48c4153404be694368141"; + sha256 = "08kdhn4kry8sc8gyffp8zl609nlajhd1x6qi50n5216r9dk03jlk"; }; meta.homepage = "https://github.com/neoclide/denite-git/"; }; denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2020-05-23"; + version = "2020-11-16"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "09c22ad10f4adaca9845db106b7a46a80dd6f6ca"; - sha256 = "1prkahf7793bi4zr60vmjsky33bzn69wjgsfkdhvgjla8kyiwf6v"; + rev = "3868302180248a19967f32a3d0f2d0057612ae34"; + sha256 = "0p3gmh9ag442zx67rkf15qdlciiwzd0aazd9sribximgl3a5jq6r"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2020-04-14"; + version = "2020-09-02"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "d438a6f550910a5688481ff0251771ac7dd09245"; - sha256 = "0p6kvl1pgf5d5rnag297dhjzzplmawvmi2j1r2m6p0732ls4qxrw"; + rev = "2c4d9117186a6cf86030d213ef2de60b5dbced19"; + sha256 = "1aka5zg7jihy1958xp4j2z3kdzmb2d4w5cbl95na4hik5rz4hyxj"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -1147,12 +907,12 @@ let deoplete-go = buildVimPluginFrom2Nix { pname = "deoplete-go"; - version = "2020-01-01"; + version = "2020-11-16"; src = fetchFromGitHub { owner = "deoplete-plugins"; repo = "deoplete-go"; - rev = "4f1ccd2ed70211fd025d052ec725c0b835bea487"; - sha256 = "0zmx98kz6pxfpakizr8xm1nrv1rjr0frz19pkik29mk6aj2b2l08"; + rev = "a6657ff9b91c7301ad1f6a01a7f0113691ef0667"; + sha256 = "02lv900k3vw33nknz58kl0hd4gr05jqq0xabi1zd4mvnk7vyqbd2"; fetchSubmodules = true; }; meta.homepage = "https://github.com/deoplete-plugins/deoplete-go/"; @@ -1172,13 +932,12 @@ let deoplete-jedi = buildVimPluginFrom2Nix { pname = "deoplete-jedi"; - version = "2020-04-13"; + version = "2020-11-07"; src = fetchFromGitHub { owner = "deoplete-plugins"; repo = "deoplete-jedi"; - rev = "42f4c24a951b0fb5e76a70e5234f16193a8a746d"; - sha256 = "1incjz7xsh4cfxw06ff07830ywn0p99b1zmml8pkapbnh3x2bjgc"; - fetchSubmodules = true; + rev = "2d61fe45e348f89979c8faf663b3e88c61435f47"; + sha256 = "0qmszwrchp272zc4rf727k9l0x472lxbbql8k2pyj1vd1ks97q1i"; }; meta.homepage = "https://github.com/deoplete-plugins/deoplete-jedi/"; }; @@ -1197,24 +956,24 @@ let deoplete-khard = buildVimPluginFrom2Nix { pname = "deoplete-khard"; - version = "2020-04-30"; + version = "2020-09-18"; src = fetchFromGitHub { owner = "nicoe"; repo = "deoplete-khard"; - rev = "7f81116b1c68d49f189a2aca62a31729fb7bb0e7"; - sha256 = "0jnpv0lpli9qjqwkzfl66fyhywa6q586q44d26q3h7sllxpz0066"; + rev = "dc2b519e8da0df10c3954946285caf484d376497"; + sha256 = "126mhnn4dqwm3aw6v4c3s3fnz40lki4cbb8xfrmxfbnbnjw1yx4x"; }; meta.homepage = "https://github.com/nicoe/deoplete-khard/"; }; deoplete-lsp = buildVimPluginFrom2Nix { pname = "deoplete-lsp"; - version = "2020-03-07"; + version = "2020-11-18"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete-lsp"; - rev = "6aa2bfd73a181fa6b55021264c4a8a83237ce558"; - sha256 = "1bcvfbv046fk34vnc1ly8civ3sibqlzli8vm2548dfxc55wcwsys"; + rev = "134e970130d57c6683052a506776fa12e04bd3de"; + sha256 = "1drbjkqx8ss2m1ns3sk5dhsg7l6xm0lvlj8kqgapqq9v5gb876j2"; }; meta.homepage = "https://github.com/Shougo/deoplete-lsp/"; }; @@ -1233,12 +992,12 @@ let deoplete-phpactor = buildVimPluginFrom2Nix { pname = "deoplete-phpactor"; - version = "2019-02-22"; + version = "2020-09-12"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "deoplete-phpactor"; - rev = "53e239effb8ff20fc0a192206e96d98d4f9001ad"; - sha256 = "14097r9fmyp9zxfgv0fj2s52qd1v5cxdckfg4zph7lg3yri1hx9p"; + rev = "3668d35d8ea8177bb70cfb239169d3c12bc54f6a"; + sha256 = "1cjdr8py7brxz419vf125jkyfjrx3n5z65ranj23z20ifc945g6b"; }; meta.homepage = "https://github.com/kristijanhusak/deoplete-phpactor/"; }; @@ -1257,12 +1016,12 @@ let deoplete-tabnine = buildVimPluginFrom2Nix { pname = "deoplete-tabnine"; - version = "2020-03-29"; + version = "2020-11-18"; src = fetchFromGitHub { owner = "tbodt"; repo = "deoplete-tabnine"; - rev = "eef0e2340e19aea05fe5759b7da3b13cadd375c4"; - sha256 = "0q10zcjhjgak3w365pagd4ym5mmj3yd1lfsxv0d4wr4lp9a51sd7"; + rev = "f3427c7633d9a79fbeea7942d2046e5b43f824dd"; + sha256 = "0xixn23k4a6s8bqp636gm5ws71r9xgg8r92xgcv1d1whx5p2yvl9"; }; meta.homepage = "https://github.com/tbodt/deoplete-tabnine/"; }; @@ -1279,6 +1038,18 @@ let meta.homepage = "https://github.com/carlitux/deoplete-ternjs/"; }; + deoplete-vim-lsp = buildVimPluginFrom2Nix { + pname = "deoplete-vim-lsp"; + version = "2020-10-27"; + src = fetchFromGitHub { + owner = "lighttiger2505"; + repo = "deoplete-vim-lsp"; + rev = "cb5af558e892a70648587e673fc251409ac3dc72"; + sha256 = "03rpw1z5fgglba7vymi3ln810nh5x3x9hjqlm41shdik9pgmg867"; + }; + meta.homepage = "https://github.com/lighttiger2505/deoplete-vim-lsp/"; + }; + deoplete-zsh = buildVimPluginFrom2Nix { pname = "deoplete-zsh"; version = "2019-11-10"; @@ -1293,36 +1064,60 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2020-05-26"; + version = "2020-11-17"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "8aef99a951686488c03070d1cf1a2155837f5f1b"; - sha256 = "0rhni3hix26flls9i1ajwnpfdynkvqxll5rhi1256pvhy2nizamq"; + rev = "27c5ddba448e50e182985e1582dd519342986cef"; + sha256 = "09i3p0r4vjc5xipqrykm83wa9p96k609c1p1c2frakskhy7zkidz"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; + devdocs-vim = buildVimPluginFrom2Nix { + pname = "devdocs-vim"; + version = "2018-08-27"; + src = fetchFromGitHub { + owner = "rhysd"; + repo = "devdocs.vim"; + rev = "1c91c619874f11f2062f80e6ca4b49456f21ae91"; + sha256 = "1nxww2mjabl2g2wchxc4h3a58j64acls24zb5jmfi71b8sai8a9b"; + }; + meta.homepage = "https://github.com/rhysd/devdocs.vim/"; + }; + dhall-vim = buildVimPluginFrom2Nix { pname = "dhall-vim"; - version = "2020-01-02"; + version = "2020-08-19"; src = fetchFromGitHub { owner = "vmchale"; repo = "dhall-vim"; - rev = "607958520f8bd4308fe52937e211f6db4ad84cf3"; - sha256 = "0rnkmfrzsm4hg6ln8g8qj9ff8z2sk7cnf4gqrswychqhhkg1f817"; + rev = "77d1c165bcbe6bb7f9eedbeafe390c2107d3c52e"; + sha256 = "03x55x0gvf7n4i8hh6s5453mf5h43pf7kdy817q6w1149bd90vxy"; }; meta.homepage = "https://github.com/vmchale/dhall-vim/"; }; + diagnostic-nvim = buildVimPluginFrom2Nix { + pname = "diagnostic-nvim"; + version = "2020-11-13"; + src = fetchFromGitHub { + owner = "nvim-lua"; + repo = "diagnostic-nvim"; + rev = "a8401479822e638fa70472009949e7be8b24e0fd"; + sha256 = "1dl4b8xhvnb2x9fw220jis7hqmiwfz0969d44l96p41bj68qbbs9"; + }; + meta.homepage = "https://github.com/nvim-lua/diagnostic-nvim/"; + }; + direnv-vim = buildVimPluginFrom2Nix { pname = "direnv-vim"; - version = "2019-04-30"; + version = "2020-11-16"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv.vim"; - rev = "5e75084465ad37dd0a4d4b1198b5ffa8978ae4e1"; - sha256 = "0vabsv98vwdjns3dliplg7x8ssyrin44af9jl248kdzkqw5fx445"; + rev = "def4982fa3a613cfb59a4cd8d35d4c99e4e1688c"; + sha256 = "1xrr8pdxmpxz79qgw1kl5wdb4i2afmvl5zjxhkjinvpqnmimx0xz"; }; meta.homepage = "https://github.com/direnv/direnv.vim/"; }; @@ -1339,26 +1134,38 @@ let meta.homepage = "https://github.com/vim-scripts/DoxygenToolkit.vim/"; }; + dracula-vim = buildVimPluginFrom2Nix { + pname = "dracula-vim"; + version = "2020-11-13"; + src = fetchFromGitHub { + owner = "dracula"; + repo = "vim"; + rev = "ba00ac0432541811955e50b8420c25b22762c7c9"; + sha256 = "1rp0zip0p07rbfiz8b5nvm6k1d80yvdgn4h59v3bg8j9qan7rg3h"; + }; + meta.homepage = "https://github.com/dracula/vim/"; + }; + echodoc-vim = buildVimPluginFrom2Nix { pname = "echodoc-vim"; - version = "2020-04-08"; + version = "2020-10-13"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "31533d9c6c2723dfb4cf5691c83f330a3a0ccddd"; - sha256 = "1ygm4g90zv009iqv8k8n4930a7gpij5jxbz7dqq2dfyj4jn37rkf"; + rev = "2a6d6bd6255fbfe152da6bb7f2404afa29479941"; + sha256 = "18nm20ivkcjlh0rgf3c1wdxf1wsc4r95znm2dhgmw1ym4wmh0v4s"; }; meta.homepage = "https://github.com/Shougo/echodoc.vim/"; }; editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2020-05-26"; + version = "2020-11-18"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "0818c7eb7ccd1cfb687161e68e55355c34694d28"; - sha256 = "1qiljz47b59sd3gyvr7l0kmb13hbi5204nnhjnpj8bd98kf676w7"; + rev = "047c4b455b9d56adee63a52d6d7cdf5bb6521d53"; + sha256 = "0v7zbvpwmp1ypv5q0xy6p98l5g4ywcgyz3w1zrh9pz3m9hxa354d"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; @@ -1366,24 +1173,36 @@ let elm-vim = buildVimPluginFrom2Nix { pname = "elm-vim"; - version = "2019-04-05"; + version = "2020-09-23"; src = fetchFromGitHub { owner = "elmcast"; repo = "elm-vim"; - rev = "165107a9fd2b20c8f050fc4f977b4e41c790b1e7"; - sha256 = "0gf7b49by0ybx3ndz7sz5dwcfnps4sz6wsr02lyarj8f8116ysy5"; + rev = "4b71facd77297cb33bbb3b14894676cff0a9bd1d"; + sha256 = "1kxkjm6fzmircg5gh7w2bmvjgk8ly5vvq9l31m4p6ql48azg2ilc"; }; meta.homepage = "https://github.com/elmcast/elm-vim/"; }; + elvish-vim = buildVimPluginFrom2Nix { + pname = "elvish-vim"; + version = "2019-06-29"; + src = fetchFromGitHub { + owner = "dmix"; + repo = "elvish.vim"; + rev = "67ef8e89bff7cb8ea936f2164c8c268bbb3295f0"; + sha256 = "133hr3i7zxysf2gnnimhz3gf3nda3fyfxmqq7mhq544v2mki4x9m"; + }; + meta.homepage = "https://github.com/dmix/elvish.vim/"; + }; + emmet-vim = buildVimPluginFrom2Nix { pname = "emmet-vim"; - version = "2020-05-04"; + version = "2020-10-21"; src = fetchFromGitHub { owner = "mattn"; repo = "emmet-vim"; - rev = "76285f8ec456a8c0d01ea0fa9d0b757c7eb0bab3"; - sha256 = "1qrqg4kr55hisi5f4qlkj1zvvlgfpby9pyynlb669d8414013f67"; + rev = "60930a968d26fc7abf4f8fd5c3926bdcda2dd787"; + sha256 = "1sf0518rq9idj0sbyplh7y9a481i3y57wwkvdakqvngbpm4bf6ms"; fetchSubmodules = true; }; meta.homepage = "https://github.com/mattn/emmet-vim/"; @@ -1427,12 +1246,12 @@ let far-vim = buildVimPluginFrom2Nix { pname = "far-vim"; - version = "2020-03-09"; + version = "2020-07-23"; src = fetchFromGitHub { owner = "brooth"; repo = "far.vim"; - rev = "2a8a9c22237d224f2c24680901b61b6f9bffb061"; - sha256 = "0hk2p10cx36dz6vf22v4hx3shkkhqhkmxp6s1l517kkchh98m4bg"; + rev = "aaf7b252301d03100ba3923c17d026562a0b17b8"; + sha256 = "10ij80x2drmk3jr5c7pm9k3jrci9qb26gmqagpxpmiv1is9sdx0a"; }; meta.homepage = "https://github.com/brooth/far.vim/"; }; @@ -1475,12 +1294,12 @@ let flake8-vim = buildVimPluginFrom2Nix { pname = "flake8-vim"; - version = "2017-02-17"; + version = "2020-10-20"; src = fetchFromGitHub { owner = "andviro"; repo = "flake8-vim"; - rev = "01c4af4c68f33b2b3785314bfbf5b3d8d1451795"; - sha256 = "14rv0p1vx4njlplkc72gz7r8sy9vc6n8x9l00zc777x5zzrhgz3g"; + rev = "5bc93f7f26ceb18ccbe116830eaf8ff2baa63994"; + sha256 = "142pgasl0b64a0zxmspdsi636axrgvdx6rh3hwjrb1zlsck19y1a"; fetchSubmodules = true; }; meta.homepage = "https://github.com/andviro/flake8-vim/"; @@ -1488,12 +1307,12 @@ let float-preview-nvim = buildVimPluginFrom2Nix { pname = "float-preview-nvim"; - version = "2020-04-19"; + version = "2020-11-03"; src = fetchFromGitHub { owner = "ncm2"; repo = "float-preview.nvim"; - rev = "3c2e230a3fe34b3a5fb74519797c29daa5a6a69a"; - sha256 = "1i5wj1hqimzrw3bwsf76w8l8yp654pdn8f61kp0v98xdgkab007d"; + rev = "f9ed1c701d5ea41222509fc822cbdc5613b14b2d"; + sha256 = "0r1pj80mnsr269d7mnxfagdp988gn3gnf5fix55z4qwim9cakrl8"; }; meta.homepage = "https://github.com/ncm2/float-preview.nvim/"; }; @@ -1524,12 +1343,12 @@ let fruzzy = buildVimPluginFrom2Nix { pname = "fruzzy"; - version = "2019-10-28"; + version = "2020-08-31"; src = fetchFromGitHub { owner = "raghur"; repo = "fruzzy"; - rev = "b312ae79db98cf6939c8319f2511efa06889e8e3"; - sha256 = "01iisbawq2w7yw866qvv109amnvyaymzyz9nqal3cjrrcwk6mmdk"; + rev = "4cdfee7b828a5cace22bfd93cf23fee0b2b233c4"; + sha256 = "1dmxz283ypz1klcmdf4jk699aifr3dywkh9y8v8v8vyflampqwwp"; }; meta.homepage = "https://github.com/raghur/fruzzy/"; }; @@ -1548,48 +1367,48 @@ let fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2020-05-23"; + version = "2020-11-11"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "7a655179a43cd431862a2bf5d297d9e55fd3f814"; - sha256 = "1ivxkg60g3jlmd14ndwfqdkzm74naddfghafpv622dainv4qw20j"; + rev = "53b3aea0da5e3581e224c958dbc13558cbe5daee"; + sha256 = "0r19v3431ps7mmq2vb0vf1phwmgi1xp0n7z43wa68i4ilyjhbnr6"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; gen_tags-vim = buildVimPluginFrom2Nix { pname = "gen_tags-vim"; - version = "2019-06-28"; + version = "2020-10-12"; src = fetchFromGitHub { owner = "jsfaint"; repo = "gen_tags.vim"; - rev = "208cd0490547bc8f7615eea1b26e4635d2e60a96"; - sha256 = "00s1kxi1bsvz06z7x78kls0k6ncnbqdyz14fvdxxq82f6s1kdvdw"; + rev = "f888a2f8732e08d9f2b638b144c5c826a30953a3"; + sha256 = "16gkczlaani0c0v3hkklriabhkgcs0mg9mrbn8jzfsap15cnkgk5"; }; meta.homepage = "https://github.com/jsfaint/gen_tags.vim/"; }; gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2020-03-08"; + version = "2020-10-07"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "42163237b57c56de9a24fe6549e46c805fab2bb3"; - sha256 = "1bg3ismjlp99drsfyrkjb137ypxmp0qpy8pp9ry9i8ljmnffbgal"; + rev = "3d90ee5686e54fb1c3242f10e644a789579a4372"; + sha256 = "0qvfqw38vk9ijwhgivjwh289vnmzc2p7cp6jiqpj98zsnank0yw2"; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2020-05-17"; + version = "2020-08-12"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "64f693f6581c3acdee71897eaba7c4e793eaa946"; - sha256 = "194njs7nfdmpnv1bkadamvicp735834kq0ijha5s41i492hb589i"; + rev = "d6191a111a1160ddecb05292eefe28ae362ccbaa"; + sha256 = "17dp28a3ipbx8fwsj0h9imkrgd0nfjzpcsn1zjdbih1kfh494smf"; }; meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; @@ -1606,6 +1425,18 @@ let meta.homepage = "https://github.com/eagletmt/ghcmod-vim/"; }; + git-messenger-vim = buildVimPluginFrom2Nix { + pname = "git-messenger-vim"; + version = "2020-08-20"; + src = fetchFromGitHub { + owner = "rhysd"; + repo = "git-messenger.vim"; + rev = "c16b0d43ca57e77081f1f23f67552efe37110b39"; + sha256 = "171w3dv3jl4mw1ikh5p688v0a8nf85h862d9zvsmdzs2v6ajigpw"; + }; + meta.homepage = "https://github.com/rhysd/git-messenger.vim/"; + }; + gitignore-vim = buildVimPluginFrom2Nix { pname = "gitignore-vim"; version = "2014-03-16"; @@ -1630,38 +1461,62 @@ let meta.homepage = "https://github.com/gregsexton/gitv/"; }; + golden-ratio = buildVimPluginFrom2Nix { + pname = "golden-ratio"; + version = "2020-04-03"; + src = fetchFromGitHub { + owner = "roman"; + repo = "golden-ratio"; + rev = "8313b6d6723c9e77ef1d3760af2cdd244e8db043"; + sha256 = "03nm1wr0qsrirg4z4171f4nygnqgb6w06ldr6rbbz4a1f7j8j654"; + }; + meta.homepage = "https://github.com/roman/golden-ratio/"; + }; + + gotests-vim = buildVimPluginFrom2Nix { + pname = "gotests-vim"; + version = "2019-04-10"; + src = fetchFromGitHub { + owner = "buoto"; + repo = "gotests-vim"; + rev = "e0ad687be26875153ecd43d16db3b93a637394e4"; + sha256 = "01w981v7rya9fnxwdhlka4vfzlnw87pxmfcqmvxh3p96lmi71xjm"; + }; + meta.homepage = "https://github.com/buoto/gotests-vim/"; + }; + goyo-vim = buildVimPluginFrom2Nix { pname = "goyo-vim"; - version = "2019-06-13"; + version = "2020-08-29"; src = fetchFromGitHub { owner = "junegunn"; repo = "goyo.vim"; - rev = "6b6ed2734084fdbb6315357ddcaecf9c8e6f143d"; - sha256 = "1ywlz1hn54kxyp5q0angriaarimq7ys7m6sk6l4x8jr1g2yh0afz"; + rev = "a865dec7ca7616dbbd69315ad1417b84d0c411f8"; + sha256 = "09mqmcz79dwcc5mv0p2wc84jc20ipa0vv2yckp4la4xh909ph4hm"; }; meta.homepage = "https://github.com/junegunn/goyo.vim/"; }; gruvbox = buildVimPluginFrom2Nix { pname = "gruvbox"; - version = "2020-02-23"; + version = "2020-07-03"; src = fetchFromGitHub { owner = "morhetz"; repo = "gruvbox"; - rev = "040138616bec342d5ea94d4db296f8ddca17007a"; - sha256 = "0qk2mqs04qlxkc1ldgjbiv1yisi2xl2b8svmjz0hdp9y2l5vfccw"; + rev = "bf2885a95efdad7bd5e4794dd0213917770d79b7"; + sha256 = "0576sqzljal3k8rsnbmcvlsk4ywg1vfgkxkvrv2zac2d5wwa9i8z"; }; meta.homepage = "https://github.com/morhetz/gruvbox/"; }; gruvbox-community = buildVimPluginFrom2Nix { pname = "gruvbox-community"; - version = "2020-05-23"; + version = "2020-11-13"; src = fetchFromGitHub { owner = "gruvbox-community"; repo = "gruvbox"; - rev = "933b6cc35a0f180ff488ef20c7b534c9c3b6701a"; - sha256 = "0w10hcz66dgilx6fv07bb3zsf5c0x9gv4vhp15c5fp2rzwxi10bn"; + rev = "2636a0344d3fbacc62d9d914a456fcfdba8ca4cb"; + sha256 = "1w9j97g3dzadwnqyal1zw12ia61b512hz8mhywqy5xq6v9f6zkw6"; }; meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; @@ -1680,12 +1535,12 @@ let gv-vim = buildVimPluginFrom2Nix { pname = "gv-vim"; - version = "2020-05-22"; + version = "2020-10-16"; src = fetchFromGitHub { owner = "junegunn"; repo = "gv.vim"; - rev = "61d877d23caaad9009d672f90fe2ab576ab93d2d"; - sha256 = "00h4d6jah0fdr5m8x9c1gmmm9wskplixnvbbalfbbpc599xhgj83"; + rev = "486b5c4e960d5ec9e79888939534b7b2fc7453ad"; + sha256 = "07pj94s5kf8qgwdz73xbb7b2h3w6gkv4sw9faicdb6hla3i19d9b"; }; meta.homepage = "https://github.com/junegunn/gv.vim/"; }; @@ -1726,14 +1581,38 @@ let meta.homepage = "https://github.com/mpickering/hlint-refactor-vim/"; }; + hoon-vim = buildVimPluginFrom2Nix { + pname = "hoon-vim"; + version = "2020-11-09"; + src = fetchFromGitHub { + owner = "urbit"; + repo = "hoon.vim"; + rev = "91b1922f8627bb0a55341bb088f2526d0f43a6ac"; + sha256 = "0h87r7r74iljwvfc6mb1maa08cxwnk6k89gc6vnwqm1zx6qxw1js"; + }; + meta.homepage = "https://github.com/urbit/hoon.vim/"; + }; + + i3config-vim = buildVimPluginFrom2Nix { + pname = "i3config-vim"; + version = "2020-03-28"; + src = fetchFromGitHub { + owner = "mboughaba"; + repo = "i3config.vim"; + rev = "c3fe1a901392ee11721e08d2a0d2886a7f8b8e83"; + sha256 = "1cygyn7p0x2smqsjxly5xbsdnrjnq5kj1a0a8qg356j0l112j7z2"; + }; + meta.homepage = "https://github.com/mboughaba/i3config.vim/"; + }; + iceberg-vim = buildVimPluginFrom2Nix { pname = "iceberg-vim"; - version = "2020-05-15"; + version = "2020-07-20"; src = fetchFromGitHub { owner = "cocopon"; repo = "iceberg.vim"; - rev = "bdd630fb15dca7793b04deaf1c1fb3a6af33ceae"; - sha256 = "045jm4gz8gqv7mgz04l3q42mj1ji9qv99n915zq8fgzfskc0pixj"; + rev = "203d56849325fb0420587c9951859a755798aea3"; + sha256 = "16calikypw9gyb4vzybwqgl329v6wpqj05z6m2ajbr027fksxfjr"; }; meta.homepage = "https://github.com/cocopon/iceberg.vim/"; }; @@ -1750,6 +1629,18 @@ let meta.homepage = "https://github.com/idris-hackers/idris-vim/"; }; + idris2-vim = buildVimPluginFrom2Nix { + pname = "idris2-vim"; + version = "2020-05-25"; + src = fetchFromGitHub { + owner = "edwinb"; + repo = "idris2-vim"; + rev = "099129e08c89d9526ad092b7980afa355ddaa24c"; + sha256 = "1gip64ni2wdd5v4crl64f20pbrx24dmr3ci7w5c9da9hs85x1p29"; + }; + meta.homepage = "https://github.com/edwinb/idris2-vim/"; + }; + Improved-AnsiEsc = buildVimPluginFrom2Nix { pname = "Improved-AnsiEsc"; version = "2015-08-26"; @@ -1800,12 +1691,12 @@ let indentLine = buildVimPluginFrom2Nix { pname = "indentLine"; - version = "2020-03-06"; + version = "2020-11-11"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "indentLine"; - rev = "15aceda8c4eea621b66faa8673fca0b9fbe2f457"; - sha256 = "1icb1h811lp86hg4w8y8mmmsfm4c80n7m8r1wi58lnm60mjasas4"; + rev = "9662ef8f0443211b11fd87919343d12179bca548"; + sha256 = "1mdbppz3xb8dzbw61fcv3gn3ad4hgia9i5s96vyw5frwxlkfyqpm"; }; meta.homepage = "https://github.com/Yggdroot/indentLine/"; }; @@ -1822,14 +1713,26 @@ let meta.homepage = "https://github.com/parsonsmatt/intero-neovim/"; }; + investigate-vim = buildVimPluginFrom2Nix { + pname = "investigate-vim"; + version = "2020-02-29"; + src = fetchFromGitHub { + owner = "keith"; + repo = "investigate.vim"; + rev = "aef9332ba3cfc070fb59fd7a4ac82bae2b42cd7b"; + sha256 = "1jiipch8jr66h1cywwj0zdlx45p70d359s8ljdwcndjwicrqslmk"; + }; + meta.homepage = "https://github.com/keith/investigate.vim/"; + }; + iosvkem = buildVimPluginFrom2Nix { pname = "iosvkem"; - version = "2020-01-18"; + version = "2020-06-18"; src = fetchFromGitHub { owner = "neutaaaaan"; repo = "iosvkem"; - rev = "08e36b649c83eece7edbd2e04e42e077aebc78eb"; - sha256 = "0jawl7fs6wl3ny9vsmzqv5pnkv5nn6wj1nx7hzgdl41183958pni"; + rev = "df359d91510be0c078905568d9033c891a3a2f4b"; + sha256 = "0xqh5hr4m6hm2vfms1iqarzhgkmrgx6f5ywyh6qhwkbrdj8q3lyq"; }; meta.homepage = "https://github.com/neutaaaaan/iosvkem/"; }; @@ -1846,6 +1749,18 @@ let meta.homepage = "https://github.com/twerth/ir_black/"; }; + is-vim = buildVimPluginFrom2Nix { + pname = "is-vim"; + version = "2020-10-27"; + src = fetchFromGitHub { + owner = "haya14busa"; + repo = "is.vim"; + rev = "d393cb346dcdf733fecd7bbfc45b70b8c05e9eb4"; + sha256 = "03rvhvqx59c6lp9xh6zry3ynppngqn53swl3v9gmc3ynh3l1jdzq"; + }; + meta.homepage = "https://github.com/haya14busa/is.vim/"; + }; + jdaddy-vim = buildVimPluginFrom2Nix { pname = "jdaddy-vim"; version = "2014-02-22"; @@ -1860,12 +1775,12 @@ let jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2020-03-07"; + version = "2020-07-17"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "e83112f9aab147ab485ee7af72e01d047c5206d3"; - sha256 = "0yj1bsfn43crmfn0ylyzyz41z0vmvapl5cgm7k1rnbj96i7vifx7"; + rev = "a17b0333031bd3652ad4c6169caaed05ffb7c49d"; + sha256 = "0xqsh0mw64s9ph4sd550fc129q567dld3vk7fciwd2905h9q0k8q"; fetchSubmodules = true; }; meta.homepage = "https://github.com/davidhalter/jedi-vim/"; @@ -1885,12 +1800,12 @@ let Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix { pname = "Jenkinsfile-vim-syntax"; - version = "2019-12-31"; + version = "2020-06-05"; src = fetchFromGitHub { owner = "martinda"; repo = "Jenkinsfile-vim-syntax"; - rev = "164b457d87b65c6ca9e5998b69c6cd24248f62ac"; - sha256 = "14s26hlsdqys7br84l9wiyvhcy17s6966mhgr9n6sdqmhz6lc4nm"; + rev = "a701341879c6db93f5dffa37f4589eef3c4ded85"; + sha256 = "0nm3lf37l1g8lpa4yz1va0s6vw0vw99zghy3dzq933j0kqmspgvp"; }; meta.homepage = "https://github.com/martinda/Jenkinsfile-vim-syntax/"; }; @@ -1909,24 +1824,24 @@ let julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2020-05-21"; + version = "2020-10-14"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "2d0b6e4018d6cc01b96ab326ff6495876200866d"; - sha256 = "1ijmxxw63mraa5afddahfvwbh9acrf11q7g6hf32k6923rfccrnq"; + rev = "a4bc8a2032e9da4dbfc5f527c2415b68fc09b9bd"; + sha256 = "1ir0yj0f0ggndxfpg8119vcb1l7qagf5qsl9s94ghbka6qqvlia3"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; kotlin-vim = buildVimPluginFrom2Nix { pname = "kotlin-vim"; - version = "2019-05-26"; + version = "2020-11-02"; src = fetchFromGitHub { owner = "udalov"; repo = "kotlin-vim"; - rev = "b9fa728701a0aa0b9a2ffe92f10880348fc27a8f"; - sha256 = "1yqzxabhpc4jbdlzhsysp0vi1ayqg0vnpysvx4ynd9961q2fk3sz"; + rev = "f338707b2aa658aef4c0d98fd9748240859cf2a9"; + sha256 = "0wm9bkykvm89f966a8wxm5vvg9kjayy5iziahnch35hrmscs5x4b"; }; meta.homepage = "https://github.com/udalov/kotlin-vim/"; }; @@ -1955,6 +1870,18 @@ let meta.homepage = "https://github.com/autozimu/LanguageClient-neovim/"; }; + LanguageTool-nvim = buildVimPluginFrom2Nix { + pname = "LanguageTool-nvim"; + version = "2020-10-19"; + src = fetchFromGitHub { + owner = "vigoux"; + repo = "LanguageTool.nvim"; + rev = "809e7d77fec834597f495fec737c59292a10025b"; + sha256 = "1g12dz85xq8qd92dgna0a3w6zgxa74njlvmvly4k20610r63bzrn"; + }; + meta.homepage = "https://github.com/vigoux/LanguageTool.nvim/"; + }; + last256 = buildVimPluginFrom2Nix { pname = "last256"; version = "2017-06-10"; @@ -1981,12 +1908,12 @@ let lean-vim = buildVimPluginFrom2Nix { pname = "lean-vim"; - version = "2019-10-04"; + version = "2020-11-01"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean.vim"; - rev = "2ace010eb32603a65af7921954a0594a02523c6b"; - sha256 = "0wq2lw4xx2qhz1xii9g7i6wz0y43b2icqrm6ypr9jmaac1rhiq7c"; + rev = "d1b3037680be79f114a87620844117e20ca7efcf"; + sha256 = "0x3cz4is30jsrp7dym4rz4xngv9mimybl4kqnry9x0nkqzn55910"; }; meta.homepage = "https://github.com/leanprover/lean.vim/"; }; @@ -2005,48 +1932,48 @@ let lexima-vim = buildVimPluginFrom2Nix { pname = "lexima-vim"; - version = "2019-07-22"; + version = "2020-07-31"; src = fetchFromGitHub { owner = "cohama"; repo = "lexima.vim"; - rev = "aa32e972b69230625989daa09ee5fd74a2d877ef"; - sha256 = "15cc09vb0yrasz76qkcqxhj95y1m6yrsx3wsn6khx39kp1bas0jd"; + rev = "89bf4dc13539131a29cf938074b3f1ce9d000bfd"; + sha256 = "19b73r3v4i64kiijihzqlbj6bf6jd1w90qc7d3lg95iwlaczd8v0"; }; meta.homepage = "https://github.com/cohama/lexima.vim/"; }; lf-vim = buildVimPluginFrom2Nix { pname = "lf-vim"; - version = "2020-05-12"; + version = "2020-10-13"; src = fetchFromGitHub { owner = "ptzz"; repo = "lf.vim"; - rev = "8dbdb135f3704790f9e66a141d2785d4b65c238d"; - sha256 = "0phfqg6ax79vsz1sy6pvjflz1929x58k7nifiqki9bzp2m6knls9"; + rev = "e541328a67fe10f1323630a30a37b58c934d7819"; + sha256 = "09w33f4cyg9wdj8jas5h43cc7byqfmmm9wyc0xjaw9jxcp78ygg9"; }; meta.homepage = "https://github.com/ptzz/lf.vim/"; }; lh-brackets = buildVimPluginFrom2Nix { pname = "lh-brackets"; - version = "2020-05-16"; + version = "2020-09-30"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-brackets"; - rev = "2f70a30a342969e8cf4e21c965d523ff456173a9"; - sha256 = "0qpiqrcr9azamvm8mzcfb3fbp7rxgbhi2bdc926i9a7psazgmyfl"; + rev = "5b43087089798be70de0119e4f2476d2a2c0f6cb"; + sha256 = "04iw79ahfxm4ym5caj8iirs02l7qw9b49igzpg9vxs2ylqyfk3pn"; }; meta.homepage = "https://github.com/LucHermitte/lh-brackets/"; }; lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2020-05-18"; + version = "2020-11-10"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "03673b75c2b2ba8d25c1323804725a6eb9bbb995"; - sha256 = "0nk3s916k7vv9cgpf4rxf5qc4bmsf74mxa59fdi8wlzda0m5dyhk"; + rev = "38a20127dc8aaf76f686b0b96023b51c466969b9"; + sha256 = "19pw4mmhp4cj2xjb6ygiahmix2wq123a738whjg5137zkrzfqz2j"; }; meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; @@ -2065,40 +1992,52 @@ let lightline-bufferline = buildVimPluginFrom2Nix { pname = "lightline-bufferline"; - version = "2020-05-08"; + version = "2020-11-17"; src = fetchFromGitHub { owner = "mengelbrecht"; repo = "lightline-bufferline"; - rev = "ef674de5ca1c963ad12f04631ea58f90dbbc70da"; - sha256 = "0kdla3gmkyk77vqz6hj41alq3jmrkml7836fhsd3hb50f6wwvk11"; + rev = "ad6f73578316dc6d1e016f9083ef35a4538c02d9"; + sha256 = "19496bhdzyrykxs8j2mx69ml9a8548jdz0s0n5qq72cxhm2b3p03"; }; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2020-05-18"; + version = "2020-11-14"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "c172131e0369672bc1b9454a2aec6d532d350dcc"; - sha256 = "04nxldbb885n11vwz61c1r4h65y26six5cs9invbz27h4pgyrvna"; + rev = "543ee323a4a63fd32cc17dc57edea9c00962bb12"; + sha256 = "1x75hd3ibnlrqnshhhrcg1z3i6z0gk58sfvjys22dvirv1r6lg37"; }; meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; limelight-vim = buildVimPluginFrom2Nix { pname = "limelight-vim"; - version = "2019-07-09"; + version = "2020-10-13"; src = fetchFromGitHub { owner = "junegunn"; repo = "limelight.vim"; - rev = "26e913a2e061195245bc62d24009ab67143a3c32"; - sha256 = "0bxmihv9i96k6pl37pzgri03vbvjwlp34rl4gkj8w2ajhhi6nsnn"; + rev = "4412a84d7fbfd01281bf23d801e95c45c1eacc09"; + sha256 = "1qab2pd1pyfrw0llxd5j11imzqxa3lnnfhr1w2fjn3yanbsxvlvd"; }; meta.homepage = "https://github.com/junegunn/limelight.vim/"; }; + lsp_extensions-nvim = buildVimPluginFrom2Nix { + pname = "lsp_extensions-nvim"; + version = "2020-11-04"; + src = fetchFromGitHub { + owner = "nvim-lua"; + repo = "lsp_extensions.nvim"; + rev = "eaa389f8a80d9700cc2c3bce787b00b61761a0f0"; + sha256 = "0zndlyn3xgzxwshjk79yfva5914xchzg9v8qimfgn7jlmn5ljhwm"; + }; + meta.homepage = "https://github.com/nvim-lua/lsp_extensions.nvim/"; + }; + lushtags = buildVimPluginFrom2Nix { pname = "lushtags"; version = "2017-04-19"; @@ -2123,6 +2062,18 @@ let meta.homepage = "https://github.com/vim-scripts/matchit.zip/"; }; + MatchTagAlways = buildVimPluginFrom2Nix { + pname = "MatchTagAlways"; + version = "2017-05-20"; + src = fetchFromGitHub { + owner = "Valloric"; + repo = "MatchTagAlways"; + rev = "352eb479a4ad1608e0880b79ab2357aac2cf4bed"; + sha256 = "0y8gq4cs0wm2ijagc2frpmm664z355iridxyl5893576v5aqp8z1"; + }; + meta.homepage = "https://github.com/Valloric/MatchTagAlways/"; + }; + mattn-calendar-vim = buildVimPluginFrom2Nix { pname = "mattn-calendar-vim"; version = "2019-11-24"; @@ -2161,12 +2112,12 @@ let ncm2 = buildVimPluginFrom2Nix { pname = "ncm2"; - version = "2020-03-05"; + version = "2020-07-26"; src = fetchFromGitHub { owner = "ncm2"; repo = "ncm2"; - rev = "6596df4631ee1ee17351a78f382d4efd0b82c05e"; - sha256 = "16276cjviij92ypqj9148828k4dhiywam0dz07v3rikknak11cra"; + rev = "7d49f7b473db732878091f2f8c68bc47b015559b"; + sha256 = "112pspa730pvwiv0hbzn9z6i3zpn25p8g45wf67kj2084wiqkkx3"; }; meta.homepage = "https://github.com/ncm2/ncm2/"; }; @@ -2183,18 +2134,102 @@ let meta.homepage = "https://github.com/ncm2/ncm2-bufword/"; }; + ncm2-cssomni = buildVimPluginFrom2Nix { + pname = "ncm2-cssomni"; + version = "2018-07-09"; + src = fetchFromGitHub { + owner = "ncm2"; + repo = "ncm2-cssomni"; + rev = "adaf78b921ee4320fd9d7adaa5bff7f3794f373a"; + sha256 = "0z79n1fivw60whx2fy6239lq8c2xnbzzadijplj51gy34jk4hki0"; + }; + meta.homepage = "https://github.com/ncm2/ncm2-cssomni/"; + }; + + ncm2-dictionary = buildVimPluginFrom2Nix { + pname = "ncm2-dictionary"; + version = "2018-11-15"; + src = fetchFromGitHub { + owner = "yuki-ycino"; + repo = "ncm2-dictionary"; + rev = "c93b52ab0cd1a9ebe5711414c3134f4bba9be6af"; + sha256 = "096l8prqm7zb2s27j2cpnydggszicaji7xjlmhrav7dzc51avafy"; + }; + meta.homepage = "https://github.com/yuki-ycino/ncm2-dictionary/"; + }; + + ncm2-github = buildVimPluginFrom2Nix { + pname = "ncm2-github"; + version = "2018-08-01"; + src = fetchFromGitHub { + owner = "ncm2"; + repo = "ncm2-github"; + rev = "2d7ed04a8fe5b8c27cfef5781a944d9865eed61f"; + sha256 = "1dcxknbjm2mxrw1l2i56xrjyxlp0vr6gr5l62x5hcd5wfkzi74a1"; + }; + meta.homepage = "https://github.com/ncm2/ncm2-github/"; + }; + + ncm2-html-subscope = buildVimPluginFrom2Nix { + pname = "ncm2-html-subscope"; + version = "2018-07-01"; + src = fetchFromGitHub { + owner = "ncm2"; + repo = "ncm2-html-subscope"; + rev = "8294cf1bb55fb805454a9230aeb91dbb0f733a14"; + sha256 = "19h1jjqv6jwv5fnxxa6gv0qiyc3rbnxf0zibqxzdclmskrdgjacq"; + }; + meta.homepage = "https://github.com/ncm2/ncm2-html-subscope/"; + }; + ncm2-jedi = buildVimPluginFrom2Nix { pname = "ncm2-jedi"; - version = "2019-11-19"; + version = "2020-08-06"; src = fetchFromGitHub { owner = "ncm2"; repo = "ncm2-jedi"; - rev = "b28bf6d054051cc1c7a6b148323d3adb9baa4ed5"; - sha256 = "07pq8akzvlb8hzksgxx1c50j09ia0xnszq1f83x75kqsjg5f6nhy"; + rev = "d378d3e80e15368c1714fd6c20dd461dc7db9796"; + sha256 = "0bphij55pjh87wcy0xk9yvgi0w3i0wvhbg71vddq0jn6m3r2gmlf"; }; meta.homepage = "https://github.com/ncm2/ncm2-jedi/"; }; + ncm2-markdown-subscope = buildVimPluginFrom2Nix { + pname = "ncm2-markdown-subscope"; + version = "2020-03-09"; + src = fetchFromGitHub { + owner = "ncm2"; + repo = "ncm2-markdown-subscope"; + rev = "beeef1e88df29d2718f0fb73cdd4702eaf449f13"; + sha256 = "0hh5bs76k5jsjzdp5lm53gma517s8ijrdp0acjjvsagz7r7gymq7"; + }; + meta.homepage = "https://github.com/ncm2/ncm2-markdown-subscope/"; + }; + + ncm2-neoinclude = buildVimPluginFrom2Nix { + pname = "ncm2-neoinclude"; + version = "2020-07-19"; + src = fetchFromGitHub { + owner = "ncm2"; + repo = "ncm2-neoinclude"; + rev = "081f48c735c5f51849ec14e6a266b5400bf94b62"; + sha256 = "0xsvj8ng9blhwl8fxscm3iflppvf7p7kpl3hxh0z14xhdy3nynyi"; + }; + meta.homepage = "https://github.com/ncm2/ncm2-neoinclude/"; + }; + + ncm2-neosnippet = buildVimPluginFrom2Nix { + pname = "ncm2-neosnippet"; + version = "2019-01-26"; + src = fetchFromGitHub { + owner = "ncm2"; + repo = "ncm2-neosnippet"; + rev = "650552528a2297179b8bb3afc1d9bb44ea97911b"; + sha256 = "14ammx1qa72m6mafd64mc9qw3sgnmjqgq5vvcylqzqwy26wwla1b"; + }; + meta.homepage = "https://github.com/ncm2/ncm2-neosnippet/"; + }; + ncm2-path = buildVimPluginFrom2Nix { pname = "ncm2-path"; version = "2019-02-20"; @@ -2207,6 +2242,30 @@ let meta.homepage = "https://github.com/ncm2/ncm2-path/"; }; + ncm2-syntax = buildVimPluginFrom2Nix { + pname = "ncm2-syntax"; + version = "2020-07-19"; + src = fetchFromGitHub { + owner = "ncm2"; + repo = "ncm2-syntax"; + rev = "d41d60b22175822c14f497378a05398e3eca2517"; + sha256 = "065sflxr6sp491ifvcf7bzvpn5c47qc0mr091v2p2k73lp9jx2s2"; + }; + meta.homepage = "https://github.com/ncm2/ncm2-syntax/"; + }; + + ncm2-tagprefix = buildVimPluginFrom2Nix { + pname = "ncm2-tagprefix"; + version = "2018-11-08"; + src = fetchFromGitHub { + owner = "ncm2"; + repo = "ncm2-tagprefix"; + rev = "6bff80cbd3edb02a0c91a26820606d0dcbfeb3bd"; + sha256 = "0a3dgvs3jflhh5015jw7iahlblvnlq7vllh9avwh9pggd7zwc42k"; + }; + meta.homepage = "https://github.com/ncm2/ncm2-tagprefix/"; + }; + ncm2-tmux = buildVimPluginFrom2Nix { pname = "ncm2-tmux"; version = "2019-01-11"; @@ -2231,14 +2290,26 @@ let meta.homepage = "https://github.com/ncm2/ncm2-ultisnips/"; }; + ncm2-vim = buildVimPluginFrom2Nix { + pname = "ncm2-vim"; + version = "2020-07-19"; + src = fetchFromGitHub { + owner = "ncm2"; + repo = "ncm2-vim"; + rev = "876ad5f30d1e296a4ab425a0e22a8162876ac48b"; + sha256 = "19b2xl5cvy3pk14r3k02149whdrcgisnqv2rzm5bic4w23532ad2"; + }; + meta.homepage = "https://github.com/ncm2/ncm2-vim/"; + }; + neco-ghc = buildVimPluginFrom2Nix { pname = "neco-ghc"; - version = "2018-05-13"; + version = "2020-06-06"; src = fetchFromGitHub { owner = "eagletmt"; repo = "neco-ghc"; - rev = "682869aca5dd0bde71a09ba952acb59c543adf7d"; - sha256 = "1v7ibi4fp99s4lswz3v0gf4i0h5i5gpj05xpsf4cixwj2zgh206h"; + rev = "b4ea02c537975a5a2bf00cb5f24cd784b2b6f5ad"; + sha256 = "13la3slqkljn7y8y9p8ic3majnvjf7pnrwr16cdpacklmz733x1f"; }; meta.homepage = "https://github.com/eagletmt/neco-ghc/"; }; @@ -2257,36 +2328,36 @@ let neco-syntax = buildVimPluginFrom2Nix { pname = "neco-syntax"; - version = "2019-11-10"; + version = "2020-09-13"; src = fetchFromGitHub { owner = "Shougo"; repo = "neco-syntax"; - rev = "6c3862ac82d2c917fa8b4126832de7d3a909f1fe"; - sha256 = "1kmzlz6c5bs7f4dxgrdn4azwh55k6ghhyzy8jjdgj0wsb309y92k"; + rev = "f8d7b748b022aac8ce73458574da5616f1c5fb65"; + sha256 = "12h8qm6l40a2dgbimn579bdyar0dq88hk7mdd0vhyj15c1305kda"; }; meta.homepage = "https://github.com/Shougo/neco-syntax/"; }; neco-vim = buildVimPluginFrom2Nix { pname = "neco-vim"; - version = "2020-04-08"; + version = "2020-11-10"; src = fetchFromGitHub { owner = "Shougo"; repo = "neco-vim"; - rev = "4fbc3f5f3a2b2d5299c388e2f1ffef04fcaf87ba"; - sha256 = "0lk5p2aihalcarsjnvn1yidgv0xqp1bk29wywsbp8ni964s0si39"; + rev = "2b1dca6ca16d6f5655748fcd4d54d772fcfd0d81"; + sha256 = "1prnclm9i7m09v1ip0sgkgddxwclas3x48zc8c800vxmmvjhzd7j"; }; meta.homepage = "https://github.com/Shougo/neco-vim/"; }; neocomplete-vim = buildVimPluginFrom2Nix { pname = "neocomplete-vim"; - version = "2020-01-23"; + version = "2020-08-12"; src = fetchFromGitHub { owner = "Shougo"; repo = "neocomplete.vim"; - rev = "0f83788cb67e0743a3a9c8d3a3a6e52a01bdc6c2"; - sha256 = "1ydnb576qbdbij7ipciw0m46wbj45gj7xirpmqxazgp9y6b13isf"; + rev = "f80bbf8f2f1717a127e5fbe885729daa862def81"; + sha256 = "0cks5fvr05k0lp2mwflqzx0mq6a3881c1304hdyci57j5bkkyvkj"; }; meta.homepage = "https://github.com/Shougo/neocomplete.vim/"; }; @@ -2305,36 +2376,36 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2020-05-17"; + version = "2020-11-05"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "a3561bf2032a162bc9f53d96fa4e5a2ada98854c"; - sha256 = "15lsxwf4f1mg5h716zikwv1hbb0i41d24hrvyrqhwqlnqbwizlbi"; + rev = "0b1c3ed1d19fceb3c7367fe40ef9934819effb13"; + sha256 = "0479vh85cdrijrghpkva5s4sv0q66hs5n2gl5nhqplz52may0xxg"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; neoinclude-vim = buildVimPluginFrom2Nix { pname = "neoinclude-vim"; - version = "2019-05-11"; + version = "2020-09-13"; src = fetchFromGitHub { owner = "Shougo"; repo = "neoinclude.vim"; - rev = "5125e73de0a8b4f2c399e4896e21be1b8f7b3d39"; - sha256 = "0qw63xyvrxvdzx01k5nnsv3p8zmnd77cwbkk24pikqrscxw3ypsz"; + rev = "954cfc9dfdb303f2c2fa867b9cf949dd74512628"; + sha256 = "0slp6mz8ds5raqhbi9gpr1ilgw745lfzjygyd58r6jcg2givsiik"; }; meta.homepage = "https://github.com/Shougo/neoinclude.vim/"; }; neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2020-04-09"; + version = "2020-11-09"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "d10e53956161176c7f8a1ef2899880d5384f47b0"; - sha256 = "0zv27bln0n687s0xm19nrk16i58hmxdhy26jmjh335zji0ydx27v"; + rev = "3b611ca24a7b78f7842facf6361404724717af1a"; + sha256 = "0x710kk7cac4m6s7xlqbm8pch1kfbwkmk6myvmsgf2qflj2qxn2j"; }; meta.homepage = "https://github.com/neomake/neomake/"; }; @@ -2353,60 +2424,60 @@ let neosnippet-snippets = buildVimPluginFrom2Nix { pname = "neosnippet-snippets"; - version = "2020-05-06"; + version = "2020-11-16"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet-snippets"; - rev = "66abcb7de82a45be6ba8b669d5e7bdca51deafdd"; - sha256 = "0a0irlhj1skkwy1897q6dbg9zh8v6b0sx12dsgj3z37rvplfw78y"; + rev = "415dc1a83087173e2307a6b4e3e7c86a3cfa3183"; + sha256 = "18amifx20y9vhx1sl4pyhzdqsgznmn52c58nws4jsqszp12xmk0a"; }; meta.homepage = "https://github.com/Shougo/neosnippet-snippets/"; }; neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet-vim"; - version = "2020-05-12"; + version = "2020-09-10"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "70f855d93c4bc727873c42111432660cf6929cdc"; - sha256 = "1gh7vh3qc9k8xhpmcvhdn5nfff81y7hkfky0mgs75a97mkd8qhnz"; + rev = "30b6b53b7a86b84371714b4a0f092d5d303c4a35"; + sha256 = "0q06a0wq2aqgkjc5jndccffibr85hf33w2igcah3x6dl203p4ips"; }; meta.homepage = "https://github.com/Shougo/neosnippet.vim/"; }; NeoSolarized = buildVimPluginFrom2Nix { pname = "NeoSolarized"; - version = "2020-03-10"; + version = "2020-08-07"; src = fetchFromGitHub { - owner = "icymind"; + owner = "overcache"; repo = "NeoSolarized"; - rev = "70609c44215c8d2c43ad8c631296caae08a9c8d4"; - sha256 = "0bxrm2vm3z1y37sm6m2hdn72g2sw31dx1xhmjvd0ng72cnp84d9k"; + rev = "b94b1a9ad51e2de015266f10fdc6e142f97bd617"; + sha256 = "019nz56yirpg1ahg8adfafrxznalw056qwm3xjm9kzg6da8j6v48"; }; - meta.homepage = "https://github.com/icymind/NeoSolarized/"; + meta.homepage = "https://github.com/overcache/NeoSolarized/"; }; neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2020-04-29"; + version = "2020-11-05"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "667f02bc417d2a4669502d1fc6876684882d8ba9"; - sha256 = "0xa4w935hfbs8nqw4aqw7ihasw4rlsqjx2i92pi1x5w8d40jnws1"; + rev = "78461935fcd6888c02e4368126a2cb645b80816e"; + sha256 = "07szw3jd5vj4sxzmrdalk79pdba7cm0c7k3rvn5bw4lyjgzml7ll"; }; meta.homepage = "https://github.com/kassio/neoterm/"; }; neovim-fuzzy = buildVimPluginFrom2Nix { pname = "neovim-fuzzy"; - version = "2019-11-14"; + version = "2020-09-16"; src = fetchFromGitHub { owner = "cloudhead"; repo = "neovim-fuzzy"; - rev = "53383395befafce802c902c21b54847074454491"; - sha256 = "064qi6zv2hrzn91pvr31b9zj2q0k9vbkk5csdhw5y52q26p1gakq"; + rev = "78f4d79f703aff49c9bcee5d527234c2f64425d5"; + sha256 = "1dq79jabyyyphgigqac9jf7hhadfh336fm8hklh1d64xlzyrfp6s"; }; meta.homepage = "https://github.com/cloudhead/neovim-fuzzy/"; }; @@ -2425,88 +2496,124 @@ let neoyank-vim = buildVimPluginFrom2Nix { pname = "neoyank-vim"; - version = "2019-12-11"; + version = "2020-07-27"; src = fetchFromGitHub { owner = "Shougo"; repo = "neoyank.vim"; - rev = "1829c6e426f829edea46660d0db08d4488010fcd"; - sha256 = "1y6fvxqpj3rwf1fmjib177lqzh3z7syp7bccn79g1j8177m515w6"; + rev = "0d86f6565a6193cdf017ac4f79e52fed04d5c0fb"; + sha256 = "02n1n3hb3bn5x9na05crhwmdmk66wyjx8i01fsyazlpv32v1wfsy"; }; meta.homepage = "https://github.com/Shougo/neoyank.vim/"; }; nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2020-02-19"; + version = "2020-10-30"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "c62e618a1ab5a50a4028e3296500ba29d9b033d8"; - sha256 = "0w4bxj423dxxkcxnfmipf8x5jfm058rq4g3m98wzcz5zbambv3qs"; + rev = "85750560a680907c50c1545abc4dd0e0b2452ff4"; + sha256 = "1395m95ry4c52bj2zpxryks70c3abfwhb140kpx4rifl2ccpnwwp"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2020-05-26"; + version = "2020-10-14"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "052b1f00a0ef14b0019f4d0cda9906ba93f9a0d6"; - sha256 = "1wn0gf8cqhmv23llhydvkhd638b3n5ya8fa6r74gm40f9h3qcp85"; + rev = "14af89743ac1c31ff9bb43682025eda50333a7d5"; + sha256 = "1q50cc9z91v809s65w0zq2s0z5smvghy0fbdjn64mr894ndvrmcv"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; nerdtree-git-plugin = buildVimPluginFrom2Nix { pname = "nerdtree-git-plugin"; - version = "2019-01-09"; + version = "2020-11-11"; src = fetchFromGitHub { - owner = "albfan"; + owner = "Xuyuanp"; repo = "nerdtree-git-plugin"; - rev = "95e20577cd442ad6256aff9bb2e9c80db05c13f0"; - sha256 = "15i66mxvygs6xa2jvk7bqdagxx1lcvynmyb9g75whgbv7is80qn7"; + rev = "9e33a3fe8aa90f5ece2439f3b1b3a98fe7e35f85"; + sha256 = "1qv526rn4yysvpka6pigs4p6gk5izqh0ik32b5aa2qk3059lkpx4"; }; - meta.homepage = "https://github.com/albfan/nerdtree-git-plugin/"; + meta.homepage = "https://github.com/Xuyuanp/nerdtree-git-plugin/"; + }; + + neuron-vim = buildVimPluginFrom2Nix { + pname = "neuron-vim"; + version = "2020-11-17"; + src = fetchFromGitHub { + owner = "fiatjaf"; + repo = "neuron.vim"; + rev = "ccaf20fdd028f21cf7281e7b94a0687ecf4e203b"; + sha256 = "1c5dk3xr4lgnc8226rhjmz4c1wjv18p5iqbc4z4bk3m32bq7rhxp"; + }; + meta.homepage = "https://github.com/fiatjaf/neuron.vim/"; }; nim-vim = buildVimPluginFrom2Nix { pname = "nim-vim"; - version = "2019-04-26"; + version = "2020-10-16"; src = fetchFromGitHub { owner = "zah"; repo = "nim.vim"; - rev = "88f5e708a739fb26be6364ab2fabadf9fffb8d7b"; - sha256 = "0ja8qx9c5g7k4phllvk3vz6s62iwpwsn40w6c32sybjs98jkrw7y"; + rev = "7a8737a4532239c06116ebde0329d8156f3d3b55"; + sha256 = "05xhac416c8zsgqlchc80f7gbjxbyngi6cxziqagdhr6kccc73gi"; }; meta.homepage = "https://github.com/zah/nim.vim/"; }; + nlua-nvim = buildVimPluginFrom2Nix { + pname = "nlua-nvim"; + version = "2020-11-16"; + src = fetchFromGitHub { + owner = "tjdevries"; + repo = "nlua.nvim"; + rev = "92fdfb1eb791e79ff1d6403dd26b59ce61dd09c6"; + sha256 = "1ka8k8rxn406glrc0qz8rk3zrxhpdaky040v1a65g5alb50af9hz"; + }; + meta.homepage = "https://github.com/tjdevries/nlua.nvim/"; + }; + nord-vim = buildVimPluginFrom2Nix { pname = "nord-vim"; - version = "2019-12-17"; + version = "2020-07-06"; src = fetchFromGitHub { owner = "arcticicestudio"; repo = "nord-vim"; - rev = "f06189a4c054fe8c22e46aca4d451e03456f2283"; - sha256 = "0gk4zq0gz3nnwfkldswg9bjpk0gf6d6mgfzcgvj0pnlbja6ass81"; + rev = "57dffa746907e8ce5c4b520146ed0d89d3c29a51"; + sha256 = "0xpz71rj74514789v6x9wrg95n8bsag8f5ygd7js40qrwpxq6b4j"; }; meta.homepage = "https://github.com/arcticicestudio/nord-vim/"; }; NrrwRgn = buildVimPluginFrom2Nix { pname = "NrrwRgn"; - version = "2020-04-21"; + version = "2020-05-29"; src = fetchFromGitHub { owner = "chrisbra"; repo = "NrrwRgn"; - rev = "a558325a2d0cca810520ed2b62e0c0e543e97bf6"; - sha256 = "1ngwyga0pslkw1d5qwz98zz8axfwc0mvxig5yp59gra9awgk6nw8"; + rev = "82a0fc6a3415db9a891f9d9f19b512041c865109"; + sha256 = "00fd466i5860bazd4pj69k8piicgckxj68lkn2l7haawj9chslzs"; }; meta.homepage = "https://github.com/chrisbra/NrrwRgn/"; }; + nvcode-color-schemes-vim = buildVimPluginFrom2Nix { + pname = "nvcode-color-schemes-vim"; + version = "2020-11-15"; + src = fetchFromGitHub { + owner = "ChristianChiarulli"; + repo = "nvcode-color-schemes.vim"; + rev = "de6b08e0e2f4dc8b8fd0c862a36cb17b9faecf14"; + sha256 = "1a7ygblpwgrnnwqjrwmc7ppgla22z1yr1n33qw5h2wp0hlvy7z3l"; + }; + meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/"; + }; + nvim-cm-racer = buildVimPluginFrom2Nix { pname = "nvim-cm-racer"; version = "2017-07-27"; @@ -2531,40 +2638,88 @@ let meta.homepage = "https://github.com/roxma/nvim-completion-manager/"; }; + nvim-dap = buildVimPluginFrom2Nix { + pname = "nvim-dap"; + version = "2020-11-15"; + src = fetchFromGitHub { + owner = "mfussenegger"; + repo = "nvim-dap"; + rev = "52f38f925a3116c6bad0b7f4d54d5daa576a5cdf"; + sha256 = "0806zbrwc1la4k6nnwih5kx8zv97dw9p9hnpyxqd3s45rnb7izsa"; + }; + meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; + }; + + nvim-dap-virtual-text = buildVimPluginFrom2Nix { + pname = "nvim-dap-virtual-text"; + version = "2020-11-09"; + src = fetchFromGitHub { + owner = "theHamsta"; + repo = "nvim-dap-virtual-text"; + rev = "7c4bbfb1caa2b5be1e863962bd0bc142e10b801f"; + sha256 = "1ry4799s4nj4nhfd2p0hbb3r8vp87zgwn0cw1h8w1hhyv9gfjn82"; + }; + meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; + }; + nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2020-05-20"; + version = "2020-10-01"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "67c37060deba03d123c4654c1b3da426c92d6f61"; - sha256 = "0rsgpnl20pxfqcwd5gr89mkqv3im4s7v4d1cvxvi9wj0ix06pxm1"; + rev = "9414e51689ee56253b55ba8ef01e5d63ec2e9d97"; + sha256 = "1vfqf8krd0mxyf31lhgmdpg6p8b5zqbpc0gjijj9akzgs6fdhknk"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; + nvim-highlite = buildVimPluginFrom2Nix { + pname = "nvim-highlite"; + version = "2020-11-18"; + src = fetchFromGitHub { + owner = "Iron-E"; + repo = "nvim-highlite"; + rev = "b8b78237b8002f6a1cda1a205db11770ca748777"; + sha256 = "136zd50kj3mzvh5m1f73spbfl7wsmac7676p8yhw4mhg9wv0vv7w"; + }; + meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; + }; + nvim-hs-vim = buildVimPluginFrom2Nix { pname = "nvim-hs-vim"; - version = "2019-04-14"; + version = "2020-08-29"; src = fetchFromGitHub { owner = "neovimhaskell"; repo = "nvim-hs.vim"; - rev = "5bc177a87c9575c4995df90a098d330fe6e02f75"; - sha256 = "14jgvkvakpy36md5si2a3rf2w869snb65inriq68xbk32bg5pg8q"; + rev = "30baacd3c7a10625cb2d4dd64ae3bbfc4fe3f8c6"; + sha256 = "1w6cr6j77nwxszm1d0y4phvjsz9q4aw214xkscw6izakfmk06h1x"; }; meta.homepage = "https://github.com/neovimhaskell/nvim-hs.vim/"; }; - nvim-lsp = buildVimPluginFrom2Nix { - pname = "nvim-lsp"; - version = "2020-05-24"; + nvim-lspconfig = buildVimPluginFrom2Nix { + pname = "nvim-lspconfig"; + version = "2020-11-18"; src = fetchFromGitHub { owner = "neovim"; - repo = "nvim-lsp"; - rev = "54f4f823a27ffa8f9e6c308d550888f3ae21373e"; - sha256 = "19v8gwq6ym0ipia039x6xw00xlwrhrmm1bw8s5v5d6j1wl1mbcmz"; + repo = "nvim-lspconfig"; + rev = "4f19567fb76438d39ed196ae5b4e06b749e75e16"; + sha256 = "16iddpk10mgh4pah9lc35ijh7idinc7v37pkbyaixnljjm64jwqw"; }; - meta.homepage = "https://github.com/neovim/nvim-lsp/"; + meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; + }; + + nvim-lsputils = buildVimPluginFrom2Nix { + pname = "nvim-lsputils"; + version = "2020-11-13"; + src = fetchFromGitHub { + owner = "RishabhRD"; + repo = "nvim-lsputils"; + rev = "6abfc5411c8292eea756816b2db9f0ee9ab344ff"; + sha256 = "07s3psv27nr99f6d6173cykvqqiv22dqljy89j8wnqkh2rskzfrq"; + }; + meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/"; }; nvim-terminal-lua = buildVimPluginFrom2Nix { @@ -2579,6 +2734,78 @@ let meta.homepage = "https://github.com/norcalli/nvim-terminal.lua/"; }; + nvim-tree-lua = buildVimPluginFrom2Nix { + pname = "nvim-tree-lua"; + version = "2020-10-31"; + src = fetchFromGitHub { + owner = "kyazdani42"; + repo = "nvim-tree.lua"; + rev = "ef893b523d366a0dde44b61d9cb327f2bea65f1d"; + sha256 = "0g4sz0q5mipa6f8hybbkd42jg6ayw3ih2lv1ml4pjyp378cqbkg6"; + }; + meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; + }; + + nvim-treesitter = buildVimPluginFrom2Nix { + pname = "nvim-treesitter"; + version = "2020-11-18"; + src = fetchFromGitHub { + owner = "nvim-treesitter"; + repo = "nvim-treesitter"; + rev = "289cdc9da8f7f21dcbf814032e9277ef0e9790a0"; + sha256 = "0fqsl6rva6rb0zdpkv8myn7x5frxg5nmjykhx0jxc23zx5q65nj3"; + }; + meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; + }; + + nvim-treesitter-context = buildVimPluginFrom2Nix { + pname = "nvim-treesitter-context"; + version = "2020-11-14"; + src = fetchFromGitHub { + owner = "romgrk"; + repo = "nvim-treesitter-context"; + rev = "f70b9e30ff0b149c0eb2c1e4bdbdef594bdab30b"; + sha256 = "04mjl32gahaw2xky8yaghmgakiiy47dcjj6k4p793xfcs1kf4bsh"; + }; + meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/"; + }; + + nvim-treesitter-refactor = buildVimPluginFrom2Nix { + pname = "nvim-treesitter-refactor"; + version = "2020-10-07"; + src = fetchFromGitHub { + owner = "nvim-treesitter"; + repo = "nvim-treesitter-refactor"; + rev = "9d4b9daf2f138a5de538ee094bd899591004f8e2"; + sha256 = "0ma5zsl70mi92b9y8nhgkppdiqfjj0bl3gklhjv1c3lg7kny7511"; + }; + meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-refactor/"; + }; + + nvim-treesitter-textobjects = buildVimPluginFrom2Nix { + pname = "nvim-treesitter-textobjects"; + version = "2020-11-18"; + src = fetchFromGitHub { + owner = "nvim-treesitter"; + repo = "nvim-treesitter-textobjects"; + rev = "be31f77bcf66fdf07bef286382e7eb563c2643fc"; + sha256 = "02y4y4na91hjj6kw944wiww16xby7brd306jkhd5bzsb8asi223n"; + }; + meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; + }; + + nvim-web-devicons = buildVimPluginFrom2Nix { + pname = "nvim-web-devicons"; + version = "2020-11-08"; + src = fetchFromGitHub { + owner = "kyazdani42"; + repo = "nvim-web-devicons"; + rev = "61693bf98df40dc17354edd5f92311e2aaa0f5cc"; + sha256 = "0siifa9gxj6kz9w4fpnra6afyri6y0b34605aqkf7820krhcmckz"; + }; + meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/"; + }; + nvim-yarp = buildVimPluginFrom2Nix { pname = "nvim-yarp"; version = "2020-04-08"; @@ -2603,26 +2830,50 @@ let meta.homepage = "https://github.com/neovim/nvimdev.nvim/"; }; + oceanic-next = buildVimPluginFrom2Nix { + pname = "oceanic-next"; + version = "2020-11-08"; + src = fetchFromGitHub { + owner = "mhartington"; + repo = "oceanic-next"; + rev = "9fa644b0f545cad22ee28ee3dd9a719a9a6bf75b"; + sha256 = "0xxc6im5rvd2c14i0jpnsgjhcsc7l5zs30razc4gqvv753g663qs"; + }; + meta.homepage = "https://github.com/mhartington/oceanic-next/"; + }; + + onedark-vim = buildVimPluginFrom2Nix { + pname = "onedark-vim"; + version = "2020-08-12"; + src = fetchFromGitHub { + owner = "joshdick"; + repo = "onedark.vim"; + rev = "7f9b1802b0d76f4f8fe7ad5bbef472c96e1c104f"; + sha256 = "11fk496xk0564fcfmc77b2m98l6dmvb4ph50vyq73a1mlcs1438c"; + }; + meta.homepage = "https://github.com/joshdick/onedark.vim/"; + }; + onehalf = buildVimPluginFrom2Nix { pname = "onehalf"; - version = "2020-05-06"; + version = "2020-10-14"; src = fetchFromGitHub { owner = "sonph"; repo = "onehalf"; - rev = "970abdf26b399100cbb59c6b6e693c4ff877c59d"; - sha256 = "1v34n0cz7jkx0wlbl6kv693qgifs0frcw4mv32ll36pmqfyb4m0h"; + rev = "89923117bc49dd1e0c6b7fdd34bc6dc4d425fe1f"; + sha256 = "0d3d9sp88b41j8yhkn99b0g1y3jbcm3hhf8dw6kq50scrb84g5y3"; }; meta.homepage = "https://github.com/sonph/onehalf/"; }; open-browser-github-vim = buildVimPluginFrom2Nix { pname = "open-browser-github-vim"; - version = "2020-03-16"; + version = "2020-11-11"; src = fetchFromGitHub { owner = "tyru"; repo = "open-browser-github.vim"; - rev = "db483ae17f02a8561e85b2071b90359a9a3bd18d"; - sha256 = "09x9lfyi9gfhy4m1vp6z1kxpvi31rr8dnlqhh6fgskkziiqch3jw"; + rev = "ee132b0f8ea180f996a2e34c5e977d23c615b47a"; + sha256 = "17da42h05840vv8n4sj0im4rc18g2drb9sh0grjlpnz86mc8fqj0"; }; meta.homepage = "https://github.com/tyru/open-browser-github.vim/"; }; @@ -2641,24 +2892,24 @@ let palenight-vim = buildVimPluginFrom2Nix { pname = "palenight-vim"; - version = "2020-01-17"; + version = "2020-10-20"; src = fetchFromGitHub { owner = "drewtempelmeyer"; repo = "palenight.vim"; - rev = "f332f9efe73227a47c18bade892ac55682641733"; - sha256 = "0nd2hqvxnjnbsp17x666nwyy0s9j9b6igyfhl44p7lkci6560gwp"; + rev = "847fcf5b1de2a1f9c28fdcc369d009996c6bf633"; + sha256 = "0v7jkg6rpwmyq0wl6lymm2j07r0mzab8lbsnxb0jw34hcpx0rfis"; }; meta.homepage = "https://github.com/drewtempelmeyer/palenight.vim/"; }; papercolor-theme = buildVimPluginFrom2Nix { pname = "papercolor-theme"; - version = "2019-11-06"; + version = "2020-11-09"; src = fetchFromGitHub { owner = "NLKNguyen"; repo = "papercolor-theme"; - rev = "ddd09867ed4e020b3ba2eb47dc3ef365da5b0fed"; - sha256 = "1dhbnd99xs6l5alqhn9m1nynmr9sbvrqj2137l23ysisprl3rgmr"; + rev = "0428fc228afc50085326bfd43746b7734e42c428"; + sha256 = "092zp0f5jvfwh2q8asxdnkrhz9djgw0lqzg70g38xk606fxy16a9"; }; meta.homepage = "https://github.com/NLKNguyen/papercolor-theme/"; }; @@ -2701,16 +2952,40 @@ let plantuml-syntax = buildVimPluginFrom2Nix { pname = "plantuml-syntax"; - version = "2020-05-09"; + version = "2020-07-03"; src = fetchFromGitHub { owner = "aklt"; repo = "plantuml-syntax"; - rev = "8dddc45f3f7ba4f0319a14e6f0167d97a703ac55"; - sha256 = "1fkls8qwkdgr5fyaml9rlrjzrbwav2zyp2xyfdyg4h6pbgchvkbl"; + rev = "eb3df3092a767c844db3f3ff355da840abd0aa97"; + sha256 = "02psvyxli5gs2cx2sha33mk98ivllb8zr1jwgv4hgi5bh6qd7wg3"; }; meta.homepage = "https://github.com/aklt/plantuml-syntax/"; }; + playground = buildVimPluginFrom2Nix { + pname = "playground"; + version = "2020-10-19"; + src = fetchFromGitHub { + owner = "nvim-treesitter"; + repo = "playground"; + rev = "0cb0a18378db84c4c2bdb38c28e897958d2ec14d"; + sha256 = "1808kwf3ccrjaqxr43l23kfj8s0zijdk0rpriymqk143b29nk52c"; + }; + meta.homepage = "https://github.com/nvim-treesitter/playground/"; + }; + + plenary-nvim = buildVimPluginFrom2Nix { + pname = "plenary-nvim"; + version = "2020-11-17"; + src = fetchFromGitHub { + owner = "nvim-lua"; + repo = "plenary.nvim"; + rev = "7d555b5dad0376dd075e19f26e4e40705efe5dba"; + sha256 = "0c2i6lp17lgsrivacix1jcis2bh12wsg0hgmssdhmq8vr43q14sk"; + }; + meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; + }; + pony-vim-syntax = buildVimPluginFrom2Nix { pname = "pony-vim-syntax"; version = "2017-09-26"; @@ -2723,6 +2998,30 @@ let meta.homepage = "https://github.com/dleonard0/pony-vim-syntax/"; }; + popfix = buildVimPluginFrom2Nix { + pname = "popfix"; + version = "2020-11-16"; + src = fetchFromGitHub { + owner = "RishabhRD"; + repo = "popfix"; + rev = "f7bb13a4e22716154904f8417928cb91e4284f22"; + sha256 = "1xmqhryr1san24386fxd60j7qrjlqx6zka87x3bjgg66rq4wqcrh"; + }; + meta.homepage = "https://github.com/RishabhRD/popfix/"; + }; + + popup-nvim = buildVimPluginFrom2Nix { + pname = "popup-nvim"; + version = "2020-10-08"; + src = fetchFromGitHub { + owner = "nvim-lua"; + repo = "popup.nvim"; + rev = "8f128cc7b2a1d759ce343ef92ea311526c6bbe13"; + sha256 = "1jxy6lp7r1wvd296x4ql6c9w43iwdwaf8jzyg5azs3x9cdyx9b73"; + }; + meta.homepage = "https://github.com/nvim-lua/popup.nvim/"; + }; + PreserveNoEOL = buildVimPluginFrom2Nix { pname = "PreserveNoEOL"; version = "2013-06-14"; @@ -2761,12 +3060,12 @@ let purescript-vim = buildVimPluginFrom2Nix { pname = "purescript-vim"; - version = "2018-12-10"; + version = "2020-10-08"; src = fetchFromGitHub { owner = "purescript-contrib"; repo = "purescript-vim"; - rev = "67ca4dc4a0291e5d8c8da48bffc0f3d2c9739e7f"; - sha256 = "1insh39hzbynr6qxb215qxhpifl5m8i5i0d09a3b6v679i7s11i8"; + rev = "5b4fa3e2970be1353f7d77735c0c9b42dc9885f3"; + sha256 = "11d2jfzimdi6idvs61gjhy7d1g8yk90dfvvw5m8rn9620xrypbgn"; }; meta.homepage = "https://github.com/purescript-contrib/purescript-vim/"; }; @@ -2785,12 +3084,12 @@ let quick-scope = buildVimPluginFrom2Nix { pname = "quick-scope"; - version = "2020-05-09"; + version = "2020-07-31"; src = fetchFromGitHub { owner = "unblevable"; repo = "quick-scope"; - rev = "95578ca8eef44fcdba5e144b78604018590c6cef"; - sha256 = "1h5kc2wffvaljdvggp2s74jkd7z88y2r5g1flqlgda2x1ihlhavm"; + rev = "64a5e6f9791e75f4d87b176d5c11f31041aa4169"; + sha256 = "1b1s8jmfip40s9m466c78jczp22dq2brbsnmdaz7gc1fgxyb5858"; }; meta.homepage = "https://github.com/unblevable/quick-scope/"; }; @@ -2953,12 +3252,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2020-05-13"; + version = "2020-09-18"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "953b10061f595496b35aec84b75c413ee5751a23"; - sha256 = "1abacayriz439lj4r3s1x92pp3wwxqav3kqsanxq9k6f6p2b2fyb"; + rev = "96e79e397126be1a64fb53d8e3656842fe1a4532"; + sha256 = "0siml7vqiq5nvymyw8az48rv5dsf9dad8y8hy22j57lknd67b8h3"; }; meta.homepage = "https://github.com/rust-lang/rust.vim/"; }; @@ -2987,6 +3286,18 @@ let meta.homepage = "https://github.com/megaannum/self/"; }; + semantic-highlight-vim = buildVimPluginFrom2Nix { + pname = "semantic-highlight-vim"; + version = "2020-09-11"; + src = fetchFromGitHub { + owner = "jaxbot"; + repo = "semantic-highlight.vim"; + rev = "7e141c2b7be0f2600276004fd2e7382a3fa0f690"; + sha256 = "04975ly6zd58zhs2v07dw6m1dha0gkmfm0pvhlrgcrf2qp8n4m3v"; + }; + meta.homepage = "https://github.com/jaxbot/semantic-highlight.vim/"; + }; + semshi = buildVimPluginFrom2Nix { pname = "semshi"; version = "2019-12-01"; @@ -3001,12 +3312,12 @@ let seoul256-vim = buildVimPluginFrom2Nix { pname = "seoul256-vim"; - version = "2020-03-14"; + version = "2020-06-21"; src = fetchFromGitHub { owner = "junegunn"; repo = "seoul256.vim"; - rev = "cfc0167e546a40eb26ec2a0a0f1c141a8c1bcaf1"; - sha256 = "1z980hsmf6gcvd16ja67az131mrgv5fv6v0ivsh0ga8hwc4f9l6q"; + rev = "24ed467ca6ef9ce7ede56c9ffb1c6b30cd0ee906"; + sha256 = "0ihs5nxdyx3jr1n96l2yx4b5gc48x7qbyxv6dc53ihw2vpn783fx"; }; meta.homepage = "https://github.com/junegunn/seoul256.vim/"; }; @@ -3035,18 +3346,42 @@ let meta.homepage = "https://github.com/vim-scripts/ShowMultiBase/"; }; + sideways-vim = buildVimPluginFrom2Nix { + pname = "sideways-vim"; + version = "2020-09-21"; + src = fetchFromGitHub { + owner = "AndrewRadev"; + repo = "sideways.vim"; + rev = "19c5a21206b6c9f999004256a10e7381450ea83f"; + sha256 = "14h8lf70wccafapifzf9c6cjprik9n1a1wmv5gpajyqqbvzh1yv6"; + }; + meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; + }; + SimpylFold = buildVimPluginFrom2Nix { pname = "SimpylFold"; - version = "2017-06-13"; + version = "2020-09-09"; src = fetchFromGitHub { owner = "tmhedberg"; repo = "SimpylFold"; - rev = "aa0371d9d708388f3ba385ccc67a7504586a20d9"; - sha256 = "1gjv78x2cgh79a04l411kdhkm53f93czs54p07kadpa9659z93ss"; + rev = "0459df8a0bbfc8ef1bfd88db889e881626f65914"; + sha256 = "1lydkm86d84fsmbklwcgnlb95vczri9a8d898hrnfvskyx050y2w"; }; meta.homepage = "https://github.com/tmhedberg/SimpylFold/"; }; + skim-vim = buildVimPluginFrom2Nix { + pname = "skim-vim"; + version = "2020-11-11"; + src = fetchFromGitHub { + owner = "lotabout"; + repo = "skim.vim"; + rev = "83faea7f2581005d4adc9256ec76e0fe3f8a15e6"; + sha256 = "0wppb2wgpk085cwh9kmqzv6f30j2hb3brqx2ik371gkrcfbpf4ly"; + }; + meta.homepage = "https://github.com/lotabout/skim.vim/"; + }; + sky-color-clock-vim = buildVimPluginFrom2Nix { pname = "sky-color-clock-vim"; version = "2018-11-03"; @@ -3097,12 +3432,12 @@ let Spacegray-vim = buildVimPluginFrom2Nix { pname = "Spacegray-vim"; - version = "2019-02-23"; + version = "2020-09-18"; src = fetchFromGitHub { owner = "ajh17"; repo = "Spacegray.vim"; - rev = "69e8fefce04e2aff6a01cc4c295493359b0e4fa1"; - sha256 = "0ks5yd1vmpjw8ml7hqd2zz2d8mqkqhfw2ya73y1igf6as70za896"; + rev = "338b319da09b5e62744a54c79148262ba0f24bf3"; + sha256 = "0jkv0sg1sc7d8br32zmwr5m1iwbvzi43f4gvshfi71c6k2fyhwlb"; }; meta.homepage = "https://github.com/ajh17/Spacegray.vim/"; }; @@ -3157,12 +3492,12 @@ let splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin-vim"; - version = "2020-05-16"; + version = "2020-10-25"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "99d12007112b63b8e3fd0fcf435471ac63ccf030"; - sha256 = "1mar7v4sp3zbvbczs54n8zj17bh042g0384ichwvqkamfcfxgdid"; + rev = "1c1b94a6aa218c429421c82bcc56a216301b6e85"; + sha256 = "1jkny1ag82zvkfjvbzrkkh4s54jcf9hq5n9ak3g691zcddhmrp17"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -3180,14 +3515,26 @@ let meta.homepage = "https://github.com/darfink/starsearch.vim/"; }; + SudoEdit-vim = buildVimPluginFrom2Nix { + pname = "SudoEdit-vim"; + version = "2020-02-27"; + src = fetchFromGitHub { + owner = "chrisbra"; + repo = "SudoEdit.vim"; + rev = "e203eada5b563e9134ce2aae26b09edae0904fd7"; + sha256 = "0pf9iix50pw3p430ky51rv11ra1hppdpwa5flzcd5kciybr76n0n"; + }; + meta.homepage = "https://github.com/chrisbra/SudoEdit.vim/"; + }; + supertab = buildVimPluginFrom2Nix { pname = "supertab"; - version = "2017-11-14"; + version = "2020-10-01"; src = fetchFromGitHub { owner = "ervandew"; repo = "supertab"; - rev = "40fe711e088e2ab346738233dd5adbb1be355172"; - sha256 = "0l5labq68kyprv63k1q35hz5ly0dd06mf2z202mccnix4mlxf0db"; + rev = "d80e8e2c1fa08607fa34c0ca5f1b66d8a906c5ef"; + sha256 = "0wjaq6k1sb38qmjcp47cr0avvwhphr0wiyl8qvnc8qqyjf8y803k"; }; meta.homepage = "https://github.com/ervandew/supertab/"; }; @@ -3206,24 +3553,24 @@ let swift-vim = buildVimPluginFrom2Nix { pname = "swift-vim"; - version = "2020-02-21"; + version = "2020-09-04"; src = fetchFromGitHub { owner = "keith"; repo = "swift.vim"; - rev = "c4053da88208cef5a32a5862694d36b73f6ce310"; - sha256 = "0awz0pf3awrwhay40wngfllpmmh24zwm02ra530x4n1hk74iwf2v"; + rev = "bfc662d11b3a006815d0b6972c1c0c2ebbc3b16e"; + sha256 = "1qf5f9p0kfi6bq2qi9izarva6r711vzlbrbdax8nq9g0pxa1bj3f"; }; meta.homepage = "https://github.com/keith/swift.vim/"; }; syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2020-04-19"; + version = "2020-11-06"; src = fetchFromGitHub { owner = "vim-syntastic"; repo = "syntastic"; - rev = "b3e2d8470fddc7f2b598f09023ebc5045a3fb1fd"; - sha256 = "1ljsh0npbcv9g6l23z4jpba0bk1k5n13ix0p0rr22cipgzlxsbvh"; + rev = "63741646a9e87bbe105674747555aded6f52c490"; + sha256 = "0x1rn76zjig4kdbs719fcpc22mbh2jz93ni8zpzpkn8r186f05s5"; }; meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; @@ -3266,14 +3613,14 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2020-05-05"; + version = "2020-11-13"; src = fetchFromGitHub { - owner = "majutsushi"; + owner = "preservim"; repo = "tagbar"; - rev = "2a1486447aa62e47faeb98e43fe75c50007870b3"; - sha256 = "0003l09xhdyyq9m0y7hs1nccv3vdmz64qd3ra3rl6lqigzv8v01n"; + rev = "68a77323cb707e227d16302d39d35949dbb0f85a"; + sha256 = "1038p1w7pfwg6ydqxbahb9plab8d40mdqmnbm6z36y7yrssmjhsj"; }; - meta.homepage = "https://github.com/majutsushi/tagbar/"; + meta.homepage = "https://github.com/preservim/tagbar/"; }; taglist-vim = buildVimPluginFrom2Nix { @@ -3302,24 +3649,36 @@ let tcomment_vim = buildVimPluginFrom2Nix { pname = "tcomment_vim"; - version = "2020-05-12"; + version = "2020-11-18"; src = fetchFromGitHub { owner = "tomtom"; repo = "tcomment_vim"; - rev = "22f3707fd19e1573b4379f3b8db0e967f4ae6492"; - sha256 = "0nj7bsmkw8yc4hfnbsm32lf4qcwc4qd18nr5sb7vrkm6ipsr2qyz"; + rev = "2037d05870e10e03b2e157a09ae007c179efd253"; + sha256 = "1z7c95rzgpm1f2cdmx3yv3f0ai7kq0kx8wd6mp4aqpdysi1qh9jk"; }; meta.homepage = "https://github.com/tomtom/tcomment_vim/"; }; + telescope-nvim = buildVimPluginFrom2Nix { + pname = "telescope-nvim"; + version = "2020-11-18"; + src = fetchFromGitHub { + owner = "nvim-telescope"; + repo = "telescope.nvim"; + rev = "aff22f5bf107af69b0a6189debae613e36d3455f"; + sha256 = "1l1c8za5qffvz7klzmxbyk0sv6j0869cpq8njrqzgzzah301pmlq"; + }; + meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; + }; + tender-vim = buildVimPluginFrom2Nix { pname = "tender-vim"; - version = "2020-04-24"; + version = "2020-06-29"; src = fetchFromGitHub { owner = "jacoborus"; repo = "tender.vim"; - rev = "44d04bc9ecb0188e7b1a3e6b6715b9a63dc8f3e1"; - sha256 = "059my5q6gqjdkaf7qn842h92c6y7lp5z8wpwsi2ww6anzy85506z"; + rev = "25924cb8b29a5158e56fb896a2540c70691c7a28"; + sha256 = "0mm5h5jhb6y0f1zsfhq0frvdm6s93skshi66rfrpn82l93zigw4c"; }; meta.homepage = "https://github.com/jacoborus/tender.vim/"; }; @@ -3350,12 +3709,12 @@ let thumbnail-vim = buildVimPluginFrom2Nix { pname = "thumbnail-vim"; - version = "2020-05-07"; + version = "2020-08-15"; src = fetchFromGitHub { owner = "itchyny"; repo = "thumbnail.vim"; - rev = "c238441923d4eefd0c1436686b35e8fa9e643a3e"; - sha256 = "101w0pvfcnms07w4l6yjhn4b4hb3rvwm827qb2z4rb14fydakias"; + rev = "161ff743cb031eff376780108b018735d92160b0"; + sha256 = "105a1a9kahfdicw1gkdhc88w41pyhmhv6yw2kh1flkaikzqlxbc8"; }; meta.homepage = "https://github.com/itchyny/thumbnail.vim/"; }; @@ -3399,96 +3758,96 @@ let traces-vim = buildVimPluginFrom2Nix { pname = "traces-vim"; - version = "2020-01-22"; + version = "2020-10-13"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "4d3858eb060a1fd2213b075a707d39cbb118ae3e"; - sha256 = "0qny9z459x7hp5y43iivws2m312clacysdy1nnb3cr1fyhw9pflx"; + rev = "1fb8738cf1e4db06423396dd3576592a94255935"; + sha256 = "0jl7m04rly8y1kslmcmi9f83a87qb3fbk6isqqqd5xgrxxmcj753"; }; meta.homepage = "https://github.com/markonm/traces.vim/"; }; tslime-vim = buildVimPluginFrom2Nix { pname = "tslime-vim"; - version = "2018-07-23"; + version = "2020-09-09"; src = fetchFromGitHub { owner = "jgdavey"; repo = "tslime.vim"; - rev = "28e9eba642a791c6a6b044433dce8e5451b26fb0"; - sha256 = "1y5xikryv6851d0rjk9c64agawshp5208mwym6ma9ngs7s3s1l4x"; + rev = "9b2b99e409336584103b83c597fdb6234875ae25"; + sha256 = "048ycam0awcf98zhha6c5n1fk366w559bmjcanik2sqlqw1f74as"; }; meta.homepage = "https://github.com/jgdavey/tslime.vim/"; }; tsuquyomi = buildVimPluginFrom2Nix { pname = "tsuquyomi"; - version = "2020-03-10"; + version = "2020-10-16"; src = fetchFromGitHub { owner = "Quramy"; repo = "tsuquyomi"; - rev = "85fffd5939c8fc5750b35a937b965af2ad5b0b15"; - sha256 = "1j5wdh0xa5yld4fy2msyjf1qvj8zx0iccc1bw63zzbrcl6rs30gx"; + rev = "144526df5340d3bd0b413e6127c0393de171889a"; + sha256 = "1amizvbpv4mwpi39x9xn5aj1kjkgl4sgh54irnhs4ga76zn0s09d"; }; meta.homepage = "https://github.com/Quramy/tsuquyomi/"; }; typescript-vim = buildVimPluginFrom2Nix { pname = "typescript-vim"; - version = "2020-02-13"; + version = "2020-09-09"; src = fetchFromGitHub { owner = "leafgarland"; repo = "typescript-vim"; - rev = "17d85d8051ba21283e62a9101734981e10b732fd"; - sha256 = "17z8ygns97wlnm4vq7kgkx3ymnbb2f6imxn02fc0iywkrhdqv7mj"; + rev = "9f247d7693cd12171239c56c355ba863f559f424"; + sha256 = "1m16rhvmymxps41s7f6nh6gnbfiw5qwkvl23jr9z91xsq58jzj9l"; }; meta.homepage = "https://github.com/leafgarland/typescript-vim/"; }; ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2020-05-19"; + version = "2020-11-09"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "e83c82099d9bd43dc7895e3cb5b114ee5a2a07c6"; - sha256 = "0a9fqgg8sg8s19q9inxyzl6lqdsnxs22csqs2rss1qz9dsic4yrh"; + rev = "b837416c1ffe39b168baee35c0938739e96211c5"; + sha256 = "1c1ahpdw0d18x5g5s5mpv7mcf0igrpla33k2khmk4q739ywb21qc"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; undotree = buildVimPluginFrom2Nix { pname = "undotree"; - version = "2019-03-13"; + version = "2020-11-10"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "be23eacb2a63380bd79e207a738c728214ecc9d3"; - sha256 = "00zyvff32zp7pyjzkq8da9xhr378mlpi8gj717yfr9wbwwarwfd7"; + rev = "9ceb50062135dd30de3da000d5fd46125f51887d"; + sha256 = "1vwjggf3csbysavk3yyfzjklyq8xwfvk17rprmj660h2whgjjzvg"; }; meta.homepage = "https://github.com/mbbill/undotree/"; }; unicode-vim = buildVimPluginFrom2Nix { pname = "unicode-vim"; - version = "2020-04-20"; + version = "2020-10-07"; src = fetchFromGitHub { owner = "chrisbra"; repo = "unicode.vim"; - rev = "ce061819e4304a9ff2f82779e12e5a30363ab47c"; - sha256 = "0k9gmf2rdvnlfqqhjlk206wimlh5di3smmrr9cgz0djq5pd3r5jz"; + rev = "5f21e3e7e60f6d032daa4769e7ee84885fb0ce4d"; + sha256 = "0sfbv620zl8lqdzsypxcn9gasaaqpwarsynjxa25c4cd843cz3d2"; }; meta.homepage = "https://github.com/chrisbra/unicode.vim/"; }; unite-vim = buildVimPluginFrom2Nix { pname = "unite-vim"; - version = "2019-08-27"; + version = "2020-06-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "unite.vim"; - rev = "5addeca429f64130d74d2f7cb8255afdb9e309d2"; - sha256 = "03bqljjc1h43qimm81mv8ywkx5388kd6clm2f7887diiww0fgvfi"; + rev = "787c777ff2fedd46fc10e315bdfea339fe016d33"; + sha256 = "1bm48d3n07i2hy7bqz6pzyl3zb5mikhplmk5fk5x09q2i47l6bqg"; }; meta.homepage = "https://github.com/Shougo/unite.vim/"; }; @@ -3519,48 +3878,36 @@ let vCoolor-vim = buildVimPluginFrom2Nix { pname = "vCoolor-vim"; - version = "2018-10-06"; + version = "2020-10-14"; src = fetchFromGitHub { owner = "KabbAmine"; repo = "vCoolor.vim"; - rev = "8fc037e453f4c2274f590bde4f9fb56167b14e57"; - sha256 = "193cjxfha5xcpfjqqpyfa6xidys1zmmmwlcj7w2cxbr5j5bdnybm"; + rev = "bc19d684af09b1e146cf72176eea1ecded84882c"; + sha256 = "03vaghwqr3k0nls365wk4qwzmvdvdvq41q02c3l5qv2vsdikmz5i"; }; meta.homepage = "https://github.com/KabbAmine/vCoolor.vim/"; }; verilog_systemverilog-vim = buildVimPluginFrom2Nix { pname = "verilog_systemverilog-vim"; - version = "2020-05-24"; + version = "2020-06-12"; src = fetchFromGitHub { owner = "vhda"; repo = "verilog_systemverilog.vim"; - rev = "e2449daa3272a6d5ad33e433cca3208bf68607a7"; - sha256 = "16w1nskfxsfs9dhk1yxmk16i5vjg0wq8l3fsqwa0904rh5wnakjn"; + rev = "c37bcf010fcb73599d690d8da6ac966dac02a07e"; + sha256 = "1f4kicgr7wv0dprvr91wi4lmk0d9bb9f4wcng4rfkq1cdwfkqdw4"; }; meta.homepage = "https://github.com/vhda/verilog_systemverilog.vim/"; }; - vim = buildVimPluginFrom2Nix { - pname = "vim"; - version = "2020-05-19"; - src = fetchFromGitHub { - owner = "dracula"; - repo = "vim"; - rev = "494dbe9d4effff140ffe6743b614d900a0f34dd7"; - sha256 = "0d85kgxb52xw6120q6zrksr10nj54s8qi0fl6gqw6nc08ldaq0b1"; - }; - meta.homepage = "https://github.com/dracula/vim/"; - }; - vim-abolish = buildVimPluginFrom2Nix { pname = "vim-abolish"; - version = "2019-11-13"; + version = "2020-10-30"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-abolish"; - rev = "7e4da6e78002344d499af9b6d8d5d6fcd7c92125"; - sha256 = "1n35igng3a6d5y4nh5pyb09s6khgcwbr3v0lnh33qb51cv4cnjh4"; + rev = "68bc80c88617672fd41da7a6ace87d29cd3fe1e3"; + sha256 = "1cgaf8nhprm8sligmq4km2p374a2x08fg3isl1k0mac1iz9vz1z8"; }; meta.homepage = "https://github.com/tpope/vim-abolish/"; }; @@ -3793,50 +4140,74 @@ let meta.homepage = "https://github.com/MarcWeber/vim-addon-xdebug/"; }; + vim-after-object = buildVimPluginFrom2Nix { + pname = "vim-after-object"; + version = "2018-09-17"; + src = fetchFromGitHub { + owner = "junegunn"; + repo = "vim-after-object"; + rev = "7f52106df8a05e9bc1c53960c31a55f77e303903"; + sha256 = "13726m0c73n5pw9gil4ahbg71ibklrwkw9yvbr6qxxvn6qyijpdy"; + }; + meta.homepage = "https://github.com/junegunn/vim-after-object/"; + }; + vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-05-27"; + version = "2020-11-14"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "c744fb81b657417512af20063a36e7cb1ecd4f5c"; - sha256 = "1x55gkqgvy9k2wmcs5y1jmzqni6xd7fjh5269c3465br3hhzlgh2"; + rev = "536667191d5bdc0afa3a18d7df229731e778815e"; + sha256 = "0ay2bkqj92gzp2r36f5s92rb9gnhwkf09cx4y67gvd4b6rbqrkwi"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; + vim-airline-clock = buildVimPluginFrom2Nix { + pname = "vim-airline-clock"; + version = "2018-05-08"; + src = fetchFromGitHub { + owner = "enricobacis"; + repo = "vim-airline-clock"; + rev = "a752ae89d833ce14f87e303f3f479c01065077ca"; + sha256 = "0wbaxm1k9j4cl5vw1wppsds0afc0h3n2ipp8xhgdh5jswjhr6wlc"; + }; + meta.homepage = "https://github.com/enricobacis/vim-airline-clock/"; + }; + vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2020-04-01"; + version = "2020-11-08"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "3fb676b8729a98817f561ef1554c0ad1a514c96a"; - sha256 = "18bfw09ywmw10jiv37iw2ijf46jhj2yw5wndqdgn7k42gy1wk7p6"; + rev = "cd6f16978d5af4b9fb861be9d728732d72789df3"; + sha256 = "0ifb43q053grj2fvjjw52xsr79xnpc00k9302xnx1x4li9s5l64d"; }; meta.homepage = "https://github.com/vim-airline/vim-airline-themes/"; }; vim-android = buildVimPluginFrom2Nix { pname = "vim-android"; - version = "2020-04-25"; + version = "2020-11-04"; src = fetchFromGitHub { owner = "hsanson"; repo = "vim-android"; - rev = "1e5ee4f2a3281201aeb71766d45800e192c103f2"; - sha256 = "1d187w74y0viv502gqxfqi0kyak0lyi0dbpcfkjd9c0fjbqrydd6"; + rev = "5007343968e21bba30d85af982689d1c1f9145e1"; + sha256 = "17c3yhnn016k03f2g3cjfwnazg2525pgwy4zqcv0vrgq2g4dil82"; }; meta.homepage = "https://github.com/hsanson/vim-android/"; }; vim-anzu = buildVimPluginFrom2Nix { pname = "vim-anzu"; - version = "2018-02-28"; + version = "2020-06-10"; src = fetchFromGitHub { owner = "osyo-manga"; repo = "vim-anzu"; - rev = "45b60d37cb9de90f6c89f7ddeacb7ae430ebcae2"; - sha256 = "1p5lh4xsv9xsl8kx0h1bg6iy0if4a69hvairq69p50ffka83pv00"; + rev = "1b95ec384487e559f0ee70e0f46c33683ff533ac"; + sha256 = "0q6s9bb1yv7ir2al4gv69vv4c8m09j1ax47qbhchgz23iwka3vmz"; }; meta.homepage = "https://github.com/osyo-manga/vim-anzu/"; }; @@ -3879,12 +4250,12 @@ let vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2020-04-03"; + version = "2020-10-28"; src = fetchFromGitHub { owner = "Chiel92"; repo = "vim-autoformat"; - rev = "555c956db3bdd8ae6f1aa5af1c5fd37eac749e6a"; - sha256 = "0dhxa9jrhahqs1wh41115w8r3xcczbjpvnj65ldzs7q9vc4n12xq"; + rev = "ff16950ba5e07353f25ee33732982a67af451eb2"; + sha256 = "12h6dznfwpifyr6ahk1b45pb59nlm6wkrfhgh65g1clnpzvchkiw"; }; meta.homepage = "https://github.com/Chiel92/vim-autoformat/"; }; @@ -3903,24 +4274,24 @@ let vim-bazel = buildVimPluginFrom2Nix { pname = "vim-bazel"; - version = "2019-08-14"; + version = "2020-08-22"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "vim-bazel"; - rev = "7c4987b4266d117a9f1d4c7fe7f4dfba33dfc8c8"; - sha256 = "182w8ibr34z86nmx6byabkah0q9fgrzml8m2ardaqzqjqr2ya5yg"; + rev = "85a044d854e5e48f72414726c255112be31e2cac"; + sha256 = "1hcfbl958v39w00kyfg75rcxs9xzaqnd98i4y322ayqfgrhd95n8"; }; meta.homepage = "https://github.com/bazelbuild/vim-bazel/"; }; vim-beancount = buildVimPluginFrom2Nix { pname = "vim-beancount"; - version = "2020-05-14"; + version = "2020-08-06"; src = fetchFromGitHub { owner = "nathangrigg"; repo = "vim-beancount"; - rev = "53ab32f82723d685648b691af3d8a64a2a119d43"; - sha256 = "1vvfr1wz2770h4rh48qnaqbbdbfxj6pcyhyfh0vf641l46v6wzf8"; + rev = "6d762beaa526d4e56280619aa62b1013b50457b7"; + sha256 = "0r4ziynmil432k1xjglqjx0bh5069aav3k9r58ksqg716w4zvzys"; }; meta.homepage = "https://github.com/nathangrigg/vim-beancount/"; }; @@ -3937,6 +4308,18 @@ let meta.homepage = "https://github.com/ntpeters/vim-better-whitespace/"; }; + vim-bsv = buildVimPluginFrom2Nix { + pname = "vim-bsv"; + version = "2020-11-08"; + src = fetchFromGitHub { + owner = "mtikekar"; + repo = "vim-bsv"; + rev = "b03893b98f5b772297e48671a9c5f92f1c7d10eb"; + sha256 = "1cd0jmxmb30c50a0ssa96a34qm2r3vasnn0x6ah9azx75k4anrcx"; + }; + meta.homepage = "https://github.com/mtikekar/vim-bsv/"; + }; + vim-buffergator = buildVimPluginFrom2Nix { pname = "vim-buffergator"; version = "2018-05-02"; @@ -3963,16 +4346,28 @@ let vim-bufkill = buildVimPluginFrom2Nix { pname = "vim-bufkill"; - version = "2020-04-29"; + version = "2020-08-04"; src = fetchFromGitHub { owner = "qpkorr"; repo = "vim-bufkill"; - rev = "1bcdcb4a03a6ac1de06bc84b7f94ca08f4485f42"; - sha256 = "0j3r63j2vs0lm1vnfzwcwqbahncnqq46wmaf1rp8i9l8skqm20px"; + rev = "2bd6d7e791668ea52bb26be2639406fcf617271f"; + sha256 = "1cvma03bg9psil67kg1x90lny7a31ljz5shybcl1jrfpzsybcqvg"; }; meta.homepage = "https://github.com/qpkorr/vim-bufkill/"; }; + vim-carbon-now-sh = buildVimPluginFrom2Nix { + pname = "vim-carbon-now-sh"; + version = "2020-10-28"; + src = fetchFromGitHub { + owner = "kristijanhusak"; + repo = "vim-carbon-now-sh"; + rev = "f4a3e5c9be2e587511f79e46fb0b48d6d646d719"; + sha256 = "1ldv9l0swh6wk3wpyy0apnmg9gfcdzkgfdv8p0qm7j7pqdz981br"; + }; + meta.homepage = "https://github.com/kristijanhusak/vim-carbon-now-sh/"; + }; + vim-choosewin = buildVimPluginFrom2Nix { pname = "vim-choosewin"; version = "2019-09-17"; @@ -3985,6 +4380,30 @@ let meta.homepage = "https://github.com/t9md/vim-choosewin/"; }; + vim-clang-format = buildVimPluginFrom2Nix { + pname = "vim-clang-format"; + version = "2019-05-15"; + src = fetchFromGitHub { + owner = "rhysd"; + repo = "vim-clang-format"; + rev = "95593b67723f23979cd7344ecfd049f2f917830f"; + sha256 = "0n0k13k63l8n0ixs4zrhlz923apvdp2mldadxqlhmvsvncmlqmpn"; + }; + meta.homepage = "https://github.com/rhysd/vim-clang-format/"; + }; + + vim-clap = buildVimPluginFrom2Nix { + pname = "vim-clap"; + version = "2020-11-15"; + src = fetchFromGitHub { + owner = "liuchengxu"; + repo = "vim-clap"; + rev = "b2fe93fbee23c3dba24439e0e0bf8c5b77eb5447"; + sha256 = "03grw812c67m63gpdaayn7dfdlkzrhcki2fkcpfq3a80cwq1fvzf"; + }; + meta.homepage = "https://github.com/liuchengxu/vim-clap/"; + }; + vim-clojure-highlight = buildVimPluginFrom2Nix { pname = "vim-clojure-highlight"; version = "2015-07-05"; @@ -4011,24 +4430,24 @@ let vim-closetag = buildVimPluginFrom2Nix { pname = "vim-closetag"; - version = "2020-04-09"; + version = "2020-10-09"; src = fetchFromGitHub { owner = "alvan"; repo = "vim-closetag"; - rev = "90cf416c03ed841ad7f3d44f4d6f3192f216176a"; - sha256 = "0kxba7s0s66m2k4j1v8iwq6m5j9843ha67br03dg7d9ya4qiyyw9"; + rev = "bd6bbc33c7e178673aa1dd17a5d249bbd4e3a6a6"; + sha256 = "0nqzjma6mqg19cxq0ck2lym51ajb1x97z497zf9pbp47hkg5875j"; }; meta.homepage = "https://github.com/alvan/vim-closetag/"; }; vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2020-05-08"; + version = "2020-11-12"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "57d6fbb4ab3480ab0b0f4c10ecc7c14eb44d94bc"; - sha256 = "0a8w2cb1aj4764hbdxnjpnpdl6xf6slsz4f19lbm8fdsq0v3izk8"; + rev = "d418de02d5a6225883b08466414e33e80a509685"; + sha256 = "1lsl2xcsyjj7ri32p89d425bq1lhpkbfac72hnwc7k6xwq87ibgm"; }; meta.homepage = "https://github.com/google/vim-codefmt/"; }; @@ -4129,6 +4548,18 @@ let meta.homepage = "https://github.com/octol/vim-cpp-enhanced-highlight/"; }; + vim-crates = buildVimPluginFrom2Nix { + pname = "vim-crates"; + version = "2019-11-11"; + src = fetchFromGitHub { + owner = "mhinz"; + repo = "vim-crates"; + rev = "addbb157d0652ce5288c5b5b6f32f8716eb47898"; + sha256 = "1pczfm9vjjna3xdqym9h69gi47kiwi97lzjf9jjlkmyg1s4pwlsp"; + }; + meta.homepage = "https://github.com/mhinz/vim-crates/"; + }; + vim-csharp = buildVimPluginFrom2Nix { pname = "vim-csharp"; version = "2017-03-29"; @@ -4143,48 +4574,48 @@ let vim-css-color = buildVimPluginFrom2Nix { pname = "vim-css-color"; - version = "2020-04-16"; + version = "2020-08-16"; src = fetchFromGitHub { owner = "ap"; repo = "vim-css-color"; - rev = "741dd18a35e251ededc0687eea9b8d100d3b83b8"; - sha256 = "1mjwyznprhhfmwi1djyjgxkqv9bwima1ysxa9782rk198j2n87vs"; + rev = "4694c6ea03a065a3f6ddbebce56797a21e8241ef"; + sha256 = "12bzxrdvb9s0d8llkq6h63g86qxs0gv9x7401apl6qrs79prrb4a"; }; meta.homepage = "https://github.com/ap/vim-css-color/"; }; vim-cue = buildVimPluginFrom2Nix { pname = "vim-cue"; - version = "2020-05-20"; + version = "2020-10-26"; src = fetchFromGitHub { owner = "jjo"; repo = "vim-cue"; - rev = "9b26fb250d473f949fc90cabe70efff316a90248"; - sha256 = "0aybj1xxi860cn7wzg13z50f16kdsyhba0z7qwchps4fr24xkjms"; + rev = "9e8bef1198817b6bae1143fecd965403d65d2466"; + sha256 = "0rq74znq9mx5p925jd120l5apjqdqp6xy6llzhf2gq5cxpg62hjl"; }; meta.homepage = "https://github.com/jjo/vim-cue/"; }; vim-cursorword = buildVimPluginFrom2Nix { pname = "vim-cursorword"; - version = "2020-05-02"; + version = "2020-06-20"; src = fetchFromGitHub { owner = "itchyny"; repo = "vim-cursorword"; - rev = "109604ab6f35744e133802d7cf61795721612cac"; - sha256 = "1mrkkl6pchrmd2s5wjdh46p54hchv7jvgdbjjxmvzhg5ndk0zxvf"; + rev = "cc8114226ceefb5cafe1890e0900d3efb7dab1fd"; + sha256 = "1x5ljk82bxc3qhrq5pz0dsab8rg1234syd1xmpkgvif52s9g4mfk"; }; meta.homepage = "https://github.com/itchyny/vim-cursorword/"; }; vim-cute-python = buildVimPluginFrom2Nix { pname = "vim-cute-python"; - version = "2016-04-04"; + version = "2020-11-17"; src = fetchFromGitHub { owner = "ehamberg"; repo = "vim-cute-python"; - rev = "d7a6163f794500447242df2bedbe20bd751b92da"; - sha256 = "1jrfd6z84cdzn3yxdfp0xfxygscq7s8kbzxk37hf9cf5pl9ln0qf"; + rev = "18cd5e0f63ae5ae74398051c0de9a27d1746e5a5"; + sha256 = "1svr8r1rva6lq9ypzazrlw5gabnipjyhd2bs43cpfcwx0ms04d2k"; }; meta.homepage = "https://github.com/ehamberg/vim-cute-python/"; }; @@ -4203,24 +4634,24 @@ let vim-dasht = buildVimPluginFrom2Nix { pname = "vim-dasht"; - version = "2020-05-18"; + version = "2020-07-11"; src = fetchFromGitHub { owner = "sunaku"; repo = "vim-dasht"; - rev = "efee6525f7f61f2b201cbb09c888941c3e5a5e27"; - sha256 = "186rvr9vw140sin219q6psvh70vlqas9vfnbbg5ms6n7wvhz6a19"; + rev = "c1c91ecfd30f0e4e946854a6f7c67eb2d1e21c98"; + sha256 = "0ldkyzsn4b555pb9qdr0k6w6m3w7ziy7v6bcnx0n8ppq4fl68pz2"; }; meta.homepage = "https://github.com/sunaku/vim-dasht/"; }; vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2020-05-28"; + version = "2020-11-04"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "8a5133cb5ba229fa80055a031b6070b1651cd102"; - sha256 = "0lxvl378gjwaywmj5fskr8bzdchlh0g33p79ja0pgzs6qffg4jj2"; + rev = "383159d338024f09e4d56585a9301958b6fefad6"; + sha256 = "1mzr45pxjm3xfc0x92clybxzj67akwmfjwwbmdd1wxjw37qdjvpw"; }; meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; @@ -4239,28 +4670,40 @@ let vim-dirdiff = buildVimPluginFrom2Nix { pname = "vim-dirdiff"; - version = "2020-03-31"; + version = "2020-11-03"; src = fetchFromGitHub { owner = "will133"; repo = "vim-dirdiff"; - rev = "5bf29d8a41b4ec93e6c04b9d4a6c626b408c27c5"; - sha256 = "0nvhsj12gsjgncpmvg8b1qz675ghfcsib5gj22p7j4l4brih563r"; + rev = "0191693f0d3dfc624c61ac95ec951183a50b3b32"; + sha256 = "0har8iri09nkjsvag4wgsynb9fxan2g8nlvlvd5zsalbnmlmdh9j"; }; meta.homepage = "https://github.com/will133/vim-dirdiff/"; }; vim-dirvish = buildVimPluginFrom2Nix { pname = "vim-dirvish"; - version = "2020-05-01"; + version = "2020-09-07"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "a19760770b810050e748de14ced589dd34c2dcb5"; - sha256 = "0iz72p992z2bkvz66x7fgyd9hpjq558h009bsjvfr4l6fpbi4ys2"; + rev = "9c0dc32af9235d42715751b30cf04fa0584c1798"; + sha256 = "1xl655mnhjn1mbqzvxblsbqyg3yq50ri2a7szvqmpywq8rr0ymq9"; }; meta.homepage = "https://github.com/justinmk/vim-dirvish/"; }; + vim-dirvish-git = buildVimPluginFrom2Nix { + pname = "vim-dirvish-git"; + version = "2020-06-04"; + src = fetchFromGitHub { + owner = "kristijanhusak"; + repo = "vim-dirvish-git"; + rev = "8a3a8b88ed0815500c2912658fe0de7583ee1d45"; + sha256 = "1z8a718kam2r87kimhayxndjbmpgk0mgwrc5v52bid584xml584k"; + }; + meta.homepage = "https://github.com/kristijanhusak/vim-dirvish-git/"; + }; + vim-dispatch = buildVimPluginFrom2Nix { pname = "vim-dispatch"; version = "2020-04-19"; @@ -4323,12 +4766,12 @@ let vim-easymotion = buildVimPluginFrom2Nix { pname = "vim-easymotion"; - version = "2020-02-08"; + version = "2020-10-25"; src = fetchFromGitHub { owner = "easymotion"; repo = "vim-easymotion"; - rev = "dd7b4b526775bc8553e16bc402020573b04a948c"; - sha256 = "1dhhq1y6xa3q26irclad6254q89xpnxglfd92v3bq01l4p41zcqf"; + rev = "41bbb8ce8a3c3acc837895ebd79f8a8bc07b99b3"; + sha256 = "1lbn844pv5pnla3qhc01wyyrx3czmr83gax8pr3w6283jwp4di6y"; }; meta.homepage = "https://github.com/easymotion/vim-easymotion/"; }; @@ -4359,24 +4802,24 @@ let vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2020-04-25"; + version = "2020-09-27"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "vim-elixir"; - rev = "53c530f79cfcd12498e31fcf8ecc466eba34c75c"; - sha256 = "13yr7iwi4w0m4zgkq1ia74qcca9wh9k0bz2y1yvm81db0bllsf6s"; + rev = "c0f7b40260d6733c2c283407bea02806e6acb9e5"; + sha256 = "0h1vpswfxvl6kwinn4hk01qzmjzbbinkn2fhw4i9j5bpq0z3w8wp"; }; meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; }; vim-elm-syntax = buildVimPluginFrom2Nix { pname = "vim-elm-syntax"; - version = "2020-01-25"; + version = "2020-10-29"; src = fetchFromGitHub { owner = "andys8"; repo = "vim-elm-syntax"; - rev = "846a5929bff5795256fbca96707e451dbc755e36"; - sha256 = "05jkx4dbkb646wy0igqpwc55iamm0a030dswhirg6nyl3x6qzgym"; + rev = "998ef67262dcbeadd596458d7ff40079b5bc5cbb"; + sha256 = "0gja4ifdpl6wfq3n897h1h635kf92v5c44jzr0ixbv3i924xqjhj"; }; meta.homepage = "https://github.com/andys8/vim-elm-syntax/"; }; @@ -4395,24 +4838,24 @@ let vim-eunuch = buildVimPluginFrom2Nix { pname = "vim-eunuch"; - version = "2020-01-16"; + version = "2020-08-07"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-eunuch"; - rev = "33e875b31c8b811a0a47908884a5e2339106bbe8"; - sha256 = "1xadb22kd40swmww0qxmmkcpcq6viy8l167pjck5q32hfngll5d3"; + rev = "4a4bf16b499dcde371c05c77ed4083c4b5228278"; + sha256 = "1wclxqw3b4jcj34jb830551c9bbrsm79mp7aahbqnjgq025j53x0"; }; meta.homepage = "https://github.com/tpope/vim-eunuch/"; }; vim-exchange = buildVimPluginFrom2Nix { pname = "vim-exchange"; - version = "2017-01-27"; + version = "2020-11-15"; src = fetchFromGitHub { owner = "tommcdo"; repo = "vim-exchange"; - rev = "05d82b87711c6c8b9b7389bfb91c24bc4f62aa87"; - sha256 = "09fa156y8pxpzdbngifa7yzg1vjg1fjsgp1h9inj818zbig8mamb"; + rev = "13d3895709277d7b35bb4e30cc6ad0409a30ff0a"; + sha256 = "0fgdqbkpk4220q1l00c7wcim24pbpxqj30lcfid2afkf953zhzhp"; }; meta.homepage = "https://github.com/tommcdo/vim-exchange/"; }; @@ -4455,12 +4898,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2020-04-18"; + version = "2020-10-30"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "6c968f26f0bd3dd04b18fad8761e0e9e1220a3da"; - sha256 = "1x74j3gghfmqh1mxswzhb6d0zdll735r5lrgn4g3z580y15h37w5"; + rev = "433ff6468d8ee0be5cbcf5bbd940f9ce2acf0f79"; + sha256 = "1mjiwzl631v4yxgfbvgc66rxbyn3w1shy7836ksd2xnbd0m6kx8h"; }; meta.homepage = "https://github.com/tpope/vim-fireplace/"; }; @@ -4513,14 +4956,26 @@ let meta.homepage = "https://github.com/dcharbon/vim-flatbuffers/"; }; + vim-floaterm = buildVimPluginFrom2Nix { + pname = "vim-floaterm"; + version = "2020-11-18"; + src = fetchFromGitHub { + owner = "voldikss"; + repo = "vim-floaterm"; + rev = "be20785a72925df1ff19a54ce5259d006bc92598"; + sha256 = "1ns9za11w2b5xvcbd8kh4a5pasy3dd4qx7zs4k4f2ay49f98c7v1"; + }; + meta.homepage = "https://github.com/voldikss/vim-floaterm/"; + }; + vim-flutter = buildVimPluginFrom2Nix { pname = "vim-flutter"; - version = "2019-09-29"; + version = "2020-09-14"; src = fetchFromGitHub { owner = "thosakwe"; repo = "vim-flutter"; - rev = "030a4e609f8f38922fa4ec9a27836d9dabaae957"; - sha256 = "0jibmr0v0pqml1cprs3qmkhhmacpb2bwpk8lhaz4dzp8jlga9g00"; + rev = "5a6de53adcc72742138b666b305869999fc8066e"; + sha256 = "1zxa1gz47qpkcrzniax6q1bq9a953rypj1cfbcjb62h5ggx2rr5n"; }; meta.homepage = "https://github.com/thosakwe/vim-flutter/"; }; @@ -4551,48 +5006,48 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2020-05-28"; + version = "2020-10-27"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "5d32f7528988644c3b4a9491a9a4b37ccbd1aa62"; - sha256 = "1h544c7h53fjn9cnvx67p1yays6147v0d445h60n6zwz02zgr4q1"; + rev = "1a77f1c00e12e8460f39098ec3289c5433d32512"; + sha256 = "14w43j0gnh10kyshikz4cl6m3f04a6hpiqasn2n71isvdd1p24kp"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; vim-ghost = buildVimPluginFrom2Nix { pname = "vim-ghost"; - version = "2020-05-20"; + version = "2020-06-19"; src = fetchFromGitHub { owner = "raghur"; repo = "vim-ghost"; - rev = "795b24dd248d507b88e30baadc46080ace07cdea"; - sha256 = "1g0gblkwba7fd4jgkp2y6rsdld7zhhwf7m2fv63j0aj5fhr74q5r"; + rev = "77330855a36350e75393cdeefb743da1040627ce"; + sha256 = "0g3wvp02cv69v7xcsbib35bw9yf36iq6ffny7lmaf0s1pj2kwpzz"; }; meta.homepage = "https://github.com/raghur/vim-ghost/"; }; vim-gist = buildVimPluginFrom2Nix { pname = "vim-gist"; - version = "2020-01-29"; + version = "2020-10-04"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-gist"; - rev = "2158eceb210b0a354bc17aa4144554e5d8bb6c79"; - sha256 = "1dz33c63q7gghz35hyrvbshqw20faccs7bvxlda5w70mkbz9h9c4"; + rev = "4a210316550577c1b6a5cb13b09ce79fba602b9c"; + sha256 = "1c3k2yfaxijg0c8fvh70jqmrc6zyhh57hid7rm77v2kymvimvazg"; }; meta.homepage = "https://github.com/mattn/vim-gist/"; }; vim-gista = buildVimPluginFrom2Nix { pname = "vim-gista"; - version = "2020-01-04"; + version = "2020-09-19"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "vim-gista"; - rev = "af13c0062a46d73384f15abee5a54e164fcaad8e"; - sha256 = "0f3pxahsaj37iln1k3289h7pj7z4fm0z3vfd0szf1spv3hzcjapd"; + rev = "c046de1b9d4cf97ff6f80cf3bdbb75b1094f2aaf"; + sha256 = "0q08hs4y9d4c4zdd0lh4k054133y0455fkn47gi7h16m01g92imc"; }; meta.homepage = "https://github.com/lambdalisue/vim-gista/"; }; @@ -4611,12 +5066,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2020-05-01"; + version = "2020-11-05"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "b356cc9a7da08ebeb919cd04b2831dad71a34d38"; - sha256 = "0y13nbrfank0rqsq5pf1cfcrrfapfvqinhbww97lxhs9clv44kny"; + rev = "987a33355ef424161fdbc4e5d625b5b5aed9704c"; + sha256 = "1qg5ri74wipf0krnwgii2jqdzy36hpwnx8nvgf7vkw8a3l90rswj"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -4647,48 +5102,48 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-05-28"; + version = "2020-11-17"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "9d76bb022e09c1d7c26a71748aa523453da9a764"; - sha256 = "0yi0m25m1vh2h4gfqj04zf6llqg6cinxd96c7q42h1fa9w8kx93s"; + rev = "baaf2d6ebcffd8d5674c9c5518cc0e2b5cdd0db4"; + sha256 = "1kbmncrny39v671czcy7mmr7ighmjhr27zajq01xadr6sdmrrbr0"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; vim-grammarous = buildVimPluginFrom2Nix { pname = "vim-grammarous"; - version = "2019-03-30"; + version = "2020-09-16"; src = fetchFromGitHub { owner = "rhysd"; repo = "vim-grammarous"; - rev = "083cbee6094c9ec347d7c75af421be27d2ec7e70"; - sha256 = "1cxycr2ijzxn9d5xgp9ri4f2i4d87a3100nsc11iwa2bzir4xsiz"; + rev = "a3d67402099ca3554dc06eb7cb514865e39ec0ea"; + sha256 = "0w1qicka7g386qg7iyfg7fh30hmdx5yvmh3qza6ifj5x4w99l0ri"; }; meta.homepage = "https://github.com/rhysd/vim-grammarous/"; }; vim-graphql = buildVimPluginFrom2Nix { pname = "vim-graphql"; - version = "2020-03-30"; + version = "2020-11-12"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-graphql"; - rev = "a3ff39f955e60baeddd8c3c4d1cab291ce37d66e"; - sha256 = "0d98b0zpbyjcafp0q25c3qsx13q74nszxsi5jxxjnpz1wv6s83x1"; + rev = "c2fe34c8c950aceb56b9b4c69e9e95922fa7a78e"; + sha256 = "1q7v0qyd1my9hgxyhz921fr4c6x9ipfgqlm41546iz097vnv715p"; }; meta.homepage = "https://github.com/jparise/vim-graphql/"; }; vim-grepper = buildVimPluginFrom2Nix { pname = "vim-grepper"; - version = "2019-12-09"; + version = "2020-07-12"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-grepper"; - rev = "dde6a660c7dd4e02b331da238ea477770073aca2"; - sha256 = "0c411yg2s6wb8141lqpgasg7iwgvfwy88z6l0c0gccmk8knypxhm"; + rev = "e9004ce564891412cfe433cfbb97295cccd06b39"; + sha256 = "1cs72x3wv4i11x7ch3gna1sxqn5zj3bd34smchfd00g4mf201lhs"; }; meta.homepage = "https://github.com/mhinz/vim-grepper/"; }; @@ -4707,12 +5162,12 @@ let vim-gutentags = buildVimPluginFrom2Nix { pname = "vim-gutentags"; - version = "2020-04-15"; + version = "2020-05-22"; src = fetchFromGitHub { owner = "ludovicchabant"; repo = "vim-gutentags"; - rev = "8e69652c7a7e7aabd96cff21b6ee6b6a295c901c"; - sha256 = "1j9548h2cqvnmqa89hha0s1wfvijdgk6ilakq60awlijdw427f04"; + rev = "50705e8ebb7038b31314f416d1bddd9cb9154049"; + sha256 = "0vm3bp94kbc28azsmm8505hyd9v1a9isrn5dp47njmj8w17l7725"; }; meta.homepage = "https://github.com/ludovicchabant/vim-gutentags/"; }; @@ -4765,6 +5220,19 @@ let meta.homepage = "https://github.com/bitc/vim-hdevtools/"; }; + vim-hexokinase = buildVimPluginFrom2Nix { + pname = "vim-hexokinase"; + version = "2020-11-03"; + src = fetchFromGitHub { + owner = "RRethy"; + repo = "vim-hexokinase"; + rev = "776f1b2a5df00249e89112655dcda6f9a8492bdb"; + sha256 = "1zxl6injhhsp9r7qjrfjq626yy32vza2lcrcgxsv8m7mf2b11zdp"; + fetchSubmodules = true; + }; + meta.homepage = "https://github.com/RRethy/vim-hexokinase/"; + }; + vim-hier = buildVimPluginFrom2Nix { pname = "vim-hier"; version = "2011-08-27"; @@ -4801,6 +5269,18 @@ let meta.homepage = "https://github.com/alx741/vim-hindent/"; }; + vim-hocon = buildVimPluginFrom2Nix { + pname = "vim-hocon"; + version = "2017-09-08"; + src = fetchFromGitHub { + owner = "GEverding"; + repo = "vim-hocon"; + rev = "bb8fb14e00f8fc1eec27dd39dcc605aac43328a3"; + sha256 = "0w6ckm931zpm1k3w02gl58hgfxzfy53sgcc9m8jz3vgi3zz0vki2"; + }; + meta.homepage = "https://github.com/GEverding/vim-hocon/"; + }; + vim-hoogle = buildVimPluginFrom2Nix { pname = "vim-hoogle"; version = "2018-03-04"; @@ -4815,12 +5295,12 @@ let vim-html-template-literals = buildVimPluginFrom2Nix { pname = "vim-html-template-literals"; - version = "2020-05-17"; + version = "2020-09-02"; src = fetchFromGitHub { owner = "jonsmithers"; repo = "vim-html-template-literals"; - rev = "0959db06cd74408935a589fb59ec63af91a1557b"; - sha256 = "0vq0y9adx2023p0nqv020921r474216msrkm0lkb5v776xm4mks2"; + rev = "602dba70bdcfc2e280e0c0503e74a8a92519db49"; + sha256 = "0x0sbmcig3r058sg78bfj8dv0lwlgdcwvw9kxviynyhk2qkg9zl9"; }; meta.homepage = "https://github.com/jonsmithers/vim-html-template-literals/"; }; @@ -4837,14 +5317,26 @@ let meta.homepage = "https://github.com/vim-utils/vim-husk/"; }; + vim-hybrid = buildVimPluginFrom2Nix { + pname = "vim-hybrid"; + version = "2016-01-05"; + src = fetchFromGitHub { + owner = "w0ng"; + repo = "vim-hybrid"; + rev = "cc58baabeabc7b83768e25b852bf89c34756bf90"; + sha256 = "1c3q39121hiw85r9ymiyhz5zsf6bl9pwk4pgj6nh6ckwns4cgcmw"; + }; + meta.homepage = "https://github.com/w0ng/vim-hybrid/"; + }; + vim-hybrid-material = buildVimPluginFrom2Nix { pname = "vim-hybrid-material"; - version = "2018-11-12"; + version = "2020-06-16"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-hybrid-material"; - rev = "f2e92ac7e5c4bb75d72f0abaea939e4364e00e2e"; - sha256 = "01b9n598106qh68ky3fykczq13pldi221r7lrxvg0vnv2zp1z5qd"; + rev = "ad031275c63a05b6acb6014a2401d8719a290bd4"; + sha256 = "0qjg25cfdx9706svw4b527arfdq4ypshay11ak62yswirkvgsc2c"; }; meta.homepage = "https://github.com/kristijanhusak/vim-hybrid-material/"; }; @@ -4863,12 +5355,12 @@ let vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2020-02-21"; + version = "2020-11-16"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "80dafb9b0e7b9f4ce7c843d4104f455c8c5b1f42"; - sha256 = "1yijaj1dqfmw4dsdmgj01sxizyraisxwjqh2hhbq93pdln4lm51f"; + rev = "1d2ec93a4d08106daf0fd85cee459488deb57436"; + sha256 = "16nvxr4xvg4r42j4dc91f9p26msksmg5zha95fwf9g84bnsbz98j"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -4935,12 +5427,12 @@ let vim-isort = buildVimPluginFrom2Nix { pname = "vim-isort"; - version = "2019-06-08"; + version = "2020-08-14"; src = fetchFromGitHub { owner = "fisadev"; repo = "vim-isort"; - rev = "b749d009075a333634dc61a039a2dc0e7f34609c"; - sha256 = "1h8s21kwbjdg632jvd46r2va7il4f1dbgwfw8fkds0n08rbnpdjw"; + rev = "94b1f1202899aa0b6e2cc20e6d1f133eafe24331"; + sha256 = "16r2nsdapf3r0zjqwwbl0k8g2p81h9zs14b91dhskyvs0hvf7cfy"; }; meta.homepage = "https://github.com/fisadev/vim-isort/"; }; @@ -4959,12 +5451,12 @@ let vim-javacomplete2 = buildVimPluginFrom2Nix { pname = "vim-javacomplete2"; - version = "2020-04-23"; + version = "2020-11-16"; src = fetchFromGitHub { owner = "artur-shaik"; repo = "vim-javacomplete2"; - rev = "3ebc63c4b79eec08eb81bdddc8f4c7cfe9cb702f"; - sha256 = "0dwgqnjcnnyvmrplbxkzmfyrm0rgd4z5kgx5989c528gp0dwhaja"; + rev = "1a0cd30af7a4d3a0fd2a053b380c92057431325a"; + sha256 = "1p82shirc11z78w82h13d7ih9l1akas6brbylkp3qwrp0pxkxpnw"; }; meta.homepage = "https://github.com/artur-shaik/vim-javacomplete2/"; }; @@ -4983,12 +5475,12 @@ let vim-javascript-syntax = buildVimPluginFrom2Nix { pname = "vim-javascript-syntax"; - version = "2019-08-21"; + version = "2020-09-27"; src = fetchFromGitHub { owner = "jelera"; repo = "vim-javascript-syntax"; - rev = "e65e4f01ba94761323450208c9bf7141428784db"; - sha256 = "09561jf3cmzpm8jn8k34fd3av6i1mqi6n32bisri96jkabw8dpv7"; + rev = "7b8e2ee761e5d81f2bff57a728909a7968df098b"; + sha256 = "1il68nf8zsz1hn5vqmsyjckmh9s8sw4z6lqqqrxwfjqkqm1ji5xq"; }; meta.homepage = "https://github.com/jelera/vim-javascript-syntax/"; }; @@ -5020,12 +5512,12 @@ let vim-jsdoc = buildVimPluginFrom2Nix { pname = "vim-jsdoc"; - version = "2020-05-16"; + version = "2020-10-10"; src = fetchFromGitHub { owner = "heavenshell"; repo = "vim-jsdoc"; - rev = "5e8eac9d8e38c273cc05c359730a2a74a1578f2b"; - sha256 = "0biyf2vzvnqzzdykq0agf1hzs2ynbbly4fxfwrfablznbdgsm0pz"; + rev = "548767343ff221a4efd0c055a43c022d23fcafc5"; + sha256 = "0scmpjav4zapglybdqilimqb3n805k8gqc46qvkiihprq9j9za4d"; }; meta.homepage = "https://github.com/heavenshell/vim-jsdoc/"; }; @@ -5056,28 +5548,52 @@ let vim-jsx-pretty = buildVimPluginFrom2Nix { pname = "vim-jsx-pretty"; - version = "2020-04-11"; + version = "2020-11-07"; src = fetchFromGitHub { owner = "MaxMEllon"; repo = "vim-jsx-pretty"; - rev = "496c44d89281d1e13c9bb4c75a2e69daba48b47b"; - sha256 = "09xr8pbx27qpffcr0j1857cpyxgkv5xay6mgpzvynpxq21xrmm3q"; + rev = "8059c9269ab62ffc4ccca587e2a2a894806fa5e6"; + sha256 = "04jmmyz79mrq7mpl9kqrc8v28gn50jl93lzkyyhzp7dyhixgbgkm"; }; meta.homepage = "https://github.com/MaxMEllon/vim-jsx-pretty/"; }; + vim-jsx-typescript = buildVimPluginFrom2Nix { + pname = "vim-jsx-typescript"; + version = "2020-07-08"; + src = fetchFromGitHub { + owner = "peitalin"; + repo = "vim-jsx-typescript"; + rev = "07370d48c605ec027543b52762930165b1b27779"; + sha256 = "190nyy7kr6i3xr6nrjlfv643s1c48kxlbh8ynk8p53yf32gcxwz7"; + }; + meta.homepage = "https://github.com/peitalin/vim-jsx-typescript/"; + }; + vim-kitty-navigator = buildVimPluginFrom2Nix { pname = "vim-kitty-navigator"; - version = "2019-11-04"; + version = "2020-09-16"; src = fetchFromGitHub { owner = "knubie"; repo = "vim-kitty-navigator"; - rev = "c32357892f10117291461631d51a6bfd20e72b9a"; - sha256 = "0zqvcnbns0vbxkqr0mpiapql8cvp54nn5a6mwc7l24jr6plhiwmn"; + rev = "ebdf6988bac3d1ebc45b3e51a86f3c065cf60c24"; + sha256 = "0zw24lhgs37lpbbdv2ir9s7g0fd3gjhjx2kvv54cs6mjszg2qmsm"; }; meta.homepage = "https://github.com/knubie/vim-kitty-navigator/"; }; + vim-LanguageTool = buildVimPluginFrom2Nix { + pname = "vim-LanguageTool"; + version = "2020-10-29"; + src = fetchFromGitHub { + owner = "dpelle"; + repo = "vim-LanguageTool"; + rev = "d1f94ef917dddfd8c82589957b7aa6a55f382964"; + sha256 = "1y2y3rkhnj6xhzkm0snfkb08h6jmyjiicmk4j8lw2vhszsfgz6ns"; + }; + meta.homepage = "https://github.com/dpelle/vim-LanguageTool/"; + }; + vim-lastplace = buildVimPluginFrom2Nix { pname = "vim-lastplace"; version = "2020-01-20"; @@ -5092,24 +5608,24 @@ let vim-latex-live-preview = buildVimPluginFrom2Nix { pname = "vim-latex-live-preview"; - version = "2018-09-25"; + version = "2020-09-11"; src = fetchFromGitHub { owner = "xuhdev"; repo = "vim-latex-live-preview"; - rev = "855c30915547c7e9c19b7e6efb528730c071d2e8"; - sha256 = "14fgbq7wyyhhzkd8832g07z97jg1b9awibzf3sn33ih7p5bb3hhp"; + rev = "afdf3f4778119f0bfacb07629d0155d58eb5562a"; + sha256 = "0zihnphc021alqbn1f84n233r6a31n499046yw1yspkcnpz7mcxm"; }; meta.homepage = "https://github.com/xuhdev/vim-latex-live-preview/"; }; vim-lawrencium = buildVimPluginFrom2Nix { pname = "vim-lawrencium"; - version = "2019-04-10"; + version = "2020-10-10"; src = fetchFromGitHub { owner = "ludovicchabant"; repo = "vim-lawrencium"; - rev = "e0c127cb4e4224453cb88faffd4627b7da499bcb"; - sha256 = "1gvvr04x17157iz83rv45nlbj1qaz90j0l96q3fki3h1b0fw0099"; + rev = "4592f24a50386e02870fa8d508cc7ba8454dc102"; + sha256 = "158hslq4chlqr9mhdpcrbxnygjk4j1pc2caqc3zrwqh9qdk8mvha"; }; meta.homepage = "https://github.com/ludovicchabant/vim-lawrencium/"; }; @@ -5140,48 +5656,48 @@ let vim-ledger = buildVimPluginFrom2Nix { pname = "vim-ledger"; - version = "2020-05-25"; + version = "2020-06-08"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "b3e6f3dfaa922cda7771a4db20d3ae0267e08133"; - sha256 = "1jx814sqs0n0mrdi2lrh6xa3d2cmgyc78176gd5c1n8k5q7qkp40"; + rev = "d5f2af4883351aa437ca1c3157d21917dc2bb1b0"; + sha256 = "0bdyhbablays384gssfdfavkxcrwcj89y8vn5kdk11xs0r78b5wr"; }; meta.homepage = "https://github.com/ledger/vim-ledger/"; }; vim-lion = buildVimPluginFrom2Nix { pname = "vim-lion"; - version = "2018-02-05"; + version = "2020-07-18"; src = fetchFromGitHub { owner = "tommcdo"; repo = "vim-lion"; - rev = "75306ac1922952ca1a401aee43ddbb304029926d"; - sha256 = "0kkf91ppn5jhvnpmmjsp6rvf97pqj57jrbn3qmmy925ncfqh90ld"; + rev = "ce46593ecd60e6051fb6e4d3986d2fc9f5a618b1"; + sha256 = "1ci9yi55wcg6388fv3dqhjsyp3nvmf9dz7q2nqsxpyd6yj1szrh7"; }; meta.homepage = "https://github.com/tommcdo/vim-lion/"; }; vim-liquid = buildVimPluginFrom2Nix { pname = "vim-liquid"; - version = "2019-11-13"; + version = "2020-07-01"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-liquid"; - rev = "9ebc192daec70e620c22d574b5a1c1e16f89a48c"; - sha256 = "0cvcjiii5wv55n695284k520rrwi0l4gqpyiqnrpnhmsaqks0n0f"; + rev = "94bd2ea1fd45cf0a21edc3433231e7fcb7791323"; + sha256 = "0r8lisyhbzyw2w9xzbashlhnag98vws78xwmh03dpd8kbpcdiz0w"; }; meta.homepage = "https://github.com/tpope/vim-liquid/"; }; vim-localvimrc = buildVimPluginFrom2Nix { pname = "vim-localvimrc"; - version = "2020-05-20"; + version = "2020-06-30"; src = fetchFromGitHub { owner = "embear"; repo = "vim-localvimrc"; - rev = "7f9d254a0c46889454cc2fd2d5918b413e4cb85a"; - sha256 = "0428hbcj4w9lwmsv9jribkp5fjcbw3sg0gs81jf9n5ax0mxgnbzy"; + rev = "ac6444afb5fd11e3f7750f696a0c6b8b0b6ec116"; + sha256 = "182fvmfnpcqda0cm878lk79iprxsd7nb9r97jmr7lx5agdcvzaqb"; }; meta.homepage = "https://github.com/embear/vim-localvimrc/"; }; @@ -5200,52 +5716,113 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2020-05-29"; + version = "2020-11-14"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "22ad7433b35b194015856d5b41037b752e192764"; - sha256 = "1jww2x2cl9pfgjxwcmcl829fvhxqagn1fcnk4d5hrgg7w6k4c10g"; + rev = "b3d239f71c02b274fcb74ebc57b836810f978da9"; + sha256 = "1vs50npx5bx13wmlbfl7dk48ifvn0kn1l4qal14sdzlv56y6hy57"; }; meta.homepage = "https://github.com/natebosch/vim-lsc/"; }; + vim-lsp = buildVimPluginFrom2Nix { + pname = "vim-lsp"; + version = "2020-11-15"; + src = fetchFromGitHub { + owner = "prabirshrestha"; + repo = "vim-lsp"; + rev = "b8c9256f61fd0e1e1256f7f03eda386ebcfb4c93"; + sha256 = "067pzkxxjna3775za58v7g7lvzw9ykxc9lpkjxh5l35xph0dhw64"; + }; + meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; + }; + + vim-lsp-cxx-highlight = buildVimPluginFrom2Nix { + pname = "vim-lsp-cxx-highlight"; + version = "2020-08-12"; + src = fetchFromGitHub { + owner = "jackguo380"; + repo = "vim-lsp-cxx-highlight"; + rev = "7c47d39d808118f0ef030b15db28ff3995d91cb6"; + sha256 = "0yiyxfhicqhhpp83ilknngr8l9r8z9bchkn3xd2ri8bx0bm7i4l7"; + }; + meta.homepage = "https://github.com/jackguo380/vim-lsp-cxx-highlight/"; + }; + vim-maktaba = buildVimPluginFrom2Nix { pname = "vim-maktaba"; - version = "2020-05-28"; + version = "2020-09-23"; src = fetchFromGitHub { owner = "google"; repo = "vim-maktaba"; - rev = "7260313ed17b2cd11b18d817d4afc8fb8cb6f3f3"; - sha256 = "0nn8c1kyg0s41id46g7s9qklnnxck8xvnvsd3gpak5ii1rxpzrsh"; + rev = "cdf8247c0abd251475be26a044b2e95698df6c09"; + sha256 = "0i4926gw06m8pqqn8a8k2xsxxg0pm3q8q1k3xd0imxi3gkyvz1fq"; }; meta.homepage = "https://github.com/google/vim-maktaba/"; }; vim-manpager = buildVimPluginFrom2Nix { pname = "vim-manpager"; - version = "2017-05-08"; + version = "2020-10-28"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "vim-manpager"; - rev = "25bdd9448651a7669659b1b8d8d7a82acdfbf8af"; - sha256 = "0d7rg4lvyxr4v34bimxpdkynmvs606fqvv0qpi7g139ng9hv6wqm"; + rev = "c23c02dd79b0a5cabe140d1f10f9aa2591cf55ed"; + sha256 = "0g61qbp4vl010isigp6j3jjb3vb2kxalcbb56xzfa6c9k5zap5j9"; }; meta.homepage = "https://github.com/lambdalisue/vim-manpager/"; }; + vim-markbar = buildVimPluginFrom2Nix { + pname = "vim-markbar"; + version = "2020-08-31"; + src = fetchFromGitHub { + owner = "Yilin-Yang"; + repo = "vim-markbar"; + rev = "df13c3abe88c01a716b1099de953dcfa1679e663"; + sha256 = "1y5w182d57z1nl8c7ng25m88by88pnxqdsxmcnnygdfjmvbv8jl9"; + }; + meta.homepage = "https://github.com/Yilin-Yang/vim-markbar/"; + }; + vim-markdown = buildVimPluginFrom2Nix { pname = "vim-markdown"; - version = "2019-07-09"; + version = "2020-07-14"; src = fetchFromGitHub { owner = "plasticboy"; repo = "vim-markdown"; - rev = "da5a7ac96f517e0fd6f886bc3fbe27156ca1f946"; - sha256 = "198bsv88njz6l2pf9yjxb8292aj7x8n2sxi50q3cdsg29a3y2i5c"; + rev = "8e5d86f7b85234d3d1b4207dceebc43a768ed5d4"; + sha256 = "013vh2rnfifm5j56imar03rvchz68ll4lbgy9y8fbw7s9a0k6yaa"; }; meta.homepage = "https://github.com/plasticboy/vim-markdown/"; }; + vim-markdown-composer = buildVimPluginFrom2Nix { + pname = "vim-markdown-composer"; + version = "2020-08-15"; + src = fetchFromGitHub { + owner = "euclio"; + repo = "vim-markdown-composer"; + rev = "c0f98ec3d6c4cb49455c18f2aeb83c0dcbad1bc4"; + sha256 = "10vb3p8gksjy8zfzlkhirdsjwgvh1yv19plxwr404x87j393rs7n"; + fetchSubmodules = true; + }; + meta.homepage = "https://github.com/euclio/vim-markdown-composer/"; + }; + + vim-matchup = buildVimPluginFrom2Nix { + pname = "vim-matchup"; + version = "2020-09-07"; + src = fetchFromGitHub { + owner = "andymass"; + repo = "vim-matchup"; + rev = "9e0b6f37113e21fecd42ef6b04762de4aafe2cf3"; + sha256 = "0cy7k96458qk5fn7fbvki42b2pgrrk803shixs4ww43iipya6m5b"; + }; + meta.homepage = "https://github.com/andymass/vim-matchup/"; + }; + vim-mergetool = buildVimPluginFrom2Nix { pname = "vim-mergetool"; version = "2019-06-22"; @@ -5258,6 +5835,18 @@ let meta.homepage = "https://github.com/samoshkin/vim-mergetool/"; }; + vim-merginal = buildVimPluginFrom2Nix { + pname = "vim-merginal"; + version = "2020-01-29"; + src = fetchFromGitHub { + owner = "idanarye"; + repo = "vim-merginal"; + rev = "02ac69b0468b7aec437df48df07f939558e85c9a"; + sha256 = "0m5lym56xzp1gnwb79vjmigfi6ar0iqbzaydv2r8c47jj7xyxiz6"; + }; + meta.homepage = "https://github.com/idanarye/vim-merginal/"; + }; + vim-metamath = buildVimPluginFrom2Nix { pname = "vim-metamath"; version = "2017-02-10"; @@ -5282,54 +5871,90 @@ let meta.homepage = "https://github.com/xolox/vim-misc/"; }; + vim-monokai = buildVimPluginFrom2Nix { + pname = "vim-monokai"; + version = "2020-10-23"; + src = fetchFromGitHub { + owner = "crusoexia"; + repo = "vim-monokai"; + rev = "9f8d7de3848e32c592b168f898f82ec4356128af"; + sha256 = "1xrwx75dq46snjsrrv0yh4p409w1blmqpw4i5vlxwi5vn29qpnvs"; + }; + meta.homepage = "https://github.com/crusoexia/vim-monokai/"; + }; + vim-monokai-pro = buildVimPluginFrom2Nix { pname = "vim-monokai-pro"; - version = "2020-05-07"; + version = "2020-10-02"; src = fetchFromGitHub { owner = "phanviet"; repo = "vim-monokai-pro"; - rev = "baf3046bb44cdffe3bf9a571b3ec24039e2c9f88"; - sha256 = "0rszkf070d8w94dhgjpsl1kyn19j7bqyz434qshz4j88jk7hap6h"; + rev = "05e534f9fea9a8e4cbf69a1523c785845deabe4e"; + sha256 = "0hf3iy2ydr6jpraf5zyqg2hl7ma5hn301jyxf6m9ffdsz7722jwm"; }; meta.homepage = "https://github.com/phanviet/vim-monokai-pro/"; }; vim-move = buildVimPluginFrom2Nix { pname = "vim-move"; - version = "2019-11-23"; + version = "2020-07-29"; src = fetchFromGitHub { owner = "matze"; repo = "vim-move"; - rev = "58049562efb0e6e077416d897b760c4dc9bb25c4"; - sha256 = "18pnk6ri73a6dq86zh510wy1s0z1dwnsyay7lxrgirjgh3s9nhhq"; + rev = "1460aa915c521864c926aa51fe20bf6bb8eaa065"; + sha256 = "0sbdd1z8nlwpac1n4234pnczavxr1kazvj86xp4a8aa7vggdm9xa"; }; meta.homepage = "https://github.com/matze/vim-move/"; }; vim-mucomplete = buildVimPluginFrom2Nix { pname = "vim-mucomplete"; - version = "2020-05-21"; + version = "2020-11-15"; src = fetchFromGitHub { owner = "lifepillar"; repo = "vim-mucomplete"; - rev = "56ded939230b13ba5b93a38e79e2b61675a8f6ef"; - sha256 = "1z6h8qwr12isr0xhpdqjf9imprz84gijaqgr761vgh7l2q1piqqv"; + rev = "80b13cbc30d258a4474b053fcdc6baaf199320a1"; + sha256 = "054g80n09mmxxlh8xaic29bn8bgn3clvv732rymljdyvbj1mlhwd"; }; meta.homepage = "https://github.com/lifepillar/vim-mucomplete/"; }; vim-multiple-cursors = buildVimPluginFrom2Nix { pname = "vim-multiple-cursors"; - version = "2020-05-19"; + version = "2020-07-30"; src = fetchFromGitHub { owner = "terryma"; repo = "vim-multiple-cursors"; - rev = "ec93676024590327263e8138443614ec4da8c9bc"; - sha256 = "09rcs435nh74p5dwdw8k1mv1w2lni4y098dg99j6dh6859lc3hw8"; + rev = "6456718e1d30b42c04b920c5413ca44f68f08759"; + sha256 = "0dmap8hjk6a0127fkab1pp5cllmijhqx80ijasngg11kxl0wzl32"; }; meta.homepage = "https://github.com/terryma/vim-multiple-cursors/"; }; + vim-mundo = buildVimPluginFrom2Nix { + pname = "vim-mundo"; + version = "2020-11-08"; + src = fetchFromGitHub { + owner = "simnalamburt"; + repo = "vim-mundo"; + rev = "33a91cc55ebc7a55b8846c46f0ab50ec0d81613f"; + sha256 = "18qbmnwlwf9hmak73zam44daf6c50hi72b9g8ra7v1l5psgi39z7"; + }; + meta.homepage = "https://github.com/simnalamburt/vim-mundo/"; + }; + + vim-nerdtree-syntax-highlight = buildVimPluginFrom2Nix { + pname = "vim-nerdtree-syntax-highlight"; + version = "2020-07-19"; + src = fetchFromGitHub { + owner = "tiagofumo"; + repo = "vim-nerdtree-syntax-highlight"; + rev = "1acc12aa7f773ede38538293332905f1ba3fea6a"; + sha256 = "0zm023mhi1si9g5r46md1v4rlls6z2m6kyn1jcfxjqyrgba67899"; + }; + meta.homepage = "https://github.com/tiagofumo/vim-nerdtree-syntax-highlight/"; + }; + vim-nerdtree-tabs = buildVimPluginFrom2Nix { pname = "vim-nerdtree-tabs"; version = "2018-12-21"; @@ -5344,12 +5969,12 @@ let vim-nftables = buildVimPluginFrom2Nix { pname = "vim-nftables"; - version = "2020-02-21"; + version = "2020-06-29"; src = fetchFromGitHub { owner = "nfnty"; repo = "vim-nftables"; - rev = "01c7b97eff12fd4b624e6efa2c0468163db61ebc"; - sha256 = "1n3mpaa60k4w0sqpkgw19aksa1sbcqz7vl8fp6bj6i63bhiprsqf"; + rev = "26f8a506c6f3e41f1e4a8d6aa94c9a79a666bbff"; + sha256 = "1z5ffgxdq8niggm18qikrh5hl8zs05gdij4z6dfnzy00xvancc40"; }; meta.homepage = "https://github.com/nfnty/vim-nftables/"; }; @@ -5380,16 +6005,28 @@ let vim-nix = buildVimPluginFrom2Nix { pname = "vim-nix"; - version = "2019-06-03"; + version = "2020-11-16"; src = fetchFromGitHub { owner = "LnL7"; repo = "vim-nix"; - rev = "a3eed01f4de995a51dfdd06287e44fcb231f6adf"; - sha256 = "0pwdfwws1dj3705m00ghw3dvym5zbm00bfsj023gmbp6vr8wn6yi"; + rev = "7542a2bf66d72cb86fc80529867accbc787f744b"; + sha256 = "1kgziwckdjg3sb1z4anwsn1c72hny60vhimxpb6424bylk1qy22j"; }; meta.homepage = "https://github.com/LnL7/vim-nix/"; }; + vim-numbertoggle = buildVimPluginFrom2Nix { + pname = "vim-numbertoggle"; + version = "2017-10-26"; + src = fetchFromGitHub { + owner = "jeffkreeftmeijer"; + repo = "vim-numbertoggle"; + rev = "cfaecb9e22b45373bb4940010ce63a89073f6d8b"; + sha256 = "1rrmvv7ali50rpbih1s0fj00a3hjspwinx2y6nhwac7bjsnqqdwi"; + }; + meta.homepage = "https://github.com/jeffkreeftmeijer/vim-numbertoggle/"; + }; + vim-obsession = buildVimPluginFrom2Nix { pname = "vim-obsession"; version = "2020-01-19"; @@ -5402,14 +6039,26 @@ let meta.homepage = "https://github.com/tpope/vim-obsession/"; }; + vim-ocaml = buildVimPluginFrom2Nix { + pname = "vim-ocaml"; + version = "2020-10-11"; + src = fetchFromGitHub { + owner = "ocaml"; + repo = "vim-ocaml"; + rev = "023a2a464e7a096779d3e541ee7d1dbe61148f6a"; + sha256 = "0wj945n3da9bzcj5n8002m4vrzv9cgk6sqcc7nyc1x34y9452z94"; + }; + meta.homepage = "https://github.com/ocaml/vim-ocaml/"; + }; + vim-one = buildVimPluginFrom2Nix { pname = "vim-one"; - version = "2019-04-09"; + version = "2020-08-09"; src = fetchFromGitHub { owner = "rakr"; repo = "vim-one"; - rev = "6695e135415c53a8fbe96672e382200aa1ffb4b4"; - sha256 = "0951r9kw23zlwd7fda6ib2d9k0akpfd2hvh82pasgw3ks9v1n2vf"; + rev = "f8bcef1968f01842d92abbcb098ec28ad3931ea5"; + sha256 = "12czxjh68hdnca4wdk9ypd5c56v1njv6wc2bcxqaj1ff09pgllmy"; }; meta.homepage = "https://github.com/rakr/vim-one/"; }; @@ -5452,16 +6101,52 @@ let vim-orgmode = buildVimPluginFrom2Nix { pname = "vim-orgmode"; - version = "2020-05-09"; + version = "2020-10-15"; src = fetchFromGitHub { owner = "jceb"; repo = "vim-orgmode"; - rev = "ecdc5b279d7b4e0ae4ebfb9e0f139e3ca6698033"; - sha256 = "00yihsp5fmpw1ch013brrjkxb6h4slkxms1n154glz8pm95bqsm0"; + rev = "b7bce17005cf114b0961d0b5576bf584a2574774"; + sha256 = "1kpg858qazv465k2w8343hkiz9lzclkcx91vcysip77diandn523"; }; meta.homepage = "https://github.com/jceb/vim-orgmode/"; }; + vim-osc52 = buildVimPluginFrom2Nix { + pname = "vim-osc52"; + version = "2020-09-19"; + src = fetchFromGitHub { + owner = "fcpg"; + repo = "vim-osc52"; + rev = "551f20e62e68684a5b745ae08b0c4236d86e4c2b"; + sha256 = "0yxjs32ab27l3kmh5lpinj15m11winqsnmykjq7lizs15v7gd2s9"; + }; + meta.homepage = "https://github.com/fcpg/vim-osc52/"; + }; + + vim-over = buildVimPluginFrom2Nix { + pname = "vim-over"; + version = "2020-01-26"; + src = fetchFromGitHub { + owner = "osyo-manga"; + repo = "vim-over"; + rev = "878f83bdac0cda308f599d319f45c7877d5274a9"; + sha256 = "00k29pcn69d9036jhjpd1xqxh59qwl30l37lsfijlv18ks0wwiqn"; + }; + meta.homepage = "https://github.com/osyo-manga/vim-over/"; + }; + + vim-packer = buildVimPluginFrom2Nix { + pname = "vim-packer"; + version = "2018-11-11"; + src = fetchFromGitHub { + owner = "hashivim"; + repo = "vim-packer"; + rev = "c2561f41e46df8a78a6b51226f60607582052134"; + sha256 = "070ncbmwh8wxxfzf7phx0hb0dk9krlvsj5mvrn7kr5y3mngdg9v4"; + }; + meta.homepage = "https://github.com/hashivim/vim-packer/"; + }; + vim-pager = buildVimPluginFrom2Nix { pname = "vim-pager"; version = "2015-08-26"; @@ -5476,12 +6161,12 @@ let vim-pandoc = buildVimPluginFrom2Nix { pname = "vim-pandoc"; - version = "2020-05-15"; + version = "2020-11-07"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "e49f9e7e3fc041dab0e9a1de4b564b3ddd8f77aa"; - sha256 = "0i1zcnsc962bzm3q6kw8bldd9xh6vb7kw0j72c4dzwdw4ayx0wf1"; + rev = "0aeed75603a55887c2b492d1fe19ac8065dae671"; + sha256 = "13xjpkq9lbb04igwif23zmb3395awk48kdyfshsga2gbv5h1i9fn"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/"; }; @@ -5500,12 +6185,12 @@ let vim-pandoc-syntax = buildVimPluginFrom2Nix { pname = "vim-pandoc-syntax"; - version = "2020-01-31"; + version = "2020-10-24"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc-syntax"; - rev = "0d1129e5cf1b0e3a90e923c3b5f40133bf153f7c"; - sha256 = "162l2p8md8lfyfjxzlmlz5ky5kvvr6wjmdk8r8lk6ygpkl2b51f7"; + rev = "2521e2e9b99a3550e1a20f24e09fa46679cbbbc7"; + sha256 = "02023bnvc9m98m45krld1b7gy13z335jv88fx4ybz019wc0mv35g"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-syntax/"; }; @@ -5560,24 +6245,24 @@ let vim-pencil = buildVimPluginFrom2Nix { pname = "vim-pencil"; - version = "2019-12-13"; + version = "2020-07-29"; src = fetchFromGitHub { owner = "reedes"; repo = "vim-pencil"; - rev = "09458527601fdb2fbd174317bdddfb34e4c64e79"; - sha256 = "09b30cxlwbr9l07ya05is9q2y9vzbzhcc656nvjjzf968l496xr2"; + rev = "dad5a3626ab68039f2676c46e7a1635e0669cc63"; + sha256 = "1s1vxzqc5gvch2rfibn7ksmxj81gscfzg0bpvnq34jp430adzdc7"; }; meta.homepage = "https://github.com/reedes/vim-pencil/"; }; vim-phabricator = buildVimPluginFrom2Nix { pname = "vim-phabricator"; - version = "2020-01-23"; + version = "2020-09-16"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-phabricator"; - rev = "065c7e3f2d92a6792b50f087393b2c9a10a1e825"; - sha256 = "0yhf347fhrs0aqsq1swqihyav32442lv2chzjr3mzqcym8zbzsh6"; + rev = "d5c0571f44f2c44ba32df2d12e52b4dfcd4921ed"; + sha256 = "003zi8dvyyhvlb30zz8ah7iai8pmwmsk2jwa38386ff0jfm6dkpq"; }; meta.homepage = "https://github.com/jparise/vim-phabricator/"; }; @@ -5596,12 +6281,12 @@ let vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2020-05-06"; + version = "2020-11-03"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "71c41fccf5ca42081d4d49aa1ea2f71c694bc4cf"; - sha256 = "1cp8qw1fblp26v9hjvd00bl2kcjqi44xw30aclxcqis6pfj1yvv0"; + rev = "2f4e28161e114cc4b34a9b8ff0f51f4906f37b0b"; + sha256 = "1wfcyrjqqngnf4l9afc0342avkys8ipfrna7zlgiypwji926y2k7"; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; }; @@ -5620,16 +6305,28 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2020-05-28"; + version = "2020-11-18"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "f0f49cf0fa8bbcb7f84e3ffe699a934142498b14"; - sha256 = "1fpiwjn16lvzcghsjbcak1hf0fqgknfyimbbw3pw4dcnvzv5w03a"; + rev = "c228e993ad6a8b79db5a5a77aecfdbd8e92ea31f"; + sha256 = "1cvdrisarw4yc4lwm80q99k7kb72zq9bd6w98786djas6asdfnll"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; + vim-poweryank = buildVimPluginFrom2Nix { + pname = "vim-poweryank"; + version = "2017-08-13"; + src = fetchFromGitHub { + owner = "haya14busa"; + repo = "vim-poweryank"; + rev = "48dff95dbd64423c96fdae5c18eaddb5b5fa3064"; + sha256 = "016w6nn2qhra9v55sn6g6qf1pj8f072f22r97nzxy4958k7f114a"; + }; + meta.homepage = "https://github.com/haya14busa/vim-poweryank/"; + }; + vim-prettyprint = buildVimPluginFrom2Nix { pname = "vim-prettyprint"; version = "2016-07-16"; @@ -5644,24 +6341,24 @@ let vim-projectionist = buildVimPluginFrom2Nix { pname = "vim-projectionist"; - version = "2020-05-05"; + version = "2020-10-31"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-projectionist"; - rev = "1d95458273a8ecdb678e65db918c045f9bb7e220"; - sha256 = "1h5gb29rs64cfr55g12s1f0w0cqzqs2nhfw8qfbfch5jbh21p10p"; + rev = "0c6967d3a8c3bd3d3b42013531c3f12c843aff80"; + sha256 = "1s6yxnlwxlblj5m9gxlc8699g2a1d7cbjacp4fk4fa9mrkga7bv8"; }; meta.homepage = "https://github.com/tpope/vim-projectionist/"; }; vim-prosession = buildVimPluginFrom2Nix { pname = "vim-prosession"; - version = "2020-04-20"; + version = "2020-11-01"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-prosession"; - rev = "95f78bd0f719fee96569f30fd5f4199c4461efb7"; - sha256 = "1ix04f3nxxmxd36kzalx0hrbks30v44ydz15apvl1h8l8663hda2"; + rev = "ad008dbdcd04ee1758f4475263c2a37789d32702"; + sha256 = "14fcvghqbv7mx2yi112vc9cq69mw98fgv0vc8x256v639bj1y5g9"; }; meta.homepage = "https://github.com/dhruvasagar/vim-prosession/"; }; @@ -5680,12 +6377,12 @@ let vim-ps1 = buildVimPluginFrom2Nix { pname = "vim-ps1"; - version = "2020-03-30"; + version = "2020-07-31"; src = fetchFromGitHub { owner = "PProvost"; repo = "vim-ps1"; - rev = "9fdf92846fbeb8445e535cf0c5bdb4b1dce4a506"; - sha256 = "0w98zcjvb64fhd6ahy3cqrs4y7zacak9nzpkkhr03l6zzbqb5kz4"; + rev = "21d8d9a9db864f230a2d12d5076351daf20d7a44"; + sha256 = "0s6mi1mzlk40sfdqghdsv709fs89hf9d6iqaw3arzs9lmin2i4ka"; }; meta.homepage = "https://github.com/PProvost/vim-ps1/"; }; @@ -5726,42 +6423,90 @@ let meta.homepage = "https://github.com/Vimjas/vim-python-pep8-indent/"; }; + vim-qf = buildVimPluginFrom2Nix { + pname = "vim-qf"; + version = "2020-11-18"; + src = fetchFromGitHub { + owner = "romainl"; + repo = "vim-qf"; + rev = "23c9d67cdd0739c9d74ac9e4a494b7cb7351170c"; + sha256 = "15kj1wvd3wlmn982l2v8sv2lc3q39bz3jw94jvmkh7nz51xvmfqc"; + }; + meta.homepage = "https://github.com/romainl/vim-qf/"; + }; + vim-qml = buildVimPluginFrom2Nix { pname = "vim-qml"; - version = "2019-12-20"; + version = "2020-11-03"; src = fetchFromGitHub { owner = "peterhoeg"; repo = "vim-qml"; - rev = "b04de1dadb7dfe372d22f7529a001af1b5e19f4f"; - sha256 = "1pxl70l0g4i8cbnpjhb9pyjhz982flkrng07y9xwzbdl2jx42i8s"; + rev = "50d2e737094c146195171b7d52e522384f15afe8"; + sha256 = "1iz2l51c15ijkpzyk5qwmd8y0yy2z8f1jwxcwk16h63g4nmfm1zr"; }; meta.homepage = "https://github.com/peterhoeg/vim-qml/"; }; vim-quickrun = buildVimPluginFrom2Nix { pname = "vim-quickrun"; - version = "2020-05-16"; + version = "2020-08-25"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-quickrun"; - rev = "3041ad7f0b3f9122d4f00bda2f3bb554bf89105c"; - sha256 = "1ncfw4inb6rdlrayvijy7769wyppiihmazmfcjdx5g42mycfxg0y"; + rev = "c688f336a4aeb002319994f4fb4a8873f204f0ab"; + sha256 = "1wzcvshwn4gvjbcmni1r473001m5ipamggkcpwsa7xr74sj4rn73"; }; meta.homepage = "https://github.com/thinca/vim-quickrun/"; }; vim-racer = buildVimPluginFrom2Nix { pname = "vim-racer"; - version = "2020-03-06"; + version = "2020-10-21"; src = fetchFromGitHub { owner = "racer-rust"; repo = "vim-racer"; - rev = "950b78f36e568134f5dcabc9a146c61e0084d220"; - sha256 = "0k62yybilh2052w6zfscw7daz7y1qnqv1311zngjim5z8xmp7j1l"; + rev = "4c8b8843de2bbf4a6b44a570f284534d5e75a989"; + sha256 = "1rkp75q0m8w9br35nngdbdlvfpha4x4yilaff40d62mcmb8xmhvj"; }; meta.homepage = "https://github.com/racer-rust/vim-racer/"; }; + vim-racket = buildVimPluginFrom2Nix { + pname = "vim-racket"; + version = "2020-07-24"; + src = fetchFromGitHub { + owner = "wlangstroth"; + repo = "vim-racket"; + rev = "bca2643c3d8bd0fcd46ab73bee69023a5da1964b"; + sha256 = "059a79d66yxhhwq127sjl84ky1153im7mm5ixjcsgg9glgvd39jy"; + }; + meta.homepage = "https://github.com/wlangstroth/vim-racket/"; + }; + + vim-ragtag = buildVimPluginFrom2Nix { + pname = "vim-ragtag"; + version = "2020-01-26"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-ragtag"; + rev = "6f1af76cd669c4fb07f0c4e20fdee3077620e3d8"; + sha256 = "1q5klbnwsg26zxhs3knhamk3srg7dmq46n83sa5rw2kmikb2idg2"; + }; + meta.homepage = "https://github.com/tpope/vim-ragtag/"; + }; + + vim-rails = buildVimPluginFrom2Nix { + pname = "vim-rails"; + version = "2020-09-29"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-rails"; + rev = "2c42236cf38c0842dd490095ffd6b1540cad2e29"; + sha256 = "0nhf4qd7dchrzjv2ijcddav72qb121c9jkkk06agsv23l9rb31pv"; + }; + meta.homepage = "https://github.com/tpope/vim-rails/"; + }; + vim-repeat = buildVimPluginFrom2Nix { pname = "vim-repeat"; version = "2019-11-13"; @@ -5788,12 +6533,12 @@ let vim-rooter = buildVimPluginFrom2Nix { pname = "vim-rooter"; - version = "2020-04-17"; + version = "2020-09-18"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-rooter"; - rev = "d64f3e04df9914e784508019a1a1f291cbb40bd4"; - sha256 = "1vwydkjm5h12kcnqmg2cv1cqf9hmhmyy2lx5lj3g0g6ra27yfjnw"; + rev = "45ea40da3f223fff83fce0a643875e560ed20aae"; + sha256 = "1bm8hpnm02pbivcvjn20qr6hk3yyb3flfkv7pk66sffhiyj44rh2"; }; meta.homepage = "https://github.com/airblade/vim-rooter/"; }; @@ -5812,36 +6557,36 @@ let vim-ruby = buildVimPluginFrom2Nix { pname = "vim-ruby"; - version = "2020-04-19"; + version = "2020-08-28"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "fd49b25e08618b58db678c3f8ce6e443b1ad04e7"; - sha256 = "086pzicqal2cmvbrzy09d93c7cz5scgjcqc9xn4cw19dn55irllp"; + rev = "e367f7b33fe9159c943963f3f839e4d08b74090e"; + sha256 = "1pngmr6ww4fmn71rshi1npyswp48dq3p7m02s6s703bg83smvmc8"; }; meta.homepage = "https://github.com/vim-ruby/vim-ruby/"; }; vim-salve = buildVimPluginFrom2Nix { pname = "vim-salve"; - version = "2019-11-13"; + version = "2020-09-22"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-salve"; - rev = "876104d364420a7a11a2d97729dd4ab0a2f8a72e"; - sha256 = "1hj0qg182jv3cwg85rg4z0f8f8hr409is71z7sxhnhjq9fn1h6xj"; + rev = "5958a99c4ac783cec668380917ac1f62b27466fe"; + sha256 = "1vs2rfhcxm9v4ndnsx85b1i29h67qv748k3nvdxc145v1hjcnapm"; }; meta.homepage = "https://github.com/tpope/vim-salve/"; }; vim-sandwich = buildVimPluginFrom2Nix { pname = "vim-sandwich"; - version = "2020-02-13"; + version = "2020-07-27"; src = fetchFromGitHub { owner = "machakann"; repo = "vim-sandwich"; - rev = "02e3b6d1ff9ce346c115166855137b318b63c536"; - sha256 = "1jd5i0ykvwf5jnm3g3rm2r0zn64xqk38p2xl55la9a1a99j9mfxh"; + rev = "f0bb324395bf6e00ec17fc7af60d2ccb8d494595"; + sha256 = "19fqpccvawh2wjkzgp64jijq4nnhirmgvrrycxzcx7lj612mbpmc"; }; meta.homepage = "https://github.com/machakann/vim-sandwich/"; }; @@ -5944,12 +6689,12 @@ let vim-signify = buildVimPluginFrom2Nix { pname = "vim-signify"; - version = "2020-05-18"; + version = "2020-08-13"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-signify"; - rev = "dfa1e55fe1c7f309f8cce4db0243f14f6edb2d4c"; - sha256 = "0p1hnjwhqmrczwns7h8gsmdl95yxcb6sqw59xshz7ji0b80h45mf"; + rev = "98c693f7a1a91b73d9232d868765b4d20af892fe"; + sha256 = "05ppj7sqp8i7qhaf6vz427nnwsnkgf9nlq3lhyhbl14cjkrhqny9"; }; meta.homepage = "https://github.com/mhinz/vim-signify/"; }; @@ -5980,12 +6725,12 @@ let vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2020-04-12"; + version = "2020-11-18"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "a81139239d6447b1c021e4873e6a14b47f32b65a"; - sha256 = "0wavkm9k2vm23nm5bmc3lpm6cac7mihzjcyk4r77qgdgmnnxkm49"; + rev = "2a75f2424e259d3b9a287f8bb9bd748255c94b44"; + sha256 = "1jswyib5czgi8finv1p30hsnfk259bnkdkj0ly653vbblwp00pyi"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; @@ -6002,6 +6747,18 @@ let meta.homepage = "https://github.com/t9md/vim-smalls/"; }; + vim-smoothie = buildVimPluginFrom2Nix { + pname = "vim-smoothie"; + version = "2019-12-02"; + src = fetchFromGitHub { + owner = "psliwka"; + repo = "vim-smoothie"; + rev = "d3de4fbd7a9331b3eb05fa632611ebd34882cc83"; + sha256 = "1bsqnz02jaydr92mmcrdlva4zxs28zgxwgznr2bwk4wnn26i54p6"; + }; + meta.homepage = "https://github.com/psliwka/vim-smoothie/"; + }; + vim-smt2 = buildVimPluginFrom2Nix { pname = "vim-smt2"; version = "2018-05-20"; @@ -6016,36 +6773,36 @@ let vim-sneak = buildVimPluginFrom2Nix { pname = "vim-sneak"; - version = "2020-02-29"; + version = "2020-09-01"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-sneak"; - rev = "98a5c946d6dc76528b9d9b044059b5ef1fab5a48"; - sha256 = "0xcxr658i5vzdkxfssd7zx6n3ar9b6dg4b2ddaswgnwq75xphrh9"; + rev = "65e5e4668371152c6ef7a6269c6a6b960cef21b4"; + sha256 = "0bfibshqqa17n9vbdd2g8kalnc78v1ag3hzws9pdacrcsxhsh0ry"; }; meta.homepage = "https://github.com/justinmk/vim-sneak/"; }; vim-snipmate = buildVimPluginFrom2Nix { pname = "vim-snipmate"; - version = "2020-03-27"; + version = "2020-10-02"; src = fetchFromGitHub { owner = "garbas"; repo = "vim-snipmate"; - rev = "b80367fefc2188c9d6c4a9eb1830360b09e13476"; - sha256 = "0qq81hcavmaq76r38qfy1cxlmhj0aswbd41k2k9fyzilzq4r0bg8"; + rev = "68eebf9dabe5c1d1964e78dda188765f224bab34"; + sha256 = "1mxa373ry17zwszd089k99lbgr5pg46x5dlahpk0l68ksxpkbxir"; }; meta.homepage = "https://github.com/garbas/vim-snipmate/"; }; vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2020-05-16"; + version = "2020-11-15"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "087d3e7c72912baeb6b1d7ba626e61d50092c848"; - sha256 = "1vir3sl2px0m4pr2z013mfzwagrh9wqkj3wagysjvm779l462407"; + rev = "e438b06d59115d4b491f7aa73d3140af44f86175"; + sha256 = "0z9c6rgix722d023jb53ynbns9zvibwaglzcb2q2h4jp1xbwq4qq"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -6098,14 +6855,26 @@ let meta.homepage = "https://github.com/tpope/vim-speeddating/"; }; + vim-spirv = buildVimPluginFrom2Nix { + pname = "vim-spirv"; + version = "2020-06-12"; + src = fetchFromGitHub { + owner = "kbenzie"; + repo = "vim-spirv"; + rev = "9b005a0569fa5e18f71fcccbacda227c1cef7eaa"; + sha256 = "0qby4bfjav2xijh732l7d2jli0adnv6cc8kcalbh5315vi4mpnfk"; + }; + meta.homepage = "https://github.com/kbenzie/vim-spirv/"; + }; + vim-startify = buildVimPluginFrom2Nix { pname = "vim-startify"; - version = "2020-04-18"; + version = "2020-10-07"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-startify"; - rev = "593388d3dbe7bfdcc06a714550d3253442b2fc65"; - sha256 = "1k0sgx8r3gi3k4ira1ilvc1jmj0k5apiv7x71dqnh41gfrz1i12h"; + rev = "f2fc11844b234479d37bef37faa7ceb2aade788b"; + sha256 = "18n16hpkqadq18gpgppbr4s516jpc8qwd357vb2c7069q79kfx39"; }; meta.homepage = "https://github.com/mhinz/vim-startify/"; }; @@ -6160,36 +6929,36 @@ let vim-swap = buildVimPluginFrom2Nix { pname = "vim-swap"; - version = "2019-06-07"; + version = "2020-11-16"; src = fetchFromGitHub { owner = "machakann"; repo = "vim-swap"; - rev = "e52ff679c88f4aa7a7afe77fb42af78c93ed33c8"; - sha256 = "0rqvxqqk961syawmyc2qdfb4w9ilb1r3mxxij2ja1jbhl1f3w4vq"; + rev = "699b7492c965a3dd96128d16b6b68a15091a931a"; + sha256 = "0vw4d1375xhp1fbv88fp96ry0hzyqkbfn4dccrlfl4sanvkh0r6y"; }; meta.homepage = "https://github.com/machakann/vim-swap/"; }; vim-SyntaxRange = buildVimPluginFrom2Nix { pname = "vim-SyntaxRange"; - version = "2020-05-09"; + version = "2020-08-18"; src = fetchFromGitHub { owner = "inkarkat"; repo = "vim-SyntaxRange"; - rev = "35d116cd1c70d2066b332a76ddbf354786cbb996"; - sha256 = "0mxih2ixaqnzh915w8zycdjxf07ax648dw5nvglcp7ym4r8fzg0q"; + rev = "602316468bc044e047db88f50157b61fa00b65cb"; + sha256 = "0zrrvd9xrivx61fiz799mdbwdzl7damdgm6i9h0sl1v95hclhi3i"; }; meta.homepage = "https://github.com/inkarkat/vim-SyntaxRange/"; }; vim-table-mode = buildVimPluginFrom2Nix { pname = "vim-table-mode"; - version = "2020-05-06"; + version = "2020-10-13"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-table-mode"; - rev = "640400908075c50704e127448175d3ede6bba2e9"; - sha256 = "0gbj324wwgai1kprn78srq3cvldpi6hx9gsr5kk2sn2yxq32xp3y"; + rev = "659ba4f39caa38e6913f88c9f4369c00e852160f"; + sha256 = "0fqj9l7i052mvw0wlyg30bmihzi937svk3ggsp0rc9wlr30frg2p"; }; meta.homepage = "https://github.com/dhruvasagar/vim-table-mode/"; }; @@ -6220,24 +6989,37 @@ let vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2020-03-03"; + version = "2020-11-14"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "89c47c6c68f6260ba34ee0733437d863046fbe95"; - sha256 = "1gkr3akvx44802i8cv4zw8j3bk5qk0h0rgz5k9jgkfch2yc76gzg"; + rev = "a6be9fea8757f6672397cadfb2784230914130c6"; + sha256 = "1c8k170hly5y82f9a1ddqm70afab2hb6hcj45s5db1nkh486p0a0"; }; meta.homepage = "https://github.com/hashivim/vim-terraform/"; }; + vim-terraform-completion = buildVimPluginFrom2Nix { + pname = "vim-terraform-completion"; + version = "2019-07-28"; + src = fetchFromGitHub { + owner = "juliosueiras"; + repo = "vim-terraform-completion"; + rev = "1c8792d1e85154aa6fc05eb746711bf2df2274d9"; + sha256 = "0j87vhxkrv8sdrlv9w5p2zkiv9ssb3rckbffjcfhn9365d41bhgr"; + fetchSubmodules = true; + }; + meta.homepage = "https://github.com/juliosueiras/vim-terraform-completion/"; + }; + vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2020-05-26"; + version = "2020-11-17"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "b882783760b954144dda5be7ad6cd4bdefd013fb"; - sha256 = "0s0dlgjkkxajkfnpihc09py0qbbamibhalsv2vdvwcqva02xrylx"; + rev = "e11fa044b312f87843313edbdfa0d7bb8db0d040"; + sha256 = "0qmpddmnj7g6l82xnbj9qjmrf885qs7flpni3cqkm0g4dzapkscf"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -6316,48 +7098,60 @@ let vim-themis = buildVimPluginFrom2Nix { pname = "vim-themis"; - version = "2020-03-08"; + version = "2020-11-18"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-themis"; - rev = "2d10aee9c9982f4f5974e88351934759c69640e7"; - sha256 = "06ab0kjamzpyql71qmc8qhvb72rx07x2g598aidk8nqkk36x87ai"; + rev = "5d65b4e4fba91b499dc3c7db47d2ca0491ae6084"; + sha256 = "0nv2a1wfykncyfr7k9whxybhi66v7y6f348jz4rjyvcl0996hzbb"; }; meta.homepage = "https://github.com/thinca/vim-themis/"; }; vim-tmux = buildVimPluginFrom2Nix { pname = "vim-tmux"; - version = "2019-03-22"; + version = "2020-07-25"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "vim-tmux"; - rev = "4e77341a2f8b9b7e41e81e9debbcecaea5987c85"; - sha256 = "16fgc0lx1jr8zbayanf5w677ssiw5xb8vwfaca295c8xlk760c3m"; + rev = "7e7680fb1bb05bca1c800213b265f45433ed1e33"; + sha256 = "19al4a4g8wfz43am32ncz8dg58wxhzn30p7r4n1780pv8hzkdrsb"; }; meta.homepage = "https://github.com/tmux-plugins/vim-tmux/"; }; + vim-tmux-clipboard = buildVimPluginFrom2Nix { + pname = "vim-tmux-clipboard"; + version = "2019-04-07"; + src = fetchFromGitHub { + owner = "roxma"; + repo = "vim-tmux-clipboard"; + rev = "47187740b88f9dab213f44678800cc797223808e"; + sha256 = "1a7rpbvb7dgjfnrh95zg2ia6iiz2mz2xps31msb8h14hcj6dsv6y"; + }; + meta.homepage = "https://github.com/roxma/vim-tmux-clipboard/"; + }; + vim-tmux-focus-events = buildVimPluginFrom2Nix { pname = "vim-tmux-focus-events"; - version = "2019-12-09"; + version = "2020-10-05"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "vim-tmux-focus-events"; - rev = "e80960715c09aef8ab9204848ed1683805a93a33"; - sha256 = "0ds6qw2i1r67jhxh9ff36al45bafsmbxxdc127l6iy2vl5wj0d3d"; + rev = "a568192ca0de4ca0bd7b3cd0249aad491625c941"; + sha256 = "130l73v18md95djkc4s9d0fr018f8f183sjcgy7dgldwdaxlqdi1"; }; meta.homepage = "https://github.com/tmux-plugins/vim-tmux-focus-events/"; }; vim-tmux-navigator = buildVimPluginFrom2Nix { pname = "vim-tmux-navigator"; - version = "2020-04-23"; + version = "2020-11-12"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "44ba6fbe45895cd541ebfc87606add5c76e3829b"; - sha256 = "075cncr53w9xc1kqm50zl8yl18aspn3zdr6qjqyslf7gkw8yk38d"; + rev = "6a1e58c3ca3bc7acca36c90521b3dfae83b2a602"; + sha256 = "17219h69vd6b994qrywg1rpx80y1rmycbfsmf9wb6c693sx721sn"; }; meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/"; }; @@ -6376,24 +7170,24 @@ let vim-toml = buildVimPluginFrom2Nix { pname = "vim-toml"; - version = "2019-08-28"; + version = "2020-07-06"; src = fetchFromGitHub { owner = "cespare"; repo = "vim-toml"; - rev = "a4ec206052aa347d7df90dc4b6697b7f2b7929bc"; - sha256 = "1dgykq4vl7vvj2f8lvg58rzqddm53i278g26ljwfimgqc8l6gmqd"; + rev = "897cb4eaa81a0366bc859effe14116660d4015cd"; + sha256 = "0ps9kwclqfdydk4132255i9rzcic0sp6d217arjsk1w6gm7m9lm6"; }; meta.homepage = "https://github.com/cespare/vim-toml/"; }; vim-trailing-whitespace = buildVimPluginFrom2Nix { pname = "vim-trailing-whitespace"; - version = "2019-12-09"; + version = "2020-11-18"; src = fetchFromGitHub { owner = "bronson"; repo = "vim-trailing-whitespace"; - rev = "6b7cdecff252474fe560d32c6f05641f3c5952c7"; - sha256 = "0arv1hmlw7c1rlkc00hzjyg48pg8g4cc9q9l2hy8kpmsl037akm3"; + rev = "05f068ebd9dbdf71d2d334d02abd99deb0311c40"; + sha256 = "1bh15yw2aysvpn2ndnc0s6jzc0y93x6q1blc5pph67rdix5bm7gy"; }; meta.homepage = "https://github.com/bronson/vim-trailing-whitespace/"; }; @@ -6422,6 +7216,18 @@ let meta.homepage = "https://github.com/lumiliet/vim-twig/"; }; + vim-twiggy = buildVimPluginFrom2Nix { + pname = "vim-twiggy"; + version = "2020-11-14"; + src = fetchFromGitHub { + owner = "sodapopcan"; + repo = "vim-twiggy"; + rev = "305fa5ab43514b76b15a57596bc514c072b9cdda"; + sha256 = "1hn42fm9a2dvxwml17j5jvd8758s71dlipspn5vi9l545cg94jjf"; + }; + meta.homepage = "https://github.com/sodapopcan/vim-twiggy/"; + }; + vim-unimpaired = buildVimPluginFrom2Nix { pname = "vim-unimpaired"; version = "2020-04-26"; @@ -6434,14 +7240,26 @@ let meta.homepage = "https://github.com/tpope/vim-unimpaired/"; }; + vim-vagrant = buildVimPluginFrom2Nix { + pname = "vim-vagrant"; + version = "2018-11-11"; + src = fetchFromGitHub { + owner = "hashivim"; + repo = "vim-vagrant"; + rev = "7741242ed9617ed53ba7e47e801634b819047ac0"; + sha256 = "0inpgcrca955h0ic7pgl6bfzs7rssjgssvrvqq3y93j5addmh60m"; + }; + meta.homepage = "https://github.com/hashivim/vim-vagrant/"; + }; + vim-vinegar = buildVimPluginFrom2Nix { pname = "vim-vinegar"; - version = "2019-11-13"; + version = "2020-06-27"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-vinegar"; - rev = "fcce70f1403ba4101668a4c960c577bddbd00f06"; - sha256 = "0zxqdyla40xcp0ps362b85bqwl3mp4zfmfdggl0gwvgd5m949yk0"; + rev = "5fee9d230ec4a6a16c45f2c71482595e4d9a67bd"; + sha256 = "14n0mnj1lmk3bmhm0knipsw120dlxpsd98fimmchw0kd80vpph41"; }; meta.homepage = "https://github.com/tpope/vim-vinegar/"; }; @@ -6460,12 +7278,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2020-05-28"; + version = "2020-11-14"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "cdcaa75d5a6054c7c69b6ebbaa4dff2fce6f96ed"; - sha256 = "0mszzkmi4kgmf6qjh5f2mr9y1b3p4jzvlsykvzavz8zb55yy4vkx"; + rev = "3b9c8c630daba920741f1fbf6696b7d32d020660"; + sha256 = "0hrsz624flscp8m6wjbr4sfqybw20ssbc78jdrh3q3n92gz1d50s"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -6482,6 +7300,30 @@ let meta.homepage = "https://github.com/thinca/vim-visualstar/"; }; + vim-vsnip = buildVimPluginFrom2Nix { + pname = "vim-vsnip"; + version = "2020-11-16"; + src = fetchFromGitHub { + owner = "hrsh7th"; + repo = "vim-vsnip"; + rev = "70af9531f131b2f1e6674780dfe1e81893de02ab"; + sha256 = "0gjcifybfjwa33njy2pkfcmblgna922c5hg1sf8kwyahmn4v5ix8"; + }; + meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; + }; + + vim-vsnip-integ = buildVimPluginFrom2Nix { + pname = "vim-vsnip-integ"; + version = "2020-11-09"; + src = fetchFromGitHub { + owner = "hrsh7th"; + repo = "vim-vsnip-integ"; + rev = "8f171eac11eb7668a33991953f9ae5af9556cc59"; + sha256 = "0a8f1nblgwdv7z0ycxlx5arx68dgg5qzvwwgws18lpf201qp07sx"; + }; + meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/"; + }; + vim-vue = buildVimPluginFrom2Nix { pname = "vim-vue"; version = "2019-08-03"; @@ -6496,12 +7338,12 @@ let vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2020-02-12"; + version = "2020-11-02"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "dd74c71cd2ea23b4a6cba4b05c873983c16e297c"; - sha256 = "1dc04vmpv62x2rfnfad2y60l5xzpw0167pbii9kss6n6ra81gayr"; + rev = "c725124ae8885ca6da4fe5cd03bda4bd77dc3fd1"; + sha256 = "1mvvqbjszp6mc0rq6m1nj7cyy44z4xf2h4lc561wkfblhhk9j4i6"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -6520,24 +7362,24 @@ let vim-which-key = buildVimPluginFrom2Nix { pname = "vim-which-key"; - version = "2020-05-25"; + version = "2020-10-02"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-which-key"; - rev = "786dceaab0987e164dcee125b8ff6111851df625"; - sha256 = "01afdf37fqz6i9g9371yh0ymv9lsw81z52vcpnwyysbj8n7qswwc"; + rev = "30c0810b012a7acdccc6b72f0e99c0388986844f"; + sha256 = "18rflksd58mwkq0lc64frfimj1l1k8cc0l45jpv0z4w118v92jyv"; }; meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; vim-wordy = buildVimPluginFrom2Nix { pname = "vim-wordy"; - version = "2019-11-22"; + version = "2020-10-24"; src = fetchFromGitHub { owner = "reedes"; repo = "vim-wordy"; - rev = "f0391713fa83771d64b065868331ef4754d861ed"; - sha256 = "0v5cl3rrg2vrdb2al67hbh730rw8m2zvhb1vippv64k65mknkgp5"; + rev = "667426a0171787b2620dffa5b2d7c01c9040237f"; + sha256 = "1lcrisv2wcd8iw76prql03wd11jgmknm3rvbcw7vv4v5r2s9rv5z"; }; meta.homepage = "https://github.com/reedes/vim-wordy/"; }; @@ -6556,12 +7398,12 @@ let vim-xkbswitch = buildVimPluginFrom2Nix { pname = "vim-xkbswitch"; - version = "2020-05-22"; + version = "2020-10-07"; src = fetchFromGitHub { owner = "lyokha"; repo = "vim-xkbswitch"; - rev = "f54fd6a7357d43a8773313504da72d1bd96d6f1a"; - sha256 = "0542prcclaw6s4f6dlp0ywz5zp10brb7br7hx4lhhizslcakg09v"; + rev = "8fb3d07e5c9809f292dddb034db2c02d649b29fb"; + sha256 = "08j0r68ps4jisgbx6lg2vz3wxyx7yzrklsi112bqjxizxjpjb132"; }; meta.homepage = "https://github.com/lyokha/vim-xkbswitch/"; }; @@ -6616,12 +7458,12 @@ let vimagit = buildVimPluginFrom2Nix { pname = "vimagit"; - version = "2020-01-12"; + version = "2020-11-18"; src = fetchFromGitHub { owner = "jreybert"; repo = "vimagit"; - rev = "bf7b16e99e075b019e56f2fbfb96c493ca3635e2"; - sha256 = "1f7gvlhrvvkf69y5vfrkvidhx8aa03n1aqmdhk9qjd6sglfg5w0i"; + rev = "aaf1278f03e866f0b978d4b0f0cc7084db251129"; + sha256 = "1k23q1p6wgjlk1cpmv1ijjggjklz8hgg6s7bx6mrk0aw5j2s1pdh"; }; meta.homepage = "https://github.com/jreybert/vimagit/"; }; @@ -6640,12 +7482,12 @@ let vimfiler-vim = buildVimPluginFrom2Nix { pname = "vimfiler-vim"; - version = "2019-07-30"; + version = "2020-07-13"; src = fetchFromGitHub { owner = "Shougo"; repo = "vimfiler.vim"; - rev = "26d3fec10cb8921d510064411784301794229a93"; - sha256 = "0iv1smk0999sfm3iqdlpb2il74l01lxfahwg87g7h3gq9frky2wd"; + rev = "0fdf9f2f7e6014a49625433058c1665f72a3b86f"; + sha256 = "028hcmr7xxqmb55m9q2h2x9kr5xq5866ivr0in23jm44s897yr25"; }; meta.homepage = "https://github.com/Shougo/vimfiler.vim/"; }; @@ -6664,12 +7506,12 @@ let vimoutliner = buildVimPluginFrom2Nix { pname = "vimoutliner"; - version = "2020-02-09"; + version = "2020-10-26"; src = fetchFromGitHub { owner = "vimoutliner"; repo = "vimoutliner"; - rev = "1031b16e6b0069229fe0f33a66489f81174fa4d9"; - sha256 = "1gn21b8yr0bjg0y1nidk13zcl4f6z8wkrxncgkd1hlc14d99jkg0"; + rev = "d198aa72c70270f1330f4237bbf853efaaa79723"; + sha256 = "05wcqs36qn8f3vcy9xi2cf0yyp7yzawlxqvpjhbad6lm52vzsabs"; }; meta.homepage = "https://github.com/vimoutliner/vimoutliner/"; }; @@ -6688,16 +7530,28 @@ let vimproc-vim = buildVimPluginFrom2Nix { pname = "vimproc-vim"; - version = "2020-01-20"; + version = "2020-06-23"; src = fetchFromGitHub { owner = "Shougo"; repo = "vimproc.vim"; - rev = "51f4664c92f0f1b121127c84d3b1c901e1c698f0"; - sha256 = "06nzh4x7j7j3nvw2s4m1gmds0z0bldxbizja91jd43qma9xnwvlk"; + rev = "8f40d86ab938d5df8c1c9824320621ae9f0d5609"; + sha256 = "11k59lc31056lk9ndkmi9a4459lnv6hdhvw3y4gpin40xchl6d61"; }; meta.homepage = "https://github.com/Shougo/vimproc.vim/"; }; + vimsence = buildVimPluginFrom2Nix { + pname = "vimsence"; + version = "2020-11-02"; + src = fetchFromGitHub { + owner = "hugolgst"; + repo = "vimsence"; + rev = "433875b4a994582a28795f8944af10d935b64322"; + sha256 = "117yxp3bzhrdi03r2d2zr1r2702czkxamdvgcxr62gysdgbz5i9z"; + }; + meta.homepage = "https://github.com/hugolgst/vimsence/"; + }; + vimshell-vim = buildVimPluginFrom2Nix { pname = "vimshell-vim"; version = "2019-07-16"; @@ -6710,14 +7564,27 @@ let meta.homepage = "https://github.com/Shougo/vimshell.vim/"; }; + vimspector = buildVimPluginFrom2Nix { + pname = "vimspector"; + version = "2020-11-16"; + src = fetchFromGitHub { + owner = "puremourning"; + repo = "vimspector"; + rev = "b7de25e3d1e9d003df63d85a8781e16cbc7635ee"; + sha256 = "06wk6hgpb2n83g3bpn7cwsyz06mpxgc0wyjwbmh2skac81piilrv"; + fetchSubmodules = true; + }; + meta.homepage = "https://github.com/puremourning/vimspector/"; + }; + vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-05-25"; + version = "2020-11-12"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "666191bc563be6716af6e167404dccb27f2fb8d1"; - sha256 = "03gc4w57j5xpcnmj60qrsc2qbrkvpmn9cfzz8xwha26cpngrwv9q"; + rev = "01762d18f86422ddc85361c86b849f9707f23ef3"; + sha256 = "0ncgfd23x8g5n568amzd9x7bvvm5mgjs7qqmr9qn7hjpprad5icq"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -6760,12 +7627,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2020-05-23"; + version = "2020-11-10"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "dab956b05534359fd4e498b45e518f63f097ae9c"; - sha256 = "1wf7plybcrrdx459f0g2rzzl9drik7w264y0i1jxf43y7nlm138n"; + rev = "bc3b2a74efb253be4b79cc7b70b192e1360f26c1"; + sha256 = "0qfdykp7sf4p2h8gfx40qmnfj94p4hksngqqkzrhzi9z3i6fqk2a"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -6784,12 +7651,12 @@ let wal-vim = buildVimPluginFrom2Nix { pname = "wal-vim"; - version = "2020-03-06"; + version = "2020-11-08"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "wal.vim"; - rev = "10f228ce1e7947f62be412f916229131b7710239"; - sha256 = "0aiwsrcqnazam56cvwmck4bf7w543cr219bkmq0ngqzna72h9735"; + rev = "c72ba0d18946f29aab9c95eb6975d321c68b3681"; + sha256 = "03hrn0d6mqjlrixwx5l270jfgwgkzr6xg00h39i49j7k3f1ql078"; }; meta.homepage = "https://github.com/dylanaraps/wal.vim/"; }; @@ -6844,12 +7711,12 @@ let xptemplate = buildVimPluginFrom2Nix { pname = "xptemplate"; - version = "2020-02-08"; + version = "2020-06-29"; src = fetchFromGitHub { owner = "drmingdrmer"; repo = "xptemplate"; - rev = "79d650bad58b9c896ec47785f8a0c7b603105c2d"; - sha256 = "1myxp0ldk0s46aipx1iswa9zx2fkc4gwqpmhbswqgg7sxl1bz30g"; + rev = "359ffe4d426bce2e95f5866b682856b25555396f"; + sha256 = "1rj5k58n1ybcc7qxsxlh09p2v4cps5xyzxmvjfrixy1qm2f85kd5"; }; meta.homepage = "https://github.com/drmingdrmer/xptemplate/"; }; @@ -6880,12 +7747,12 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2020-05-15"; + version = "2020-11-16"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "fbbb4b2fa346f556aee8424c98ee51e849949bb1"; - sha256 = "1plgig0m7zb4zk7mqj5g12nc622dpngj4g4wvkg2ffic2krz9fdx"; + rev = "9404065e3ba943a1204d11d333980c9ae7ab2a22"; + sha256 = "1pfkbmy38ppl1fw0fw4zh53f7dazflvzfyb02gsj6bpyg6jvjqdz"; fetchSubmodules = true; }; meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; @@ -6893,12 +7760,12 @@ let YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2020-05-25"; + version = "2020-11-13"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "27362f850ceca80e5369f46512fdd3ba042de4d7"; - sha256 = "1gm8z7rshn2ffc3hdwif2910ckbz01x6aysp0yk8nfmqb7iacnjc"; + rev = "604a2a02e070bbd46f58c79a46f4df048e26a97c"; + sha256 = "0m9wfpm855cp9zzg0nsd6bb7ijmgj9vhfhm7x5nhmqjqjfyl8282"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -6930,36 +7797,36 @@ let zenburn = buildVimPluginFrom2Nix { pname = "zenburn"; - version = "2020-01-23"; + version = "2020-09-08"; src = fetchFromGitHub { owner = "jnurmine"; repo = "zenburn"; - rev = "ec6f369a000602e37e7c066b725f9d6bd12538f4"; - sha256 = "1ff5ac8lp7fq854kgf03c5h695lm60giw0qda5z428mmzwq0xask"; + rev = "4ec3795d81fc83b6f43389a6291bfa99394473a8"; + sha256 = "148s2szjx61rp93nxa95552m87mn4n4ga00dlbvvv7sm607mvxd8"; }; meta.homepage = "https://github.com/jnurmine/zenburn/"; }; zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2020-05-21"; + version = "2020-10-09"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "912e9c792702519ca03cd3e3048e8d276a5d3947"; - sha256 = "1svy3bp8rhcbimcp5p4crz57fiv1p2xvcr4xs90frsncq1r483q9"; + rev = "fa5f6d7c5be47bd32dcc69ccf980fc585575cc38"; + sha256 = "0szrnp27ccl93fbn1j9ybsld1l6j3xdrnx6dsf01gdxidm3w60f3"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; zoomwintab-vim = buildVimPluginFrom2Nix { pname = "zoomwintab-vim"; - version = "2020-04-10"; + version = "2020-10-13"; src = fetchFromGitHub { owner = "troydm"; repo = "zoomwintab.vim"; - rev = "63a70b9e12617d6565a0489c68efe44708d19cf8"; - sha256 = "1dsi2d6wrv5x6w2hrrjzqivsspxxav0hdj0pymml6gry2jcbj4s9"; + rev = "3b33368ed2ff6138d07f7ee148306cce7d7f6b7c"; + sha256 = "0jx6860ajw50fn0l5p3dm3fcfwklqs1lf22yyrb09iljavixj777"; }; meta.homepage = "https://github.com/troydm/zoomwintab.vim/"; }; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 73c5690b1927..a5a40d5eeae9 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -1,21 +1,20 @@ { lib, stdenv , python, cmake, meson, vim, ruby , which, fetchFromGitHub, fetchgit, fetchurl, fetchzip, fetchpatch -, llvmPackages, rustPlatform +, llvmPackages, rustPlatform, buildGoModule +, pkgconfig, curl, openssl, libgit2, libiconv , xkb-switch, fzf, skim, stylish-haskell , python3, boost, icu, ncurses , ycmd, rake , gobject-introspection, glib, wrapGAppsHook , substituteAll , languagetool +, tabnine , Cocoa, CoreFoundation, CoreServices , buildVimPluginFrom2Nix , nodePackages , dasht -# coc-go dependency -, go - # deoplete-khard dependency , khard @@ -24,6 +23,7 @@ , gomodifytags, gotags, gotools, go-motion , gnused, reftools, gogetdoc, golangci-lint , impl, iferr, gocode, gocode-gomod, go-tools +, gopls # direnv-vim dependencies , direnv @@ -60,16 +60,19 @@ self: super: { }; LanguageClient-neovim = let - version = "0.1.157"; - LanguageClient-neovim-src = fetchurl { - url = "https://github.com/autozimu/LanguageClient-neovim/archive/${version}.tar.gz"; - sha256 = "1ccq5akkm8n612ni5g7w7v5gv73g7p1d9i92k0bnsy33fvi3pmnh"; + version = "0.1.160"; + LanguageClient-neovim-src = fetchFromGitHub { + owner = "autozimu"; + repo = "LanguageClient-neovim"; + rev = version; + sha256 = "143cifahav1pfmpx3j1ihx433jrwxf6z27s0wxndgjkd2plkks58"; }; LanguageClient-neovim-bin = rustPlatform.buildRustPackage { - name = "LanguageClient-neovim-bin"; + pname = "LanguageClient-neovim-bin"; + inherit version; src = LanguageClient-neovim-src; - cargoSha256 = "0r3f7sixkvgfrw0j81bxj1jpam5si9dnivrw63s29cvjxrdbnmqz"; + cargoSha256 = "0mf94j85awdcqa6cyb89bipny9xg13ldkznjf002fq747f55my2a"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; # FIXME: Use impure version of CoreFoundation because of missing symbols. @@ -97,8 +100,6 @@ self: super: { # These usually implicitly set by cc-wrapper around clang (pkgs/build-support/cc-wrapper). # The linked ruby code shows generates the required '.clang_complete' for cmake based projects # https://gist.github.com/Mic92/135e83803ed29162817fce4098dec144 - # as an alternative you can execute the following command: - # $ eval echo $(nix-instantiate --eval --expr 'with (import <nixpkgs>) {}; clang.default_cxx_stdlib_compile') preFixup = '' substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/clang_complete.vim \ --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.clang.cc.lib}/lib/libclang.so'" @@ -123,199 +124,6 @@ self: super: { ''; }); - coc-go = super.coc-go.overrideAttrs(old: { - preFixup = '' - substituteInPlace "$out"/share/vim-plugins/coc-go/src/utils/tools.ts \ - --replace 'const cmd = `GOPATH=''${gopath}; go ''${args}`' 'const cmd = `GOPATH=''${gopath}; ${go}/bin/go ''${args}`' - ''; - }); - - coc-css = buildVimPluginFrom2Nix { - pname = "coc-css"; - version = nodePackages.coc-css.version; - src = "${nodePackages.coc-css}/lib/node_modules/coc-css"; - }; - - coc-emmet = buildVimPluginFrom2Nix { - pname = "coc-emmet"; - version = nodePackages.coc-emmet.version; - src = "${nodePackages.coc-emmet}/lib/node_modules/coc-emmet"; - }; - - coc-eslint = buildVimPluginFrom2Nix { - pname = "coc-eslint"; - version = nodePackages.coc-eslint.version; - src = "${nodePackages.coc-eslint}/lib/node_modules/coc-eslint"; - }; - - coc-git = buildVimPluginFrom2Nix { - pname = "coc-git"; - version = nodePackages.coc-git.version; - src = "${nodePackages.coc-git}/lib/node_modules/coc-git"; - }; - - coc-highlight = buildVimPluginFrom2Nix { - pname = "coc-highlight"; - version = nodePackages.coc-highlight.version; - src = "${nodePackages.coc-highlight}/lib/node_modules/coc-highlight"; - }; - - coc-html = buildVimPluginFrom2Nix { - pname = "coc-html"; - version = nodePackages.coc-html.version; - src = "${nodePackages.coc-html}/lib/node_modules/coc-html"; - }; - - coc-imselect = buildVimPluginFrom2Nix { - pname = "coc-imselect"; - version = nodePackages.coc-imselect.version; - src = "${nodePackages.coc-imselect}/lib/node_modules/coc-imselect"; - }; - - coc-java = buildVimPluginFrom2Nix { - pname = "coc-java"; - version = nodePackages.coc-java.version; - src = "${nodePackages.coc-java}/lib/node_modules/coc-java"; - }; - - coc-jest = buildVimPluginFrom2Nix { - pname = "coc-jest"; - version = nodePackages.coc-jest.version; - src = "${nodePackages.coc-jest}/lib/node_modules/coc-jest"; - }; - - coc-json = buildVimPluginFrom2Nix { - pname = "coc-json"; - version = nodePackages.coc-json.version; - src = "${nodePackages.coc-json}/lib/node_modules/coc-json"; - }; - - coc-lists = buildVimPluginFrom2Nix { - pname = "coc-lists"; - version = nodePackages.coc-lists.version; - src = "${nodePackages.coc-lists}/lib/node_modules/coc-lists"; - }; - - coc-metals = buildVimPluginFrom2Nix { - pname = "coc-metals"; - version = nodePackages.coc-metals.version; - src = "${nodePackages.coc-metals}/lib/node_modules/coc-metals"; - }; - - coc-pairs = buildVimPluginFrom2Nix { - pname = "coc-pairs"; - version = nodePackages.coc-pairs.version; - src = "${nodePackages.coc-pairs}/lib/node_modules/coc-pairs"; - }; - - coc-prettier = buildVimPluginFrom2Nix { - pname = "coc-prettier"; - version = nodePackages.coc-prettier.version; - src = "${nodePackages.coc-prettier}/lib/node_modules/coc-prettier"; - }; - - coc-python = buildVimPluginFrom2Nix { - pname = "coc-python"; - version = nodePackages.coc-python.version; - src = "${nodePackages.coc-python}/lib/node_modules/coc-python"; - }; - - coc-r-lsp = buildVimPluginFrom2Nix { - pname = "coc-r-lsp"; - version = nodePackages.coc-r-lsp.version; - src = "${nodePackages.coc-r-lsp}/lib/node_modules/coc-r-lsp"; - }; - - coc-rls = buildVimPluginFrom2Nix { - pname = "coc-rls"; - version = nodePackages.coc-rls.version; - src = "${nodePackages.coc-rls}/lib/node_modules/coc-rls"; - }; - - coc-rust-analyzer = buildVimPluginFrom2Nix { - pname = "coc-rust-analyzer"; - version = nodePackages.coc-rust-analyzer.version; - src = "${nodePackages.coc-rust-analyzer}/lib/node_modules/coc-rust-analyzer"; - }; - - coc-smartf = buildVimPluginFrom2Nix { - pname = "coc-smartf"; - version = nodePackages.coc-smartf.version; - src = "${nodePackages.coc-smartf}/lib/node_modules/coc-smartf"; - }; - - coc-snippets = buildVimPluginFrom2Nix { - pname = "coc-snippets"; - version = nodePackages.coc-snippets.version; - src = "${nodePackages.coc-snippets}/lib/node_modules/coc-snippets"; - }; - - coc-solargraph = buildVimPluginFrom2Nix { - pname = "coc-solargraph"; - version = nodePackages.coc-solargraph.version; - src = "${nodePackages.coc-solargraph}/lib/node_modules/coc-solargraph"; - }; - - coc-stylelint = buildVimPluginFrom2Nix { - pname = "coc-stylelint"; - version = nodePackages.coc-stylelint.version; - src = "${nodePackages.coc-stylelint}/lib/node_modules/coc-stylelint"; - }; - - coc-tabnine = buildVimPluginFrom2Nix { - pname = "coc-tabnine"; - version = nodePackages.coc-tabnine.version; - src = "${nodePackages.coc-tabnine}/lib/node_modules/coc-tabnine"; - }; - - coc-tslint = buildVimPluginFrom2Nix { - pname = "coc-tslint"; - version = nodePackages.coc-tslint.version; - src = "${nodePackages.coc-tslint}/lib/node_modules/coc-tslint"; - }; - - coc-tslint-plugin = buildVimPluginFrom2Nix { - pname = "coc-tslint-plugin"; - version = nodePackages.coc-tslint-plugin.version; - src = "${nodePackages.coc-tslint-plugin}/lib/node_modules/coc-tslint-plugin"; - }; - - coc-tsserver = buildVimPluginFrom2Nix { - pname = "coc-tsserver"; - version = nodePackages.coc-tsserver.version; - src = "${nodePackages.coc-tsserver}/lib/node_modules/coc-tsserver"; - }; - - coc-vetur = buildVimPluginFrom2Nix { - pname = "coc-vetur"; - version = nodePackages.coc-vetur.version; - src = "${nodePackages.coc-vetur}/lib/node_modules/coc-vetur"; - }; - - coc-vimtex = buildVimPluginFrom2Nix { - pname = "coc-vimtex"; - version = nodePackages.coc-vimtex.version; - src = "${nodePackages.coc-vimtex}/lib/node_modules/coc-vimtex"; - }; - - coc-wxml = buildVimPluginFrom2Nix { - pname = "coc-wxml"; - version = nodePackages.coc-wxml.version; - src = "${nodePackages.coc-wxml}/lib/node_modules/coc-wxml"; - }; - - coc-yaml = buildVimPluginFrom2Nix { - pname = "coc-yaml"; - version = nodePackages.coc-yaml.version; - src = "${nodePackages.coc-yaml}/lib/node_modules/coc-yaml"; - }; - - coc-yank = buildVimPluginFrom2Nix { - pname = "coc-yank"; - version = nodePackages.coc-yank.version; - src = "${nodePackages.coc-yank}/lib/node_modules/coc-yank"; - }; - command-t = super.command-t.overrideAttrs(old: { buildInputs = [ ruby rake ]; buildPhase = '' @@ -422,6 +230,14 @@ self: super: { configurePhase = "cd plugins/nvim"; }); + vimsence = super.vimsence.overrideAttrs(old: { + meta = with stdenv.lib; { + description = "Discord rich presence for Vim"; + homepage = "https://github.com/hugolgst/vimsence"; + maintainers = with stdenv.lib.maintainers; [ hugolgst ]; + }; + }); + vim-gist = super.vim-gist.overrideAttrs(old: { dependencies = with super; [ webapi-vim ]; }); @@ -441,6 +257,18 @@ self: super: { passthru.python3Dependencies = ps: with ps; [ jedi ]; }); + ncm2-neoinclude = super.ncm2-neoinclude.overrideAttrs(old: { + dependencies = with super; [ neoinclude-vim ]; + }); + + ncm2-neosnippet = super.ncm2-neosnippet.overrideAttrs(old: { + dependencies = with super; [ neosnippet-vim ]; + }); + + ncm2-syntax = super.ncm2-syntax.overrideAttrs(old: { + dependencies = with super; [ neco-syntax ]; + }); + ncm2-ultisnips = super.ncm2-ultisnips.overrideAttrs(old: { dependencies = with super; [ ultisnips ]; }); @@ -449,6 +277,10 @@ self: super: { dependencies = [ self.fzfWrapper ]; }); + skim-vim = super.skim-vim.overrideAttrs(old: { + dependencies = [ self.skim ]; + }); + sved = let # we put the script in its own derivation to benefit the magic of wrapGAppsHook svedbackend = stdenv.mkDerivation { @@ -555,6 +387,10 @@ self: super: { dependencies = with super; [ vim-maktaba ]; }); + vim-beancount = super.vim-beancount.overrideAttrs(old: { + passthru.python3Dependencies = ps: with ps; [ beancount ]; + }); + vim-codefmt = super.vim-codefmt.overrideAttrs(old: { dependencies = with super; [ vim-maktaba ]; }); @@ -593,6 +429,7 @@ self: super: { golint golangci-lint gomodifytags + gopls gotags gotools iferr @@ -631,6 +468,21 @@ self: super: { ''; }); + vim-markdown-composer = + let + vim-markdown-composer-bin = rustPlatform.buildRustPackage rec { + pname = "vim-markdown-composer-bin"; + inherit (super.vim-markdown-composer) src version; + cargoSha256 = "iuhq2Zhdkib8hw4uvXBjwE5ZiN1kzairlzufaGuVkWc="; + }; + in super.vim-markdown-composer.overrideAttrs(oldAttrs: rec { + preFixup = '' + substituteInPlace "$out"/share/vim-plugins/vim-markdown-composer/after/ftplugin/markdown/composer.vim \ + --replace "let l:args = [s:plugin_root . '/target/release/markdown-composer']" \ + "let l:args = ['${vim-markdown-composer-bin}/bin/markdown-composer']" + ''; + }); + vim-metamath = super.vim-metamath.overrideAttrs(old: { preInstall = "cd vim"; }); @@ -742,4 +594,101 @@ self: super: { ${vim}/bin/vim --cmd ":set rtp^=$PWD" -c 'ru plugin/unicode.vim' -c 'UnicodeCache' -c ':echohl Normal' -c ':q' > /dev/null ''; }); -} + + vim-hexokinase = super.vim-hexokinase.overrideAttrs(old: { + preFixup = let + hexokinase = buildGoModule { + name = "hexokinase"; + src = old.src + "/hexokinase"; + vendorSha256 = "pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + }; + in '' + ln -s ${hexokinase}/bin/hexokinase $target/hexokinase/hexokinase + ''; + + meta.platforms = stdenv.lib.platforms.all; + }); + + vim-clap = super.vim-clap.overrideAttrs(old: { + preFixup = let + maple-bin = rustPlatform.buildRustPackage { + name = "maple"; + src = old.src; + + nativeBuildInputs = [ + pkgconfig + ]; + + buildInputs = [ + openssl + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + CoreServices + curl + libgit2 + libiconv + ]; + + cargoSha256 = "QUi3GyAsakAtDQkiVA7ez05s5CixqsVSp92svYmcWdQ="; + }; + in '' + ln -s ${maple-bin}/bin/maple $target/bin/maple + ''; + + meta.platforms = stdenv.lib.platforms.all; + }); + + completion-tabnine = super.completion-tabnine.overrideAttrs(old: { + buildInputs = [ tabnine ]; + + postFixup = '' + mkdir $target/binaries + ln -s ${tabnine}/bin/TabNine $target/binaries/TabNine_$(uname -s) + ''; + }); +} // ( + let + nodePackageNames = [ + "coc-css" + "coc-diagnostic" + "coc-emmet" + "coc-eslint" + "coc-git" + "coc-go" + "coc-highlight" + "coc-html" + "coc-imselect" + "coc-java" + "coc-jest" + "coc-json" + "coc-lists" + "coc-markdownlint" + "coc-metals" + "coc-pairs" + "coc-prettier" + "coc-python" + "coc-r-lsp" + "coc-rls" + "coc-rust-analyzer" + "coc-smartf" + "coc-snippets" + "coc-solargraph" + "coc-stylelint" + "coc-tabnine" + "coc-tslint" + "coc-tslint-plugin" + "coc-tsserver" + "coc-vetur" + "coc-vimlsp" + "coc-vimtex" + "coc-wxml" + "coc-yaml" + "coc-yank" + ]; + nodePackage2VimPackage = name: buildVimPluginFrom2Nix { + pname = name; + inherit (nodePackages.${name}) version meta; + src = "${nodePackages.${name}}/lib/node_modules/${name}"; + }; + in + lib.genAttrs nodePackageNames nodePackage2VimPackage +) diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py index 84d57133d228..b9bab293a797 100755 --- a/pkgs/misc/vim-plugins/update.py +++ b/pkgs/misc/vim-plugins/update.py @@ -40,7 +40,6 @@ DEFAULT_IN = ROOT.joinpath("vim-plugin-names") DEFAULT_OUT = ROOT.joinpath("generated.nix") DEPRECATED = ROOT.joinpath("deprecated.json") - def retry(ExceptionToCheck: Any, tries: int = 4, delay: float = 3, backoff: float = 2): """Retry calling the decorated function using an exponential backoff. http://www.saltycrane.com/blog/2009/11/trying-out-retry-decorator-python/ @@ -71,6 +70,12 @@ def retry(ExceptionToCheck: Any, tries: int = 4, delay: float = 3, backoff: floa return deco_retry +def make_request(url: str) -> urllib.request.Request: + token = os.getenv("GITHUB_API_TOKEN") + headers = {} + if token is not None: + headers["Authorization"] = f"token {token}" + return urllib.request.Request(url, headers=headers) class Repo: def __init__( @@ -91,9 +96,8 @@ class Repo: @retry(urllib.error.URLError, tries=4, delay=3, backoff=2) def has_submodules(self) -> bool: try: - urllib.request.urlopen( - self.url(f"blob/{self.branch}/.gitmodules"), timeout=10 - ).close() + req = make_request(self.url(f"blob/{self.branch}/.gitmodules")) + urllib.request.urlopen(req, timeout=10).close() except urllib.error.HTTPError as e: if e.code == 404: return False @@ -104,7 +108,8 @@ class Repo: @retry(urllib.error.URLError, tries=4, delay=3, backoff=2) def latest_commit(self) -> Tuple[str, datetime]: commit_url = self.url(f"commits/{self.branch}.atom") - with urllib.request.urlopen(commit_url, timeout=10) as req: + commit_req = make_request(commit_url) + with urllib.request.urlopen(commit_req, timeout=10) as req: self.check_for_redirect(commit_url, req) xml = req.read() root = ET.fromstring(xml) diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 6e558ed67f9b..935d640b0744 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -1,9 +1,9 @@ 907th/vim-auto-save +aca/completion-tabnine airblade/vim-gitgutter airblade/vim-rooter ajh17/Spacegray.vim aklt/plantuml-syntax -albfan/nerdtree-git-plugin altercation/vim-colors-solarized alvan/vim-closetag alx741/vim-hindent @@ -11,9 +11,11 @@ alx741/vim-stylishask amiorin/ctrlp-z andrep/vimacs andreshazard/vim-logreview +AndrewRadev/sideways.vim AndrewRadev/splitjoin.vim andsild/peskcolor.vim andviro/flake8-vim +andymass/vim-matchup andys8/vim-elm-syntax antoinemadec/coc-fzf ap/vim-css-color @@ -35,6 +37,7 @@ bohlender/vim-smt2 brennanfee/vim-gui-position bronson/vim-trailing-whitespace brooth/far.vim +buoto/gotests-vim carlitux/deoplete-ternjs ccarpita/rtorrent-syntax-file cespare/vim-toml @@ -45,17 +48,20 @@ chrisbra/CheckAttach chrisbra/csv.vim chrisbra/NrrwRgn chrisbra/Recover.vim +chrisbra/SudoEdit.vim chrisbra/unicode.vim chrisgeo/sparkup chriskempson/base16-vim +ChristianChiarulli/nvcode-color-schemes.vim christoomey/vim-sort-motion christoomey/vim-tmux-navigator +chuling/ci_dark ckarnell/antonys-macro-repeater -ckipp01/coc-metals cloudhead/neovim-fuzzy CoatiSoftware/vim-sourcetrail cocopon/iceberg.vim cohama/lexima.vim +crusoexia/vim-monokai ctjhoa/spacevim ctrlpvim/ctrlp.vim dag/vim-fish @@ -79,7 +85,9 @@ dhruvasagar/vim-table-mode digitaltoad/vim-pug direnv/direnv.vim dleonard0/pony-vim-syntax -dracula/vim +dmix/elvish.vim +dpelle/vim-LanguageTool +dracula/vim as dracula-vim drewtempelmeyer/palenight.vim drmingdrmer/xptemplate dylanaraps/wal.vim @@ -87,6 +95,7 @@ eagletmt/ghcmod-vim eagletmt/neco-ghc easymotion/vim-easymotion editorconfig/editorconfig-vim +edwinb/idris2-vim ehamberg/vim-cute-python eikenb/acp elixir-editors/vim-elixir @@ -94,14 +103,18 @@ elmcast/elm-vim elzr/vim-json embear/vim-localvimrc enomsg/vim-haskellConcealPlus +enricobacis/vim-airline-clock ensime/ensime-vim ervandew/supertab esneider/YUNOcommit.vim -fannheyward/coc-rust-analyzer +euclidianAce/BetterLua.vim +euclio/vim-markdown-composer farmergreg/vim-lastplace fatih/vim-go +fcpg/vim-osc52 FelikZ/ctrlp-py-matcher fenetikm/falcon +fiatjaf/neuron.vim fisadev/vim-isort flazz/vim-colorschemes floobits/floobits-neovim @@ -111,6 +124,7 @@ fsharp/vim-fsharp fszymanski/deoplete-emoji garbas/vim-snipmate gentoo/gentoo-syntax +GEverding/vim-hocon gibiansky/vim-textobj-haskell glts/vim-textobj-comment godlygeek/csapprox @@ -127,41 +141,52 @@ guns/vim-clojure-highlight guns/vim-clojure-static guns/vim-sexp guns/xterm-color-table.vim +hashivim/vim-packer hashivim/vim-terraform +hashivim/vim-vagrant haya14busa/incsearch-easymotion.vim haya14busa/incsearch.vim +haya14busa/is.vim haya14busa/vim-asterisk +haya14busa/vim-poweryank heavenshell/vim-jsdoc hecal3/vim-leader-guide henrik/vim-indexed-search HerringtonDarkholme/yats.vim honza/vim-snippets hotwatermorning/auto-git-diff +hrsh7th/vim-vsnip +hrsh7th/vim-vsnip-integ hsanson/vim-android hsitz/VimOrganizer +hugolgst/vimsence iamcco/coc-spell-checker ianks/vim-tsx -icymind/NeoSolarized +idanarye/vim-merginal idris-hackers/idris-vim Inazuma110/deoplete-greek inkarkat/vim-SyntaxRange int3/vim-extradite +Iron-E/nvim-highlite itchyny/calendar.vim itchyny/lightline.vim itchyny/thumbnail.vim itchyny/vim-cursorword itchyny/vim-gitbranch ivanov/vim-ipython +jackguo380/vim-lsp-cxx-highlight jacoborus/tender.vim jaredgorski/SpaceCamp +jaxbot/semantic-highlight.vim JazzCore/ctrlp-cmatcher jceb/vim-hier jceb/vim-orgmode jeetsukumaran/vim-buffergator jeetsukumaran/vim-indentwise jeffkreeftmeijer/neovim-sensible +jeffkreeftmeijer/vim-numbertoggle jelera/vim-javascript-syntax -jgdavey/tslime.vim +jgdavey/tslime.vim@main jhradilek/vim-docbk jhradilek/vim-snippets as vim-docbk-snippets jiangmiao/auto-pairs @@ -172,7 +197,7 @@ jnurmine/zenburn jonbri/vim-colorstepper jonsmithers/vim-html-template-literals joonty/vim-xdebug -josa42/coc-go +joshdick/onedark.vim jpalardy/vim-slime jparise/vim-graphql jparise/vim-phabricator @@ -181,12 +206,14 @@ jsfaint/gen_tags.vim JuliaEditorSupport/deoplete-julia JuliaEditorSupport/julia-vim Julian/vim-textobj-variable-segment +juliosueiras/vim-terraform-completion junegunn/fzf.vim junegunn/goyo.vim junegunn/gv.vim junegunn/limelight.vim junegunn/seoul256.vim junegunn/vader.vim +junegunn/vim-after-object junegunn/vim-easy-align junegunn/vim-github-dashboard junegunn/vim-peekaboo @@ -206,17 +233,23 @@ kana/vim-tabpagecd kana/vim-textobj-function kana/vim-textobj-user kassio/neoterm +kbenzie/vim-spirv kchmck/vim-coffee-script KeitaNakamura/neodark.vim keith/swift.vim +keith/investigate.vim kien/rainbow_parentheses.vim knubie/vim-kitty-navigator konfekt/fastfold kristijanhusak/defx-git kristijanhusak/defx-icons kristijanhusak/deoplete-phpactor +kristijanhusak/vim-carbon-now-sh +kristijanhusak/vim-dirvish-git kristijanhusak/vim-hybrid-material kshenoy/vim-signature +kyazdani42/nvim-tree.lua +kyazdani42/nvim-web-devicons lambdalisue/vim-gista lambdalisue/vim-manpager lambdalisue/vim-pager @@ -228,10 +261,13 @@ lepture/vim-jinja lervag/vimtex lfilho/cosco.vim lifepillar/vim-mucomplete +lighttiger2505/deoplete-vim-lsp lilydjwg/colorizer +liuchengxu/vim-clap liuchengxu/vim-which-key liuchengxu/vista.vim LnL7/vim-nix +lotabout/skim.vim LucHermitte/lh-brackets LucHermitte/lh-vim-lib ludovicchabant/vim-gutentags @@ -243,7 +279,6 @@ lyokha/vim-xkbswitch machakann/vim-highlightedyank machakann/vim-sandwich machakann/vim-swap -majutsushi/tagbar maksimr/vim-jsbeautify MarcWeber/vim-addon-actions MarcWeber/vim-addon-async @@ -274,11 +309,16 @@ matze/vim-move maximbaz/lightline-ale MaxMEllon/vim-jsx-pretty mbbill/undotree +mboughaba/i3config.vim megaannum/forms megaannum/self mengelbrecht/lightline-bufferline +metakirby5/codi.vim mfukar/robotframework-vim +mfussenegger/nvim-dap mg979/vim-visual-multi +mhartington/oceanic-next +mhinz/vim-crates mhinz/vim-grepper mhinz/vim-janah mhinz/vim-sayonara @@ -294,6 +334,7 @@ mopp/sky-color-clock.vim morhetz/gruvbox motus/pig.vim mpickering/hlint-refactor-vim +mtikekar/vim-bsv nanotech/jellybeans.vim natebosch/vim-lsc nathanaelkane/vim-indent-guides @@ -303,48 +344,28 @@ nbouscal/vim-stylish-haskell ncm2/float-preview.nvim ncm2/ncm2 ncm2/ncm2-bufword +ncm2/ncm2-cssomni +ncm2/ncm2-github +ncm2/ncm2-html-subscope ncm2/ncm2-jedi +ncm2/ncm2-markdown-subscope +ncm2/ncm2-neoinclude +ncm2/ncm2-neosnippet ncm2/ncm2-path +ncm2/ncm2-syntax +ncm2/ncm2-tagprefix ncm2/ncm2-tmux ncm2/ncm2-ultisnips +ncm2/ncm2-vim ndmitchell/ghcid -neoclide/coc-css neoclide/coc-denite -neoclide/coc-emmet -neoclide/coc-eslint -neoclide/coc-git -neoclide/coc-highlight -neoclide/coc-html -neoclide/coc-imselect -neoclide/coc-java -neoclide/coc-jest -neoclide/coc-json -neoclide/coc-lists neoclide/coc-neco -neoclide/coc-pairs -neoclide/coc-prettier -neoclide/coc-python -neoclide/coc-r-lsp -neoclide/coc-rls -neoclide/coc-smartf -neoclide/coc-snippets -neoclide/coc-solargraph -neoclide/coc-stylelint -neoclide/coc-tabnine -neoclide/coc-tslint -neoclide/coc-tslint-plugin -neoclide/coc-tsserver -neoclide/coc-vetur -neoclide/coc-vimtex -neoclide/coc-wxml -neoclide/coc-yaml -neoclide/coc-yank neoclide/coc.nvim@release neoclide/denite-extra neoclide/denite-git neoclide/vim-easygit neomake/neomake -neovim/nvim-lsp +neovim/nvim-lspconfig neovim/nvimdev.nvim neovimhaskell/haskell-vim neovimhaskell/nvim-hs.vim @@ -359,16 +380,31 @@ norcalli/nvim-terminal.lua ntpeters/vim-better-whitespace numirias/semshi nvie/vim-flake8 +nvim-lua/completion-nvim +nvim-lua/diagnostic-nvim +nvim-lua/lsp_extensions.nvim +nvim-lua/plenary.nvim +nvim-lua/popup.nvim +nvim-telescope/telescope.nvim +nvim-treesitter/completion-treesitter +nvim-treesitter/nvim-treesitter +nvim-treesitter/nvim-treesitter-refactor +nvim-treesitter/nvim-treesitter-textobjects +nvim-treesitter/playground +ocaml/vim-ocaml octol/vim-cpp-enhanced-highlight Olical/conjure OrangeT/vim-csharp osyo-manga/shabadou.vim osyo-manga/vim-anzu +osyo-manga/vim-over osyo-manga/vim-textobj-multiblock osyo-manga/vim-watchdogs +overcache/NeoSolarized pangloss/vim-javascript parsonsmatt/intero-neovim pearofducks/ansible-vim +peitalin/vim-jsx-typescript peterbjorgensen/sved peterhoeg/vim-qml phanviet/vim-monokai-pro @@ -377,9 +413,14 @@ ponko2/deoplete-fish posva/vim-vue powerman/vim-plugin-AnsiEsc PProvost/vim-ps1 +prabirshrestha/asyncomplete.vim +prabirshrestha/vim-lsp preservim/nerdcommenter preservim/nerdtree +preservim/tagbar +psliwka/vim-smoothie ptzz/lf.vim +puremourning/vimspector purescript-contrib/purescript-vim python-mode/python-mode qnighy/lalrpop.vim @@ -396,14 +437,25 @@ rbgrouleff/bclose.vim reedes/vim-pencil reedes/vim-wordy rhysd/committia.vim +rhysd/devdocs.vim +rhysd/git-messenger.vim +rhysd/vim-clang-format rhysd/vim-grammarous rhysd/vim-operator-surround +RishabhRD/nvim-lsputils +RishabhRD/popfix rodjek/vim-puppet romainl/vim-cool +romainl/vim-qf +roman/golden-ratio +romgrk/barbar.nvim +romgrk/nvim-treesitter-context ron89/thesaurus_query.vim roxma/nvim-cm-racer roxma/nvim-completion-manager roxma/nvim-yarp +roxma/vim-tmux-clipboard +RRethy/vim-hexokinase RRethy/vim-illuminate rust-lang/rust.vim ryanoasis/vim-devicons @@ -437,13 +489,16 @@ Shougo/vimproc.vim Shougo/vimshell.vim shumphrey/fugitive-gitlab.vim sickill/vim-pasta +simnalamburt/vim-mundo SirVer/ultisnips sjl/gundo.vim sjl/splice.vim sk1418/last256 slashmili/alchemist.vim +sodapopcan/vim-twiggy solarnz/arcanist.vim sonph/onehalf +steelsojka/completion-buffers stefandtw/quickfix-reflector.vim stephpy/vim-yaml sunaku/vim-dasht @@ -456,6 +511,7 @@ ternjs/tern_for_vim terryma/vim-expand-region terryma/vim-multiple-cursors tex/vimpreviewpandoc +theHamsta/nvim-dap-virtual-text thinca/vim-ft-diff_fold thinca/vim-prettyprint thinca/vim-quickrun @@ -464,7 +520,9 @@ thinca/vim-themis thinca/vim-visualstar thirtythreeforty/lessspace.vim thosakwe/vim-flutter +tiagofumo/vim-nerdtree-syntax-highlight tikhomirov/vim-glsl +tjdevries/nlua.nvim tmhedberg/SimpylFold tmsvg/pear-tree tmux-plugins/vim-tmux @@ -489,6 +547,8 @@ tpope/vim-liquid tpope/vim-obsession tpope/vim-pathogen tpope/vim-projectionist +tpope/vim-ragtag +tpope/vim-rails tpope/vim-repeat tpope/vim-rhubarb tpope/vim-rsi @@ -515,8 +575,11 @@ uarun/vim-protobuf udalov/kotlin-vim ujihisa/neco-look unblevable/quick-scope +urbit/hoon.vim +Valloric/MatchTagAlways Valodim/deoplete-notmuch vhda/verilog_systemverilog.vim +vigoux/LanguageTool.nvim vim-airline/vim-airline vim-airline/vim-airline-themes vim-pandoc/vim-pandoc @@ -559,20 +622,29 @@ vimwiki/vimwiki vito-c/jq.vim vmchale/ats-vim vmchale/dhall-vim +vn-ki/coc-clap +voldikss/vim-floaterm VundleVim/Vundle.vim +w0ng/vim-hybrid wakatime/vim-wakatime wannesm/wmgraphviz.vim +weirongxu/coc-explorer wellle/targets.vim wellle/tmux-complete.vim +whonore/Coqtail will133/vim-dirdiff wincent/command-t wincent/ferret +wlangstroth/vim-racket wsdjeg/vim-fetch xavierd/clang_complete xolox/vim-easytags xolox/vim-misc xuhdev/vim-latex-live-preview +Xuyuanp/nerdtree-git-plugin ycm-core/YouCompleteMe Yggdroot/indentLine +Yilin-Yang/vim-markbar +yuki-ycino/ncm2-dictionary zah/nim.vim ziglang/zig.vim diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 5e1703c8cc36..ee77599a3ba2 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -183,7 +183,7 @@ let rtpPath = "share/vim-plugins"; - vimrcFile = { + vimrcContent = { packages ? null, vam ? null, pathogen ? null, @@ -338,7 +338,7 @@ let filetype indent plugin on | syn on ''); - in writeText "vimrc" '' + in '' " configuration generated by NIX set nocompatible @@ -351,11 +351,13 @@ let ${customRC} ''; + vimrcFile = settings: writeText "vimrc" (vimrcContent settings); in rec { inherit vimrcFile; + inherit vimrcContent; # shell script with custom name passing [-u vimrc] [-U gvimrc] to vim vimWithRC = { diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix index 84919e07c5e2..f6c765383ea3 100644 --- a/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -50,19 +50,15 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "cpptools"; publisher = "ms-vscode"; - version = "0.27.1"; + version = "1.0.1"; }; vsix = fetchurl { + name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; url = "https://github.com/microsoft/vscode-cpptools/releases/download/${mktplcRef.version}/cpptools-linux.vsix"; - sha256 = "1if43zis2cy32c6y1zsh0ih0y2kpdag0flkb795b3m5iwm38rjsq"; + sha256 = "1lb5pza2ny1ydan19596amabs1np10nq08yqsfbvvfw7zbg4gnyc"; }; - unpackPhase = '' - unzip $src - cd extension - ''; - buildInputs = [ jq ]; diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index cb145ade054c..bc00f82f19b7 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1,196 +1,263 @@ -{ stdenv, callPackage, vscode-utils, llvmPackages_8 }: +{ stdenv, config, lib, callPackage, vscode-utils, llvmPackages_8, llvmPackages_latest }: let inherit (vscode-utils) buildVscodeMarketplaceExtension; -in -# -# Unless there is a good reason not to, we attempt to use the same name as the -# extension's unique identifier (the name the extension gets when installed -# from vscode under `~/.vscode`) and found on the marketplace extension page. -# So an extension's attribute name should be of the form: -# "${mktplcRef.publisher}.${mktplcRef.name}". -# -{ - - alanz.vscode-hie-server = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-hie-server"; - publisher = "alanz"; - version = "0.0.27"; # see the note above - sha256 = "1mz0h5zd295i73hbji9ivla8hx02i4yhqcv6l4r23w3f07ql3i8h"; - }; - meta = { - license = stdenv.lib.licenses.mit; - }; - }; - - bbenoist.Nix = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "Nix"; - publisher = "bbenoist"; - version = "1.0.1"; - sha256 = "0zd0n9f5z1f0ckzfjr38xw2zzmcxg1gjrava7yahg5cvdcw6l35b"; - }; - meta = with stdenv.lib; { - license = licenses.mit; - }; - }; - - cmschuetz12.wal = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "wal"; - publisher = "cmschuetz12"; - version = "0.1.0"; - sha256 = "0q089jnzqzhjfnv0vlb5kf747s3mgz64r7q3zscl66zb2pz5q4zd"; - }; - meta = with stdenv.lib; { - license = licenses.mit; - }; - }; - - formulahendry.auto-close-tag = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "auto-close-tag"; - publisher = "formulahendry"; - version = "0.5.6"; - sha256 = "058jgmllqb0j6gg5anghdp35nkykii28igfcwqgh4bp10pyvspg0"; - }; - meta = { - license = stdenv.lib.licenses.mit; - }; - }; - - james-yu.latex-workshop = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "latex-workshop"; - publisher = "James-Yu"; - version = "8.2.0"; - sha256 = "1ai16aam4v5jzhxgms589q0l24kyk1a9in6z4i7g05b3sahyxab2"; - }; - meta = with stdenv.lib; { - license = licenses.mit; - }; - }; - - justusadam.language-haskell = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "language-haskell"; - publisher = "justusadam"; - version = "3.0.3"; - sha256 = "1sg4g8h1gww4y67zix5f33v2gf121k2fcm6l1m7lygpkn40a8dsj"; - }; - meta = { - license = stdenv.lib.licenses.bsd3; - }; - }; - - ms-azuretools.vscode-docker = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-docker"; - publisher = "ms-azuretools"; - version = "0.8.1"; - sha256 = "0n59whmcrx8946xix6skvc50f2vsc85ckvn8cs06w9mqmymm1q0s"; - }; - meta = { - license = stdenv.lib.licenses.mit; - }; - }; - - ms-kubernetes-tools.vscode-kubernetes-tools = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-kubernetes-tools"; - publisher = "ms-kubernetes-tools"; - version = "1.0.6"; - sha256 = "12a4phl1pddsajy3n0ld6rp607iy0pif6pqrs6ljbg2x97fyra28"; - }; - meta = { - license = stdenv.lib.licenses.mit; - }; - }; - - ms-vscode.Go = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "Go"; - publisher = "ms-vscode"; - version = "0.11.7"; - sha256 = "1l6jjdfivw1pn9y4d4i7zf80ls1k1b0ap1d828ah57ad3bgmyqfi"; - }; - meta = { - license = stdenv.lib.licenses.mit; - }; - }; - ms-vscode.cpptools = callPackage ./cpptools {}; + # + # Unless there is a good reason not to, we attempt to use the same name as the + # extension's unique identifier (the name the extension gets when installed + # from vscode under `~/.vscode`) and found on the marketplace extension page. + # So an extension's attribute name should be of the form: + # "${mktplcRef.publisher}.${mktplcRef.name}". + # + baseExtensions = self: stdenv.lib.mapAttrs (_n: stdenv.lib.recurseIntoAttrs) + { - ms-vscode-remote.remote-ssh = callPackage ./remote-ssh {}; + alanz.vscode-hie-server = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-hie-server"; + publisher = "alanz"; + version = "0.0.27"; # see the note above + sha256 = "1mz0h5zd295i73hbji9ivla8hx02i4yhqcv6l4r23w3f07ql3i8h"; + }; + meta = { + license = stdenv.lib.licenses.mit; + }; + }; - ms-python.python = callPackage ./python { - extractNuGet = callPackage ./python/extract-nuget.nix { }; - }; + bbenoist.Nix = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "Nix"; + publisher = "bbenoist"; + version = "1.0.1"; + sha256 = "0zd0n9f5z1f0ckzfjr38xw2zzmcxg1gjrava7yahg5cvdcw6l35b"; + }; + meta = with stdenv.lib; { + license = licenses.mit; + }; + }; - redhat.vscode-yaml = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-yaml"; - publisher = "redhat"; - version = "0.5.3"; - sha256 = "03swlsp906rqlrx6jf3ibh7pk36sm0zdr8jfy6sr3w5lqjg27gka"; - }; - meta = { - license = stdenv.lib.licenses.mit; - }; - }; + cmschuetz12.wal = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "wal"; + publisher = "cmschuetz12"; + version = "0.1.0"; + sha256 = "0q089jnzqzhjfnv0vlb5kf747s3mgz64r7q3zscl66zb2pz5q4zd"; + }; + meta = with stdenv.lib; { + license = licenses.mit; + }; + }; - matklad.rust-analyzer = callPackage ./rust-analyzer {}; + dhall.dhall-lang = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "dhall-lang"; + publisher = "dhall"; + version = "0.0.4"; + sha256 = "0sa04srhqmngmw71slnrapi2xay0arj42j4gkan8i11n7bfi1xpf"; + }; + meta = { license = stdenv.lib.licenses.mit; }; + }; - scala-lang.scala = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "scala"; - publisher = "scala-lang"; - version = "0.3.8"; - sha256 = "17dl10m3ayf57sqgil4mr9fjdm7i8gb5clrs227b768pp2d39ll9"; - }; - meta = { - license = stdenv.lib.licenses.mit; - }; - }; - - scalameta.metals = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "metals"; - publisher = "scalameta"; - version = "1.9.0"; - sha256 = "0p2wbnw98zmjbfiz4mi1mh131s78r01kjnja339lwdigqxg88gi6"; - }; - meta = { - license = stdenv.lib.licenses.asl20; - }; - }; - - skyapps.fish-vscode = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "fish-vscode"; - publisher = "skyapps"; - version = "0.2.1"; - sha256 = "0y1ivymn81ranmir25zk83kdjpjwcqpnc9r3jwfykjd9x0jib2hl"; - }; - meta = with stdenv.lib; { - license = licenses.mit; - }; - }; - - vscodevim.vim = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vim"; - publisher = "vscodevim"; - version = "1.11.3"; - sha256 = "1smzsgcrkhghbnpy51gp28kh74l7y4s2m8pfxabb4ffb751254j0"; + dhall.vscode-dhall-lsp-server = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-dhall-lsp-server"; + publisher = "dhall"; + version = "0.0.4"; + sha256 = "1zin7s827bpf9yvzpxpr5n6mv0b5rhh3civsqzmj52mdq365d2js"; + }; + meta = { license = stdenv.lib.licenses.mit; }; + }; + + formulahendry.auto-close-tag = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "auto-close-tag"; + publisher = "formulahendry"; + version = "0.5.6"; + sha256 = "058jgmllqb0j6gg5anghdp35nkykii28igfcwqgh4bp10pyvspg0"; + }; + meta = { + license = stdenv.lib.licenses.mit; + }; + }; + + golang.Go = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "Go"; + publisher = "golang"; + version = "0.18.1"; + sha256 = "sha256-b2Wa3TULQQnBm1/xnDCB9SZjE+Wxz5wBttjDEtf8qlE="; + }; + meta = { + license = stdenv.lib.licenses.mit; + }; + }; + + haskell.haskell = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "haskell"; + publisher = "haskell"; + version = "1.1.0"; + sha256 = "1wg06lyk0qn9jd6gi007sg7v0z9z8gwq7x2449d4ihs9n3w5l0gb"; + }; + meta = with stdenv.lib; { + license = licenses.mit; + }; + }; + + james-yu.latex-workshop = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "latex-workshop"; + publisher = "James-Yu"; + version = "8.2.0"; + sha256 = "1ai16aam4v5jzhxgms589q0l24kyk1a9in6z4i7g05b3sahyxab2"; + }; + meta = with stdenv.lib; { + license = licenses.mit; + }; + }; + + justusadam.language-haskell = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "language-haskell"; + publisher = "justusadam"; + version = "3.2.1"; + sha256 = "0lxp8xz17ciy93nj4lzxqvz71vw1zdyamrnh2n792yair8890rr6"; + }; + meta = { + license = stdenv.lib.licenses.bsd3; + }; + }; + + ms-azuretools.vscode-docker = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-docker"; + publisher = "ms-azuretools"; + version = "0.8.1"; + sha256 = "0n59whmcrx8946xix6skvc50f2vsc85ckvn8cs06w9mqmymm1q0s"; + }; + meta = { + license = stdenv.lib.licenses.mit; + }; + }; + + ms-kubernetes-tools.vscode-kubernetes-tools = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-kubernetes-tools"; + publisher = "ms-kubernetes-tools"; + version = "1.0.6"; + sha256 = "12a4phl1pddsajy3n0ld6rp607iy0pif6pqrs6ljbg2x97fyra28"; + }; + meta = { + license = stdenv.lib.licenses.mit; + }; + }; + + ms-vscode.cpptools = callPackage ./cpptools {}; + + ms-vscode-remote.remote-ssh = callPackage ./remote-ssh {}; + + ms-python.python = callPackage ./python { + extractNuGet = callPackage ./python/extract-nuget.nix { }; + }; + + redhat.vscode-yaml = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-yaml"; + publisher = "redhat"; + version = "0.5.3"; + sha256 = "03swlsp906rqlrx6jf3ibh7pk36sm0zdr8jfy6sr3w5lqjg27gka"; + }; + meta = { + license = stdenv.lib.licenses.mit; + }; + }; + + matklad.rust-analyzer = callPackage ./rust-analyzer {}; + + scala-lang.scala = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "scala"; + publisher = "scala-lang"; + version = "0.4.5"; + sha256 = "0nrj32a7a86vwc9gfh748xs3mmfwbc304dp7nks61f0lx8b4wzxw"; + }; + meta = { + license = stdenv.lib.licenses.mit; + }; + }; + + scalameta.metals = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "metals"; + publisher = "scalameta"; + version = "1.9.7"; + sha256 = "0v599yssvk358gxfxnyzzkyk0y5krsbp8n4rkp9wb2ncxqsqladr"; + }; + meta = { + license = stdenv.lib.licenses.asl20; + }; + }; + + skyapps.fish-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "fish-vscode"; + publisher = "skyapps"; + version = "0.2.1"; + sha256 = "0y1ivymn81ranmir25zk83kdjpjwcqpnc9r3jwfykjd9x0jib2hl"; + }; + meta = with stdenv.lib; { + license = licenses.mit; + }; + }; + + vadimcn.vscode-lldb = callPackage ./vscode-lldb { + lldb = llvmPackages_latest.lldb; + }; + + ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare-vsliveshare {}; + + vscodevim.vim = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vim"; + publisher = "vscodevim"; + version = "1.11.3"; + sha256 = "1smzsgcrkhghbnpy51gp28kh74l7y4s2m8pfxabb4ffb751254j0"; + }; + meta = { + license = stdenv.lib.licenses.mit; + }; + }; + + xaver.clang-format = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "clang-format"; + publisher = "xaver"; + version = "1.9.0"; + sha256 = "abd0ef9176eff864f278c548c944032b8f4d8ec97d9ac6e7383d60c92e258c2f"; + }; + meta = with stdenv.lib; { + license = licenses.mit; + maintainers = [ maintainers.zeratax ]; + }; + }; + + llvm-org.lldb-vscode = llvmPackages_8.lldb; + + WakaTime.vscode-wakatime = callPackage ./wakatime {}; }; - meta = { - license = stdenv.lib.licenses.mit; + + aliases = self: super: { + # aliases + ms-vscode = lib.recursiveUpdate super.ms-vscode { inherit (super.golang) Go; }; }; - }; - llvm-org.lldb-vscode = llvmPackages_8.lldb; + # TODO: add overrides overlay, so that we can have a generated.nix + # then apply extension specific modifcations to packages. + + # overlays will be applied left to right, overrides should come after aliases. + overlays = lib.optionals (config.allowAliases or true) [ aliases ]; - WakaTime.vscode-wakatime = callPackage ./wakatime {}; -} + toFix = lib.foldl' (lib.flip lib.extends) baseExtensions overlays; +in + lib.fix toFix diff --git a/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix b/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix new file mode 100644 index 000000000000..c49f798899fe --- /dev/null +++ b/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix @@ -0,0 +1,138 @@ +# Baseed on previous attempts: +# - <https://github.com/msteen/nixos-vsliveshare/blob/master/pkgs/vsliveshare/default.nix> +# - <https://github.com/NixOS/nixpkgs/issues/41189> +{ lib, gccStdenv, vscode-utils, autoPatchelfHook, bash, file, makeWrapper, dotnet-sdk_3 +, curl, gcc, icu, libkrb5, libsecret, libunwind, libX11, lttng-ust, openssl, util-linux, zlib +, desktop-file-utils, xprop +}: + +with lib; + +let + # https://docs.microsoft.com/en-us/visualstudio/liveshare/reference/linux#install-prerequisites-manually + libs = [ + # .NET Core + openssl + libkrb5 + zlib + icu + + # Credential Storage + libsecret + + # NodeJS + libX11 + + # https://github.com/flathub/com.visualstudio.code.oss/issues/11#issuecomment-392709170 + libunwind + lttng-ust + curl + + # General + gcc.cc.lib + util-linux # libuuid + ]; + +in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vsliveshare"; + publisher = "ms-vsliveshare"; + version = "1.0.2902"; + sha256 = "0fx2vi0wxamcwqcgcx7wpg8hi7f1c2pibrmd2qy2whilpsv3gzmb"; + }; +}).overrideAttrs(attrs: { + buildInputs = attrs.buildInputs ++ libs ++ [ autoPatchelfHook bash file makeWrapper ]; + + # Using a patch file won't work, because the file changes too often, causing the patch to fail on most updates. + # Rather than patching the calls to functions, we modify the functions to return what we want, + # which is less likely to break in the future. + postPatch = '' + sed -i \ + -e 's/updateExecutablePermissionsAsync() {/& return;/' \ + -e 's/isInstallCorrupt(traceSource, manifest) {/& return false;/' \ + out/prod/extension-prod.js + + declare ext_unique_id + ext_unique_id="$(basename "$out")" + + # Fix extension attempting to write to 'modifiedInternalSettings.json'. + # Move this write to the tmp directory indexed by the nix store basename. + sed -i \ + -E -e $'s/path\.resolve\(constants_1\.EXTENSION_ROOT_PATH, \'\.\/modifiedInternalSettings\.json\'\)/path.join\(os.tmpdir(), "'$ext_unique_id'" + "-modifiedInternalSettings.json"\)/g' \ + out/prod/extension-prod.js + + # Fix extension attempting to write to 'vsls-agent.lock'. + # Move this write to the tmp directory indexed by the nix store basename. + sed -i \ + -E -e $'s/(Agent_1.getAgentPath\(\) \+ \'.lock\')/path.join\(os.tmpdir(), "'$ext_unique_id'" + "-vsls-agent.lock"\)/g' \ + out/prod/extension-prod.js + + # TODO: Under 'node_modules/@vsliveshare/vscode-launcher-linux' need to hardcode path to 'desktop-file-install' + # 'update-desktop-database' and 'xprop'. Might want to wrap the script instead. + ''; + + # Support for the `postInstall` hook was added only in nixos-20.03, + # so for backwards compatibility reasons lets not use it yet. + installPhase = attrs.installPhase + '' + # Support both the new and old directory structure of vscode extensions. + if [[ -d $out/ms-vsliveshare.vsliveshare ]]; then + cd $out/ms-vsliveshare.vsliveshare + elif [[ -d $out/share/vscode/extensions/ms-vsliveshare.vsliveshare ]]; then + cd $out/share/vscode/extensions/ms-vsliveshare.vsliveshare + else + echo "Could not find extension directory 'ms-vsliveshare.vsliveshare'." >&2 + exit 1 + fi + + bash -s <<ENDSUBSHELL + shopt -s extglob + + # A workaround to prevent the journal filling up due to diagnostic logging. + # See: https://github.com/MicrosoftDocs/live-share/issues/1272 + # See: https://unix.stackexchange.com/questions/481799/how-to-prevent-a-process-from-writing-to-the-systemd-journal + gcc -fPIC -shared -ldl -o dotnet_modules/noop-syslog.so ${./noop-syslog.c} + + # Normally the copying of the right executables is done externally at a later time, + # but we want it done at installation time. + cp dotnet_modules/exes/linux-x64/* dotnet_modules + + # The required executables are already copied over, + # and the other runtimes won't be used and thus are just a waste of space. + rm -r dotnet_modules/exes dotnet_modules/runtimes/!(linux-x64) + + # Not all executables and libraries are executable, so make sure that they are. + find . -type f ! -executable -exec file {} + | grep -w ELF | cut -d ':' -f1 | xargs -rd'\n' chmod +x + + # Not all scripts are executed by passing them to a shell, so they need to be executable as well. + find . -type f -name '*.sh' ! -executable -exec chmod +x {} + + + # Lock the extension downloader. + touch install-linux.Lock externalDeps-linux.Lock + ENDSUBSHELL + ''; + + rpath = makeLibraryPath libs; + + postFixup = '' + # We cannot use `wrapProgram`, because it will generate a relative path, + # which will break when copying over the files. + mv dotnet_modules/vsls-agent{,-wrapped} + makeWrapper $PWD/dotnet_modules/vsls-agent{-wrapped,} \ + --prefix LD_LIBRARY_PATH : "$rpath" \ + --set LD_PRELOAD $PWD/dotnet_modules/noop-syslog.so \ + --set DOTNET_ROOT ${dotnet-sdk_3} + + for bn in check-reqs.sh install.sh uninstall.sh; do + wrapProgram "$PWD/node_modules/@vsliveshare/vscode-launcher-linux/$bn" \ + --prefix PATH : "${makeBinPath [desktop-file-utils xprop]}" + done + ''; + + meta = { + description = "Live Share lets you achieve greater confidence at speed by streamlining collaborative editing, debugging, and more in real-time during development"; + homepage = "https://aka.ms/vsls-docs"; + license = licenses.unfree; + maintainers = with maintainers; [ jraygauthier ]; + platforms = [ "x86_64-linux" ]; + }; +}) diff --git a/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/noop-syslog.c b/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/noop-syslog.c new file mode 100644 index 000000000000..c76ec57a3820 --- /dev/null +++ b/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/noop-syslog.c @@ -0,0 +1 @@ +void syslog(int priority, const char *format, ...) { } diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix index 8f5a92e47222..1d86f82d278f 100644 --- a/pkgs/misc/vscode-extensions/python/default.nix +++ b/pkgs/misc/vscode-extensions/python/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, vscode-utils, extractNuGet , icu, curl, openssl, lttng-ust, autoPatchelfHook -, python3 +, python3, musl , pythonUseFixed ? false # When `true`, the python default setting will be fixed to specified. # Use version from `PATH` for default setting otherwise. # Defaults to `false` as we expect it to be project specific most of the time. @@ -37,12 +37,17 @@ let sha256 = languageServerSha256; }; }; -in vscode-utils.buildVscodeMarketplaceExtension { +in vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "2020.3.71659"; - sha256 = "1smhnhkfchmljz8aj1br70023ysgd2hj6pm1ncn1jxphf89qi1ja"; + version = "2020.9.114305"; + }; + + vsix = fetchurl { + name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; + url = "https://github.com/microsoft/vscode-python/releases/download/${mktplcRef.version}/ms-python-release.vsix"; + sha256 = "1vh0wvfvzszc58lw7dbl60knpm5l6rrsghfchhn5dvwyadx4a33h"; }; buildInputs = [ @@ -50,6 +55,7 @@ in vscode-utils.buildVscodeMarketplaceExtension { curl openssl lttng-ust + musl ]; nativeBuildInputs = [ @@ -81,6 +87,7 @@ in vscode-utils.buildVscodeMarketplaceExtension { meta = with lib; { license = licenses.mit; + platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.jraygauthier ]; }; } diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json index d42da3bbc5bd..ea91b6d6470e 100644 --- a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json +++ b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json @@ -2,21 +2,25 @@ "name": "rust-analyzer", "version": "0.4.0-dev", "dependencies": { - "jsonc-parser": "^2.2.1", - "node-fetch": "^2.6.0", - "vscode-languageclient": "7.0.0-next.1", - "@rollup/plugin-commonjs": "^11.0.2", - "@rollup/plugin-node-resolve": "^7.1.1", - "@types/node": "^12.12.34", - "@types/node-fetch": "^2.5.5", - "@types/vscode": "1.44.0", - "@typescript-eslint/eslint-plugin": "^2.27.0", - "@typescript-eslint/parser": "^2.27.0", - "eslint": "^6.8.0", - "rollup": "^2.3.3", - "tslib": "^1.11.1", - "typescript": "^3.8.3", + "node-fetch": "^2.6.1", + "vscode-languageclient": "7.0.0-next.12", + "@rollup/plugin-commonjs": "^13.0.2", + "@rollup/plugin-node-resolve": "^8.4.0", + "@types/glob": "^7.1.3", + "@types/mocha": "^7.0.2", + "@types/node": "~12.7.0", + "@types/node-fetch": "^2.5.7", + "@types/vscode": "^1.47.1", + "@typescript-eslint/eslint-plugin": "^3.10.1", + "@typescript-eslint/parser": "^3.10.1", + "eslint": "^7.8.0", + "glob": "^7.1.6", + "mocha": "^8.1.3", + "rollup": "^2.26.9", + "tslib": "^2.0.1", + "typescript": "^3.9.7", "typescript-formatter": "^7.2.2", - "vsce": "^1.75.0" + "vsce": "^1.79.5", + "vscode-test": "^1.4.0" } } diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/default.nix b/pkgs/misc/vscode-extensions/rust-analyzer/default.nix index 9f49f4c8eef0..d19027fa5762 100644 --- a/pkgs/misc/vscode-extensions/rust-analyzer/default.nix +++ b/pkgs/misc/vscode-extensions/rust-analyzer/default.nix @@ -32,12 +32,11 @@ in vscode-utils.buildVscodeExtension { nativeBuildInputs = lib.optional setDefaultServerPath jq; - postFixup = lib.optionalString setDefaultServerPath '' - package_json="$out/${publisher}.${pname}/package.json" + preInstall = lib.optionalString setDefaultServerPath '' jq '.contributes.configuration.properties."rust-analyzer.serverPath".default = $s' \ --arg s "${rust-analyzer}/bin/rust-analyzer" \ - $package_json >$package_json.new - mv $package_json.new $package_json + package.json >package.json.new + mv package.json.new package.json ''; meta = with lib; { diff --git a/pkgs/misc/vscode-extensions/updateSettings.nix b/pkgs/misc/vscode-extensions/updateSettings.nix index a033229c5898..c7fecf080720 100644 --- a/pkgs/misc/vscode-extensions/updateSettings.nix +++ b/pkgs/misc/vscode-extensions/updateSettings.nix @@ -16,7 +16,7 @@ let updateVSCodeSettingsCmd = '' ( - echo 'updateSettings.nix: Updating ${vscodeSettingsFile}...' + echo 'updateSettings.nix: Updating ${vscodeSettingsFile}...' oldSettings=$(cat ${vscodeSettingsFile}) echo $oldSettings' ${builtins.toJSON settings}' | ${jq}/bin/jq -s add > ${vscodeSettingsFile} )''; @@ -25,10 +25,10 @@ let fileName = builtins.baseNameOf vscodeSettingsFile; symlinkFromUserSettingCmd = lib.optionalString symlinkFromUserSetting '' && mkdir -p "${userSettingsFolder}" && ln -sfv "$(pwd)/${vscodeSettingsFile}" "${userSettingsFolder}/" ''; -in +in writeShellScriptBin ''vscodeNixUpdate-${lib.removeSuffix ".json" (fileName)}'' - (lib.optionalString (settings != {}) + (lib.optionalString (settings != {}) (if createIfDoesNotExists then '' [ ! -f "${vscodeSettingsFile}" ] && ${createEmptySettingsCmd} ${updateVSCodeSettingsCmd} ${symlinkFromUserSettingCmd} diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json b/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json new file mode 100644 index 000000000000..6e73ee446d86 --- /dev/null +++ b/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json @@ -0,0 +1,24 @@ +{ + "name": "vscode-lldb", + "version": "1.5.3", + "dependencies": { + "@types/json5": "^0.0.30", + "@types/mocha": "^7.0.1", + "@types/node": "^8.10.50", + "@types/vscode": "^1.31.0", + "@types/yauzl": "^2.9.0", + "json5": "^2.1.0", + "memory-streams": "^0.1.3", + "mocha": "^7.0.1", + "source-map-support": "^0.5.12", + "string-argv": "^0.3.1", + "ts-loader": "^6.2.1", + "typescript": "^3.7.0", + "vsce": "^1.73.0", + "vscode-debugadapter-testsupport": "^1.35.0", + "vscode-debugprotocol": "^1.35.0", + "webpack": "^4.39.1", + "webpack-cli": "^3.3.7", + "yauzl": "^2.10.0" + } +} diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch b/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch new file mode 100644 index 000000000000..db62552b913b --- /dev/null +++ b/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch @@ -0,0 +1,45 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,13 +9,6 @@ include(cmake/CopyFiles.cmake) + set(CMAKE_CXX_STANDARD 11) + set(CMAKE_INSTALL_PREFIX $ENV{HOME}/.vscode/extensions/vscode-lldb CACHE PATH "Install location") + +-set(LLDB_ROOT $ENV{LLDB_ROOT} CACHE PATH "Root of LLDB build directory") +-if (LLDB_ROOT) +- message("Using LLDB from ${LLDB_ROOT}") +-else() +- message(FATAL_ERROR "LLDB_ROOT not set." ) +-endif() +- + # General OS-specific definitions + if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + set(DylibPrefix lib) +@@ -64,8 +57,9 @@ set(UpdateFile ${CMAKE_COMMAND} -E copy_if_different) + + # Adapter + +-add_subdirectory(adapter) +-add_subdirectory(lldb) ++add_custom_target(adapter) ++add_custom_target(lldb) ++add_custom_target(codelldb) + + # Extension package content + +@@ -74,16 +68,6 @@ configure_file(package.json ${CMAKE_CURRENT_BINARY_DIR}/package.json @ONLY) + configure_file(webpack.config.js ${CMAKE_CURRENT_BINARY_DIR}/webpack.config.js @ONLY) + file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/package-lock.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) + +-# Run 'npm install' +-execute_process( +- COMMAND ${NPM} install +- WORKING_DIRECTORY ${CMAKE_BINARY_DIR} +- RESULT_VARIABLE Result +-) +-if (NOT ${Result} EQUAL 0) +- message(FATAL_ERROR "npm intall failed: ${Result}") +-endif() +- + # Copy it back, so we can commit the lock file. + file(COPY ${CMAKE_CURRENT_BINARY_DIR}/package-lock.json DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}) +
\ No newline at end of file diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/default.nix b/pkgs/misc/vscode-extensions/vscode-lldb/default.nix new file mode 100644 index 000000000000..f22c9df36a1b --- /dev/null +++ b/pkgs/misc/vscode-extensions/vscode-lldb/default.nix @@ -0,0 +1,106 @@ +{ lib, stdenv, vscode-utils, fetchFromGitHub, rustPlatform, makeWrapper, jq +, nodePackages, cmake, nodejs, unzip, python3, lldb, breakpointHook +, setDefaultLldbPath ? true +}: +assert lib.versionAtLeast python3.version "3.5"; +let + publisher = "vadimcn"; + name = "vscode-lldb"; + version = "1.5.3"; + + dylibExt = stdenv.hostPlatform.extensions.sharedLibrary; + + src = fetchFromGitHub { + owner = "vadimcn"; + repo = "vscode-lldb"; + rev = "v${version}"; + sha256 = "1139945j3z0fxc3nlyvd81k0ypymqsj051idrbgbibwshpi86y93"; + fetchSubmodules = true; + }; + + adapter = rustPlatform.buildRustPackage { + pname = "${name}-adapter"; + inherit version src; + + cargoSha256 = "0jl4msf2jcjxddwqkx8fr0c35wg4vwvg5c19mihri1v34i09zc5r"; + + # It will pollute the build environment of `buildRustPackage`. + cargoPatches = [ ./reset-cargo-config.patch ]; + + nativeBuildInputs = [ makeWrapper ]; + + buildAndTestSubdir = "adapter"; + + # Hack: Need a nightly compiler. + RUSTC_BOOTSTRAP = 1; + + # `adapter` expects a special hierarchy to resolve everything well. + postInstall = '' + mkdir -p $out/adapter + mv -t $out/adapter \ + $out/bin/* \ + $out/lib/* \ + ./adapter/*.py \ + ./formatters/*.py + rmdir $out/{bin,lib} + ''; + + postFixup = '' + wrapProgram $out/adapter/codelldb \ + --prefix PATH : "${python3}/bin" \ + --prefix LD_LIBRARY_PATH : "${python3}/lib" + ''; + }; + + build-deps = nodePackages."vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps"; + + vsix = stdenv.mkDerivation { + name = "${name}-${version}-vsix"; + inherit src; + + # Only build the extension. We handle `adapter` and `lldb` with nix. + patches = [ ./cmake-build-extension-only.patch ]; + + nativeBuildInputs = [ cmake nodejs unzip breakpointHook ]; + + postConfigure = '' + cp -r ${build-deps}/lib/node_modules/vscode-lldb/{node_modules,package-lock.json} . + ''; + + makeFlags = [ "vsix_bootstrap" ]; + + installPhase = '' + unzip ./codelldb-bootstrap.vsix 'extension/*' -d ./vsix-extracted + mv vsix-extracted/extension $out + + ln -s ${adapter}/adapter $out + # Mark that adapter and lldb are installed. + touch $out/platform.ok + ''; + + dontStrip = true; + dontPatchELF = true; + }; + +in vscode-utils.buildVscodeExtension { + inherit name; + src = vsix; + + nativeBuildInputs = lib.optional setDefaultLldbPath jq; + postUnpack = lib.optionalString setDefaultLldbPath '' + jq '.contributes.configuration.properties."lldb.library".default = $s' \ + --arg s "${lldb}/lib/liblldb.so" \ + $sourceRoot/package.json >$sourceRoot/package.json.new + mv $sourceRoot/package.json.new $sourceRoot/package.json + ''; + + vscodeExtUniqueId = "${publisher}.${name}"; + + meta = with lib; { + description = "A native debugger extension for VSCode based on LLDB"; + homepage = "https://github.com/vadimcn/vscode-lldb"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ oxalica ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/reset-cargo-config.patch b/pkgs/misc/vscode-extensions/vscode-lldb/reset-cargo-config.patch new file mode 100644 index 000000000000..300f8cd96ef9 --- /dev/null +++ b/pkgs/misc/vscode-extensions/vscode-lldb/reset-cargo-config.patch @@ -0,0 +1,11 @@ +--- a/.cargo/config ++++ b/.cargo/config +@@ -1,8 +0,0 @@ +-[build] +-target-dir = "build/target" +- +-[target.armv7-unknown-linux-gnueabihf] +-linker = "arm-linux-gnueabihf-gcc" +- +-[target.aarch64-unknown-linux-gnu] +-linker = "aarch64-linux-gnu-gcc" diff --git a/pkgs/misc/vscode-extensions/vscode-utils.nix b/pkgs/misc/vscode-extensions/vscode-utils.nix index 743ae13a3e4a..1de3bce3d0db 100644 --- a/pkgs/misc/vscode-extensions/vscode-utils.nix +++ b/pkgs/misc/vscode-extensions/vscode-utils.nix @@ -1,12 +1,7 @@ { stdenv, lib, buildEnv, writeShellScriptBin, fetchurl, vscode, unzip, jq }: let - extendedPkgVersion = lib.getVersion vscode; - extendedPkgName = lib.removeSuffix "-${extendedPkgVersion}" vscode.name; - - buildVscodeExtension = a@{ name, - namePrefix ? "${extendedPkgName}-extension-", src, # Same as "Unique Identifier" on the extension's web page. # For the moment, only serve as unique extension dir. @@ -18,14 +13,14 @@ let buildInputs ? [], ... }: - stdenv.mkDerivation ((removeAttrs a [ "vscodeExtUniqueId" ]) // { + stdenv.mkDerivation ((removeAttrs a [ "vscodeExtUniqueId" ]) // { - name = namePrefix + name; + name = "vscode-extension-${name}"; inherit vscodeExtUniqueId; inherit configurePhase buildPhase dontPatchELF dontStrip; - installPrefix = "share/${extendedPkgName}/extensions/${vscodeExtUniqueId}"; + installPrefix = "share/vscode/extensions/${vscodeExtUniqueId}"; buildInputs = [ unzip ] ++ buildInputs; @@ -80,7 +75,7 @@ let vscodeDefault = vscode; }; - + vscodeExts2nix = import ./vscodeExts2nix.nix { inherit lib writeShellScriptBin; vscodeDefault = vscode; @@ -90,7 +85,7 @@ let inherit lib buildEnv writeShellScriptBin extensionsFromVscodeMarketplace jq; vscodeDefault = vscode; }; -in +in { inherit fetchVsixFromVscodeMarketplace buildVscodeExtension buildVscodeMarketplaceExtension extensionFromVscodeMarketplace diff --git a/pkgs/misc/vscode-extensions/vscodeEnv.nix b/pkgs/misc/vscode-extensions/vscodeEnv.nix index 6e4bb7b3ea88..7c58a4bdfb34 100644 --- a/pkgs/misc/vscode-extensions/vscodeEnv.nix +++ b/pkgs/misc/vscode-extensions/vscodeEnv.nix @@ -21,13 +21,13 @@ , user-data-dir ? ''"''${TMP}''${name}"/vscode-data-dir'' # if file exists will use it and import the extensions in it into this dervation else will use empty extensions list # this file will be created/updated by vscodeExts2nix when vscode exists -, mutableExtensionsFile +, mutableExtensionsFile }: -let +let mutableExtensionsFilePath = toString mutableExtensionsFile; - mutableExtensions = if builtins.pathExists mutableExtensionsFile + mutableExtensions = if builtins.pathExists mutableExtensionsFile then import mutableExtensionsFilePath else []; - vscodeWithConfiguration = import ./vscodeWithConfiguration.nix { + vscodeWithConfiguration = import ./vscodeWithConfiguration.nix { inherit lib writeShellScriptBin extensionsFromVscodeMarketplace; vscodeDefault = vscode; } @@ -63,19 +63,19 @@ let symlinkFromUserSetting = (user-data-dir != ""); }; - vscodeExts2nix = import ./vscodeExts2nix.nix { + vscodeExts2nix = import ./vscodeExts2nix.nix { inherit lib writeShellScriptBin; vscodeDefault = vscodeWithConfiguration; } { extensionsToIgnore = nixExtensions; - extensions = mutableExtensions; + extensions = mutableExtensions; }; code = writeShellScriptBin "code" '' ${updateSettingsCmd}/bin/vscodeNixUpdate-settings ${updateLaunchCmd}/bin/vscodeNixUpdate-launch ${updateKeybindingsCmd}/bin/vscodeNixUpdate-keybindings - ${vscodeWithConfiguration}/bin/code --wait "$@" + ${vscodeWithConfiguration}/bin/code --wait "$@" echo 'running vscodeExts2nix to update ${mutableExtensionsFilePath}...' ${vscodeExts2nix}/bin/vscodeExts2nix > ${mutableExtensionsFilePath} ''; diff --git a/pkgs/misc/vscode-extensions/vscodeEnvTest.nix b/pkgs/misc/vscode-extensions/vscodeEnvTest.nix index d7e586cab6ec..19a9edbf1afe 100644 --- a/pkgs/misc/vscode-extensions/vscodeEnvTest.nix +++ b/pkgs/misc/vscode-extensions/vscodeEnvTest.nix @@ -1,5 +1,5 @@ with import <nixpkgs>{}; -callPackage (import ./vscodeEnv.nix) { +callPackage (import ./vscodeEnv.nix) { extensionsFromVscodeMarketplace = vscode-utils.extensionsFromVscodeMarketplace; vscodeDefault = vscode; } { @@ -9,4 +9,3 @@ callPackage (import ./vscodeEnv.nix) { t = "test"; }; } - diff --git a/pkgs/misc/vscode-extensions/vscodeExts2nix.nix b/pkgs/misc/vscode-extensions/vscodeExts2nix.nix index afd176b4c5e4..58ad5866c935 100644 --- a/pkgs/misc/vscode-extensions/vscodeExts2nix.nix +++ b/pkgs/misc/vscode-extensions/vscodeExts2nix.nix @@ -1,24 +1,24 @@ -# based on the passed vscode will stdout a nix expression with the installed vscode extensions +# based on the passed vscode will stdout a nix expression with the installed vscode extensions { lib , vscodeDefault , writeShellScriptBin }: ##User input -{ vscode ? vscodeDefault +{ vscode ? vscodeDefault , extensionsToIgnore ? [] # will use those extensions to get sha256 if still exists when executed. -, extensions ? [] +, extensions ? [] }: -let +let mktplcExtRefToFetchArgs = import ./mktplcExtRefToFetchArgs.nix; in writeShellScriptBin "vscodeExts2nix" '' - echo '[' + echo '[' for line in $(${vscode}/bin/code --list-extensions --show-versions \ ${lib.optionalString (extensionsToIgnore != []) '' - | grep -v -i '^\(${lib.concatMapStringsSep "\\|" (e : ''${e.publisher}.${e.name}'') extensionsToIgnore}\)' + | grep -v -i '^\(${lib.concatMapStringsSep "\\|" (e : ''${e.publisher}.${e.name}'') extensionsToIgnore}\)' ''} ) ; do [[ $line =~ ([^.]*)\.([^@]*)@(.*) ]] diff --git a/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix b/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix index f15d14c74418..e20c631f8c03 100644 --- a/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix +++ b/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix @@ -1,22 +1,22 @@ # wrapper over vscode to control extensions per project (extensions folder will be created in execution path) -{ lib -, writeShellScriptBin -, extensionsFromVscodeMarketplace +{ lib +, writeShellScriptBin +, extensionsFromVscodeMarketplace , vscodeDefault }: ## User input -{ vscode ? vscodeDefault +{ vscode ? vscodeDefault # extensions to be symlinked into the project's extensions folder -, nixExtensions ? [] +, nixExtensions ? [] # extensions to be copied into the project's extensions folder -, mutableExtensions ? [] -, vscodeExtsFolderName ? ".vscode-exts" +, mutableExtensions ? [] +, vscodeExtsFolderName ? ".vscode-exts" , user-data-dir ? ''"''${TMP}vscodeWithConfiguration/vscode-data-dir"'' }: -let +let nixExtsDrvs = extensionsFromVscodeMarketplace nixExtensions; mutExtsDrvs = extensionsFromVscodeMarketplace mutableExtensions; - mutableExtsPaths = lib.forEach mutExtsDrvs ( e: + mutableExtsPaths = lib.forEach mutExtsDrvs ( e: { origin = ''${e}/share/vscode/extensions/${e.vscodeExtUniqueId}''; target = ''${vscodeExtsFolderName}/${e.vscodeExtUniqueId}-${(lib.findSingle (ext: ''${ext.publisher}.${ext.name}'' == e.vscodeExtUniqueId) "" "m" mutableExtensions ).version}''; @@ -39,16 +39,16 @@ let cp -a ${ePath.origin} ${ePath.target} chmod -R u+rwx ${ePath.target} fi - '') mutableExtsPaths} + '') mutableExtsPaths} ''; in writeShellScriptBin "code" '' - if ! [[ "$@" =~ "--list-extension" ]]; then - mkdir -p "${vscodeExtsFolderName}" + if ! [[ "$@" =~ "--list-extension" ]]; then + mkdir -p "${vscodeExtsFolderName}" ${rmExtensions} ${cpExtensions} fi - ${vscode}/bin/code --extensions-dir "${vscodeExtsFolderName}" ${ + ${vscode}/bin/code --extensions-dir "${vscodeExtsFolderName}" ${ lib.optionalString (user-data-dir != "") ''--user-data-dir ${user-data-dir }'' } "$@" '' diff --git a/pkgs/misc/vscode-extensions/wakatime/default.nix b/pkgs/misc/vscode-extensions/wakatime/default.nix index 30b2f94f1a58..b1c7142c5917 100644 --- a/pkgs/misc/vscode-extensions/wakatime/default.nix +++ b/pkgs/misc/vscode-extensions/wakatime/default.nix @@ -8,8 +8,8 @@ in mktplcRef = { name = "vscode-wakatime"; publisher = "WakaTime"; - version = "4.0.0"; - sha256 = "0bwxz8dg00k8frnvkvcngll5yaf9k7z13dg309vmw8xbdgkiyid4"; + version = "4.0.9"; + sha256 = "0sm2fr9zbk1759r52dpnz9r7xbvxladlpinlf2i0hyaa06bhp3b1"; }; postPatch = '' |