diff options
Diffstat (limited to 'pkgs/applications')
24 files changed, 436 insertions, 262 deletions
diff --git a/pkgs/applications/blockchains/erigon.nix b/pkgs/applications/blockchains/erigon/default.nix index d656db3c47c..f4e5b1de652 100644 --- a/pkgs/applications/blockchains/erigon.nix +++ b/pkgs/applications/blockchains/erigon/default.nix @@ -1,18 +1,21 @@ { lib, buildGoModule, fetchFromGitHub }: +let + pinData = lib.importJSON ./pin.json; +in buildGoModule rec { pname = "erigon"; - version = "2.30.0"; + version = pinData.version; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-s5D+Ps5S95AyNh7tt2SnTvUxNHzOothsMZA7NW3x0yM="; + sha256 = pinData.sha256; fetchSubmodules = true; }; - vendorSha256 = "sha256-ICoThps7c4+9NQPeaASQ88YVbczJD/MgF2ldOmKjgvc="; + vendorSha256 = pinData.vendorSha256; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: diff --git a/pkgs/applications/blockchains/erigon/pin.json b/pkgs/applications/blockchains/erigon/pin.json new file mode 100644 index 00000000000..e274f307007 --- /dev/null +++ b/pkgs/applications/blockchains/erigon/pin.json @@ -0,0 +1,5 @@ +{ + "version": "2.31.0", + "sha256": "sha256-+qVfujPKy/HAkMOJQdHI3G1pBoYG2Lhm5BKHrvf3lv0=", + "vendorSha256": "sha256-XTGbwMEuLBEXP/QAR8RLRPrbvz2ReCLg4tCogbqHiHg=" +} diff --git a/pkgs/applications/blockchains/erigon/update.sh b/pkgs/applications/blockchains/erigon/update.sh new file mode 100755 index 00000000000..c50a7a20f29 --- /dev/null +++ b/pkgs/applications/blockchains/erigon/update.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i oil -p jq sd nix-prefetch-github ripgrep + +# TODO set to `verbose` or `extdebug` once implemented in oil +shopt --set xtrace +# we need failures inside of command subs to get the correct vendorSha256 +shopt --unset inherit_errexit + +const directory = $(dirname $0 | xargs realpath) +const owner = "ledgerwatch" +const repo = "erigon" +const latest_rev = $(curl -q https://api.github.com/repos/${owner}/${repo}/releases/latest | \ + jq -r '.tag_name') +const latest_version = $(echo $latest_rev | sd 'v' '') +const current_version = $(jq -r '.version' $directory/pin.json) +if ("$latest_version" === "$current_version") { + echo "$repo is already up-to-date" + return 0 +} else { + const tarball_meta = $(nix-prefetch-github $owner $repo --rev "$latest_rev" --fetch-submodules) + const tarball_hash = "sha256-$(echo $tarball_meta | jq -r '.sha256')" + + jq ".version = \"$latest_version\" | \ + .\"sha256\" = \"$tarball_hash\" | \ + .\"vendorSha256\" = \"\"" $directory/pin.json | sponge $directory/pin.json + + const new_vendor_sha256 = $(nix-build -A erigon 2>&1 | \ + tail -n 2 | \ + head -n 1 | \ + sd '\s+got:\s+' '') + + jq ".vendorSha256 = \"$new_vendor_sha256\"" $directory/pin.json | sponge $directory/pin.json +} diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 3bed576e5db..86815bd55ba 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -12,22 +12,10 @@ let appimageContents = appimageTools.extractType2 { inherit pname version src; }; - - # Hotplug events from udevd are fired into the kernel, which then re-broadcasts them over a - # special socket, to every libudev client listening for hotplug when the kernel does that. It will - # try to preserve the uid of the sender but a non-root namespace (like the fhs-env) cant map root - # to a uid, for security reasons, so the uid of the sender becomes nobody and libudev actively - # rejects such messages. This patch disables that bit of security in libudev. - # See: https://github.com/NixOS/nixpkgs/issues/116361 - systemdPatched = systemd.overrideAttrs ({ patches ? [ ], ... }: { - patches = patches ++ [ ./systemd.patch ]; - }); in appimageTools.wrapType2 rec { inherit pname version src; - extraPkgs = pkgs: [ systemdPatched ]; - extraInstallCommands = '' mv $out/bin/${pname}-${version} $out/bin/${pname} install -m 444 -D ${appimageContents}/ledger-live-desktop.desktop $out/share/applications/ledger-live-desktop.desktop diff --git a/pkgs/applications/blockchains/ledger-live-desktop/systemd.patch b/pkgs/applications/blockchains/ledger-live-desktop/systemd.patch deleted file mode 100644 index a70053d7118..00000000000 --- a/pkgs/applications/blockchains/ledger-live-desktop/systemd.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/libsystemd/sd-device/device-monitor.c b/src/libsystemd/sd-device/device-monitor.c -index fd5900704d..f9106fdbe5 100644 ---- a/src/libsystemd/sd-device/device-monitor.c -+++ b/src/libsystemd/sd-device/device-monitor.c -@@ -445,9 +445,6 @@ int device_monitor_receive_device(sd_device_monitor *m, sd_device **ret) { - "sd-device-monitor: No sender credentials received, message ignored."); - - cred = (struct ucred*) CMSG_DATA(cmsg); -- if (cred->uid != 0) -- return log_debug_errno(SYNTHETIC_ERRNO(EAGAIN), -- "sd-device-monitor: Sender uid="UID_FMT", message ignored.", cred->uid); - - if (streq(buf.raw, "libudev")) { - /* udev message needs proper version magic */ diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix index 3fed7fda38a..29749c35db1 100644 --- a/pkgs/applications/editors/neovim/tests/default.nix +++ b/pkgs/applications/editors/neovim/tests/default.nix @@ -1,5 +1,5 @@ # run tests by building `neovim.tests` -{ vimUtils, vim_configurable, writeText, neovim, vimPlugins +{ vimUtils, writeText, neovim, vimPlugins , lib, fetchFromGitHub, neovimUtils, wrapNeovimUnstable , neovim-unwrapped , fetchFromGitLab diff --git a/pkgs/applications/editors/spacevim/default.nix b/pkgs/applications/editors/spacevim/default.nix index ef3a6538c7c..8252f8ce1c1 100644 --- a/pkgs/applications/editors/spacevim/default.nix +++ b/pkgs/applications/editors/spacevim/default.nix @@ -2,7 +2,7 @@ , git , fzf , makeWrapper -, vim_configurable +, vim-full , vimPlugins , fetchFromGitHub , lib @@ -14,7 +14,7 @@ let format = formats.toml { }; - vim-customized = vim_configurable.customize { + vim-customized = vim-full.customize { name = "vim"; # Not clear at the moment how to import plugins such that # SpaceVim finds them and does not auto download them to diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 11ddddaefc2..ad64772de55 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -63,7 +63,7 @@ let in stdenv.mkDerivation rec { - pname = "vim_configurable"; + pname = "vim-full"; inherit (common) version postPatch hardeningDisable enableParallelBuilding meta; diff --git a/pkgs/applications/editors/vim/macvim-configurable.nix b/pkgs/applications/editors/vim/macvim-configurable.nix index 7ed3dee9b6b..5c436307897 100644 --- a/pkgs/applications/editors/vim/macvim-configurable.nix +++ b/pkgs/applications/editors/vim/macvim-configurable.nix @@ -6,9 +6,9 @@ let makeCustomizable = macvim: macvim // { # configure expects the same args as vimUtils.vimrcFile. # This is the same as the value given to neovim.override { configure = … } - # or the value of vim_configurable.customize { vimrcConfig = … } + # or the value of vim-full.customize { vimrcConfig = … } # - # Note: Like neovim and vim_configurable, configuring macvim disables the + # Note: Like neovim and vim-full, configuring macvim disables the # sourcing of the user's vimrc. Use `customRC = "source $HOME/.vim/vimrc"` # if you want to preserve that behavior. configure = let diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 6188496a80b..d9ba0371714 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -161,12 +161,12 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2022-12-06"; + version = "2022-12-09"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "1326f60715adf6c434c0a6287e071af02d13dc26"; - sha256 = "1zk7xy8fm5hqvbcn3jcpw7x0l4vcjx7zi09a04xvds1jf09s8l6g"; + rev = "3ce1a63f85128beea8d74a52baacea11c105bf0f"; + sha256 = "10mzrhhnh9jsxagpzx5pw3j4xnv573769wg9zk004y2h76pwyg2j"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -799,24 +799,24 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2022-12-03"; + version = "2022-12-09"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "e5f1393350cf842389be289c03885b92ab29ffb3"; - sha256 = "1dkbplm6h7gmf4w7gjs823qjczvvmlqqpnljlb91mglqpcd7wc87"; + rev = "bfb2ab023499251c72f922b584e28ba52b0f7791"; + sha256 = "1gzlcmag12gk7xy0rvsxfix9d6g7s50fsvcqwp4rk70y83dl5ijq"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; barbecue-nvim = buildVimPluginFrom2Nix { pname = "barbecue.nvim"; - version = "2022-12-05"; + version = "2022-12-07"; src = fetchFromGitHub { owner = "utilyre"; repo = "barbecue.nvim"; - rev = "2f242375df96e8a82089d4424e5db0d237c5ae46"; - sha256 = "14gbx10gpng0n2bb3x7lbzx9n3vdw900yw19fa8qf9mlvi36gpxx"; + rev = "50b3c69a39f70d7b99661d82f37bb9b04eca25bd"; + sha256 = "0p69khfwlgcqrq8d6d2xrr4913vpc7hywz498h3ig5mqaik6bsy5"; }; meta.homepage = "https://github.com/utilyre/barbecue.nvim/"; }; @@ -1339,12 +1339,12 @@ final: prev: cmp-latex-symbols = buildVimPluginFrom2Nix { pname = "cmp-latex-symbols"; - version = "2022-06-17"; + version = "2022-12-08"; src = fetchFromGitHub { owner = "kdheepak"; repo = "cmp-latex-symbols"; - rev = "46e7627afa8c8ff57158d1c29d721d8efebbc39f"; - sha256 = "10354d12in7sr5hdamj0cw8hgja6pwl70i9lcxlnha5jzkx8xm03"; + rev = "1ec2e4f47cde6c7ffcebec92cfec58ddc1f6689a"; + sha256 = "093wj6kfln2lsgcijnwjj924lbgld0vhfvx8w0kfhlhpv5fr5dfz"; }; meta.homepage = "https://github.com/kdheepak/cmp-latex-symbols/"; }; @@ -2023,24 +2023,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2022-12-07"; + version = "2022-12-09"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "295c64b9f9084a78db4eee7450483ce3caf541e0"; - sha256 = "1ga254s56gbyyywwif4lhfgak3w5gam5ldry33d8h7nqfrvbmmdr"; + rev = "3cc371dbddb400c0fc5e8edeb423b14cd5084276"; + sha256 = "1wblwq215xldsl86m728866n677q064x55xm425riisd376xarka"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2022-12-07"; + version = "2022-12-09"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "b601b48b9a12ab4cd5baedc633f88b48a74100c5"; - sha256 = "0m93y7m159plhwwrsdqr7d651fzbp0z3p49g9l4v199kvsq0x50a"; + rev = "ccc1f692da9fbb9a87fe7eb5ccd341a3c35283a6"; + sha256 = "021cyhwza7skml7j0k26mf159myr4d8j8m9rq01id0j3xy5zqjgb"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2059,12 +2059,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-12-07"; + version = "2022-12-09"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "fd9c9eb2361f327969368f8eeadd063e5a7d5abe"; - sha256 = "070a632szjhb342jz41gg7lhw4m11wi5n33f1z8mhc976yy53cas"; + rev = "95d658235c75016dcfd4e1468d07de72a4bfad49"; + sha256 = "1nsy1j221hps1z3rxvq9xd4k29wxjl3wss2dcpgcillgspl9rrrz"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2095,12 +2095,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2022-11-17"; + version = "2022-12-08"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "e11e27864428a68b25e43b833e9081e350a38d96"; - sha256 = "15yma6waw0914i3z3ck50ndris4s7b9297lcjzsb7vxwkfnrkn9i"; + rev = "22fcb7a623bab743fcae1532b272ae52a6e24fda"; + sha256 = "0cspbrbx3zz6zp59bbj6qx1f17xcbvcbx1920z8l1c1cisdh4m4a"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2577,24 +2577,24 @@ final: prev: dial-nvim = buildVimPluginFrom2Nix { pname = "dial.nvim"; - version = "2022-10-22"; + version = "2022-12-08"; src = fetchFromGitHub { owner = "monaqa"; repo = "dial.nvim"; - rev = "9ba17c2ee636a8e7fdef5b69d6aac54dd26f4384"; - sha256 = "0c22dg8mscgv8kgxmynj0vagp2lrccp1mjv0ski3mr5d4gq83x9q"; + rev = "f6d274bd8e32be65b99f1052a8b5353ef5e702d7"; + sha256 = "0lnzs4qqbnbrkxfp40hwrpvh0579qw0bnayjz0qzqhi115fss136"; }; meta.homepage = "https://github.com/monaqa/dial.nvim/"; }; diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2022-12-06"; + version = "2022-12-08"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "e37b2d9aaba408954d0e894e27e6f4dbf939ef95"; - sha256 = "0a9m0ymjj6y1nmpf0yxzvqnz1j2ppwis43a26iqr94i4n5kva393"; + rev = "85903aa26257a4ea42c4bdbf3c998a2006aaaec5"; + sha256 = "1032blq53y5zdlg4y3zpbi1lmk07qg3p6061dia2hjmfhbkcdzs4"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -2751,8 +2751,8 @@ final: prev: src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "bed286c9f787a2b6f49edaa47bc286ff93a304b5"; - sha256 = "1987f2nm1rg5ig5qbi1nfsmm2iamypbimhw38m7ammv1wda840fx"; + rev = "478b697fb5605956da781bfe7c1de7a89f4a1628"; + sha256 = "03n2f5nvnjkz9h74wqc5bl04v9snq285dg75gj0lrxcrg0y6j63q"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; @@ -2843,12 +2843,12 @@ final: prev: ferret = buildVimPluginFrom2Nix { pname = "ferret"; - version = "2022-06-12"; + version = "2022-12-08"; src = fetchFromGitHub { owner = "wincent"; repo = "ferret"; - rev = "3d064304876941e4197db6b4264db6b72bd9f83d"; - sha256 = "1lkznmavw2f4ckh3yjjvdhja313ia0aayn5pkf6ygjny1089gcih"; + rev = "22cf052269b1143cd579b81c9390880ac712b67f"; + sha256 = "0pwwyf0fwwqaxa9sqm74aqy5r0wvyh24csg8mwp4cyhkdnk2w1rf"; }; meta.homepage = "https://github.com/wincent/ferret/"; }; @@ -3706,12 +3706,12 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline.nvim"; - version = "2022-09-02"; + version = "2022-12-08"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "db7cbcb40cc00fc5d6074d7569fb37197705e7f6"; - sha256 = "1r9y6zqar0gv8kvqqxlh07ifa16h5yqa24fj22qw63vgnysbxqbp"; + rev = "c4c203c3e8a595bc333abaf168fcb10c13ed5fb7"; + sha256 = "1kanfs0c1rbi23dm0vkmyzg4qkxq18hc2jc2izvyqiklbpi49x06"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -4007,12 +4007,12 @@ final: prev: lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2022-12-04"; + version = "2022-12-09"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "25cfbde4c5c01133ec36fbc0fd44d9c7cf99e397"; - sha256 = "02d43j8v5lnwg48x11nzdh270fhia1flbqv682ss391zcl0z2h7q"; + rev = "60a0ab74cb1bded492cebf2f5f4f25868b52d1ee"; + sha256 = "1rqgb90dh91l4pgkj6gl79lmnxynmr2w8iiwpx3rvyfbpsrkqyhi"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -4055,12 +4055,12 @@ final: prev: legendary-nvim = buildVimPluginFrom2Nix { pname = "legendary.nvim"; - version = "2022-12-07"; + version = "2022-12-08"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "78cc8984cd5f3afb71f8f053f0a1d4708069f2c8"; - sha256 = "08n243nz39sw6c6ihaz9x64ws1vlj7pp180lrhl3ifqgnaj1ymfb"; + rev = "7be09ac0cf0ac12d65e41c706822a24eb0b92971"; + sha256 = "08wz13l9lhqx21l1d32724mqpk3x10kakbw8r88isnwi8psbfs9r"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -4967,12 +4967,12 @@ final: prev: neoconf-nvim = buildVimPluginFrom2Nix { pname = "neoconf.nvim"; - version = "2022-12-07"; + version = "2022-12-08"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "a292a8a4927278c4c9e7653cf0a37cd40c17d0fb"; - sha256 = "1j2n4k02b5648ayarqdcw312ynd9j50gm3l5ish6fav6k4ipngq6"; + rev = "44da95e38c294ddc43fe6b39df6b6e99ecfda52a"; + sha256 = "1hkzf105900zfclan6qckpvljs0mk48dgjxdf80fq0khy0c1whhy"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5135,12 +5135,12 @@ final: prev: neotest = buildVimPluginFrom2Nix { pname = "neotest"; - version = "2022-12-05"; + version = "2022-12-08"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "d9bd5b05983ccfa349ff2692a5adb17b227088b5"; - sha256 = "05iqzzmxvzb0s6v68pl2wjc643bwhd1mc3r2mrywkj99n8k6mn3k"; + rev = "a77f3ab85518b0cfb43d6074c27f3a2abc0aac75"; + sha256 = "1fwmx1b6z8pfbb2baj198saliwf5572bvh69ma1ch6zm593vkp2z"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; @@ -5363,12 +5363,12 @@ final: prev: nordic-nvim = buildVimPluginFrom2Nix { pname = "nordic.nvim"; - version = "2022-11-05"; + version = "2022-12-08"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "nordic.nvim"; - rev = "cb2d7dff4e698cda93775ad61169b08c9461ca88"; - sha256 = "0ryp42mcvgknxj9yq0i314vx1ig1x88qjvi2ipb92l6mvwnaqps7"; + rev = "cd552784eeeae61644fec60f6cc52c267dbddc73"; + sha256 = "0pv3z3kz1v399q283fymz10rq46980a5z2nvhzrfg3i0ws4gpni0"; }; meta.homepage = "https://github.com/andersevenrud/nordic.nvim/"; }; @@ -5387,24 +5387,24 @@ final: prev: nui-nvim = buildVimPluginFrom2Nix { pname = "nui.nvim"; - version = "2022-10-27"; + version = "2022-12-09"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "d12a6977846b2fa978bff89b439e509320854e10"; - sha256 = "1ghj8kjv2skh2hd9m6sghvj6pya8d9jvr5m9l9q1r0sg1i5x1kjy"; + rev = "2a6533fb798efad7dd783311315bab8dc5eb381b"; + sha256 = "08r8ddpxs6zf13vkdjcvhczh6g4r4hkfag5yqkc3pa57wfrda8f2"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-12-05"; + version = "2022-12-08"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "b3d2ebdb75cf1fa4290822b43dc31f61bd0023f8"; - sha256 = "01ri9sk5p67lkv1jf6zia8l87prrsccyz2862pk7brsmyaja22kw"; + rev = "a0acd495f5edce6d4d5d3c6bd63d2319ccded9ed"; + sha256 = "1d5ybbpl0vfszfxjx9rkvd76j8jibcjqbgb9njy36d15qq3fv0ph"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -5627,12 +5627,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2022-12-01"; + version = "2022-12-09"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "8f396b7836b9bbda9edd9f655f12ca377ae97676"; - sha256 = "0jbl9ima5q5f0rcjac8p35by96wha3ph2518d1mjbliawfdl23p1"; + rev = "a8fd28aec46fe9f5dd42f8d5939217ce60787d73"; + sha256 = "0sxq0nlhgk2q1yz8nyj21z2mxgfg383jm00s6j0hggq02v3a86mz"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -5795,12 +5795,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2022-12-05"; + version = "2022-12-08"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "82e9feb6eb6000cea42b4cddf5b31daf624173bb"; - sha256 = "1f7akw10npsvabgprg4vm23nqxiy679rp2cbyfywkis2hjb4mraw"; + rev = "e0147c1b0f94708392783bbb44db8cd8bf8c84d4"; + sha256 = "1m015d36yxq3q5f2pw9bpn3jrr35gi333c78x8brzng7l592zs8j"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -5855,12 +5855,12 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2022-12-05"; + version = "2022-12-08"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "46e14866fd2876a18772f913c6c14f5545c6034a"; - sha256 = "16gnlbghywq6ksfmbzfgl9mj4d9gywdqkj8i4jsgl6h4qkvp4hb3"; + rev = "5b6d0463e956b625cd17b51ad391bae9ee5bea92"; + sha256 = "0ignv8w27jzxg1a3c884j0xgy10bwkbdk1inip9jrv3hpai2x9rj"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -5879,12 +5879,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-12-07"; + version = "2022-12-09"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "c7206327096bedf2e213788a60624a84b3b7552d"; - sha256 = "1f310ng3i69mlp429fcq65fqrfigdpmnsixq91qyan964cn1b13r"; + rev = "8a3e5f9add9cd408c7063619c8d612700bf25d4d"; + sha256 = "1cjv3pdbmgjh956sp02vjg4i5bjfimj8awahvw9a9bjkwr56d8wl"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -5927,12 +5927,12 @@ final: prev: nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2022-11-26"; + version = "2022-12-09"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "92f7451aa0dd0267027ab9a5850a4b7c1af33341"; - sha256 = "16bifycciggvsq5mxp43w21jdh8r57yhsrs7bnwgzy19h0q5lm8w"; + rev = "d1c01907256dae7c9d55ba1fcfb8cf6b4f583325"; + sha256 = "0w7sya5pyfj9ad4295200j32ibsg5w9qx6icnlfv2fac03r4ir65"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -6027,8 +6027,8 @@ final: prev: src = fetchFromGitHub { owner = "petertriho"; repo = "nvim-scrollbar"; - rev = "779cf6f5e7ebcd78acf37dff35a240e03f616357"; - sha256 = "0hz9y3q84azi3grzac7i6dazv982g7di7limd1qajx8x3hbbfvyx"; + rev = "f45aecbba9c402282dfc99721e0ad4c08710907c"; + sha256 = "0aga91mvkgm8l2nqk2ng8rcgn2a10f5z4xdk66p7afddc8xzk32p"; }; meta.homepage = "https://github.com/petertriho/nvim-scrollbar/"; }; @@ -6119,12 +6119,12 @@ final: prev: nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-12-07"; + version = "2022-12-09"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "440401c506ec9b87cd3824ad17631115ab860cc5"; - sha256 = "1xyb73vavp38mr7lvjbwd9hmqlc4bw41g1wg0fs8fflabjy3bals"; + rev = "35ad87384b3e47b3b5758d1642bbea08c70200c0"; + sha256 = "0jy5lq1r7dq1ib3mmx3izihcxv985rda468h33y0hvk11l36mx88"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -6263,12 +6263,12 @@ final: prev: nvimdev-nvim = buildVimPluginFrom2Nix { pname = "nvimdev.nvim"; - version = "2022-11-10"; + version = "2022-12-08"; src = fetchFromGitHub { owner = "neovim"; repo = "nvimdev.nvim"; - rev = "5f4f2f294d45dbdf1936b81b9bcae97651f46fbd"; - sha256 = "0xzfjfs3z4v3w3hc7kvq33a8xyfxxha0x6vpgl4p7vh8rvxc5n8d"; + rev = "3220bb394ab059888b1b0498bbe43d9435ccee22"; + sha256 = "01alhc1wlh7g0b1p0x2q49v4srh2vqiwcgv7sjis89wz2dnq5n48"; }; meta.homepage = "https://github.com/neovim/nvimdev.nvim/"; }; @@ -6359,12 +6359,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2022-11-21"; + version = "2022-12-09"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "6f13896727c82c1ff56acf483d474ba7ad88f230"; - sha256 = "1vbnxc9cvk2gn5vs4mhgk7mvlzdifhkh3bl71814q9mvq46nnxav"; + rev = "ceb1ad90a20c39a87799e5f0facfa02d7cb19a23"; + sha256 = "0wq15k4g02hi7dvkwg1j7mr2cgl6yvisk9dsyzkdsh30yfpg11cb"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -6419,12 +6419,12 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2022-11-30"; + version = "2022-12-07"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "fc9bb0f5823d01e4008e4b86663772d4148aa9ce"; - sha256 = "1vb0x89qr2kk5ma8syw4l56c6j2b7y2advyjykdli8psn6i7gsyf"; + rev = "d3980a5cda71266579ef773168d7750e04911877"; + sha256 = "1wlmzsj70x891bcxkdcwgx7hiljhgcl73w2i9vadk4n51hxc57h7"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -6901,12 +6901,12 @@ final: prev: rnvimr = buildVimPluginFrom2Nix { pname = "rnvimr"; - version = "2022-11-27"; + version = "2022-12-08"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "rnvimr"; - rev = "d78ca640354ea7a4671ff11df8f71fbb087e0eba"; - sha256 = "1y613xbqjv3g6drcqhx04j34fnx2l00yb17prcd4vn5sjllil9mz"; + rev = "64579c485812867bbd7890a55ca93884beb440b6"; + sha256 = "0yzy3mq7b7hnnb04z45m4r3hcpf11djv5zxhsyk60pnyvlwrdl7k"; }; meta.homepage = "https://github.com/kevinhwang91/rnvimr/"; }; @@ -7383,12 +7383,12 @@ final: prev: ssr-nvim = buildVimPluginFrom2Nix { pname = "ssr.nvim"; - version = "2022-12-04"; + version = "2022-12-08"; src = fetchFromGitHub { owner = "cshuaimin"; repo = "ssr.nvim"; - rev = "6238c102d16779aaa505a16200ac50a01c16b5ef"; - sha256 = "0w0yljwf5l19sczb8qrzkhl61w7xhyapj8v182c7h60k7nis1qqx"; + rev = "ce2ba65370c3e6ca2e84e652c9adfccb8611458e"; + sha256 = "080xgvq8i01v2zz86nxwr1c2pi2mb5qjx6lymkygp0xjmv3p9b2v"; }; meta.homepage = "https://github.com/cshuaimin/ssr.nvim/"; }; @@ -7709,12 +7709,12 @@ final: prev: tcomment_vim = buildVimPluginFrom2Nix { pname = "tcomment_vim"; - version = "2022-12-02"; + version = "2022-12-07"; src = fetchFromGitHub { owner = "tomtom"; repo = "tcomment_vim"; - rev = "ced243a049bb6839ff057741de731418879e97e8"; - sha256 = "1q2q2q8rpd8fzf4sa14mjg42m1d97cqxz82xk4vgg3ml3ffgcsly"; + rev = "dd1da14193c10f7f5b91638e438977b48d191aa9"; + sha256 = "1k3f821hc1kzajsb259309m57iwhjrika7i87ayx8pq1mvlxzdvc"; }; meta.homepage = "https://github.com/tomtom/tcomment_vim/"; }; @@ -7745,12 +7745,12 @@ final: prev: telescope-coc-nvim = buildVimPluginFrom2Nix { pname = "telescope-coc.nvim"; - version = "2022-10-20"; + version = "2022-12-08"; src = fetchFromGitHub { owner = "fannheyward"; repo = "telescope-coc.nvim"; - rev = "0193fe529edd2cb61ccc020b492df76528f880fc"; - sha256 = "1y7kav5749bznz5m7102igba29yvfbasnbn6hzsx57g8vj36kwbb"; + rev = "878c8ac14f809f7a1247a090408f7c23fa075470"; + sha256 = "0q237i5cwxqzzhfmnbvljsmc4z7gmdfapz965pp135ybid4nh5xh"; }; meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/"; }; @@ -8191,12 +8191,12 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2022-11-03"; + version = "2022-12-09"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "3ba683827c623affb4d9aa518e97b34db2623093"; - sha256 = "043rchc7qbn65b7wfgvp6fdg67xijgd3i3jfm82i1rha7dlymb41"; + rev = "b02a1674bd0010d7982b056fd3df4f717ff8a57a"; + sha256 = "1ibkq0mv39n8pf43nxrridn4hdn95qk7pq0mv28qrb9p8dnxczfj"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; @@ -8239,12 +8239,12 @@ final: prev: treesj = buildVimPluginFrom2Nix { pname = "treesj"; - version = "2022-12-02"; + version = "2022-12-09"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "43604d7e1504571c768024e90907dc7b581456a4"; - sha256 = "0k9swbihxjynzkhfg5dgnkm5ajzaq75py4lpxfiql54pvbbllcb5"; + rev = "1c4447d01cfed64fdb9a62fd69611dc8d6b9ade0"; + sha256 = "188xd9zwy9kx3gmlagbk4rw2wsspszx8zqg57kv6xa15zb4c6366"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; @@ -8359,12 +8359,12 @@ final: prev: undotree = buildVimPluginFrom2Nix { pname = "undotree"; - version = "2022-10-08"; + version = "2022-12-09"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "bd60cb564e3c3220b35293679669bb77af5f389d"; - sha256 = "0w05yhyjh6j7gcdfghvbjylc64wba42fagnj4bxk1lbcqvnnzxc8"; + rev = "1a23ea84bd02c34f50d8e10a8b4bfc89597ffe4e"; + sha256 = "00r0jnsrqdfns08ndj3xhwfx3yf65dgsin9pihad64gj9fmwvbv3"; }; meta.homepage = "https://github.com/mbbill/undotree/"; }; @@ -9271,12 +9271,12 @@ final: prev: vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2022-12-04"; + version = "2022-12-09"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "b97c8fcdaed5c3915e49f70f7fa7aa148d528428"; - sha256 = "1j3g4rcjy5fr7pbm45bkzsq0kppvrp54wd6dsdzxwd2y1nkrm82l"; + rev = "64ffe0761b9499f15ea8b56b153644c488b5bf74"; + sha256 = "1apym7104z3pxx57srb7ih1qsyidf421f3d6rzfs8nc2vvgdd061"; }; meta.homepage = "https://github.com/google/vim-codefmt/"; }; @@ -9463,24 +9463,24 @@ final: prev: vim-dadbod = buildVimPluginFrom2Nix { pname = "vim-dadbod"; - version = "2022-12-03"; + version = "2022-12-08"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "c8034ea7160c0fa9351f9f07f964bb335cdd6187"; - sha256 = "1kbll59gzcrawwgfiv63psciab330id3jc19kmbl3dvbs3m9if8q"; + rev = "1ad079ed63d9934174fec918cc0abc7e020eb02c"; + sha256 = "0zmnvwg28bw1pnbf3bx675bssjiab8brcabdkl8vfqgnyibw2pm7"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; vim-dadbod-completion = buildVimPluginFrom2Nix { pname = "vim-dadbod-completion"; - version = "2022-11-22"; + version = "2022-12-08"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-completion"; - rev = "339667d9939d434f9b4496859c077faa88880183"; - sha256 = "08slydxkahw4w383k4ln6hhz0lq9caxxilp4r9k4xk5dmsi7d2xd"; + rev = "e71eb6140556c5ced80de6299a1fdfe22bd3c1b1"; + sha256 = "1d3gg2s9krvq9nasa3iwb7kv3jx5v74h0h55syp7d7hl7idysgdd"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/"; }; @@ -9559,12 +9559,12 @@ final: prev: vim-dirvish = buildVimPluginFrom2Nix { pname = "vim-dirvish"; - version = "2022-07-14"; + version = "2022-12-08"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "81b40878f286f370df2a2b3a52c4d860643d2142"; - sha256 = "19wmp9bx3sgf4vjvq504ah12hh6zm7hvqjyq07sccy2z7ld87bd5"; + rev = "6233243f0caa71d27d27ea102540a88bce8eb6ea"; + sha256 = "03nvv5y4zv2kh4fkg3xx0zf247mqv201zf89aalczvslvwdf7gqf"; }; meta.homepage = "https://github.com/justinmk/vim-dirvish/"; }; @@ -11038,12 +11038,12 @@ final: prev: vim-monokai = buildVimPluginFrom2Nix { pname = "vim-monokai"; - version = "2021-05-06"; + version = "2022-12-09"; src = fetchFromGitHub { owner = "crusoexia"; repo = "vim-monokai"; - rev = "66f7dc9c63296ea6ba408faa60bebe54a34c57f2"; - sha256 = "10ip0y9p2qf869h2yhp2zs6qc048rw1x5i0spziajca96251gvig"; + rev = "6b6c2b698e94d0af8d8f2307be01571ab8b7b74f"; + sha256 = "1pa1fylfzammcy7xvl2wlgg2qw8yzrzr7yf0vdalqfmxkakma1z8"; }; meta.homepage = "https://github.com/crusoexia/vim-monokai/"; }; @@ -11350,12 +11350,12 @@ final: prev: vim-orgmode = buildVimPluginFrom2Nix { pname = "vim-orgmode"; - version = "2022-01-23"; + version = "2022-12-09"; src = fetchFromGitHub { owner = "jceb"; repo = "vim-orgmode"; - rev = "66cd7ee69a9cddc73f65566e32da159f1e51401f"; - sha256 = "1ywf5vcn3b8isfw4gxqfplchn94jvbqvaap15w1yk5ljmp46gxgk"; + rev = "b27feaba9a316e8307cfd7a56797b378fb52df83"; + sha256 = "0b2y49ylbrp1i5r5abznziv1n43d063mib07v4ila0873k7fzir6"; }; meta.homepage = "https://github.com/jceb/vim-orgmode/"; }; @@ -11926,12 +11926,12 @@ final: prev: vim-sandwich = buildVimPluginFrom2Nix { pname = "vim-sandwich"; - version = "2022-07-22"; + version = "2022-12-07"; src = fetchFromGitHub { owner = "machakann"; repo = "vim-sandwich"; - rev = "74898e6f5c5ea37e17163f00bf4981049f785eed"; - sha256 = "09zx0081bmprvf1zv3wxjnl0j4viks9w3yysbwgg1qqi38fls5rg"; + rev = "c5a2cc438ce6ea2005c556dc833732aa53cae21a"; + sha256 = "1b1rim7q398dnwdaqakcycvyvw04rw32k10ij7w7mqpbn9hklpm5"; }; meta.homepage = "https://github.com/machakann/vim-sandwich/"; }; @@ -12190,12 +12190,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2022-12-01"; + version = "2022-12-08"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "6173350127d56dcc5664f50320b3f522951f56e9"; - sha256 = "1a002y2pw76bh35q9z0rba3wnfcwgfmnii4gn3107wwfmfy50z55"; + rev = "8c917944354552c1263159a4a218ad924969be0c"; + sha256 = "1fsfmi6q4inbv5vdfclfjc3dga4wcvgw6dm32xqxq74raq5npgmc"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -12431,12 +12431,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2022-11-10"; + version = "2022-12-08"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "ab7feab8cb139e5b4955cb4c6ddf52e968cb24be"; - sha256 = "0glnzs21xhwgir4ndnrv3jlmi5g6b4znybcpp5d4aqxd5sqa80m3"; + rev = "99894e398e6b3c797bda2d0390f36d265ad0ab58"; + sha256 = "070755cb9sfbcxcq122gqblsrqng2xvgjvv6rgwfkg32rn7dbsfz"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -12575,12 +12575,12 @@ final: prev: vim-tmux-navigator = buildVimPluginFrom2Nix { pname = "vim-tmux-navigator"; - version = "2022-12-04"; + version = "2022-12-08"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "a40cc7a52787e06fd57650e09be490432e3d4717"; - sha256 = "0l98v8lbadz32z7i1d1n0b1ggpvbsc71ni3lqm9hd2xhx9rixps1"; + rev = "41ea9d23b814014c8d8daf8b44fa0cd827a0e5f4"; + sha256 = "15581nighr1a82gkn0blkx75l6bz0vfq573nf626dw1qa652nipz"; }; meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/"; }; @@ -12863,12 +12863,12 @@ final: prev: vim-which-key = buildVimPluginFrom2Nix { pname = "vim-which-key"; - version = "2022-10-30"; + version = "2022-12-07"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-which-key"; - rev = "398adc5bf2918ee84e78bd974a9f9d64ddfc0801"; - sha256 = "18kjcw8jdidihfscir5kihz22mvlwkbab1w5m8hc2w9qjljcza50"; + rev = "c0eb7a63e80ed0dc2c91eb8c879b7396a795f775"; + sha256 = "14v47fjp1klnacbbn2ly9ya0xs4dv2bsf9pg391zfcpp9rzf6mrl"; }; meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; @@ -12923,12 +12923,12 @@ final: prev: vim-xkbswitch = buildVimPluginFrom2Nix { pname = "vim-xkbswitch"; - version = "2022-12-07"; + version = "2022-12-08"; src = fetchFromGitHub { owner = "lyokha"; repo = "vim-xkbswitch"; - rev = "e64864ec2e01ba554c6ee5396e4e77f732433738"; - sha256 = "0sg4ynwr5mw0qpgnvl752d9yslvd8rxl6swz61gnzgg8j3fyhk5f"; + rev = "6bcc2dd50f8952e9d20760ccccd3425ecaa4b25e"; + sha256 = "09lh4cd2v8k0hj6ipik1lq78syl07aaf5aybpnf9l3gbvqbj5wnw"; }; meta.homepage = "https://github.com/lyokha/vim-xkbswitch/"; }; @@ -12969,6 +12969,18 @@ final: prev: meta.homepage = "https://github.com/simonrw/vim-yapf/"; }; + vim-zettel = buildVimPluginFrom2Nix { + pname = "vim-zettel"; + version = "2022-09-05"; + src = fetchFromGitHub { + owner = "michal-h21"; + repo = "vim-zettel"; + rev = "e38119f98c888b6fc700f97e363254ddafc950ba"; + sha256 = "1a4rc7blj7lh318x8cgyyi9q3m5szdz2f1frn6yga5vqd9cyv877"; + }; + meta.homepage = "https://github.com/michal-h21/vim-zettel/"; + }; + vim2hs = buildVimPluginFrom2Nix { pname = "vim2hs"; version = "2014-04-16"; @@ -13501,12 +13513,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2022-12-06"; + version = "2022-12-09"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "08ef4cb230a16c5f6b8f33ef1bf0c5b3e192905a"; - sha256 = "1xzh1ql0iix33ixkdcrvf80xa9c995b6gq2ag0k9q4ikvmid5lx2"; + rev = "d55d81eabfeacbfb167e2948790ae94aaba3b149"; + sha256 = "0xhcrh1zyjq7i5kdsvw1v2f83m0d3ikv8hzpvpkm13zkhzasj018"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -13525,12 +13537,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2022-12-07"; + version = "2022-12-09"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "b0e0b05e5aa8156fe9c8f3a3a3804a434394ab65"; - sha256 = "1kakayg4v5fdi1hs1zyv6f9hd9im0f36z4f4bk1yszsgycrcyl1z"; + rev = "e61b0e2760e62a72a858e7e51733b52c22927dd3"; + sha256 = "10i68hk8q8m6w9r7pmk4m18x6k931w6nl095452cag0ijc6rsxkd"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 1b3a191a9da..7cea3b46149 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -338,14 +338,14 @@ }; erlang = buildGrammar { language = "erlang"; - version = "3a9c769"; + version = "a8b8b0e"; source = fetchFromGitHub { - owner = "AbstractMachinesLab"; + owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "3a9c769444f08bbccce03845270efac0c641c5e7"; - hash = "sha256-ZsjHTNUfTEPo3Wb1ihW0M2YTWK6mpNhxQG/nLfMaG4I="; + rev = "a8b8b0e16c4f5552f5e85af3dec976a5d16af8b9"; + hash = "sha256-6eiRiTTPdMBRsxVHIHYuw0sIfRDvP4pZIEyckoo304Q="; }; - meta.homepage = "https://github.com/AbstractMachinesLab/tree-sitter-erlang"; + meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; fennel = buildGrammar { language = "fennel"; @@ -471,12 +471,12 @@ }; glimmer = buildGrammar { language = "glimmer"; - version = "abcc997"; + version = "fee3427"; source = fetchFromGitHub { owner = "alexlafroscia"; repo = "tree-sitter-glimmer"; - rev = "abcc9970da0ed0645741bf52ea70232374bc9e52"; - hash = "sha256-kkNnyaAXeZJ770Jl4mmOdyXvq6bQd/9Q6eVyr+JV2jY="; + rev = "fee34278dc212869dcfc92fce3007ee79a752867"; + hash = "sha256-a3goK+QSkrdsKvimT8vpsJ1bt8FhLf1bws0aqjncv3A="; }; meta.homepage = "https://github.com/alexlafroscia/tree-sitter-glimmer"; }; @@ -493,12 +493,12 @@ }; go = buildGrammar { language = "go"; - version = "e34b8a4"; + version = "64457ea"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-go"; - rev = "e34b8a418c33bba8bdf3375e8e55903dff7c68b9"; - hash = "sha256-Bfp2XsT83x+VPMPB5rHAbSpEkHD7lG0iDq2Yt63Ug8I="; + rev = "64457ea6b73ef5422ed1687178d4545c3e91334a"; + hash = "sha256-38pkqR9iEIEf9r3IHJPIYgKfWBlb9aQWi1kij04Vo5k="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-go"; }; @@ -1016,12 +1016,12 @@ }; php = buildGrammar { language = "php"; - version = "ab2e721"; + version = "b4a8a60"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "ab2e72179ceb8bb0b249c8ac9162a148e911b3dc"; - hash = "sha256-Lg4gEi6bCYosakr2McmgOwGHsmsVSjD+oyG6XNTd0j0="; + rev = "b4a8a6048d66fcda4e8e4988bd0d9095980e303a"; + hash = "sha256-Pm0FuY34eMhX4K7pbYpNAY1WYBOO+9cFCx/j992fsg8="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; @@ -1082,12 +1082,12 @@ }; python = buildGrammar { language = "python"; - version = "b14614e"; + version = "9e53981"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-python"; - rev = "b14614e2144b8f9ee54deed5a24f3c6f51f9ffa8"; - hash = "sha256-4TDEK3v7hqinisXtAi/iJL0rUKqII07oVg/Jz3IV2yA="; + rev = "9e53981ec31b789ee26162ea335de71f02186003"; + hash = "sha256-D2++Xg7dRfjGM2r4cxaXGQnBOAX5JBREcEAJeNa7Y9M="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-python"; }; @@ -1291,12 +1291,12 @@ }; sql = buildGrammar { language = "sql"; - version = "54b363b"; + version = "a4dd131"; source = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "54b363b87c22787f9dcfabb5d8aa221cb65ace42"; - hash = "sha256-ku4t3IyPNIIXVt3RvUoCG+TUbe62m7EFtXLUiAPb+pQ="; + rev = "a4dd131eeb9fe7f3c9c2ca0f506f6d58d9986a97"; + hash = "sha256-Z1x1XPecXt3a4mL40Fyt5+1wrD+0L3Hh9aWjI0vIhIc="; }; generate = true; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; @@ -1336,12 +1336,12 @@ }; swift = buildGrammar { language = "swift"; - version = "cff1c9a"; + version = "4443b12"; source = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "cff1c9a62df89e8900d53ff48bc42862e6522dcf"; - hash = "sha256-tfpqnutY8uLzhPWPsDzsvwaRWOS8vIxAOPlcyPoSwNU="; + rev = "4443b125240d7ae7e50d35d8415fae5be61bdaf2"; + hash = "sha256-Hym56WVG5QIic+pd6Hvae5ETM6UNaTo4Sr9mTUVFt0Q="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index c569941ed2b..09215753f41 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1260,6 +1260,10 @@ self: super: { dependencies = with self; [ vimproc-vim ]; }); + vim-zettel = super.vim-zettel.overrideAttrs (old: { + dependencies = with self; [ vimwiki fzf-vim ]; + }); + YankRing-vim = super.YankRing-vim.overrideAttrs (old: { sourceRoot = "."; }); diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 032a3b6d001..03af40a05ae 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1088,6 +1088,7 @@ https://github.com/lyokha/vim-xkbswitch/,, https://github.com/mg979/vim-xtabline/,, https://github.com/stephpy/vim-yaml/,, https://github.com/mindriot101/vim-yapf/,, +https://github.com/michal-h21/vim-zettel/,HEAD, https://github.com/dag/vim2hs/,, https://github.com/dominikduda/vim_current_word/,, https://github.com/andrep/vimacs/,, diff --git a/pkgs/applications/editors/vim/plugins/vim-utils.nix b/pkgs/applications/editors/vim/plugins/vim-utils.nix index f0e4e8e982e..6607ff2b8c4 100644 --- a/pkgs/applications/editors/vim/plugins/vim-utils.nix +++ b/pkgs/applications/editors/vim/plugins/vim-utils.nix @@ -14,7 +14,7 @@ USAGE EXAMPLE Install Vim like this eg using nixos option environment.systemPackages which will provide vim-with-plugins in PATH: - vim_configurable.customize { + vim-full.customize { name = "vim-with-plugins"; # optional # add custom .vimrc lines like this: @@ -105,7 +105,7 @@ fitting the vimrcConfig.vam.pluginDictionaries option. Thus the most simple usage would be: vim_with_plugins = - let vim = vim_configurable; + let vim = vim-full; inherit (vimUtil.override {inherit vim}) rtpPath addRtp buildVimPlugin vimHelpTags; vimPlugins = [ # the derivation list from the buffer created by nix#ExportPluginsForNix diff --git a/pkgs/applications/editors/vim/vimacs.nix b/pkgs/applications/editors/vim/vimacs.nix index f8a087cbe6e..e65439df523 100644 --- a/pkgs/applications/editors/vim/vimacs.nix +++ b/pkgs/applications/editors/vim/vimacs.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, config, vim_configurable, macvim, vimPlugins +{ lib, stdenv, config, vim-full, macvim, vimPlugins , useMacvim ? stdenv.isDarwin && (config.vimacs.macvim or true) , vimacsExtraArgs ? "" }: stdenv.mkDerivation rec { pname = "vimacs"; version = lib.getVersion vimPackage; - vimPackage = if useMacvim then macvim else vim_configurable; + vimPackage = if useMacvim then macvim else vim-full; buildInputs = [ vimPackage vimPlugins.vimacs ]; diff --git a/pkgs/applications/misc/1password-gui/darwin.nix b/pkgs/applications/misc/1password-gui/darwin.nix index 04bc1023116..6f3d86f51c3 100644 --- a/pkgs/applications/misc/1password-gui/darwin.nix +++ b/pkgs/applications/misc/1password-gui/darwin.nix @@ -18,4 +18,7 @@ stdenv.mkDerivation { mkdir -p $out/Applications cp -r *.app $out/Applications ''; + + # 1Password is notarized. + dontFixup = true; } diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index 3ac928a3d36..05a49db76ad 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -14,55 +14,31 @@ , gtk4 , gtksourceview5 , libadwaita -, steam , cabextract , p7zip , xdpyinfo , imagemagick +, lsb-release +, pciutils , procps , gamescope , mangohud +, vkbasalt-cli , vmtouch -, wine -, bottlesExtraLibraries ? pkgs: [ ] # extra packages to add to steam.run multiPkgs -, bottlesExtraPkgs ? pkgs: [ ] # extra packages to add to steam.run targetPkgs }: - -let - steam-run = (steam.override { - # required by wine runner `caffe` - extraLibraries = pkgs: with pkgs; [ libunwind libusb1 gnutls ] - ++ bottlesExtraLibraries pkgs; - extraPkgs = pkgs: [ ] - ++ bottlesExtraPkgs pkgs; - }).run; -in python3Packages.buildPythonApplication rec { - pname = "bottles"; - version = "2022.10.14.1"; + pname = "bottles-unwrapped"; + version = "2022.11.14"; src = fetchFromGitHub { owner = "bottlesdevs"; - repo = pname; + repo = "bottles"; rev = version; - sha256 = "sha256-FO91GSGlc2f3TSLrlmRDPi5p933/Y16tdEpX4RcKhL0="; + sha256 = "sha256-bigrJtqx9iZURYojwxlGe7xSGWS13wSaGcrTTROP9J8="; }; patches = [ ./vulkan_icd.patch ]; - postPatch = '' - chmod +x build-aux/meson/postinstall.py - patchShebangs build-aux/meson/postinstall.py - - substituteInPlace bottles/backend/wine/winecommand.py \ - --replace \ - "command = f\"{runner} {command}\"" \ - "command = f\"{''' if runner == 'wine' or runner == 'wine64' else '${steam-run}/bin/steam-run '}{runner} {command}\"" \ - --replace \ - "command = f\"{_picked['entry_point']} {command}\"" \ - "command = f\"${steam-run}/bin/steam-run {_picked['entry_point']} {command}\"" - ''; - nativeBuildInputs = [ blueprint-compiler meson @@ -101,12 +77,16 @@ python3Packages.buildPythonApplication rec { p7zip xdpyinfo imagemagick - procps + vkbasalt-cli gamescope mangohud vmtouch - wine + + # Undocumented (subprocess.Popen()) + lsb-release + pciutils + procps ]; format = "other"; diff --git a/pkgs/applications/misc/bottles/fhsenv.nix b/pkgs/applications/misc/bottles/fhsenv.nix new file mode 100644 index 00000000000..dfb0d36f64d --- /dev/null +++ b/pkgs/applications/misc/bottles/fhsenv.nix @@ -0,0 +1,101 @@ +{ lib +, buildFHSUserEnvBubblewrap +, symlinkJoin +, bottles-unwrapped +, extraPkgs ? pkgs: [ ] +, extraLibraries ? pkgs: [ ] +}: + +let fhsEnv = { + targetPkgs = pkgs: with pkgs; [ + bottles-unwrapped + vkbasalt + ] ++ extraPkgs pkgs; + + multiPkgs = + let + xorgDeps = pkgs: with pkgs.xorg; [ + libpthreadstubs + libSM + libX11 + libXaw + libxcb + libXcomposite + libXcursor + libXdmcp + libXext + libXi + libXinerama + libXmu + libXrandr + libXrender + libXv + libXxf86vm + ]; + in + pkgs: with pkgs; [ + # https://wiki.winehq.org/Building_Wine + alsa-lib + cups + dbus + fontconfig + freetype + glib + gnutls + libglvnd + gsm + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + libgphoto2 + libjpeg_turbo + libkrb5 + libpcap + libpng + libpulseaudio + libtiff + libunwind + libusb1 + libv4l + libxml2 + mpg123 + ocl-icd + openldap + samba4 + sane-backends + SDL2 + udev + vulkan-loader + + # https://www.gloriouseggroll.tv/how-to-get-out-of-wine-dependency-hell/ + alsa-plugins + dosbox + giflib + gtk3 + libva + libxslt + ncurses + openal + + # Steam runtime + libgcrypt + libgpg-error + p11-kit + zlib # Freetype + ] ++ xorgDeps pkgs + ++ extraLibraries pkgs; +}; +in +symlinkJoin { + name = "bottles"; + paths = [ + (buildFHSUserEnvBubblewrap (fhsEnv // { name = "bottles"; runScript = "bottles"; })) + (buildFHSUserEnvBubblewrap (fhsEnv // { name = "bottles-cli"; runScript = "bottles-cli"; })) + ]; + postBuild = '' + mkdir -p $out/share + ln -s ${bottles-unwrapped}/share/applications $out/share + ln -s ${bottles-unwrapped}/share/icons $out/share + ''; + + inherit (bottles-unwrapped) meta; +} diff --git a/pkgs/applications/misc/bottles/vulkan_icd.patch b/pkgs/applications/misc/bottles/vulkan_icd.patch index d638917151e..ff376e136bb 100644 --- a/pkgs/applications/misc/bottles/vulkan_icd.patch +++ b/pkgs/applications/misc/bottles/vulkan_icd.patch @@ -1,13 +1,15 @@ diff --git a/bottles/backend/utils/vulkan.py b/bottles/backend/utils/vulkan.py -index 6673493..07f70d1 100644 +index 6673493..9191004 100644 --- a/bottles/backend/utils/vulkan.py +++ b/bottles/backend/utils/vulkan.py -@@ -29,6 +29,8 @@ class VulkanUtils: +@@ -28,7 +28,9 @@ class VulkanUtils: + "/usr/share/vulkan", "/etc/vulkan", "/usr/local/share/vulkan", - "/usr/local/etc/vulkan" -+ "/run/opengl-driver/share/vulkan/", -+ "/run/opengl-driver-32/share/vulkan/", +- "/usr/local/etc/vulkan" ++ "/usr/local/etc/vulkan", ++ "/run/opengl-driver/share/vulkan", ++ "/run/opengl-driver-32/share/vulkan", ] if "FLATPAK_ID" in os.environ: __vk_icd_dirs += [ diff --git a/pkgs/applications/networking/cluster/waypoint/default.nix b/pkgs/applications/networking/cluster/waypoint/default.nix index 317c0d5374b..36718608d42 100644 --- a/pkgs/applications/networking/cluster/waypoint/default.nix +++ b/pkgs/applications/networking/cluster/waypoint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "waypoint"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+lNeMcSlhmbs1knONnoX2RhEgxTYyCfpdD6WuDTiLx8="; + sha256 = "sha256-jbrzXktY1vGk1DuzrzxlWwFQoFPprnDy2YjZQBgmcPI="; }; - vendorSha256 = "sha256-59rJ30m6eiNIapJUNc1jRJE7IoAj0O+5G8JyKkhcyvY="; + vendorSha256 = "sha256-oTzGgyQZWNj7vNpAaDO47nB7EbpUiQD66u4F1LJ2CR0="; nativeBuildInputs = [ go-bindata installShellFiles ]; diff --git a/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix b/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix index b43ba703baf..75e7981af5b 100644 --- a/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix +++ b/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "zeronet-conservancy"; - version = "0.7.8"; + version = "0.7.8.1"; format = "other"; src = fetchFromGitHub { owner = "zeronet-conservancy"; repo = "zeronet-conservancy"; rev = "v${version}"; - sha256 = "sha256-U61cQzZfEKCrnk/80yEwh8rh+VojXsvrAQV0ckFqM/4="; + sha256 = "sha256-+wZiwUy5bmW8+3h4SuvNN8I6mCIPOlOeFmiXlMu12OU="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index bf7bffd1159..6a20a68324f 100644 --- a/pkgs/applications/science/logic/abc/default.nix +++ b/pkgs/applications/science/logic/abc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "abc-verifier"; - version = "unstable-2022-09-08"; + version = "unstable-2022-11-09"; src = fetchFromGitHub { owner = "yosyshq"; repo = "abc"; - rev = "ab5b16ede2ff3a4ab5209df24db2c76700899684"; - hash = "sha256-G4MnBViwIosFDiPfUimGqf6fq1KJlxj+LozmgoKaH3A="; + rev = "be9a35c0363174a7cef21d55ed80d92a9ef95ab1"; + hash = "sha256-IN9YgJONcC55N89OXMrMuNuznTdjXNWxR0IngH8OWC8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/system/asusctl/default.nix b/pkgs/applications/system/asusctl/default.nix index 8c6330e69fb..42b1308e7b4 100644 --- a/pkgs/applications/system/asusctl/default.nix +++ b/pkgs/applications/system/asusctl/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "asusctl"; - version = "4.5.2"; + version = "4.5.5"; src = fetchFromGitLab { owner = "asus-linux"; repo = "asusctl"; rev = version; - hash = "sha256-hrmH4DDNzc7iMa5YJUQEb3Ng4QekPG+CoGWoHtv9e58="; + hash = "sha256-3R8TAhOxnwKfA/Nc+R9JrLGMkZu9vGqCLbXUa8QGadA="; }; - cargoSha256 = "sha256-7JOy5mKkP021+tx8a579WvmqQewEkjFgcwD/f7gzDt8="; + cargoSha256 = "sha256-FHyKGLELX6xpPCAc/m2mqbfXcka35q0fGjeaE57g70M="; postPatch = '' files=" diff --git a/pkgs/applications/video/netflix/default.nix b/pkgs/applications/video/netflix/default.nix new file mode 100644 index 00000000000..4f44ddebaef --- /dev/null +++ b/pkgs/applications/video/netflix/default.nix @@ -0,0 +1,56 @@ +{ fetchurl +, google-chrome +, lib +, makeDesktopItem +, runtimeShell +, symlinkJoin +, writeScriptBin +}: + +let + name = "netflix-via-google-chrome"; + + meta = { + description = "Open Netflix in Google Chrome app mode"; + longDescription = '' + Netflix is a video streaming service providing films, TV series and exclusive content. See https://www.netflix.com. + + This package installs an application launcher item that opens Netflix in a dedicated Google Chrome window. If your preferred browser doesn't support Netflix's DRM, this package provides a quick and easy way to launch Netflix on a supported browser, without polluting your application list with a redundant, single-purpose browser. + ''; + homepage = google-chrome.meta.homepage or null; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.roberth ]; + platforms = google-chrome.meta.platforms or lib.platforms.all; + }; + + desktopItem = makeDesktopItem { + inherit name; + # Executing by name as opposed to store path is conventional and prevents + # copies of the desktop file from bitrotting too much. + # (e.g. a copy in ~/.config/autostart, you lazy lazy bastard ;) ) + exec = name; + icon = fetchurl { + name = "netflix-icon-2016.png"; + url = "https://assets.nflxext.com/us/ffe/siteui/common/icons/nficon2016.png"; + sha256 = "sha256-c0H3uLCuPA2krqVZ78MfC1PZ253SkWZP3PfWGP2V7Yo="; + meta.license = lib.licenses.unfree; + }; + desktopName = "Netflix via Google Chrome"; + genericName = "A video streaming service providing films and exclusive TV series"; + categories = [ "TV" "AudioVideo" "Network" ]; + startupNotify = true; + }; + + script = writeScriptBin name '' + #!${runtimeShell} + exec ${google-chrome}/bin/${google-chrome.meta.mainProgram} \ + --app=https://netflix.com \ + --no-first-run --no-default-browser-check --no-crash-upload + ''; + +in + +symlinkJoin { + inherit name meta; + paths = [ script desktopItem ]; +} |