diff --git a/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix b/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix
index d6e8de3efad6..f89d0ce8007c 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix
@@ -13,13 +13,13 @@
 
 trivialBuild {
   pname = "ement";
-  version = "unstable-2022-05-05";
+  version = "unstable-2022-05-14";
 
   src = fetchFromGitHub {
     owner = "alphapapa";
     repo = "ement.el";
-    rev = "84739451afa8355360966dfa788d469d9dc4a8e3";
-    sha256 = "sha256-XdegBKZfoKbFaMM/l8249VD9KKC5/4gQIK6ggPcoOaE=";
+    rev = "961d650377f9e7440e47c36c0386e899f5b2d86b";
+    sha256 = "sha256-4KTSPgso7UvzCRKNFI3YaPR1t4DUwggO4KtBYLm0W4Y=";
   };
 
   packageRequires = [
diff --git a/pkgs/applications/editors/emacs/elisp-packages/ement/handle-nil-images.patch b/pkgs/applications/editors/emacs/elisp-packages/ement/handle-nil-images.patch
index 547fee164056..271e1cd2dbac 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/ement/handle-nil-images.patch
+++ b/pkgs/applications/editors/emacs/elisp-packages/ement/handle-nil-images.patch
@@ -1,8 +1,8 @@
-diff --git a/ement.el b/ement.el
-index c9596a7..1b33045 100644
---- a/ement.el
-+++ b/ement.el
-@@ -682,14 +682,15 @@ can cause undesirable underlining."
+diff --git a/ement-lib.el b/ement-lib.el
+index f0b2738..025a191 100644
+--- a/ement-lib.el
++++ b/ement-lib.el
+@@ -644,14 +644,15 @@ can cause undesirable underlining."
    "Return a copy of IMAGE set to MAX-WIDTH and MAX-HEIGHT.
  IMAGE should be one as created by, e.g. `create-image'."
    ;; It would be nice if the image library had some simple functions to do this sort of thing.
@@ -24,5 +24,5 @@ index c9596a7..1b33045 100644
 +            (image-property new-image :max-height) max-height)
 +      new-image)))
  
- ;;;;; Reading/writing sessions
- 
+ (defun ement--room-alias (room)
+   "Return latest m.room.canonical_alias event in ROOM."
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index d491bb7f8050..4e35fd632b1f 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -53,12 +53,12 @@ final: prev:
 
   Coqtail = buildVimPluginFrom2Nix {
     pname = "Coqtail";
-    version = "2022-04-21";
+    version = "2022-05-10";
     src = fetchFromGitHub {
       owner = "whonore";
       repo = "Coqtail";
-      rev = "0b8f2408f96481a373f336b4405af03008e39a4e";
-      sha256 = "1v36ndpx8jaipav30ailxpadvzk5qxmgphd1p0hck50mdngpynki";
+      rev = "ba1659dc1e3e38cd59d5bef19a51bdcf704abce5";
+      sha256 = "1zqj4j3y970kpr29kp2lx6ggd49d03dv6hxffg58v8kc1v3ibf14";
     };
     meta.homepage = "https://github.com/whonore/Coqtail/";
   };
@@ -149,12 +149,12 @@ final: prev:
 
   LeaderF = buildVimPluginFrom2Nix {
     pname = "LeaderF";
-    version = "2022-04-26";
+    version = "2022-05-11";
     src = fetchFromGitHub {
       owner = "Yggdroot";
       repo = "LeaderF";
-      rev = "2817a561495f19a37369c72a1685e3e1e4c3c09d";
-      sha256 = "1xxsm1b2v5wdy4psjcggm4ssgdq2j8q9ds98j1ky8l7carj0qfwn";
+      rev = "f1da1ca2a4a71e79f4a625f62d8973de5cd2fab9";
+      sha256 = "1jny8r8fs0z1gdcb75r3in7jp9gl9mwc4wvjslb8qp8yh1ja0ddv";
     };
     meta.homepage = "https://github.com/Yggdroot/LeaderF/";
   };
@@ -269,12 +269,12 @@ final: prev:
 
   SchemaStore-nvim = buildVimPluginFrom2Nix {
     pname = "SchemaStore.nvim";
-    version = "2022-05-02";
+    version = "2022-05-13";
     src = fetchFromGitHub {
       owner = "b0o";
       repo = "SchemaStore.nvim";
-      rev = "24e03a0e7c100336efdef5035eb6e59ac3f7ed4a";
-      sha256 = "0hjysfszcaw2i2awkv0sbhnj0x5jcl7s6jmb279m7gcf7giwvghk";
+      rev = "dc964c3caecd8f8fc477fc308187d47147b33d81";
+      sha256 = "1z8g04d7hd4qxag2b9rqyzvxvg8xya98zsxyd2rll51n2hw22bk1";
     };
     meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
   };
@@ -329,12 +329,12 @@ final: prev:
 
   SpaceVim = buildVimPluginFrom2Nix {
     pname = "SpaceVim";
-    version = "2022-05-02";
+    version = "2022-05-11";
     src = fetchFromGitHub {
       owner = "SpaceVim";
       repo = "SpaceVim";
-      rev = "97b010245f42bda351fd050a3c6ccf7806b9b007";
-      sha256 = "1plfcrigk1s2l8ig0y6vf7awidbdj3p985pzjl19nrv93g49d71f";
+      rev = "48c57041f9b7ceeff3e3d476f4ddf2cfc8a9f321";
+      sha256 = "0qfh948fykmbhvhlqs5zq1qglfl09wrnnrzssqfi8j8h64yqajnh";
     };
     meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
   };
@@ -486,12 +486,12 @@ final: prev:
 
   aerial-nvim = buildVimPluginFrom2Nix {
     pname = "aerial.nvim";
-    version = "2022-05-02";
+    version = "2022-05-13";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "aerial.nvim";
-      rev = "8d2ef96e44768250a652826c6586005f40eeac7f";
-      sha256 = "0lgn1p381bxr69j1bb2hfj1y51x941p9yjqfg8nd84ka1qy4hjyx";
+      rev = "19e739139283c8ac5e2c147f870d2a038496688e";
+      sha256 = "16h1kkyczqifw0d4lwfaq3smx5scsap1d2pv00kcmwvs56ws5sx9";
     };
     meta.homepage = "https://github.com/stevearc/aerial.nvim/";
   };
@@ -522,12 +522,12 @@ final: prev:
 
   ale = buildVimPluginFrom2Nix {
     pname = "ale";
-    version = "2022-05-02";
+    version = "2022-05-13";
     src = fetchFromGitHub {
       owner = "dense-analysis";
       repo = "ale";
-      rev = "56399106fcf9d80d476307576bc307e67f0167e2";
-      sha256 = "0mc125zrbipikxdffvcn39cqphz0y2lavsbsh4x4604af74va0dv";
+      rev = "044a6c956bfb557ec6c6d37921db6ee11de879f9";
+      sha256 = "1sz58bn0h65bkh29047ps8wm9fni0k9q2gmf69w7q5njlynk4ah9";
     };
     meta.homepage = "https://github.com/dense-analysis/ale/";
   };
@@ -678,12 +678,12 @@ final: prev:
 
   aurora = buildVimPluginFrom2Nix {
     pname = "aurora";
-    version = "2022-02-02";
+    version = "2022-05-05";
     src = fetchFromGitHub {
       owner = "ray-x";
       repo = "aurora";
-      rev = "d11266046077968bbc3d6ac37d81e069618cdedd";
-      sha256 = "1hdycb9rc7kpcppwv332hmrnzx5g2jy5r0ckaynahwwbwbjiyjqh";
+      rev = "315831585d8de6c7787eb05c5bea56f430c851e1";
+      sha256 = "19w3qmk6q1dj4jnwmvmd1af2bjwrfjmfnsrmjim9qmv6w0c2pbav";
     };
     meta.homepage = "https://github.com/ray-x/aurora/";
   };
@@ -714,12 +714,12 @@ final: prev:
 
   auto-session = buildVimPluginFrom2Nix {
     pname = "auto-session";
-    version = "2022-04-21";
+    version = "2022-05-06";
     src = fetchFromGitHub {
       owner = "rmagatti";
       repo = "auto-session";
-      rev = "4b1c978c6fb73e1e59f988fe85cfa51347a86e8a";
-      sha256 = "154s0kfhvmyvcbdmy62v00jlmnfgnkmv4ilwf8hig4qxn1376arw";
+      rev = "7c9477614fb95b103c277a98bf3f588e337cd7ac";
+      sha256 = "1d502bfkr6qxrqr0jxwngj22cz4bh7v36kakpb9g4qbxdd3h1r30";
     };
     meta.homepage = "https://github.com/rmagatti/auto-session/";
   };
@@ -738,12 +738,12 @@ final: prev:
 
   awesome-vim-colorschemes = buildVimPluginFrom2Nix {
     pname = "awesome-vim-colorschemes";
-    version = "2022-01-17";
+    version = "2022-05-04";
     src = fetchFromGitHub {
       owner = "rafi";
       repo = "awesome-vim-colorschemes";
-      rev = "9a28614941beec4539f82937d50df1a03bb70e0d";
-      sha256 = "0fvb3r8176r030wnf1rvpd4dba8cz5506a3plp5j5h5gxpsyd27y";
+      rev = "9f96bbdef5cb19daf58449f0fbb597af6fc4c2eb";
+      sha256 = "1yqc0j2aq3aqyn924dn8d2pqxapn1w5wylgr1pc5mf0f7nl6qc94";
     };
     meta.homepage = "https://github.com/rafi/awesome-vim-colorschemes/";
   };
@@ -762,12 +762,12 @@ final: prev:
 
   barbar-nvim = buildVimPluginFrom2Nix {
     pname = "barbar.nvim";
-    version = "2022-02-22";
+    version = "2022-05-10";
     src = fetchFromGitHub {
       owner = "romgrk";
       repo = "barbar.nvim";
-      rev = "be65945626fb6bf6058cae61d5176d156f923c11";
-      sha256 = "165ffjrwhhjdyssj96z4qn3fjys0dxwckpvjyzrpca2b2fag0cx2";
+      rev = "9d024d646c3fa0281a5ddcf189e2a620010f43ff";
+      sha256 = "05fh6992q7npnar82ijf67nf1c3rj6sxg2wk3ckb22qks2hxq8nd";
     };
     meta.homepage = "https://github.com/romgrk/barbar.nvim/";
   };
@@ -870,36 +870,36 @@ final: prev:
 
   bufdelete-nvim = buildVimPluginFrom2Nix {
     pname = "bufdelete.nvim";
-    version = "2022-04-12";
+    version = "2022-05-07";
     src = fetchFromGitHub {
       owner = "famiu";
       repo = "bufdelete.nvim";
-      rev = "96454aedf95f52393a28cfcfc76482895de014ee";
-      sha256 = "0rr87wbqil2k2cia759kisllwcsbq0s3yhcl9h849qgd4gr2926h";
+      rev = "93e71aabbc3d534d70bb5d1913778eb42afb96f9";
+      sha256 = "0qzf6mmws0f1nmlk8m4pwfsbkkpq5nr024n9l2jvmchax63w1bds";
     };
     meta.homepage = "https://github.com/famiu/bufdelete.nvim/";
   };
 
   bufexplorer = buildVimPluginFrom2Nix {
     pname = "bufexplorer";
-    version = "2022-03-21";
+    version = "2022-05-03";
     src = fetchFromGitHub {
       owner = "jlanzarotta";
       repo = "bufexplorer";
-      rev = "a81eb31192e3033eccedb61c842e274252038a04";
-      sha256 = "06b0mfmys2ah1hkyfipv0chv138mmdlixc2l0377zhq8409i3k3c";
+      rev = "1be66e253730fd186a5a789a67a337420f431a71";
+      sha256 = "1k3x04xvsmqbvmmcg7hlv3jnwpv9qgmdvwjz0620xmspfk43m09x";
     };
     meta.homepage = "https://github.com/jlanzarotta/bufexplorer/";
   };
 
   bufferline-nvim = buildVimPluginFrom2Nix {
     pname = "bufferline.nvim";
-    version = "2022-05-02";
+    version = "2022-05-12";
     src = fetchFromGitHub {
       owner = "akinsho";
       repo = "bufferline.nvim";
-      rev = "2d5266d14b7b5dbc54923469b4599f0349f7cedc";
-      sha256 = "0i8k8paa23v0l011lvydcv45c4jnr8wfiiwyw16hhndfamcwhgfh";
+      rev = "29d5789aa407e7105968c43dba566defd3ca96bd";
+      sha256 = "0skrqpxszp2z2zv21vh2prxdyizps43qjyyy56rxs25cl6hrzb1j";
     };
     meta.homepage = "https://github.com/akinsho/bufferline.nvim/";
   };
@@ -1038,12 +1038,12 @@ final: prev:
 
   cmp-buffer = buildVimPluginFrom2Nix {
     pname = "cmp-buffer";
-    version = "2022-02-21";
+    version = "2022-05-09";
     src = fetchFromGitHub {
       owner = "hrsh7th";
       repo = "cmp-buffer";
-      rev = "d66c4c2d376e5be99db68d2362cd94d250987525";
-      sha256 = "0n9mqrf4rzj784zhshxr2wqyhm99d9mzalxqnik7srkghjvc9l4a";
+      rev = "12463cfcd9b14052f9effccbf1d84caa7a2d57f0";
+      sha256 = "11fbxw8rrhypazd256qwjvf8gg0laqb9b4h9yqdgvwj810y6n6wg";
     };
     meta.homepage = "https://github.com/hrsh7th/cmp-buffer/";
   };
@@ -1206,12 +1206,12 @@ final: prev:
 
   cmp-tabnine = buildVimPluginFrom2Nix {
     pname = "cmp-tabnine";
-    version = "2022-04-04";
+    version = "2022-05-12";
     src = fetchFromGitHub {
       owner = "tzachar";
       repo = "cmp-tabnine";
-      rev = "1c6e5c55f3a879354891c59cf27da733890bfc88";
-      sha256 = "1hmif83kl2h4zz4xqkxb0xc003wzlirr26znx0r1f8z54f1j1hik";
+      rev = "30629b30791b42dcaadc7680cc5cb078a7a3075f";
+      sha256 = "1zs6dmaxx0af62v32c5l7cpywq2sd8fiw8j102mc4pn3s0vdcbgm";
     };
     meta.homepage = "https://github.com/tzachar/cmp-tabnine/";
   };
@@ -1374,12 +1374,12 @@ final: prev:
 
   coc-nvim = buildVimPluginFrom2Nix {
     pname = "coc.nvim";
-    version = "2022-05-01";
+    version = "2022-05-13";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc.nvim";
-      rev = "83a5f083d7ed76899729f25063a5ab9c326e5f02";
-      sha256 = "1pwi1l4h6hdr45z5lnw3mjbpr3jx6iipnaz5bla64cq7cgf98nw6";
+      rev = "a1edaee28938ce266c2543e2552bc6ee1ad29ffa";
+      sha256 = "132jvk2wf53qbn2qgnr0zjh7nw05lr91p2jhykam77gxkmgzazpq";
     };
     meta.homepage = "https://github.com/neoclide/coc.nvim/";
   };
@@ -1398,12 +1398,12 @@ final: prev:
 
   codi-vim = buildVimPluginFrom2Nix {
     pname = "codi.vim";
-    version = "2022-04-30";
+    version = "2022-05-11";
     src = fetchFromGitHub {
       owner = "metakirby5";
       repo = "codi.vim";
-      rev = "086593fbf5f0891c9fa93cf14453ad14a79d3ed0";
-      sha256 = "0m8hgchb927kgcz65fkmk61w6ma5hvqfr221r7f9jbjzj49laaxd";
+      rev = "4da94d813cfcd83434098a24a277d6be43f5bf50";
+      sha256 = "0rr5i704bqw2w600jvgvxl35sx2gak2bbxz59wk7k7jyxrzbjam6";
     };
     meta.homepage = "https://github.com/metakirby5/codi.vim/";
   };
@@ -1447,12 +1447,12 @@ final: prev:
 
   comment-nvim = buildVimPluginFrom2Nix {
     pname = "comment.nvim";
-    version = "2022-04-27";
+    version = "2022-05-12";
     src = fetchFromGitHub {
       owner = "numtostr";
       repo = "comment.nvim";
-      rev = "cb0de89ba80b7cdb37b92e2a9e43b566f8834c7a";
-      sha256 = "17pshx6jq82nfjn2w65i0d3zh53r5b07lc2bh2aqpm5x2c5bhn3h";
+      rev = "40f5587789681b3453e4a27831b7d293e1c3da7b";
+      sha256 = "1lbjqq3h6434gwzc0bmnz64xlkrkjc11nlya6kp4amb6ajj3bg9i";
     };
     meta.homepage = "https://github.com/numtostr/comment.nvim/";
   };
@@ -1615,12 +1615,12 @@ final: prev:
 
   copilot-vim = buildVimPluginFrom2Nix {
     pname = "copilot.vim";
-    version = "2022-04-09";
+    version = "2022-05-09";
     src = fetchFromGitHub {
       owner = "github";
       repo = "copilot.vim";
-      rev = "573da1aaadd7402c3ab22fb1ae6853db1dc82acb";
-      sha256 = "1j2rva50rl8kn480b613z6a0xnfwkvyi4amg9n4r2l89dxdsni84";
+      rev = "df203c1356b72032df32d7b0b5facb4895139b6e";
+      sha256 = "18v21b314p4firiz0xhqnfl45g5wbcigiqq4ypnhf1lgwd6ngpqd";
     };
     meta.homepage = "https://github.com/github/copilot.vim/";
   };
@@ -1639,12 +1639,12 @@ final: prev:
 
   coq_nvim = buildVimPluginFrom2Nix {
     pname = "coq_nvim";
-    version = "2022-05-02";
+    version = "2022-05-13";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "coq_nvim";
-      rev = "b443ff20dd28d90231dad463bcdbf342e53d13f3";
-      sha256 = "14a3942nphlqfr9s4cwx8fa1n1yj1rqhk65bbp6z7zaw7x8g7jmf";
+      rev = "ca1c0df28b235bdce65ac87c0bed31da8f9e8be4";
+      sha256 = "17g7qd44jx5l8903m2hk8ja4hl4n2x43b0wmzvlpgjmpvgvhskzm";
     };
     meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
   };
@@ -1759,24 +1759,24 @@ final: prev:
 
   dart-vim-plugin = buildVimPluginFrom2Nix {
     pname = "dart-vim-plugin";
-    version = "2022-01-25";
+    version = "2022-05-10";
     src = fetchFromGitHub {
       owner = "dart-lang";
       repo = "dart-vim-plugin";
-      rev = "42e6f57f2404b882cb7e491d50e525f8a8eb7f1f";
-      sha256 = "1lla0ldgayryib0868zl10dz6yy9dxa0k86fxl5sr6y0csfpi23z";
+      rev = "ceecea7895e469fc998d383818b2107d97cec06a";
+      sha256 = "1h2glyi5zyskc9ld6gz8p3k84npfg2b1in5rjv3hhwg6d14d6xd8";
     };
     meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/";
   };
 
   dashboard-nvim = buildVimPluginFrom2Nix {
     pname = "dashboard-nvim";
-    version = "2021-04-17";
+    version = "2022-05-09";
     src = fetchFromGitHub {
       owner = "glepnir";
       repo = "dashboard-nvim";
-      rev = "ba98ab86487b8eda3b0934b5423759944b5f7ebd";
-      sha256 = "1gyk0n8ks7xyjqab0gb7yx4ypl9k7csfjgmha84hy7mz4h08fkxq";
+      rev = "3b31a80513969752a8c53ff8b16a8e060404cf50";
+      sha256 = "0gcjyywjdsigq7a4jmcg8zgj6na5zagncdgp2a5qs81sa962k798";
     };
     meta.homepage = "https://github.com/glepnir/dashboard-nvim/";
   };
@@ -1867,12 +1867,12 @@ final: prev:
 
   deol-nvim = buildVimPluginFrom2Nix {
     pname = "deol.nvim";
-    version = "2022-04-29";
+    version = "2022-05-04";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deol.nvim";
-      rev = "0bdb926d328765144dd788c062161c565dc38732";
-      sha256 = "0c4dl37npass3n2dx6459dm1bk30fhy5yaphxjg897wz61xn622x";
+      rev = "cb48ec3f1c119d68cf633757a236228e3d887bf1";
+      sha256 = "0ckhcx6z1dqlvsaldy3961p3h4qvxgdqdp4i8xkqy4scjvaanvz0";
     };
     meta.homepage = "https://github.com/Shougo/deol.nvim/";
   };
@@ -2145,12 +2145,12 @@ final: prev:
 
   diffview-nvim = buildVimPluginFrom2Nix {
     pname = "diffview.nvim";
-    version = "2022-04-14";
+    version = "2022-05-09";
     src = fetchFromGitHub {
       owner = "sindrets";
       repo = "diffview.nvim";
-      rev = "2d1f45282587d565cc4d84112490bc944c0b491d";
-      sha256 = "0cwp07igj131fp650wk6nh80kygvlf7h0r8p915jsyxfh9y06p7i";
+      rev = "91e99ae14e9e6e360540007e6785146458a138da";
+      sha256 = "1sghkg75y62rcc0jy7ra6rsmx05gxz4nv944i4lywn952vc49nd7";
     };
     meta.homepage = "https://github.com/sindrets/diffview.nvim/";
   };
@@ -2181,12 +2181,12 @@ final: prev:
 
   dressing-nvim = buildVimPluginFrom2Nix {
     pname = "dressing.nvim";
-    version = "2022-05-01";
+    version = "2022-05-11";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "dressing.nvim";
-      rev = "a476efd3f372d6b5b0df431cac36911fb84c515e";
-      sha256 = "1n15lzjma6mpaphx6ppmhsgvg51vbrp91qf3nssyvr5n2vpjhhfy";
+      rev = "55e4ceae81d9169f46ea4452ce6e8c58cca00651";
+      sha256 = "1i34pk9l76n8ianz9hww8kn7dnnzivv8sbyf0vf7w21r2bh1p1k4";
     };
     meta.homepage = "https://github.com/stevearc/dressing.nvim/";
   };
@@ -2205,12 +2205,12 @@ final: prev:
 
   edge = buildVimPluginFrom2Nix {
     pname = "edge";
-    version = "2022-04-27";
+    version = "2022-05-04";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "edge";
-      rev = "fb5a763f2591bed8d10562edbd0e64c88cc5e674";
-      sha256 = "0p79ck2n94argr7k8glwpmmzf6945mh4gb23p5hd5m8a02ys7ax4";
+      rev = "93e92e161edfca2cef1534efb88e2aa2138834d9";
+      sha256 = "0y24hdaqq9dsfy4di0pql1zj7a7jj48m44nm2a1g1dsra8k94jm2";
     };
     meta.homepage = "https://github.com/sainnhe/edge/";
   };
@@ -2291,12 +2291,12 @@ final: prev:
 
   everforest = buildVimPluginFrom2Nix {
     pname = "everforest";
-    version = "2022-04-27";
+    version = "2022-05-04";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "everforest";
-      rev = "1e594a20ce382bcc55c0e3fd488e90ca68dffb32";
-      sha256 = "1415759zc6fp39h0xzpb2d99m4xsh5ma84j6yv236zb0bavm88ah";
+      rev = "f748681a3fac2496aedf694f5bd09a30f80cd3c0";
+      sha256 = "0w9gv52y806bn7az9yl2anx7yiv2ildslw4rvj82v5ni0b6mq4j5";
     };
     meta.homepage = "https://github.com/sainnhe/everforest/";
   };
@@ -2351,12 +2351,12 @@ final: prev:
 
   feline-nvim = buildVimPluginFrom2Nix {
     pname = "feline.nvim";
-    version = "2022-04-12";
+    version = "2022-05-06";
     src = fetchFromGitHub {
       owner = "feline-nvim";
       repo = "feline.nvim";
-      rev = "79f5e9e5a76842b72f1814dcd4fc239a95ead391";
-      sha256 = "1svj1464hlash4igbai9mdman7cvlb8rfiyyylm7yn4wh8c2xb3k";
+      rev = "f63f17bc9b845dd4cca4112f243b551aea141ced";
+      sha256 = "1l088yjqkjs8vfgc738qgbd8w72a4rni1bzk5wc9q2z8m1rzf7kr";
     };
     meta.homepage = "https://github.com/feline-nvim/feline.nvim/";
   };
@@ -2399,12 +2399,12 @@ final: prev:
 
   fidget-nvim = buildVimPluginFrom2Nix {
     pname = "fidget.nvim";
-    version = "2022-04-19";
+    version = "2022-05-08";
     src = fetchFromGitHub {
       owner = "j-hui";
       repo = "fidget.nvim";
-      rev = "956683191df04c5a401e1f1fb2e53b957fbcecaa";
-      sha256 = "1hwkm19x8zccwcnq72b8jk6dcmhngsxqcs3c02sarr2n0vqwvip0";
+      rev = "99b306167d1d305ca084e3bb475d6eadf32a365b";
+      sha256 = "0pxxsz0g2qklnl16pfbv0178fd34ff2vvx4qwndwkfgx4qmlkj8q";
     };
     meta.homepage = "https://github.com/j-hui/fidget.nvim/";
   };
@@ -2472,12 +2472,12 @@ final: prev:
 
   formatter-nvim = buildVimPluginFrom2Nix {
     pname = "formatter.nvim";
-    version = "2022-04-26";
+    version = "2022-05-12";
     src = fetchFromGitHub {
       owner = "mhartington";
       repo = "formatter.nvim";
-      rev = "100af7c04f12b99d29fbca7dc1aa3d17301c54e9";
-      sha256 = "082cp251ynznjk3ims389ljdww9786nh8kglydqpqh3sdvc7s0mp";
+      rev = "fb814e0e18a2ced247c40736d395d15a2517486e";
+      sha256 = "19dav8ajydd4b9ziw6l4k9pn3dpc2z6zh1sb8a1hxcv02xfc71xg";
     };
     meta.homepage = "https://github.com/mhartington/formatter.nvim/";
   };
@@ -2496,12 +2496,12 @@ final: prev:
 
   friendly-snippets = buildVimPluginFrom2Nix {
     pname = "friendly-snippets";
-    version = "2022-04-25";
+    version = "2022-05-09";
     src = fetchFromGitHub {
       owner = "rafamadriz";
       repo = "friendly-snippets";
-      rev = "6e0881ad5dfae8bcb160bb6704e1f5fe31be9938";
-      sha256 = "1cyrqsc0jf1v6qxrd944x74803cck3nxddp1ac8rhl9yj8kz176w";
+      rev = "4ef45d099453a26d23084a04ae7dced19e6d5ae5";
+      sha256 = "0l3hkg97w26k01f4arifnnaws4m50b2phig2pq8kqr80rz5i0gk7";
     };
     meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
   };
@@ -2568,24 +2568,24 @@ final: prev:
 
   fzf-lsp-nvim = buildVimPluginFrom2Nix {
     pname = "fzf-lsp.nvim";
-    version = "2022-02-06";
+    version = "2022-05-04";
     src = fetchFromGitHub {
       owner = "gfanto";
       repo = "fzf-lsp.nvim";
-      rev = "b02056f3c4b9d64d876bbf0a58d20791345a9364";
-      sha256 = "16n78ylicrd7lh41g5hvd9vnnhkwbvj28c190k5zvrblyyhipn93";
+      rev = "13fec018f619a14f0fcc90d1ff32f235d3344315";
+      sha256 = "1wmmahy62dk04dplf96qh9aqfamjr3nm1fn3ky5lbw6ij8kgk5y8";
     };
     meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/";
   };
 
   fzf-lua = buildVimPluginFrom2Nix {
     pname = "fzf-lua";
-    version = "2022-05-07";
+    version = "2022-05-12";
     src = fetchFromGitHub {
       owner = "ibhagwan";
       repo = "fzf-lua";
-      rev = "b614a9d315512ec4ce9c1df41474e5ab8e12f7df";
-      sha256 = "0gb7q4fbv3754ck44h6dd93dcy8j4czhhna1d2kgq21614xs303k";
+      rev = "de7ac64e742c21afae5dae93e8207408fde5042c";
+      sha256 = "14hqkwsg4sgah0nyxd08iqzl8aycy6hgxn7wnyk0xdpr0nkhlm24";
     };
     meta.homepage = "https://github.com/ibhagwan/fzf-lua/";
   };
@@ -2676,12 +2676,12 @@ final: prev:
 
   git-blame-nvim = buildVimPluginFrom2Nix {
     pname = "git-blame.nvim";
-    version = "2022-04-29";
+    version = "2022-05-08";
     src = fetchFromGitHub {
       owner = "f-person";
       repo = "git-blame.nvim";
-      rev = "0a7d27028b69525f2c6b6a3460029ed6cb291541";
-      sha256 = "0mbvaasx82wcn37mrn20gb98g7prhav4ps1wyk46mirla350ikjl";
+      rev = "8ab29dd555de8f1791a4d34f47f21c8a2fdae8be";
+      sha256 = "1bknqk0xc85n9qc1mhg9w95yniyk0j9jq7pxc2wwdn5zrfig1vjw";
     };
     meta.homepage = "https://github.com/f-person/git-blame.nvim/";
   };
@@ -2736,12 +2736,12 @@ final: prev:
 
   gitsigns-nvim = buildNeovimPluginFrom2Nix {
     pname = "gitsigns.nvim";
-    version = "2022-05-02";
+    version = "2022-05-12";
     src = fetchFromGitHub {
       owner = "lewis6991";
       repo = "gitsigns.nvim";
-      rev = "ef153188e849bd317c00448755bc4182a2bd495d";
-      sha256 = "1pysiqgkp34kmpf4fkyjqih0rrq3mscrh9z27mzfhy2zhky8pikp";
+      rev = "ffd06e36f6067935d8cb9793905dd2e84e291310";
+      sha256 = "00lm0685mwrm4c4r4vprb0ksmylnrlz8silghaqdg80zlhbn729v";
     };
     meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
   };
@@ -2772,12 +2772,12 @@ final: prev:
 
   glow-nvim = buildVimPluginFrom2Nix {
     pname = "glow.nvim";
-    version = "2022-04-13";
+    version = "2022-05-11";
     src = fetchFromGitHub {
       owner = "ellisonleao";
       repo = "glow.nvim";
-      rev = "0c76518e440f2ea4dbadd87beec8eea4ce030f17";
-      sha256 = "093qa13dd32rn8r50pw3s65186ch2i9wawf1dwylqymjn1afnqbk";
+      rev = "da265c328f5e4f102dbdbb1a0fd8627afdaf0320";
+      sha256 = "1pmj8rjhf80jrgxp8iim9i36qqc6jwx8c73z6nqs6nkmnccychih";
     };
     meta.homepage = "https://github.com/ellisonleao/glow.nvim/";
   };
@@ -2868,24 +2868,24 @@ final: prev:
 
   gruvbox-material = buildVimPluginFrom2Nix {
     pname = "gruvbox-material";
-    version = "2022-04-27";
+    version = "2022-05-04";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "gruvbox-material";
-      rev = "3d664943daf65bf99390a52c5dbc557f87fac552";
-      sha256 = "08zh5rc9p6svmds57gvvkk12nadd56ysx8xrhsjxbn3cdxag86gj";
+      rev = "f943521890297076cdcd629182a0405f6b9a83f0";
+      sha256 = "06x45ygxmqsgxrghvc4l6zdf1waxrwg3lk7m0lq4sh6nygdzhw1h";
     };
     meta.homepage = "https://github.com/sainnhe/gruvbox-material/";
   };
 
   gruvbox-nvim = buildVimPluginFrom2Nix {
     pname = "gruvbox.nvim";
-    version = "2022-04-26";
+    version = "2022-05-12";
     src = fetchFromGitHub {
       owner = "ellisonleao";
       repo = "gruvbox.nvim";
-      rev = "cf1b07f07673b5c2f9e3903b5fc4c2f7bc7d1123";
-      sha256 = "1pr91d8qsii9z5ff4gw766nf4v9r06ym15hk5y3z293bsd6hfns8";
+      rev = "72930977a442a2de2592ed39168c018bef90e086";
+      sha256 = "1k6rbn4ksmgi36f3zqlz52c99x3ilpjmv6q3y93j5kp2lxp1yz6r";
     };
     meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/";
   };
@@ -2916,12 +2916,12 @@ final: prev:
 
   harpoon = buildVimPluginFrom2Nix {
     pname = "harpoon";
-    version = "2022-04-05";
+    version = "2022-05-08";
     src = fetchFromGitHub {
       owner = "ThePrimeagen";
       repo = "harpoon";
-      rev = "28762aa04d6395538e26e1efff5213b26720e68f";
-      sha256 = "0c2fpwm8v2fzkg8rq7lhpv8lzm614y4x6n2xp612sj824jm7aj03";
+      rev = "d3d3d22b6207f46f8ca64946f4d781e975aec0fc";
+      sha256 = "0vc14gg4ll4ghmvyqvzij9pkvm30sml61nhs7pbpw3qq5mfizb7z";
     };
     meta.homepage = "https://github.com/ThePrimeagen/harpoon/";
   };
@@ -3108,24 +3108,24 @@ final: prev:
 
   incsearch-vim = buildVimPluginFrom2Nix {
     pname = "incsearch.vim";
-    version = "2017-11-24";
+    version = "2022-05-13";
     src = fetchFromGitHub {
       owner = "haya14busa";
       repo = "incsearch.vim";
-      rev = "25e2547fb0566460f5999024f7a0de7b3775201f";
-      sha256 = "05v0d9b5sm4d1bvhb01jk6s7brlli2xc16hvzr6gik1nm1ks6ai1";
+      rev = "c83de6d1ac31d173d7c3ffee0ad61dc643ee4f08";
+      sha256 = "0vlj9hdy4d1p06mnxjpdz4mjqvbsgy5rp4l8k87wbs2b5x8008yj";
     };
     meta.homepage = "https://github.com/haya14busa/incsearch.vim/";
   };
 
   indent-blankline-nvim = buildVimPluginFrom2Nix {
     pname = "indent-blankline.nvim";
-    version = "2022-04-15";
+    version = "2022-05-10";
     src = fetchFromGitHub {
       owner = "lukas-reineke";
       repo = "indent-blankline.nvim";
-      rev = "045d9582094b27f5ae04d8b635c6da8e97e53f1d";
-      sha256 = "0wxkvx1xy7p4872fh9ydsnnqlpwm9x3afwakgxv38l9vmk5mpid4";
+      rev = "8567ac8ccd19ee41a6ec55bf044884799fa3f56b";
+      sha256 = "0gbdgn8031i4wgl5w2halaxjir39710n5cs8997cf3fhjj8zk5ss";
     };
     meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/";
   };
@@ -3289,24 +3289,24 @@ final: prev:
 
   julia-vim = buildVimPluginFrom2Nix {
     pname = "julia-vim";
-    version = "2022-03-23";
+    version = "2022-05-06";
     src = fetchFromGitHub {
       owner = "JuliaEditorSupport";
       repo = "julia-vim";
-      rev = "a2c96eda9d5b0dde03d2e22d0888e40426cd38dd";
-      sha256 = "1x9f3gd4bgj3f1c75bp58mvaxll4rw55vznqckc0w0p1bcwq9faw";
+      rev = "d743b99ff8321f4a80d21692bf536442d841bd55";
+      sha256 = "07x3zayahbp2dm7lc5kvrpd0c4i8qivs1brbdv9b1rv9b45qx5nf";
     };
     meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/";
   };
 
   kanagawa-nvim = buildVimPluginFrom2Nix {
     pname = "kanagawa.nvim";
-    version = "2022-04-21";
+    version = "2022-05-04";
     src = fetchFromGitHub {
       owner = "rebelot";
       repo = "kanagawa.nvim";
-      rev = "0ad738e7cc43514d35388c1caca13990d688aa5c";
-      sha256 = "06gcdkh92i5znpn5gw1xyc82nf4kr2j1mi8d8pnajqyvvxyb8mca";
+      rev = "50e7b43552072696d26757aff5f6307e2ab5e3ea";
+      sha256 = "051asspplaw9m1iqv78gfv8dzg3c96c1mhhv5swih4r3zcbylhhi";
     };
     meta.homepage = "https://github.com/rebelot/kanagawa.nvim/";
   };
@@ -3373,24 +3373,24 @@ final: prev:
 
   lazygit-nvim = buildVimPluginFrom2Nix {
     pname = "lazygit.nvim";
-    version = "2022-04-15";
+    version = "2022-05-10";
     src = fetchFromGitHub {
       owner = "kdheepak";
       repo = "lazygit.nvim";
-      rev = "68407ff60c1abe56cecedd4bec41380df5070a21";
-      sha256 = "080h4w55l36rvi4bb8z3bx2g41wp9lk08ihmz0jfmp7dzfgjszsi";
+      rev = "1f9f372b9fc137b8123d12a78c22a26c0fa78f0a";
+      sha256 = "1s4bpi7i86246p28pjk99rv1qj1gp7l7zwfch0f23nwnggm8s6pm";
     };
     meta.homepage = "https://github.com/kdheepak/lazygit.nvim/";
   };
 
   lean-nvim = buildVimPluginFrom2Nix {
     pname = "lean.nvim";
-    version = "2022-05-02";
+    version = "2022-05-09";
     src = fetchFromGitHub {
       owner = "Julian";
       repo = "lean.nvim";
-      rev = "902eb7f75d664bccd251c38d7921570b05b47cdc";
-      sha256 = "1dw8r7vl260baclf8ymq9zr9vxq8d8s6hjbnjs4xqliaza0g7pj3";
+      rev = "725ff1f12e908001d2d42e9b06725cd8117e16f8";
+      sha256 = "0i93k3izl9b8lsax7s1bz53jwkjsjh9iv2wgwk7bf9a6c34g9mq5";
     };
     meta.homepage = "https://github.com/Julian/lean.nvim/";
   };
@@ -3529,24 +3529,24 @@ final: prev:
 
   lightline-vim = buildVimPluginFrom2Nix {
     pname = "lightline.vim";
-    version = "2022-03-15";
+    version = "2022-05-09";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "lightline.vim";
-      rev = "11931e2de42cb1a14887a002a874f0b2daf12bc2";
-      sha256 = "1iyns1bm3wjr6z2hmc0p9j61vhprhax4f9qdqaf3w7vvgkhx1xj6";
+      rev = "b02ef0d9f253dfc1cbb3f340b74998d7a4db0bf6";
+      sha256 = "1rr5n23vvybfi3gbqljalqn0pnkwzzb4zqcz74jlz1dfyddsngah";
     };
     meta.homepage = "https://github.com/itchyny/lightline.vim/";
   };
 
   lightspeed-nvim = buildVimPluginFrom2Nix {
     pname = "lightspeed.nvim";
-    version = "2022-04-04";
+    version = "2022-05-13";
     src = fetchFromGitHub {
       owner = "ggandor";
       repo = "lightspeed.nvim";
-      rev = "cfde2b2fe0dafc5684780399961595357998f611";
-      sha256 = "0zcippcfv87vcsbld0kka4mn2lixg0r6m2c82g9bssf304skfhfr";
+      rev = "c5b93fc1d76a708cb698417326e04f4786a38d90";
+      sha256 = "0lgk9i240mgzf7f3j3z93dkj00fi3rypn79zc60wqdyzhpg4r4lm";
     };
     meta.homepage = "https://github.com/ggandor/lightspeed.nvim/";
   };
@@ -3577,12 +3577,12 @@ final: prev:
 
   lir-nvim = buildVimPluginFrom2Nix {
     pname = "lir.nvim";
-    version = "2022-04-20";
+    version = "2022-05-07";
     src = fetchFromGitHub {
       owner = "tamago324";
       repo = "lir.nvim";
-      rev = "43b2fae50a49fbf435899201b0c687b72ab2cc8f";
-      sha256 = "0ayq5nj6mmxc4pd6sf49wllkr1bkgvx6dsdy0hl2f3w20sn5bpba";
+      rev = "4fc9dcaccb31301cb6ad938e1f40c211ab1115e2";
+      sha256 = "08bn39smzdsh4whqk8icmf39fixnivw0bmvh9c90260mqj7329xr";
     };
     meta.homepage = "https://github.com/tamago324/lir.nvim/";
   };
@@ -3613,12 +3613,12 @@ final: prev:
 
   litee-filetree-nvim = buildVimPluginFrom2Nix {
     pname = "litee-filetree.nvim";
-    version = "2022-04-06";
+    version = "2022-05-11";
     src = fetchFromGitHub {
       owner = "ldelossa";
       repo = "litee-filetree.nvim";
-      rev = "2a59ba7c362d1e39b80baa47dc237a7eeca42ba0";
-      sha256 = "1xw3p3jhyyggp82a8n99nqk9hnm8z6n84lclb2wjbma9a0xzk9kl";
+      rev = "91d403620dafeb30410aa0ed0cc416c9b67d3233";
+      sha256 = "1v70qlnwc59agxasvshr5691k00lvahks469pxh0kb0m072ainri";
     };
     meta.homepage = "https://github.com/ldelossa/litee-filetree.nvim/";
   };
@@ -3637,12 +3637,12 @@ final: prev:
 
   litee-nvim = buildVimPluginFrom2Nix {
     pname = "litee.nvim";
-    version = "2022-04-25";
+    version = "2022-05-09";
     src = fetchFromGitHub {
       owner = "ldelossa";
       repo = "litee.nvim";
-      rev = "2d257af35e90b1ee6017481b7fd82878d8f0e5ff";
-      sha256 = "05cnx2py9jwkpv34fbqqwjq8gb2rx3rwp97a1klr8khk8sr59b5y";
+      rev = "273bc3389434ff041e65f6c10edbf470763f6a8f";
+      sha256 = "1gy6an081phxkzaz0r548lq1idlxwmpgcgxj41jc7cliplfm8h4m";
     };
     meta.homepage = "https://github.com/ldelossa/litee.nvim/";
   };
@@ -3708,12 +3708,12 @@ final: prev:
 
   lsp_signature-nvim = buildVimPluginFrom2Nix {
     pname = "lsp_signature.nvim";
-    version = "2022-05-01";
+    version = "2022-05-09";
     src = fetchFromGitHub {
       owner = "ray-x";
       repo = "lsp_signature.nvim";
-      rev = "6d160406f948a810c40304224a1255c8bba5a415";
-      sha256 = "0hkj9z1ap6a3a4xbdq47cahx2j21pzwiss3fsarpwr6rjmcl62x3";
+      rev = "db324e2ada5bb795d0016ec0ef2b4ae7f11d8904";
+      sha256 = "1swvj79h7bgdm0wmb3a2a730y4gic1aivj371q7k8acc1s824j7d";
     };
     meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
   };
@@ -3732,24 +3732,24 @@ final: prev:
 
   lspsaga-nvim = buildVimPluginFrom2Nix {
     pname = "lspsaga.nvim";
-    version = "2022-03-14";
+    version = "2022-05-05";
     src = fetchFromGitHub {
       owner = "tami5";
       repo = "lspsaga.nvim";
-      rev = "5309d75bd90ce5b1708331df3af1e971fa83a2b9";
-      sha256 = "0xvlpjv69wf18nw5hbmmgbhs8ws4gfq5ny2vrncqaxcikr3gdmms";
+      rev = "8dde091a61ab07f639baaa82b456d3508d0aa7e8";
+      sha256 = "15cimji9x53ki1rrxw2y7vj5g4lp4b91hxljcp9jn9qhkjb7kj47";
     };
     meta.homepage = "https://github.com/tami5/lspsaga.nvim/";
   };
 
   lua-dev-nvim = buildVimPluginFrom2Nix {
     pname = "lua-dev.nvim";
-    version = "2022-01-18";
+    version = "2022-05-12";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "lua-dev.nvim";
-      rev = "a0ee77789d9948adce64d98700cc90cecaef88d5";
-      sha256 = "10hc5iyqicbwjchwfyk7dz2wph0hz7ikjanvga9ncjk62qm2154f";
+      rev = "f5c31936fe06fcbeb59b98f69f74f9c2f91abaec";
+      sha256 = "0vwpi3cg0gv17w3bm2vlzspsms1rn2yjrzkq2zvf2f4slqq3rfpw";
     };
     meta.homepage = "https://github.com/folke/lua-dev.nvim/";
   };
@@ -3768,24 +3768,24 @@ final: prev:
 
   lualine-nvim = buildVimPluginFrom2Nix {
     pname = "lualine.nvim";
-    version = "2022-05-02";
+    version = "2022-05-13";
     src = fetchFromGitHub {
       owner = "nvim-lualine";
       repo = "lualine.nvim";
-      rev = "45d07fc026400c211337a7ce1cb90e7b7a397e31";
-      sha256 = "13np9iqh69w5mrzx8pi5db87cm5sjay5cfs9zb1lk0zxz3n4592d";
+      rev = "a4e4517ac32441dd92ba869944741f0b5f468531";
+      sha256 = "18q935aicddai7j99ln61wz1di6lhwzs11x8fxgq704kfap1l2fj";
     };
     meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/";
   };
 
   luasnip = buildVimPluginFrom2Nix {
     pname = "luasnip";
-    version = "2022-05-01";
+    version = "2022-05-05";
     src = fetchFromGitHub {
       owner = "l3mon4d3";
       repo = "luasnip";
-      rev = "1dbafec2379bd836bd09c4659d4c6e1a70eb380e";
-      sha256 = "1y0jp1saggg59lpicyvjbklg3fb5qmbmh8q7gacx27zgp26hz66r";
+      rev = "cc0086390c6cd2eaebae1834b115c891649ec95f";
+      sha256 = "1kid880y097jl9ys2zs94fj66fq2dhbgjmd97blpdyhsa9m0mgnc";
     };
     meta.homepage = "https://github.com/l3mon4d3/luasnip/";
   };
@@ -3804,12 +3804,12 @@ final: prev:
 
   lush-nvim = buildVimPluginFrom2Nix {
     pname = "lush.nvim";
-    version = "2022-04-12";
+    version = "2022-05-06";
     src = fetchFromGitHub {
       owner = "rktjmp";
       repo = "lush.nvim";
-      rev = "87e9039138051ae75f76235924a273ac1a78cc3e";
-      sha256 = "1plsm3xsf7bm709l6q341cbvm7na78a11b32n3j86j204zybdvbs";
+      rev = "0c4acf666eb23acb5ffbd7f29526d801560b696a";
+      sha256 = "1khpmlf90yhlqaapk2vkqkwzdjwsrrl3hfb209k3wl25588m9fm8";
     };
     meta.homepage = "https://github.com/rktjmp/lush.nvim/";
   };
@@ -3840,12 +3840,12 @@ final: prev:
 
   marks-nvim = buildVimPluginFrom2Nix {
     pname = "marks.nvim";
-    version = "2022-04-03";
+    version = "2022-05-13";
     src = fetchFromGitHub {
       owner = "chentau";
       repo = "marks.nvim";
-      rev = "8e80a20a170434bc77decc97bc4364c3ba848925";
-      sha256 = "0bah5xjrwq43ihw37gw8nxsj3qdh9fjqs9n7fkfhsg6hyp1qy4fc";
+      rev = "56cfa45f9c20373ed90bc4271eae17ee0d452bae";
+      sha256 = "0qc452ikyrrx28by0awm9jggv05zcph95kygjya1085g9win87l4";
     };
     meta.homepage = "https://github.com/chentau/marks.nvim/";
   };
@@ -3864,12 +3864,12 @@ final: prev:
 
   material-nvim = buildVimPluginFrom2Nix {
     pname = "material.nvim";
-    version = "2022-04-18";
+    version = "2022-05-10";
     src = fetchFromGitHub {
       owner = "marko-cerovac";
       repo = "material.nvim";
-      rev = "9679aaf52e709b892a2cac044e44b694ea027709";
-      sha256 = "183afbjbblwx6r8ix1z3h7nq54fhbdf5w2nagwd850w90iq6kyic";
+      rev = "255033d6db241cec11d81ee46d81b56122e2000a";
+      sha256 = "1zn32xkbn37mqi41rh6d0186rxkq7ry5m1j7f8iliyhvd5gj1a1s";
     };
     meta.homepage = "https://github.com/marko-cerovac/material.nvim/";
   };
@@ -3888,24 +3888,24 @@ final: prev:
 
   mini-nvim = buildVimPluginFrom2Nix {
     pname = "mini.nvim";
-    version = "2022-05-01";
+    version = "2022-05-12";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.nvim";
-      rev = "2bc924df80eaa788abd9af9ab9df446b10aa9b88";
-      sha256 = "159n5sxg28lsvapdy59dxfhnjr7nb2wqy05pbcsdk90g4d7v43f7";
+      rev = "1764bcfb1450ddef4eb7118a3c16464caad44439";
+      sha256 = "0bayg5y0i23pz6x798qyx90l1w6wmf83kgdz9akxn6s5m82v8z4y";
     };
     meta.homepage = "https://github.com/echasnovski/mini.nvim/";
   };
 
   minimap-vim = buildVimPluginFrom2Nix {
     pname = "minimap.vim";
-    version = "2022-04-15";
+    version = "2022-05-09";
     src = fetchFromGitHub {
       owner = "wfxr";
       repo = "minimap.vim";
-      rev = "3395cbd51bf042ef6d2cd714eb493eb7ed5fbb76";
-      sha256 = "1bia6l9dhx0hk3jk38zgid8ljs28azrmz5xfp4mv5wa1g1kby0bl";
+      rev = "5d44fe7a3a5f7041c4220a71e8fe83d8c8498042";
+      sha256 = "04rqv8c5g1fs8pymlf2fcbm09k64bvpiqmjilf59m843vkvgk1xf";
     };
     meta.homepage = "https://github.com/wfxr/minimap.vim/";
   };
@@ -4248,12 +4248,12 @@ final: prev:
 
   neogit = buildVimPluginFrom2Nix {
     pname = "neogit";
-    version = "2022-04-13";
+    version = "2022-05-09";
     src = fetchFromGitHub {
       owner = "TimUntersberger";
       repo = "neogit";
-      rev = "c8dd268091ffcbcb673de59c5b37ff26a2eb24ed";
-      sha256 = "0a5y5vlpfmx113byas8y91s0ng6xnxmjpva0jiv9wk419kgnk0f1";
+      rev = "84d1eefe9d5af41cc3e5de02f2c9a263d5302781";
+      sha256 = "03zrwgk0z534qzbzrf2s3bdk3kcjyrxjhr3xp0qsx7nlpx5ackby";
     };
     meta.homepage = "https://github.com/TimUntersberger/neogit/";
   };
@@ -4308,12 +4308,12 @@ final: prev:
 
   neorg = buildVimPluginFrom2Nix {
     pname = "neorg";
-    version = "2022-05-01";
+    version = "2022-05-13";
     src = fetchFromGitHub {
       owner = "nvim-neorg";
       repo = "neorg";
-      rev = "633dfc9f0c3a00a32ee89d4ab826da2eecfe9bd8";
-      sha256 = "13r17drh0xy2dibx2qq4r90zlkjfyp3mzfa6p7w29yr623ixbbs1";
+      rev = "509947a6587a83aa755914eb95be605864bb108d";
+      sha256 = "0qhq61kl3y282dm06z7kyzda5qpj9nk3mpvz5asc46vfvw98ijyh";
     };
     meta.homepage = "https://github.com/nvim-neorg/neorg/";
   };
@@ -4368,12 +4368,12 @@ final: prev:
 
   neovim-ayu = buildVimPluginFrom2Nix {
     pname = "neovim-ayu";
-    version = "2022-05-01";
+    version = "2022-05-11";
     src = fetchFromGitHub {
       owner = "Shatur";
       repo = "neovim-ayu";
-      rev = "cc64cadfd6e54967a7b01bac1a689239a20804ac";
-      sha256 = "1rnlr14n3b6sxs0m64x5s42yq2bj8677bxyz4b479cdiq76gnyk2";
+      rev = "bb0793b661acec468c472f20eb28dbe855428793";
+      sha256 = "0nrky5mlh79xzgdbwibrs43yw317gaavhq0p7pfpxsxdxhfjw416";
     };
     meta.homepage = "https://github.com/Shatur/neovim-ayu/";
   };
@@ -4488,12 +4488,12 @@ final: prev:
 
   nightfox-nvim = buildVimPluginFrom2Nix {
     pname = "nightfox.nvim";
-    version = "2022-05-02";
+    version = "2022-05-10";
     src = fetchFromGitHub {
       owner = "EdenEast";
       repo = "nightfox.nvim";
-      rev = "25b3f3e46c87c51e4d8075d2e11f481628716363";
-      sha256 = "1asz3wz9v47smwn6ahzmv8mdjbfazwbwzmcf9niy0jxva6b3qyrx";
+      rev = "63a8eb64e8559e4c910e91025a2959c4b50b8c54";
+      sha256 = "1kiryppcg1ng8n5m3b5qyzzw5vnisgpb1n6yw961yddxdzc8hcr4";
     };
     meta.homepage = "https://github.com/EdenEast/nightfox.nvim/";
   };
@@ -4548,12 +4548,12 @@ final: prev:
 
   nord-nvim = buildVimPluginFrom2Nix {
     pname = "nord.nvim";
-    version = "2022-02-17";
+    version = "2022-05-11";
     src = fetchFromGitHub {
       owner = "shaunsingh";
       repo = "nord.nvim";
-      rev = "1fdad275596f85bdc36c525b14697ff3a4f08bdf";
-      sha256 = "1pq32gnpmkyqaxq0j5bqf6ik9vkrf2zkayvcvb6fv4vxaiv7w7hr";
+      rev = "fb2c13625c711d3ab9303c0d9881437b5b280ba5";
+      sha256 = "1pd8wsjp6jg2a8bvwn593sd9wf2czaxaq05xlgjzfwgc9k30mjig";
     };
     meta.homepage = "https://github.com/shaunsingh/nord.nvim/";
   };
@@ -4572,36 +4572,36 @@ final: prev:
 
   nterm-nvim = buildVimPluginFrom2Nix {
     pname = "nterm.nvim";
-    version = "2021-11-10";
+    version = "2022-05-10";
     src = fetchFromGitHub {
       owner = "jlesquembre";
       repo = "nterm.nvim";
-      rev = "14d16c83aa1d165724f7780f470c4dcde5addcb6";
-      sha256 = "0y883fpjfk7lki8nfscxhfw0wr7xm1d22zgf52zqmc9pjznjz9my";
+      rev = "cd7b7035d09144ee4ea49244bf5cb8ed68e499f8";
+      sha256 = "0cvg03d1z7jkamg062ng731pdmckrdm611q24brr9ha1qc5q26gm";
     };
     meta.homepage = "https://github.com/jlesquembre/nterm.nvim/";
   };
 
   nui-nvim = buildVimPluginFrom2Nix {
     pname = "nui.nvim";
-    version = "2022-04-08";
+    version = "2022-05-06";
     src = fetchFromGitHub {
       owner = "MunifTanjim";
       repo = "nui.nvim";
-      rev = "42552b3797c3452c5c94e0c84a04fbda9591b9d1";
-      sha256 = "0ggiq9yvrkv2fff41qzvz82lsxxc8swlxfvv1n9g5am8zym2ssk1";
+      rev = "abdbfab89f307151db83b1a5147cd390ef27ff99";
+      sha256 = "0z49sfnsr7hmfr4vrd82f1m6kvswfqq31n4fsdmjy9h4qmjb0w5f";
     };
     meta.homepage = "https://github.com/MunifTanjim/nui.nvim/";
   };
 
   null-ls-nvim = buildVimPluginFrom2Nix {
     pname = "null-ls.nvim";
-    version = "2022-05-01";
+    version = "2022-05-09";
     src = fetchFromGitHub {
       owner = "jose-elias-alvarez";
       repo = "null-ls.nvim";
-      rev = "3dbded7cfaf0591157280bc97d11407eeaef3ea9";
-      sha256 = "0k74064x0k2l4k07zlfv3kl3qm3f7spj49rr9ahcwn0pni38y71c";
+      rev = "dcad76eb1abb80cf3a27208823becbf62547abf8";
+      sha256 = "1xsgmz1gzrz313whjm2ivc7px7xkcdqqi9gn466d5yyshzqvx3jq";
     };
     meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
   };
@@ -4644,12 +4644,12 @@ final: prev:
 
   nvim-autopairs = buildVimPluginFrom2Nix {
     pname = "nvim-autopairs";
-    version = "2022-04-28";
+    version = "2022-05-04";
     src = fetchFromGitHub {
       owner = "windwp";
       repo = "nvim-autopairs";
-      rev = "63779ea99ed43ab22660ac6ae5b506a40bf41aeb";
-      sha256 = "0lc03xjsamy8fpfwy6ag9r8cx1cp0my461l0wvbgznzr1qkq325y";
+      rev = "aea913109d30c87df329ec9b8fea9aed6ef9f52a";
+      sha256 = "0jhw4m552vfxilmn5cp67a9xz1w8jd6ixijyl2bsvp1j56qklfi6";
     };
     meta.homepage = "https://github.com/windwp/nvim-autopairs/";
   };
@@ -4704,12 +4704,12 @@ final: prev:
 
   nvim-cmp = buildVimPluginFrom2Nix {
     pname = "nvim-cmp";
-    version = "2022-05-02";
+    version = "2022-05-13";
     src = fetchFromGitHub {
       owner = "hrsh7th";
       repo = "nvim-cmp";
-      rev = "bba6fb67fdafc0af7c5454058dfbabc2182741f4";
-      sha256 = "1qkhynhaasplvk7argik7jqkl0jymi347xqbg1i7b1h4qp51xjpq";
+      rev = "9a0c639ac2324e6e9ecc54dc22b1d32bb6c42ab9";
+      sha256 = "06pza2xc5fzmsdz945mascmjd43k48agfq15ds91km8scpvpsx77";
     };
     meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
   };
@@ -4788,24 +4788,24 @@ final: prev:
 
   nvim-dap = buildVimPluginFrom2Nix {
     pname = "nvim-dap";
-    version = "2022-04-18";
+    version = "2022-05-11";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-dap";
-      rev = "d6d8317ce9e096029150bc5844916347a9af6f45";
-      sha256 = "0p5317hf7a9ky78dg68j4daj6z0nmhxiq4v52nfld54kz1f5dkmx";
+      rev = "2249fcfd09cdc27c08e9d2f3be5268ba81db3378";
+      sha256 = "0v0gz77dqyd485f9d43q101zcxnsyc13n9bl572xcrshdn6czncs";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
   };
 
   nvim-dap-ui = buildVimPluginFrom2Nix {
     pname = "nvim-dap-ui";
-    version = "2022-04-29";
+    version = "2022-05-11";
     src = fetchFromGitHub {
       owner = "rcarriga";
       repo = "nvim-dap-ui";
-      rev = "3eec5258c620e2b7b688676be8fb2e9a8ae436b2";
-      sha256 = "1x7y49jzbj3s07pkdi842balj9wx0x1z4khgixxj7p03awcyngsm";
+      rev = "e5c32746aa72e39267803fdf6934d79541d39f42";
+      sha256 = "06igsddmjd27wj880vq9l9qq38x438ybrjvizn8dz98paypa6b1d";
     };
     meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/";
   };
@@ -4860,12 +4860,12 @@ final: prev:
 
   nvim-gdb = buildVimPluginFrom2Nix {
     pname = "nvim-gdb";
-    version = "2022-05-02";
+    version = "2022-05-12";
     src = fetchFromGitHub {
       owner = "sakhnik";
       repo = "nvim-gdb";
-      rev = "d064ee481b2aec86133ebcd514c835a28776f9c5";
-      sha256 = "1xxm69jndx8sgkip1f8n7k9nb697d1n7r13iyp1bcgllwir5f1mi";
+      rev = "9c630705829fbe8c21a9379ae2be948560189d80";
+      sha256 = "1cdc2r12k1nma37vicshy4kbk79ap8qj040rscxzl41z96ff8v0b";
     };
     meta.homepage = "https://github.com/sakhnik/nvim-gdb/";
   };
@@ -4884,12 +4884,12 @@ final: prev:
 
   nvim-highlite = buildVimPluginFrom2Nix {
     pname = "nvim-highlite";
-    version = "2022-04-29";
+    version = "2022-05-12";
     src = fetchFromGitHub {
       owner = "Iron-E";
       repo = "nvim-highlite";
-      rev = "16f6fe2ece750b9cbfacca3675e8e71cd4c19665";
-      sha256 = "1i5v8z6gmj09lwi6mb6m6srskavqdwwv4iazajjrjwjv0wfzcdb9";
+      rev = "1838e0a8418dfc87bc35ecb4a2bc594f032fda06";
+      sha256 = "10ipn3xw4vlfkms0vg28gvwycs3hxpssc1gmp6hfj9z9ips976x1";
     };
     meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
   };
@@ -4920,12 +4920,12 @@ final: prev:
 
   nvim-jdtls = buildVimPluginFrom2Nix {
     pname = "nvim-jdtls";
-    version = "2022-04-29";
+    version = "2022-05-06";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-jdtls";
-      rev = "9010412f7de118168d2fe4ba97b578d0d76cc500";
-      sha256 = "0jzz9av1k4msa9942p8g1f0cnlh0rdgb026s3xg4ksbdspc72d67";
+      rev = "f582b5be2ae1fee2e5dc974cd9b979a1ab08cca6";
+      sha256 = "0bfdp6xbq7qr7185m06ccfmln2gc24vc1215cxczm1bpyrh98ncq";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
   };
@@ -4968,36 +4968,36 @@ final: prev:
 
   nvim-lint = buildVimPluginFrom2Nix {
     pname = "nvim-lint";
-    version = "2022-05-02";
+    version = "2022-05-11";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-lint";
-      rev = "2c8f41f62d09b1e1068c3949661eba5bc0cea7ba";
-      sha256 = "08syhj3wwrz7ivv492zjs02xcf42b3f1zhh26am8jr430k0l491d";
+      rev = "0407c340a77380e4122dc349efa10fc846c928b4";
+      sha256 = "1cagndfqdk505q18iq4wgmwav3hh04vmgxj7h8924v9ffj8wr0wx";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-lint/";
   };
 
   nvim-lsp-ts-utils = buildVimPluginFrom2Nix {
     pname = "nvim-lsp-ts-utils";
-    version = "2022-04-04";
+    version = "2022-05-09";
     src = fetchFromGitHub {
       owner = "jose-elias-alvarez";
       repo = "nvim-lsp-ts-utils";
-      rev = "1826275ee0fc7fded65e8716b231db86a17080e3";
-      sha256 = "129zjds8c69hahv307wnpdsjzfh29flsr99lkjma8dymsan96lb0";
+      rev = "441385952278a1df5c91ba0d33e72c148d4654d3";
+      sha256 = "199nf01hjxdalc76xhr306xyisvydjwqhhw40nx1krq9k3xy4z39";
     };
     meta.homepage = "https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/";
   };
 
   nvim-lspconfig = buildVimPluginFrom2Nix {
     pname = "nvim-lspconfig";
-    version = "2022-04-28";
+    version = "2022-05-12";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "21102d5e3b6ffc6929d60418581ac1a29ee9eddd";
-      sha256 = "16hdgxzbb31253178kyy1j77qpskq80dlnfdfxj2bh761zc237rn";
+      rev = "9ff2a06cebd4c8c3af5259d713959ab310125bec";
+      sha256 = "1jsrbimif11jvkdbb7kz6c9iykbql5kzx4q4p0njfdqmvkn4ybdb";
     };
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
   };
@@ -5016,24 +5016,24 @@ final: prev:
 
   nvim-metals = buildVimPluginFrom2Nix {
     pname = "nvim-metals";
-    version = "2022-04-27";
+    version = "2022-05-13";
     src = fetchFromGitHub {
       owner = "scalameta";
       repo = "nvim-metals";
-      rev = "6bc7681b489b04feff394f832984d14510e97e47";
-      sha256 = "0syq7sp836glngfjv6ykbwa14bwyn1zr929ma2sxs5jvqj5sbzvx";
+      rev = "7c74065823e073749652749a7a89c78c81749acf";
+      sha256 = "1rbmksw2ia8rvfjncvyy77bcx1zwpragw1k9fv7n50xhpjsgahvc";
     };
     meta.homepage = "https://github.com/scalameta/nvim-metals/";
   };
 
   nvim-neoclip-lua = buildVimPluginFrom2Nix {
     pname = "nvim-neoclip.lua";
-    version = "2022-04-29";
+    version = "2022-05-11";
     src = fetchFromGitHub {
       owner = "AckslD";
       repo = "nvim-neoclip.lua";
-      rev = "f3ff1645de5d2fd46ac8ffe86e440b7f3ae1fd11";
-      sha256 = "0ayi9sfdj1rcz9zlib65vbpaf9jyyfkiqsadiq6ldgwj9wx6vvi4";
+      rev = "5520ad7b24b0c4bc0b5371eef2492e787aa59a3a";
+      sha256 = "050p667xqi15fddvyr2p11xpsr9sl2mapfi5x6g9ca4x1738jgsv";
     };
     meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/";
   };
@@ -5052,12 +5052,12 @@ final: prev:
 
   nvim-notify = buildVimPluginFrom2Nix {
     pname = "nvim-notify";
-    version = "2022-05-01";
+    version = "2022-05-04";
     src = fetchFromGitHub {
       owner = "rcarriga";
       repo = "nvim-notify";
-      rev = "ebe78bea13b60640816658ae798a199bd5118eb1";
-      sha256 = "0mzbqfc5kw4qa9hifjkzf3i1adz38g1lg9m6395y3bc6zry73dxp";
+      rev = "d4a01eedeb2e6c3d453f3aa0f1b303dd8611dc71";
+      sha256 = "0i0nikpin6fab7x72mzjsxsfgpyjnk4fhmw7il51i2igllxm5krs";
     };
     meta.homepage = "https://github.com/rcarriga/nvim-notify/";
   };
@@ -5076,24 +5076,24 @@ final: prev:
 
   nvim-scrollview = buildVimPluginFrom2Nix {
     pname = "nvim-scrollview";
-    version = "2022-04-13";
+    version = "2022-05-05";
     src = fetchFromGitHub {
       owner = "dstein64";
       repo = "nvim-scrollview";
-      rev = "ba6c48bf7919dd48a371e7b9c683b8858053e885";
-      sha256 = "1pziragklk4zciy2q07llsa6ldqv090ynwclzrgwsv79l1rf9mzm";
+      rev = "696b56fec29bad6daadafdc067955cd6010933bc";
+      sha256 = "1j9i36ww0krq3k01l2rzd6qc29kc6w5cnl2lvb4m24n3k5rakjd4";
     };
     meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
   };
 
   nvim-solarized-lua = buildVimPluginFrom2Nix {
     pname = "nvim-solarized-lua";
-    version = "2022-01-22";
+    version = "2022-05-13";
     src = fetchFromGitHub {
       owner = "ishan9299";
       repo = "nvim-solarized-lua";
-      rev = "995ae7e0baa4b5d42c094ffa7d6b3fe9459397c3";
-      sha256 = "01dsbdlizckvw34hwzq7jkdhsv5008jzj9p140c177zv4qps2kll";
+      rev = "a6af3a33cfe78c97f3adb2d86d3165bb25fb0ec3";
+      sha256 = "1z7wi72dqrw0fgsnm0s7zmxb72cq564dqvvpl1cqgizf4ab2a42a";
     };
     meta.homepage = "https://github.com/ishan9299/nvim-solarized-lua/";
   };
@@ -5124,38 +5124,38 @@ final: prev:
 
   nvim-tree-lua = buildVimPluginFrom2Nix {
     pname = "nvim-tree.lua";
-    version = "2022-05-01";
+    version = "2022-05-10";
     src = fetchFromGitHub {
       owner = "kyazdani42";
       repo = "nvim-tree.lua";
-      rev = "483f1550d1c53f7dcf261d40af5f993ffcb8b9c3";
-      sha256 = "1syhjcf9pawc70apbrhrddsxyabqqs60f0s7yc759v6qb64nqshr";
+      rev = "82ec79aac5557c05728d88195fb0d008cacbf565";
+      sha256 = "1xxxapb093mljrw8yr7qm2nij7j0639pfpyc3pv9zgz6ivd4d6xc";
     };
     meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
   };
 
   nvim-treesitter = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter";
-    version = "2022-05-01";
+    version = "2022-05-13";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "4067351ffd6e5cfd5527873f6db9845e04527b8b";
-      sha256 = "0232nmbp82wjpv3npb4302pmsdfcfs67cgl7775d552zqfr2va9r";
+      rev = "f1373051e554cc4642cda719c8023e4e8508eb2d";
+      sha256 = "1jfcjwyp57scwj164pxzh376mh2i4nx2sxx0gpihl3r4m067gb84";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
   };
 
   nvim-treesitter-context = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter-context";
-    version = "2022-01-12";
+    version = "2022-05-12";
     src = fetchFromGitHub {
-      owner = "romgrk";
+      owner = "nvim-treesitter";
       repo = "nvim-treesitter-context";
-      rev = "b7d7aba81683c1cd76141e090ff335bb55332cba";
-      sha256 = "113vvcisnypfbbnw9l9jq0avsh95p286gay3vb60ykfxjfbxsw1q";
+      rev = "a7916523e8107a57021cabae51917b7dae844aa6";
+      sha256 = "0pqc31yp8prq5gkblasyyhf4cxi4gkqglp0jmvqmsax46r82ffz1";
     };
-    meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/";
+    meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/";
   };
 
   nvim-treesitter-pyfold = buildVimPluginFrom2Nix {
@@ -5220,12 +5220,12 @@ final: prev:
 
   nvim-ts-rainbow = buildVimPluginFrom2Nix {
     pname = "nvim-ts-rainbow";
-    version = "2022-04-24";
+    version = "2022-05-09";
     src = fetchFromGitHub {
       owner = "p00f";
       repo = "nvim-ts-rainbow";
-      rev = "a7767e2a1761078abb97f6516e45c56147e0952e";
-      sha256 = "0ms95gxvydzf078y8mp2xqinm9bbk750nqc3ayyi26ipqba6f13x";
+      rev = "190f8c83abb29504877b91c84ed3ceb6009ad3bd";
+      sha256 = "1kq54zd1yx6q1ch886jcvhhydbxz9frky9wl60q00q62zgds8vmz";
     };
     meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";
   };
@@ -5280,12 +5280,12 @@ final: prev:
 
   nvimdev-nvim = buildVimPluginFrom2Nix {
     pname = "nvimdev.nvim";
-    version = "2022-04-24";
+    version = "2022-05-04";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvimdev.nvim";
-      rev = "2bfb1156112267e1ab98c6779fb15cf858bf11b9";
-      sha256 = "1bdx2lmyh9zvqlqah2knkhdnh5n1fcnav4iw0v9ls4845q2qh4i4";
+      rev = "ef38441a7149087366bfc05654e7cc21a83df60e";
+      sha256 = "0chdbsixjw3l6bvqdhf2na2hdwm94lzb66mssafbhgpq328y97wk";
     };
     meta.homepage = "https://github.com/neovim/nvimdev.nvim/";
   };
@@ -5316,12 +5316,12 @@ final: prev:
 
   octo-nvim = buildVimPluginFrom2Nix {
     pname = "octo.nvim";
-    version = "2022-04-26";
+    version = "2022-05-13";
     src = fetchFromGitHub {
       owner = "pwntester";
       repo = "octo.nvim";
-      rev = "622ab9feaa735dc0999e567183ce357f3dff080f";
-      sha256 = "00prf7wb1p7daqly08h8l4ak5cmwbr76c5i40a8vfpn660wgj2zg";
+      rev = "f5bd0c0336d6585a18b3ea95b4a40be068c74bbb";
+      sha256 = "1cgkdrnk0yfrls5s4vjvkz0851c5877lmpnkh17nw1zn9rlds165";
     };
     meta.homepage = "https://github.com/pwntester/octo.nvim/";
   };
@@ -5364,12 +5364,12 @@ final: prev:
 
   onedarkpro-nvim = buildVimPluginFrom2Nix {
     pname = "onedarkpro.nvim";
-    version = "2022-04-26";
+    version = "2022-05-13";
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "onedarkpro.nvim";
-      rev = "bca9cfd1dc2e4311659d9ab85e6e7f3c8309a4d7";
-      sha256 = "10xl1hmrkzklsxlbgkazp62h97ff7pz3dczsgx7mk8bzs8cq5433";
+      rev = "1f6e3bbb20f45648f5680606e5e5d5e881133f1f";
+      sha256 = "05vhgrsn8fbmrzc5hn9k34qscvdvrq30rl61lgsw0wsn49685ck9";
     };
     meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
   };
@@ -5412,12 +5412,12 @@ final: prev:
 
   orgmode = buildVimPluginFrom2Nix {
     pname = "orgmode";
-    version = "2022-05-02";
+    version = "2022-05-13";
     src = fetchFromGitHub {
       owner = "nvim-orgmode";
       repo = "orgmode";
-      rev = "1a52ca239c726d62104fad012472c28a00cdcc22";
-      sha256 = "17360m754y0fsxh95pl0zfl8jhhgw4hvk4991kxksrir0v3xsayz";
+      rev = "675e58f6c7a889871911a5dc3e08491fe7b6b8a8";
+      sha256 = "02czyx7gpd85ns2rndx52f5a07iq2qqm2zvhvfnmmmfpz11s26w6";
     };
     meta.homepage = "https://github.com/nvim-orgmode/orgmode/";
   };
@@ -5556,12 +5556,12 @@ final: prev:
 
   plenary-nvim = buildNeovimPluginFrom2Nix {
     pname = "plenary.nvim";
-    version = "2022-04-17";
+    version = "2022-05-13";
     src = fetchFromGitHub {
       owner = "nvim-lua";
       repo = "plenary.nvim";
-      rev = "9069d14a120cadb4f6825f76821533f2babcab92";
-      sha256 = "0pgzi0brqn4kcbv1k5d50xm0bcwaq50sk5jnj3q9ls2pvv7lb9a0";
+      rev = "0a907364b5cd6e3438e230df7add8b9bb5ef6fd3";
+      sha256 = "07k4vlpa1cxg4sxhwg0412ws13djspga16d67lqs545j5pfkgzr0";
     };
     meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
   };
@@ -5834,12 +5834,12 @@ final: prev:
 
   refactoring-nvim = buildVimPluginFrom2Nix {
     pname = "refactoring.nvim";
-    version = "2022-04-27";
+    version = "2022-05-11";
     src = fetchFromGitHub {
       owner = "theprimeagen";
       repo = "refactoring.nvim";
-      rev = "fef309f654906d931f2c714a77f5182fe70ada7d";
-      sha256 = "15y5v702xa2ax35p4sdv5ylkpz06pnrfi0jfp2isbl6z79p6dqv3";
+      rev = "33ac6f3bcfe97447037ded20291d40de34d8912c";
+      sha256 = "1m0bd72pjay9mlmf0lhii7yi4mch77dlqwadlsiyv9qw07w1b1s4";
     };
     meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";
   };
@@ -5870,12 +5870,12 @@ final: prev:
 
   rest-nvim = buildVimPluginFrom2Nix {
     pname = "rest.nvim";
-    version = "2022-05-01";
+    version = "2022-05-13";
     src = fetchFromGitHub {
       owner = "NTBBloodbath";
       repo = "rest.nvim";
-      rev = "e5f68db73276c4d4d255f75a77bbe6eff7a476ef";
-      sha256 = "1gkml0101kai4cff2dlk8bv8rhsbiyr55hysvyv46gnxhisd8fy0";
+      rev = "d902996de965d5d491f122e69ba9d03f9c673eb0";
+      sha256 = "05vibdiig6lmiiixnnzc99adi6x4chkx02hqy51llahsdkg7369s";
     };
     meta.homepage = "https://github.com/NTBBloodbath/rest.nvim/";
   };
@@ -5894,12 +5894,12 @@ final: prev:
 
   rnvimr = buildVimPluginFrom2Nix {
     pname = "rnvimr";
-    version = "2022-04-08";
+    version = "2022-05-10";
     src = fetchFromGitHub {
       owner = "kevinhwang91";
       repo = "rnvimr";
-      rev = "65705df886624833105f6f146ac4cf8c4d426aad";
-      sha256 = "1xc83qih6pw1g3qrkjzmn3bri0xn8cmqiqykxajd77ijxjaq9xsp";
+      rev = "9c1e490e5ff882e2f930ec015946a0b5b300037e";
+      sha256 = "1msynng52mn47iqfwwi0n6wl37psj67pvyyz9kdb4l9r89ahqxax";
     };
     meta.homepage = "https://github.com/kevinhwang91/rnvimr/";
   };
@@ -5954,12 +5954,12 @@ final: prev:
 
   rust-tools-nvim = buildVimPluginFrom2Nix {
     pname = "rust-tools.nvim";
-    version = "2022-05-01";
+    version = "2022-05-12";
     src = fetchFromGitHub {
       owner = "simrat39";
       repo = "rust-tools.nvim";
-      rev = "fe900a3d6028df4e7b7c89e8b0bf05b86af462ac";
-      sha256 = "0mkbq5rk86jz5ckj1bg7z0s5x3j8kcldfc57gdk8r48bjkirds42";
+      rev = "fbfcd9c4b7e40202ccf3db5035ac3c2b15a4413f";
+      sha256 = "1plxhdr7j088nsq361zq35p4wmv9xd9xbgvi3mxr66mmmcm8k0pd";
     };
     meta.homepage = "https://github.com/simrat39/rust-tools.nvim/";
   };
@@ -6123,12 +6123,12 @@ final: prev:
 
   slimv = buildVimPluginFrom2Nix {
     pname = "slimv";
-    version = "2022-04-03";
+    version = "2022-05-09";
     src = fetchFromGitHub {
       owner = "kovisoft";
       repo = "slimv";
-      rev = "eb5856c616466b0f463e27a30965ea142003a552";
-      sha256 = "1c4hprzqzxkf0yqkqc8261qr7xk817nm28cp38dw4z1rmjcg1l04";
+      rev = "cba9910aaad90dd5f1cd508ad98adebe2271069c";
+      sha256 = "16zxvwrgiv5fafwm0b75ici35c630466mxdk4dww978152bxahzn";
     };
     meta.homepage = "https://github.com/kovisoft/slimv/";
   };
@@ -6171,12 +6171,12 @@ final: prev:
 
   sonokai = buildVimPluginFrom2Nix {
     pname = "sonokai";
-    version = "2022-04-27";
+    version = "2022-05-10";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "sonokai";
-      rev = "9ad83caa675cb5160760bf85dcb951946c994572";
-      sha256 = "02sp13fbz12xbw7jh5l1isim7q66l54xdl82y4x245xh7h6mkvnh";
+      rev = "06b51526ad1db6359ec65ef5326a020bcae46ab9";
+      sha256 = "0yhn3hgqgdp56qcdy18zzhbx8z54g6i39prrbckpxi7mfh0i2lmm";
     };
     meta.homepage = "https://github.com/sainnhe/sonokai/";
   };
@@ -6195,12 +6195,12 @@ final: prev:
 
   space-vim = buildVimPluginFrom2Nix {
     pname = "space-vim";
-    version = "2022-02-15";
+    version = "2022-05-13";
     src = fetchFromGitHub {
       owner = "liuchengxu";
       repo = "space-vim";
-      rev = "637390b17a8cd7d154a0d90a5c07612f1538a28e";
-      sha256 = "0f43mspfnch1ifqa9rgvc64dmk0hz3cirz8iicpszmdr0fphq3xs";
+      rev = "36f61f8e7157750f0e93d496d68b46d606d313b7";
+      sha256 = "0pm630rq3ihjr4ikfzh08cpi2ps0qasp6dm8rdrm3zdf5b58i1bz";
     };
     meta.homepage = "https://github.com/liuchengxu/space-vim/";
   };
@@ -6267,12 +6267,12 @@ final: prev:
 
   splitjoin-vim = buildVimPluginFrom2Nix {
     pname = "splitjoin.vim";
-    version = "2022-05-02";
+    version = "2022-05-10";
     src = fetchFromGitHub {
       owner = "AndrewRadev";
       repo = "splitjoin.vim";
-      rev = "64f68a641084d18903769ec138b8fab45477bd92";
-      sha256 = "0if7z8yf75d5wamvlk76hxqvax7lrjmiiwdj4bf00j2pla5jydi8";
+      rev = "37f5e795767ff14d2c8bf9cfb4998b9a0317feed";
+      sha256 = "0klfadkqhv8a76qk074h9yll68wbabgsxbbhd4ba58sbv19qz35n";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";
@@ -6316,12 +6316,12 @@ final: prev:
 
   stabilize-nvim = buildVimPluginFrom2Nix {
     pname = "stabilize.nvim";
-    version = "2022-03-11";
+    version = "2022-05-09";
     src = fetchFromGitHub {
       owner = "luukvbaal";
       repo = "stabilize.nvim";
-      rev = "786c818d7258b783afc192ac287b4365c5596dcf";
-      sha256 = "07fd72p0qch0gfg92vcw3mlh7f8f1dii681qzpngnlk73ghq4ffw";
+      rev = "174dfcd0197ebc7397c854ae8607f9c9e691eef5";
+      sha256 = "1vi1gjkflrkm5fr432r23rbq474h26j9jyagdrkw6mkq3wgh4fcr";
     };
     meta.homepage = "https://github.com/luukvbaal/stabilize.nvim/";
   };
@@ -6352,12 +6352,12 @@ final: prev:
 
   stylish-nvim = buildVimPluginFrom2Nix {
     pname = "stylish.nvim";
-    version = "2022-02-11";
+    version = "2022-02-01";
     src = fetchFromGitHub {
       owner = "teto";
       repo = "stylish.nvim";
-      rev = "ea745ebf446410ef3d75f9890b2e7fd59be42e19";
-      sha256 = "1kl2g32ls4s7kpr6395rdmsa7gdzkpfiypphmnxg8n75n0b0mwb3";
+      rev = "279c18b7c35d1f6c650790b88e873e8a8a714f5e";
+      sha256 = "09byh62f4ymkfpspk4sn5y0p9nsn3dphny94qcggfay1vddc3v93";
     };
     meta.homepage = "https://github.com/teto/stylish.nvim/";
   };
@@ -6654,12 +6654,12 @@ final: prev:
 
   telescope-file-browser-nvim = buildVimPluginFrom2Nix {
     pname = "telescope-file-browser.nvim";
-    version = "2022-04-20";
+    version = "2022-05-13";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope-file-browser.nvim";
-      rev = "ee355b83e00475e11dec82e3ea166f846a392018";
-      sha256 = "1s39si5fifv6bvjk8kzs2zy18ap5q22pfqg68wn5icnp588498hz";
+      rev = "28e75f6cdb63b4903035c8db2845aaddb89f1610";
+      sha256 = "1imyjajrx4irxn3m2plpz9g0crkfyiq5amivhn2mqvawk1l05zy5";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/";
   };
@@ -6823,12 +6823,12 @@ final: prev:
 
   telescope-nvim = buildVimPluginFrom2Nix {
     pname = "telescope.nvim";
-    version = "2022-05-02";
+    version = "2022-05-12";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope.nvim";
-      rev = "23e28d066a55a8e33bff33196f7bd65ea3ecbdbe";
-      sha256 = "1yhc81k57ar58i0pwcwr28jsbkpcn8qqqjv95qcfi4hh14z75wfn";
+      rev = "39b12d84e86f5054e2ed98829b367598ae53ab41";
+      sha256 = "12krg8l13j4rqxqn9jx5nkpfpa3ffh2avv9z687ag7k1axvcak9h";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
   };
@@ -7004,12 +7004,12 @@ final: prev:
 
   toggleterm-nvim = buildVimPluginFrom2Nix {
     pname = "toggleterm.nvim";
-    version = "2022-04-25";
+    version = "2022-05-11";
     src = fetchFromGitHub {
       owner = "akinsho";
       repo = "toggleterm.nvim";
-      rev = "6c7f5dbdd69bc5611a85194ddca83ac2c8ee84d6";
-      sha256 = "1c9hhwb77h6f4g1agkqmp0zccpbbyany2sgack1k9373y4q4c131";
+      rev = "ea21c3ef51868a564eeace357f4a3d429f93efb1";
+      sha256 = "1y8nb5cdlghf37sl872gx1rd28r437vxz94w90ydijin8hswcdqi";
     };
     meta.homepage = "https://github.com/akinsho/toggleterm.nvim/";
   };
@@ -7064,12 +7064,12 @@ final: prev:
 
   trouble-nvim = buildVimPluginFrom2Nix {
     pname = "trouble.nvim";
-    version = "2022-03-18";
+    version = "2022-05-09";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "trouble.nvim";
-      rev = "691d490cc4eadc430d226fa7d77aaa84e2e0a125";
-      sha256 = "1d218xxz936q53aknazhnfxhy9ncjyq76dna6y5n87kxn9hzqix1";
+      rev = "da61737d860ddc12f78e638152834487eabf0ee5";
+      sha256 = "1aa45r9z8mghak8f5gymhm875rssi1afs92h0mpnn43y0j76xy31";
     };
     meta.homepage = "https://github.com/folke/trouble.nvim/";
   };
@@ -7148,12 +7148,12 @@ final: prev:
 
   unicode-vim = buildVimPluginFrom2Nix {
     pname = "unicode.vim";
-    version = "2022-04-18";
+    version = "2022-05-05";
     src = fetchFromGitHub {
       owner = "chrisbra";
       repo = "unicode.vim";
-      rev = "cc36bfa066d4a773e3152cc3c70051bc23ef2893";
-      sha256 = "1npirr14khfmpvnvbmys98lxhy0yg5ah3270s85b9lp2xhxnkpps";
+      rev = "176963d8e43dd54ff1582cb2374e731b51a7f5d5";
+      sha256 = "030izymxcvs5hw8pqsmlqwxgzdbysh96q7qxk7mb2v15dh8qnv9d";
     };
     meta.homepage = "https://github.com/chrisbra/unicode.vim/";
   };
@@ -7172,12 +7172,12 @@ final: prev:
 
   urlview-nvim = buildVimPluginFrom2Nix {
     pname = "urlview.nvim";
-    version = "2022-04-25";
+    version = "2022-05-07";
     src = fetchFromGitHub {
       owner = "axieax";
       repo = "urlview.nvim";
-      rev = "3b637651d5f0de185a0ceac783582692e204b053";
-      sha256 = "1hpm1mhj9n6fnrkr5vpl1x80xgx7f2ic5vy9ndybbsppk2l8jrp4";
+      rev = "92a6ae6f33839222ce4ea58f5cdaf0a3f235caca";
+      sha256 = "0y3l0py0cnvj876xi5kgc7mmbycj7s61mj29ipsmn9bnjvk008yb";
     };
     meta.homepage = "https://github.com/axieax/urlview.nvim/";
   };
@@ -7244,12 +7244,12 @@ final: prev:
 
   vifm-vim = buildVimPluginFrom2Nix {
     pname = "vifm.vim";
-    version = "2022-03-28";
+    version = "2022-05-03";
     src = fetchFromGitHub {
       owner = "vifm";
       repo = "vifm.vim";
-      rev = "069349e5dbba9fbb24b88ebedb89f728387fae79";
-      sha256 = "1rrzhg8qpvgvcm9fkr05hmkw95gn37pys0h0d6rii6qhbx9z95vs";
+      rev = "d6ae9ca80284bd7df38b102ba280f0d132129c0f";
+      sha256 = "087ila6rskhd7vi1yqlqmq781gqajh69y4dk7n9f4sza75hb210x";
     };
     meta.homepage = "https://github.com/vifm/vifm.vim/";
   };
@@ -7580,12 +7580,12 @@ final: prev:
 
   vim-airline = buildVimPluginFrom2Nix {
     pname = "vim-airline";
-    version = "2022-04-12";
+    version = "2022-05-06";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
-      rev = "be5bda1f1dbfa4e36b2adabaf3f423adfa66c336";
-      sha256 = "1k0yv95i2kigggmh3dcg9rq6pkh7qcycsv9nm6jshgsfic8ly8n5";
+      rev = "c4655701431a9c79704c827fd88a4783ec946879";
+      sha256 = "1qsr3kkfx5vbhmnym0id2h9mph8bw6g75vwpqfi9vfmbg4fddh3l";
     };
     meta.homepage = "https://github.com/vim-airline/vim-airline/";
   };
@@ -7724,12 +7724,12 @@ final: prev:
 
   vim-autoformat = buildVimPluginFrom2Nix {
     pname = "vim-autoformat";
-    version = "2022-04-21";
+    version = "2022-05-12";
     src = fetchFromGitHub {
       owner = "vim-autoformat";
       repo = "vim-autoformat";
-      rev = "544596a21c54ee0888a1f30f3bb31d472432d7d9";
-      sha256 = "19ridsf6vgiknagplfdmbsg23wnl48j7n48z8qa3372x1v30c92p";
+      rev = "c833f1dd0398901f5ad3f5f0ec2e07975e246294";
+      sha256 = "1vafpp3m75dd8c453zq6w8qnapw7h5kpbzdx2s5fpjdn9qrg2g87";
     };
     meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/";
   };
@@ -7952,12 +7952,12 @@ final: prev:
 
   vim-clap = buildVimPluginFrom2Nix {
     pname = "vim-clap";
-    version = "2022-04-27";
+    version = "2022-05-10";
     src = fetchFromGitHub {
       owner = "liuchengxu";
       repo = "vim-clap";
-      rev = "7d1fb3baf5b92b707146262713f6fe30d49a2f15";
-      sha256 = "0m7cgiysr95c1lssfsi84z1hhqv8bz32wsazk7jmxxn9j83696s5";
+      rev = "5d0662d8d7e640a1ffb64b1b4dbbc41995391218";
+      sha256 = "0bz6nrjsz1m2ibhbg4zc2z9slqfwnx5q6mc6favf9nw7j821s95g";
     };
     meta.homepage = "https://github.com/liuchengxu/vim-clap/";
   };
@@ -8540,12 +8540,12 @@ final: prev:
 
   vim-eunuch = buildVimPluginFrom2Nix {
     pname = "vim-eunuch";
-    version = "2022-05-01";
+    version = "2022-05-06";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-eunuch";
-      rev = "73b5e3fccfb5295e38546318c0d3139874c25efb";
-      sha256 = "1xqx80a1g9r3lxfxb1ahrbfzmm4r6azm8iyc3430nwqx4jg72pp2";
+      rev = "39e0232f490322c5a2d9e24275872f28da496a93";
+      sha256 = "1wp5x5vximysab4c97d7x7y0hnnmycfm9h8mxxzz291ra5yrbbr2";
     };
     meta.homepage = "https://github.com/tpope/vim-eunuch/";
   };
@@ -8660,12 +8660,12 @@ final: prev:
 
   vim-floaterm = buildVimPluginFrom2Nix {
     pname = "vim-floaterm";
-    version = "2022-02-15";
+    version = "2022-05-05";
     src = fetchFromGitHub {
       owner = "voldikss";
       repo = "vim-floaterm";
-      rev = "6244d1739aad6682c6c1d5db18c846c342af6e3e";
-      sha256 = "1w0d93wm0xwg8wyvyzdibjmnd1py343mvvzj911byvnm1b52zp7h";
+      rev = "ab7876f86c05c1935eb23a193f4f276132902ac1";
+      sha256 = "10i6akvr1ib2lwh6xwjchmpjzdabj2qs05h8h1ww9mdycj4q1pli";
     };
     meta.homepage = "https://github.com/voldikss/vim-floaterm/";
   };
@@ -8732,12 +8732,12 @@ final: prev:
 
   vim-fugitive = buildVimPluginFrom2Nix {
     pname = "vim-fugitive";
-    version = "2022-04-26";
+    version = "2022-05-13";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "b7287bd5421da62986d9abf9131509b2c9f918e4";
-      sha256 = "1pk1qlr7lcifffsxm8fqy34p9nizv0n5mc0rl7xb7pr5c98a4vzz";
+      rev = "a8139d37b242c5bc5ceeddc4fcd7dddf2b2c2650";
+      sha256 = "1n22hjg374rs1412v4yvn3jc5nzd2jfsk3vzhaf8i3zv4b6w2vf1";
     };
     meta.homepage = "https://github.com/tpope/vim-fugitive/";
   };
@@ -8828,12 +8828,12 @@ final: prev:
 
   vim-gitgutter = buildVimPluginFrom2Nix {
     pname = "vim-gitgutter";
-    version = "2022-04-25";
+    version = "2022-05-04";
     src = fetchFromGitHub {
       owner = "airblade";
       repo = "vim-gitgutter";
-      rev = "988a6dbad9a9777cd94aab18ba7821a41068685b";
-      sha256 = "178jzjwqjd15b3gjdyiay5fw9sv6s7jbzj1sgqfwlg2gm3m7g2fi";
+      rev = "719d4ec06a0fb0aa9f1dfaebcf4f9691e8dc3f73";
+      sha256 = "1mdpds4xpjcwfsm6r9w65hxwjsxm7pcr3dnkfh6v8xx0kyflmijp";
     };
     meta.homepage = "https://github.com/airblade/vim-gitgutter/";
   };
@@ -8852,12 +8852,12 @@ final: prev:
 
   vim-glsl = buildVimPluginFrom2Nix {
     pname = "vim-glsl";
-    version = "2022-02-06";
+    version = "2022-05-10";
     src = fetchFromGitHub {
       owner = "tikhomirov";
       repo = "vim-glsl";
-      rev = "28a6dfbcd96095226bee90985b7f12c5679dbbb6";
-      sha256 = "051f0q5bkgp77pz0izh5mvqsmxy0rzlvriwq4j7qzslqk7i850p2";
+      rev = "bfd330a271933c3372fcfa8ce052970746c8e9dd";
+      sha256 = "0nqpg95mh5z0wmiqvc8cfzq1gb99ximc1gbz9bv3x7239f66z5vn";
     };
     meta.homepage = "https://github.com/tikhomirov/vim-glsl/";
   };
@@ -8948,24 +8948,24 @@ final: prev:
 
   vim-gutentags = buildVimPluginFrom2Nix {
     pname = "vim-gutentags";
-    version = "2020-05-22";
+    version = "2022-05-12";
     src = fetchFromGitHub {
       owner = "ludovicchabant";
       repo = "vim-gutentags";
-      rev = "50705e8ebb7038b31314f416d1bddd9cb9154049";
-      sha256 = "0vm3bp94kbc28azsmm8505hyd9v1a9isrn5dp47njmj8w17l7725";
+      rev = "b77b8fabcb0b052c32fe17efcc0d44f020975244";
+      sha256 = "0wiqy5m7wvrmr3d2vy5j5lz6wh3z2c2v7amy9ji7prq1gxv3n095";
     };
     meta.homepage = "https://github.com/ludovicchabant/vim-gutentags/";
   };
 
   vim-hardtime = buildVimPluginFrom2Nix {
     pname = "vim-hardtime";
-    version = "2022-03-13";
+    version = "2022-05-06";
     src = fetchFromGitHub {
       owner = "takac";
       repo = "vim-hardtime";
-      rev = "5603072377d1f1f26a1561eda9e1884bb5f028ef";
-      sha256 = "13279v9vd083xg6820gh15qxsyhbr7gjf7lzgy8w52xya852xsks";
+      rev = "91177392e9372a1cf09a4b9b79532d2490bd405f";
+      sha256 = "1f8vvm37yk125c0h28jbry9hshd3amrbfxcrg7j9qj9kdkad1zjq";
     };
     meta.homepage = "https://github.com/takac/vim-hardtime/";
   };
@@ -9069,12 +9069,12 @@ final: prev:
 
   vim-highlightedyank = buildVimPluginFrom2Nix {
     pname = "vim-highlightedyank";
-    version = "2022-01-25";
+    version = "2022-05-12";
     src = fetchFromGitHub {
       owner = "machakann";
       repo = "vim-highlightedyank";
-      rev = "ff16bf3bac23fb4e17c976f4e1ff7941cd686c8d";
-      sha256 = "0slnykqkbqnncz0vjwhf9p9x8wi5p8xfv485wbip1njd6vqhd965";
+      rev = "f9db473137ca96c6a989ec3e2b7edf8a3189c448";
+      sha256 = "0lj2w9nzqrmw33gcf8k1hf50mpwymhdyyv09mp9phanywg06l1ay";
     };
     meta.homepage = "https://github.com/machakann/vim-highlightedyank/";
   };
@@ -9380,6 +9380,18 @@ final: prev:
     meta.homepage = "https://github.com/google/vim-jsonnet/";
   };
 
+  vim-jsonpath = buildVimPluginFrom2Nix {
+    pname = "vim-jsonpath";
+    version = "2020-06-16";
+    src = fetchFromGitHub {
+      owner = "mogelbrod";
+      repo = "vim-jsonpath";
+      rev = "af9c07b87765fc5aee176a894bc91fb04a5e3c47";
+      sha256 = "0l59c6xl4rly7xbfgsqam1rwcyvqhr7lzi3g2jpwirarm823rla9";
+    };
+    meta.homepage = "https://github.com/mogelbrod/vim-jsonpath/";
+  };
+
   vim-jsx-pretty = buildVimPluginFrom2Nix {
     pname = "vim-jsx-pretty";
     version = "2021-01-12";
@@ -9538,12 +9550,12 @@ final: prev:
 
   vim-localvimrc = buildVimPluginFrom2Nix {
     pname = "vim-localvimrc";
-    version = "2022-04-06";
+    version = "2022-05-11";
     src = fetchFromGitHub {
       owner = "embear";
       repo = "vim-localvimrc";
-      rev = "b0a81e42e6036f716bd9e6b025978dfb7dacaa53";
-      sha256 = "1327i1pamz3bwhj1zyr2bjn142bhp45y1xlv8gs7dm7zyixfksd3";
+      rev = "244a92ceae63b8c23a74022eaf205b431745fcb6";
+      sha256 = "1y56xh4k7zqagsnw86lkm747l1x4i5l95r0jks4j35d1fcmpq81i";
     };
     meta.homepage = "https://github.com/embear/vim-localvimrc/";
   };
@@ -9658,24 +9670,24 @@ final: prev:
 
   vim-markdown = buildVimPluginFrom2Nix {
     pname = "vim-markdown";
-    version = "2022-04-26";
+    version = "2022-05-07";
     src = fetchFromGitHub {
       owner = "preservim";
       repo = "vim-markdown";
-      rev = "9068655bb74bb615b3876b4d4d6a1d1141e212f3";
-      sha256 = "0s4ph2c8a1ha0cd95b2lf2i5irf4bwx34929i2c5p3ihk2701fsf";
+      rev = "3a9643961233c2812816078af8bd1eaabc530dce";
+      sha256 = "1yw8d1c5mjkjs93nby9xfx4jwxnb8zq36p1p7ciq808xzks42994";
     };
     meta.homepage = "https://github.com/preservim/vim-markdown/";
   };
 
   vim-markdown-composer = buildVimPluginFrom2Nix {
     pname = "vim-markdown-composer";
-    version = "2022-01-04";
+    version = "2022-05-04";
     src = fetchFromGitHub {
       owner = "euclio";
       repo = "vim-markdown-composer";
-      rev = "010ae3667fb0cb4c63c99439d1a8f81ebdcc849e";
-      sha256 = "1hz0xjq0srv3llb4i6n2sw0pi2s0k3qcwyk6az5icrvkfhbnc0kf";
+      rev = "5b79f425ebd28216d9aa472be3ba07cda41d9b24";
+      sha256 = "0i4m2x2cw604aczp1ijnrv0wvh1b9bxg9zh0zmf8kk7b00zc1k5c";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/euclio/vim-markdown-composer/";
@@ -9695,12 +9707,12 @@ final: prev:
 
   vim-matchup = buildVimPluginFrom2Nix {
     pname = "vim-matchup";
-    version = "2022-04-20";
+    version = "2022-05-06";
     src = fetchFromGitHub {
       owner = "andymass";
       repo = "vim-matchup";
-      rev = "1cb069f2a526682b3ce69610cf7c05511295ad37";
-      sha256 = "09xwkzipsqiyglmyxkz0n6jycwp918mfxazqycy54zwng1c207q1";
+      rev = "485e71120fea7be22f0ba051a05a00675276ced0";
+      sha256 = "0zzn5gspi5811w1drbk362a75q4d697l0ngxgps00bcgvj9l8r6d";
     };
     meta.homepage = "https://github.com/andymass/vim-matchup/";
   };
@@ -10247,12 +10259,12 @@ final: prev:
 
   vim-plug = buildVimPluginFrom2Nix {
     pname = "vim-plug";
-    version = "2022-04-21";
+    version = "2022-05-03";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "vim-plug";
-      rev = "be55ec46b5ab031805487a9c3e895db57f53010b";
-      sha256 = "03flkm75xp7g4kzwdmvz2dc2r1aqbkyknxbclvp38xk3qwwd5kvh";
+      rev = "8fdabfba0b5a1b0616977a32d9e04b4b98a6016a";
+      sha256 = "046j2cq4s14ys7n5b1lil5sgdis66mydd8bpsidcyq004k3zy2lc";
     };
     meta.homepage = "https://github.com/junegunn/vim-plug/";
   };
@@ -10343,12 +10355,12 @@ final: prev:
 
   vim-projectionist = buildVimPluginFrom2Nix {
     pname = "vim-projectionist";
-    version = "2022-04-27";
+    version = "2022-05-06";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-projectionist";
-      rev = "df1e28dba36e69288173fdcdce122d98538ae782";
-      sha256 = "1xqf3vrw5vy2pg87b840i87pxvi252rlw4q6fyldlzffxygk6zhq";
+      rev = "d4aee3035699b82b3789cee0e88dad0e38c423ab";
+      sha256 = "0gmpqp9wplq8pqrqfpardrj7g5mr16w4q9485wzy9nk86nsqavj9";
     };
     meta.homepage = "https://github.com/tpope/vim-projectionist/";
   };
@@ -10463,12 +10475,12 @@ final: prev:
 
   vim-quickrun = buildVimPluginFrom2Nix {
     pname = "vim-quickrun";
-    version = "2022-04-16";
+    version = "2022-05-08";
     src = fetchFromGitHub {
       owner = "thinca";
       repo = "vim-quickrun";
-      rev = "53917966d392d5517d38e63b2520bd2641763778";
-      sha256 = "03cswzwfpjf0v3nnjr0141p03fswsv13kphhac4i3ajal30nh80h";
+      rev = "276f39ab6507659ea8664c51b616a89ca9445875";
+      sha256 = "1gxp1rqc0vxlpmqqwxbdz0mh2pkh3hdcvsxrh1f73ya3vzlgyqfy";
     };
     meta.homepage = "https://github.com/thinca/vim-quickrun/";
   };
@@ -10511,12 +10523,12 @@ final: prev:
 
   vim-rails = buildVimPluginFrom2Nix {
     pname = "vim-rails";
-    version = "2022-04-27";
+    version = "2022-05-06";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-rails";
-      rev = "2f8adae670e3fe262b793885ae5d808d40c6f2ed";
-      sha256 = "1mjjhnrpdcz85r1l3jriqa55ffdkr35c0vf85g3kzg9kqf8g9y0l";
+      rev = "9c92dafe6894aed3fa81df7ac52cdd8e7a8ea9a6";
+      sha256 = "050vkbj1y80f1kcmb0hfd2mha1bb4v3f2bvnazcymxn08z8frww7";
     };
     meta.homepage = "https://github.com/tpope/vim-rails/";
   };
@@ -10547,12 +10559,12 @@ final: prev:
 
   vim-rhubarb = buildVimPluginFrom2Nix {
     pname = "vim-rhubarb";
-    version = "2021-09-13";
+    version = "2022-05-11";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-rhubarb";
-      rev = "977b3ccbad1f7e5370354ae409fb2ea4a7ce2058";
-      sha256 = "1vvjj3ql2dm3dniscxjmr5h9kfx005bgdxc1ppz6yi2q9spmchqg";
+      rev = "ab0d42bb31b3317aa66dd1c0b506837cc6ca2835";
+      sha256 = "0qv2ppmxpy72gb8ivz5cx19b4y8si4v428d9mmlx9q7mv9q4wmhq";
     };
     meta.homepage = "https://github.com/tpope/vim-rhubarb/";
   };
@@ -10787,12 +10799,12 @@ final: prev:
 
   vim-slime = buildVimPluginFrom2Nix {
     pname = "vim-slime";
-    version = "2022-01-13";
+    version = "2022-05-11";
     src = fetchFromGitHub {
       owner = "jpalardy";
       repo = "vim-slime";
-      rev = "0ea9b35882155996171fd15a5227e673ce2d2c60";
-      sha256 = "1palz3375v400fjlxwpc4drm36rnffz86mdkyqdqssvm41fv0wkx";
+      rev = "6e4b81303968f37346925d6907b96ef07788cc82";
+      sha256 = "1z0nmfmn7ijj3hih4dbi1iq3dc6gpprck3fmidhmkv6vms041nx4";
     };
     meta.homepage = "https://github.com/jpalardy/vim-slime/";
   };
@@ -10823,12 +10835,12 @@ final: prev:
 
   vim-smoothie = buildVimPluginFrom2Nix {
     pname = "vim-smoothie";
-    version = "2021-02-07";
+    version = "2022-05-04";
     src = fetchFromGitHub {
       owner = "psliwka";
       repo = "vim-smoothie";
-      rev = "10fd0aa57d176718bc2c570f121ab523c4429a25";
-      sha256 = "18zn29mkgdiddn3il393xzg7hpa0x25yvais1l29jq2711sg4rdc";
+      rev = "b440f139a55cb5161cde3478729f6603d9d20d81";
+      sha256 = "1hvv440zb3bwx1v8nyy3bk9vnhlbjy2a1hdfcmc37rghbni1kp0k";
     };
     meta.homepage = "https://github.com/psliwka/vim-smoothie/";
   };
@@ -10871,12 +10883,12 @@ final: prev:
 
   vim-snippets = buildVimPluginFrom2Nix {
     pname = "vim-snippets";
-    version = "2022-04-30";
+    version = "2022-05-12";
     src = fetchFromGitHub {
       owner = "honza";
       repo = "vim-snippets";
-      rev = "45c8e00d0bae9056713097ea655d76d463b66f10";
-      sha256 = "0zng2k82kwm0av1dyar6y44cq79v5khy07swwp6kmkz5vjj9y4dd";
+      rev = "6f270bb2d26c38765ff2243e9337c65f8a96a28b";
+      sha256 = "0jzafsk1ri2jfn26k962x2g6ygqrkrf3kwvd1ikx0hql0nhcvrrq";
     };
     meta.homepage = "https://github.com/honza/vim-snippets/";
   };
@@ -11292,12 +11304,12 @@ final: prev:
 
   vim-tpipeline = buildVimPluginFrom2Nix {
     pname = "vim-tpipeline";
-    version = "2022-04-19";
+    version = "2022-05-11";
     src = fetchFromGitHub {
       owner = "vimpostor";
       repo = "vim-tpipeline";
-      rev = "7a5d832ca3086aeddc607304a2dde481b66f1719";
-      sha256 = "0dnlq3iv7dq798m1llpn72b4kwvxrw7q7bgkswhaqhgcsb1xjxwz";
+      rev = "2c4417db1d549f96a6a944bf4d85d8c797ab4a31";
+      sha256 = "1rzhzl4w9k11maa1iy0a8sss3319jvp1viqqh0l7kgg13595acnk";
     };
     meta.homepage = "https://github.com/vimpostor/vim-tpipeline/";
   };
@@ -11352,12 +11364,12 @@ final: prev:
 
   vim-ultest = buildVimPluginFrom2Nix {
     pname = "vim-ultest";
-    version = "2022-04-09";
+    version = "2022-05-05";
     src = fetchFromGitHub {
       owner = "rcarriga";
       repo = "vim-ultest";
-      rev = "a99eb0bdf7d901d538b5dd724e2ab3a958c1799c";
-      sha256 = "0mlb2qvxw7ds0b6jrxw5224mz1bzlzb4vly2wnygzrl6mhsk2xyw";
+      rev = "6978fd32e3ca2c1c5591884eea0d57a7ee43d212";
+      sha256 = "19dphm7xgfc0xvxrlys21zkp7ixbx62p11x6ms6xmwm8cjjh64pc";
     };
     meta.homepage = "https://github.com/rcarriga/vim-ultest/";
   };
@@ -11424,12 +11436,12 @@ final: prev:
 
   vim-visual-multi = buildVimPluginFrom2Nix {
     pname = "vim-visual-multi";
-    version = "2022-04-08";
+    version = "2022-05-06";
     src = fetchFromGitHub {
       owner = "mg979";
       repo = "vim-visual-multi";
-      rev = "d5b820655e17c6ccd363885e5614652e4cffae95";
-      sha256 = "0mp8g825l0zcj0gh3v5wa29dq5hhx0f96ijsd5bxhh694vppx8q5";
+      rev = "046d0d5ac5fb2888447d1dd8b7e52fd0314f9766";
+      sha256 = "17masfjxrhjcfqmlgf1jpmmz18j8vb4n88dl34rry6c3abiraprj";
     };
     meta.homepage = "https://github.com/mg979/vim-visual-multi/";
   };
@@ -11797,12 +11809,12 @@ final: prev:
 
   vimtex = buildVimPluginFrom2Nix {
     pname = "vimtex";
-    version = "2022-05-02";
+    version = "2022-05-12";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "9ffbe63a2055b59b09b18b1cd682e0b2703cc898";
-      sha256 = "151ilpd7360rhpi3nyi5dfky814zx9zc4fa82wj6bnkcwy1b4k0c";
+      rev = "dfaca59bbbf0079ab1b4f159337ae7f17d1b5289";
+      sha256 = "1sbsirrl822dp9z1vynkhzbd2yhid9vcr9yzp540qrp6flcvf10q";
     };
     meta.homepage = "https://github.com/lervag/vimtex/";
   };
@@ -11893,12 +11905,12 @@ final: prev:
 
   which-key-nvim = buildVimPluginFrom2Nix {
     pname = "which-key.nvim";
-    version = "2022-03-18";
+    version = "2022-05-04";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "which-key.nvim";
-      rev = "a3c19ec5754debb7bf38a8404e36a9287b282430";
-      sha256 = "00kkl785ifx5sg49q65d4yzdgf08gyriqrils5n4zhz4pksd5z1a";
+      rev = "bd4411a2ed4dd8bb69c125e339d837028a6eea71";
+      sha256 = "0vf685xgdb967wmvffk1pfrvbhg1jkvzp1kb7r0vs90mg8gpv1aj";
     };
     meta.homepage = "https://github.com/folke/which-key.nvim/";
   };
@@ -11917,12 +11929,12 @@ final: prev:
 
   wildfire-vim = buildVimPluginFrom2Nix {
     pname = "wildfire.vim";
-    version = "2021-05-10";
+    version = "2022-05-05";
     src = fetchFromGitHub {
       owner = "gcmt";
       repo = "wildfire.vim";
-      rev = "fa91b732fd1c5acd23b7b32d5fbbc884eedafc8d";
-      sha256 = "15gikqmpaf5c6687kgc5ib57pw7gyvxaihdv5549s7p2xkkbcl24";
+      rev = "b371e2b1d938ae0e164146136051de164ecb9aa5";
+      sha256 = "0lpv10330818aza0fv8adzswnq8jq47z043p6gqfn7b7h2visy5p";
     };
     meta.homepage = "https://github.com/gcmt/wildfire.vim/";
   };
@@ -12098,12 +12110,12 @@ final: prev:
 
   zoxide-vim = buildVimPluginFrom2Nix {
     pname = "zoxide.vim";
-    version = "2021-12-10";
+    version = "2022-05-07";
     src = fetchFromGitHub {
       owner = "nanotee";
       repo = "zoxide.vim";
-      rev = "c4e96f34b1b3160d6b6a6519588024412df27cd7";
-      sha256 = "0zisr1r1z9ys0jkab1lvwy4klwkay07p0095f03r9qydnig8jgsm";
+      rev = "5062d4c17ff873eeed88cabe317d7ee1a43c5731";
+      sha256 = "1chq7fnygvb1wm7v0rg8cf0czn1q1i59kggg0jdvrnwf0f6m7nb4";
     };
     meta.homepage = "https://github.com/nanotee/zoxide.vim/";
   };
@@ -12122,12 +12134,12 @@ final: prev:
 
   chad = buildVimPluginFrom2Nix {
     pname = "chad";
-    version = "2022-05-02";
+    version = "2022-05-13";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "chadtree";
-      rev = "820c1913a77a12d080e3436e60a491327664589b";
-      sha256 = "0lc5ldg65h4jqb6qkz22avzv4x2jmciabcsy47a9wkzy2l9hlvza";
+      rev = "b6ac01c187359e305a2df8caea540f4527b91ab2";
+      sha256 = "14rp8h59bnwpi86nnkmhxsgyszhhd26fzra7wjni2agdhf2410zp";
     };
     meta.homepage = "https://github.com/ms-jpq/chadtree/";
   };
@@ -12194,12 +12206,12 @@ final: prev:
 
   rose-pine = buildVimPluginFrom2Nix {
     pname = "rose-pine";
-    version = "2022-04-25";
+    version = "2022-05-06";
     src = fetchFromGitHub {
       owner = "rose-pine";
       repo = "neovim";
-      rev = "da67a549cf5d67e15618cc3001f1e07724a1597f";
-      sha256 = "1dfccfjy67b7269zypkdi7x6fcsdgw2qmd44kyk66qr6f9q4yng2";
+      rev = "aa69b6a3d77068542c613d96419c3241a9fcbf46";
+      sha256 = "0x9pn109my5rw627qmf5xawy3n40l9n3l6hp6np77y2rqlpn8m3y";
     };
     meta.homepage = "https://github.com/rose-pine/neovim/";
   };
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 04e28b5fc20f..494d42a4c46f 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -845,7 +845,7 @@ self: super: {
             libiconv
           ];
 
-          cargoSha256 = "035v8mm8v7aj8qwhvxsp6k0afn05gi2xb1achzsvm0m4a8a9xs65";
+          cargoSha256 = "0l1x7kprnxa95pbf8ml9ixmj0cmbnnv6nd0v6qry8j67rx8plpmp";
         };
       in
       ''
@@ -974,7 +974,7 @@ self: super: {
       vim-markdown-composer-bin = rustPlatform.buildRustPackage rec {
         pname = "vim-markdown-composer-bin";
         inherit (super.vim-markdown-composer) src version;
-        cargoSha256 = "03d7kap6vha1jmyfrjqaja5439x6mhnvjjbz3rmxb3x4dpppbpj1";
+        cargoSha256 = "0q0i6kyihswrjrfdj4p3z54b779sdg2wz38z943ypj6dqphhcklx";
       };
     in
     super.vim-markdown-composer.overrideAttrs (oldAttrs: rec {
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 6369d0ca7c42..e3806c71a2f6 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -533,6 +533,7 @@ https://github.com/chr4/sslsecure.vim/,,
 https://github.com/luukvbaal/stabilize.nvim/,,
 https://github.com/eigenfoo/stan-vim/,,
 https://github.com/darfink/starsearch.vim/,,
+https://github.com/teto/stylish.nvim/,HEAD,
 https://github.com/lambdalisue/suda.vim/,,
 https://github.com/ervandew/supertab/,,
 https://github.com/ur4ltz/surround.nvim/,,
@@ -786,6 +787,7 @@ https://github.com/maksimr/vim-jsbeautify/,,
 https://github.com/heavenshell/vim-jsdoc/,,
 https://github.com/elzr/vim-json/,,
 https://github.com/google/vim-jsonnet/,,
+https://github.com/mogelbrod/vim-jsonpath/,HEAD,
 https://github.com/MaxMEllon/vim-jsx-pretty/,,
 https://github.com/peitalin/vim-jsx-typescript/,,
 https://github.com/knubie/vim-kitty-navigator/,,
diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix
index 176172236201..f55b6ef79143 100644
--- a/pkgs/applications/misc/bibletime/default.nix
+++ b/pkgs/applications/misc/bibletime/default.nix
@@ -1,29 +1,49 @@
-{ lib, mkDerivation, fetchurl, cmake, pkg-config, sword, boost, clucene_core
-, qtbase, qttools, qtsvg, perlPackages, docbook_xml_dtd_45
-, docbook_xsl_ns }:
+{ lib, mkDerivation
+, fetchFromGitHub
+, cmake
+, docbook_xml_dtd_45
+, pkg-config
+, wrapQtAppsHook
+, boost
+, clucene_core_2
+, docbook_xsl_ns
+, perlPackages
+, qtbase
+, qtsvg
+, qttools
+, sword
+}:
 
 mkDerivation rec {
   pname = "bibletime";
   version = "3.0.2";
 
-  src = fetchurl {
-    url = "https://github.com/bibletime/bibletime/releases/download/v${version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-/JNjnU/DGD4YRtrKzX7t6MgNCZYihdgTJc+Jbr9IYJ4=";
+  src = fetchFromGitHub {
+    owner = "bibletime";
+    repo = "bibletime";
+    rev = "v${version}";
+    hash = "sha256-8X5LkquALFnG0yRayZYjeymHDcOzINBv0MXeVBsOnfI=";
   };
 
-  nativeBuildInputs = [ cmake pkg-config docbook_xml_dtd_45 ];
+  nativeBuildInputs = [
+    cmake
+    docbook_xml_dtd_45
+    pkg-config
+    wrapQtAppsHook
+  ];
+
   buildInputs = [
-    sword
     boost
-    clucene_core
-    qtbase
-    qttools
-    qtsvg
+    clucene_core_2
     perlPackages.Po4a
+    qtbase
+    qtsvg
+    qttools
+    sword
   ];
 
   preConfigure = ''
-    export CLUCENE_HOME=${clucene_core};
+    export CLUCENE_HOME=${clucene_core_2};
     export SWORD_HOME=${sword};
   '';
 
@@ -35,7 +55,7 @@ mkDerivation rec {
   ];
 
   meta = with lib; {
-    description = "A Qt4 Bible study tool";
+    description = "A powerful cross platform Bible study tool";
     homepage = "http://www.bibletime.info/";
     platforms = platforms.linux;
     license = licenses.gpl2Plus;
diff --git a/pkgs/applications/video/epgstation/default.nix b/pkgs/applications/video/epgstation/default.nix
index b89193617274..1f5d23a684a8 100644
--- a/pkgs/applications/video/epgstation/default.nix
+++ b/pkgs/applications/video/epgstation/default.nix
@@ -23,18 +23,6 @@ let
     sha256 = "K1cAvmqWEfS6EY4MKAtjXb388XLYHtouxNM70PWgFig=";
   };
 
-  workaround-opencollective-buildfailures = stdenv.mkDerivation {
-    # FIXME: This should be removed when a complete fix is available
-    # https://github.com/svanderburg/node2nix/issues/145
-    name = "workaround-opencollective-buildfailures";
-    dontUnpack = true;
-    installPhase = ''
-      mkdir -p $out/bin
-      touch $out/bin/opencollective-postinstall
-      chmod +x $out/bin/opencollective-postinstall
-    '';
-  };
-
   client = nodePackages.epgstation-client.override (drv: {
     # FIXME: remove this option if possible
     #
@@ -49,21 +37,14 @@ let
   server = nodePackages.epgstation.override (drv: {
     inherit src;
 
-    bypassCache = false;
-
     # This is set to false to keep devDependencies at build time. Build time
     # dependencies are pruned afterwards.
     production = false;
 
-    buildInputs = [ bash ];
-    nativeBuildInputs = [
-      nodejs
-      workaround-opencollective-buildfailures
+    buildInputs = (drv.buildInputs or [ ]) ++ [ bash ];
+    nativeBuildInputs = (drv.nativeBuildInputs or [ ]) ++ [
       makeWrapper
-    ] ++ (with nodePackages; [
-      node-pre-gyp
-      node-gyp-build
-    ]);
+    ];
 
     preRebuild = ''
       # Fix for not being able to connect to mysql using domain sockets.
diff --git a/pkgs/development/compilers/dotnet/build-dotnet.nix b/pkgs/development/compilers/dotnet/build-dotnet.nix
index 4a30107bbeca..67ce79ca5751 100644
--- a/pkgs/development/compilers/dotnet/build-dotnet.nix
+++ b/pkgs/development/compilers/dotnet/build-dotnet.nix
@@ -1,6 +1,7 @@
 { type
 , version
 , srcs
+, icu #passing icu as an argument, because dotnet 3.1 has troubles with icu71
 }:
 
 assert builtins.elem type [ "aspnetcore" "runtime" "sdk"];
@@ -11,7 +12,6 @@ assert builtins.elem type [ "aspnetcore" "runtime" "sdk"];
 , writeText
 , libunwind
 , openssl
-, icu
 , libuuid
 , zlib
 , curl
@@ -38,7 +38,6 @@ in stdenv.mkDerivation rec {
   rpath = lib.makeLibraryPath ([
     stdenv.cc.cc
     zlib
-
     curl
     icu
     libunwind
diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
index 87256e95b02a..0740802ca4a4 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -5,7 +5,7 @@ dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_3_1 sdk_5_0 aspn
 Hashes and urls below are retrieved from:
 https://dotnet.microsoft.com/download/dotnet
 */
-{ callPackage }:
+{ callPackage, icu70, icu }:
 let
   buildDotnet = attrs: callPackage (import ./build-dotnet.nix attrs) {};
   buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; });
@@ -20,8 +20,11 @@ rec {
   sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 3.1 (LTS), 5.0 (Current) or 6.0 (LTS)";
   sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 3.1 (LTS), 5.0 (Current) or 6.0 (LTS)";
 
+  ##### Following attributes with urls and hashes should be auto-generated by print-hashes.sh #####
+
   # v3.1 (lts)
   aspnetcore_3_1 = buildAspNetCore {
+    icu = icu70;
     version = "3.1.21";
     srcs = {
       x86_64-linux = {
@@ -40,6 +43,7 @@ rec {
   };
 
   runtime_3_1 = buildNetRuntime {
+    icu = icu70;
     version = "3.1.21";
     srcs = {
       x86_64-linux = {
@@ -58,6 +62,7 @@ rec {
   };
 
   sdk_3_1 = buildNetSdk {
+    icu = icu70;
     version = "3.1.415";
     srcs = {
       x86_64-linux = {
@@ -77,6 +82,7 @@ rec {
 
   # v5.0 (current)
   aspnetcore_5_0 = buildAspNetCore {
+    inherit icu;
     version = "5.0.12";
     srcs = {
       x86_64-linux = {
@@ -95,6 +101,7 @@ rec {
   };
 
   runtime_5_0 = buildNetRuntime {
+    inherit icu;
     version = "5.0.12";
     srcs = {
       x86_64-linux = {
@@ -113,6 +120,7 @@ rec {
   };
 
   sdk_5_0 = buildNetSdk {
+    inherit icu;
     version = "5.0.403";
     srcs = {
       x86_64-linux = {
@@ -132,6 +140,7 @@ rec {
 
   # v6.0 (lts)
   aspnetcore_6_0 = buildAspNetCore {
+    inherit icu;
     version = "6.0.4";
     srcs = {
       x86_64-linux = {
@@ -154,6 +163,7 @@ rec {
   };
 
   runtime_6_0 = buildNetRuntime {
+    inherit icu;
     version = "6.0.4";
     srcs = {
       x86_64-linux = {
@@ -176,6 +186,7 @@ rec {
   };
 
   sdk_6_0 = buildNetSdk {
+    inherit icu;
     version = "6.0.202";
     srcs = {
       x86_64-linux = {
diff --git a/pkgs/development/compilers/dotnet/print-hashes.sh b/pkgs/development/compilers/dotnet/print-hashes.sh
index 966f0a9c0614..162f1af70ecf 100755
--- a/pkgs/development/compilers/dotnet/print-hashes.sh
+++ b/pkgs/development/compilers/dotnet/print-hashes.sh
@@ -84,6 +84,11 @@ Examples:
     aspnetcore_files="$(release_files "$release_content" "aspnetcore-runtime")"
     runtime_files="$(release_files "$release_content" "runtime")"
     sdk_files="$(release_files "$release_content" "sdk")"
+    if [ $major_minor = "3.1" ]; then
+      icu_attr="icu = icu70;"
+    else
+      icu_attr="inherit icu;"
+    fi
 
     major_minor_underscore=${major_minor/./_}
     channel_version=$(jq -r '."channel-version"' <<< "$content")
@@ -91,16 +96,19 @@ Examples:
     echo "
   # v$channel_version ($support_phase)
   aspnetcore_$major_minor_underscore = buildAspNetCore {
+    $icu_attr
     version = \"${aspnetcore_version}\";
     $(platform_sources "$aspnetcore_files")
   };
 
   runtime_$major_minor_underscore = buildNetRuntime {
+    $icu_attr
     version = \"${runtime_version}\";
     $(platform_sources "$runtime_files")
   };
 
   sdk_$major_minor_underscore = buildNetSdk {
+    $icu_attr
     version = \"${sdk_version}\";
     $(platform_sources "$sdk_files")
   }; "
diff --git a/pkgs/development/embedded/blackmagic/default.nix b/pkgs/development/embedded/blackmagic/default.nix
index f3b3b0b2d04b..abb5e19f8bf2 100644
--- a/pkgs/development/embedded/blackmagic/default.nix
+++ b/pkgs/development/embedded/blackmagic/default.nix
@@ -1,40 +1,37 @@
-{ stdenv, lib, fetchFromGitHub, fetchpatch
-, gcc-arm-embedded, libftdi1, libusb-compat-0_1, pkg-config
+{ stdenv, lib
+, fetchFromGitHub
+, gcc-arm-embedded
+, pkg-config
 , python3
+, hidapi
+, libftdi1
+, libusb1
 }:
 
-with lib;
-
 stdenv.mkDerivation rec {
   pname = "blackmagic";
-  version = "unstable-2020-08-05";
+  version = "unstable-2022-04-16";
   # `git describe --always`
-  firmwareVersion = "v1.6.1-539-gdd74ec8";
+  firmwareVersion = "v1.7.1-415-gc4869a5";
 
   src = fetchFromGitHub {
     owner = "blacksphere";
     repo = "blackmagic";
-    rev = "dd74ec8e6f734302daa1ee361af88dfb5043f166";
-    sha256 = "18w8y64fs7wfdypa4vm3migk5w095z8nbd8qp795f322mf2bz281";
+    rev = "c4869a54733ae92099a7316954e34d1ab7b6097c";
+    hash = "sha256-0MC1v/5u/txSshxkOI5TErMRRrYCcHly3qbVTAk9Vc0=";
     fetchSubmodules = true;
   };
 
-  patches = [
-    # Fix deprecation warning with libftdi 1.5
-    (fetchpatch {
-      url = "https://github.com/blacksphere/blackmagic/commit/dea4be2539c5ea63836ec78dca08b52fa8b26ab5.patch";
-      sha256 = "0f81simij1wdhifsxaavalc6yxzagfbgwry969dbjmxqzvrsrds5";
-    })
-  ];
-
   nativeBuildInputs = [
-    gcc-arm-embedded pkg-config
+    gcc-arm-embedded
+    pkg-config
     python3
   ];
 
   buildInputs = [
+    hidapi
     libftdi1
-    libusb-compat-0_1
+    libusb1
   ];
 
   strictDeps = true;
@@ -50,12 +47,17 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  buildPhase = "${stdenv.shell} ${./helper.sh}";
+  buildPhase = ''
+    runHook preBuild
+    ${stdenv.shell} ${./helper.sh}
+    runHook postBuild
+  '';
+
   dontInstall = true;
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with lib; {
     description = "In-application debugger for ARM Cortex microcontrollers";
     longDescription = ''
       The Black Magic Probe is a modern, in-application debugging tool
diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix
index 0891bfd2d8ff..bf5ab2dc98fc 100644
--- a/pkgs/development/interpreters/dart/default.nix
+++ b/pkgs/development/interpreters/dart/default.nix
@@ -2,7 +2,7 @@
 , lib
 , fetchurl
 , unzip
-, version ? "2.15.1"
+, version ? "2.17.0"
 , sources ? let
     base = "https://storage.googleapis.com/dart-archive/channels";
     x86_64 = "x64";
@@ -10,28 +10,28 @@
     aarch64 = "arm64";
     # Make sure that if the user overrides version parameter they're
     # also need to override sources, to avoid mistakes
-    version = "2.15.1";
+    version = "2.17.0";
   in
   {
     "${version}-aarch64-darwin" = fetchurl {
       url = "${base}/stable/release/${version}/sdk/dartsdk-macos-${aarch64}-release.zip";
-      sha256 = "sha256-DDE4DpA2m8wKkUZuQDn4NpXVvtaJ6sIHeKNjk3RbpYE=";
+      sha256 = "sha256-WXf0SdSEHMaJRfVFgKzb9SY4LBjf1xO5Oki/dzKMEMY=";
     };
     "${version}-x86_64-darwin" = fetchurl {
       url = "${base}/stable/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip";
-      sha256 = "sha256-s6bkwh2m5KdRr/WxWXwItO9YaDpp/HI3xjnS2UHmN+I=";
+      sha256 = "sha256-PwaxUQHIUhRWCOy3IVdGtRyP9LtscqoUJPOZfevN7xs=";
     };
     "${version}-x86_64-linux" = fetchurl {
       url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
-      sha256 = "sha256-D0XcqlO0CQtpsne4heqaTLOkFYnJEZET4bl4rVXOM18=";
+      sha256 = "sha256-V7j9lk5HyB1GeuuVsJmmcKt+j1ShzXTUW80f3HeRPYY=";
     };
     "${version}-i686-linux" = fetchurl {
       url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${i686}-release.zip";
-      sha256 = "sha256-SRq5TtxS+bwCqVxa0U2Zhn8J1Wtm4Onq+3uQS+951sw=";
+      sha256 = "sha256-YWxFwbcGvssOSL4S5O4jqLzxdUHvbVd9i4cLNyFn/cs=";
     };
     "${version}-aarch64-linux" = fetchurl {
       url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip";
-      sha256 = "sha256-iDbClCNDUsxT6K6koc4EQuu7dppTbOfzCVedpQIKI5U=";
+      sha256 = "sha256-BaHbD9hFhYd9YYCFg0bXxTx++JQzZn2zuF8/Ll+nA2s=";
     };
   }
 }:
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 2fcdab95509e..ab2b6af9d5f9 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -119,6 +119,11 @@ let
       sha256 = "sha256-1KnYHz9ntKbgfLeoDcsQrV6RdvzDB2LHCoFYCmS4sLY=";
     };
 
+    patches = [
+      # https://savannah.gnu.org/bugs/?func=detailitem&item_id=62436
+      ./patches/bug62436.patch
+    ];
+
     buildInputs = [
       readline
       ncurses
diff --git a/pkgs/development/interpreters/octave/patches/bug62436.patch b/pkgs/development/interpreters/octave/patches/bug62436.patch
new file mode 100644
index 000000000000..d9d7cfc30408
--- /dev/null
+++ b/pkgs/development/interpreters/octave/patches/bug62436.patch
@@ -0,0 +1,27 @@
+# HG changeset patch
+# User John Donoghue <john.donoghue@ieee.org>
+# Date 1652358904 14400
+#      Thu May 12 08:35:04 2022 -0400
+# Branch stable
+# Node ID 8c940cfcce257369677c09154da2aab2c56eaa79
+# Parent  63710f3bd9811c2d206ac9e7b4f47cf06c47e153
+* scripts/pkg/private/build.m: check configure and Makefile exist before trying to unlink them (Bug #62436)
+
+diff -r 63710f3bd981 -r 8c940cfcce25 scripts/pkg/private/build.m
+--- a/scripts/pkg/private/build.m	Wed May 11 09:44:55 2022 -0700
++++ b/scripts/pkg/private/build.m	Thu May 12 08:35:04 2022 -0400
+@@ -77,8 +77,12 @@
+     else
+       arch_abi = getarch ();
+       configure_make (desc, build_root, verbose);
+-      unlink (fullfile (build_root, "src", "configure"));
+-      unlink (fullfile (build_root, "src", "Makefile"));
++      if exist (fullfile (build_root, "src", "configure"), "file")
++        unlink (fullfile (build_root, "src", "configure"));
++      endif
++      if exist (fullfile (build_root, "src", "Makefile"), "file")
++        unlink (fullfile (build_root, "src", "Makefile"));
++      endif
+     endif
+     tar_name = [desc.name "-" desc.version "-" arch_abi ".tar"];
+     tar_path = fullfile (builddir, tar_name);
diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix
index e4884b85b4ae..23464990d869 100644
--- a/pkgs/development/libraries/spdk/default.nix
+++ b/pkgs/development/libraries/spdk/default.nix
@@ -10,9 +10,19 @@
 , libuuid
 , numactl
 , openssl
+, fetchurl
 }:
 
-stdenv.mkDerivation rec {
+let
+  # The old version has some CVEs howver they should not affect SPDK's usage of the framework: https://github.com/NixOS/nixpkgs/pull/171648#issuecomment-1121964568
+  dpdk' = dpdk.overrideAttrs (old: rec {
+    name = "dpdk-21.11";
+    src = fetchurl {
+      url = "https://fast.dpdk.org/rel/${name}.tar.xz";
+      sha256 = "sha256-Mkbj7WjuKzaaXYviwGzxCKZp4Vf01Bxby7sha/Wr06E=";
+    };
+  });
+in stdenv.mkDerivation rec {
   pname = "spdk";
   version = "21.10";
 
@@ -40,7 +50,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    cunit dpdk libaio libbsd libuuid numactl openssl ncurses
+    cunit dpdk' libaio libbsd libuuid numactl openssl ncurses
   ];
 
   postPatch = ''
@@ -49,7 +59,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  configureFlags = [ "--with-dpdk=${dpdk}" ];
+  configureFlags = [ "--with-dpdk=${dpdk'}" ];
 
   NIX_CFLAGS_COMPILE = "-mssse3"; # Necessary to compile.
   # otherwise does not find strncpy when compiling
diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix
index d9b6626e72b4..b681c3b35703 100644
--- a/pkgs/development/node-packages/default.nix
+++ b/pkgs/development/node-packages/default.nix
@@ -119,6 +119,7 @@ let
     # NOTE: this is a stub package to fetch npm dependencies for
     # ../../applications/video/epgstation
     epgstation = super."epgstation-../../applications/video/epgstation".override (drv: {
+      buildInputs = [ self.node-pre-gyp self.node-gyp-build ];
       meta = drv.meta // {
         platforms = pkgs.lib.platforms.none;
       };
diff --git a/pkgs/development/ocaml-modules/atd/default.nix b/pkgs/development/ocaml-modules/atd/default.nix
index 5ff5496ed6f6..81b9567fcdc4 100644
--- a/pkgs/development/ocaml-modules/atd/default.nix
+++ b/pkgs/development/ocaml-modules/atd/default.nix
@@ -17,9 +17,10 @@ buildDunePackage rec {
   };
 
   meta = with lib; {
-    homepage = "https://github.com/mjambon/atd";
     description = "Syntax for cross-language type definitions";
+    homepage = "https://github.com/mjambon/atd";
     license = licenses.mit;
     maintainers = with maintainers; [ aij jwilberding ];
+    mainProgram = "atdcat";
   };
 }
diff --git a/pkgs/development/ocaml-modules/awa/default.nix b/pkgs/development/ocaml-modules/awa/default.nix
index d870ab865053..eba150e34023 100644
--- a/pkgs/development/ocaml-modules/awa/default.nix
+++ b/pkgs/development/ocaml-modules/awa/default.nix
@@ -32,9 +32,10 @@ buildDunePackage rec {
 
   meta = with lib; {
     description = "SSH implementation in OCaml";
-    license = licenses.isc;
     homepage = "https://github.com/mirage/awa-ssh";
     changelog = "https://github.com/mirage/awa-ssh/raw/v${version}/CHANGES.md";
+    license = licenses.isc;
     maintainers = [ maintainers.sternenseemann ];
+    mainProgram = "awa_lwt_server";
   };
 }
diff --git a/pkgs/development/ocaml-modules/bisect_ppx/default.nix b/pkgs/development/ocaml-modules/bisect_ppx/default.nix
index 48b9684902ce..fdfc61e73c34 100644
--- a/pkgs/development/ocaml-modules/bisect_ppx/default.nix
+++ b/pkgs/development/ocaml-modules/bisect_ppx/default.nix
@@ -21,8 +21,9 @@ buildDunePackage rec {
 
   meta = with lib; {
     description = "Bisect_ppx is a code coverage tool for OCaml and Reason. It helps you test thoroughly by showing what's not tested.";
-    license = licenses.mit;
     homepage = "https://github.com/aantron/bisect_ppx";
+    license = licenses.mit;
     maintainers = with maintainers; [ ];
+    mainProgram = "bisect-ppx-report";
   };
 }
diff --git a/pkgs/development/ocaml-modules/ca-certs-nss/default.nix b/pkgs/development/ocaml-modules/ca-certs-nss/default.nix
index 987c325ee00e..9c71ca476c96 100644
--- a/pkgs/development/ocaml-modules/ca-certs-nss/default.nix
+++ b/pkgs/development/ocaml-modules/ca-certs-nss/default.nix
@@ -43,9 +43,10 @@ buildDunePackage rec {
   checkInputs = [ alcotest ];
 
   meta = with lib; {
-    license = licenses.isc;
     description = "X.509 trust anchors extracted from Mozilla's NSS";
-    maintainers = [ maintainers.sternenseemann ];
     homepage = "https://github.com/mirage/ca-certs-nss";
+    license = licenses.isc;
+    maintainers = [ maintainers.sternenseemann ];
+    mainProgram = "extract-from-certdata";
   };
 }
diff --git a/pkgs/development/ocaml-modules/checkseum/default.nix b/pkgs/development/ocaml-modules/checkseum/default.nix
index 3a07707a4cd1..13d9f2829aff 100644
--- a/pkgs/development/ocaml-modules/checkseum/default.nix
+++ b/pkgs/development/ocaml-modules/checkseum/default.nix
@@ -39,9 +39,10 @@ buildDunePackage rec {
   doCheck = true;
 
   meta = {
-    homepage = "https://github.com/mirage/checkseum";
     description = "ADLER-32 and CRC32C Cyclic Redundancy Check";
+    homepage = "https://github.com/mirage/checkseum";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.vbgl ];
+    mainProgram = "checkseum.checkseum";
   };
 }
diff --git a/pkgs/development/ocaml-modules/coin/default.nix b/pkgs/development/ocaml-modules/coin/default.nix
index 0ff2ce940410..5996cd7adb61 100644
--- a/pkgs/development/ocaml-modules/coin/default.nix
+++ b/pkgs/development/ocaml-modules/coin/default.nix
@@ -30,8 +30,9 @@ buildDunePackage rec {
 
   meta = {
     description = "A library to normalize an KOI8-{U,R} input to Unicode";
-    license = lib.licenses.mit;
     homepage = "https://github.com/mirage/coin";
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ ];
+    mainProgram = "coin.generate";
   };
 }
diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix
index 360848881a9e..d9960f732c74 100644
--- a/pkgs/development/ocaml-modules/cpdf/default.nix
+++ b/pkgs/development/ocaml-modules/cpdf/default.nix
@@ -31,10 +31,11 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    homepage = "https://www.coherentpdf.com/";
-    inherit (ocaml.meta) platforms;
     description = "PDF Command Line Tools";
+    homepage = "https://www.coherentpdf.com/";
     license = licenses.unfree;
     maintainers = [ maintainers.vbgl ];
+    mainProgram = "cpdf";
+    inherit (ocaml.meta) platforms;
   };
 }
diff --git a/pkgs/development/ocaml-modules/decompress/default.nix b/pkgs/development/ocaml-modules/decompress/default.nix
index 7629349c1d1c..f329a0ff013b 100644
--- a/pkgs/development/ocaml-modules/decompress/default.nix
+++ b/pkgs/development/ocaml-modules/decompress/default.nix
@@ -23,8 +23,9 @@ buildDunePackage rec {
 
   meta = {
     description = "Pure OCaml implementation of Zlib";
+    homepage = "https://github.com/mirage/decompress";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.vbgl ];
-    homepage = "https://github.com/mirage/decompress";
+    mainProgram = "decompress.pipe";
   };
 }
diff --git a/pkgs/development/ocaml-modules/dns/client.nix b/pkgs/development/ocaml-modules/dns/client.nix
index a6dc40de24ea..5178360f7b50 100644
--- a/pkgs/development/ocaml-modules/dns/client.nix
+++ b/pkgs/development/ocaml-modules/dns/client.nix
@@ -16,5 +16,6 @@ buildDunePackage {
 
   meta = dns.meta // {
     description = "Pure DNS resolver API";
+    mainProgram = "dns-client.unix";
   };
 }
diff --git a/pkgs/development/ocaml-modules/hidapi/default.nix b/pkgs/development/ocaml-modules/hidapi/default.nix
index 44b1d5f150a8..b4492f438ccc 100644
--- a/pkgs/development/ocaml-modules/hidapi/default.nix
+++ b/pkgs/development/ocaml-modules/hidapi/default.nix
@@ -24,9 +24,10 @@ buildDunePackage rec {
   doCheck = true;
 
   meta = with lib; {
-    homepage = "https://github.com/vbmithr/ocaml-hidapi";
     description = "Bindings to Signal11's hidapi library";
+    homepage = "https://github.com/vbmithr/ocaml-hidapi";
     license = licenses.isc;
     maintainers = [ maintainers.alexfmpe ];
+    mainProgram = "ocaml-hid-enumerate";
   };
 }
diff --git a/pkgs/development/ocaml-modules/irmin/pack.nix b/pkgs/development/ocaml-modules/irmin/pack.nix
index 5955dda8ed99..12934007cf14 100644
--- a/pkgs/development/ocaml-modules/irmin/pack.nix
+++ b/pkgs/development/ocaml-modules/irmin/pack.nix
@@ -20,6 +20,7 @@ buildDunePackage rec {
 
   meta = irmin.meta // {
     description = "Irmin backend which stores values in a pack file";
+    mainProgram = "irmin_fsck";
   };
 
 }
diff --git a/pkgs/development/ocaml-modules/irmin/unix.nix b/pkgs/development/ocaml-modules/irmin/unix.nix
index 89cf36979bde..2906e77b1b6f 100644
--- a/pkgs/development/ocaml-modules/irmin/unix.nix
+++ b/pkgs/development/ocaml-modules/irmin/unix.nix
@@ -26,6 +26,7 @@ buildDunePackage rec {
 
   meta = irmin.meta // {
     description = "Unix backends for Irmin";
+    mainProgram = "irmin";
   };
 
 }
diff --git a/pkgs/development/ocaml-modules/janestreet/0.14.nix b/pkgs/development/ocaml-modules/janestreet/0.14.nix
index cee30da45c9e..b9a19f13410a 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.14.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix
@@ -405,7 +405,10 @@ with self;
     pname = "ppx_base";
     hash = "1wv3q0qyghm0c5izq03y97lv3czqk116059mg62wx6valn22a000";
     minimumOCamlVersion = "4.04.2";
-    meta.description = "Base set of ppx rewriters";
+    meta = {
+      description = "Base set of ppx rewriters";
+      mainProgram = "ppx-base";
+    };
     propagatedBuildInputs = [ ppx_cold ppx_enumerate ppx_hash ppx_js_style ];
   };
 
@@ -519,7 +522,10 @@ with self;
     pname = "ppx_jane";
     hash = "1kk238fvrcylymwm7xwc7llbyspmx1y662ypq00vy70g112rir7j";
     minimumOCamlVersion = "4.04.2";
-    meta.description = "Standard Jane Street ppx rewriters";
+    meta = {
+      description = "Standard Jane Street ppx rewriters";
+      mainProgram = "ppx-jane";
+    };
     propagatedBuildInputs = [ base_quickcheck ppx_bin_prot ppx_expect ppx_fixed_literal ppx_module_timer ppx_optcomp ppx_optional ppx_pipebang ppx_stable ppx_string ppx_typerep_conv ppx_variants_conv ];
   };
 
diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix
index fa525dbba813..b010272b54b4 100644
--- a/pkgs/development/ocaml-modules/lablgl/default.nix
+++ b/pkgs/development/ocaml-modules/lablgl/default.nix
@@ -39,10 +39,11 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    homepage = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html";
     description = "OpenGL bindings for ocaml";
+    homepage = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html";
     license = licenses.gpl2;
     maintainers = with maintainers; [ pSub vbgl ];
+    mainProgram = "lablglut";
     broken = stdenv.isDarwin;
   };
 }
diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/pkgs/development/ocaml-modules/lambda-term/default.nix
index b7ed4f24b1d9..e44fdbe3ee80 100644
--- a/pkgs/development/ocaml-modules/lambda-term/default.nix
+++ b/pkgs/development/ocaml-modules/lambda-term/default.nix
@@ -25,7 +25,8 @@ buildDunePackage rec {
 
   propagatedBuildInputs = [ zed lwt_log lwt_react mew_vi ];
 
-  meta = { description = "Terminal manipulation library for OCaml";
+  meta = {
+    description = "Terminal manipulation library for OCaml";
     longDescription = ''
     Lambda-term is a cross-platform library for
     manipulating the terminal. It provides an abstraction for keys,
@@ -43,8 +44,7 @@ buildDunePackage rec {
 
     inherit (src.meta) homepage;
     license = lib.licenses.bsd3;
-    maintainers = [
-      lib.maintainers.gal_bolle
-    ];
+    maintainers = [ lib.maintainers.gal_bolle ];
+    mainProgram = "lambda-term-actions";
   };
 }
diff --git a/pkgs/development/ocaml-modules/letsencrypt/app.nix b/pkgs/development/ocaml-modules/letsencrypt/app.nix
index de1dbbb8c849..1f6cc6e2b103 100644
--- a/pkgs/development/ocaml-modules/letsencrypt/app.nix
+++ b/pkgs/development/ocaml-modules/letsencrypt/app.nix
@@ -43,5 +43,6 @@ buildDunePackage {
 
   meta = letsencrypt.meta // {
     description = "An ACME client implementation of the ACME protocol (RFC 8555) for OCaml";
+    mainProgram = "oacmel";
   };
 }
diff --git a/pkgs/development/ocaml-modules/lustre-v6/default.nix b/pkgs/development/ocaml-modules/lustre-v6/default.nix
index 4eeb01e9f3b4..3cc7a25a36aa 100644
--- a/pkgs/development/ocaml-modules/lustre-v6/default.nix
+++ b/pkgs/development/ocaml-modules/lustre-v6/default.nix
@@ -20,9 +20,10 @@ buildDunePackage rec {
   ];
 
   meta = with lib; {
-    homepage = "https://www-verimag.imag.fr/lustre-v6.html";
     description = "Lustre V6 compiler";
+    homepage = "https://www-verimag.imag.fr/lustre-v6.html";
     license = lib.licenses.cecill21;
     maintainers = [ lib.maintainers.delta ];
+    mainProgram = "lv6";
   };
 }
diff --git a/pkgs/development/ocaml-modules/lutils/default.nix b/pkgs/development/ocaml-modules/lutils/default.nix
index 492a987dc9cc..c462eb9fe15d 100644
--- a/pkgs/development/ocaml-modules/lutils/default.nix
+++ b/pkgs/development/ocaml-modules/lutils/default.nix
@@ -21,5 +21,6 @@ buildDunePackage rec {
     homepage = "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils/";
     description = "Tools and libs shared by Verimag/synchronous tools (lustre, lutin, rdbg)";
     license = lib.licenses.cecill21;
+    mainProgram = "gnuplot-rif";
   };
 }
diff --git a/pkgs/development/ocaml-modules/mrmime/default.nix b/pkgs/development/ocaml-modules/mrmime/default.nix
index a5c2a68ee47b..50cd04ddb0a7 100644
--- a/pkgs/development/ocaml-modules/mrmime/default.nix
+++ b/pkgs/development/ocaml-modules/mrmime/default.nix
@@ -67,8 +67,9 @@ buildDunePackage rec {
 
   meta = {
     description = "Parser and generator of mail in OCaml";
-    license = lib.licenses.mit;
     homepage = "https://github.com/mirage/mrmime";
-    maintainers = with lib.maintainers; [ ];
+    license = lib.licenses.mit;
+    maintainers = [ ];
+    mainProgram = "mrmime.generate";
   };
 }
diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/default.nix b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix
index c1831e660f42..f5b69a3b1e3a 100644
--- a/pkgs/development/ocaml-modules/ocaml-lsp/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix
@@ -17,5 +17,6 @@ buildDunePackage rec {
 
   meta = lsp.meta // {
     description = "OCaml Language Server Protocol implementation";
+    mainProgram = "ocamllsp";
   };
 }
diff --git a/pkgs/development/ocaml-modules/otfm/default.nix b/pkgs/development/ocaml-modules/otfm/default.nix
index f67174587915..96ef1037cf69 100644
--- a/pkgs/development/ocaml-modules/otfm/default.nix
+++ b/pkgs/development/ocaml-modules/otfm/default.nix
@@ -34,8 +34,9 @@ stdenv.mkDerivation {
       of them.
     '';
     homepage = webpage;
-    inherit (ocaml.meta) platforms;
     license = licenses.bsd3;
     maintainers = [ maintainers.jirkamarsik ];
+    mainProgram = "otftrip";
+    inherit (ocaml.meta) platforms;
   };
 }
diff --git a/pkgs/development/ocaml-modules/phylogenetics/default.nix b/pkgs/development/ocaml-modules/phylogenetics/default.nix
index 366ad9cc24ac..11da66bd7600 100644
--- a/pkgs/development/ocaml-modules/phylogenetics/default.nix
+++ b/pkgs/development/ocaml-modules/phylogenetics/default.nix
@@ -46,9 +46,10 @@ buildDunePackage rec {
   doCheck = true;
 
   meta = with lib; {
-    homepage = "https://github.com/biocaml/phylogenetics";
     description = "Algorithms and datastructures for phylogenetics";
-    maintainers = [ maintainers.bcdarwin ];
+    homepage = "https://github.com/biocaml/phylogenetics";
     license = licenses.cecill-b;
+    maintainers = [ maintainers.bcdarwin ];
+    mainProgram = "phylosim";
   };
 }
diff --git a/pkgs/development/ocaml-modules/tuntap/default.nix b/pkgs/development/ocaml-modules/tuntap/default.nix
index 981f05b01e38..2bbf89c61273 100644
--- a/pkgs/development/ocaml-modules/tuntap/default.nix
+++ b/pkgs/development/ocaml-modules/tuntap/default.nix
@@ -23,7 +23,8 @@ buildDunePackage rec {
 
   meta = {
     description = "Bindings to the UNIX tuntap facility";
-    license = lib.licenses.isc;
     homepage = "https://github.com/mirage/ocaml-tuntap";
+    license = lib.licenses.isc;
+    mainProgram = "otunctl";
   };
 }
diff --git a/pkgs/development/ocaml-modules/uuuu/default.nix b/pkgs/development/ocaml-modules/uuuu/default.nix
index d2895ce68e67..59dd7d568967 100644
--- a/pkgs/development/ocaml-modules/uuuu/default.nix
+++ b/pkgs/development/ocaml-modules/uuuu/default.nix
@@ -32,8 +32,9 @@ buildDunePackage rec {
 
   meta = {
     description = "A library to normalize an ISO-8859 input to Unicode code-point";
-    license = lib.licenses.mit;
     homepage = "https://github.com/mirage/uuuu";
-    maintainers = with lib.maintainers; [ ];
+    license = lib.licenses.mit;
+    maintainers = [ ];
+    mainProgram = "uuuu.generate";
   };
 }
diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix
index 35a0e51cb09a..94ebc1b8d817 100644
--- a/pkgs/development/ocaml-modules/vg/default.nix
+++ b/pkgs/development/ocaml-modules/vg/default.nix
@@ -57,8 +57,9 @@ stdenv.mkDerivation {
     module. An API allows to implement new renderers.
     '';
     homepage = webpage;
-    inherit (ocaml.meta) platforms;
     license = licenses.isc;
     maintainers = [ maintainers.jirkamarsik ];
+    mainProgram = "vecho";
+    inherit (ocaml.meta) platforms;
   };
 }
diff --git a/pkgs/development/ocaml-modules/wayland/default.nix b/pkgs/development/ocaml-modules/wayland/default.nix
index 7dfb46ce63cf..12c385eac72c 100644
--- a/pkgs/development/ocaml-modules/wayland/default.nix
+++ b/pkgs/development/ocaml-modules/wayland/default.nix
@@ -42,8 +42,9 @@ buildDunePackage rec {
 
   meta = {
     description = "Pure OCaml Wayland protocol library";
+    homepage = "https://github.com/talex5/ocaml-wayland";
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.sternenseemann ];
-    homepage = "https://github.com/talex5/ocaml-wayland";
+    mainProgram = "wayland-scanner-ocaml";
   };
 }
diff --git a/pkgs/development/ocaml-modules/webbrowser/default.nix b/pkgs/development/ocaml-modules/webbrowser/default.nix
index a8adced93882..7ace251e5533 100644
--- a/pkgs/development/ocaml-modules/webbrowser/default.nix
+++ b/pkgs/development/ocaml-modules/webbrowser/default.nix
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
     homepage = "https://erratique.ch/software/webbrowser";
     license = lib.licenses.isc;
     maintainers = [ lib.maintainers.vbgl ];
+    mainProgram = "browse";
     inherit (ocaml.meta) platforms;
   };
 }
diff --git a/pkgs/development/ocaml-modules/wodan/unix.nix b/pkgs/development/ocaml-modules/wodan/unix.nix
index 64a18b6b83d7..9b9cd841e0f1 100644
--- a/pkgs/development/ocaml-modules/wodan/unix.nix
+++ b/pkgs/development/ocaml-modules/wodan/unix.nix
@@ -22,6 +22,9 @@ buildDunePackage rec {
     moveToOutput bin "''${!outputBin}"
   '';
 
-  meta = wodan.meta // { description = "Wodan clients with Unix integration"; };
+  meta = wodan.meta // {
+    description = "Wodan clients with Unix integration";
+    mainProgram = "wodanc";
+  };
 
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
index 4a502ac65dbf..df03e41d56b9 100644
--- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-containerservice";
-  version = "19.0.0";
+  version = "19.1.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "sha256-UHkSUoNzXWomr4vczGRRXVJplVRfqDjwFczkOP2Jwsc=";
+    sha256 = "sha256-t06Cesxvjk31aDxkX2Yj0VzFubWbiAc26LzNTIgVEqs=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
index d26033c414f1..fc638390a3b3 100644
--- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-datafactory";
-  version = "2.4.0";
+  version = "2.5.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    hash = "sha256-oCDh7tWsBA6z/auQm3AtkRzT9IUrq8HJ+R//HDJ+1nw=";
+    hash = "sha256-vV+VAK+lesBylrIsGB+MZCT4kW84beFSIYJZfOzPoTY=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/blocksat-cli/default.nix b/pkgs/development/python-modules/blocksat-cli/default.nix
index 4c5b96bce538..8652dbdc5441 100644
--- a/pkgs/development/python-modules/blocksat-cli/default.nix
+++ b/pkgs/development/python-modules/blocksat-cli/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "blocksat-cli";
-  version = "0.4.2";
+  version = "0.4.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-hz5BGE+gqOrPiXvmeOTOecm2RUrTvM/xxvV3cnO2QSc=";
+    sha256 = "sha256-HHalq64pgjobnPwjXMi57OumHxOuf7wjuw0d6arMoAI=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/cirq-core/default.nix b/pkgs/development/python-modules/cirq-core/default.nix
index 92045eb3e3ef..74f8e488fd92 100644
--- a/pkgs/development/python-modules/cirq-core/default.nix
+++ b/pkgs/development/python-modules/cirq-core/default.nix
@@ -30,7 +30,7 @@
 
 buildPythonPackage rec {
   pname = "cirq-core";
-  version = "0.13.1";
+  version = "0.14.1";
 
   disabled = pythonOlder "3.6";
 
@@ -38,32 +38,17 @@ buildPythonPackage rec {
     owner = "quantumlib";
     repo = "cirq";
     rev = "v${version}";
-    sha256 = "sha256-MVfJ8iEeW8gFvCNTqrWfYpNNYuDAufHgcjd7Nh3qp8U=";
+    sha256 = "sha256-cIDwV3IBXrTJ4jC1/HYmduY3tLe/f6wj8CWZ4cnThG8=";
   };
 
   sourceRoot = "source/${pname}";
 
-  patches = [
-    # present in upstream master - remove after 0.13.1
-    (fetchpatch {
-      name = "fix-test-tolerances.part-1.patch";
-      url = "https://github.com/quantumlib/Cirq/commit/eb1d9031e55d3c8801ea44abbb6a4132b2fc5126.patch";
-      sha256 = "0ka24v6dfxnap9p07ni32z9zccbmw0lbrp5mcknmpsl12hza98xm";
-      stripLen = 1;
-    })
-    (fetchpatch {
-      name = "fix-test-tolerances.part-2.patch";
-      url = "https://github.com/quantumlib/Cirq/commit/a28d601b2bcfc393336375c53e5915fd16455395.patch";
-      sha256 = "0k2dqsm4ydn6556d40kc8j04jgjn59z4wqqg1jn1r916a7yxw493";
-      stripLen = 1;
-    })
-  ];
-
   postPatch = ''
     substituteInPlace requirements.txt \
       --replace "matplotlib~=3.0" "matplotlib" \
       --replace "networkx~=2.4" "networkx" \
-      --replace "numpy~=1.16" "numpy"
+      --replace "numpy~=1.16" "numpy" \
+      --replace "sympy<1.10" "sympy"
   '';
 
   propagatedBuildInputs = [
@@ -93,9 +78,9 @@ buildPythonPackage rec {
     freezegun
   ];
 
-  pytestFlagsArray = lib.optionals (!withContribRequires) [
+  disabledTestPaths = lib.optionals (!withContribRequires) [
     # requires external (unpackaged) libraries, so untested.
-    "--ignore=cirq/contrib/"
+    "cirq/contrib/"
   ];
   disabledTests = [
     "test_metadata_search_path" # tries to import flynt, which isn't in Nixpkgs
diff --git a/pkgs/development/python-modules/cirq/default.nix b/pkgs/development/python-modules/cirq/default.nix
index 6e428eeb4ef6..17623817e7b6 100644
--- a/pkgs/development/python-modules/cirq/default.nix
+++ b/pkgs/development/python-modules/cirq/default.nix
@@ -1,4 +1,5 @@
 { buildPythonPackage
+, fetchpatch
 , cirq-aqt
 , cirq-core
 , cirq-google
@@ -14,6 +15,14 @@ buildPythonPackage rec {
   pname = "cirq";
   inherit (cirq-core) version src meta;
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/quantumlib/Cirq/commit/b832db606e5f1850b1eda168a6d4a8e77d8ec711.patch";
+      name = "pr-5330-prevent-implicit-packages.patch";
+      sha256 = "sha256-HTEH3fFxPiBedaz5GxZjXayvoiazwHysKZIOzqwZmbg=";
+    })
+  ];
+
   propagatedBuildInputs = [
     cirq-aqt
     cirq-core
diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix
index 879ffbf7123a..27c1a673eee9 100644
--- a/pkgs/development/python-modules/hahomematic/default.nix
+++ b/pkgs/development/python-modules/hahomematic/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "hahomematic";
-  version = "1.3.0";
+  version = "1.3.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "danielperna84";
     repo = pname;
     rev = "refs/tags/${version}";
-    sha256 = "sha256-033iPQfFF26Ly8OVdjExDZDoQ35DXuVF7dXqokA7k/s=";
+    sha256 = "sha256-RgjsaGtji5vSQcv+npOYcXJNYUhx9Snz56BXnfoc2QY=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/hatasmota/default.nix b/pkgs/development/python-modules/hatasmota/default.nix
index db524438d63a..5f09cb3b7355 100644
--- a/pkgs/development/python-modules/hatasmota/default.nix
+++ b/pkgs/development/python-modules/hatasmota/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "hatasmota";
-  version = "0.4.1";
+  version = "0.5.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "emontnemery";
     repo = pname;
     rev = "refs/tags/${version}";
-    sha256 = "sha256-So3wnz6HBGlgBgBJiU4m+fFx7f8Y+6c15OCD8GFGQaE=";
+    sha256 = "sha256-pIMao1zZXJJVEG9J9ypWlo/JF0nmci49ANcqHJSY2AY=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix
index 3bbc8ad2669e..d0eba93fb85d 100644
--- a/pkgs/development/python-modules/huggingface-hub/default.nix
+++ b/pkgs/development/python-modules/huggingface-hub/default.nix
@@ -14,13 +14,13 @@
 
 buildPythonPackage rec {
   pname = "huggingface-hub";
-  version = "0.4.0";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "huggingface_hub";
-    rev = "v${version}";
-    sha256 = "sha256-rrkubNy60e/1VcGacYQang4yWxUzIBGySxZyq6G1arw=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-jR4aqMAAQJ5a7pOe3RpCtLgdm5JVVSPsBQtube6FeqM=";
   };
 
   nativeBuildInputs = [ packaging ];
@@ -41,7 +41,7 @@ buildPythonPackage rec {
    meta = with lib; {
     homepage = "https://github.com/huggingface/huggingface_hub";
     description = "Download and publish models and other files on the huggingface.co hub";
-    changelog = "https://github.com/huggingface/huggingface_hub/releases/tag/${version}";
+    changelog = "https://github.com/huggingface/huggingface_hub/releases/tag/v${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ ];
   };
diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix
index d7f8e6c5a1ba..cff3ad1c737d 100644
--- a/pkgs/development/python-modules/jc/default.nix
+++ b/pkgs/development/python-modules/jc/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "jc";
-  version = "1.18.8";
+  version = "1.19.0";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "kellyjonbrazil";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-tZrvWMt0qdOFTNeL99mZGFl8bVDGCqj25zVl7QvXQLw=";
+    sha256 = "sha256-0UOU4arSCh+5l258mwZQLNf/JUbPcTgcHtusiTyYPwg=";
   };
 
   propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ];
diff --git a/pkgs/development/python-modules/motionblinds/default.nix b/pkgs/development/python-modules/motionblinds/default.nix
index f3cf778fcbad..e2a27b56cac1 100644
--- a/pkgs/development/python-modules/motionblinds/default.nix
+++ b/pkgs/development/python-modules/motionblinds/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "motionblinds";
-  version = "0.6.5";
+  version = "0.6.7";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     owner = "starkillerOG";
     repo = "motion-blinds";
     rev = "refs/tags/${version}";
-    sha256 = "sha256-RAGsVHi/f+0gIzVomhC8h3JvoD4EEe6dK9PBi5daTgU=";
+    sha256 = "sha256-c6+kctEB4gwLGTgTA+sUA3v9ST4dn4RFPbyaXSgGvoQ=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix
index 6fa1728deea3..987aa20d2dbb 100644
--- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "mypy-boto3-s3";
-  version = "1.22.8";
+  version = "1.23.0.post1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Br7HlymKuQUbI+iw90HWi1lSnEFwQbziBLokAHTzGEk=";
+    hash = "sha256-eF0ChMOqisXsMWLlKCAWGMrTUe4sGfZxWo5uc/ZKAQk=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix
index d05696528123..2b079c8f00e3 100644
--- a/pkgs/development/python-modules/pip-tools/default.nix
+++ b/pkgs/development/python-modules/pip-tools/default.nix
@@ -13,13 +13,13 @@
 
 buildPythonPackage rec {
   pname = "pip-tools";
-  version = "6.6.0";
+  version = "6.6.1";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-mKokAERAocBInXGlZ6Tor98jx3gr/0g9EhmIHnMC3oM=";
+    sha256 = "sha256-Y04+jUcHJXwAQxPRap1sFMHOlNPA+h+Tw40mRAHy5PI=";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix
index b2c8bef9d495..7bbfbdb27d3b 100644
--- a/pkgs/development/python-modules/plugwise/default.nix
+++ b/pkgs/development/python-modules/plugwise/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "plugwise";
-  version = "0.18.2";
+  version = "0.18.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = pname;
     repo = "python-plugwise";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-l97GF5dZlwps2mhw84A+8IBmTmvnaJ/5MeWYdeAu4Zw=";
+    sha256 = "sha256-aNlPOgUChLFkPPZtb3o4A49uoSBjxKaq3WtuupHlmi8=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
index 36f25fce9d14..13678edc8656 100644
--- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
+++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pyTelegramBotAPI";
-  version = "4.5.0";
+  version = "4.5.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Jonbb26MbK/LKztFkB7IlaHQm98DPYn4lYK4ikDPpaE=";
+    hash = "sha256-ClzdkvH1uz1qh/q3prfn8n0eosY3y3mUscbb4EKbmJQ=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyomo/default.nix b/pkgs/development/python-modules/pyomo/default.nix
index 105f78b5824f..3a9a80d57812 100644
--- a/pkgs/development/python-modules/pyomo/default.nix
+++ b/pkgs/development/python-modules/pyomo/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "pyomo";
-  version = "6.4.0";
+  version = "6.4.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -17,8 +17,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = "pyomo";
     owner = "pyomo";
-    rev = version;
-    hash = "sha256-FdUhne5Dn5hTIXMce1G6Zu6nx+AuP/JdK0a5fCE3hg8=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-LwlUib/CeVCCmgpTHtYHcFyxk9Esx1zhZ3yGHeGpugY=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/qcs-api-client/default.nix b/pkgs/development/python-modules/qcs-api-client/default.nix
index 41412e16f8fc..92aaabb4e1ab 100644
--- a/pkgs/development/python-modules/qcs-api-client/default.nix
+++ b/pkgs/development/python-modules/qcs-api-client/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "qcs-api-client";
-  version = "0.20.10";
+  version = "0.20.12";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "rigetti";
     repo = "qcs-api-client-python";
     rev = "v${version}";
-    hash = "sha256-pBC8pFrk6iNYPS3/LKaVo+ds2okN56bxzvffEfs6SrU=";
+    hash = "sha256-4462T2WIBdWjtd51YfslYZOcJg9f0nrSOKTi2ed6WvI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/tools/analysis/rr/unstable.nix b/pkgs/development/tools/analysis/rr/unstable.nix
index 35098c1bcfc8..8ffdbc88e4dd 100644
--- a/pkgs/development/tools/analysis/rr/unstable.nix
+++ b/pkgs/development/tools/analysis/rr/unstable.nix
@@ -11,12 +11,12 @@ let
 in
 
   rr.overrideAttrs (old: {
-    version = "unstable-2021-07-06";
+    version = "unstable-2022-05-12";
 
     src = fetchFromGitHub {
       owner = "mozilla";
       repo = "rr";
-      rev = "0fc21a8d654dabc7fb1991d76343824cb7951ea0";
-      sha256 = "0s851rflxmvxcfw97zmplcwzhv86xmd3my78pi4c7gkj18d621i5";
+      rev = "c96cb688106634ad09af6214aa91252c3a4f74b1";
+      sha256 = "sha256-K4cEQnvBXr/j9qXCgIHLqMrRzm96ushTO5STivRj+Mk=";
     };
   })
diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix
deleted file mode 100644
index 3b9de427bde0..000000000000
--- a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ lib, buildGoPackage, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep
-, src, version, hasBootstrapScript, postPatch ? ""
-, ... }:
-let
-  goPackagePath = "github.com/buildkite/agent";
-in
-buildGoPackage {
-  pname = "buildkite-agent";
-  inherit version;
-
-  inherit goPackagePath src postPatch;
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  postInstall = ''
-    ${lib.optionalString hasBootstrapScript ''
-    # Install bootstrap.sh
-    mkdir -p $out/libexec/buildkite-agent
-    cp $NIX_BUILD_TOP/go/src/${goPackagePath}/templates/bootstrap.sh $out/libexec/buildkite-agent
-    sed -e "s|#!/bin/bash|#!${bash}/bin/bash|g" -i $out/libexec/buildkite-agent/bootstrap.sh
-    ''}
-
-    # Fix binary name
-    mv $out/bin/{agent,buildkite-agent}
-
-    # These are runtime dependencies
-    wrapProgram $out/bin/buildkite-agent \
-      ${lib.optionalString hasBootstrapScript "--set BUILDKITE_BOOTSTRAP_SCRIPT_PATH $out/libexec/buildkite-agent/bootstrap.sh"} \
-      --prefix PATH : '${lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}'
-  '';
-
-  meta = with lib; {
-    description = "Build runner for buildkite.com";
-    longDescription = ''
-      The buildkite-agent is a small, reliable, and cross-platform build runner
-      that makes it easy to run automated builds on your own infrastructure.
-      It’s main responsibilities are polling buildkite.com for work, running
-      build jobs, reporting back the status code and output log of the job,
-      and uploading the job's artifacts.
-    '';
-    homepage = "https://buildkite.com/docs/agent";
-    license = licenses.mit;
-    maintainers = with maintainers; [ pawelpacana zimbatm rvl ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix
index a82ff178c9eb..e953fa0ba40d 100644
--- a/pkgs/development/tools/misc/gdbgui/default.nix
+++ b/pkgs/development/tools/misc/gdbgui/default.nix
@@ -2,80 +2,35 @@
 , buildPythonApplication
 , fetchPypi
 , gdb
-, flask
-, six
-, bidict
-, python-engineio
-, python-socketio
 , flask-socketio
 , flask-compress
 , pygdbmi
 , pygments
-, gevent
-, gevent-websocket
-, eventlet
 , }:
 
-let
-  # gdbgui only works with the latest previous major version of flask-socketio,
-  # which depends itself on the latest previous major versions of dependencies.
-  python-engineio' = python-engineio.overridePythonAttrs (old: rec {
-    version = "3.14.2";
-    src = fetchPypi {
-      inherit (old) pname;
-      inherit version;
-      sha256 = "119halljynqsgswlhlh750qv56js1p7j52sc0nbwxh8450zmbd7a";
-    };
-    propagatedBuildInputs = [ six ];
-    doCheck = false;
-  });
-  python-socketio' = python-socketio.overridePythonAttrs (old: rec {
-    version = "4.6.1";
-    src = fetchPypi {
-      inherit (old) pname;
-      inherit version;
-      sha256 = "047syhrrxh327p0fnab0d1zy25zijnj3gs1qg3kjpsy1jaj5l7yd";
-    };
-    propagatedBuildInputs = [ bidict python-engineio' ];
-    doCheck = false;
-  });
-  flask-socketio' = flask-socketio.overridePythonAttrs (old: rec {
-    version = "4.3.2";
-    src = fetchPypi {
-      inherit (old) pname;
-      inherit version;
-      sha256 = "0s2xs9kv9cbwy8bcxszhdwlcb9ldv0fj33lwilf5vypj0wsin01p";
-    };
-    propagatedBuildInputs = [ flask python-socketio' ];
-    doCheck = false;
-  });
-in
 buildPythonApplication rec {
   pname = "gdbgui";
-  version = "0.14.0.2";
+
+  version = "0.15.0.1";
+
 
   buildInputs = [ gdb ];
   propagatedBuildInputs = [
-    flask
-    flask-socketio'
+    flask-socketio
     flask-compress
     pygdbmi
     pygments
-    gevent
-    gevent-websocket
-    eventlet
   ];
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1v6wwsncgnhlg5c7gsmzcp52hfblfnz5kf5pk4d0zybflsxak02d";
+    sha256 = "sha256-bwrleLn3GBx4Mie2kujtaUo+XCALM+hRLySIZERlBg0=";
   };
 
   postPatch = ''
     echo ${version} > gdbgui/VERSION.txt
     # remove upper version bound
-    sed -ie 's!, <.*"!"!' setup.py
-    sed -i 's/greenlet==/greenlet>=/' setup.py
+    sed -ie 's!,.*<.*!!' requirements.in
   '';
 
   postInstall = ''
diff --git a/pkgs/development/tools/ocaml/ocaml-recovery-parser/default.nix b/pkgs/development/tools/ocaml/ocaml-recovery-parser/default.nix
index 619d0ded7b32..19ce91574bff 100644
--- a/pkgs/development/tools/ocaml/ocaml-recovery-parser/default.nix
+++ b/pkgs/development/tools/ocaml/ocaml-recovery-parser/default.nix
@@ -27,9 +27,10 @@ buildDunePackage rec {
   ];
 
   meta = with lib; {
-    homepage = "https://github.com/serokell/ocaml-recovery-parser";
     description = "A simple fork of OCaml parser with support for error recovery";
+    homepage = "https://github.com/serokell/ocaml-recovery-parser";
     license = with licenses; [ lgpl2Only mit mpl20 ];
     maintainers = with maintainers; [ romildo ];
+    mainProgram = "menhir-recover";
   };
 }
diff --git a/pkgs/development/tools/ocaml/ocamlscript/default.nix b/pkgs/development/tools/ocaml/ocamlscript/default.nix
index 0b4b748f0586..48b7d840a4f2 100644
--- a/pkgs/development/tools/ocaml/ocamlscript/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlscript/default.nix
@@ -29,5 +29,6 @@ stdenv.mkDerivation rec {
     inherit (ocaml.meta) platforms;
     description = "Natively-compiled OCaml scripts";
     maintainers = [ maintainers.vbgl ];
+    mainProgram = "ocamlscript";
   };
 }
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
index 45a7e6619d1b..c99e0047f0d1 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
@@ -5,7 +5,7 @@
 }:
 let
   # Poetry2nix version
-  version = "1.29.0";
+  version = "1.29.1";
 
   inherit (poetryLib) isCompatible readTOML moduleName;
 
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json
index 78e1e87f6bf7..dca0936ca73f 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json
@@ -801,6 +801,9 @@
   "notebook-shim": [
     "jupyter-packaging"
   ],
+  "notify-py": [
+    "poetry-core"
+  ],
   "notus-scanner": [
     "poetry-core"
   ],
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix
index 74ca436b049f..ce9805cd41ef 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix
@@ -1891,7 +1891,7 @@ lib.composeManyExtensions [
 
           # Fix library paths
           postPatch = old.postPatch or "" + ''
-            ${self.python.pythonForBuild.interpreter} ${./shapely-rewrite.py} shapely/geos.py
+            ${pkgs.python3.interpreter} ${./shapely-rewrite.py} shapely/geos.py
           '';
         }
       );
diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/os-specific/darwin/goku/default.nix
index 32a7f20befda..af70aaccc464 100644
--- a/pkgs/os-specific/darwin/goku/default.nix
+++ b/pkgs/os-specific/darwin/goku/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "goku";
-  version = "0.5.1";
+  version = "0.5.2";
 
   src = fetchurl {
     url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku.zip";
-    sha256 = "7c9304a5b4265575ca154bc0ebc04fcf812d14981775966092946cf82f65c782";
+    sha256 = "506eccdabedc68c112778b13ded65099327267c2e3fd488916e3a340bc312954";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix
index 1e4f50e42df3..2f06401d49af 100644
--- a/pkgs/os-specific/linux/dpdk/default.nix
+++ b/pkgs/os-specific/linux/dpdk/default.nix
@@ -9,14 +9,14 @@
 
 let
   mod = kernel != null;
-  dpdkVersion = "21.11";
+  dpdkVersion = "22.03";
 in stdenv.mkDerivation rec {
   pname = "dpdk";
   version = "${dpdkVersion}" + lib.optionalString mod "-${kernel.version}";
 
   src = fetchurl {
     url = "https://fast.dpdk.org/rel/dpdk-${dpdkVersion}.tar.xz";
-    sha256 = "sha256-Mkbj7WjuKzaaXYviwGzxCKZp4Vf01Bxby7sha/Wr06E=";
+    sha256 = "sha256-st5fCLzVcz+Q1NfmwDJRWQja2PyNJnrGolNELZuDp8U=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index 39c07f48a29a..4f5f3b585dad 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -1,27 +1,50 @@
 { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, kernel, installShellFiles, pkg-config
 , luajit, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils, tbb, protobuf, grpc
+, libyamlcpp, nlohmann_json
 }:
 
 with lib;
 let
   # Compare with https://github.com/draios/sysdig/blob/dev/cmake/modules/falcosecurity-libs.cmake
-  libsRev = "2160111cd088aea9ae2235d3385ecb0b1ab6623c";
-  libsSha256 = "sha256-TOuxXtrxujyAjzAtlX3/eCfM16mwxnmZ6Wg44SG0dTs=";
+  libsRev = "e5c53d648f3c4694385bbe488e7d47eaa36c229a";
+  libsSha256 = "sha256-pG10y5PpDqaF/cq8oAvax5B/ls2UTRQd7tCfBjWVf0U=";
+
+  # Compare with https://github.com/falcosecurity/libs/blob/master/cmake/modules/valijson.cmake#L17
+  valijson = fetchFromGitHub {
+    owner = "tristanpenman";
+    repo = "valijson";
+    rev = "v0.6";
+    sha256 = "sha256-ZD19Q2MxMQd3yEKbY90GFCrerie5/jzgO8do4JQDoKM=";
+  };
+
 in
 stdenv.mkDerivation rec {
   pname = "sysdig";
-  version = "0.28.0";
+  version = "0.29.3";
 
   src = fetchFromGitHub {
     owner = "draios";
     repo = "sysdig";
     rev = version;
-    sha256 = "sha256-oE3vCmOw+gcmvGqj7Xk5injpNC/YThckJMNg5XRFhME=";
+    sha256 = "sha256-dMLeroOd9CgvmgQdPfX8oBxQSyksZi/hP4vO03JhlF0=";
   };
 
   nativeBuildInputs = [ cmake perl installShellFiles pkg-config ];
   buildInputs = [
-    luajit ncurses jsoncpp libb64 openssl curl jq gcc elfutils tbb protobuf grpc
+    luajit
+    ncurses
+    libb64
+    openssl
+    curl
+    jq
+    gcc
+    elfutils
+    tbb
+    protobuf
+    grpc
+    libyamlcpp
+    jsoncpp
+    nlohmann_json
   ] ++ optionals (kernel != null) kernel.moduleBuildDependencies;
 
   hardeningDisable = [ "pic" ];
@@ -34,7 +57,7 @@ stdenv.mkDerivation rec {
       sha256 = libsSha256;
     }} libs
     chmod -R +w libs
-    cmakeFlagsArray+=("-DFALCOSECURITY_LIBS_SOURCE_DIR=$(pwd)/libs")
+    cmakeFlagsArray+=("-DFALCOSECURITY_LIBS_SOURCE_DIR=$(pwd)/libs" "-DVALIJSON_INCLUDE=${valijson}/include")
   '';
 
   cmakeFlags = [
@@ -47,6 +70,10 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg -DluaL_getn(L,i)=((int)lua_objlen(L,i))";
 
   preConfigure = ''
+    if ! grep -q "${libsRev}" cmake/modules/falcosecurity-libs.cmake; then
+      echo "falcosecurity-libs checksum needs to be updated!"
+      exit 1
+    fi
     cmakeFlagsArray+=(-DCMAKE_EXE_LINKER_FLAGS="-ltbb -lcurl -labsl_synchronization")
   '' + optionalString (kernel != null) ''
     export INSTALL_MOD_PATH="$out"
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 652f203460bc..c8cde641723f 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,8 +1,8 @@
-{ lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests, tzdata, wire }:
+{ lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests, tzdata, wire, fetchpatch }:
 
 buildGoModule rec {
   pname = "grafana";
-  version = "8.5.1";
+  version = "8.5.2";
 
   excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" ];
 
@@ -10,14 +10,22 @@ buildGoModule rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "sha256-GwvJA+lcbUuVbzniDW6gYbxQO5uXSP6rjzgmcJ5YYxk=";
+    sha256 = "sha256-9m6fu+wwmKpw/ehAIfgLe5YzOqTP3BC6/9mUgLL9XS0=";
   };
 
   srcStatic = fetchurl {
     url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
-    sha256 = "030zl5k8b4hcay06a2lvlmq8swbix88ii4gz9yd4kywcjy5vhnyf";
+    sha256 = "1gq0wyqpgc7crbz8cd4dnwixhx7chnmbl2di4zcqs26g8y30q7rj";
   };
 
+  patches = [
+    # skip a flaky test, remove on the next update
+    (fetchpatch {
+      url = "https://github.com/grafana/grafana/commit/9e3a01a1bea3f4d5d99e53d55128d79160610349.patch";
+      sha256 = "sha256-rzZxNLn074JBb4DW3QC1zWNGe1uLGIlXvnjh60e8B3Q=";
+    })
+  ];
+
   vendorSha256 = "sha256-ZL+A6Sz0uHg7ZzYHmA4EU5ZxfRXBLyKglk135iQT600=";
 
   nativeBuildInputs = [ wire ];
diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix
index 6b0704b04a59..c2060560c594 100644
--- a/pkgs/servers/redpanda/default.nix
+++ b/pkgs/servers/redpanda/default.nix
@@ -4,13 +4,19 @@ let
   version = "21.11.15";
   platform = if stdenv.isLinux then "linux" else "darwin";
   arch = if stdenv.isAarch64 then "arm" else "amd";
+  sha256s = {
+    darwin.amd = "sha256-Yf4O7lVcf+nmb0wFTx7jLjUSmdAItoUfPlkhHveI9UY=";
+    darwin.arm = "sha256-vKfFBheDZtvcbg0zbj3rqUEQczZvySuGuM3RopnDJG8=";
+    linux.amd = "sha256:0vpxn7kcpqylk0nc74m6yxgwwf8ns8pyb6kxnmnmv2x58f8x4c8n";
+    linux.arm = "sha256-1AQSB2V5zGivU0UinTST2kOydQf/bmLbpjdW0Yo4ptE=";
+  };
 in stdenv.mkDerivation rec {
   pname = "redpanda";
   inherit version;
 
   src = fetchzip {
     url = "https://github.com/redpanda-data/redpanda/releases/download/v${version}/rpk-${platform}-${arch}64.zip";
-    sha256 = "sha256-Yf4O7lVcf+nmb0wFTx7jLjUSmdAItoUfPlkhHveI9UY=";
+    sha256 = sha256s.${platform}.${arch};
   };
 
   installPhase = ''
diff --git a/pkgs/tools/misc/lazydocker/default.nix b/pkgs/tools/misc/lazydocker/default.nix
index cfdce8e3c0bd..985cc4721381 100644
--- a/pkgs/tools/misc/lazydocker/default.nix
+++ b/pkgs/tools/misc/lazydocker/default.nix
@@ -1,19 +1,25 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "lazydocker";
-  version = "0.13";
+  version = "0.18.1";
 
   src = fetchFromGitHub {
     owner = "jesseduffield";
     repo = "lazydocker";
     rev = "v${version}";
-    sha256 = "sha256-thUm33AdP9Huc2vcTRatC1ULHZd0edEQggEGTqOV3a0=";
+    sha256 = "sha256-qtGPsfZVu5ZuCusO5nYgxR/qHiwyhzMmBMLMDpKzKDA=";
   };
 
-  goPackagePath = "github.com/jesseduffield/lazydocker";
+  vendorSha256 = null;
 
-  subPackages = [ "." ];
+  postPatch = ''
+    rm -f pkg/config/app_config_test.go
+  '';
+
+  excludedPackages = [ "scripts" "test/printrandom" ];
+
+  ldflags = [ "-s" "-w" "-X main.version=${version}" ];
 
   meta = with lib; {
     description = "A simple terminal UI for both docker and docker-compose";
diff --git a/pkgs/tools/system/gohai/default.nix b/pkgs/tools/system/gohai/default.nix
index a4b07f112ae3..40fc48b8ffa6 100644
--- a/pkgs/tools/system/gohai/default.nix
+++ b/pkgs/tools/system/gohai/default.nix
@@ -1,26 +1,28 @@
-{ lib, buildGoPackage, fetchgit }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "gohai";
-  version = "2018-05-23";
-  rev = "60e13eaed98afa238ad6dfc98224c04fbb7b19b1";
+  version = "unstable-2022-04-12";
 
-  goPackagePath = "github.com/DataDog/gohai";
-
-  src = fetchgit {
-    inherit rev;
-    url    = "https://github.com/DataDog/gohai";
-    sha256 = "15hdw195f6ayrmj1nbyfpfswdai1r1z3qjw927mbma7rwql24dkr";
+  src = fetchFromGitHub {
+    owner = "DataDog";
+    repo = "gohai";
+    rev = "c614f513e87f04d3d19b2d4ae853cc5703f3a9bc";
+    sha256 = "sha256-vdzGGTg9SHYS0OQUn3VvrQGpKxzqxBRXDKOm0c7FvYY=";
   };
 
-  goDeps = ./deps.nix;
+  vendorSha256 = "sha256-aN1fwGbBm45e6qdRu+4wnv2ZI7SOsIPONB4vF9o2vlI=";
+
+  ldflags = [ "-s" "-w" ];
+
+  doCheck = false;
 
   meta = with lib; {
-    description      = "System information collector";
-    homepage         = "https://github.com/DataDog/gohai";
-    license          = licenses.mit;
-    maintainers      = [ maintainers.tazjin ];
-    platforms        = platforms.unix;
+    description = "System information collector";
+    homepage = "https://github.com/DataDog/gohai";
+    license = licenses.mit;
+    maintainers = with maintainers; [ tazjin ];
+    platforms = platforms.unix;
 
     longDescription = ''
       Gohai is a tool which collects an inventory of system
diff --git a/pkgs/tools/system/gohai/deps.nix b/pkgs/tools/system/gohai/deps.nix
deleted file mode 100644
index f6d63e460246..000000000000
--- a/pkgs/tools/system/gohai/deps.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
-[
-  {
-    goPackagePath = "github.com/cihub/seelog";
-    fetch = {
-      type = "git";
-      url = "https://github.com/cihub/seelog";
-      rev = "f561c5e57575bb1e0a2167028b7339b3a8d16fb4";
-      sha256 = "0r3228hvgljgpaggj6b9mvxfsizfw25q2c1761wsvcif8gz49cvl";
-    };
-  }
-  {
-    goPackagePath = "github.com/shirou/gopsutil";
-    fetch = {
-      type = "git";
-      url = "https://github.com/shirou/gopsutil";
-      rev = "eeb1d38d69593f121e060d24d17f7b1f0936b203";
-      sha256 = "01qsznk599225gf4pld7p2m30p61y77mvzhrs6raxpk6wf7icp4w";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/sys";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/sys";
-      rev = "77b0e4315053a57ed2962443614bdb28db152054";
-      sha256 = "1024gcv1b40i2rgvpgyw2hgy1k5g7473pn29yavwysj37m1rrplp";
-    };
-  }
-]
diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/tools/virtualization/govc/default.nix
index 00330f7d1a43..32cfb4aa662d 100644
--- a/pkgs/tools/virtualization/govc/default.nix
+++ b/pkgs/tools/virtualization/govc/default.nix
@@ -1,10 +1,8 @@
-{ lib, fetchFromGitHub, buildGoPackage }:
+{ lib, fetchFromGitHub, buildGoModule }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "govc";
-  version = "0.25.0";
-
-  goPackagePath = "github.com/vmware/govmomi";
+  version = "0.28.0";
 
   subPackages = [ "govc" ];
 
@@ -12,9 +10,17 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "vmware";
     repo = "govmomi";
-    sha256 = "sha256-Ri8snbmgcAZmdumKzBl3P6gf/eZgwdgg7V+ijyeZjks=";
+    sha256 = "sha256-uK1JsBJC9O8dEJbAnyeMoolKZ2WhEPsDo/is/I+gfHg=";
   };
 
+  vendorSha256 = "sha256-jbGqQITAhyBLoDa3cKU5gK+4WGgoGSCyFtzeoXx8e7k=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/vmware/govmomi/govc/flags.BuildVersion=${version}"
+  ];
+
   meta = {
     description = "A vSphere CLI built on top of govmomi";
     homepage = "https://github.com/vmware/govmomi/tree/master/govc";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2d5c1d228f57..3c69baf380e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -750,7 +750,9 @@ with pkgs;
 
   installShellFiles = callPackage ../build-support/install-shell-files {};
 
-  lazydocker = callPackage ../tools/misc/lazydocker { };
+  lazydocker = callPackage ../tools/misc/lazydocker {
+    buildGoModule = buildGo118Module;
+  };
 
   ld-is-cc-hook = makeSetupHook { name = "ld-is-cc-hook"; }
     ../build-support/setup-hooks/ld-is-cc-hook.sh;