Merge master into staging-next

18 files changed, 389 insertions, 271 deletions

diff --git a/pkgs/applications/audio/tone/default.nix b/pkgs/applications/audio/tone/default.nix
index 4f02d4bd642f7..c235fff4b724d 100644
--- a/pkgs/applications/audio/tone/default.nix
+++ b/pkgs/applications/audio/tone/default.nix
@@ -7,13 +7,13 @@ let
 
 in buildDotnetModule rec {
   pname = "tone";
-  version = "0.1.3";
+  version = "0.1.5";
 
   src = fetchFromGitHub {
     owner = "sandreas";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-Z3cumXAIJhUB3/EbzB08MfBCrga1JHtDKr44TmRQuno=";
+    sha256 = "sha256-HhXyOPoDtraT7ef0kpE7SCQbvGFLrTddzS6Kdu0LxW4=";
   };
 
   projectFile = "tone/tone.csproj";
diff --git a/pkgs/applications/audio/tone/nuget-deps.nix b/pkgs/applications/audio/tone/nuget-deps.nix
index 3e9fa83c3540e..4b372fe51244e 100644
--- a/pkgs/applications/audio/tone/nuget-deps.nix
+++ b/pkgs/applications/audio/tone/nuget-deps.nix
@@ -28,7 +28,7 @@
   (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "7.0.0"; sha256 = "1liyprh0zha2vgmqh92n8kkjz61zwhr7g16f0gmr297z2rg1j5pj"; })
   (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; })
   (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "7.0.0"; sha256 = "1b4km9fszid9vp2zb3gya5ni9fn8bq62bzaas2ck2r7gs0sdys80"; })
-  (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.13"; sha256 = "0sjd1npl37mky8gqi4bir2fgp0bm6y3jy641asfxa0k0cidbfzwl"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.15"; sha256 = "0lcz7dniv3arkdzlmjgr9168rjb0an9xf3v3m3pdwjmy8yaipfba"; })
   (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; sha256 = "1p9splg1min274dpz7xdfgzrwkyfd3xlkygwpr1xgjvvyjvs6b0i"; })
   (fetchNuGet { pname = "Sandreas.AudioMetadata"; version = "0.1.1"; sha256 = "11ibv23h7qj5qshibmlsqmjca51dqbhib9p1gz66c5kqhk7ci38j"; })
   (fetchNuGet { pname = "Sandreas.Files"; version = "1.1.2"; sha256 = "08qk229q2y1dpdxdnp8xi9mgk8fgpjxrxm4z6ak8n09npp67nhn0"; })
@@ -51,5 +51,5 @@
   (fetchNuGet { pname = "TestableIO.System.IO.Abstractions"; version = "19.0.1"; sha256 = "01v2wgb6y2z7df4b2dsy0jb4hnhpv5kgyxypzyqdk7h6plad2axd"; })
   (fetchNuGet { pname = "TestableIO.System.IO.Abstractions.Wrappers"; version = "19.0.1"; sha256 = "1ms8wqar5w3z2y2qgxii9pqnsb4f1aikji2vaw01zxvnh2wry42n"; })
   (fetchNuGet { pname = "Ude.NetStandard"; version = "1.2.0"; sha256 = "074yff6g272zpkhk0zvmbfiaaxyp3b05fl24i7ffp2jf9r8bnfpl"; })
-  (fetchNuGet { pname = "z440.atl.core"; version = "4.18.0"; sha256 = "0wwqhpl3xw9vf6c5idz1kwpd72kbg7b9fcmj6gmccxa99kcgljzk"; })
+  (fetchNuGet { pname = "z440.atl.core"; version = "4.19.0"; sha256 = "16290hcf42yhs69ymjrg2znk7s56nnp4hj8rqwi1i8rdajmfr2v1"; })
 ]
diff --git a/pkgs/applications/backup/unifi-protect-backup/default.nix b/pkgs/applications/backup/unifi-protect-backup/default.nix
index 36f554761f08c..c0c39fc38543d 100644
--- a/pkgs/applications/backup/unifi-protect-backup/default.nix
+++ b/pkgs/applications/backup/unifi-protect-backup/default.nix
@@ -5,7 +5,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "unifi-protect-backup";
-  version = "0.8.8";
+  version = "0.9.0";
 
   format = "pyproject";
 
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "ep1cman";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-Z8qK7LprMyXl5irx9Xrs/RgqvNcFVBqLBSljovr6oiE=";
+    hash = "sha256-yPYzFZ4eI1wvBZgSP4Z90zyS+0vrDtf0uRz60byE5XA=";
   };
 
   pythonRelaxDeps = [
@@ -23,10 +23,6 @@ python3.pkgs.buildPythonApplication rec {
     "pyunifiprotect"
   ];
 
-  pythonRemoveDeps = [
-    "pylint"
-  ];
-
   nativeBuildInputs = with python3.pkgs; [
     poetry-core
     pythonRelaxDepsHook
@@ -36,7 +32,10 @@ python3.pkgs.buildPythonApplication rec {
     aiocron
     aiorun
     aiosqlite
+    apprise
     click
+    expiring-dict
+    python-dateutil
     pyunifiprotect
   ];
 
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 45a2fdd9baab8..35e13d23f20fe 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -29,12 +29,12 @@ final: prev:
 
   ChatGPT-nvim = buildVimPluginFrom2Nix {
     pname = "ChatGPT.nvim";
-    version = "2023-04-06";
+    version = "2023-04-11";
     src = fetchFromGitHub {
       owner = "jackMort";
       repo = "ChatGPT.nvim";
-      rev = "3ea19ba666e226ac33c8e00c7bf99e81931d7c86";
-      sha256 = "0jfa9z7iq32i8ydyxb2d6psmcgifhyhkigpa99n216j4m5m8azmy";
+      rev = "3ff8403136e3298f45ff9d11456f922da5b9fc50";
+      sha256 = "057y17xqs29w06rmiyjnacj3v4pix3a0a088khg3kxv6lnazsyd4";
     };
     meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/";
   };
@@ -667,12 +667,12 @@ final: prev:
 
   asyncomplete-vim = buildVimPluginFrom2Nix {
     pname = "asyncomplete.vim";
-    version = "2021-12-06";
+    version = "2023-04-11";
     src = fetchFromGitHub {
       owner = "prabirshrestha";
       repo = "asyncomplete.vim";
-      rev = "9c7651894c2c6d656c0dc71e87cfabbbb71b9c78";
-      sha256 = "1vjai1v9nnn7vbckclz85bhl6mx4d5d3155pg2vv1d2s4lzqplhv";
+      rev = "b3fbac1930be2c9cdf956f4a0346c1dd0e9abd44";
+      sha256 = "0jm2bqsqk0jjdm69lpxgnsms7c12pfkrn1lljpqqf2cx1xjql19r";
     };
     meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/";
   };
@@ -775,12 +775,12 @@ final: prev:
 
   auto-session = buildVimPluginFrom2Nix {
     pname = "auto-session";
-    version = "2023-03-10";
+    version = "2023-04-09";
     src = fetchFromGitHub {
       owner = "rmagatti";
       repo = "auto-session";
-      rev = "1d3dd70a2d48e0f3441128eb4fb0b437a0bf2cc4";
-      sha256 = "1wrb5bn4dg4ava7mknil5dhkr5nn0m60l78y5q6zqdlrxfsskzhy";
+      rev = "f391aba10ee61927a1cceb9ea3a9dde501e87e9e";
+      sha256 = "00bhp8bnlml5qm4yk49155l70lw7wlyy3ljnwqgrqxs1a40i04gy";
     };
     meta.homepage = "https://github.com/rmagatti/auto-session/";
   };
@@ -859,24 +859,24 @@ final: prev:
 
   barbar-nvim = buildVimPluginFrom2Nix {
     pname = "barbar.nvim";
-    version = "2023-04-09";
+    version = "2023-04-10";
     src = fetchFromGitHub {
       owner = "romgrk";
       repo = "barbar.nvim";
-      rev = "5c359a9915937ba798a38a56059685d53bc00ed5";
-      sha256 = "039q2i6imd5bwjgybpa18lmlwjslm4z9war04xsm4hc8pcallj4q";
+      rev = "0a21988ddfe4e63ef4d89332b2a6914dbdbf16ac";
+      sha256 = "1iy8pizpx1j6lqhnkfp3iijy9y6c2ja3dqvkmp68wryiffr1bvgh";
     };
     meta.homepage = "https://github.com/romgrk/barbar.nvim/";
   };
 
   barbecue-nvim = buildVimPluginFrom2Nix {
     pname = "barbecue.nvim";
-    version = "2023-04-08";
+    version = "2023-04-09";
     src = fetchFromGitHub {
       owner = "utilyre";
       repo = "barbecue.nvim";
-      rev = "5975a2da9240ad7642e4dc88f0647aca3c1bd5b8";
-      sha256 = "1r6zkprwvdh5phcnwf5b47wfi5gfg0w3y60pz8kakp7k7hh8yiz0";
+      rev = "0859f1264310e8b5f75e2da1d5254c586fc7e3c8";
+      sha256 = "0h391fy61il5xvdm48h73ddckf27x5x4vqr1x6fbv7zll9qi1q1l";
     };
     meta.homepage = "https://github.com/utilyre/barbecue.nvim/";
   };
@@ -1927,12 +1927,12 @@ final: prev:
 
   comment-nvim = buildVimPluginFrom2Nix {
     pname = "comment.nvim";
-    version = "2023-03-10";
+    version = "2023-04-11";
     src = fetchFromGitHub {
       owner = "numtostr";
       repo = "comment.nvim";
-      rev = "8d3aa5c22c2d45e788c7a5fe13ad77368b783c20";
-      sha256 = "0qxzy4dr9cr5q59yi7mw883id51zpb3mnrv6r0aqh9flswkljllr";
+      rev = "ab62084fa992ed7ee3c19bbb5227ce2c4234612b";
+      sha256 = "02hsh3addjmdinhh3irh0hsbyqvl4mhkd5msa6c4ddaxf6zbwclq";
     };
     meta.homepage = "https://github.com/numtostr/comment.nvim/";
   };
@@ -2083,12 +2083,12 @@ final: prev:
 
   conjure = buildVimPluginFrom2Nix {
     pname = "conjure";
-    version = "2023-03-26";
+    version = "2023-04-10";
     src = fetchFromGitHub {
       owner = "Olical";
       repo = "conjure";
-      rev = "51936288d182a677fcb808e660081ad7e9ecd4ec";
-      sha256 = "0j6amy2jc7jgxgsski4za5fhc4wgxh22lqz3k01ag40845gfndqb";
+      rev = "7625ed9afc689888a743492547b0f1ebbe367faf";
+      sha256 = "1d1cihbyaq00fvnia394xlw2g1byv5iwc2az1kmanc51kzwmcg52";
     };
     meta.homepage = "https://github.com/Olical/conjure/";
   };
@@ -2131,12 +2131,12 @@ final: prev:
 
   copilot-lua = buildVimPluginFrom2Nix {
     pname = "copilot.lua";
-    version = "2023-03-28";
+    version = "2023-04-11";
     src = fetchFromGitHub {
       owner = "zbirenbaum";
       repo = "copilot.lua";
-      rev = "f0b41fb89ef2ed7ab4e8cd5208a30755aa638fc4";
-      sha256 = "0x78a8s20pf93aip87j9dhrjpm4330faz3lqlwk6x6qi6dmvdvyy";
+      rev = "a4a37dda9e48986e5d2a90d6a3cbc88fca241dbb";
+      sha256 = "1f5jzjih3bq7nlhvlrw8ndzvknmaaih4z10m0hzsjd4gdqnpvldn";
     };
     meta.homepage = "https://github.com/zbirenbaum/copilot.lua/";
   };
@@ -2337,12 +2337,12 @@ final: prev:
     pname = "dashboard-nvim";
     version = "2023-04-07";
     src = fetchFromGitHub {
-      owner = "glepnir";
+      owner = "nvimdev";
       repo = "dashboard-nvim";
       rev = "6f65affd9904ed96a7c7a3edc55486f7f517931d";
       sha256 = "1jqxl2hsygmsq4bm3461qmancszh6ddr713g3zlzb1a17fyrivpk";
     };
-    meta.homepage = "https://github.com/glepnir/dashboard-nvim/";
+    meta.homepage = "https://github.com/nvimdev/dashboard-nvim/";
   };
 
   defx-git = buildVimPluginFrom2Nix {
@@ -2431,12 +2431,12 @@ final: prev:
 
   deol-nvim = buildVimPluginFrom2Nix {
     pname = "deol.nvim";
-    version = "2023-03-23";
+    version = "2023-04-11";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deol.nvim";
-      rev = "99644305ccaa49feacc1c44f6e579ba49da8d72f";
-      sha256 = "06473gh7jb9y2xyhsd4x75h0imkylxxcgbxjv4sigdbcg0gk6qm9";
+      rev = "1eea36d874485399fe1af9cd9b92f20c85d24a0f";
+      sha256 = "0c60yp58adnlz7qk5kzihwvs6lyw3b3kl0p3h88q1zx38pa0zyl7";
     };
     meta.homepage = "https://github.com/Shougo/deol.nvim/";
   };
@@ -2709,12 +2709,12 @@ final: prev:
 
   dial-nvim = buildVimPluginFrom2Nix {
     pname = "dial.nvim";
-    version = "2023-04-05";
+    version = "2023-04-10";
     src = fetchFromGitHub {
       owner = "monaqa";
       repo = "dial.nvim";
-      rev = "f4a5fe6424d3951607952d03c7d6595c7f721232";
-      sha256 = "04j3rsrfcl7vbnkdjnhmcznw57l0b4v7mjpx2hfpz5xg1ck7v5y6";
+      rev = "747d6fd009dbc1904627868125e16cfa7c524b0d";
+      sha256 = "19xn6bjhj6w1c8jaf65f0qrypmpx938dib8ig2md8xxz69hfyc44";
     };
     meta.homepage = "https://github.com/monaqa/dial.nvim/";
   };
@@ -2769,12 +2769,12 @@ final: prev:
 
   dracula-nvim = buildVimPluginFrom2Nix {
     pname = "dracula.nvim";
-    version = "2023-03-30";
+    version = "2023-04-11";
     src = fetchFromGitHub {
       owner = "Mofiqul";
       repo = "dracula.nvim";
-      rev = "8653e7699810b63bda8ef267055cb4d4237670ef";
-      sha256 = "17r785dbnn87qg35k3dbvlaszfb29nrv5l0703c1i69armdf1k3z";
+      rev = "ce99c0b68edca27caa1701c0e79cf461b484d501";
+      sha256 = "00rnxjz7cvlcbs1zld04fxnk8y5vjvikcz078bs7ap3l4pg1zy5p";
     };
     meta.homepage = "https://github.com/Mofiqul/dracula.nvim/";
   };
@@ -2805,12 +2805,12 @@ final: prev:
 
   edge = buildVimPluginFrom2Nix {
     pname = "edge";
-    version = "2023-04-05";
+    version = "2023-04-11";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "edge";
-      rev = "bdebafb8229403a1e138344802b6817b1cf660e8";
-      sha256 = "0lm032db2f4kppdlpbn2w8gshbfp42y52y76py42r4y0xvls413n";
+      rev = "cda4ae057cc6c0f6e15865772b64d2474f4dd5c2";
+      sha256 = "0skrfnq6ch41blb2v8pw7pi6mkjkv6kjgfi9nkx29zgfqs0lv12d";
     };
     meta.homepage = "https://github.com/sainnhe/edge/";
   };
@@ -2891,12 +2891,12 @@ final: prev:
 
   everforest = buildVimPluginFrom2Nix {
     pname = "everforest";
-    version = "2023-04-05";
+    version = "2023-04-11";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "everforest";
-      rev = "3e259a9a606778cd9181ecb65301ec92af8a1681";
-      sha256 = "0y49w7h0ng7xf5lgns218477xl71an9zllrkfnmjh105dapgbadk";
+      rev = "8ab6ce701e2d042eabded36f5d8cf7072b896b46";
+      sha256 = "0j6x3iiv9lkrm8prkax7pvk3kr71a7xwzfwcldl15y56jn01va57";
     };
     meta.homepage = "https://github.com/sainnhe/everforest/";
   };
@@ -3120,24 +3120,24 @@ final: prev:
 
   flutter-tools-nvim = buildVimPluginFrom2Nix {
     pname = "flutter-tools.nvim";
-    version = "2023-04-02";
+    version = "2023-04-11";
     src = fetchFromGitHub {
       owner = "akinsho";
       repo = "flutter-tools.nvim";
-      rev = "0a7e6b40aebd874e957ed630420a267e6cac0967";
-      sha256 = "0sdmdayidwcbj5lrnv7aqpz0q81s1scyaa39zdv0ywaajrhapm2l";
+      rev = "b64892ec95b4454f1080b62fef170338f92fc414";
+      sha256 = "194dmji38vdkykmr8a2mn4zjzq6k9g8bn1mdsnblapcbwk02b0za";
     };
     meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/";
   };
 
   formatter-nvim = buildVimPluginFrom2Nix {
     pname = "formatter.nvim";
-    version = "2023-02-26";
+    version = "2023-04-10";
     src = fetchFromGitHub {
       owner = "mhartington";
       repo = "formatter.nvim";
-      rev = "ed949c13e1a942db29ababa35e8c7864ced90eb6";
-      sha256 = "06cvpzfhbhsxvkwp05v776jj675g02w3zbc5n2gz0acy7rb37cqx";
+      rev = "b09b4573b0b6f4bc9e0ae599f7fab7dab34a6acf";
+      sha256 = "17igcjbj51568zz7lnhzfby9xx3i78yv6yw0gnpjng1w97i1n4j2";
     };
     meta.homepage = "https://github.com/mhartington/formatter.nvim/";
   };
@@ -3264,12 +3264,12 @@ final: prev:
 
   fzf-lua = buildVimPluginFrom2Nix {
     pname = "fzf-lua";
-    version = "2023-04-08";
+    version = "2023-04-11";
     src = fetchFromGitHub {
       owner = "ibhagwan";
       repo = "fzf-lua";
-      rev = "04d5a528a4159901607c11d46a398f45db2ed43f";
-      sha256 = "0livhcb4mq4smkq3sqpsm96zdj0d25yx36gb3fv7mvyqlmfs45h1";
+      rev = "061a4df40f5238782fdd7b380fe55650fadd9384";
+      sha256 = "0p928iyia6bpzrc4g6926xxagvfw30830air5lfbw492vp4rh2j5";
     };
     meta.homepage = "https://github.com/ibhagwan/fzf-lua/";
   };
@@ -3600,24 +3600,24 @@ final: prev:
 
   gruvbox-material = buildVimPluginFrom2Nix {
     pname = "gruvbox-material";
-    version = "2023-04-05";
+    version = "2023-04-11";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "gruvbox-material";
-      rev = "a6c5f652788b36c6ff2a0fdbefa271cb46f8f5e7";
-      sha256 = "0cmwrjwn3kvkhg7w8hls3sl5zzh5s9i62870ddrs59mmnxk83q08";
+      rev = "b12f46903867939b963c8c20abb27dd507d77054";
+      sha256 = "08plsqi71ijp746ni941l2w18n1r3bqiwyziffyfh7nrjwhk21w8";
     };
     meta.homepage = "https://github.com/sainnhe/gruvbox-material/";
   };
 
   gruvbox-nvim = buildVimPluginFrom2Nix {
     pname = "gruvbox.nvim";
-    version = "2023-04-08";
+    version = "2023-04-10";
     src = fetchFromGitHub {
       owner = "ellisonleao";
       repo = "gruvbox.nvim";
-      rev = "046bd22cc704fef4f19d6a9320fc27bf4527479f";
-      sha256 = "00snp6i8gqia9l1lv4j5qb85mvh1ckm4r6fkhm3im0g71pih2nj7";
+      rev = "de4e3380575acc1bc9a349d32f028301dea54dcd";
+      sha256 = "10r0vvici824894aj51979vyszwdzw2g2dyfzfr5d57365sc8bgb";
     };
     meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/";
   };
@@ -3683,12 +3683,12 @@ final: prev:
 
   haskell-tools-nvim = buildNeovimPluginFrom2Nix {
     pname = "haskell-tools.nvim";
-    version = "2023-04-06";
+    version = "2023-04-09";
     src = fetchFromGitHub {
       owner = "MrcJkb";
       repo = "haskell-tools.nvim";
-      rev = "fd369e6b501bd87712ff713e911273b95ddfb9cc";
-      sha256 = "12db9kyjyhpyc3cd5gifi3d425q5aplmzs3s74ahn19w4ni14vpk";
+      rev = "bf43d7ba6f27be7dcbdb8df8d79de07e3112a244";
+      sha256 = "0gnzsbbj16p7ckbc19wvdllx4z0bnqw6wlgkyk3wgxg2g1gn389n";
     };
     meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
   };
@@ -3731,12 +3731,12 @@ final: prev:
 
   heirline-nvim = buildVimPluginFrom2Nix {
     pname = "heirline.nvim";
-    version = "2023-04-08";
+    version = "2023-04-10";
     src = fetchFromGitHub {
       owner = "rebelot";
       repo = "heirline.nvim";
-      rev = "64d57ac5dcfd24a998ff38a76bf3204810273988";
-      sha256 = "1q1yv1i5ynfwrxkiinlrhgjd6cc6c7pzvcv7f5ziadk7fvikpdlf";
+      rev = "d860874eef6088109b5cb102871d76307280f052";
+      sha256 = "0gh4jc45zvgmgx3bg4iyqa4smjl2bqalkwylpq74izzn4bxjd4yz";
     };
     meta.homepage = "https://github.com/rebelot/heirline.nvim/";
   };
@@ -4102,12 +4102,12 @@ final: prev:
 
   jedi-vim = buildVimPluginFrom2Nix {
     pname = "jedi-vim";
-    version = "2022-12-28";
+    version = "2023-04-11";
     src = fetchFromGitHub {
       owner = "davidhalter";
       repo = "jedi-vim";
-      rev = "be483a2dcb63e992b02c5a0faff5d555720246fc";
-      sha256 = "0ir2n9prdi50lvxrc23ya6pzmdp6fw1rdlls41zh0qbah0681yc3";
+      rev = "42c2af1812bc12831a2904811835082904c3cc1e";
+      sha256 = "0f6889lzxfgpjzk78pzh6450r3aqgkc521mv4v1fq9li8hvdqlxx";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/davidhalter/jedi-vim/";
@@ -4175,12 +4175,12 @@ final: prev:
 
   kanagawa-nvim = buildVimPluginFrom2Nix {
     pname = "kanagawa.nvim";
-    version = "2023-04-08";
+    version = "2023-04-11";
     src = fetchFromGitHub {
       owner = "rebelot";
       repo = "kanagawa.nvim";
-      rev = "3c87bfacd5f51033bbeeb04f837c88f94861f6af";
-      sha256 = "0qs72s1m415fn37cjl6mbn07ivyk1x3q63clypb1rk7frswyz1bz";
+      rev = "22adef57f08a3cd07978b65966ce68da42501f68";
+      sha256 = "15v5p1kj97nhnibnki03a1y0lm2v6k5r2s0fwxz6ynij4sz6bshn";
     };
     meta.homepage = "https://github.com/rebelot/kanagawa.nvim/";
   };
@@ -4259,12 +4259,12 @@ final: prev:
 
   lazy-lsp-nvim = buildVimPluginFrom2Nix {
     pname = "lazy-lsp.nvim";
-    version = "2023-03-06";
+    version = "2023-04-11";
     src = fetchFromGitHub {
       owner = "dundalek";
       repo = "lazy-lsp.nvim";
-      rev = "f0d8f0ddf34bd7e1eb9d5ee6ed65a67138769d22";
-      sha256 = "0dpgfansqili9prnp1fdnhjg6gmq5snaalh6q18gsk6c9lrw0laf";
+      rev = "1e9aa30df98d5bef804e252b2afde2a4f5fc50e1";
+      sha256 = "19m1zfdqx4vym345fljqd59s1chdnhb6hyqz7hl4hjwz9wyd86b1";
     };
     meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/";
   };
@@ -4331,24 +4331,24 @@ final: prev:
 
   leap-nvim = buildVimPluginFrom2Nix {
     pname = "leap.nvim";
-    version = "2023-03-14";
+    version = "2023-04-09";
     src = fetchFromGitHub {
       owner = "ggandor";
       repo = "leap.nvim";
-      rev = "f74473d23ebf60957e0db3ff8172349a82e5a442";
-      sha256 = "1fjc3b4czlndd1nfn5n2zwlx51xhxcxiysjipfhnbbqhpy4sqfbg";
+      rev = "98a72ad93c629c49bd7127d342960cc1b159b620";
+      sha256 = "1zb0k6d57z8pp4nzmqvk041gqhpsswxz642jj8398hf44r05lcq8";
     };
     meta.homepage = "https://github.com/ggandor/leap.nvim/";
   };
 
   legendary-nvim = buildVimPluginFrom2Nix {
     pname = "legendary.nvim";
-    version = "2023-04-07";
+    version = "2023-04-10";
     src = fetchFromGitHub {
       owner = "mrjones2014";
       repo = "legendary.nvim";
-      rev = "b8cb553dff63a1ded1be1f258cf8e0e4c443e302";
-      sha256 = "1q7gg1v70qx2sd7vzixj0q8hl8d4aa9n81hhsnl72zld36qx7h4k";
+      rev = "69e7b9b56e6507760049c78a15116e1c0540423c";
+      sha256 = "0m5ngwaz9hw79gwv7mpbc3i63m3i18sykvmm67gr9182k505xqpc";
     };
     meta.homepage = "https://github.com/mrjones2014/legendary.nvim/";
   };
@@ -4643,12 +4643,12 @@ final: prev:
 
   lsp-overloads-nvim = buildVimPluginFrom2Nix {
     pname = "lsp-overloads.nvim";
-    version = "2023-02-26";
+    version = "2023-04-10";
     src = fetchFromGitHub {
       owner = "Issafalcon";
       repo = "lsp-overloads.nvim";
-      rev = "1423a6114f5540681a694330c22c36b0ca21f1d4";
-      sha256 = "1rwrhn32izidzzhs0vjanqr5id5b9jszk03xzxxmkmk4f34lhchb";
+      rev = "c63692f0b31ca0114bf2573d8d99fed5fd47dad9";
+      sha256 = "1yh1k1px4lxfqcdirpdwammc9rjf8bpk2qs6vvkiixx2wkh4xsdf";
     };
     meta.homepage = "https://github.com/Issafalcon/lsp-overloads.nvim/";
   };
@@ -4679,12 +4679,12 @@ final: prev:
 
   lsp-zero-nvim = buildVimPluginFrom2Nix {
     pname = "lsp-zero.nvim";
-    version = "2023-04-07";
+    version = "2023-04-10";
     src = fetchFromGitHub {
       owner = "VonHeikemen";
       repo = "lsp-zero.nvim";
-      rev = "2f242f4a910bcc5157ba3d9f1ff646d4e5a83a2f";
-      sha256 = "06q5ws45fj4rgbdybgqnia57rj50xlyr1yrzxgp9b16qby7a3bqz";
+      rev = "48d5f891b57291550a7e32792abae4d0774942e3";
+      sha256 = "16lw176flzpgdm209q5gxaqdhk4jqyk2jbkqk22s6y29g2lzv16w";
     };
     meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/";
   };
@@ -4760,6 +4760,18 @@ final: prev:
     meta.homepage = "https://github.com/kkharji/lspsaga.nvim/";
   };
 
+  ltex_extra-nvim = buildVimPluginFrom2Nix {
+    pname = "ltex_extra.nvim";
+    version = "2023-01-29";
+    src = fetchFromGitHub {
+      owner = "barreiroleo";
+      repo = "ltex_extra.nvim";
+      rev = "1d2f288ceedc70d5a9c00f55c0d0cc788b5164f2";
+      sha256 = "1vknp3y3s1pavk9f4n4kb6nnymvcs7pbrnb8ckw18jyk02mfnjfs";
+    };
+    meta.homepage = "https://github.com/barreiroleo/ltex_extra.nvim/";
+  };
+
   lualine-lsp-progress = buildVimPluginFrom2Nix {
     pname = "lualine-lsp-progress";
     version = "2021-10-23";
@@ -4786,12 +4798,12 @@ final: prev:
 
   luasnip = buildVimPluginFrom2Nix {
     pname = "luasnip";
-    version = "2023-04-09";
+    version = "2023-04-11";
     src = fetchFromGitHub {
       owner = "l3mon4d3";
       repo = "luasnip";
-      rev = "8fdb06d4601c019a9ee880473646364bdbed3206";
-      sha256 = "1avzmyvvfffy9fh3kw58ag63kvm3aj0zld1mi1z0m7ihyza5v5aq";
+      rev = "dc2e307287e9a9eabc18f0e3984c7e8cb164bb38";
+      sha256 = "10gyij1glisb1zqqdrb2wy772kz3nwf0mjn9npzzfcyrpvvwfra4";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/l3mon4d3/luasnip/";
@@ -4907,12 +4919,12 @@ final: prev:
 
   mason-nvim = buildVimPluginFrom2Nix {
     pname = "mason.nvim";
-    version = "2023-04-08";
+    version = "2023-04-11";
     src = fetchFromGitHub {
       owner = "williamboman";
       repo = "mason.nvim";
-      rev = "2311d9d883eb709ad9979a726a38c5ce1343b63c";
-      sha256 = "1w51kzsadw7wkddxs9alz0vy6y8c3bv1x77km6xk8jf068bi36l9";
+      rev = "3fb2be48864b7850a26c54c04cedb54e95dcdf3f";
+      sha256 = "11i931xsxbsw7arbglv8k4gl53klw2jv0r69a00m0fddyiz4avq8";
     };
     meta.homepage = "https://github.com/williamboman/mason.nvim/";
   };
@@ -4979,24 +4991,24 @@ final: prev:
 
   mini-nvim = buildVimPluginFrom2Nix {
     pname = "mini.nvim";
-    version = "2023-04-02";
+    version = "2023-04-10";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.nvim";
-      rev = "a7c375312edba618d7abc7c6129c53c512cca9d7";
-      sha256 = "188ycy7816jnw2srfydvmnwh0l2pxbj63mlyjlqw4j51a5r64snn";
+      rev = "d42d1e5b5394f1a34763dc630f70dffe2470ef84";
+      sha256 = "01hp2aqz0fj84s0b9kysy22mx8ms9v4pwng9b4xi5skbdli2vcsb";
     };
     meta.homepage = "https://github.com/echasnovski/mini.nvim/";
   };
 
   minimap-vim = buildVimPluginFrom2Nix {
     pname = "minimap.vim";
-    version = "2023-03-31";
+    version = "2023-04-11";
     src = fetchFromGitHub {
       owner = "wfxr";
       repo = "minimap.vim";
-      rev = "15dce1b667d4df0eec715798ab94c0850316e8a3";
-      sha256 = "17kxkky4g3fxgxs840flhyp9c2cxh8hzq2kzfdqaz7am6mas9cn6";
+      rev = "868a809302f9f5d4c408ef8aef7eb9bd5893f801";
+      sha256 = "1j7p33did6c0xnxq96541fw07fq25ss9784sf33ak6by8xhmpqdw";
     };
     meta.homepage = "https://github.com/wfxr/minimap.vim/";
   };
@@ -5459,12 +5471,12 @@ final: prev:
 
   neorg = buildVimPluginFrom2Nix {
     pname = "neorg";
-    version = "2023-04-01";
+    version = "2023-04-11";
     src = fetchFromGitHub {
       owner = "nvim-neorg";
       repo = "neorg";
-      rev = "d38a22940aaa55351cd4dc106540fa302fad4f0d";
-      sha256 = "1iykm9p4p8kji04zx69fv91rd1a2yzf712y413pzgz5saqaracs5";
+      rev = "32c03d5a320235469050757ec890d8eb11c3135c";
+      sha256 = "0fk3b6kpbjd59v3smbvmfn1lcx3aac30v25mc5ni4sq3328cwlvq";
     };
     meta.homepage = "https://github.com/nvim-neorg/neorg/";
   };
@@ -5519,12 +5531,12 @@ final: prev:
 
   neotest = buildVimPluginFrom2Nix {
     pname = "neotest";
-    version = "2023-04-02";
+    version = "2023-04-10";
     src = fetchFromGitHub {
       owner = "nvim-neotest";
       repo = "neotest";
-      rev = "734efe8a2682b6415712933efd19c484c2f8d942";
-      sha256 = "0jr1amq42kbvmq0wfdmdbajch9brfs29mp159vs31y14ddz40vqj";
+      rev = "28724010861dbf294f09b9ee1948d2da2823604b";
+      sha256 = "0n4g735i9kndnv5790bkggsl3dm0jckwxa0n83j4mikrrfg0zi66";
     };
     meta.homepage = "https://github.com/nvim-neotest/neotest/";
   };
@@ -5555,12 +5567,12 @@ final: prev:
 
   neotest-dotnet = buildVimPluginFrom2Nix {
     pname = "neotest-dotnet";
-    version = "2023-02-05";
+    version = "2023-04-10";
     src = fetchFromGitHub {
       owner = "Issafalcon";
       repo = "neotest-dotnet";
-      rev = "b7d3b848454180760a3ef8c98c6b0f01b7ad3466";
-      sha256 = "1r5advhhj64ck6brxngwq57b65h9q6fzf2yiffznz6xnyqgilimh";
+      rev = "cb0e6f580e4877034a76a02c3e8aed75dcbc8c48";
+      sha256 = "0x0msjris2mpfgadkrgk1gqb00cck26lqlazjqqdf1516lvyvlm2";
     };
     meta.homepage = "https://github.com/Issafalcon/neotest-dotnet/";
   };
@@ -5627,12 +5639,12 @@ final: prev:
 
   neotest-phpunit = buildVimPluginFrom2Nix {
     pname = "neotest-phpunit";
-    version = "2022-10-09";
+    version = "2023-04-10";
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "neotest-phpunit";
-      rev = "0e5c306434ebea413585c3d0d39c97f6a33ef977";
-      sha256 = "1kbydwj6af7s945chh6bmykza7vnzs94cw55gs19324a1yd9ky7j";
+      rev = "bf414a6dd2ddbe69f6c7b96e345cfe28afd577db";
+      sha256 = "0ss6qlh6cs1bidn7j2m7565pnx2sfclqik1x123dw6ibmasc9zrb";
     };
     meta.homepage = "https://github.com/olimorris/neotest-phpunit/";
   };
@@ -5663,12 +5675,12 @@ final: prev:
 
   neotest-rspec = buildVimPluginFrom2Nix {
     pname = "neotest-rspec";
-    version = "2023-04-05";
+    version = "2023-04-10";
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "neotest-rspec";
-      rev = "7243a4cdc27fa1a857653b862e10b7f93c28aebf";
-      sha256 = "0j6aahy5zk5g2afphikbzqnhpf8z5xz0k0g1x0cwwi22qziaq84f";
+      rev = "0843dbd82f953c2d7a4a50160c07c3cb6600879c";
+      sha256 = "1aky5dhhflilvsazzh6ix75fl3618zyss1dyy3dpws3mk16fn5cf";
     };
     meta.homepage = "https://github.com/olimorris/neotest-rspec/";
   };
@@ -5723,12 +5735,12 @@ final: prev:
 
   neovim-ayu = buildVimPluginFrom2Nix {
     pname = "neovim-ayu";
-    version = "2023-02-10";
+    version = "2023-04-11";
     src = fetchFromGitHub {
       owner = "Shatur";
       repo = "neovim-ayu";
-      rev = "0eb91afe11f1763a477655965684269a545012e1";
-      sha256 = "1nhayyl8lr22j0qrf64h1sjq9z650sxwgcqi8an1b6g6nhqwc329";
+      rev = "7ee99986e4a478ce0fa78c35e4afddd00476e551";
+      sha256 = "05mfrlj8cw32z0xnp3mhqz3li30rfg2zv2b1lp0akkl1csgbivf8";
     };
     meta.homepage = "https://github.com/Shatur/neovim-ayu/";
   };
@@ -5855,12 +5867,12 @@ final: prev:
 
   nightfox-nvim = buildVimPluginFrom2Nix {
     pname = "nightfox.nvim";
-    version = "2023-04-05";
+    version = "2023-04-11";
     src = fetchFromGitHub {
       owner = "EdenEast";
       repo = "nightfox.nvim";
-      rev = "b9a3385d4814d7c8aa6a9a68f42c6a8bc05282f4";
-      sha256 = "18659nz8l24ip16gw3zji0cmhjjzvnhhparbgajw5m6bdq9jahwh";
+      rev = "fbc610f3d3771e330b0dbefc8aab3112679554a6";
+      sha256 = "1a5mmjhiq3dpbillrmyh0f2j4p2cki6707j0qdbak1swrk30hwqp";
     };
     meta.homepage = "https://github.com/EdenEast/nightfox.nvim/";
   };
@@ -5891,12 +5903,12 @@ final: prev:
 
   nlsp-settings-nvim = buildVimPluginFrom2Nix {
     pname = "nlsp-settings.nvim";
-    version = "2023-04-09";
+    version = "2023-04-11";
     src = fetchFromGitHub {
       owner = "tamago324";
       repo = "nlsp-settings.nvim";
-      rev = "c4b2773bcb0939d3123ff8e8006611b190b98b51";
-      sha256 = "1vxrmwr1fd75wm97snk2ckflqsg5aixv2f1wa47jym4brnlcag4y";
+      rev = "fd5ca6e4c2b01f97309e6b515b9957e7454587e1";
+      sha256 = "047911rgg1a9vrg1f6yaifsc54wgg6xjpgv198iaz80dhn5mr913";
     };
     meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
   };
@@ -5987,24 +5999,24 @@ final: prev:
 
   nui-nvim = buildVimPluginFrom2Nix {
     pname = "nui.nvim";
-    version = "2023-04-02";
+    version = "2023-04-10";
     src = fetchFromGitHub {
       owner = "MunifTanjim";
       repo = "nui.nvim";
-      rev = "1f43b13d133eb4b4f53a4485379d9afa58808389";
-      sha256 = "03vvpqdg88vz3amq62bfdzslsykbm7nafvq6cf6ggazd01rc1zsj";
+      rev = "bf5900f1b60bf6499755ac92315181a24a87a577";
+      sha256 = "0rs8i095ppkllvk6hacgvwsbmmiwaj2m57xwg5jd7mxyvy40zr4j";
     };
     meta.homepage = "https://github.com/MunifTanjim/nui.nvim/";
   };
 
   null-ls-nvim = buildVimPluginFrom2Nix {
     pname = "null-ls.nvim";
-    version = "2023-04-05";
+    version = "2023-04-11";
     src = fetchFromGitHub {
       owner = "jose-elias-alvarez";
       repo = "null-ls.nvim";
-      rev = "5855128178fa78293acdfb5b4e41ef046779240b";
-      sha256 = "0v2dd4yyh9949ig7kj3ra65xxldzwdppkg6y48n3qbn6x8f1v9vn";
+      rev = "f8ffcd7cb8fb3325c711d459152ef132b5b65aed";
+      sha256 = "0cbc4ic7q6mlr7cg4km8z7zy0znjj7d1vshafi2xg219fq5sfy1g";
     };
     meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
   };
@@ -6491,12 +6503,12 @@ final: prev:
 
   nvim-lspconfig = buildVimPluginFrom2Nix {
     pname = "nvim-lspconfig";
-    version = "2023-04-09";
+    version = "2023-04-10";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "27e9e1d2638ffd133b06f314a49ac55825cb1017";
-      sha256 = "0fbq9gwrgr5gaz5k3aq5c7fw0gg5qkzw86qqff1ghz8b5jkjkkp5";
+      rev = "10fa01d553ce10646350461ac5ddc71f189e9d1a";
+      sha256 = "1v5zqf5z9fl23f62cgchsyhg54wpw364k6bpn9gi6py5mfpig49c";
     };
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
   };
@@ -6755,24 +6767,24 @@ final: prev:
 
   nvim-tree-lua = buildVimPluginFrom2Nix {
     pname = "nvim-tree.lua";
-    version = "2023-04-09";
+    version = "2023-04-11";
     src = fetchFromGitHub {
       owner = "nvim-tree";
       repo = "nvim-tree.lua";
-      rev = "086bf310bd19a7103ee7d761eb59f89f3dd23e21";
-      sha256 = "135d1dfgbfjh9sc5j2bgrkl6123pbn279fhs22p76i6jnn0fnyaz";
+      rev = "48d53a5934fbd51b655d03db7dad35551838f2c9";
+      sha256 = "0wxkbjbbx6j2fs3bxc69vdppp4n46s13ykilrq4sd4vkcj1msr5m";
     };
     meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
   };
 
   nvim-treesitter = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter";
-    version = "2023-04-08";
+    version = "2023-04-11";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "a57d2a599b57a619f58a5c91c89d9bf12f8977b2";
-      sha256 = "16bqwc60k9s38zrqrhwci4jwkq2c97k6irgb0i9mqgqddm9f7dn4";
+      rev = "ac4020c70722337c326bf65b645b162ee6e1796b";
+      sha256 = "0i993nj2yazzq5maiyqn0x1n0iilx6jz1a5wi079f0whhz5jaggi";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
   };
@@ -6803,12 +6815,12 @@ final: prev:
 
   nvim-treesitter-pyfold = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter-pyfold";
-    version = "2023-03-15";
+    version = "2023-04-11";
     src = fetchFromGitHub {
       owner = "eddiebergman";
       repo = "nvim-treesitter-pyfold";
-      rev = "77ee666a066bf1b77d2c727da85bd7868e6775e7";
-      sha256 = "19bci2kd0k0dcj9vvflf029zhgz4ib95xxacc9hhsfgv6ap4bf5a";
+      rev = "f0d31fc70e8f8fed43ef745814317eab653454de";
+      sha256 = "0jzk6xax1fb6vzbdd2p7f06r1s4mbw1srlykvfi7031y7b6n4ccj";
     };
     meta.homepage = "https://github.com/eddiebergman/nvim-treesitter-pyfold/";
   };
@@ -6827,24 +6839,24 @@ final: prev:
 
   nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter-textobjects";
-    version = "2023-03-27";
+    version = "2023-04-10";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter-textobjects";
-      rev = "b55fe6175f0001347a433c9df358c8cbf8a4e90f";
-      sha256 = "1kip55hxkg6lgbqj37hx5fsph5j4c69r7n6c7ypqynhn7qg6flqx";
+      rev = "8673926519ea61069f9c1366d1ad1949316d250e";
+      sha256 = "0qgx7f1jkd62dxw8a0f4h01dbixzqmj18nmyh50baang671xzlzl";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
   };
 
   nvim-ts-autotag = buildVimPluginFrom2Nix {
     pname = "nvim-ts-autotag";
-    version = "2023-04-08";
+    version = "2023-04-10";
     src = fetchFromGitHub {
       owner = "windwp";
       repo = "nvim-ts-autotag";
-      rev = "7a1c677985b8fc4cdfdb87dd55fbc16dadd86bbe";
-      sha256 = "0yqxg4hmdjs2bn7hg5al012kf8ykhrjsg1ca22vnnaqz4j98il0k";
+      rev = "b525525b6aba20763e19011a73454845170850d7";
+      sha256 = "0j8vgqq3408y1b6vsv5rppp5aqly1cf8yn37chh526r42aikzbkd";
     };
     meta.homepage = "https://github.com/windwp/nvim-ts-autotag/";
   };
@@ -6898,12 +6910,12 @@ final: prev:
 
   nvim-web-devicons = buildVimPluginFrom2Nix {
     pname = "nvim-web-devicons";
-    version = "2023-04-08";
+    version = "2023-04-11";
     src = fetchFromGitHub {
       owner = "nvim-tree";
       repo = "nvim-web-devicons";
-      rev = "f16ec8f6e5d23e4349501dae46e0a661918e086e";
-      sha256 = "08c76ps667wkyh8lzkjszpfhjr22cdxz7p30bkps42i71vq12d4n";
+      rev = "defb7da4d3d313bf31982c52fd78e414f02840c9";
+      sha256 = "1qwcr82yd2jdfds6r6s0pfkixpk0dydnl1l9vqg092l6vkx6v30v";
     };
     meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/";
   };
@@ -6994,12 +7006,12 @@ final: prev:
 
   oil-nvim = buildVimPluginFrom2Nix {
     pname = "oil.nvim";
-    version = "2023-04-07";
+    version = "2023-04-11";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "oil.nvim";
-      rev = "5edf9784a5ab536dcdcdae5cc8d75a307863d529";
-      sha256 = "1y41z4n4k20zqqgvjxjz9zrxh3if8snm2pxys7ma0rd0vfylgiwm";
+      rev = "fb8b101d7cb4727d8719ab6ed141330eca997d3f";
+      sha256 = "1vhrmiws4k65v5mzvxy2f93f5y8dxcpchsxwrqfmp9imzkcm081z";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/oil.nvim/";
@@ -7307,12 +7319,12 @@ final: prev:
 
   plenary-nvim = buildNeovimPluginFrom2Nix {
     pname = "plenary.nvim";
-    version = "2023-02-19";
+    version = "2023-04-10";
     src = fetchFromGitHub {
       owner = "nvim-lua";
       repo = "plenary.nvim";
-      rev = "253d34830709d690f013daf2853a9d21ad7accab";
-      sha256 = "17vvl06jc5vrfrv7gljflkqykshhg84wnhbl9br4pm050ywlg4ng";
+      rev = "9ac3e9541bbabd9d73663d757e4fe48a675bb054";
+      sha256 = "0d3h8kjid7mkqzdhakbf9wiyj1vxrcw4n8dp678bxm0452n82vxl";
     };
     meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
   };
@@ -7958,12 +7970,12 @@ final: prev:
 
   smart-splits-nvim = buildVimPluginFrom2Nix {
     pname = "smart-splits.nvim";
-    version = "2023-04-08";
+    version = "2023-04-11";
     src = fetchFromGitHub {
       owner = "mrjones2014";
       repo = "smart-splits.nvim";
-      rev = "68a7fedd4032d230fea11dfe4f2e7409b3a01345";
-      sha256 = "063sk1x4vzkxdyxbrqq42ip2kjdzc5ydgkqkgmnhm9dhl92zbnb6";
+      rev = "a2d3c590c250298f34674c19a87aa9e4c01af788";
+      sha256 = "18028fx4f88v34227mdzqj77x9k6zja69dj0shsl14pyagxallng";
     };
     meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/";
   };
@@ -8030,12 +8042,12 @@ final: prev:
 
   sonokai = buildVimPluginFrom2Nix {
     pname = "sonokai";
-    version = "2023-04-05";
+    version = "2023-04-11";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "sonokai";
-      rev = "a4d96b68fb1ba00fb2e91d2f46705de9cddbb348";
-      sha256 = "0qn5mryiay1ka0inhqivnq8fkn9cyz5gdyv3pfpkjb7s19kmkf36";
+      rev = "5eeceab6e905c1b93ba3a49dfbaa1200071990f9";
+      sha256 = "0d32v5qr5irbaznq1r654b8ffqyryqxs0cxmav65hp09y3m27lmx";
     };
     meta.homepage = "https://github.com/sainnhe/sonokai/";
   };
@@ -8380,12 +8392,12 @@ final: prev:
 
   tabby-nvim = buildVimPluginFrom2Nix {
     pname = "tabby.nvim";
-    version = "2023-01-30";
+    version = "2023-04-10";
     src = fetchFromGitHub {
       owner = "nanozuki";
       repo = "tabby.nvim";
-      rev = "9065c65138b59ea8182024216a5bbcf0d77baebb";
-      sha256 = "0jfgg02l2872ickl3bwsm6xyh5nl5sqgn3yfk9kn45aba3kd7nvm";
+      rev = "ca5109cc26aa45ddd3270010d41bcd68fb59c773";
+      sha256 = "0imp646bdx97gs1dw0izfq544c53qkdy7s4jaa7zlwdsszfq0rnb";
     };
     meta.homepage = "https://github.com/nanozuki/tabby.nvim/";
   };
@@ -8597,12 +8609,12 @@ final: prev:
 
   telescope-frecency-nvim = buildVimPluginFrom2Nix {
     pname = "telescope-frecency.nvim";
-    version = "2023-02-15";
+    version = "2023-04-11";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope-frecency.nvim";
-      rev = "e5696afabd8753d772987ea48434d9c0d8b0aa6b";
-      sha256 = "1zcw5lm97kil8jk722xfcnxy9vqlffbrsfhk2f53hwxnabbkl3qq";
+      rev = "0a4a521471141ae3c94ff0ebcffcaff3c3aad147";
+      sha256 = "14n6fvkaa5f4k989a51ib3r7czy1q6ggym17g7rrd2vx4bk0n1vd";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/";
   };
@@ -8815,12 +8827,12 @@ final: prev:
 
   telescope-nvim = buildNeovimPluginFrom2Nix {
     pname = "telescope.nvim";
-    version = "2023-04-09";
+    version = "2023-04-10";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope.nvim";
-      rev = "2ea61f1952f0ad10e4fcc282468a06d3e69674c2";
-      sha256 = "0f4agdsy3fl53glm8fv9nqliijd16a5imlan3i8v6pk09339k61a";
+      rev = "6258d50b09f9ae087317e392efe7c05a7323492d";
+      sha256 = "0p4wz6gvs7952gbzlaz8sdjb92s1nwwry8mkxywi37pn8z6rvj2h";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
   };
@@ -9005,6 +9017,18 @@ final: prev:
     meta.homepage = "https://github.com/wellle/tmux-complete.vim/";
   };
 
+  tmux-nvim = buildVimPluginFrom2Nix {
+    pname = "tmux.nvim";
+    version = "2023-03-11";
+    src = fetchFromGitHub {
+      owner = "aserowy";
+      repo = "tmux.nvim";
+      rev = "9ba03cc5dfb30f1dc9eb50d0796dfdd52c5f454e";
+      sha256 = "0xkdihg0f9b0wc37zml7n3wsmy8ppy08zynv8f2j90xwlwad06b4";
+    };
+    meta.homepage = "https://github.com/aserowy/tmux.nvim/";
+  };
+
   tmuxline-vim = buildVimPluginFrom2Nix {
     pname = "tmuxline.vim";
     version = "2021-07-20";
@@ -9056,12 +9080,12 @@ final: prev:
 
   toggleterm-nvim = buildVimPluginFrom2Nix {
     pname = "toggleterm.nvim";
-    version = "2023-03-31";
+    version = "2023-04-09";
     src = fetchFromGitHub {
       owner = "akinsho";
       repo = "toggleterm.nvim";
-      rev = "b86982429325112d2b20c6d0cc7a5c4b182ab705";
-      sha256 = "1md3j9865lq4xc3ai0k8h8jdwpmqk82d7j33zrqlpak83ys8mbgk";
+      rev = "2e477f7ee8ee8229ff3158e3018a067797b9cd38";
+      sha256 = "1d7qqgviimgmzz1g7ykv688pyhr0m9kv6h9lrczxmdq7xwymmbbq";
     };
     meta.homepage = "https://github.com/akinsho/toggleterm.nvim/";
   };
@@ -9248,12 +9272,12 @@ final: prev:
 
   unison = buildVimPluginFrom2Nix {
     pname = "unison";
-    version = "2023-04-06";
+    version = "2023-04-11";
     src = fetchFromGitHub {
       owner = "unisonweb";
       repo = "unison";
-      rev = "3525b4d70508b7587b3ea3b4df5f1ffae18928b8";
-      sha256 = "05bkv361layal7bbj76h8zkzbf5ar41nzvzb3xmw3gsmm0h6nngn";
+      rev = "b9c391ea148795d50071565d8abea635f59dc68f";
+      sha256 = "0xh52mc6kp58w2frjmncc0p132y3287hc92dxih62maaagaham9l";
     };
     meta.homepage = "https://github.com/unisonweb/unison/";
   };
@@ -9272,12 +9296,12 @@ final: prev:
 
   urlview-nvim = buildVimPluginFrom2Nix {
     pname = "urlview.nvim";
-    version = "2023-03-19";
+    version = "2023-04-10";
     src = fetchFromGitHub {
       owner = "axieax";
       repo = "urlview.nvim";
-      rev = "e92d99f062685f9d3ab84238e1cdde6399dc64ce";
-      sha256 = "0ahs5sgs95wkpr11s93r08w0xagiqrfw5zrgqyhhjqg2dfpqzxp9";
+      rev = "cef8de1ea2f2faf3964f2d017cd88a35e93c9fe3";
+      sha256 = "0x4l1lypyrcj2w5nx6khjpw7myp225gd0y9wfb2x98d1ymln5j83";
     };
     meta.homepage = "https://github.com/axieax/urlview.nvim/";
   };
@@ -9428,12 +9452,12 @@ final: prev:
 
   vim-abolish = buildVimPluginFrom2Nix {
     pname = "vim-abolish";
-    version = "2023-04-08";
+    version = "2023-04-10";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-abolish";
-      rev = "e5f0c592bc54bb8e3d6acc964a9db9f4037cbbf9";
-      sha256 = "1h3k14nkgp0jjvhwfi9pvx7kkfc74whwisja14mykpbwzcdwhdiq";
+      rev = "cb3dcb220262777082f63972298d57ef9e9455ec";
+      sha256 = "0xriiima13cv84jlv37qd6ab4l6fjapqd8a8xsr5c87k0kkyyg13";
     };
     meta.homepage = "https://github.com/tpope/vim-abolish/";
   };
@@ -11746,12 +11770,12 @@ final: prev:
 
   vim-lsp = buildVimPluginFrom2Nix {
     pname = "vim-lsp";
-    version = "2023-04-06";
+    version = "2023-04-10";
     src = fetchFromGitHub {
       owner = "prabirshrestha";
       repo = "vim-lsp";
-      rev = "6703edafe62dcb94b2757828b9b7435227c3e3ff";
-      sha256 = "03srmixrpvyia3386n2kwkg9byrzh6lcdb4dd9j21ah212ll6nfy";
+      rev = "06bf1b35ef4717a10a00ec4f8387ebf3ec983194";
+      sha256 = "1wmxjlhhb3za2giza5hphr4sp4x763czajviv6vndfpibi4cgy5s";
     };
     meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
   };
@@ -11855,12 +11879,12 @@ final: prev:
 
   vim-matchup = buildVimPluginFrom2Nix {
     pname = "vim-matchup";
-    version = "2023-03-25";
+    version = "2023-04-10";
     src = fetchFromGitHub {
       owner = "andymass";
       repo = "vim-matchup";
-      rev = "156367e4cbd123bc9a70eeabeaa16f7cf9239e12";
-      sha256 = "19jh4s9fv40q9vy1lykh0zv5qv225zs48wgskd7b0xq0gh2c9vcz";
+      rev = "03ebc3b7dbf8f17f2d45d9b5619b48a030e1bf88";
+      sha256 = "18bgw4gv9xd8msh7ly4lz8x631a3bprn5lcdl114g3h6ybs8ldix";
     };
     meta.homepage = "https://github.com/andymass/vim-matchup/";
   };
@@ -13368,12 +13392,12 @@ final: prev:
 
   vim-test = buildVimPluginFrom2Nix {
     pname = "vim-test";
-    version = "2023-03-28";
+    version = "2023-04-11";
     src = fetchFromGitHub {
       owner = "vim-test";
       repo = "vim-test";
-      rev = "739024ba3264cf153d54ab8da5cdaaa978f7628c";
-      sha256 = "1549qrgpyi87rmm14n182zns8kgvfk2yg5cl8sz7vvnzyh3s2gvz";
+      rev = "8183037eccad54deb2100a9665157e4405fa4702";
+      sha256 = "10mj43mm366h91nfp4cnkw61kvdx0pm0kzac0yc41bar91mmpbg6";
     };
     meta.homepage = "https://github.com/vim-test/vim-test/";
   };
@@ -14219,6 +14243,18 @@ final: prev:
     meta.homepage = "https://github.com/folke/which-key.nvim/";
   };
 
+  whitespace-nvim = buildVimPluginFrom2Nix {
+    pname = "whitespace.nvim";
+    version = "2023-02-13";
+    src = fetchFromGitHub {
+      owner = "johnfrankmorgan";
+      repo = "whitespace.nvim";
+      rev = "525f67b3f01910c73f07f0848839aab0b7ab9f42";
+      sha256 = "0kv2b099jc9592g0b381rdgzv5wvryy3v95bfk1sdjr9bmzdyjn9";
+    };
+    meta.homepage = "https://github.com/johnfrankmorgan/whitespace.nvim/";
+  };
+
   wilder-nvim = buildVimPluginFrom2Nix {
     pname = "wilder.nvim";
     version = "2022-08-13";
@@ -14486,12 +14522,12 @@ final: prev:
 
   catppuccin-nvim = buildVimPluginFrom2Nix {
     pname = "catppuccin-nvim";
-    version = "2023-03-27";
+    version = "2023-04-11";
     src = fetchFromGitHub {
       owner = "catppuccin";
       repo = "nvim";
-      rev = "73587f9c454da81679202f1668c30fea6cdafd5e";
-      sha256 = "0775rqp1367rivqxilpqmrjh5k900j3idid2lg7h5h2q4h8yicaj";
+      rev = "f078aa49bef4cb9e7b86f07b607c6e98c95b9fb5";
+      sha256 = "0w87h5vdrwn3ch8fyyfxkpz16r150910wmbb5y6wr4ad3scndjsk";
     };
     meta.homepage = "https://github.com/catppuccin/nvim/";
   };
@@ -14558,14 +14594,14 @@ final: prev:
 
   lspsaga-nvim-original = buildVimPluginFrom2Nix {
     pname = "lspsaga-nvim-original";
-    version = "2023-04-09";
+    version = "2023-04-11";
     src = fetchFromGitHub {
-      owner = "glepnir";
+      owner = "nvimdev";
       repo = "lspsaga.nvim";
-      rev = "1fbb3e4721354d0d0a20a28bb77b3f83fe68538b";
-      sha256 = "07h7rdqxbz4vy3hqyl15am2bkv89h8afysby2jlqdcfn0y5wa5h1";
+      rev = "1ead4ce8a20a8ac7e96aca038d54ceaa185be4e0";
+      sha256 = "14k02srgqdzglzbn6yvr12qgpkmngaamlpb97p4h27d6di9zpkkm";
     };
-    meta.homepage = "https://github.com/glepnir/lspsaga.nvim/";
+    meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/";
   };
 
   mattn-calendar-vim = buildVimPluginFrom2Nix {
@@ -14582,12 +14618,12 @@ final: prev:
 
   nord-vim = buildVimPluginFrom2Nix {
     pname = "nord-vim";
-    version = "2023-03-07";
+    version = "2023-04-10";
     src = fetchFromGitHub {
       owner = "nordtheme";
       repo = "vim";
-      rev = "684c345b8a8bf5e37919c38be6edaaa9356dbf4b";
-      sha256 = "1c6mbi0j5r1s0765jj513h5yxzp59n1brar2jsa398ig3508cv9b";
+      rev = "f725ac643afce04021c9abcbb57711fcb9fa71e9";
+      sha256 = "0pbgcpqfzwari78v5yypidcy5rlxdsklg77fkjgzxgkjikmbil8s";
     };
     meta.homepage = "https://github.com/nordtheme/vim/";
   };
diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
index a537b02893069..257f01b1aec01 100644
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@@ -303,12 +303,12 @@
   };
   devicetree = buildGrammar {
     language = "devicetree";
-    version = "0.0.0+rev=ea30a05";
+    version = "0.0.0+rev=6428cee";
     src = fetchFromGitHub {
       owner = "joelspadin";
       repo = "tree-sitter-devicetree";
-      rev = "ea30a05d0f0446a96d8b096ad11828ad4f8ad849";
-      hash = "sha256-ZiUMIsjVMxpchxmJQ3g2yXIn+/kAWPwTzMzx3IlW93o=";
+      rev = "6428cee0e9d76fac3291796ced56ac14ecd036ee";
+      hash = "sha256-QU5lCnTe00Mj5IfrBBnGwvU5S3Gz9VL2FRTNy0FPnIo=";
     };
     meta.homepage = "https://github.com/joelspadin/tree-sitter-devicetree";
   };
@@ -733,12 +733,12 @@
   };
   hcl = buildGrammar {
     language = "hcl";
-    version = "0.0.0+rev=0ff887f";
+    version = "0.0.0+rev=becebeb";
     src = fetchFromGitHub {
       owner = "MichaHoffmann";
       repo = "tree-sitter-hcl";
-      rev = "0ff887f2a60a147452d52db060de6b42f42f1441";
-      hash = "sha256-L4B2qtGqrtyLHyUMx1p0t4aKncm72dUE+e19Fv5iqUA=";
+      rev = "becebebd3509c02e871c99be55556269be1def1b";
+      hash = "sha256-GR2a+VuhZVMGmLW9Mg7bSALNsy0SyfG+YVaRz1qY6a0=";
     };
     meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl";
   };
@@ -1743,12 +1743,12 @@
   };
   terraform = buildGrammar {
     language = "terraform";
-    version = "0.0.0+rev=0ff887f";
+    version = "0.0.0+rev=becebeb";
     src = fetchFromGitHub {
       owner = "MichaHoffmann";
       repo = "tree-sitter-hcl";
-      rev = "0ff887f2a60a147452d52db060de6b42f42f1441";
-      hash = "sha256-L4B2qtGqrtyLHyUMx1p0t4aKncm72dUE+e19Fv5iqUA=";
+      rev = "becebebd3509c02e871c99be55556269be1def1b";
+      hash = "sha256-GR2a+VuhZVMGmLW9Mg7bSALNsy0SyfG+YVaRz1qY6a0=";
     };
     location = "dialects/terraform";
     meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl";
@@ -1923,12 +1923,12 @@
   };
   vim = buildGrammar {
     language = "vim";
-    version = "0.0.0+rev=2886b52";
+    version = "0.0.0+rev=cd63bd2";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "tree-sitter-vim";
-      rev = "2886b52143d570d81f97c98be7a1e204ce9d3bcd";
-      hash = "sha256-w8yHo5rtqqD80gbSChaHhSzt3ljPBKWYZ+pxaWFM35s=";
+      rev = "cd63bd20644a419d209b625d21258617580273d2";
+      hash = "sha256-9u9sMBFIrLviF60WTOoiA7bpJfqsD5iWE5OSRdrOz0E=";
     };
     meta.homepage = "https://github.com/neovim/tree-sitter-vim";
   };
@@ -2011,12 +2011,12 @@
   };
   zig = buildGrammar {
     language = "zig";
-    version = "0.0.0+rev=f3bc9ff";
+    version = "0.0.0+rev=2c7b630";
     src = fetchFromGitHub {
       owner = "maxxnino";
       repo = "tree-sitter-zig";
-      rev = "f3bc9ffe9ca10f52dee01999b5b6ce9a4074b0ac";
-      hash = "sha256-/Bk7UGdPOHmGc01eCNPHsXFMF4pAxE/gkhVxvRItZZ8=";
+      rev = "2c7b6308d906d7aec4b3e1fafaaeca447a8a2c2f";
+      hash = "sha256-uN/B4YasWdgAWV8IAwKd4MP/L73+RiQJGQD00ZA8d6E=";
     };
     meta.homepage = "https://github.com/maxxnino/tree-sitter-zig";
   };
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index d75e6eaaa4212..82d5760973fd9 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -399,6 +399,7 @@ https://github.com/lspcontainers/lspcontainers.nvim/,,
 https://github.com/onsails/lspkind-nvim/,,
 https://github.com/tami5/lspsaga.nvim/,,
 https://github.com/glepnir/lspsaga.nvim/,main,lspsaga-nvim-original
+https://github.com/barreiroleo/ltex_extra.nvim/,HEAD,
 https://github.com/arkav/lualine-lsp-progress/,,
 https://github.com/nvim-lualine/lualine.nvim/,,
 https://github.com/l3mon4d3/luasnip/,,
@@ -755,6 +756,7 @@ https://github.com/vim-scripts/timestamp.vim/,,
 https://github.com/levouh/tint.nvim/,HEAD,
 https://github.com/tomtom/tlib_vim/,,
 https://github.com/wellle/tmux-complete.vim/,,
+https://github.com/aserowy/tmux.nvim/,HEAD,
 https://github.com/edkolev/tmuxline.vim/,,
 https://github.com/folke/todo-comments.nvim/,,
 https://github.com/AmeerTaweel/todo.nvim/,,
@@ -1194,6 +1196,7 @@ https://github.com/liuchengxu/vista.vim/,,
 https://github.com/dylanaraps/wal.vim/,,
 https://github.com/mattn/webapi-vim/,,
 https://github.com/folke/which-key.nvim/,,
+https://github.com/johnfrankmorgan/whitespace.nvim/,HEAD,
 https://github.com/gelguy/wilder.nvim/,,
 https://github.com/gcmt/wildfire.vim/,,
 https://github.com/fgheng/winbar.nvim/,main,
diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix
index 5e3ffca891003..df6490ebb264f 100644
--- a/pkgs/applications/misc/logseq/default.nix
+++ b/pkgs/applications/misc/logseq/default.nix
@@ -55,7 +55,8 @@ stdenv.mkDerivation rec {
     # set the env "LOCAL_GIT_DIRECTORY" for dugite so that we can use the git in nixpkgs
     makeWrapper ${electron}/bin/electron $out/bin/${pname} \
       --set "LOCAL_GIT_DIRECTORY" ${git} \
-      --add-flags $out/share/${pname}/resources/app
+      --add-flags $out/share/${pname}/resources/app \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
   '';
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index d9fcbc26380ee..c29df0221b6d7 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -7,7 +7,7 @@ let
 
   # Please keep the version x.y.0.z and do not update to x.y.76.z because the
   # source of the latter disappears much faster.
-  version = "8.87.0.406";
+  version = "8.96.0.207";
 
   rpath = lib.makeLibraryPath [
     alsa-lib
@@ -68,7 +68,7 @@ let
           "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
           "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
         ];
-        sha256 = "sha256-lWnQIdMmfz90h3tOWkQv0vo3HnRi3z6W27vK28+Ksjo=";
+        sha256 = "sha256-tkOPYFkmc4nzO8Rgat9/VNuzzIW10qSEzbXhjkZV83k=";
       }
     else
       throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";
diff --git a/pkgs/applications/office/timeline/default.nix b/pkgs/applications/office/timeline/default.nix
index f3f404cda89f2..70776bb391bfc 100644
--- a/pkgs/applications/office/timeline/default.nix
+++ b/pkgs/applications/office/timeline/default.nix
@@ -4,6 +4,7 @@
 , gettext
 , makeDesktopItem
 , copyDesktopItems
+, wrapGAppsHook
 }:
 
 python3.pkgs.buildPythonApplication rec {
@@ -16,7 +17,7 @@ python3.pkgs.buildPythonApplication rec {
     sha256 = "sha256-qwH2mt3Va62QJKJGOpt5WV3QksqQaRGEif4CcPC5F2E=";
   };
 
-  nativeBuildInputs = [ python3.pkgs.wrapPython copyDesktopItems ];
+  nativeBuildInputs = [ python3.pkgs.wrapPython copyDesktopItems wrapGAppsHook ];
 
   pythonPath = with python3.pkgs; [
     wxPython_4_2
@@ -76,6 +77,12 @@ python3.pkgs.buildPythonApplication rec {
     runHook postCheck
   '';
 
+  dontWrapGApps = true;
+
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
   meta = with lib; {
     homepage = "https://thetimelineproj.sourceforge.net/";
     changelog = "https://thetimelineproj.sourceforge.net/changelog.html";
diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index 172975314a57a..675e1ab619833 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,14 +1,14 @@
 {
-  "version": "15.10.1",
-  "repo_hash": "sha256-BETTehy2GxZDGWLgdao1I0cqm4cNaL9lhXe+JmCNi10=",
+  "version": "15.10.2",
+  "repo_hash": "sha256-XjL1D2DschFn64D2KcTQP6pppecIN26LrWMJPUfYvgI=",
   "yarn_hash": "1il8dnjb7591ss6w14zibdihg3bylw866jjjclv1qm8cihp8k3y8",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v15.10.1-ee",
+  "rev": "v15.10.2-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "15.10.1",
-    "GITLAB_PAGES_VERSION": "15.10.1",
+    "GITALY_SERVER_VERSION": "15.10.2",
+    "GITLAB_PAGES_VERSION": "15.10.2",
     "GITLAB_SHELL_VERSION": "14.18.0",
-    "GITLAB_WORKHORSE_VERSION": "15.10.1"
+    "GITLAB_WORKHORSE_VERSION": "15.10.2"
   }
 }
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index 0a325a28e3d07..dbd5e9bf8a805 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -11,7 +11,7 @@ let
     gemdir = ./.;
   };
 
-  version = "15.10.1";
+  version = "15.10.2";
   package_version = "v${lib.versions.major version}";
   gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
 
@@ -22,7 +22,7 @@ let
       owner = "gitlab-org";
       repo = "gitaly";
       rev = "v${version}";
-      sha256 = "sha256-iGYmBMRno2qCvdklyztGTV48m0UMeozuyX7ZZdS7K/c=";
+      sha256 = "sha256-18BmECQqzwwxl7nY5+Bi4oyA2EPd5HqzJdgVPV8J1OM=";
     };
 
     vendorSha256 = "sha256-knuUyJGz5JvYyKeDQ66cMQQSh2YKkkDB54iCir1QpEY=";
diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
index ca56a575e287f..a23599a7c4895 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "gitlab-pages";
-  version = "15.10.1";
+  version = "15.10.2";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-pages";
     rev = "v${version}";
-    sha256 = "sha256-FZ7Ifb8bau1helYnmKcS90oASnjF/knxbtPsck6lwKk=";
+    sha256 = "sha256-h3Q8dOz61sRhDxRlcPTP+yhP/ntTTqggyAFvTgu6m6k=";
   };
 
   vendorHash = "sha256-s3HHoz9URACuVVhePQQFviTqlQU7vCLOjTJPBlus1Vo=";
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index bf6b87e1a0fa9..917554c0d84ed 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@@ -5,7 +5,7 @@ in
 buildGoModule rec {
   pname = "gitlab-workhorse";
 
-  version = "15.10.1";
+  version = "15.10.2";
 
   src = fetchFromGitLab {
     owner = data.owner;
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
index 8cafe3b8909c9..15995b07e1f0f 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
@@ -546,7 +546,7 @@ gem 'lru_redux'
 # Locked as long as quoted-printable encoding issues are not resolved
 # Monkey-patched in `config/initializers/mail_encoding_patch.rb`
 # See https://gitlab.com/gitlab-org/gitlab/issues/197386
-gem 'mail', '= 2.7.1'
+gem 'mail', '= 2.8.1'
 gem 'mail-smtp_pool', '~> 0.1.0', path: 'vendor/gems/mail-smtp_pool', require: false
 
 gem 'microsoft_graph_mailer', '~> 0.1.0', path: 'vendor/gems/microsoft_graph_mailer'
@@ -593,12 +593,8 @@ gem 'app_store_connect'
 # For phone verification
 gem 'telesignenterprise', '~> 2.2'
 
-# Ruby 3 extracts net-protocol into a separate gem, while Ruby 2 has it built-in
-# This condition installs the gem only for Ruby 3 to avoid warnings on Ruby 2
-# Can be removed when support for Ruby 2 is dropped
-install_if -> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.0.0") } do
-  # BufferedIO patch
-  gem 'net-protocol', '~> 0.1.3'
-end
+# BufferedIO patch
+# Updating this version will require updating scripts/allowed_warnings.txt
+gem 'net-protocol', '~> 0.1.3'
 
 gem 'duo_api', '~> 1.3'
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
index 1f1f566be37c0..b624e3908515e 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
@@ -344,6 +344,7 @@ GEM
       danger
       gitlab (~> 4.2, >= 4.2.0)
     database_cleaner (1.7.0)
+    date (3.3.3)
     dead_end (3.1.1)
     debug_inspector (1.1.0)
     deckar01-task_list (2.3.2)
@@ -927,8 +928,11 @@ GEM
       zeitwerk (~> 2.5)
     lru_redux (1.1.0)
     lumberjack (1.2.7)
-    mail (2.7.1)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
     marcel (1.0.2)
     marginalia (1.11.1)
       actionpack (>= 5.2)
@@ -972,12 +976,19 @@ GEM
     nenv (0.3.0)
     net-http-persistent (4.0.1)
       connection_pool (~> 2.2)
+    net-imap (0.3.4)
+      date
+      net-protocol
     net-ldap (0.17.1)
     net-ntp (2.1.3)
+    net-pop (0.1.2)
+      net-protocol
     net-protocol (0.1.3)
       timeout
     net-scp (3.0.0)
       net-ssh (>= 2.6.5, < 7.0.0)
+    net-smtp (0.3.3)
+      net-protocol
     net-ssh (6.0.0)
     netrc (0.11.0)
     nio4r (2.5.8)
@@ -1790,7 +1801,7 @@ DEPENDENCIES
   loofah (~> 2.19.1)
   lookbook (~> 1.5, >= 1.5.3)
   lru_redux
-  mail (= 2.7.1)
+  mail (= 2.8.1)
   mail-smtp_pool (~> 0.1.0)!
   marginalia (~> 1.11.1)
   memory_profiler (~> 1.0)
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
index fe75ce4a2a9c1..4b90619af0cfc 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
@@ -1064,6 +1064,16 @@ src:
     };
     version = "1.7.0";
   };
+  date = {
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1";
+      type = "gem";
+    };
+    version = "3.3.3";
+  };
   dead_end = {
     groups = ["default" "test"];
     platforms = [];
@@ -3416,15 +3426,15 @@ src:
     version = "1.2.7";
   };
   mail = {
-    dependencies = ["mini_mime"];
+    dependencies = ["mini_mime" "net-imap" "net-pop" "net-smtp"];
     groups = ["default" "development" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc";
+      sha256 = "1bf9pysw1jfgynv692hhaycfxa8ckay1gjw5hz3madrbrynryfzc";
       type = "gem";
     };
-    version = "2.7.1";
+    version = "2.8.1";
   };
   mail-smtp_pool = {
     dependencies = ["connection_pool" "mail"];
@@ -3739,6 +3749,17 @@ src:
     };
     version = "4.0.1";
   };
+  net-imap = {
+    dependencies = ["date" "net-protocol"];
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1d996zf3g8xz244791b0qsl9vr7zg4lqnnmf9k2kshr9lki5jam8";
+      type = "gem";
+    };
+    version = "0.3.4";
+  };
   net-ldap = {
     groups = ["default"];
     platforms = [];
@@ -3759,6 +3780,17 @@ src:
     };
     version = "2.1.3";
   };
+  net-pop = {
+    dependencies = ["net-protocol"];
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1wyz41jd4zpjn0v1xsf9j778qx1vfrl24yc20cpmph8k42c4x2w4";
+      type = "gem";
+    };
+    version = "0.1.2";
+  };
   net-protocol = {
     dependencies = ["timeout"];
     groups = ["default"];
@@ -3781,6 +3813,17 @@ src:
     };
     version = "3.0.0";
   };
+  net-smtp = {
+    dependencies = ["net-protocol"];
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1c6md06hm5bf6rv53sk54dl2vg038pg8kglwv3rayx0vk2mdql9x";
+      type = "gem";
+    };
+    version = "0.3.3";
+  };
   net-ssh = {
     groups = ["default"];
     platforms = [];
diff --git a/pkgs/applications/version-management/lefthook/default.nix b/pkgs/applications/version-management/lefthook/default.nix
index cd8c2482dd4ad..7f4affc34fe90 100644
--- a/pkgs/applications/version-management/lefthook/default.nix
+++ b/pkgs/applications/version-management/lefthook/default.nix
@@ -6,7 +6,7 @@
 
 let
   pname = "lefthook";
-  version = "1.3.8";
+  version = "1.3.9";
 in
 buildGoModule rec {
   inherit pname version;
@@ -15,7 +15,7 @@ buildGoModule rec {
     owner = "evilmartians";
     repo = "lefthook";
     rev = "v${version}";
-    hash = "sha256-AtqCRGl+xvFA3mW9hYZALSrknUbuJ83LOKgOvLDLIPU=";
+    hash = "sha256-6XsSnFrYRsVNzp5Kr1+GghbNh2uOOyT4BQm9yBw3jRU=";
   };
 
   vendorHash = "sha256-cMRl+TqSLlfoAja+JNaNKfHDR9fkvMTWdB1FT3XxPd4=";
diff --git a/pkgs/applications/video/hyperion-ng/default.nix b/pkgs/applications/video/hyperion-ng/default.nix
index d9a1e251e4d0c..a1eb4086e89c4 100644
--- a/pkgs/applications/video/hyperion-ng/default.nix
+++ b/pkgs/applications/video/hyperion-ng/default.nix
@@ -1,51 +1,73 @@
-{ stdenv, avahi-compat, cmake, fetchFromGitHub, flatbuffers, hidapi, lib, libcec
-, libusb1, libX11, libxcb, libXrandr, mbedtls, mkDerivation, protobuf, python3
-, qtbase, qtserialport, qtsvg, qtx11extras, wrapQtAppsHook }:
+{ stdenv, lib, fetchFromGitHub
+, cmake, wrapQtAppsHook, perl
+, flatbuffers, protobuf, mbedtls
+, hidapi, libcec, libusb1
+, libX11, libxcb, libXrandr, python3
+, qtbase, qtserialport, qtsvg, qtx11extras
+, withRPiDispmanx ? false, libraspberrypi
+}:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "hyperion.ng";
-  version = "2.0.12";
+  version = "2.0.14";
 
   src = fetchFromGitHub {
     owner = "hyperion-project";
     repo = pname;
     rev = version;
-    sha256 = "sha256-J31QaWwGNhIpnZmWN9lZEI6fC0VheY5X8fGchQqtAlQ=";
+    sha256 = "sha256-Y1PZ+YyPMZEX4fBpMG6IVT1gtXR9ZHlavJMCQ4KAenc=";
+    # needed for `dependencies/external/`:
+    # * rpi_ws281x` - not possible to use as a "system" lib
+    # * qmdnsengine - not in nixpkgs yet
+    fetchSubmodules = true;
   };
 
   buildInputs = [
-    avahi-compat
-    flatbuffers
     hidapi
-    libcec
     libusb1
     libX11
     libxcb
     libXrandr
-    mbedtls
+    flatbuffers
     protobuf
+    mbedtls
     python3
     qtbase
     qtserialport
     qtsvg
     qtx11extras
-  ];
+  ] ++ lib.optional stdenv.isLinux libcec
+    ++ lib.optional withRPiDispmanx libraspberrypi;
 
-  nativeBuildInputs = [ cmake wrapQtAppsHook ];
+  nativeBuildInputs = [
+    cmake wrapQtAppsHook
+  ] ++ lib.optional stdenv.isDarwin perl; # for macos bundle
+
+  patchPhase =  ''
+    patchShebangs test/testrunner.sh
+    patchShebangs src/hyperiond/CMakeLists.txt
+  '' ;
 
   cmakeFlags = [
     "-DCMAKE_BUILD_TYPE=Release"
-    "-DUSE_SYSTEM_MBEDTLS_LIBS=ON"
+    "-DENABLE_DEPLOY_DEPENDENCIES=OFF"
     "-DUSE_SYSTEM_FLATBUFFERS_LIBS=ON"
     "-DUSE_SYSTEM_PROTO_LIBS=ON"
-  ];
+    "-DUSE_SYSTEM_MBEDTLS_LIBS=ON"
+    # "-DUSE_SYSTEM_QMDNS_LIBS=ON"  # qmdnsengine not in nixpkgs yet
+    "-DENABLE_TESTS=ON"
+  ] ++ lib.optional (withRPiDispmanx == false) "-DENABLE_DISPMANX=OFF";
+
+  doCheck = true;
+  checkPhase = ''
+    cd ../ && ./test/testrunner.sh && cd -
+  '';
 
   meta = with lib; {
-    broken = (stdenv.isLinux && stdenv.isAarch64);
-    description = "Open Source Ambilight solution";
+    description = "An opensource Bias or Ambient Lighting implementation";
     homepage = "https://github.com/hyperion-project/hyperion.ng";
     license = licenses.mit;
-    maintainers = with maintainers; [ algram ];
+    maintainers = with maintainers; [ algram kazenyuk ];
     platforms = platforms.unix;
   };
 }