From 2df2a508dc3b072ef9b0f6e537084e1d29010484 Mon Sep 17 00:00:00 2001
From: Andrew Abbott <andrew@mirx.dev>
Date: Mon, 18 Apr 2022 10:32:07 +1000
Subject: [PATCH 01/40] kakounePlugins: Fix update.py

I tried to run this and it failed. These changes made it work again.

I looked at maintainers/scripts/pluginupdate.py and how the types
differed to make this fix.
---
 .../editors/kakoune/plugins/update.py         | 39 ++++++++-----------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/editors/kakoune/plugins/update.py b/pkgs/applications/editors/kakoune/plugins/update.py
index dd8765db28a4..49662a0e8e2e 100755
--- a/pkgs/applications/editors/kakoune/plugins/update.py
+++ b/pkgs/applications/editors/kakoune/plugins/update.py
@@ -42,19 +42,19 @@ HEADER = "# This file has been generated by ./pkgs/applications/editors/kakoune/
 class KakouneEditor(pluginupdate.Editor):
 
 
-    def generate_nix(self, plugins: List[Tuple[str, str, pluginupdate.Plugin]], outfile: str):
-        sorted_plugins = sorted(plugins, key=lambda v: v[2].name.lower())
+    def generate_nix(self, plugins: List[Tuple[pluginupdate.PluginDesc, pluginupdate.Plugin]], outfile: str):
+        sorted_plugins = sorted(plugins, key=lambda v: v[1].name.lower())
 
         with open(outfile, "w+") as f:
             f.write(HEADER)
             f.write(
                 """
-    { lib, buildKakounePluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }:
-    let
-    packages = ( self:
-    {"""
+{ lib, buildKakounePluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }:
+let
+packages = ( self:
+{"""
             )
-            for owner, repo, plugin in sorted_plugins:
+            for pluginDesc, plugin in sorted_plugins:
                 if plugin.has_submodules:
                     submodule_attr = "\n      fetchSubmodules = true;"
                 else:
@@ -62,24 +62,19 @@ class KakouneEditor(pluginupdate.Editor):
 
                 f.write(
                     f"""
-    {plugin.normalized_name} = buildKakounePluginFrom2Nix {{
-        pname = "{plugin.normalized_name}";
-        version = "{plugin.version}";
-        src = fetchFromGitHub {{
-        owner = "{owner}";
-        repo = "{repo}";
-        rev = "{plugin.commit}";
-        sha256 = "{plugin.sha256}";{submodule_attr}
-        }};
-        meta.homepage = "https://github.com/{owner}/{repo}/";
-    }};
-    """
+  {plugin.normalized_name} = buildKakounePluginFrom2Nix {{
+    pname = "{plugin.normalized_name}";
+    version = "{plugin.version}";
+    src = {pluginDesc.repo.as_nix(plugin)};
+    meta.homepage = "{pluginDesc.repo.url("")}";
+  }};
+"""
                 )
             f.write(
                 """
-    });
-    in lib.fix' (lib.extends overrides packages)
-    """
+});
+in lib.fix' (lib.extends overrides packages)
+"""
             )
         print(f"updated {outfile}")
 

From dd13d8c7e4256407829c0a206047d07814767a07 Mon Sep 17 00:00:00 2001
From: Andrew Abbott <andrew@mirx.dev>
Date: Sun, 17 Apr 2022 21:46:56 +1000
Subject: [PATCH 02/40] kakoune: Update plugin list

Added some plugins I use, fixed the reference to one, and removed ones
that are no longer available.
---
 .../editors/kakoune/plugins/kakoune-plugin-names            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names b/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names
index a6cae7a4505b..84b83080c2d8 100644
--- a/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names
+++ b/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names
@@ -1,14 +1,14 @@
 repo,branch,alias
+adrusi/zig.kak,,
 alexherbo2/auto-pairs.kak,,
-alexherbo2/replace-mode.kak,,
-alexherbo2/sleuth.kak,,
 andreyorst/fzf.kak,,
 andreyorst/powerline.kak,,
+andreyorst/smarttab.kak,,
 basbebe/pandoc.kak,,
 danr/kakoune-easymotion,,
 Delapouite/kakoune-buffers,,
 Delapouite/kakoune-registers,,
-enricozb/tabs.kak@main,,
+enricozb/tabs.kak,,
 greenfork/active-window.kak,,
 kakoune-editor/kakoune-extra-filetypes,,
 kakounedotcom/connect.kak,,

From d935f53e71efebce375730c1d91852d507910ec3 Mon Sep 17 00:00:00 2001
From: Andrew Abbott <andrew@mirx.dev>
Date: Mon, 18 Apr 2022 11:06:14 +1000
Subject: [PATCH 03/40] kakounePlugins: update

---
 .../editors/kakoune/plugins/generated.nix     | 112 +++++++++---------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/pkgs/applications/editors/kakoune/plugins/generated.nix b/pkgs/applications/editors/kakoune/plugins/generated.nix
index 953c95c47248..a37c90fb99d3 100644
--- a/pkgs/applications/editors/kakoune/plugins/generated.nix
+++ b/pkgs/applications/editors/kakoune/plugins/generated.nix
@@ -1,15 +1,15 @@
 # This file has been generated by ./pkgs/applications/editors/kakoune/plugins/update.py. Do not edit!
 { lib, buildKakounePluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }:
 let
-  packages = ( self:
+packages = ( self:
 {
   active-window-kak = buildKakounePluginFrom2Nix {
     pname = "active-window-kak";
-    version = "2020-05-13";
+    version = "2022-11-14";
     src = fetchFromGitHub {
       owner = "greenfork";
       repo = "active-window.kak";
-      rev = "988db69cfbb88bd741d089bb43b0be551693e7c1";
+      rev = "36bf0364eed856a52cddf274072e9f255902c0ee";
       sha256 = "1fv1cp9q212gamf9z2papl5xcl2w31fpcmbgdzbxcxdl1pvfsqp8";
     };
     meta.homepage = "https://github.com/greenfork/active-window.kak/";
@@ -17,12 +17,12 @@ let
 
   auto-pairs-kak = buildKakounePluginFrom2Nix {
     pname = "auto-pairs-kak";
-    version = "2021-03-28";
+    version = "2022-03-13";
     src = fetchFromGitHub {
       owner = "alexherbo2";
       repo = "auto-pairs.kak";
-      rev = "526779a26a5cf5f48e7c4f5c5fecca274968a737";
-      sha256 = "0gkhvwxyh8pdfydrj7zkfidk0drrbhvdi1fq3pkzllna3vz8q181";
+      rev = "bfdcb8566076f653ec707f86207f83ea75173ce9";
+      sha256 = "0vx9msk8wlj8p9qf6yiv9gzrbanb5w245cidnx5cppgld2w842ij";
     };
     meta.homepage = "https://github.com/alexherbo2/auto-pairs.kak/";
   };
@@ -41,48 +41,48 @@ let
 
   fzf-kak = buildKakounePluginFrom2Nix {
     pname = "fzf-kak";
-    version = "2021-04-03";
+    version = "2022-10-11";
     src = fetchFromGitHub {
       owner = "andreyorst";
       repo = "fzf.kak";
-      rev = "1b3a3beebbe7134e671fde2ef2f4242b34ae2c60";
-      sha256 = "0rsd65zcizbq3isy8576gqw7mcml5ixw84padaz6ndwfif5fv701";
+      rev = "6910bfb4c23cac59c17f5b7850f7bd49aba3e5cb";
+      sha256 = "1hlals4d9x5i4mwigxjlx4f9xgc9rw15yzvbvc64cminxic2i3i8";
     };
     meta.homepage = "https://github.com/andreyorst/fzf.kak/";
   };
 
   kakboard = buildKakounePluginFrom2Nix {
     pname = "kakboard";
-    version = "2020-05-09";
+    version = "2022-04-02";
     src = fetchFromGitHub {
       owner = "lePerdu";
       repo = "kakboard";
-      rev = "2f13f5cd99591b76ad5cba230815b80138825120";
-      sha256 = "1kvnbsv20y09rlnyar87qr0h26i16qsq801krswvxcwhid7ijlvd";
+      rev = "5759dcc5af593ff88a7faecc41a8f549ec440771";
+      sha256 = "0g8q0rkdnzsfvlibjd1zfcapngfli5aa3qrgmkgdi24n9ad8wzvh";
     };
     meta.homepage = "https://github.com/lePerdu/kakboard/";
   };
 
   kakoune-buffer-switcher = buildKakounePluginFrom2Nix {
     pname = "kakoune-buffer-switcher";
-    version = "2020-12-27";
+    version = "2022-09-18";
     src = fetchFromGitHub {
       owner = "occivink";
       repo = "kakoune-buffer-switcher";
-      rev = "6a27c45db87a23070c34fab36d2f8d812cd002a6";
-      sha256 = "1rmwy317908v8p54806m721bpzm8sgygb9abri34537ka6r05y5j";
+      rev = "21319aa08e7c9072dcf1a4f2f5583887d701fc37";
+      sha256 = "0lnvcb4khw1ywxd369phd2xibsh5f6qc11x5vrla331wr1q7y8j8";
     };
     meta.homepage = "https://github.com/occivink/kakoune-buffer-switcher/";
   };
 
   kakoune-buffers = buildKakounePluginFrom2Nix {
     pname = "kakoune-buffers";
-    version = "2021-04-02";
+    version = "2021-11-10";
     src = fetchFromGitHub {
       owner = "Delapouite";
       repo = "kakoune-buffers";
-      rev = "7832ea7a4528363482f5684f16cbcebcbec0adfd";
-      sha256 = "196d36jww6asf5zr03l1rwg49kkv16s2d4zyryb2m3zvy7prf2bb";
+      rev = "6b2081f5b7d58c72de319a5cba7bf628b6802881";
+      sha256 = "0pbrgydifw2a8yf3ringyqq91fccfv4lm4v8sk5349hbcz6apr4c";
     };
     meta.homepage = "https://github.com/Delapouite/kakoune-buffers/";
   };
@@ -101,12 +101,12 @@ let
 
   kakoune-extra-filetypes = buildKakounePluginFrom2Nix {
     pname = "kakoune-extra-filetypes";
-    version = "2021-01-15";
+    version = "2021-05-16";
     src = fetchFromGitHub {
       owner = "kakoune-editor";
       repo = "kakoune-extra-filetypes";
-      rev = "c6f8aaccd8c9cd6b487964c8943416e21fbe7c18";
-      sha256 = "1vkff8xbycfgxv8x09cvc79qcg5fdzn2x77mbmifmkq236khrwrg";
+      rev = "8ffeec08068edfee42e076c5f6d56a54a498bad2";
+      sha256 = "1v87aqfk2jcysbdls3mh2v1yafk1albbinfxsxp11m4nxd2b9agl";
     };
     meta.homepage = "https://github.com/kakoune-editor/kakoune-extra-filetypes/";
   };
@@ -125,24 +125,24 @@ let
 
   kakoune-registers = buildKakounePluginFrom2Nix {
     pname = "kakoune-registers";
-    version = "2020-06-19";
+    version = "2022-03-01";
     src = fetchFromGitHub {
       owner = "Delapouite";
       repo = "kakoune-registers";
-      rev = "9531947baecd83c1d4c3bea0adf10f4462f1e120";
-      sha256 = "08v9ndghh7wvr8rsrqm05gksk9ai5vnwvw9gwqasbppb48cv4a8c";
+      rev = "b8ca8e04ebe50671a937bceccba69c62b68ae8b0";
+      sha256 = "0vy5dc6jly5xqcck0vhnmbjxjdy3615b6d329v0b04amzy0hdlck";
     };
     meta.homepage = "https://github.com/Delapouite/kakoune-registers/";
   };
 
   kakoune-vertical-selection = buildKakounePluginFrom2Nix {
     pname = "kakoune-vertical-selection";
-    version = "2019-04-11";
+    version = "2022-11-29";
     src = fetchFromGitHub {
       owner = "occivink";
       repo = "kakoune-vertical-selection";
-      rev = "c420f8b867ce47375fac303886e31623669a42b7";
-      sha256 = "13jdyd2j45wvgqvxdzw9zww14ly93bqjb6700zzxj7mkbiff6wsb";
+      rev = "227b3fd9643e6e3b9d36fab324081a988c038e21";
+      sha256 = "0ygqhlk31ilczpwws28iqya8i1qhnwkb5rw6bn2zqgxj428a1kqj";
     };
     meta.homepage = "https://github.com/occivink/kakoune-vertical-selection/";
   };
@@ -161,24 +161,24 @@ let
 
   pandoc-kak = buildKakounePluginFrom2Nix {
     pname = "pandoc-kak";
-    version = "2020-11-30";
+    version = "2021-06-29";
     src = fetchFromGitHub {
       owner = "basbebe";
       repo = "pandoc.kak";
-      rev = "63979f7e08b86d80436bbe2d9dba173a56057b97";
-      sha256 = "16pmmnpyxf8r7gpj8g1lwa960nscjmcl52n1a7s6xcqkp9856wxs";
+      rev = "e9597e8df58427884161ce27392a9558930832a7";
+      sha256 = "1baslidszbybx2ngdkm7wns2m5l27gc0mb3blhhydiav8fcfvc6m";
     };
     meta.homepage = "https://github.com/basbebe/pandoc.kak/";
   };
 
   powerline-kak = buildKakounePluginFrom2Nix {
     pname = "powerline-kak";
-    version = "2021-04-06";
+    version = "2022-04-05";
     src = fetchFromGitHub {
       owner = "andreyorst";
       repo = "powerline.kak";
-      rev = "6fa5ad383f2884f201d6e3ef07a4687c606df525";
-      sha256 = "1s7ggjby0bymq48njzhdvkkarmzl44803xv0dlnzrj7q9c3xv27a";
+      rev = "c5ef9a845bbd886c73ef00c0efff986e02d5f5d8";
+      sha256 = "1lshlnz5xrxzafxmb6w05g2i6nvi49aqyd8852k9l0lmzqryp7l2";
     };
     meta.homepage = "https://github.com/andreyorst/powerline.kak/";
   };
@@ -195,41 +195,41 @@ let
     meta.homepage = "https://github.com/kakounedotcom/prelude.kak/";
   };
 
-  replace-mode-kak = buildKakounePluginFrom2Nix {
-    pname = "replace-mode-kak";
-    version = "2020-10-07";
+  smarttab-kak = buildKakounePluginFrom2Nix {
+    pname = "smarttab-kak";
+    version = "2022-04-10";
     src = fetchFromGitHub {
-      owner = "alexherbo2";
-      repo = "replace-mode.kak";
-      rev = "5f4c73cdbaf5aeb964ee35ad4b9081b233af90c0";
-      sha256 = "1cmylx99bm7jwfb4hclb69sdc4n8f29ssyy2byjiw53ni9rnc8q0";
+      owner = "andreyorst";
+      repo = "smarttab.kak";
+      rev = "86ac6599b13617ff938905ba4cdd8225d7eb6a2e";
+      sha256 = "1992xwf2aygzfd26lhg3yiy253g0hl1iagj0kq9yhcqg0i5xjcj9";
     };
-    meta.homepage = "https://github.com/alexherbo2/replace-mode.kak/";
-  };
-
-  sleuth-kak = buildKakounePluginFrom2Nix {
-    pname = "sleuth-kak";
-    version = "2020-11-06";
-    src = fetchFromGitHub {
-      owner = "alexherbo2";
-      repo = "sleuth.kak";
-      rev = "911db8bd208ad0d289b8fa15a2ac665ff39bd6bd";
-      sha256 = "0g41c0038fpmihqva71xl4vfbmvsp13i47gp6fnmaikajpynzc51";
-    };
-    meta.homepage = "https://github.com/alexherbo2/sleuth.kak/";
+    meta.homepage = "https://github.com/andreyorst/smarttab.kak/";
   };
 
   tabs-kak = buildKakounePluginFrom2Nix {
     pname = "tabs-kak";
-    version = "2021-04-14";
+    version = "2021-07-05";
     src = fetchFromGitHub {
       owner = "enricozb";
       repo = "tabs.kak";
-      rev = "048f83455ea7c671ab06e9b9578ac25e5de1d6fb";
-      sha256 = "0xswpsdf1bj54inl6vf2lzbjkxfc6g0fyv5kd6y9ahlh5irij8z0";
+      rev = "1cb19e410a3ef299f7a701fa5bec98c2d9284dac";
+      sha256 = "0hxa4mvw1k74vscxkm520c6g7iwcaqh8kj9g4mwy6n5kkvr1drf0";
     };
     meta.homepage = "https://github.com/enricozb/tabs.kak/";
   };
 
+  zig-kak = buildKakounePluginFrom2Nix {
+    pname = "zig-kak";
+    version = "2019-05-06";
+    src = fetchFromGitHub {
+      owner = "adrusi";
+      repo = "zig.kak";
+      rev = "5a7e84e138324e6b8d140fe384dfe5cc941e26b7";
+      sha256 = "1w0nmhsgchjga4by9ch9md3pdc1bwn0p157g6zwnfpj7lnaahsmq";
+    };
+    meta.homepage = "https://github.com/adrusi/zig.kak/";
+  };
+
 });
 in lib.fix' (lib.extends overrides packages)

From dcca1f7841f981dff1208842140317fdf54735e3 Mon Sep 17 00:00:00 2001
From: Andrew Abbott <andrew@mirx.dev>
Date: Mon, 18 Apr 2022 11:06:57 +1000
Subject: [PATCH 04/40] kakounePlugins: add generated updated input file

---
 .../kakoune/plugins/kakoune-plugin-names      | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names b/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names
index 84b83080c2d8..b856308c7831 100644
--- a/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names
+++ b/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names
@@ -1,20 +1,20 @@
 repo,branch,alias
-adrusi/zig.kak,,
-alexherbo2/auto-pairs.kak,,
-andreyorst/fzf.kak,,
-andreyorst/powerline.kak,,
-andreyorst/smarttab.kak,,
-basbebe/pandoc.kak,,
-danr/kakoune-easymotion,,
-Delapouite/kakoune-buffers,,
-Delapouite/kakoune-registers,,
-enricozb/tabs.kak,,
-greenfork/active-window.kak,,
-kakoune-editor/kakoune-extra-filetypes,,
-kakounedotcom/connect.kak,,
-kakounedotcom/prelude.kak,,
-lePerdu/kakboard,,
-listentolist/kakoune-rainbow,,
-mayjs/openscad.kak,,
-occivink/kakoune-buffer-switcher,,
-occivink/kakoune-vertical-selection,,
+https://github.com/greenfork/active-window.kak/,,
+https://github.com/alexherbo2/auto-pairs.kak/,,
+https://github.com/kakounedotcom/connect.kak/,,
+https://github.com/andreyorst/fzf.kak/,,
+https://github.com/lePerdu/kakboard/,,
+https://github.com/occivink/kakoune-buffer-switcher/,,
+https://github.com/Delapouite/kakoune-buffers/,,
+https://github.com/danr/kakoune-easymotion/,,
+https://github.com/kakoune-editor/kakoune-extra-filetypes/,,
+https://github.com/listentolist/kakoune-rainbow/,,
+https://github.com/Delapouite/kakoune-registers/,,
+https://github.com/occivink/kakoune-vertical-selection/,,
+https://github.com/mayjs/openscad.kak/,,
+https://github.com/basbebe/pandoc.kak/,,
+https://github.com/andreyorst/powerline.kak/,,
+https://github.com/kakounedotcom/prelude.kak/,,
+https://github.com/andreyorst/smarttab.kak/,,
+https://github.com/enricozb/tabs.kak/,,
+https://github.com/adrusi/zig.kak/,,

From f29431a85cedb337c5ef21605673b1f8c0137371 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 28 Jan 2023 04:20:00 +0000
Subject: [PATCH 05/40] sudo-font: 0.64 -> 0.69

https://github.com/jenskutilek/sudo-font/releases/tag/v0.69
---
 pkgs/data/fonts/sudo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix
index dca4ccd200cb..26870d8003b9 100644
--- a/pkgs/data/fonts/sudo/default.nix
+++ b/pkgs/data/fonts/sudo/default.nix
@@ -2,11 +2,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "sudo-font";
-  version = "0.64";
+  version = "0.69";
 
   src = fetchzip {
     url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip";
-    hash = "sha256-Y99YPoNpe55Wrj5epiqqQ6ddUBTj9uI4oj4M5ARTzJo=";
+    hash = "sha256-GXlQh9JRAzbwWKTJw/y003ywjaWtiQayHxiWPTPvIO0=";
   };
 
   installPhase = ''

From 11bdd4f36fae3dc86226ea78e9069c40a8f7a6a1 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 28 Jan 2023 04:20:00 +0000
Subject: [PATCH 06/40] ibm-plex: 6.0.1 -> 6.1.1

---
 pkgs/data/fonts/ibm-plex/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/pkgs/data/fonts/ibm-plex/default.nix
index 9909f8f5a3e0..0de1f38a0ff8 100644
--- a/pkgs/data/fonts/ibm-plex/default.nix
+++ b/pkgs/data/fonts/ibm-plex/default.nix
@@ -2,11 +2,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "ibm-plex";
-  version = "6.0.1";
+  version = "6.1.1";
 
   src = fetchzip {
     url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip";
-    hash = "sha256-n13NuKrZUc0JGvDf2PLZkxogefDkEHaOZk4JN42/C74=";
+    hash = "sha256-PZ7KPtaXZFVD5uMc7i+GQMA4DU5PsspeAodiU/FrTpY=";
   };
 
   installPhase = ''

From 02f9bd89e944c42ad572d8dd7fa363c194557d99 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 28 Jan 2023 04:20:00 +0000
Subject: [PATCH 07/40] millet: 0.7.5 -> 0.7.6

---
 pkgs/development/tools/language-servers/millet/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix
index d6974aff86cf..036c5057d899 100644
--- a/pkgs/development/tools/language-servers/millet/default.nix
+++ b/pkgs/development/tools/language-servers/millet/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "millet";
-  version = "0.7.5";
+  version = "0.7.6";
 
   src = fetchFromGitHub {
     owner = "azdavis";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-lRWL8J83U8W/QdxNew9To4kbqhmqt0KUQMnaODTfT1U=";
+    hash = "sha256-7Mv1+c8X+rZQyw3y+eGvSyqVqiSPdTj1WxoUv1mynSs=";
   };
 
-  cargoHash = "sha256-IGEmcFmkEm+seGf9eLokU7pjRNgwOaJr+mf152yogw8=";
+  cargoHash = "sha256-0fJIp2zlZkeidTFg6jQs6S2mVHJL8flqiZtTvM0F9OQ=";
 
   postPatch = ''
     rm .cargo/config.toml

From ba5a5ec3ef5413f43ab3f532e9ee2059cbe83b3a Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 28 Jan 2023 14:16:53 +0100
Subject: [PATCH 08/40] chromium: 109.0.5414.74 -> 109.0.5414.119

https://chromereleases.googleblog.com/2023/01/stable-channel-update-for-desktop_24.html

This update includes 6 security fixes.

CVEs:
CVE-2023-0471 CVE-2023-0472 CVE-2023-0473 CVE-2023-0474
---
 .../browsers/chromium/upstream-info.json           | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 4554f2d8180b..09a1478f5fde 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -1,8 +1,8 @@
 {
   "stable": {
-    "version": "109.0.5414.74",
-    "sha256": "0pcfaj3n3rjk4va9g0ajlsv1719kdhqcnjdd4piinqxb4qy27vgd",
-    "sha256bin64": "1qfp9li90p2d6asy60v12h7r4025l01yf3dzcdyihvr0la3bhdrx",
+    "version": "109.0.5414.119",
+    "sha256": "0bdyb14v12izxkldq27jx532p0bid3wdwfpd1mwm7jqswxgfzkfb",
+    "sha256bin64": "0iap6i4zmflp4fsj16knwdp03gixsdkbys0scbvvzs3fzy2r5zkx",
     "deps": {
       "gn": {
         "version": "2022-11-10",
@@ -12,10 +12,10 @@
       }
     },
     "chromedriver": {
-      "version": "109.0.5414.25",
-      "sha256_linux": "1gybh9nyc2j96ics1898qkrn1aajb2gpjb8l6b2p0hs24iqhjilg",
-      "sha256_darwin": "1w3sz9sxjkir2wwkzjx870qq04xzf9z7b59m953w33mkfm6zvz71",
-      "sha256_darwin_aarch64": "1qfg22glac44y5pdzscm2yr6wjnhm7p7pkiadblky27fp13dpyv0"
+      "version": "109.0.5414.74",
+      "sha256_linux": "1mhnw4maixwfhrz3r3mhpr9bl9hn7cvr2ji6y6ai32hxa1ix9m6f",
+      "sha256_darwin": "0w46xd05m7irfxqsfnjwgd2v65c9vgnh8awaknqgh02wmdgx3nm0",
+      "sha256_darwin_aarch64": "0amb2kd4cq4clir9gqr1b1mdy46m8nwzka227xxjd2i14vwzckb0"
     }
   },
   "beta": {

From 044c928be8a3865bc62d9c1a700fe5d410a94e17 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 28 Jan 2023 14:16:53 +0100
Subject: [PATCH 09/40] chromiumBeta: 110.0.5481.38 -> 110.0.5481.52

---
 .../networking/browsers/chromium/upstream-info.json         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 4554f2d8180b..4e1e7b509322 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -19,9 +19,9 @@
     }
   },
   "beta": {
-    "version": "110.0.5481.38",
-    "sha256": "0y3clfzqnbyz0v53w3ha1kx4jb9skdf22ihs09i8b568dj1m9mwj",
-    "sha256bin64": "0gvxsgw0ywq8d689g8790fymhksqg744m3j7kg4hcnmiyqdajl0n",
+    "version": "110.0.5481.52",
+    "sha256": "09khb67xl1b2caw0j9lmv6a9iyms9sprn2r7wsgqzjn9dzd9wwcq",
+    "sha256bin64": "0dv9fxwqn50hl06y7zfqby8hd9lwqwk2q3856fygbn82qppkbl4r",
     "deps": {
       "gn": {
         "version": "2022-12-12",

From ba0a61217501b203852b0f68eadae624ed3070cb Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 28 Jan 2023 14:16:53 +0100
Subject: [PATCH 10/40] chromiumDev: 111.0.5545.6 -> 111.0.5562.0

---
 .../networking/browsers/chromium/upstream-info.json         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 4554f2d8180b..fd1ed55e5a0d 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -32,9 +32,9 @@
     }
   },
   "dev": {
-    "version": "111.0.5545.6",
-    "sha256": "0c5v7w0fbhrgqialncx0adyyah2026icwrxjwywridah1jrbm90a",
-    "sha256bin64": "1m3s40hibs3f1j3g2asq102iijjd59xrqqz7iv82za1slnrcbfg5",
+    "version": "111.0.5562.0",
+    "sha256": "0aviz1cjm00lya530n0wyqn85d3idzn3bbp8065ygvfawqcf163j",
+    "sha256bin64": "0azkcvbl645c9ph4vn4502qbgfcb7zbs4ycy3q73nj5al642absm",
     "deps": {
       "gn": {
         "version": "2022-12-12",

From 44560dde8853dfabee3f53ee8f6efc0617d84caf Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Sat, 28 Jan 2023 23:37:56 -0500
Subject: [PATCH 11/40] vimPlugins: update

---
 .../editors/vim/plugins/generated.nix         | 598 +++++++++---------
 1 file changed, 299 insertions(+), 299 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 98d7a8db2f4d..c1590d5a491f 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -65,12 +65,12 @@ final: prev:
 
   Coqtail = buildVimPluginFrom2Nix {
     pname = "Coqtail";
-    version = "2022-12-30";
+    version = "2023-01-27";
     src = fetchFromGitHub {
       owner = "whonore";
       repo = "Coqtail";
-      rev = "4ba9154caafe707c95d438681da4eb4774380024";
-      sha256 = "11c39hjpn9i3d74wqnqczcx9bysgaj3wjkb8y86b312kpi4r2agh";
+      rev = "564a64651578164b5c7f2503e306bc436beb88da";
+      sha256 = "151w10p8w7ml9v7h18y3zzgbr48ffpxsxj3lnxl8lm44dab76qp1";
     };
     meta.homepage = "https://github.com/whonore/Coqtail/";
   };
@@ -293,12 +293,12 @@ final: prev:
 
   SchemaStore-nvim = buildVimPluginFrom2Nix {
     pname = "SchemaStore.nvim";
-    version = "2023-01-17";
+    version = "2023-01-26";
     src = fetchFromGitHub {
       owner = "b0o";
       repo = "SchemaStore.nvim";
-      rev = "8ec6e1b030d933cba9a207a78c2f24333641fb2c";
-      sha256 = "1cqhg2mp2qjpi28yq7pj9qlyry9vlyjw30nvwm0sd02pkjal0m0j";
+      rev = "e942fac8de03539dc07ea96e70a8ec262dccadda";
+      sha256 = "0iznxnl5m3kkmbqyynjvr3mgsrcm0a8g12s5cx42g0v9i9xpjf1y";
     };
     meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
   };
@@ -498,12 +498,12 @@ final: prev:
 
   aerial-nvim = buildVimPluginFrom2Nix {
     pname = "aerial.nvim";
-    version = "2023-01-22";
+    version = "2023-01-28";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "aerial.nvim";
-      rev = "e2b6cd07b45f8457ea183d16e483fdac3581b04f";
-      sha256 = "0hx85bkbqcp94d2i1p9jd3c5n91xg1fhmm86yf7xjpx4knynsdbh";
+      rev = "911373eb6be91700a3597aeb228f553d4a29aec1";
+      sha256 = "1w7yp0rw3ij5gv4nnjzzhfqx9z5n4ayxg9phlxxpvysmma90sfar";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/aerial.nvim/";
@@ -559,12 +559,12 @@ final: prev:
 
   ale = buildVimPluginFrom2Nix {
     pname = "ale";
-    version = "2023-01-06";
+    version = "2023-01-28";
     src = fetchFromGitHub {
       owner = "dense-analysis";
       repo = "ale";
-      rev = "69c1dc8b5f3d215d4a0538265b2d257c2ed7a8fa";
-      sha256 = "00jr9s90i03zkl076pa0knc0k9dx1xcc98ajlrxw3dkq38kbshiy";
+      rev = "0af4899605af26dd8ea7fe79acff6ab99f6532b2";
+      sha256 = "0h45gnpr2l5r0ikyyrdzx9zvwvzy03qrwj3j2280rfm5m97v1ss4";
     };
     meta.homepage = "https://github.com/dense-analysis/ale/";
   };
@@ -835,24 +835,24 @@ final: prev:
 
   barbar-nvim = buildVimPluginFrom2Nix {
     pname = "barbar.nvim";
-    version = "2023-01-03";
+    version = "2023-01-22";
     src = fetchFromGitHub {
       owner = "romgrk";
       repo = "barbar.nvim";
-      rev = "c1b5d351ccd8f88fd2729b90ade2ef5d333463de";
-      sha256 = "1cwkkg57mga200kyvd9j02xi82mbq95i5nj0lkpc7r2lxds70qbr";
+      rev = "e9da670e3fd58598bd0d2cf7e32e1af24cb2fcca";
+      sha256 = "0bsid941ybaibwwq5hgp13n8xqh8z2yjldggrcamhm9hga5sy0a0";
     };
     meta.homepage = "https://github.com/romgrk/barbar.nvim/";
   };
 
   barbecue-nvim = buildVimPluginFrom2Nix {
     pname = "barbecue.nvim";
-    version = "2023-01-22";
+    version = "2023-01-28";
     src = fetchFromGitHub {
       owner = "utilyre";
       repo = "barbecue.nvim";
-      rev = "ab0d20b2d48551340b52b3cbe8922462caa06950";
-      sha256 = "10382d94lg6k7g8inwqs40ddywzm8pfg6j0m97kansag4q7c8p4j";
+      rev = "11e363e33f9952b35e757c528bf6515872ec8650";
+      sha256 = "1vr6d0vfqr2y4ld9dj420293y9bfszl5sh3z5d4ydx1firc23ljc";
     };
     meta.homepage = "https://github.com/utilyre/barbecue.nvim/";
   };
@@ -1399,12 +1399,12 @@ final: prev:
 
   cmp-latex-symbols = buildVimPluginFrom2Nix {
     pname = "cmp-latex-symbols";
-    version = "2022-12-08";
+    version = "2023-01-23";
     src = fetchFromGitHub {
       owner = "kdheepak";
       repo = "cmp-latex-symbols";
-      rev = "1ec2e4f47cde6c7ffcebec92cfec58ddc1f6689a";
-      sha256 = "093wj6kfln2lsgcijnwjj924lbgld0vhfvx8w0kfhlhpv5fr5dfz";
+      rev = "165fb66afdbd016eaa1570e41672c4c557b57124";
+      sha256 = "19hrj03b1l6n981h0rjy6y98fach7hj64hh3l787w1wkhq3pirxj";
     };
     meta.homepage = "https://github.com/kdheepak/cmp-latex-symbols/";
   };
@@ -1795,12 +1795,12 @@ final: prev:
 
   coc-nvim = buildVimPluginFrom2Nix {
     pname = "coc.nvim";
-    version = "2023-01-21";
+    version = "2023-01-28";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc.nvim";
-      rev = "e86b15bbcabc2cc1f20a40e7c127a424e7ad3850";
-      sha256 = "1qh30yg082a6s55psa1z844n3s5z8s31pan7iywaygwcnpxhlgx6";
+      rev = "0ae203a03115973097d60cc2df7b35a7754f2c8f";
+      sha256 = "0cbw0g73x4bsz8i552q1nrqf7mglisbvzapv01l2a9l9jxspzapc";
     };
     meta.homepage = "https://github.com/neoclide/coc.nvim/";
   };
@@ -1819,12 +1819,12 @@ final: prev:
 
   codi-vim = buildVimPluginFrom2Nix {
     pname = "codi.vim";
-    version = "2022-12-02";
+    version = "2023-01-23";
     src = fetchFromGitHub {
       owner = "metakirby5";
       repo = "codi.vim";
-      rev = "6537ba677a0c7c6c796b195f29077b57fad33716";
-      sha256 = "01rk4i212zcas64hk3d2a15qvn8rxwlkghzci2cd1n79ywj0q9xd";
+      rev = "ab8c5faa867424c79a7d5d3a7f55d3a2528ee9b9";
+      sha256 = "0d3rpj31wd5xzwcrnv7rwm54g81s3i4hxs7lcwph8k1j7pb8i1nl";
     };
     meta.homepage = "https://github.com/metakirby5/codi.vim/";
   };
@@ -1951,12 +1951,12 @@ final: prev:
 
   compiler-explorer-nvim = buildVimPluginFrom2Nix {
     pname = "compiler-explorer.nvim";
-    version = "2023-01-19";
+    version = "2023-01-25";
     src = fetchFromGitHub {
       owner = "krady21";
       repo = "compiler-explorer.nvim";
-      rev = "c9ce6476e4b481c64d13939c6696043b8e21dd43";
-      sha256 = "0mqb300w663xb4yfxkijbn8ixzgj8azgywmhg7qjskds7w8af15z";
+      rev = "1528b525d17a98dfc6f7b07aa28672106df9cde7";
+      sha256 = "1mv844ijirg9vv8klphrdka3qyji9hvgfqcwf2v2a3c4h2vd78rf";
     };
     meta.homepage = "https://github.com/krady21/compiler-explorer.nvim/";
   };
@@ -2083,12 +2083,12 @@ final: prev:
 
   copilot-lua = buildVimPluginFrom2Nix {
     pname = "copilot.lua";
-    version = "2023-01-22";
+    version = "2023-01-25";
     src = fetchFromGitHub {
       owner = "zbirenbaum";
       repo = "copilot.lua";
-      rev = "6ca9b4b3eda9138406291493750a6890c927dbfa";
-      sha256 = "00dfhj44hfqi66j1ayr7h424qc160l9d91wlbfb4hhbg2rcldp4l";
+      rev = "cfedeb726dc18b25f69d2f2a084b41061ae16e8f";
+      sha256 = "1ysg39cmvk3cw2dwkdx9gjirq8lkfdh3zskxrbw6zkc0xl7zs31a";
     };
     meta.homepage = "https://github.com/zbirenbaum/copilot.lua/";
   };
@@ -2107,24 +2107,24 @@ final: prev:
 
   coq-artifacts = buildVimPluginFrom2Nix {
     pname = "coq.artifacts";
-    version = "2023-01-22";
+    version = "2023-01-29";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "coq.artifacts";
-      rev = "0b78334e1edcd7eb3d2038621b388ff040f035fb";
-      sha256 = "0ag9f1h03s0pfiqaxclcz73sra0lwkva23dyacg53svcmpi9bpic";
+      rev = "53513efa7cc878ae7929ec6a389028effa569441";
+      sha256 = "0syix30ag4fda8hzpraijm0v6s64gr4vwz4i9c3lvcwssd4q6dfw";
     };
     meta.homepage = "https://github.com/ms-jpq/coq.artifacts/";
   };
 
   coq-thirdparty = buildVimPluginFrom2Nix {
     pname = "coq.thirdparty";
-    version = "2023-01-22";
+    version = "2023-01-29";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "coq.thirdparty";
-      rev = "d48f1315617092a8c0db29c2fd2d81d5e244c555";
-      sha256 = "1ddzfj9gg67jz5kx4i51iyyl3js1b3k7mzxxa8pp5fh1021pi1hy";
+      rev = "5b9fb4da049d48a1e8872f92c180a3646f610a14";
+      sha256 = "0bplxcdv3yxls893myc6a6kpq01wfypw2sgnd61pc8k78xkhmdps";
     };
     meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/";
   };
@@ -2143,12 +2143,12 @@ final: prev:
 
   coq_nvim = buildVimPluginFrom2Nix {
     pname = "coq_nvim";
-    version = "2023-01-22";
+    version = "2023-01-29";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "coq_nvim";
-      rev = "25232d23926c28c34f462dd9a57847d90b1af969";
-      sha256 = "1ycf3mfrs2a4c43mbdc3rs2kby1y2gxpp0kxilv8vp0c1idibyxr";
+      rev = "b6032a67b53ca92b7bda401ef45284e888c5f4b6";
+      sha256 = "1wxwwnbbz25idi4bwqzb9byf44awss97ca1925n5gmxq19g7x1gc";
     };
     meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
   };
@@ -2179,12 +2179,12 @@ final: prev:
 
   crates-nvim = buildVimPluginFrom2Nix {
     pname = "crates.nvim";
-    version = "2023-01-13";
+    version = "2023-01-24";
     src = fetchFromGitHub {
       owner = "saecki";
       repo = "crates.nvim";
-      rev = "707ed7d6f8927a5ec0c241aa793f694f1b05f731";
-      sha256 = "1nd7n871vlp5hdgl5xap09kn596rx99i11ccn7nr4abl56q2dp2s";
+      rev = "c2e9929c3ac40776c30bc7b328a7dff98756050a";
+      sha256 = "1lqxbb6r49afqqc2gfxdim1kr3dww74gg1pbz26s6bqvga1wzf8s";
     };
     meta.homepage = "https://github.com/saecki/crates.nvim/";
   };
@@ -2287,12 +2287,12 @@ final: prev:
 
   dashboard-nvim = buildVimPluginFrom2Nix {
     pname = "dashboard-nvim";
-    version = "2023-01-10";
+    version = "2023-01-29";
     src = fetchFromGitHub {
       owner = "glepnir";
       repo = "dashboard-nvim";
-      rev = "f7d623457d6621b25a1292b24e366fae40cb79ab";
-      sha256 = "17vwcqajvxhbvifg562zxvzwln0llb3gzyih3k61yssdp5akcfl0";
+      rev = "8bb7bf77c13eb61b03a9fb8b03035ce8e0bc29a7";
+      sha256 = "1ldakxhz6zkxr0nal0rrr91ccj3zs3578jcdkspri8w6rrg0bqm7";
     };
     meta.homepage = "https://github.com/glepnir/dashboard-nvim/";
   };
@@ -2661,24 +2661,24 @@ final: prev:
 
   dial-nvim = buildVimPluginFrom2Nix {
     pname = "dial.nvim";
-    version = "2023-01-15";
+    version = "2023-01-26";
     src = fetchFromGitHub {
       owner = "monaqa";
       repo = "dial.nvim";
-      rev = "dbcfd4510d31884d444ec33a4453d0f06ad4a5eb";
-      sha256 = "1qcwchka11gaphb36njcwa7qdw4hbp0x36w7mhsdm8p4i5xw3161";
+      rev = "5020da900cc5dfd7067f181ee2ebd872ca7c84e8";
+      sha256 = "0qxd2wn6q5v60ai222yjhzqkcb9v0dnlr4k2pvn9zqcwhj0qc2py";
     };
     meta.homepage = "https://github.com/monaqa/dial.nvim/";
   };
 
   diffview-nvim = buildVimPluginFrom2Nix {
     pname = "diffview.nvim";
-    version = "2023-01-15";
+    version = "2023-01-27";
     src = fetchFromGitHub {
       owner = "sindrets";
       repo = "diffview.nvim";
-      rev = "5bbcf162d03287296fe393f88da6065db3cf9fd0";
-      sha256 = "0lmqvm2sdj5mpq8hd03wyvmxgm6y286f0b7kr820znh1swlky3z1";
+      rev = "dc77f487b292c4a89dd437d80331e3aacbe3aaed";
+      sha256 = "086xkgd05s13ddb21jvmiyzhrv585wzaxq2fj4whbyyjhrhkjkjg";
     };
     meta.homepage = "https://github.com/sindrets/diffview.nvim/";
   };
@@ -2757,24 +2757,24 @@ final: prev:
 
   edge = buildVimPluginFrom2Nix {
     pname = "edge";
-    version = "2023-01-14";
+    version = "2023-01-25";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "edge";
-      rev = "5064f59094c42911e2ce57e1b59acda546c3905b";
-      sha256 = "1gssj61d8lma9kbadmdwgpa3i4343srlfnzjc3br527dhw7ihcqm";
+      rev = "c9a87dd0b7b5417c3797332ef06b17733626387f";
+      sha256 = "1cjl5gyp2wibhb8d4rwsav62bs0x12n4xjrkmz189rc5dmh1yplw";
     };
     meta.homepage = "https://github.com/sainnhe/edge/";
   };
 
   editorconfig-vim = buildVimPluginFrom2Nix {
     pname = "editorconfig-vim";
-    version = "2023-01-22";
+    version = "2023-01-25";
     src = fetchFromGitHub {
       owner = "editorconfig";
       repo = "editorconfig-vim";
-      rev = "ed23a49992a8adfc0a1db765cb5353adeb12f9ff";
-      sha256 = "09bi47gv5xd7wf7i53kbp3d2n5xzbns408cg52faxixd001m0f71";
+      rev = "ee6e91ca09d59043d365bd96a32e989bd75abe84";
+      sha256 = "068af4iznkvkafxnyj54clwalmzcywlfxphlzas4psg6qxzcdj13";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/editorconfig/editorconfig-vim/";
@@ -2843,12 +2843,12 @@ final: prev:
 
   everforest = buildVimPluginFrom2Nix {
     pname = "everforest";
-    version = "2023-01-03";
+    version = "2023-01-25";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "everforest";
-      rev = "62408f6cb189606bc4b16832ada29be3ae33515f";
-      sha256 = "18h7mwr9lpsdsdi90vn4nc868g50li27xvylrs2srppfjr7kvl7w";
+      rev = "aa97c07ee7b327120e467927c85a57ff1d713754";
+      sha256 = "0pr4igijc9n8gwr64x4srgbwg21m6x0bkl2v00ps6iscblfmzzr3";
     };
     meta.homepage = "https://github.com/sainnhe/everforest/";
   };
@@ -3084,12 +3084,12 @@ final: prev:
 
   friendly-snippets = buildVimPluginFrom2Nix {
     pname = "friendly-snippets";
-    version = "2023-01-19";
+    version = "2023-01-26";
     src = fetchFromGitHub {
       owner = "rafamadriz";
       repo = "friendly-snippets";
-      rev = "046e4d3491baf664e0eef5231d28beb49333578b";
-      sha256 = "1ywp6lfzdx4k1pj6fzxd703zcvwrfkbmcmggds267bjgadrfbbnc";
+      rev = "a6f7a1609addb4e57daa6bedc300f77f8d225ab7";
+      sha256 = "1rw4r8g4hblmlddbddd5skf5x8i4zaba8ncmzbr26svdmayk1c16";
     };
     meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
   };
@@ -3204,12 +3204,12 @@ final: prev:
 
   fzf-vim = buildVimPluginFrom2Nix {
     pname = "fzf.vim";
-    version = "2023-01-16";
+    version = "2023-01-27";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "fzf.vim";
-      rev = "bdf48c282ad2174c25c059b3cdb7956427b07a99";
-      sha256 = "0xjbnvyp0qnfnvz0grhyfcmzn7m90v3d3pfqfvivis3x1vws883q";
+      rev = "dc71692255b62d1f67dc55c8e51ab1aa467b1d46";
+      sha256 = "0h8yq3rxm6dfryjlh57n13bylwg4f4c4skc9z0krgl200v39ard0";
     };
     meta.homepage = "https://github.com/junegunn/fzf.vim/";
   };
@@ -3348,12 +3348,12 @@ final: prev:
 
   gitsigns-nvim = buildNeovimPluginFrom2Nix {
     pname = "gitsigns.nvim";
-    version = "2023-01-20";
+    version = "2023-01-27";
     src = fetchFromGitHub {
       owner = "lewis6991";
       repo = "gitsigns.nvim";
-      rev = "7b37bd5c2dd4d7abc86f2af096af79120608eeca";
-      sha256 = "19kna3rjdzfx2ys07jwb413saj9dg25i9ym6r8037r7h65h42yz2";
+      rev = "0d4fe37ba5285171f3729da955955205f3fa945b";
+      sha256 = "0bpi4xhpi031sgrkxdqrrl7fk16wdkk1k7ln6b8qyf5vyhkcckfz";
     };
     meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
   };
@@ -3372,12 +3372,12 @@ final: prev:
 
   glance-nvim = buildVimPluginFrom2Nix {
     pname = "glance.nvim";
-    version = "2023-01-10";
+    version = "2023-01-29";
     src = fetchFromGitHub {
       owner = "DNLHC";
       repo = "glance.nvim";
-      rev = "611478d2b36beb3c416c92f77e7c116d7bd25ee6";
-      sha256 = "0fhxg27yq2lfwfwgpg2zf28hrb6kfa6nffrm6bzajk192z1zbak0";
+      rev = "3275558ac586c2778318d36cf1bf48c071c286c2";
+      sha256 = "0xzd6i1nx2ijcl0r6nzspgcqv5c2m97k0nm5q92ivgkr5cgvw96g";
     };
     meta.homepage = "https://github.com/DNLHC/glance.nvim/";
   };
@@ -3396,12 +3396,12 @@ final: prev:
 
   glow-nvim = buildVimPluginFrom2Nix {
     pname = "glow.nvim";
-    version = "2023-01-14";
+    version = "2023-01-23";
     src = fetchFromGitHub {
       owner = "ellisonleao";
       repo = "glow.nvim";
-      rev = "c88184a0bbd3e32e0274ad8c3782aba718f1053c";
-      sha256 = "0b1yqy0j7akgqal1zq8h3zgrk0asvyffxrad81s2wv4r0dcg8csr";
+      rev = "77b5cb1235c3a7d9be9d8cf6e0454d2528414911";
+      sha256 = "178s6jnmry7wsj78cyq28lsnzvjzwlqbii00idxm510kifa09zqp";
     };
     meta.homepage = "https://github.com/ellisonleao/glow.nvim/";
   };
@@ -3516,24 +3516,24 @@ final: prev:
 
   gruvbox-material = buildVimPluginFrom2Nix {
     pname = "gruvbox-material";
-    version = "2023-01-14";
+    version = "2023-01-22";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "gruvbox-material";
-      rev = "30e9f4b0fa24c25980df1690a8c47c36e40b6673";
-      sha256 = "0nzrjrkfvckhzmxpwmn5qr62zfhkidmccfwj7iaaa3f4mi2ya5mb";
+      rev = "13b7eb4589d9ab0f388ca51047051f7158c930e5";
+      sha256 = "0mivkynl1xl40mk9ppiixk5mk8z70g30i7bm3lwpg02746vyp04v";
     };
     meta.homepage = "https://github.com/sainnhe/gruvbox-material/";
   };
 
   gruvbox-nvim = buildVimPluginFrom2Nix {
     pname = "gruvbox.nvim";
-    version = "2023-01-04";
+    version = "2023-01-26";
     src = fetchFromGitHub {
       owner = "ellisonleao";
       repo = "gruvbox.nvim";
-      rev = "e863942494d7c72a7c8d2c54cf651f28fc5a76ab";
-      sha256 = "0xh1y64bn274f7rm597gqgqjrra5fafydqcm127ikdiqsa948psy";
+      rev = "2e93ac50b3e95d650e62729f8810a005861e77ad";
+      sha256 = "0ahgpgjazrwsvqpvsgbgwzhiglzb291d1ww20f8grakdhppvas3h";
     };
     meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/";
   };
@@ -3587,24 +3587,24 @@ final: prev:
 
   harpoon = buildVimPluginFrom2Nix {
     pname = "harpoon";
-    version = "2022-11-23";
+    version = "2023-01-23";
     src = fetchFromGitHub {
       owner = "ThePrimeagen";
       repo = "harpoon";
-      rev = "21d0d1bfa3000e4384740bfaefa0ebc51c773786";
-      sha256 = "16idy8a2ar2gc7kdr888wwlyw4m48kbw2yzflz16fbdg56krb43d";
+      rev = "8c0bb0a328e57278f4783bb0e2ea32f296d36db1";
+      sha256 = "0w1v0r420m9aqkl4h4wjzhc7am8pf43pbv6g8mkf50x8mgxqyac6";
     };
     meta.homepage = "https://github.com/ThePrimeagen/harpoon/";
   };
 
   haskell-tools-nvim = buildVimPluginFrom2Nix {
     pname = "haskell-tools.nvim";
-    version = "2023-01-22";
+    version = "2023-01-28";
     src = fetchFromGitHub {
       owner = "MrcJkb";
       repo = "haskell-tools.nvim";
-      rev = "6ac15db045393cb40c484b19f3903d89acf2b125";
-      sha256 = "07rsq2wgdjqlav15jvaiwk4a33q6w07all7q6v7hzdpng8bmywgi";
+      rev = "5645e7326cd8724aeb8c222d49a4ffa55de97c82";
+      sha256 = "0lri9xgyhd9sfjbj7ggnhy0v8xrvswl4b6vnvk9lic05i54hl4rv";
     };
     meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
   };
@@ -3850,12 +3850,12 @@ final: prev:
 
   indent-blankline-nvim = buildVimPluginFrom2Nix {
     pname = "indent-blankline.nvim";
-    version = "2022-12-08";
+    version = "2023-01-26";
     src = fetchFromGitHub {
       owner = "lukas-reineke";
       repo = "indent-blankline.nvim";
-      rev = "c4c203c3e8a595bc333abaf168fcb10c13ed5fb7";
-      sha256 = "1kanfs0c1rbi23dm0vkmyzg4qkxq18hc2jc2izvyqiklbpi49x06";
+      rev = "8299fe7703dfff4b1752aeed271c3b95281a952d";
+      sha256 = "1z2rnaa9p62yid89n9pni9jzzdlcdc55i95c67yn5qzxd3h637hi";
     };
     meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/";
   };
@@ -4139,12 +4139,12 @@ final: prev:
 
   lazy-nvim = buildVimPluginFrom2Nix {
     pname = "lazy.nvim";
-    version = "2023-01-22";
+    version = "2023-01-25";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "lazy.nvim";
-      rev = "cab4682d22a0451bc36a648694235621b5dd808e";
-      sha256 = "0kxvb6l9pxdrs9cxh1cqf9p4y8nbfn9rx3a7zgd21h4c6126bcvh";
+      rev = "15fe46a728b7473d4cae368838bbc1c79c3a3f48";
+      sha256 = "0vw5p1cl9cblq39wvcsh6bq0li6qfqhxqvbn786b3xidlsw8wzv4";
     };
     meta.homepage = "https://github.com/folke/lazy.nvim/";
   };
@@ -4391,12 +4391,12 @@ final: prev:
 
   lir-nvim = buildVimPluginFrom2Nix {
     pname = "lir.nvim";
-    version = "2023-01-15";
+    version = "2023-01-25";
     src = fetchFromGitHub {
       owner = "tamago324";
       repo = "lir.nvim";
-      rev = "937e882c169d572a8a73dfcb71137a264c6369b2";
-      sha256 = "00aw82ymjqh729mi38l3nx0fhpp6rciqyqv0ar4g0v1qlq4gyp4l";
+      rev = "3aa6c2029499625dc76911cb007e9cd370137f11";
+      sha256 = "1pbpssf24zam4py6wg5k2m7hadivlsv25yvm4gxr0cnn79fv5cqp";
     };
     meta.homepage = "https://github.com/tamago324/lir.nvim/";
   };
@@ -4475,12 +4475,12 @@ final: prev:
 
   lsp-colors-nvim = buildVimPluginFrom2Nix {
     pname = "lsp-colors.nvim";
-    version = "2023-01-04";
+    version = "2023-01-23";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "lsp-colors.nvim";
-      rev = "750d59b643865b906996028147675e9af216ea95";
-      sha256 = "1i5qn1npa9zil3xql7yavx3p7w9xa26fz2lxw9ks23mpgdplk9gs";
+      rev = "d0b245232aeb197bbd097111d8b69621b0671edb";
+      sha256 = "1nvspfsd3x3i5wv8y3a0kvnnl56wha038dblz2d8psrbkghr1fbh";
     };
     meta.homepage = "https://github.com/folke/lsp-colors.nvim/";
   };
@@ -4547,12 +4547,12 @@ final: prev:
 
   lsp-zero-nvim = buildVimPluginFrom2Nix {
     pname = "lsp-zero.nvim";
-    version = "2023-01-19";
+    version = "2023-01-28";
     src = fetchFromGitHub {
       owner = "VonHeikemen";
       repo = "lsp-zero.nvim";
-      rev = "0b312c34372ec2b0daec722d1b7fad77b84bef5b";
-      sha256 = "095n5sq850b66cpbqfbqkz5xzd2klyv5ijknffrbdrx0gwjh561l";
+      rev = "d3e00eb9ac9131cd9241ba28c06678d11ba83dcf";
+      sha256 = "1wkad9iygialmbjxfs0zp6il9p5327g0fhwc22sld8h72298ca9p";
     };
     meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/";
   };
@@ -4654,12 +4654,12 @@ final: prev:
 
   luasnip = buildVimPluginFrom2Nix {
     pname = "luasnip";
-    version = "2023-01-22";
+    version = "2023-01-27";
     src = fetchFromGitHub {
       owner = "l3mon4d3";
       repo = "luasnip";
-      rev = "5955bdd7b20854aea74dc86c7ddf9989296d52d7";
-      sha256 = "0yzhz6cyhsh7aypvi0cz20wapn1xcild6llif7yvqbmvl4ygrdl5";
+      rev = "94f192cf5f0a1931b3035c2d8affdebec460968c";
+      sha256 = "163zh6pq6a7qxs3yvkrpn5sihrbn1vhmr3jv27p4swkh2x3dn5q8";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/l3mon4d3/luasnip/";
@@ -4727,36 +4727,36 @@ final: prev:
 
   mason-lspconfig-nvim = buildVimPluginFrom2Nix {
     pname = "mason-lspconfig.nvim";
-    version = "2023-01-22";
+    version = "2023-01-26";
     src = fetchFromGitHub {
       owner = "williamboman";
       repo = "mason-lspconfig.nvim";
-      rev = "d7ff61a828d59bc593ea3e2020508c114048d790";
-      sha256 = "03rmdhp30kzvc98gaagxbm3cm0q1mqy28wjih6r7l14kp3qv8bv1";
+      rev = "422b9745143150e16cd3fe331c74f6737de75e72";
+      sha256 = "0imsx0zz5059anxbglfvfimnffjw7pzi3byp5arj7qwjmkrwgyay";
     };
     meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/";
   };
 
   mason-tool-installer-nvim = buildVimPluginFrom2Nix {
     pname = "mason-tool-installer.nvim";
-    version = "2022-10-29";
+    version = "2023-01-26";
     src = fetchFromGitHub {
       owner = "WhoIsSethDaniel";
       repo = "mason-tool-installer.nvim";
-      rev = "27f61f75a71bb3c2504a17e02b571f79cae43676";
-      sha256 = "0zhmffjqssfqjbx69j7ambzr4dz52r4sgl6xhmzf9qxr8xlkhvny";
+      rev = "6ca38efeb0406dea8da6c97f61d6f6ef30ab0576";
+      sha256 = "0a4h7hmm53qaydnqfrfp7yb4j157da0mvr0ivkm77f270rr2pwg0";
     };
     meta.homepage = "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/";
   };
 
   mason-nvim = buildVimPluginFrom2Nix {
     pname = "mason.nvim";
-    version = "2023-01-22";
+    version = "2023-01-28";
     src = fetchFromGitHub {
       owner = "williamboman";
       repo = "mason.nvim";
-      rev = "bb88357eff0d0c69ab8ecc5985952e0a9a72175a";
-      sha256 = "0hfnwjv165w1d89xd7gs11q5j8a52zj43acxaash2qaxy5hl3zpz";
+      rev = "2469bfc2538652cb0cf88c129f67d38e46a9cb59";
+      sha256 = "13ymyc881zkd7c47ayc9cknkzabcgmskm94cq9qjk34r00zgd2jh";
     };
     meta.homepage = "https://github.com/williamboman/mason.nvim/";
   };
@@ -4823,12 +4823,12 @@ final: prev:
 
   mini-nvim = buildVimPluginFrom2Nix {
     pname = "mini.nvim";
-    version = "2023-01-21";
+    version = "2023-01-24";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.nvim";
-      rev = "1c11d5fdb71c1d766545e42b0dd99eda50f1e349";
-      sha256 = "16g9yzwiibrjhl9ln911kw433li5av64p6nrhypj6pcf2n1dkrfc";
+      rev = "81a575e0c51d4607bf6690f12906c7590d961717";
+      sha256 = "1lxvcqqixxpw61d0dd8rfn67g6jr7hlj9pj3w4hpl33mw7ji03zy";
     };
     meta.homepage = "https://github.com/echasnovski/mini.nvim/";
   };
@@ -5183,12 +5183,12 @@ final: prev:
 
   neoconf-nvim = buildVimPluginFrom2Nix {
     pname = "neoconf.nvim";
-    version = "2023-01-22";
+    version = "2023-01-28";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "neoconf.nvim";
-      rev = "0d4a5197def6019f125444c3870aa5a8f251a2db";
-      sha256 = "03shsrnagr37awsvr88pzm1yhdp680dbzzgknzxf5d9sw7c3jfsg";
+      rev = "d65df617fd98d1224b342fc6a6ee3cfcc2b6c751";
+      sha256 = "1ca1p6cpwps43v7nl661ljsnrhiafx41nap73hvyjblm1c732cjx";
     };
     meta.homepage = "https://github.com/folke/neoconf.nvim/";
   };
@@ -5207,12 +5207,12 @@ final: prev:
 
   neodev-nvim = buildVimPluginFrom2Nix {
     pname = "neodev.nvim";
-    version = "2023-01-21";
+    version = "2023-01-28";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "neodev.nvim";
-      rev = "34dd33cd283b3a89f70d32c8f55bb5ec4ce2de93";
-      sha256 = "1skz0fj0v5s926mfg58nrdmivsadjzlhlymxfyz0zvkj3vkf7d50";
+      rev = "8fd21037453f4306f500e437c5cbdf6e8b6c2f99";
+      sha256 = "0zxac4425677w3pvj5yp7sxllmnj4bhwc6kwwa6c409wvyzrfas2";
     };
     meta.homepage = "https://github.com/folke/neodev.nvim/";
   };
@@ -5231,12 +5231,12 @@ final: prev:
 
   neogit = buildVimPluginFrom2Nix {
     pname = "neogit";
-    version = "2023-01-20";
+    version = "2023-01-27";
     src = fetchFromGitHub {
       owner = "TimUntersberger";
       repo = "neogit";
-      rev = "30265e7a1bdf59361b37e293cdcecc167851c602";
-      sha256 = "0fk29ggvncc26zx8zxdbyhqydxmvw3k71nf7ipp7pcxgkgm4zj4s";
+      rev = "da8b0931724864e20c541ec1ec51f998cf8212f9";
+      sha256 = "1hww128m01k9b3zyp1zfjj7scshafafxssn1cwgbczjc5y10yhja";
     };
     meta.homepage = "https://github.com/TimUntersberger/neogit/";
   };
@@ -5351,12 +5351,12 @@ final: prev:
 
   neotest = buildVimPluginFrom2Nix {
     pname = "neotest";
-    version = "2023-01-18";
+    version = "2023-01-25";
     src = fetchFromGitHub {
       owner = "nvim-neotest";
       repo = "neotest";
-      rev = "6676edc3078b8936df989df639900dc9a70dfc8a";
-      sha256 = "1rhh775mm7byxcazl63hwdz8yjlz4fghd7yxaysv49s3rbrka1z1";
+      rev = "392808a91d6ee28d27cbfb93c9fd9781759b5d00";
+      sha256 = "03s8kkj386i77vryss1br3033azmbjhf4wzaqnrm9238951hls5w";
     };
     meta.homepage = "https://github.com/nvim-neotest/neotest/";
   };
@@ -5387,12 +5387,12 @@ final: prev:
 
   neovim-fuzzy = buildVimPluginFrom2Nix {
     pname = "neovim-fuzzy";
-    version = "2021-07-02";
+    version = "2023-01-25";
     src = fetchFromGitHub {
       owner = "cloudhead";
       repo = "neovim-fuzzy";
-      rev = "0bef4e1a81c65fc05d31380dd74454bd67733837";
-      sha256 = "02a8ipk341bs6y8mk7nixdkbk1c4jdddsjp1qvqgyyca0shaqsz8";
+      rev = "f6a1429bd0ac9953eb1d838ba800e69685fbcac1";
+      sha256 = "0d2r8dx9sicf4fjf87ksclsvdvx2f7npjqpscyvycn04wrzvjsaq";
     };
     meta.homepage = "https://github.com/cloudhead/neovim-fuzzy/";
   };
@@ -5423,12 +5423,12 @@ final: prev:
 
   nerdcommenter = buildVimPluginFrom2Nix {
     pname = "nerdcommenter";
-    version = "2022-11-09";
+    version = "2023-01-27";
     src = fetchFromGitHub {
       owner = "preservim";
       repo = "nerdcommenter";
-      rev = "98cc4a2d64ca67cccbf5b5cf47c682ebadaaff58";
-      sha256 = "0s8czq77lsf10b2fsw6mhavirc1ivby1a9c5y49zj9fva876h968";
+      rev = "06f6166e5dfcf78eb0d055c21274cafc3927d461";
+      sha256 = "0h340y2v4bb1wfqa8015skd7yb694iwqgq3v42mqpcsa3ssnvh70";
     };
     meta.homepage = "https://github.com/preservim/nerdcommenter/";
   };
@@ -5483,24 +5483,24 @@ final: prev:
 
   nginx-vim = buildVimPluginFrom2Nix {
     pname = "nginx.vim";
-    version = "2022-12-31";
+    version = "2023-01-25";
     src = fetchFromGitHub {
       owner = "chr4";
       repo = "nginx.vim";
-      rev = "99694458062e4e1d138bd022b10432a05612a2db";
-      sha256 = "1ih25dl3zzcp2245vrq3ypii76b3ri73ayv3w8qg7s73j1g1c6p5";
+      rev = "8a42e93c9f004fbc5b32bb2e4940107fb7b70a42";
+      sha256 = "12dhzglvmpv1b0ynwig224dnilakqkwh4npidmgh5njy2rrqvy9m";
     };
     meta.homepage = "https://github.com/chr4/nginx.vim/";
   };
 
   nightfox-nvim = buildVimPluginFrom2Nix {
     pname = "nightfox.nvim";
-    version = "2023-01-18";
+    version = "2023-01-29";
     src = fetchFromGitHub {
       owner = "EdenEast";
       repo = "nightfox.nvim";
-      rev = "97e66dfaaecdc81f1dd7da00f8d4a6033f3bf6b2";
-      sha256 = "01q3qlazc6m39rn67qpz03prrs2x9wqf71xi5s4a82vp53ha1fjv";
+      rev = "789b3029d5058e925436ac29eb0521aa4e042b36";
+      sha256 = "0yg2a3qp4bdr1gv0kkl92qa7s605c652jgkym8hk95jfmiz12hyf";
     };
     meta.homepage = "https://github.com/EdenEast/nightfox.nvim/";
   };
@@ -5531,12 +5531,12 @@ final: prev:
 
   nlsp-settings-nvim = buildVimPluginFrom2Nix {
     pname = "nlsp-settings.nvim";
-    version = "2023-01-22";
+    version = "2023-01-27";
     src = fetchFromGitHub {
       owner = "tamago324";
       repo = "nlsp-settings.nvim";
-      rev = "26fb0c6c5653b0bda95f29eae638305bab351123";
-      sha256 = "0w9yy5c4rxw0k8z975p6zn1792lmjld1gch1m1gji0nvyyasvsbi";
+      rev = "69f4018faa021027d4b0651b4836bc8ac127d573";
+      sha256 = "0a5rqbq821aiqfam0iw6jmwz07rcf1r68r9k5bs06cm7pdai3784";
     };
     meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
   };
@@ -5567,12 +5567,12 @@ final: prev:
 
   noice-nvim = buildVimPluginFrom2Nix {
     pname = "noice.nvim";
-    version = "2023-01-17";
+    version = "2023-01-25";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "noice.nvim";
-      rev = "16b60455867dec069bf41699d690fa01261b4bf6";
-      sha256 = "1fsngf0lf45csr5w6691xkdnkjbmp82xr4q65fnc5p0931q1yl7x";
+      rev = "20f47dcebd24c84650bb8ed57d8349cc53dffd3f";
+      sha256 = "05ph9hrxl6k6ic6kpghcpygq7pzm4dgzvhr6f0r9ar3b8fanz1n3";
     };
     meta.homepage = "https://github.com/folke/noice.nvim/";
   };
@@ -5639,12 +5639,12 @@ final: prev:
 
   null-ls-nvim = buildVimPluginFrom2Nix {
     pname = "null-ls.nvim";
-    version = "2023-01-20";
+    version = "2023-01-28";
     src = fetchFromGitHub {
       owner = "jose-elias-alvarez";
       repo = "null-ls.nvim";
-      rev = "33cfeb7a761f08e8535dca722d4b237cabadd371";
-      sha256 = "1lna5833nvk8db5jv549147078m6mzgzqvc42gqby8ma54rn6dq3";
+      rev = "7b2b28e207a1df4ebb13c7dc0bd83f69b5403d71";
+      sha256 = "02ing7v31xk43161986b7np04d58cxkm19h00mq95gdbqy3gnaz8";
     };
     meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
   };
@@ -5759,12 +5759,12 @@ final: prev:
 
   nvim-cmp = buildNeovimPluginFrom2Nix {
     pname = "nvim-cmp";
-    version = "2023-01-06";
+    version = "2023-01-26";
     src = fetchFromGitHub {
       owner = "hrsh7th";
       repo = "nvim-cmp";
-      rev = "11a95792a5be0f5a40bab5fc5b670e5b1399a939";
-      sha256 = "178r1v9p7mcwg8xgl3jr4ibjsh9wiq0y81mps0nhx8q2dgnx8cyz";
+      rev = "e7e2ef7031db8e0cfad7ad9916ec766ddd9dbb3b";
+      sha256 = "1jd1x6rg9k5gjwnlfrhmy976xky6sm7335hcz2lpgjapgy7rnyz7";
     };
     meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
   };
@@ -5867,12 +5867,12 @@ final: prev:
 
   nvim-dap = buildVimPluginFrom2Nix {
     pname = "nvim-dap";
-    version = "2023-01-18";
+    version = "2023-01-28";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-dap";
-      rev = "c64a6627bb01eb151da96b28091797beaac09536";
-      sha256 = "1nf48ns1zfmpizmki9545w4m8ndmkh76aadlmjpzn7y4draq5asf";
+      rev = "d213b7d5bf0d56b1f47c62a2f5d4ebd202fe0d12";
+      sha256 = "080pnbnq9ysjqn491y83mxylrgvwbwbh2qvwmcsb0y5kjjq77ix9";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
   };
@@ -5903,24 +5903,24 @@ final: prev:
 
   nvim-dap-ui = buildVimPluginFrom2Nix {
     pname = "nvim-dap-ui";
-    version = "2023-01-11";
+    version = "2023-01-28";
     src = fetchFromGitHub {
       owner = "rcarriga";
       repo = "nvim-dap-ui";
-      rev = "b80227ea56a48177786904f6322abc8b2dc0bc36";
-      sha256 = "11a9jn4m1db2zlkfvwym98h15l46idf14gaddczf1njxhms52nm1";
+      rev = "e26fba0562cb9c904f7a6510a94961b82701a16f";
+      sha256 = "19rvvls95ih4v2wkdyyfzwv8aa4wfw281j325v1sx6fbblfr0ykx";
     };
     meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/";
   };
 
   nvim-dap-virtual-text = buildVimPluginFrom2Nix {
     pname = "nvim-dap-virtual-text";
-    version = "2023-01-16";
+    version = "2023-01-28";
     src = fetchFromGitHub {
       owner = "theHamsta";
       repo = "nvim-dap-virtual-text";
-      rev = "191345947a92a5188d791e9786a5b4f205dcaca3";
-      sha256 = "05rhpr34qsjczcv5kjd8664629308k3nazd8ksgfrpkjbg0ifjq9";
+      rev = "7f7f2af549e72a0b7bddc3b4f827beb027ea8ce3";
+      sha256 = "0ljipdw5cbcny6790r85hsfhnf0may6bamf27s3mzabrczayyd1w";
     };
     meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/";
   };
@@ -6119,12 +6119,12 @@ final: prev:
 
   nvim-lspconfig = buildVimPluginFrom2Nix {
     pname = "nvim-lspconfig";
-    version = "2023-01-22";
+    version = "2023-01-27";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "85cd2ecacd8805614efe3fb3a5146ac7d0f88a17";
-      sha256 = "0fhfqf4rag58q64wfrlfzyw87n3zv24gnwr9inn3i63b27r57w83";
+      rev = "1e988250a0f52a68ddb72905d623405d634e9c5d";
+      sha256 = "1l3mdym1a0h8d6dsv6wr7whgsml7z9r9g0f6qraj4yp93l3n3wd4";
     };
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
   };
@@ -6167,12 +6167,12 @@ final: prev:
 
   nvim-metals = buildVimPluginFrom2Nix {
     pname = "nvim-metals";
-    version = "2023-01-14";
+    version = "2023-01-27";
     src = fetchFromGitHub {
       owner = "scalameta";
       repo = "nvim-metals";
-      rev = "c552c96b837ce8b1318cf3eccbda41a73760cb21";
-      sha256 = "1fqi33clnjsyx0fkdajl9vyrpmbdry11dm38nmm5d83a4zyb4qax";
+      rev = "0b9c5303b7402ae24971ed2f0e5890fd72505532";
+      sha256 = "18r8vhflf9k8rmbw7czv2v7l46144nv7ia3sszhby8p1npd57ld7";
     };
     meta.homepage = "https://github.com/scalameta/nvim-metals/";
   };
@@ -6191,12 +6191,12 @@ final: prev:
 
   nvim-navic = buildVimPluginFrom2Nix {
     pname = "nvim-navic";
-    version = "2022-12-11";
+    version = "2023-01-26";
     src = fetchFromGitHub {
       owner = "smiteshp";
       repo = "nvim-navic";
-      rev = "7a2b823152fe4de65ee7925b0e32d26ed73bc57c";
-      sha256 = "00hsnlbr6s2ljwzl5ayjw1m2bdm4kmypl7xlg2p8l1yjnnsk4dn4";
+      rev = "11e08391eeed00effa85ca24ff9d1e0472cbcd6a";
+      sha256 = "16nr10lyzq45hm49mh2y6xjk8f59bra1mzgybclz09l9aikzmkhq";
     };
     meta.homepage = "https://github.com/smiteshp/nvim-navic/";
   };
@@ -6287,12 +6287,12 @@ final: prev:
 
   nvim-snippy = buildVimPluginFrom2Nix {
     pname = "nvim-snippy";
-    version = "2023-01-19";
+    version = "2023-01-28";
     src = fetchFromGitHub {
       owner = "dcampos";
       repo = "nvim-snippy";
-      rev = "97df9b3e7da6f9a7325cb5c32649dddc48bb1630";
-      sha256 = "188gr37y77l74dlzsp8wgccglx5c67gpdb3fmrn34cbw7id7fj7d";
+      rev = "04f602f931e81dc330a0c4dd51f3dd896f0be920";
+      sha256 = "1vvh9mgqspw3q3qhv0assvjmx9hkm5ihqxdgjbh7z471g9jzhz78";
     };
     meta.homepage = "https://github.com/dcampos/nvim-snippy/";
   };
@@ -6359,24 +6359,24 @@ final: prev:
 
   nvim-tree-lua = buildVimPluginFrom2Nix {
     pname = "nvim-tree.lua";
-    version = "2023-01-21";
+    version = "2023-01-28";
     src = fetchFromGitHub {
       owner = "nvim-tree";
       repo = "nvim-tree.lua";
-      rev = "96506fee49542f3aedab76368d400a147fea344e";
-      sha256 = "137gwzb6xq32mwkbzwqiw2i3bgjz07nd1xx7d6ys825a9akkddcn";
+      rev = "e14989c0eaa6f9c299d48f7e45ce1ed04b21180f";
+      sha256 = "04wx9lcfakg4pa1b3njrld5f59wqzsnvc4pkgvjx39iiis6f4ga8";
     };
     meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
   };
 
   nvim-treesitter = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter";
-    version = "2023-01-22";
+    version = "2023-01-28";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "7bef1d53302f1087a07f83a4321582d835f44d4f";
-      sha256 = "1v560a216ink7km0gr32kgjxd84lcvpiwy991pvp3s0xqxmw5bx7";
+      rev = "c610c78576f372684f42eeaec56d13be2cf304d2";
+      sha256 = "1xl40cfrs04g4wvysgk5zm928kj9imzbs1zxq0z3xjgzgxbs8c3z";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
   };
@@ -6419,12 +6419,12 @@ final: prev:
 
   nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter-textobjects";
-    version = "2023-01-17";
+    version = "2023-01-28";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter-textobjects";
-      rev = "2fb97bd6c53d78517d2022a0b84422c18ce5686e";
-      sha256 = "0wwzmkkdw3n2agxsclaniblwfjaqwav7vyd5w0fjcqvqjim4jd9d";
+      rev = "9011d333aa411ae71ca8762ca3a277ce6b9e6527";
+      sha256 = "09pb0miwm2wzsn4d1jyayay3b3ig67y30mjnncz1jxx688blvc86";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
   };
@@ -6478,12 +6478,12 @@ final: prev:
 
   nvim-web-devicons = buildVimPluginFrom2Nix {
     pname = "nvim-web-devicons";
-    version = "2023-01-21";
+    version = "2023-01-28";
     src = fetchFromGitHub {
       owner = "nvim-tree";
       repo = "nvim-web-devicons";
-      rev = "13d06d74afad093d8312fe051633b55f24049c16";
-      sha256 = "07qixz6l1dyy84l14mbx6jwrmpmwdgvj8crq9vxqh44w5gwjr3qs";
+      rev = "a421d183ef37dfa13f51a5805bed2381aebf9080";
+      sha256 = "0754m29aizcav7ynqflpbv3kzz2n7mw2xx8aliay3slzq18kix8d";
     };
     meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/";
   };
@@ -6562,24 +6562,24 @@ final: prev:
 
   octo-nvim = buildVimPluginFrom2Nix {
     pname = "octo.nvim";
-    version = "2023-01-18";
+    version = "2023-01-27";
     src = fetchFromGitHub {
       owner = "pwntester";
       repo = "octo.nvim";
-      rev = "52b2c9702fb9e219cd4182ed29daee644ec535f6";
-      sha256 = "0inw57p02ad644f7fjfwsvk0lap6kpwrriz43kpp2x7wypkj8jxi";
+      rev = "7900dc0cd37e7bb5d4175a37c9c4c3dfb94a1f7b";
+      sha256 = "1197x2agkc5h97z1hi6pk72sbx397vccpc5xsxc9hrsq5llpx37n";
     };
     meta.homepage = "https://github.com/pwntester/octo.nvim/";
   };
 
   oil-nvim = buildVimPluginFrom2Nix {
     pname = "oil.nvim";
-    version = "2023-01-22";
+    version = "2023-01-29";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "oil.nvim";
-      rev = "6c6b7673af1314dd7c8254a95eb8d331f6b76ac6";
-      sha256 = "0gwfl7hslgbr2fawx15wbd6p4j60jnd2l68v36rxrmxl9iqm1ra6";
+      rev = "716dd8f9cf1ff2b9cda03497025612ce3c366307";
+      sha256 = "14qydwhkr90w2bb1xza44pm2d1iiqmvijqik8qjs122i6z5hc7c6";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/oil.nvim/";
@@ -6635,12 +6635,12 @@ final: prev:
 
   onedarkpro-nvim = buildVimPluginFrom2Nix {
     pname = "onedarkpro.nvim";
-    version = "2023-01-18";
+    version = "2023-01-24";
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "onedarkpro.nvim";
-      rev = "2aeceb0f0700ba57c8248aa36b3a900e58f5820e";
-      sha256 = "0nslv7dxsxfjh2xlkh5w10gpi29c65g3mf9m7zyrbj3s0m5pldgg";
+      rev = "c3409eca73d2ae334935ca4afdb0428f453ba404";
+      sha256 = "1zj4kp8ffhgq9syqh5w7rr5zzb92kvzdkcpf3x0v2d4cwxysd2ji";
     };
     meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
   };
@@ -6695,12 +6695,12 @@ final: prev:
 
   orgmode = buildVimPluginFrom2Nix {
     pname = "orgmode";
-    version = "2022-12-13";
+    version = "2023-01-26";
     src = fetchFromGitHub {
       owner = "nvim-orgmode";
       repo = "orgmode";
-      rev = "dadf56334d2be7d9e8ad1e22c697a6e75f0164b7";
-      sha256 = "19bp9mbjldxi2qzsa364rw86zp450zr2ajnnflp2sr0hhdvg620f";
+      rev = "458fac9f6c33400dd6976514ea29f88fa34fe1cd";
+      sha256 = "06hp5ylp7xi22w9q5bssdfc9hamgvlsnvxppkgqk0glidsy90pbd";
     };
     meta.homepage = "https://github.com/nvim-orgmode/orgmode/";
   };
@@ -6839,12 +6839,12 @@ final: prev:
 
   playground = buildVimPluginFrom2Nix {
     pname = "playground";
-    version = "2023-01-15";
+    version = "2023-01-24";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "playground";
-      rev = "01c27f37a1f067200680cacfb7b96f5ad2fa5cd6";
-      sha256 = "13h5w5f9ywigi33g38ij5k24kyyz2nafwhzs5zqn8mngnvh7h0km";
+      rev = "c19bcfd6a3681bc876e1b861f6685bfc04972d0d";
+      sha256 = "07vhiknf5gfd8rp6ynp9xq3rlc17b1sh322mlhg3976hl62lgs4f";
     };
     meta.homepage = "https://github.com/nvim-treesitter/playground/";
   };
@@ -7129,12 +7129,12 @@ final: prev:
 
   refactoring-nvim = buildVimPluginFrom2Nix {
     pname = "refactoring.nvim";
-    version = "2023-01-19";
+    version = "2023-01-23";
     src = fetchFromGitHub {
       owner = "theprimeagen";
       repo = "refactoring.nvim";
-      rev = "ee63338cfb9151018afb243f5af5262c1686b280";
-      sha256 = "03fgla400n5mqhpfa3lljzark76ah7n0mzzxfsn5c6m3hxfkvaim";
+      rev = "57c32c6b7a211e5a3a5e4ddc4ad2033daff5cf9a";
+      sha256 = "0w4gw09b94dhxbbkyl0zhwxl5m370qp8la6frbjcan06bqh85xcv";
     };
     meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";
   };
@@ -7165,12 +7165,12 @@ final: prev:
 
   rest-nvim = buildNeovimPluginFrom2Nix {
     pname = "rest.nvim";
-    version = "2023-01-04";
+    version = "2023-01-23";
     src = fetchFromGitHub {
       owner = "rest-nvim";
       repo = "rest.nvim";
-      rev = "090e253c114b6d5448bac5869a28a6623c195e3a";
-      sha256 = "0qdxm9rcbq78yh0s3cvsbpnjjfd772fhkdrzwg1gc7k8p4ppnm1q";
+      rev = "0fdb69f328529b34a2279c14be63b3325dc52740";
+      sha256 = "0dn9g6a3lidavw381cd9ckhw3biiq81vypgg4bl5yl6w4avp5nr0";
     };
     meta.homepage = "https://github.com/rest-nvim/rest.nvim/";
   };
@@ -7249,12 +7249,12 @@ final: prev:
 
   rust-tools-nvim = buildVimPluginFrom2Nix {
     pname = "rust-tools.nvim";
-    version = "2023-01-08";
+    version = "2023-01-25";
     src = fetchFromGitHub {
       owner = "simrat39";
       repo = "rust-tools.nvim";
-      rev = "df584e84393ef255f5b8cbd709677d6a3a5bf42f";
-      sha256 = "1h2p6xdv4bxphn98iwjzk9fh54lh1ff41smp2n0j84inqpl0mygv";
+      rev = "b297167d9e01accc9b9afe872ce91e791df2dde0";
+      sha256 = "1fwjykp6gaafniflb3816z2nkfkpwa9pkxdcs6l2ka06ngr3xdih";
     };
     meta.homepage = "https://github.com/simrat39/rust-tools.nvim/";
   };
@@ -7514,12 +7514,12 @@ final: prev:
 
   sonokai = buildVimPluginFrom2Nix {
     pname = "sonokai";
-    version = "2023-01-14";
+    version = "2023-01-24";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "sonokai";
-      rev = "e2e89497f178bec568a0a43cda651f0429ec8ec1";
-      sha256 = "0dh5dsn8znhxsdr9plxa2mchlnfbgrvalc5pnz2wdsc2adz37521";
+      rev = "c55985d5df53751a44fc532a53bed3be9f3b0d14";
+      sha256 = "0jmwsdpmj01g78gkv4cc7l5fxxhxrzlx2lkwmj5r9klkx07fpsrg";
     };
     meta.homepage = "https://github.com/sainnhe/sonokai/";
   };
@@ -7647,12 +7647,12 @@ final: prev:
 
   sqlite-lua = buildVimPluginFrom2Nix {
     pname = "sqlite.lua";
-    version = "2022-11-18";
+    version = "2023-01-23";
     src = fetchFromGitHub {
       owner = "kkharji";
       repo = "sqlite.lua";
-      rev = "53cac3fdb5f5e4e63e243232b6eccf3c764ae18a";
-      sha256 = "0qp3b6jd6khp8wmc4s8n6sc518p6m44l7f7ln8pr91jz6qh5z30p";
+      rev = "93ff5824682ecc874200e338fd8ca9ccd08508f8";
+      sha256 = "07wv8shiilibgnp7l0pk9b6qwydwwfvdzdv2vvwn0k0jpaxsjvmy";
     };
     meta.homepage = "https://github.com/kkharji/sqlite.lua/";
   };
@@ -7803,12 +7803,12 @@ final: prev:
 
   swayconfig-vim = buildVimPluginFrom2Nix {
     pname = "swayconfig.vim";
-    version = "2022-10-05";
+    version = "2023-01-28";
     src = fetchFromGitHub {
       owner = "jamespeapen";
       repo = "swayconfig.vim";
-      rev = "30014a34d0ab46f26311f47c1c11ba0b9166f1d5";
-      sha256 = "03jw3w80zgmql8ngs8s1j8digwkn7206psklmcnmc1p2drb2d3pf";
+      rev = "ce04a8e8c494590382d1b32a20ed3b451d608623";
+      sha256 = "0lirihvrx0qn59nbg5s3sh1jgv0v3q4ag7kgvc3r7q9a2fbjg46y";
     };
     meta.homepage = "https://github.com/jamespeapen/swayconfig.vim/";
   };
@@ -7840,12 +7840,12 @@ final: prev:
 
   symbols-outline-nvim = buildVimPluginFrom2Nix {
     pname = "symbols-outline.nvim";
-    version = "2022-08-29";
+    version = "2023-01-25";
     src = fetchFromGitHub {
       owner = "simrat39";
       repo = "symbols-outline.nvim";
-      rev = "6a3ed24c5631da7a5d418bced57c16b32af7747c";
-      sha256 = "0x4jq7z54nj7p4abnaqc2cnldyi7rcl5r444n9jc82i5pmg6ck27";
+      rev = "512791925d57a61c545bc303356e8a8f7869763c";
+      sha256 = "11c5gr117cad9zw5c8msh7xrk1n02kmyb52vwbrzd0vd0kzy52ia";
     };
     meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/";
   };
@@ -8166,12 +8166,12 @@ final: prev:
 
   telescope-manix = buildVimPluginFrom2Nix {
     pname = "telescope-manix";
-    version = "2023-01-14";
+    version = "2023-01-23";
     src = fetchFromGitHub {
       owner = "MrcJkb";
       repo = "telescope-manix";
-      rev = "55f73d0743d8597ca9c7bfbebe286e0b5bbe6138";
-      sha256 = "1jgl3qb92x4wnkvjwzpqbkcmw22hc4m7nmp1dpj8cy30z5yawg54";
+      rev = "66feda7a276366edfc555cb0a7e56b8dd70aadc3";
+      sha256 = "1n4ygj3jhgqfg7xrh3hd56x14yqk6rdy3099hy8azbrx40zx0zdw";
     };
     meta.homepage = "https://github.com/MrcJkb/telescope-manix/";
   };
@@ -8322,12 +8322,12 @@ final: prev:
 
   term-edit-nvim = buildVimPluginFrom2Nix {
     pname = "term-edit.nvim";
-    version = "2023-01-21";
+    version = "2023-01-25";
     src = fetchFromGitHub {
       owner = "chomosuke";
       repo = "term-edit.nvim";
-      rev = "eb9a18b77fa54d0416e315dc0f9793f480930419";
-      sha256 = "0562rlcah3czb00m9fkc1dhhy0v9zgi5lx2hc3zjprccdhw9q41j";
+      rev = "9efbb3298ce63807750a415a091d7d535ff0a7e8";
+      sha256 = "1qb16nnraxg1b9v2hwi8ywzzxgd6p8hxy673d5x561firnfj1zqi";
     };
     meta.homepage = "https://github.com/chomosuke/term-edit.nvim/";
   };
@@ -8466,12 +8466,12 @@ final: prev:
 
   todo-comments-nvim = buildVimPluginFrom2Nix {
     pname = "todo-comments.nvim";
-    version = "2023-01-04";
+    version = "2023-01-23";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "todo-comments.nvim";
-      rev = "077c59586d9d0726b0696dc5680eb863f4e04bc5";
-      sha256 = "1gvglhdwaqrm3anaz7wyq3k1bjikjq7nqrdaszd9nnp3n4yarmhr";
+      rev = "74c7d28cb50b0713c881ef69bcb6cdd77d8907d1";
+      sha256 = "1k42l9ghpkds2fqxj8f0anlh4gkpiid28zwkhy29k2br21m7q5fq";
     };
     meta.homepage = "https://github.com/folke/todo-comments.nvim/";
   };
@@ -8515,12 +8515,12 @@ final: prev:
 
   tokyonight-nvim = buildVimPluginFrom2Nix {
     pname = "tokyonight.nvim";
-    version = "2023-01-18";
+    version = "2023-01-23";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "tokyonight.nvim";
-      rev = "4071f7fa984859c5de7a1fd27069b99c3a0d802a";
-      sha256 = "0l4ibd0bi2msj2camxls039n6pw008ll50mf5r8888265hmqzkfw";
+      rev = "affb21a81e6d7de073378eb86d02864c594104d9";
+      sha256 = "0q37ldqajhp46g0ikc3yfnq9bgmghqdb8884rc56sraql9g0nwmi";
     };
     meta.homepage = "https://github.com/folke/tokyonight.nvim/";
   };
@@ -8587,12 +8587,12 @@ final: prev:
 
   trouble-nvim = buildVimPluginFrom2Nix {
     pname = "trouble.nvim";
-    version = "2023-01-19";
+    version = "2023-01-23";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "trouble.nvim";
-      rev = "b2a0afac2c319a481f0f0318963a74d672ba5766";
-      sha256 = "0wjhwzk4drm1phvndbkjjcax3q1gmh9akl5i7fwd8635w8dpc9fs";
+      rev = "490f7fe6d227f4f7a64f00be8c7dcd7a508ed271";
+      sha256 = "1bdhn3y4zs5m66bj009lqyn5spdn36vr8yc04k35xv5434011p0i";
     };
     meta.homepage = "https://github.com/folke/trouble.nvim/";
   };
@@ -8635,12 +8635,12 @@ final: prev:
 
   twilight-nvim = buildVimPluginFrom2Nix {
     pname = "twilight.nvim";
-    version = "2023-01-04";
+    version = "2023-01-23";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "twilight.nvim";
-      rev = "8bb7fa7b918baab1ca81b977102ddb54afa63512";
-      sha256 = "0bqd24cv0mb288qppah5hpmjlik37hbfifgbclfjkkb7irf1va8y";
+      rev = "9410252bed96887ca5a86bf16435a3a51a0e6ce5";
+      sha256 = "17mw3zqlviz4jsmjfsvddjd60xgkfihc60jv391rinl1w36l79ld";
     };
     meta.homepage = "https://github.com/folke/twilight.nvim/";
   };
@@ -8683,12 +8683,12 @@ final: prev:
 
   unicode-vim = buildVimPluginFrom2Nix {
     pname = "unicode.vim";
-    version = "2022-09-25";
+    version = "2023-01-28";
     src = fetchFromGitHub {
       owner = "chrisbra";
       repo = "unicode.vim";
-      rev = "4c851a24310fcfb5540a7e2b17c563f1f542e3a2";
-      sha256 = "0zgycqvr1z88mjh1xfyvmr00nriwfxk7imvcfqskh9l0wy6z0m52";
+      rev = "d4925c55b5d6d57003100b3ce17b82b9e44d161c";
+      sha256 = "192ln697rv7m3nk4401p4w75d3afsjlcc5m4hcmf00ci3vimk7mn";
     };
     meta.homepage = "https://github.com/chrisbra/unicode.vim/";
   };
@@ -8779,12 +8779,12 @@ final: prev:
 
   vifm-vim = buildVimPluginFrom2Nix {
     pname = "vifm.vim";
-    version = "2023-01-21";
+    version = "2023-01-25";
     src = fetchFromGitHub {
       owner = "vifm";
       repo = "vifm.vim";
-      rev = "a9488d0803020e8d99ed13b95fd9def82941c978";
-      sha256 = "0c78cr5f16vliiblafhcmmcq1xqybfnd70576drh6n7sr2fhss88";
+      rev = "347d6125495ee87d6f6066e4830f70ddba18722e";
+      sha256 = "1xdhyml77k5fgmd9rl8g643bd7qywgzg3hqapns0xcj8axiigmvf";
     };
     meta.homepage = "https://github.com/vifm/vifm.vim/";
   };
@@ -8863,12 +8863,12 @@ final: prev:
 
   vim-abolish = buildVimPluginFrom2Nix {
     pname = "vim-abolish";
-    version = "2023-01-06";
+    version = "2023-01-20";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-abolish";
-      rev = "aa3428b734ddbd0105615832843f619774a6871e";
-      sha256 = "0dnv1ixhzrgafd7kqpx8hp0r1snyqfxw80psnbxsr6qcwzawb2da";
+      rev = "d55c90d6c9995ccb79d2152564a4939cd84d73e9";
+      sha256 = "0vfhjv7jpx15lqd6kf7jds5x5x4x5gj9cbr5rgm0cbbcn2734gji";
     };
     meta.homepage = "https://github.com/tpope/vim-abolish/";
   };
@@ -9511,12 +9511,12 @@ final: prev:
 
   vim-clap = buildVimPluginFrom2Nix {
     pname = "vim-clap";
-    version = "2023-01-22";
+    version = "2023-01-27";
     src = fetchFromGitHub {
       owner = "liuchengxu";
       repo = "vim-clap";
-      rev = "5a6ff035e16c57874fbf68951b1206535733827d";
-      sha256 = "1v0fxyqnbcf3x5vv5aq1z9q75m1qym6l1f9jn9iwdwg06mj581wj";
+      rev = "c90b57f153fed630a6c881e6e04b2c08a2cdd4be";
+      sha256 = "0ncgqxvx3m6drbshmnxz1hlmjr4dsdhpshiwi9ssq3hnqr5j58a0";
     };
     meta.homepage = "https://github.com/liuchengxu/vim-clap/";
   };
@@ -10243,12 +10243,12 @@ final: prev:
 
   vim-flog = buildVimPluginFrom2Nix {
     pname = "vim-flog";
-    version = "2023-01-22";
+    version = "2023-01-28";
     src = fetchFromGitHub {
       owner = "rbong";
       repo = "vim-flog";
-      rev = "baa0206f8d1685d1239d6c10f4b53869eb84c4a0";
-      sha256 = "0hmdpn548bn46ygwm8w2wm609hiyn2nwj2kqc7nsi0ypa5pkbnnb";
+      rev = "a5f6e41fc5b51ff5185d75c44bd9279492eec8a1";
+      sha256 = "0v6yxx7j7lw7zp5wqhkjdbnh8wqyhdby2jfxm0wgz0m4a8w8d5k9";
     };
     meta.homepage = "https://github.com/rbong/vim-flog/";
   };
@@ -10748,12 +10748,12 @@ final: prev:
 
   vim-illuminate = buildVimPluginFrom2Nix {
     pname = "vim-illuminate";
-    version = "2023-01-11";
+    version = "2023-01-23";
     src = fetchFromGitHub {
       owner = "RRethy";
       repo = "vim-illuminate";
-      rev = "da80f3877896adcf77f59fb0bf74e9601615d372";
-      sha256 = "129r4jrdffy18yklk18gbplgxf7dkngda8cgssf9xfawizyg739v";
+      rev = "4e1d43cdc39e35f495c7b39a78a349b4d5badad0";
+      sha256 = "135274m0q9gclg1lqr9aw3063w3m7csmibri3jzx3lk444gqmh9v";
     };
     meta.homepage = "https://github.com/RRethy/vim-illuminate/";
   };
@@ -11133,12 +11133,12 @@ final: prev:
 
   vim-localvimrc = buildVimPluginFrom2Nix {
     pname = "vim-localvimrc";
-    version = "2022-05-11";
+    version = "2023-01-27";
     src = fetchFromGitHub {
       owner = "embear";
       repo = "vim-localvimrc";
-      rev = "244a92ceae63b8c23a74022eaf205b431745fcb6";
-      sha256 = "1y56xh4k7zqagsnw86lkm747l1x4i5l95r0jks4j35d1fcmpq81i";
+      rev = "6cc9f9ffaaf44b45bd5268f8a541363619bf1b13";
+      sha256 = "05j14v41jrjm4p1kbqxgx3n54isv4y93w2iy679jyggrrdzi5m71";
     };
     meta.homepage = "https://github.com/embear/vim-localvimrc/";
   };
@@ -11181,12 +11181,12 @@ final: prev:
 
   vim-lsp = buildVimPluginFrom2Nix {
     pname = "vim-lsp";
-    version = "2023-01-15";
+    version = "2023-01-28";
     src = fetchFromGitHub {
       owner = "prabirshrestha";
       repo = "vim-lsp";
-      rev = "3244bed52220bee01515eb6dbc7da29a66998fec";
-      sha256 = "0rh5pz0m4nbhx8dw2nqvswyapyh9s8racwlqxgykaxlni89m1g23";
+      rev = "ad6d61b13c64499163f2430245f410bf9e75e89e";
+      sha256 = "0q1zzn73399h9zllfrdh50lgfw66n8b0swiyqaxyzyxspl882cm1";
     };
     meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
   };
@@ -11602,12 +11602,12 @@ final: prev:
 
   vim-ocaml = buildVimPluginFrom2Nix {
     pname = "vim-ocaml";
-    version = "2022-12-15";
+    version = "2023-01-24";
     src = fetchFromGitHub {
       owner = "ocaml";
       repo = "vim-ocaml";
-      rev = "8d30ed73ce7583b31224ab206ec158f547dd25db";
-      sha256 = "041wv3n3w1bfabgwpswwvpc4rsnmib3520cv7rkrvw7dqpywk7dn";
+      rev = "4c907ef607810662c42795098d42f23a224fe6e7";
+      sha256 = "1355c0kf6g0v0q6sb5xnl8rssm4hjkpkjqwbi9yb0r9sj8z7zx96";
     };
     meta.homepage = "https://github.com/ocaml/vim-ocaml/";
   };
@@ -11986,14 +11986,14 @@ final: prev:
 
   vim-prisma = buildVimPluginFrom2Nix {
     pname = "vim-prisma";
-    version = "2020-04-04";
+    version = "2023-01-24";
     src = fetchFromGitHub {
-      owner = "pantharshit00";
+      owner = "prisma";
       repo = "vim-prisma";
-      rev = "e91ac5011232e1bd8ea53204db8d01203d5d0f3c";
-      sha256 = "0pc203n70g1b0qfvrnfi5sxg2vr9zfw274s9lpgpxmribknpxi86";
+      rev = "95c5b25066efb34c75bce78698baa371fe0ee7c2";
+      sha256 = "046lpazz44f6b1lcvklaq1jl0sbyiklj6kcv580rrff89511nzsy";
     };
-    meta.homepage = "https://github.com/pantharshit00/vim-prisma/";
+    meta.homepage = "https://github.com/prisma/vim-prisma/";
   };
 
   vim-projectionist = buildVimPluginFrom2Nix {
@@ -12526,12 +12526,12 @@ final: prev:
 
   vim-snippets = buildVimPluginFrom2Nix {
     pname = "vim-snippets";
-    version = "2023-01-14";
+    version = "2023-01-28";
     src = fetchFromGitHub {
       owner = "honza";
       repo = "vim-snippets";
-      rev = "1049d2425b6d270621b48e110de37d5467a2a621";
-      sha256 = "083h0dzi60p9hv2g9daydalrrpzngbw0lgyapbn1xzh3idb0hqhx";
+      rev = "8f9eead6c4dfdfee9052d4ea667c1c9d8a396f80";
+      sha256 = "1zpffb0f8scgsmpv0y4pbnlp09kv0lgmrn9ss8h53byrqsa14rif";
     };
     meta.homepage = "https://github.com/honza/vim-snippets/";
   };
@@ -12899,12 +12899,12 @@ final: prev:
 
   vim-tmux-clipboard = buildVimPluginFrom2Nix {
     pname = "vim-tmux-clipboard";
-    version = "2019-04-07";
+    version = "2023-01-28";
     src = fetchFromGitHub {
       owner = "roxma";
       repo = "vim-tmux-clipboard";
-      rev = "47187740b88f9dab213f44678800cc797223808e";
-      sha256 = "1a7rpbvb7dgjfnrh95zg2ia6iiz2mz2xps31msb8h14hcj6dsv6y";
+      rev = "21be1d22b82448292d8f290384b48e9ad372f833";
+      sha256 = "09fd216nyv0b00078hipz871hilhpx9zf740s9c9lmw1cd80cs9g";
     };
     meta.homepage = "https://github.com/roxma/vim-tmux-clipboard/";
   };
@@ -13475,12 +13475,12 @@ final: prev:
 
   vimspector = buildVimPluginFrom2Nix {
     pname = "vimspector";
-    version = "2023-01-04";
+    version = "2023-01-25";
     src = fetchFromGitHub {
       owner = "puremourning";
       repo = "vimspector";
-      rev = "475d75a32e368dbfc700b580b16b351face72129";
-      sha256 = "10r0n4dz8r4jbv9j583r77pp25q4yb4zd5gbrb8svxr873fja33n";
+      rev = "0224789989392a9a6b958afa9fce9db5ff1e7a4f";
+      sha256 = "0fvdyi9ipzk5crw4gfvvjhir7zw5g2gr3gnzgniwgap79nnhb1aq";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/puremourning/vimspector/";
@@ -13488,12 +13488,12 @@ final: prev:
 
   vimtex = buildVimPluginFrom2Nix {
     pname = "vimtex";
-    version = "2023-01-19";
+    version = "2023-01-27";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "c77ec4e15768ffcb97a96d1bf2df1ef58e94acdd";
-      sha256 = "0cdc8qs1jyzxphqs11nwib0xxv4lsaiqi7w580jhg7an7w484kn0";
+      rev = "13fa591e82f7fe0fedbb097e9869d32f6af207fe";
+      sha256 = "040v6764iagzyy6iya1rq6zacqyqqnwd4xqv3jf15ns5bzb73lam";
     };
     meta.homepage = "https://github.com/lervag/vimtex/";
   };
@@ -13596,12 +13596,12 @@ final: prev:
 
   which-key-nvim = buildVimPluginFrom2Nix {
     pname = "which-key.nvim";
-    version = "2023-01-12";
+    version = "2023-01-23";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "which-key.nvim";
-      rev = "e4fa445065a2bb0bbc3cca85346b67817f28e83e";
-      sha256 = "1gj1qkq1zxn9by6zxwg46rplpks51wvv3pmdjh8qr0ldkxk9yavy";
+      rev = "684e96c5e8477f1ee9b3f2e9a12d802fd12c5531";
+      sha256 = "0kdmv1jkkfcrhrvc6mcdy173cx39mwq5nwq3yni46zgcn5iyxiq3";
     };
     meta.homepage = "https://github.com/folke/which-key.nvim/";
   };
@@ -13777,12 +13777,12 @@ final: prev:
 
   zen-mode-nvim = buildVimPluginFrom2Nix {
     pname = "zen-mode.nvim";
-    version = "2023-01-04";
+    version = "2023-01-24";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "zen-mode.nvim";
-      rev = "4313a5828e4d48c5f2f135f29d46f769a59dcfdc";
-      sha256 = "05wn6p90ymwg0y3941c6v7zpxhkd2zn4xqg2qvvl4wyyhn4rl4wp";
+      rev = "2c8f9f3758a4c430ff867e547741424ac16208bb";
+      sha256 = "0iv87ixlb9ajzszkyih7ydd8644zd61njsjb0s94pwydqhxs8bsi";
     };
     meta.homepage = "https://github.com/folke/zen-mode.nvim/";
   };
@@ -13897,12 +13897,12 @@ final: prev:
 
   chad = buildVimPluginFrom2Nix {
     pname = "chad";
-    version = "2023-01-22";
+    version = "2023-01-29";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "chadtree";
-      rev = "ed78c1968dfd3b9aa2a3444fce0482c06ee65a17";
-      sha256 = "1yhffffvb5ry4vcaiz68rnjv13r63v632962axkm0wgqbc5i62fc";
+      rev = "d6841f9002ec98ad0ae9989e2c2f51133703f1de";
+      sha256 = "00zic7fb3a3r59231fxyw2n9dw0rcsi11q97p6pk71sy4gpkq0pa";
     };
     meta.homepage = "https://github.com/ms-jpq/chadtree/";
   };
@@ -13945,12 +13945,12 @@ final: prev:
 
   lspsaga-nvim-original = buildVimPluginFrom2Nix {
     pname = "lspsaga-nvim-original";
-    version = "2023-01-22";
+    version = "2023-01-29";
     src = fetchFromGitHub {
       owner = "glepnir";
       repo = "lspsaga.nvim";
-      rev = "8516da6a9c40a1d9ab81ad56c90673be29f188f7";
-      sha256 = "1l3l1w75j6bal7l4jf27rvy7w5vx1w62z5650y9xgx9wjnc1y955";
+      rev = "e698de51356eeda94907c179789f5c2f0112c185";
+      sha256 = "0gw3z7krmag9bgcqyc1j84jv58wpmm34l018x5svnmyy5v15ayw4";
     };
     meta.homepage = "https://github.com/glepnir/lspsaga.nvim/";
   };

From ae3cadc174634ce8cf42cca1aa362f08391ed6e4 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Sat, 28 Jan 2023 23:39:32 -0500
Subject: [PATCH 12/40] vimPlugins.sg-nvim: init at 2023-01-27

---
 .../editors/vim/plugins/generated.nix         | 12 +++++++
 .../editors/vim/plugins/overrides.nix         | 31 +++++++++++++++++++
 .../editors/vim/plugins/vim-plugin-names      |  1 +
 3 files changed, 44 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index c1590d5a491f..285f8ba8c8d5 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -7403,6 +7403,18 @@ final: prev:
     meta.homepage = "https://github.com/junegunn/seoul256.vim/";
   };
 
+  sg-nvim = buildVimPluginFrom2Nix {
+    pname = "sg.nvim";
+    version = "2023-01-27";
+    src = fetchFromGitHub {
+      owner = "tjdevries";
+      repo = "sg.nvim";
+      rev = "6eb1a0dbff6d52b2f3b5d9789fb7307755c8ea1f";
+      sha256 = "1pcifz7fjdk2fp9xnmc67h2dbvy7ynvh5m8a8il8chy71sx5jnvi";
+    };
+    meta.homepage = "https://github.com/tjdevries/sg.nvim/";
+  };
+
   shabadou-vim = buildVimPluginFrom2Nix {
     pname = "shabadou.vim";
     version = "2016-07-19";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 3086cbf82414..f4515b69abf6 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -68,6 +68,9 @@
   # nvim-treesitter dependencies
 , callPackage
 
+  # sg.nvim dependencies
+, darwin
+
   # sved dependencies
 , glib
 , gobject-introspection
@@ -748,6 +751,34 @@ self: super: {
     ];
   });
 
+  sg-nvim = super.sg-nvim.overrideAttrs (old:
+    let
+      sg-nvim-rust = rustPlatform.buildRustPackage {
+        pname = "sg-nvim-rust";
+        inherit (old) version src;
+
+        cargoHash = "sha256-lrVwmJqfERq/tj4u+kRJ0kgbPQaFNAR6M3d4GqIJJyU=";
+
+        nativeBuildInputs = [ pkg-config ];
+
+        buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [
+          darwin.apple_sdk.frameworks.Security
+        ];
+
+        cargoBuildFlags = [ "--workspace" ];
+
+        # tests are broken
+        doCheck = false;
+      };
+    in
+    {
+      dependencies = with self; [ plenary-nvim ];
+      postInstall = ''
+        mkdir -p $out/target/debug
+        ln -s ${sg-nvim-rust}/{bin,lib}/* $out/target/debug
+      '';
+    });
+
   skim = buildVimPluginFrom2Nix {
     pname = "skim";
     inherit (skim) version;
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 1cd0de9f1249..3d6e50fc5128 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -622,6 +622,7 @@ https://github.com/megaannum/self/,,
 https://github.com/jaxbot/semantic-highlight.vim/,,
 https://github.com/numirias/semshi/,,
 https://github.com/junegunn/seoul256.vim/,,
+https://github.com/tjdevries/sg.nvim/,HEAD,
 https://github.com/osyo-manga/shabadou.vim/,,
 https://github.com/AndrewRadev/sideways.vim/,,
 https://github.com/lotabout/skim.vim/,,

From 6cef925333006529bd1835f770e1e81e22f438a4 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Sat, 28 Jan 2023 23:39:45 -0500
Subject: [PATCH 13/40] vimPlugins.nvim-treesitter: update grammars

---
 .../vim/plugins/nvim-treesitter/generated.nix | 155 +++++++++++-------
 1 file changed, 94 insertions(+), 61 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
index 2f2dd0416f27..b131486826d7 100644
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@@ -1,6 +1,6 @@
 # generated by pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py
 
-{ buildGrammar, fetchCrate, fetchFromBitbucket, fetchFromGitHub, fetchFromGitLab, fetchFromGitea, fetchFromGitiles, fetchFromRepoOrCz, fetchFromSourcehut, fetchHex, fetchgit, fetchhg, fetchsvn }:
+{ buildGrammar, fetchCrate, fetchFromBitbucket, fetchFromGitHub, fetchFromGitLab, fetchFromGitea, fetchFromGitiles, fetchFromRepoOrCz, fetchFromSourcehut, fetchHex, fetchPypi, fetchgit, fetchhg, fetchsvn }:
 
 {
   ada = buildGrammar {
@@ -71,12 +71,12 @@
   };
   beancount = buildGrammar {
     language = "beancount";
-    version = "4cbd1f0";
+    version = "c68ffc4";
     src = fetchFromGitHub {
       owner = "polarmutex";
       repo = "tree-sitter-beancount";
-      rev = "4cbd1f09cd07c1f1fabf867c2cf354f9da53cc4c";
-      hash = "sha256-Uh9/yBYXNKBvdpqNv1kr5eREYmKy3Z/kvaSZQpUl+0U=";
+      rev = "c68ffc4c6c27eadd81dd56c66f03f4d202d4b2d7";
+      hash = "sha256-MJDatUpXJMf3OB8KocA+kJi+mqNKRs7wraq33tCg3/c=";
     };
     meta.homepage = "https://github.com/polarmutex/tree-sitter-beancount";
   };
@@ -124,6 +124,17 @@
     };
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp";
   };
+  capnp = buildGrammar {
+    language = "capnp";
+    version = "62057f5";
+    src = fetchFromGitHub {
+      owner = "amaanq";
+      repo = "tree-sitter-capnp";
+      rev = "62057f5d3a57ac44ca3d773623f5585b98ae2ce7";
+      hash = "sha256-EsqsYnetQBpANCrOzk1U5Tg2gfJzFSax9/ia4A8x7ic=";
+    };
+    meta.homepage = "https://github.com/amaanq/tree-sitter-capnp";
+  };
   clojure = buildGrammar {
     language = "clojure";
     version = "262d6d6";
@@ -181,12 +192,12 @@
   };
   cpp = buildGrammar {
     language = "cpp";
-    version = "2d2c4ae";
+    version = "56cec4c";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-cpp";
-      rev = "2d2c4aee8672af4c7c8edff68e7dd4c07e88d2b1";
-      hash = "sha256-BjNWSTpwytOSYw32lYFItNI4t3xw+uJUx/0htYo7aLs=";
+      rev = "56cec4c2eb5d6af3d2942e69e35db15ae2433740";
+      hash = "sha256-CWh5p0tlBQizABjwBRN1VoxeEriOPhTy3lFZI9PjsTA=";
     };
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp";
   };
@@ -203,12 +214,12 @@
   };
   cuda = buildGrammar {
     language = "cuda";
-    version = "0091006";
+    version = "de20daa";
     src = fetchFromGitHub {
       owner = "theHamsta";
       repo = "tree-sitter-cuda";
-      rev = "0091006d6498ee5647f080ef6c09e5b95e481078";
-      hash = "sha256-t1wd32UE2Kz1VkIM4HfFFSDnttdCPGm1xOH9ZP+ATxc=";
+      rev = "de20daa547344bec47d89e55a37fb9ab0706d8cc";
+      hash = "sha256-gZctMdfwDCJEFNPKWLPr546V24clnIXUdiz4U7qISKY=";
     };
     meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda";
   };
@@ -349,12 +360,12 @@
   };
   erlang = buildGrammar {
     language = "erlang";
-    version = "f0e2f78";
+    version = "2422bc9";
     src = fetchFromGitHub {
       owner = "WhatsApp";
       repo = "tree-sitter-erlang";
-      rev = "f0e2f78cdadb2e67323f9ed511656e47dcaa43bb";
-      hash = "sha256-aMgKNcIQUkwA3rrzS5+gHzzGESabCtbLa9HGXmIxT90=";
+      rev = "2422bc9373094bfa97653ac540e08759f812523c";
+      hash = "sha256-DTIA3EP2RQtts6Hl6FThSxN1SwEUbRVJJig8zOUQRCo=";
     };
     meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang";
   };
@@ -459,12 +470,12 @@
   };
   gitcommit = buildGrammar {
     language = "gitcommit";
-    version = "190d288";
+    version = "f71b93f";
     src = fetchFromGitHub {
       owner = "gbprod";
       repo = "tree-sitter-gitcommit";
-      rev = "190d288a1746bddb4abe96b597fb7d17b76e5522";
-      hash = "sha256-PPdwdUfJ+2TCxVdEvexxGSBMDZmI1GW7eSfc/X3Me7Y=";
+      rev = "f71b93f399c9c2b315825827c95466e7405ec622";
+      hash = "sha256-489Rbi75XbW/IuFLijFThsI+BNXqVY1tVALwMT6yie0=";
     };
     meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit";
   };
@@ -637,12 +648,12 @@
   };
   hlsl = buildGrammar {
     language = "hlsl";
-    version = "bd0d463";
+    version = "8e2f090";
     src = fetchFromGitHub {
       owner = "theHamsta";
       repo = "tree-sitter-hlsl";
-      rev = "bd0d463d1380816240a8cb1fd747fc0d3fed24aa";
-      hash = "sha256-0Dafbn0+8N1MBRyOhiaZBo7KZqm8YpFzg/ZwT3SLq+g=";
+      rev = "8e2f0907e8d2e17a88a375025e70054bafdaa8b0";
+      hash = "sha256-kBSigaBR6uM4E9uHI79gYlxBrN0E5i1zTW8syMPIQdI=";
     };
     meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl";
   };
@@ -703,23 +714,23 @@
   };
   java = buildGrammar {
     language = "java";
-    version = "09d650d";
+    version = "dd597f1";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-java";
-      rev = "09d650def6cdf7f479f4b78f595e9ef5b58ce31e";
-      hash = "sha256-tGBi6gJJIPpp6oOwmAQdqBD6eaJRBRcYbWtm1BHsgBA=";
+      rev = "dd597f13eb9bab0c1bccc9aec390e8e6ebf9e0a6";
+      hash = "sha256-JeQZ4TMpt6Lfbcfc6m/PzhFZEgTdouasJ3b1sPISy2s=";
     };
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-java";
   };
   javascript = buildGrammar {
     language = "javascript";
-    version = "7a29d06";
+    version = "15e85e8";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-javascript";
-      rev = "7a29d06274b7cf87d643212a433d970b73969016";
-      hash = "sha256-fMPCHdfHHyg7yNi9LDA35z+WFfPRbctrh38dZV5qZt4=";
+      rev = "15e85e80b851983fab6b12dce5a535f5a0df0f9c";
+      hash = "sha256-2SAJBnY8pmynGqB8OVqHeeAKovskO+C/XiJbLTKSlcM=";
     };
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript";
   };
@@ -791,23 +802,34 @@
   };
   julia = buildGrammar {
     language = "julia";
-    version = "0412178";
+    version = "9d36818";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-julia";
-      rev = "041217800bf423099015e1654c9a4fdd75310bb1";
-      hash = "sha256-DwRU4yqnMFqMIh4mAo9a57SRXhOLTnWKjO6zSaczUNU=";
+      rev = "9d368185be7e8139f2eda93d8b0acc2a54031718";
+      hash = "sha256-6jKiqDo8fSHrUGFIizNSKWoB0CVXJv6b3XfN9YjNLJc=";
     };
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia";
   };
+  kdl = buildGrammar {
+    language = "kdl";
+    version = "3a67244";
+    src = fetchFromGitHub {
+      owner = "amaanq";
+      repo = "tree-sitter-kdl";
+      rev = "3a67244a48e9446248fc48117afe11dab19b030a";
+      hash = "sha256-mq+aG0C71b9OSug7chtopipVm1OJNLijmwe/PNb2ais=";
+    };
+    meta.homepage = "https://github.com/amaanq/tree-sitter-kdl";
+  };
   kotlin = buildGrammar {
     language = "kotlin";
-    version = "b953dbd";
+    version = "e463703";
     src = fetchFromGitHub {
       owner = "fwcd";
       repo = "tree-sitter-kotlin";
-      rev = "b953dbdd05257fcb2b64bc4d9c1578fac12e3c28";
-      hash = "sha256-xTbRn7bDN6FR9UOzw43RVHIahI/DFjwLGQj3cYoPurY=";
+      rev = "e4637037a5fe6f25fe66c305669faa0855f35692";
+      hash = "sha256-Xoj9RJqtyNtwag5tXRfu5iJpTnajRk1g7ClflBbFZyI=";
     };
     meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin";
   };
@@ -890,24 +912,24 @@
   };
   markdown = buildGrammar {
     language = "markdown";
-    version = "16d0b5e";
+    version = "b795aa9";
     src = fetchFromGitHub {
       owner = "MDeiml";
       repo = "tree-sitter-markdown";
-      rev = "16d0b5e54d781150bea1070ffb360d47e6238659";
-      hash = "sha256-Nz9vEOV9yz3Vk8TM41clp6isViHNiko9T9mEq4NA76k=";
+      rev = "b795aa9893e4417609cf03723fe1e94e547ccfa4";
+      hash = "sha256-TfQoNPZd6OBOi/E2anJSpjLg9MwQQjix7d7rIL92SEw=";
     };
     location = "tree-sitter-markdown";
     meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
   };
   markdown_inline = buildGrammar {
     language = "markdown_inline";
-    version = "16d0b5e";
+    version = "b795aa9";
     src = fetchFromGitHub {
       owner = "MDeiml";
       repo = "tree-sitter-markdown";
-      rev = "16d0b5e54d781150bea1070ffb360d47e6238659";
-      hash = "sha256-Nz9vEOV9yz3Vk8TM41clp6isViHNiko9T9mEq4NA76k=";
+      rev = "b795aa9893e4417609cf03723fe1e94e547ccfa4";
+      hash = "sha256-TfQoNPZd6OBOi/E2anJSpjLg9MwQQjix7d7rIL92SEw=";
     };
     location = "tree-sitter-markdown-inline";
     meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
@@ -947,12 +969,12 @@
   };
   nickel = buildGrammar {
     language = "nickel";
-    version = "092e901";
+    version = "d6c7eeb";
     src = fetchFromGitHub {
       owner = "nickel-lang";
       repo = "tree-sitter-nickel";
-      rev = "092e90142667482996880044d2c04837d3d1c266";
-      hash = "sha256-y0Lx6HdkoC7rOzm8fOfLBUt6672qe7AHe1SI6YY/aHE=";
+      rev = "d6c7eeb751038f934b5b1aa7ff236376d0235c56";
+      hash = "sha256-D/RRwXsWyHMxoU7Z8VVJ6jn7zUFKaKusLT/ofON7sOE=";
     };
     meta.homepage = "https://github.com/nickel-lang/tree-sitter-nickel";
   };
@@ -1091,6 +1113,17 @@
     };
     meta.homepage = "https://github.com/leo60228/tree-sitter-pioasm";
   };
+  poe_filter = buildGrammar {
+    language = "poe_filter";
+    version = "80dc101";
+    src = fetchFromGitHub {
+      owner = "ObserverOfTime";
+      repo = "tree-sitter-poe-filter";
+      rev = "80dc10195e26c72598ed1ab02cdf2d8e4c792e7b";
+      hash = "sha256-KDsi8eLrTnZaD9XwyF24edmBNHre3FoTiD7RE/MpvEQ=";
+    };
+    meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-poe-filter";
+  };
   prisma = buildGrammar {
     language = "prisma";
     version = "eca2596";
@@ -1269,12 +1302,12 @@
   };
   scala = buildGrammar {
     language = "scala";
-    version = "067ee61";
+    version = "b7cebd2";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-scala";
-      rev = "067ee61ff9484eac4f5bc4d57dfd007900c48f20";
-      hash = "sha256-KyxlDQla/XTBHccJG+rTqN9EO90OElZd7y21f1HTibI=";
+      rev = "b7cebd27eeb9c46082105938cae0acaaace573e3";
+      hash = "sha256-E5RwaeFmYmvEAV1W+pMNseMuVCef++xZEFssqNHrfug=";
     };
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala";
   };
@@ -1346,12 +1379,12 @@
   };
   sql = buildGrammar {
     language = "sql";
-    version = "9d98029";
+    version = "4fe05b2";
     src = fetchFromGitHub {
       owner = "derekstride";
       repo = "tree-sitter-sql";
-      rev = "9d9802991aa1d1bc00eee7713a838dab1eb4f149";
-      hash = "sha256-Iy5rqNZem1r++aI7vGITzBSFGjdDLGHFOgBWqIgKZX0=";
+      rev = "4fe05b2d81565ddb689d2f415e07afdacc515c52";
+      hash = "sha256-rfx4jBKC2zXo+zWBBb2WkFopF00KB7WHzz7LZ3M026M=";
     };
     generate = true;
     meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
@@ -1450,12 +1483,12 @@
   };
   thrift = buildGrammar {
     language = "thrift";
-    version = "999a27d";
+    version = "a4e433e";
     src = fetchFromGitHub {
       owner = "duskmoon314";
       repo = "tree-sitter-thrift";
-      rev = "999a27d87b8f90a74306d4e79c5e22db3ab61633";
-      hash = "sha256-9aadAYFKeBv0gc4SHCYH+m77BB0c4qXpmg1mOeKp6mw=";
+      rev = "a4e433e7198c811d44164d50c491c82ec533dfdc";
+      hash = "sha256-Nnmg8qWxPmDvyYkWpb9GvbaJHxzCWED7h+bkI/DLSWg=";
     };
     meta.homepage = "https://github.com/duskmoon314/tree-sitter-thrift";
   };
@@ -1472,12 +1505,12 @@
   };
   tlaplus = buildGrammar {
     language = "tlaplus";
-    version = "d3ef05e";
+    version = "6fd16d8";
     src = fetchFromGitHub {
       owner = "tlaplus-community";
       repo = "tree-sitter-tlaplus";
-      rev = "d3ef05eec4473094e2d691243aa243ce63de6406";
-      hash = "sha256-k5O6VheS8RBrSNk/GBjP3Qun4wY8cbPXxEFU0tCKbuU=";
+      rev = "6fd16d8469c6898317423d61738d97e2b3f5caf7";
+      hash = "sha256-s5mYc/kPZ4wHhm1ZeC5WBjBfzTFnANPRAZeE8UOVE1I=";
     };
     meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus";
   };
@@ -1505,12 +1538,12 @@
   };
   tsx = buildGrammar {
     language = "tsx";
-    version = "faad909";
+    version = "5d20856";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-typescript";
-      rev = "faad9094f4061a43d4e9005439e9e85c6541ebe7";
-      hash = "sha256-8W/YX2EP3brbDsURZ8YI04KqgLOK6QqXaiFikpwrTV0=";
+      rev = "5d20856f34315b068c41edaee2ac8a100081d259";
+      hash = "sha256-cpOAtfvlffS57BrXaoa2xa9NUYw0AsHxVI8PrcpgZCQ=";
     };
     location = "tsx";
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript";
@@ -1539,24 +1572,24 @@
   };
   typescript = buildGrammar {
     language = "typescript";
-    version = "faad909";
+    version = "5d20856";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-typescript";
-      rev = "faad9094f4061a43d4e9005439e9e85c6541ebe7";
-      hash = "sha256-8W/YX2EP3brbDsURZ8YI04KqgLOK6QqXaiFikpwrTV0=";
+      rev = "5d20856f34315b068c41edaee2ac8a100081d259";
+      hash = "sha256-cpOAtfvlffS57BrXaoa2xa9NUYw0AsHxVI8PrcpgZCQ=";
     };
     location = "typescript";
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript";
   };
   v = buildGrammar {
     language = "v";
-    version = "0b03983";
+    version = "7ef1f12";
     src = fetchFromGitHub {
       owner = "vlang";
       repo = "vls";
-      rev = "0b039830a33e759f0c9ee978b47ad10b82d37349";
-      hash = "sha256-sQxq/tWNN/aWD3ZmNhil45cnjzfy/2AXn2X/NhzvnKk=";
+      rev = "7ef1f120c1c8950c7a3e1cdffe655bdd7220321b";
+      hash = "sha256-2oVvuJsvEgv8J3abkV5ezAt0YdIkNNA4psqrcr4K+jo=";
     };
     location = "tree_sitter_v";
     meta.homepage = "https://github.com/vlang/vls";

From dc99847c049fad2a8d95f2efd6dcd3e4ae0a3ec3 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Sun, 29 Jan 2023 00:12:09 -0500
Subject: [PATCH 14/40] vimPlugins.vim-clap: fix cargoSha256

---
 pkgs/applications/editors/vim/plugins/overrides.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index f4515b69abf6..6d6a48293702 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1087,7 +1087,7 @@ self: super: {
             libiconv
           ];
 
-          cargoSha256 = "sha256-v9RXW5RSPMotRVR/9ljBJ9VNbrLnSkU3zlEU79Xem28=";
+          cargoSha256 = "sha256-fPVLVJXvC5blIjZ3Qyc/lxq+V+qoGrIKrXEzwdNpdHc=";
         };
       in
       ''

From 33cdea47267856a9f1c36e8dcd1f30cb1a0c6f83 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Jan 2023 08:32:28 +0000
Subject: [PATCH 15/40] gitRepo: 2.30 -> 2.31

---
 pkgs/applications/version-management/git-repo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix
index 69fb89604bb7..8bd9d315d005 100644
--- a/pkgs/applications/version-management/git-repo/default.nix
+++ b/pkgs/applications/version-management/git-repo/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "git-repo";
-  version = "2.30";
+  version = "2.31";
 
   src = fetchFromGitHub {
     owner = "android";
     repo = "tools_repo";
     rev = "v${version}";
-    sha256 = "sha256-Ck+Q7sHhMqUWu6WeA3DhY+svMxH2sU0WvmyvZ5qsW+E=";
+    sha256 = "sha256-Xr5VH7iMboh2F2iBqjIo+PNmWcC/GCYJp3PrPbeyefQ=";
   };
 
   # Fix 'NameError: name 'ssl' is not defined'

From daed45a457995d0e3c26840557faff0cf0154089 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Jan 2023 10:39:50 +0000
Subject: [PATCH 16/40] grandorgue: 3.9.4-1 -> 3.9.5-1

---
 pkgs/applications/audio/grandorgue/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix
index 1b20f306166f..fc052754a1b6 100644
--- a/pkgs/applications/audio/grandorgue/default.nix
+++ b/pkgs/applications/audio/grandorgue/default.nix
@@ -5,14 +5,14 @@
 
 stdenv.mkDerivation rec {
   pname = "grandorgue";
-  version = "3.9.4-1";
+  version = "3.9.5-1";
 
   src = fetchFromGitHub {
     owner = "GrandOrgue";
     repo = pname;
     rev = version;
     fetchSubmodules = true;
-    sha256 = "sha256-10gcVxMLhMXUblvJYLj0TTwGFl1YHI7HU3TfHXtJ+24=";
+    sha256 = "sha256-5OqTQBOYE6XU3BRiVwXOHrn22bVZzIIeZI8pgsWxhPw=";
   };
 
   postPatch = ''

From e19ce28294fa256c9255081ba5d59c344e946ca8 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sun, 29 Jan 2023 11:56:34 +0100
Subject: [PATCH 17/40] ogre: 13.6.0 -> 13.6.1

---
 pkgs/development/libraries/ogre/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix
index ebd1d89803c1..63174807829e 100644
--- a/pkgs/development/libraries/ogre/default.nix
+++ b/pkgs/development/libraries/ogre/default.nix
@@ -36,13 +36,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ogre";
-  version = "13.6.0";
+  version = "13.6.1";
 
   src = fetchFromGitHub {
     owner = "OGRECave";
     repo = "ogre";
     rev = "v${version}";
-    sha256 = "sha256-yPIrF0jSeWXQ67U/QDgeQnMPvxsyaecyiW964kLsDAE=";
+    hash = "sha256-UG/vwLE80Ski9NwMj9E5+PoLU6rSCdJrSmQOmmFv66U=";
   };
 
   nativeBuildInputs = [

From 4243a3b48344235963012322280c491a57be304c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Jan 2023 12:35:38 +0000
Subject: [PATCH 18/40] jfrog-cli: 2.32.0 -> 2.34.0

---
 pkgs/tools/misc/jfrog-cli/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/jfrog-cli/default.nix b/pkgs/tools/misc/jfrog-cli/default.nix
index 7a8a6aa8a848..3b11dfcb64fd 100644
--- a/pkgs/tools/misc/jfrog-cli/default.nix
+++ b/pkgs/tools/misc/jfrog-cli/default.nix
@@ -2,14 +2,14 @@
 
 buildGoModule rec {
   pname = "jfrog-cli";
-  version = "2.32.0";
-  vendorSha256 = "sha256-nL+2Yc4gI2+SoxoaGlazecsrcVkVh6Ig9sqITSOa5e0=";
+  version = "2.34.0";
+  vendorHash = "sha256-Z0ifACsdSIYevsvRD5KACFSRlvrL1jIJbrzjDFeLbEQ=";
 
   src = fetchFromGitHub {
     owner = "jfrog";
     repo = "jfrog-cli";
     rev = "v${version}";
-    sha256 = "sha256-EyDX4OrBAzc5eYR660SrGIG61TRlWnnV/GAtXy7DfEI=";
+    sha256 = "sha256-SDZzbUh3wbDfzkE/5GgFstDuMYLiM8+MXRZ79jYGoaQ=";
   };
 
   postInstall = ''

From 96d70f9841f57976386faa2f208a80703139713e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Jan 2023 13:25:39 +0000
Subject: [PATCH 19/40] revive: 1.2.4 -> 1.2.5

---
 pkgs/development/tools/revive/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/revive/default.nix b/pkgs/development/tools/revive/default.nix
index 8179f117fd43..9b75282fbf08 100644
--- a/pkgs/development/tools/revive/default.nix
+++ b/pkgs/development/tools/revive/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "revive";
-  version = "1.2.4";
+  version = "1.2.5";
 
   src = fetchFromGitHub {
     owner = "mgechev";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-tD6Z7W/sPwHKqvCXjXLlxkGj3FZ4+QCv9vn7KdCmSv4=";
+    sha256 = "sha256-pWX3dZqZ9UZ/k8c1K0xAgonsxZVrutWJ1PROQusO9vQ=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -18,7 +18,7 @@ buildGoModule rec {
       rm -rf $out/.git
     '';
   };
-  vendorSha256 = "sha256-sa4OkTSRyoPFXTGmjpiqBug+EKgxkcJrNxQwbTRfN2A=";
+  vendorHash = "sha256-IfayKnHCe1HHSi7YPNz8Wlz1TSAiVGs0rxpY9HYG3s8=";
 
   ldflags = [
     "-s"
@@ -35,7 +35,7 @@ buildGoModule rec {
 
   # The following tests fail when built by nix:
   #
-  # $ nix log /nix/store/build-revive.1.2.4.drv | grep FAIL
+  # $ nix log /nix/store/build-revive.1.2.5.drv | grep FAIL
   #
   # --- FAIL: TestAll (0.01s)
   # --- FAIL: TestTimeEqual (0.00s)

From aa3e1c98d52c09e6cf7c0f82722e900f534b3bd7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Jan 2023 16:56:01 +0000
Subject: [PATCH 20/40] phrase-cli: 2.6.4 -> 2.6.5

---
 pkgs/tools/misc/phrase-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/phrase-cli/default.nix b/pkgs/tools/misc/phrase-cli/default.nix
index f2eafc38472d..aeb978ec3163 100644
--- a/pkgs/tools/misc/phrase-cli/default.nix
+++ b/pkgs/tools/misc/phrase-cli/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "phrase-cli";
-  version = "2.6.4";
+  version = "2.6.5";
 
   src = fetchFromGitHub {
     owner = "phrase";
     repo = "phrase-cli";
     rev = version;
-    sha256 = "sha256-9jNRXAP+qNihqr30/dSHqzDkyh+GauafMQBkBit5gmc=";
+    sha256 = "sha256-6pt8WjfSt458FIK/cCzEOM9mFruFY6jBnkXoRWIhOr0=";
   };
 
   vendorHash = "sha256-zUwp7RqaKtxbTzEOhcmGG/+tqtBKs7cm6+sFNCKET08=";

From 85edbdb0e161188168e2d5fe6fa56afbce900828 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Jan 2023 17:08:38 +0000
Subject: [PATCH 21/40] arkade: 0.8.56 -> 0.8.59

---
 pkgs/applications/networking/cluster/arkade/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix
index 9b0d76a5ac14..34bbcd0a1dc5 100644
--- a/pkgs/applications/networking/cluster/arkade/default.nix
+++ b/pkgs/applications/networking/cluster/arkade/default.nix
@@ -7,20 +7,20 @@
 
 buildGoModule rec {
   pname = "arkade";
-  version = "0.8.56";
+  version = "0.8.59";
 
   src = fetchFromGitHub {
     owner = "alexellis";
     repo = "arkade";
     rev = version;
-    sha256 = "sha256-iU0/ovnclq/jwhi1d6zY4tz56ZB7FT0Mbpi2tEjb9QI=";
+    sha256 = "sha256-uvvxlU5c5MNYVqu0btL4xpjyvb/fDbFPGWkIzru84Z8=";
   };
 
   CGO_ENABLED = 0;
 
   nativeBuildInputs = [ installShellFiles ];
 
-  vendorHash = "sha256-DsLW5l7TxlXRFZDhtRfq5YqVT3XR7EZGNIoPiksHNck=";
+  vendorHash = "sha256-WQsnBBx05wXKDS7h3bhipTqZTQLxRjVLObuMNUfAiTk=";
 
   # Exclude pkg/get: tests downloading of binaries which fail when sandbox=true
   subPackages = [

From d02dc7451ea35ab751aba5881b31e438dd4a455a Mon Sep 17 00:00:00 2001
From: "helmi.nour" <helmiinour@gmail.com>
Date: Sun, 29 Jan 2023 18:42:13 +0100
Subject: [PATCH 22/40] add nrhelmi to maintainers list

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2f0eb281950b..8f7133461089 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -10282,6 +10282,12 @@
     githubId = 34083928;
     name = "Tim DeHerrera";
   };
+  nrhelmi = {
+    email = "helmiinour@gmail.com";
+    github = "nrhelmi";
+    githubId = 15707703;
+    name = "Helmi Nour";
+  };
   nshalman = {
     email = "nahamu@gmail.com";
     github = "nshalman";

From 5391e8f249a771e878d69ca301b46e8c9dd51655 Mon Sep 17 00:00:00 2001
From: "helmi.nour" <helmiinour@gmail.com>
Date: Sun, 29 Jan 2023 18:42:54 +0100
Subject: [PATCH 23/40] xteve: init at 2.2.0.200

---
 pkgs/servers/xteve/default.nix  | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/servers/xteve/default.nix

diff --git a/pkgs/servers/xteve/default.nix b/pkgs/servers/xteve/default.nix
new file mode 100644
index 000000000000..a65d37538972
--- /dev/null
+++ b/pkgs/servers/xteve/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "xteve";
+  version = "2.2.0.200";
+
+  src = fetchFromGitHub {
+    owner = "xteve-project";
+    repo = "xTeVe";
+    rev = version;
+    hash = "sha256-hD4GudSkGZO41nR/CgcMg/SqKjpAO1yJDkfwa8AUges=";
+  };
+
+  vendorSha256 = "sha256-oPkSWpqNozfSFLIFsJ+e2pOL6CcR91YHbqibEVF2aSk=";
+
+  meta = with lib; {
+    description = "M3U Proxy for Plex DVR and Emby Live TV";
+    homepage = "https://github.com/xteve-project/xTeVe";
+    license = licenses.mit;
+    maintainers = with maintainers; [ nrhelmi ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9d15e16d3737..bfeab67edf55 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12896,6 +12896,8 @@ with pkgs;
 
   xray = callPackage ../tools/networking/xray { };
 
+  xteve = callPackage ../servers/xteve { };
+
   testdisk = libsForQt5.callPackage ../tools/system/testdisk { };
 
   testdisk-qt = testdisk.override { enableQt = true; };

From 04b8f65f47d02c8a245e2a3b071236bd17d095e4 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sun, 29 Jan 2023 19:02:34 +0100
Subject: [PATCH 24/40] audacity: 3.2.3 -> 3.2.4 (#213330)

---
 pkgs/applications/audio/audacity/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix
index 44ba848bc2b7..4a652e1ac474 100644
--- a/pkgs/applications/audio/audacity/default.nix
+++ b/pkgs/applications/audio/audacity/default.nix
@@ -61,13 +61,13 @@
 
 stdenv.mkDerivation rec {
   pname = "audacity";
-  version = "3.2.3";
+  version = "3.2.4";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "Audacity-${version}";
-    sha256 = "sha256-0F9+4hyUoKb0UP5t02yws/ErogscvI1nsdnSTpcr53E=";
+    hash = "sha256-gz2o0Rj4364nJAvJmMQzwIQycoQmqz2/43DBvd3qbho=";
   };
 
   postPatch = ''

From ef3d55945243f794e966f798560b75db3f1dba03 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 20 Jan 2023 16:01:17 +0300
Subject: [PATCH 25/40] plasma-wayland-protocols: 1.9.0 -> 1.10.0

---
 .../libraries/plasma-wayland-protocols/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/plasma-wayland-protocols/default.nix b/pkgs/development/libraries/plasma-wayland-protocols/default.nix
index 74e4f6c5100d..d749744d51ed 100644
--- a/pkgs/development/libraries/plasma-wayland-protocols/default.nix
+++ b/pkgs/development/libraries/plasma-wayland-protocols/default.nix
@@ -7,11 +7,11 @@
 
 mkDerivation rec {
   pname = "plasma-wayland-protocols";
-  version = "1.9.0";
+  version = "1.10.0";
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-pCdbmoVHFvpe2cK6LWl98rB0n8RaKK2WXmjQqjbF1Mg=";
+    sha256 = "sha256-MZSIZ8mgRhPm3g0jrfy8Ws7N3vCzn5hrNF7GwZcnNv4=";
   };
 
   nativeBuildInputs = [ extra-cmake-modules ];

From 5e60f6b44e651e874ba731a2a19b7c54b1cb920c Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 20 Jan 2023 15:58:24 +0300
Subject: [PATCH 26/40] kdevelop-pg-qt: 2.2.1 -> 2.2.2

Fix build with Qt 5.15.8
---
 pkgs/applications/kde/kdevelop/kdevelop-pg-qt.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/kde/kdevelop/kdevelop-pg-qt.nix b/pkgs/applications/kde/kdevelop/kdevelop-pg-qt.nix
index f96e8cf6b677..468e264915c8 100644
--- a/pkgs/applications/kde/kdevelop/kdevelop-pg-qt.nix
+++ b/pkgs/applications/kde/kdevelop/kdevelop-pg-qt.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "kdevelop-pg-qt";
-  version = "2.2.1";
+  version = "2.2.2";
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
-    sha256 = "0ay6m6j6zgrbcm48f14bass83bk4w5qnx76xihc05p69i9w32ff1";
+    sha256 = "sha256-PVZgTEefjwSuMqUj7pHzB4xxcRfQ3rOelz4iSUy7ZfE=";
   };
 
   nativeBuildInputs = [ cmake pkg-config extra-cmake-modules ];

From 169576452945b9022acecf20c1cea33ab0ac400b Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Sun, 29 Jan 2023 10:40:22 -0800
Subject: [PATCH 27/40] signalbackup-tools: 20230109-1 -> 20230128-1

Diff: https://github.com/bepaald/signalbackup-tools/compare/20230109-1...20230128-1
---
 .../instant-messengers/signalbackup-tools/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
index 446c483f5bc0..904e47695d5b 100644
--- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "signalbackup-tools";
-  version = "20230109-1";
+  version = "20230128-1";
 
   src = fetchFromGitHub {
     owner = "bepaald";
     repo = pname;
     rev = version;
-    sha256 = "sha256-wPx1W0eaQHpA/jcZ+A7YFL5FwPqz12j/jPgxa1JeEM8=";
+    sha256 = "sha256-wYhftShCL9XozK0c7OLijqzveDvEvv9stpw+6CQND/Y=";
   };
 
   postPatch = ''

From f003aa94da96efcf2184e7212b929199ba98d6d3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Jan 2023 19:00:24 +0000
Subject: [PATCH 28/40] kestrel: 0.10.0 -> 0.10.1

---
 pkgs/tools/security/kestrel/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/kestrel/default.nix b/pkgs/tools/security/kestrel/default.nix
index 16f3a4f52a4e..69622b71e0e1 100644
--- a/pkgs/tools/security/kestrel/default.nix
+++ b/pkgs/tools/security/kestrel/default.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "kestrel";
-  version = "0.10.0";
+  version = "0.10.1";
 
   src = fetchFromGitHub {
     owner = "finfet";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-aJKqx/PY7BanzE5AtqmKxvkULgXXqueGnDniLd9tHOg=";
+    hash = "sha256-kEM81HIfWETVrUiqXu1+3az+Stg3GdjHE7FaxXJgNYk=";
   };
 
-  cargoHash = "sha256-UnXaDdQzoYP1N2FnLjOQgiJKnCyCojXKKxVlWYZT0DE=";
+  cargoHash = "sha256-xv35oFawFLVXZS3Eum6RCo8LcVvHftfv+UvJYYmIDx4=";
 
   nativeBuildInputs = [
     installShellFiles

From 0eefa1772bd8a5d67dfd9d9442e26f986a0bee26 Mon Sep 17 00:00:00 2001
From: Adam Stephens <adam@valkor.net>
Date: Sun, 29 Jan 2023 14:17:55 -0500
Subject: [PATCH 29/40] golden-cheetah: add adamcstephens as maintainer

---
 pkgs/applications/misc/golden-cheetah/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix
index 7f796a2bb0c2..a5ce1e6c1310 100644
--- a/pkgs/applications/misc/golden-cheetah/default.nix
+++ b/pkgs/applications/misc/golden-cheetah/default.nix
@@ -76,7 +76,7 @@ in mkDerivation rec {
   meta = with lib; {
     description = "Performance software for cyclists, runners and triathletes";
     platforms = platforms.linux;
-    maintainers = [ ];
+    maintainers = with maintainers; [ adamcstephens ];
     license = licenses.gpl2Plus;
   };
 }

From 133f2623bd73eb1440d89ec3015eab3b30da4c22 Mon Sep 17 00:00:00 2001
From: Adam Stephens <adam@valkor.net>
Date: Sun, 29 Jan 2023 14:18:48 -0500
Subject: [PATCH 30/40] golden-cheetah: 3.6-DEV2111 -> 3.6-RC3

---
 .../0001-Fix-building-with-bison-3.7.patch    | 46 +++++++++----------
 .../misc/golden-cheetah/default.nix           | 19 ++++----
 2 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/pkgs/applications/misc/golden-cheetah/0001-Fix-building-with-bison-3.7.patch b/pkgs/applications/misc/golden-cheetah/0001-Fix-building-with-bison-3.7.patch
index f8f725f7f680..f410d0f18b2b 100644
--- a/pkgs/applications/misc/golden-cheetah/0001-Fix-building-with-bison-3.7.patch
+++ b/pkgs/applications/misc/golden-cheetah/0001-Fix-building-with-bison-3.7.patch
@@ -1,24 +1,5 @@
-From 8befa137776786829508f23dd33ab37e2b95a895 Mon Sep 17 00:00:00 2001
-From: Poncho <poncho@spahan.ch>
-Date: Mon, 7 Sep 2020 09:39:49 +0200
-Subject: [PATCH] Fix building with bison 3.7
-
-Bison 3.7 changes how header files are included [1][2], in that instead of
-copying and inserting the contents of a file, the file itself is included
-(by default as '"basename.h"').
-
-[1] https://lists.gnu.org/archive/html/info-gnu/2020-07/msg00006.html
-[2] https://www.gnu.org/software/bison/manual/html_node/_0025define-Summary.html
-
-Close: https://github.com/GoldenCheetah/GoldenCheetah/issues/3586
----
- src/Core/DataFilter.y     | 3 +++
- src/Core/RideDB.y         | 2 ++
- src/FileIO/JsonRideFile.y | 3 +++
- 3 files changed, 8 insertions(+)
-
 diff --git a/src/Core/DataFilter.y b/src/Core/DataFilter.y
-index 7c5e481b0..142e80a5c 100644
+index 30070f131..15f746a10 100644
 --- a/src/Core/DataFilter.y
 +++ b/src/Core/DataFilter.y
 @@ -49,6 +49,9 @@ extern Leaf *DataFilterroot; // root node for parsed statement
@@ -28,8 +9,8 @@ index 7c5e481b0..142e80a5c 100644
 +// generated by the scanner
 +%define api.header.include {"DataFilter_yacc.h"}
 +
- // Symbol can be meta or metric name
- %token <leaf> SYMBOL PYTHON
+ // Symbol can be meta, metric, variable or function name
+ %token <string> SYMBOL PYTHON
  
 diff --git a/src/Core/RideDB.y b/src/Core/RideDB.y
 index d6da086bd..f2001e23c 100644
@@ -58,6 +39,21 @@ index 2cbbef9fc..d5c77a779 100644
  %pure-parser
  %lex-param { void *scanner }
  %parse-param { struct JsonContext *jc }
--- 
-2.34.1
-
+diff --git a/src/gcconfig.pri.in b/src/gcconfig.pri.in
+index a280bbb6b..07e543372 100644
+--- a/src/gcconfig.pri.in
++++ b/src/gcconfig.pri.in
+@@ -75,10 +75,10 @@
+ 
+ # Let us know where flex and bison are installed.
+ # You may need to specify the full path if things don't work.
+-#QMAKE_LEX  = flex
+-#QMAKE_YACC = bison
++QMAKE_LEX  = flex
++QMAKE_YACC = bison
+ # If you are using bison 3.7 or higher, uncomment the line below
+-#QMAKE_MOVE = cp
++QMAKE_MOVE = cp
+ # If you're compiling with nmake and VC then you
+ # will likely also use win_flex and win_bison
+ # so uncomment below
diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix
index a5ce1e6c1310..ee25c5e8cc0f 100644
--- a/pkgs/applications/misc/golden-cheetah/default.nix
+++ b/pkgs/applications/misc/golden-cheetah/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchFromGitHub, fetchpatch, mkDerivation
 , qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools
 , qtconnectivity, qtcharts, libusb-compat-0_1, gsl, blas
-, bison, flex, zlib, qmake, makeDesktopItem, makeWrapper
+, bison, flex, zlib, qmake, makeDesktopItem, wrapQtAppsHook
 }:
 
 let
@@ -16,13 +16,13 @@ let
   };
 in mkDerivation rec {
   pname = "golden-cheetah";
-  version = "3.6-DEV2111";
+  version = "3.6-RC3";
 
   src = fetchFromGitHub {
     owner = "GoldenCheetah";
     repo = "GoldenCheetah";
-    rev = "v${version}";
-    sha256 = "17sk89szvaq31bcv6rgfn1bbw132k7w8zlalfb3ayflavdxbk6sa";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-/LGVDeWJZZXy5r5WxElDuxUagpA/RIwHGRbkcdO8IrE=";
   };
 
   buildInputs = [
@@ -39,7 +39,7 @@ in mkDerivation rec {
     gsl
     blas
   ];
-  nativeBuildInputs = [ flex makeWrapper qmake bison ];
+  nativeBuildInputs = [ flex wrapQtAppsHook qmake bison ];
 
   patches = [
     # allow building with bison 3.7
@@ -55,11 +55,10 @@ in mkDerivation rec {
   preConfigure = ''
     cp src/gcconfig.pri.in src/gcconfig.pri
     cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri
-    echo 'QMAKE_LRELEASE = ${qttools.dev}/bin/lrelease' >> src/gcconfig.pri
-    echo 'LIBUSB_INSTALL = ${libusb-compat-0_1}' >> src/gcconfig.pri
-    echo 'LIBUSB_INCLUDE = ${libusb-compat-0_1.dev}/include' >> src/gcconfig.pri
-    echo 'LIBUSB_LIBS = -L${libusb-compat-0_1}/lib -lusb' >> src/gcconfig.pri
-    sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local
+    sed -i 's,^#QMAKE_LRELEASE.*,QMAKE_LRELEASE = ${qttools.dev}/bin/lrelease,' src/gcconfig.pri
+    sed -i 's,^#LIBUSB_INSTALL.*,LIBUSB_INSTALL = ${libusb-compat-0_1},' src/gcconfig.pri
+    sed -i 's,^#LIBUSB_INCLUDE.*,LIBUSB_INCLUDE = ${libusb-compat-0_1.dev}/include,' src/gcconfig.pri
+    sed -i 's,^#LIBUSB_LIBS.*,LIBUSB_LIBS = -L${libusb-compat-0_1}/lib -lusb,' src/gcconfig.pri
   '';
 
   installPhase = ''

From aa13964553085617899d147d81de43353680525f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Jan 2023 19:36:14 +0000
Subject: [PATCH 31/40] dendrite: 0.10.8 -> 0.11.0

---
 pkgs/servers/dendrite/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/servers/dendrite/default.nix
index 9051f2e87e54..6f459e7ad282 100644
--- a/pkgs/servers/dendrite/default.nix
+++ b/pkgs/servers/dendrite/default.nix
@@ -3,16 +3,16 @@
 
 buildGoModule rec {
   pname = "matrix-dendrite";
-  version = "0.10.8";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "dendrite";
     rev = "v${version}";
-    sha256 = "sha256-D+hZWcywOCynGxMlJtsr5YaGxwRVGODNYO8jZROsGX8=";
+    sha256 = "sha256-EJUHpV+ZsMMSMsJGhF0Atblksg5rgI3a2qcRxLyZP38=";
   };
 
-  vendorSha256 = "sha256-mNvie0PP0758AndWQ629oY4/aFGwiG358NhwYHSdxEU=";
+  vendorHash = "sha256-Ygd5wC4j0kAbEMMVct5WXZvkcYSqqK8d7ZZ9CDU1RHU=";
 
   subPackages = [
     # The server as a monolith: https://matrix-org.github.io/dendrite/installation/install/monolith

From d060aaf8994950c9557cb78109773559420c9c48 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Jan 2023 19:49:23 +0000
Subject: [PATCH 32/40] usql: 0.13.5 -> 0.13.6

---
 pkgs/applications/misc/usql/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/usql/default.nix b/pkgs/applications/misc/usql/default.nix
index 95c3153eeb08..9300bc3c228d 100644
--- a/pkgs/applications/misc/usql/default.nix
+++ b/pkgs/applications/misc/usql/default.nix
@@ -10,18 +10,18 @@
 
 buildGoModule rec {
   pname = "usql";
-  version = "0.13.5";
+  version = "0.13.6";
 
   src = fetchFromGitHub {
     owner = "xo";
     repo = "usql";
     rev = "v${version}";
-    hash = "sha256-Tsv2nUlxu/nUsupQgYn1CAy/mrwq14OEFZErgO34thU=";
+    hash = "sha256-FmwsiCXSnTEvA1oAScJhnl1ZG7WTfbNQyJBULnNt9/c=";
   };
 
   buildInputs = [ unixODBC icu ];
 
-  vendorHash = "sha256-Zd8/1i9YwVoOoJ1NG5gMGB781IbNBL5lfkrSwYNn9Hg=";
+  vendorHash = "sha256-lla+smDg6nNNQZYEQI5xY3iRw4gm6WCDh8gDZ6N9lqk=";
   proxyVendor = true;
 
   # Exclude broken impala & hive driver

From 002f51e03d9220f85d4df9d05d473a811c70e607 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Jan 2023 19:52:23 +0000
Subject: [PATCH 33/40] tippecanoe: 2.18.0 -> 2.19.0

---
 pkgs/applications/misc/tippecanoe/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/tippecanoe/default.nix b/pkgs/applications/misc/tippecanoe/default.nix
index 916dacd5e52a..eebe42890da3 100644
--- a/pkgs/applications/misc/tippecanoe/default.nix
+++ b/pkgs/applications/misc/tippecanoe/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tippecanoe";
-  version = "2.18.0";
+  version = "2.19.0";
 
   src = fetchFromGitHub {
     owner = "felt";
     repo = "tippecanoe";
     rev = finalAttrs.version;
-    hash = "sha256-+V6nV2L1lE5QEkZcDMg9WE3iiBuZN/QTMR+XX/IdjmA=";
+    hash = "sha256-FWdAMIAoj3/+SQLIan++UpmWH1o3v92FsDw//b5RorM=";
   };
 
   buildInputs = [ sqlite zlib ];

From 8fe6493ad82081eb134f05b4d3d709b7a3d5b870 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Jan 2023 19:57:50 +0000
Subject: [PATCH 34/40] gost: 2.11.1 -> 2.11.5

---
 pkgs/tools/networking/gost/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/gost/default.nix b/pkgs/tools/networking/gost/default.nix
index 0c12652586be..f36ee2d3e206 100644
--- a/pkgs/tools/networking/gost/default.nix
+++ b/pkgs/tools/networking/gost/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "gost";
-  version = "2.11.1";
+  version = "2.11.5";
 
   src = fetchFromGitHub {
     owner = "ginuerzh";
     repo = "gost";
     rev = "v${version}";
-    sha256 = "1mxgjvx99bz34f132827bqk56zgvh5rw3h2xmc524wvx59k9zj2a";
+    sha256 = "sha256-UBjrWeBw9+qKQ/+1T1W/3e0vrigp540URIyM2d9iCE8=";
   };
 
-  vendorSha256 = "1cgb957ipkiix3x0x84c77a1i8l679q3kqykm1lhb4f19x61dqjh";
+  vendorHash = "sha256-lA4uW0cc0XqU9pjVEMapFLb3eD20Lea9PbkgL3sjJns=";
 
   postPatch = ''
     substituteInPlace http2_test.go \

From 97655c9381b780fc1fc5bfc5c9a8288a895bf52d Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sun, 29 Jan 2023 21:01:56 +0100
Subject: [PATCH 35/40] rpm-ostree: 2022.13 -> 2023.1

---
 pkgs/tools/misc/rpm-ostree/default.nix | 7 +++++--
 pkgs/top-level/all-packages.nix        | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix
index 7b9b362d7935..3c3b02dd3f98 100644
--- a/pkgs/tools/misc/rpm-ostree/default.nix
+++ b/pkgs/tools/misc/rpm-ostree/default.nix
@@ -40,13 +40,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rpm-ostree";
-  version = "2022.13";
+  version = "2023.1";
 
   outputs = [ "out" "dev" "man" "devdoc" ];
 
   src = fetchurl {
     url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-3lU+Xmfyjs6AFnf+vE5xMSAntRoNeHBVrOJZLvv1YyY=";
+    hash = "sha256-JNLp1IHbIRpe3Au2iUsx7x065rirQlzT9bg7CoqHCyg=";
   };
 
   nativeBuildInputs = [
@@ -114,6 +114,9 @@ stdenv.mkDerivation rec {
     env NOCONFIGURE=1 ./autogen.sh
   '';
 
+  # https://github.com/NixOS/nixpkgs/issues/201254
+  NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc";
+
   meta = with lib; {
     description = "A hybrid image/package system. It uses OSTree as an image format, and uses RPM as a component model";
     homepage = "https://coreos.github.io/rpm-ostree/";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 84588a3fb207..09af15ab4cd1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11457,6 +11457,8 @@ with pkgs;
 
   rpm-ostree = callPackage ../tools/misc/rpm-ostree {
     gperf = gperf_3_0;
+    # https://github.com/NixOS/nixpkgs/issues/201254
+    stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv else stdenv;
   };
 
   rpm2targz = callPackage ../tools/archivers/rpm2targz { };

From 719765485ffede93940cad024b288d0b429d6aec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Jan 2023 20:05:31 +0000
Subject: [PATCH 36/40] codeql: 2.12.0 -> 2.12.1

---
 pkgs/development/tools/analysis/codeql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix
index ec333520ca54..0a9cefb57b06 100644
--- a/pkgs/development/tools/analysis/codeql/default.nix
+++ b/pkgs/development/tools/analysis/codeql/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "codeql";
-  version = "2.12.0";
+  version = "2.12.1";
 
   dontConfigure = true;
   dontBuild = true;
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   src = fetchzip {
     url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
-    sha256 = "sha256-V+UXodw84NGZPi3Ws4hKyftqnGibn9uFgrkGXxpRAZc=";
+    sha256 = "sha256-rJdB1G2/Fbs5zwfXF/Q79k1IztkOJrL7b0sjH5kcEMs=";
   };
 
   nativeBuildInputs = [

From d234d85007ffadd020eb6aa702fdeff09570233e Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlenga <k.kotlenga@gmail.com>
Date: Sun, 29 Jan 2023 21:19:20 +0100
Subject: [PATCH 37/40] vimPlugins.gruvbox-nvim: Remove unused lush dependency

gruvbox-nvim doesn't depend on lush since
https://github.com/ellisonleao/gruvbox.nvim/commit/de05c0ff9647afa14a892b2d107d1ad915dbf4c5
---
 pkgs/applications/editors/vim/plugins/overrides.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 3086cbf82414..5cdf4b1d658a 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -484,10 +484,6 @@ self: super: {
     dependencies = with self; [ plenary-nvim ];
   });
 
-  gruvbox-nvim = super.gruvbox-nvim.overrideAttrs (old: {
-    dependencies = with self; [ lush-nvim ];
-  });
-
   himalaya-vim = super.himalaya-vim.overrideAttrs (old: {
     postPatch = ''
       substituteInPlace plugin/himalaya.vim \

From 15dbacc1a48479e182798b66ba2c89c92fbdd084 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 29 Jan 2023 14:15:22 +0100
Subject: [PATCH 38/40] maintainers: move srounce

maintainers: move franzmondlichtmann

maintainers: move ym*

maintainers: move bb2020

maintainers: move bbenne10

maintainers: mive dei*

maitnainers: move ziguana

maintainers: move zuzuleinen

maintainers: move wd15

maintainers: move ameer

maintainers: move zane

maintainers: move rb

maintainers: move yshym

maintainers: move zupo

maintainers: move zokrezyl

maintainers: move xavierzwirtz

maintainers: move RossComputerGuy

maintainers: move detegr

maintainers: move cpcloud

maintainers: move berbiche

maintainers: move davegallant

maintainers: move hmenke

maintainers: move bezmuth

maintainers: move bpaulin

maintainers: move bryanhonof

maintainers: move nikstur

maintainers: move yisuidenghua

maintainers: move wuyoli

maintainers: move WhiteBlackGoose

maintainers: move witchof0x20

maintainers: move waelwindows

maintainers: move wesleyjrz

maintainers: move hloeffler

maintainers: move wilsonehusin

maintainers: move wenngle

maintainers: move nagisa

maintainers: move yanganto

maintainers: move pwoelfel

maintainers: move melling

maintainers: move melias122

maintainers: move zbioe

maintainers: move zendo

maintainers: move waiting-for-dev

maintainers: move zeri

maintainers: move kuwii

maintainers: move sei40kr

maintainers: move zseri

maintainers: move masaeedu

maintainers: move zenithal

maintainers: move ydlr

maintainers: move princemachiavelli

maintainers: move kkharji

maintainers: move fzakaria

maintainers: move mlatus

maintainers: move portothree

maintainers: move dfithian

maintainers: move rakesh4g

maintainers: move starcraft66

maintainers: move zoedsoupe

maintainers: move zanculmarktum

maintainers: move zombiezen

maintainers: move nigelgbanks

maintainers: move saulecabrera

maintainers: move vbrandl

maintainers: move jali-clarke

maintainers: move shardy

maintainers: move qbit

maintainers: move turbomack

maintainers: move jpagex

maintainers: move npatsakula

maintainers: move tfmoraes

maintainers: move vdot0x23

maintainers: move pulsation

maintainers: move misuzu

 maintainers: move matthewcroughan

maintainers: move ngerstle

maintainers: move snpschaaf

maintainers: move tjni

maintainers: move cafkafk

maintainers: move macalinao

maintainers: move snglth

maintainers: move SohamG
---
 maintainers/maintainer-list.nix | 1151 +++++++++++++++----------------
 1 file changed, 575 insertions(+), 576 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2aec66efa9be..327122a4a363 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -759,6 +759,12 @@
     githubId = 2626481;
     name = "Ambroz Bizjak";
   };
+  ameer = {
+    name = "Ameer Taweel";
+    email = "ameertaweel2002@gmail.com";
+    github = "AmeerTaweel";
+    githubId = 20538273;
+  };
   amesgen = {
     email = "amesgen@amesgen.de";
     github = "amesgen";
@@ -1638,12 +1644,28 @@
     githubId = 340132;
     name = "Brayden Banks";
   };
+  bb2020 = {
+    github = "bb2020";
+    githubId = 19290397;
+    name = "Tunc Uzlu";
+  };
   bbarker = {
     email = "brandon.barker@gmail.com";
     github = "bbarker";
     githubId = 916366;
     name = "Brandon Elam Barker";
   };
+  bbenne10 = {
+    email = "Bryan.Bennett@protonmail.com";
+    matrix = "@bryan.bennett:matrix.org";
+    github = "bbenne10";
+    githubId = 687376;
+    name = "Bryan Bennett";
+    keys = [{
+      # compare with https://keybase.io/bbenne10
+      fingerprint = "41EA 00B4 00F9 6970 1CB2  D3AF EF90 E3E9 8B8F 5C0B";
+    }];
+  };
   bbenno = {
     email = "nix@bbenno.com";
     github = "bbenno";
@@ -1778,6 +1800,15 @@
     githubId = 26041945;
     name = "Potato Hatsue";
   };
+  berbiche = {
+    name = "Nicolas Berbiche";
+    email = "nicolas@normie.dev";
+    github = "berbiche";
+    githubId = 20448408;
+    keys = [{
+      fingerprint = "D446 E58D 87A0 31C7 EC15  88D7 B461 2924 45C6 E696";
+    }];
+  };
   berce = {
     email = "bert.moens@gmail.com";
     github = "berce";
@@ -1820,6 +1851,12 @@
     githubId = 9730330;
     name = "Benoit de Chezelles";
   };
+  bezmuth = {
+    email = "benkel97@protonmail.com";
+    name = "Ben Kelly";
+    github = "bezmuth";
+    githubId = 31394095;
+  };
   bfortz = {
     email = "bernard.fortz@gmail.com";
     github = "bfortz";
@@ -2015,6 +2052,12 @@
     github = "bouk";
     githubId = 97820;
   };
+  bpaulin = {
+    email = "brunopaulin@bpaulin.net";
+    github = "bpaulin";
+    githubId = 115711;
+    name = "bpaulin";
+  };
   bradediger = {
     email = "brad@bradediger.com";
     github = "bradediger";
@@ -2124,6 +2167,12 @@
     githubId = 53131727;
     name = "Bryan Albuquerque";
   };
+  bryanhonof = {
+    name = "Bryan Honof";
+    email = "bryanhonof@gmail.com";
+    github = "bryanhonof";
+    githubId = 5932804;
+  };
   btlvr = {
     email = "btlvr@protonmail.com";
     github = "btlvr";
@@ -2218,6 +2267,21 @@
       }
     ];
   };
+  cafkafk = {
+    email = "christina@cafkafk.com";
+    matrix = "@cafkafk:matrix.cafkafk.com";
+    name = "Christina Sørensen";
+    github = "cafkafk";
+    githubId = 89321978;
+    keys = [
+      {
+        fingerprint = "7B9E E848 D074 AE03 7A0C  651A 8ED4 DEF7 375A 30C8";
+      }
+      {
+        fingerprint = "208A 2A66 8A2F CDE7 B5D3 8F64 CDDC 792F 6552 51ED";
+      }
+    ];
+  };
   calbrecht = {
     email = "christian.albrecht@mayflower.de";
     github = "calbrecht";
@@ -2934,6 +2998,11 @@
     githubId = 1573344;
     name = "Andrey Pavlov";
   };
+  cpcloud = {
+    name = "Phillip Cloud";
+    github = "cpcloud";
+    githubId = 417981;
+  };
   cpages = {
     email = "page@ruiec.cat";
     github = "cpages";
@@ -3253,6 +3322,12 @@
     githubId = 34766150;
     name = "datafoo";
   };
+  davegallant = {
+    name = "Dave Gallant";
+    email = "davegallant@gmail.com";
+    github = "davegallant";
+    githubId = 4519234;
+  };
   davhau = {
     email = "d.hauer.it@gmail.com";
     name = "David Hauer";
@@ -3386,6 +3461,17 @@
     githubId = 156239;
     name = "D Anzorge";
   };
+  deifactor = {
+    name = "Ash Zahlen";
+    email = "ext0l@riseup.net";
+    github = "deifactor";
+    githubId = 30192992;
+  };
+  deinferno = {
+    name = "deinferno";
+    github = "deinferno";
+    githubId = 14363193;
+  };
   delan = {
     name = "Delan Azabani";
     email = "delan@azabani.com";
@@ -3494,6 +3580,12 @@
     githubId = 10042482;
     name = "Louis Pearson";
   };
+  detegr = {
+    name = "Antti Keränen";
+    email = "detegr@rbx.email";
+    github = "Detegr";
+    githubId = 724433;
+  };
   Dettorer = {
     name = "Paul Hervot";
     email = "paul.hervot@dettorer.net";
@@ -3525,6 +3617,12 @@
     githubId = 579369;
     name = "Tuomas Tynkkynen";
   };
+  dfithian = {
+    email = "daniel.m.fithian@gmail.com";
+    name = "Daniel Fithian";
+    github = "dfithian";
+    githubId = 8409320;
+  };
   dfordivam = {
     email = "dfordivam+nixpkgs@gmail.com";
     github = "dfordivam";
@@ -4894,13 +4992,18 @@
     githubId = 84968;
     name = "Florian Paul Schmidt";
   };
-
   fragamus = {
     email = "innovative.engineer@gmail.com";
     github = "fragamus";
     githubId = 119691;
     name = "Michael Gough";
   };
+  franzmondlichtmann = {
+    name = "Franz Schroepf";
+    email = "franz-schroepf@t-online.de";
+    github = "franzmondlichtmann";
+    githubId = 105480088;
+  };
   freax13 = {
     email = "erbse.13@gmx.de";
     github = "Freax13";
@@ -5014,6 +5117,13 @@
     githubId = 3036816;
     name = "Edgar Aroutiounian";
   };
+  fzakaria = {
+    name = "Farid Zakaria";
+    email = "farid.m.zakaria@gmail.com";
+    matrix = "@fzakaria:matrix.org";
+    github = "fzakaria";
+    githubId = 605070;
+  };
   gabesoft = {
     email = "gabesoft@gmail.com";
     github = "gabesoft";
@@ -5789,12 +5899,28 @@
     github = "thbkrshw";
     githubId = 33122;
   };
+  hloeffler = {
+    name = "Hauke Löffler";
+    email = "nix@hauke-loeffler.de";
+    github = "hloeffler";
+    githubId = 6627191;
+  };
   hlolli = {
     email = "hlolli@gmail.com";
     github = "hlolli";
     githubId = 6074754;
     name = "Hlodver Sigurdsson";
   };
+  hmenke = {
+    name = "Henri Menke";
+    email = "henri@henrimenke.de";
+    matrix = "@hmenke:matrix.org";
+    github = "hmenke";
+    githubId = 1903556;
+    keys = [{
+      fingerprint = "F1C5 760E 45B9 9A44 72E9  6BFB D65C 9AFB 4C22 4DA3";
+    }];
+  };
   huantian = {
     name = "David Li";
     email = "davidtianli@gmail.com";
@@ -6361,6 +6487,12 @@
       fingerprint = "B982 0250 1720 D540 6A18  2DA8 188E 4945 E85B 2D21";
     }];
   };
+  jali-clarke = {
+    email = "jinnah.ali-clarke@outlook.com";
+    name = "Jinnah Ali-Clarke";
+    github = "jali-clarke";
+    githubId = 17733984;
+  };
   jasoncarr = {
     email = "jcarr250@gmail.com";
     github = "jasoncarr0";
@@ -7069,6 +7201,12 @@
     githubId = 15893072;
     name = "Josh van Leeuwen";
   };
+  jpagex = {
+    name = "Jérémy Pagé";
+    email = "contact@jeremypage.me";
+    github = "jpagex";
+    githubId = 635768;
+  };
   jpas = {
     name = "Jarrod Pas";
     email = "jarrod@jarrodpas.com";
@@ -7636,6 +7774,12 @@
     github = "kjeremy";
     githubId = 4325700;
   };
+  kkharji = {
+    name = "kkharji";
+    email = "kkharji@protonmail.com";
+    github = "kkharji";
+    githubId = 65782666;
+  };
   klden = {
     name = "Kenzyme Le";
     email = "kl@kenzymele.com";
@@ -7857,6 +8001,12 @@
     githubId = 2943605;
     name = "Evgeny Kurnevsky";
   };
+  kuwii = {
+    name = "kuwii";
+    email = "kuwii.someone@gmail.com";
+    github = "kuwii";
+    githubId = 10705175;
+  };
   kuznero = {
     email = "roman@kuznero.com";
     github = "kuznero";
@@ -8637,6 +8787,15 @@
     githubId = 42545625;
     name = "Maas Lalani";
   };
+  macalinao = {
+    email = "me@ianm.com";
+    name = "Ian Macalinao";
+    github = "macalinao";
+    githubId = 401263;
+    keys = [{
+      fingerprint = "1147 43F1 E707 6F3E 6F4B  2C96 B9A8 B592 F126 F8E8";
+    }];
+  };
   maddiethecafebabe = {
     email = "maddie@cafebabe.date";
     github = "maddiethecafebabe";
@@ -8852,6 +9011,12 @@
       fingerprint = "B573 5118 0375 A872 FBBF  7770 B629 036B E399 EEE9";
     }];
   };
+  masaeedu = {
+    email = "masaeedu@gmail.com";
+    github = "masaeedu";
+    githubId = 3674056;
+    name = "Asad Saeeduddin";
+  };
   masipcat = {
     email = "jordi@masip.cat";
     github = "masipcat";
@@ -8906,6 +9071,12 @@
     githubId = 952712;
     name = "Matt Christ";
   };
+  matthewcroughan = {
+    email = "matt@croughan.sh";
+    github = "MatthewCroughan";
+    githubId = 26458780;
+    name = "Matthew Croughan";
+  };
   matthewbauer = {
     email = "mjbauer95@gmail.com";
     github = "matthewbauer";
@@ -9201,11 +9372,11 @@
     githubId = 365721;
     name = "Francois Truphemus";
   };
-  melsigl = {
-    email = "melanie.bianca.sigl@gmail.com";
-    github = "melsigl";
-    githubId = 15093162;
-    name = "Melanie B. Sigl";
+  melias122 = {
+    name = "Martin Elias";
+    email = "martin+nixpkgs@elias.sx";
+    github = "melias122";
+    githubId = 1027766;
   };
   melkor333 = {
     email = "samuel@ton-kunst.ch";
@@ -9213,6 +9384,18 @@
     githubId = 6412377;
     name = "Samuel Ruprecht";
   };
+  melling = {
+    email = "mattmelling@fastmail.com";
+    github = "mattmelling";
+    githubId = 1215331;
+    name = "Matt Melling";
+  };
+  melsigl = {
+    email = "melanie.bianca.sigl@gmail.com";
+    github = "melsigl";
+    githubId = 15093162;
+    name = "Melanie B. Sigl";
+  };
   kira-bruneau = {
     email = "kira.bruneau@pm.me";
     name = "Kira Bruneau";
@@ -9496,6 +9679,12 @@
       fingerprint = "7088 C742 1873 E0DB 97FF  17C2 245C AB70 B4C2 25E9";
     }];
   };
+  misuzu = {
+    email = "bakalolka@gmail.com";
+    github = "misuzu";
+    githubId = 248143;
+    name = "misuzu";
+  };
   mitchmindtree = {
     email = "mail@mitchellnordine.com";
     github = "mitchmindtree";
@@ -9560,6 +9749,12 @@
       fingerprint = "64BE BF11 96C3 DD7A 443E  8314 1DC0 82FA DE5B A863";
     }];
   };
+  mlatus = {
+    email = "wqseleven@gmail.com";
+    github = "Ninlives";
+    githubId = 17873203;
+    name = "mlatus";
+  };
   mlieberman85 = {
     email = "mlieberman85@gmail.com";
     github = "mlieberman85";
@@ -9965,6 +10160,12 @@
     githubId = 6783654;
     name = "Nadrieril Feneanar";
   };
+  nagisa = {
+    name = "Simonas Kazlauskas";
+    email = "nixpkgs@kazlauskas.me";
+    github = "nagisa";
+    githubId = 679122;
+  };
   nagy = {
     email = "danielnagy@posteo.de";
     github = "nagy";
@@ -10210,6 +10411,18 @@
     githubId = 6391776;
     name = "Nikita Voloboev";
   };
+  nikstur = {
+    email = "nikstur@outlook.com";
+    name = "nikstur";
+    github = "nikstur";
+    githubId = 61635709;
+  };
+  ngerstle = {
+    name = "Nicholas Gerstle";
+    email = "ngerstle@gmail.com";
+    github = "ngerstle";
+    githubId = 1023752;
+  };
   ngiger = {
     email = "niklaus.giger@member.fsf.org";
     github = "ngiger";
@@ -10283,6 +10496,12 @@
       fingerprint = "E576 BFB2 CF6E B13D F571  33B9 E315 A758 4613 1564";
     }];
   };
+  nigelgbanks = {
+    name = "Nigel Banks";
+    email = "nigel.g.banks@gmail.com";
+    github = "nigelgbanks";
+    githubId = 487373;
+  };
   NikolaMandic = {
     email = "nikola@mandic.email";
     github = "NikolaMandic";
@@ -10459,6 +10678,12 @@
     githubId = 5548;
     name = "Nicolas Pouillard";
   };
+  npatsakula = {
+    email = "nikita.patsakula@gmail.com";
+    name = "Patsakula Nikita";
+    github = "npatsakula";
+    githubId = 23001619;
+  };
   nphilou = {
     email = "nphilou@gmail.com";
     github = "nphilou";
@@ -11457,6 +11682,12 @@
     githubId = 4201956;
     name = "pongo1231";
   };
+  portothree = {
+    name = "Gustavo Porto";
+    email = "gus@p8s.co";
+    github = "portothree";
+    githubId = 3718120;
+  };
   poscat = {
     email = "poscat@mail.poscat.moe";
     github = "poscat0x04";
@@ -11511,6 +11742,16 @@
     githubId = 228931;
     name = "Philipp Riegger";
   };
+  princemachiavelli = {
+    name = "Josh Hoffer";
+    email = "jhoffer@sansorgan.es";
+    matrix = "@princemachiavelli:matrix.org";
+    github = "Princemachiavelli";
+    githubId = 2730968;
+    keys = [{
+      fingerprint = "DD54 130B ABEC B65C 1F6B  2A38 8312 4F97 A318 EA18";
+    }];
+  };
   prikhi = {
     email = "pavan.rikhi@gmail.com";
     github = "prikhi";
@@ -11652,6 +11893,11 @@
     githubId = 37715;
     name = "Brian McKenna";
   };
+  pulsation = {
+    name = "Philippe Sam-Long";
+    github = "pulsation";
+    githubId = 1838397;
+  };
   purcell = {
     email = "steve@sanityinc.com";
     github = "purcell";
@@ -11671,6 +11917,12 @@
     githubId = 23097564;
     name = "Nora Widdecke";
   };
+  pwoelfel = {
+    name = "Philipp Woelfel";
+    email = "philipp.woelfel@gmail.com";
+    github = "PhilippWoelfel";
+    githubId = 19400064;
+  };
   pyrolagus = {
     email = "pyrolagus@gmail.com";
     github = "PyroLagus";
@@ -11689,6 +11941,16 @@
     githubId = 315234;
     name = "Serge Bazanski";
   };
+  qbit = {
+    name = "Aaron Bieber";
+    email = "aaron@bolddaemon.com";
+    github = "qbit";
+    githubId = 68368;
+    matrix = "@qbit:tapenet.org";
+    keys = [{
+      fingerprint = "3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE";
+    }];
+  };
   qknight = {
     email = "js@lastlog.de";
     github = "qknight";
@@ -11807,6 +12069,12 @@
     githubId = 882;
     name = "Ragnar Dahlen";
   };
+  rakesh4g = {
+    email = "rakeshgupta4u@gmail.com";
+    github = "Rakesh4G";
+    githubId = 50867187;
+    name = "Rakesh Gupta";
+  };
   ralith = {
     email = "ben.e.saunders@gmail.com";
     matrix = "@ralith:ralith.com";
@@ -11862,6 +12130,12 @@
     githubId = 1758708;
     name = "Răzvan Flavius Panda";
   };
+  rb = {
+    email = "maintainers@cloudposse.com";
+    github = "nitrocode";
+    githubId = 7775707;
+    name = "RB";
+  };
   rb2k = {
     email = "nix@marc-seeger.com";
     github = "rb2k";
@@ -12321,6 +12595,12 @@
       fingerprint = "1401 1B63 393D 16C1 AA9C  C521 8526 B757 4A53 6236";
     }];
   };
+  RossComputerGuy = {
+    name = "Tristan Ross";
+    email = "tristan.ross@midstall.com";
+    github = "RossComputerGuy";
+    githubId = 19699320;
+  };
   rowanG077 = {
     email = "goemansrowan@gmail.com";
     github = "rowanG077";
@@ -12630,6 +12910,12 @@
     githubId = 695473;
     name = "Sascha Grunert";
   };
+  saulecabrera = {
+    name = "Saúl Cabrera";
+    email = "saulecabrera@gmail.com";
+    github = "saulecabrera";
+    githubId = 1423601;
+  };
   sauyon = {
     email = "s@uyon.co";
     github = "sauyon";
@@ -12824,6 +13110,12 @@
     githubId = 17243347;
     name = "Sebastian Sellmeier";
   };
+  sei40kr = {
+    name = "Seong Yong-ju";
+    email = "sei40kr@gmail.com";
+    github = "sei40kr";
+    githubId = 11665236;
+  };
   sellout = {
     email = "greg@technomadic.org";
     github = "sellout";
@@ -12961,6 +13253,12 @@
     }];
     name = "Shane Sveller";
   };
+  shardy = {
+    email = "shardul@baral.ca";
+    github = "shardulbee";
+    githubId = 16765155;
+    name = "Shardul Baral";
+  };
   shawndellysse = {
     email = "sdellysse@gmail.com";
     github = "sdellysse";
@@ -13275,11 +13573,23 @@
     github = "snapdgn";
     githubId = 85608760;
   };
+  snglth = {
+    email = "illia@ishestakov.com";
+    github = "snglth";
+    githubId = 8686360;
+    name = "Illia Shestakov";
+  };
   snicket2100 = {
     github = "snicket2100";
     githubId = 57048005;
     name = "snicket2100";
   };
+  snpschaaf = {
+    email = "philipe.schaaf@secunet.com";
+    name = "Philippe Schaaf";
+    github = "snpschaaf";
+    githubId = 105843013;
+  };
   snyh = {
     email = "snyh@snyh.org";
     github = "snyh";
@@ -13298,6 +13608,15 @@
     githubId = 2157287;
     name = "sohalt";
   };
+  SohamG = {
+    email = "sohamg2@gmail.com";
+    name = "Soham S Gumaste";
+    github = "SohamG";
+    githubId = 7116239;
+    keys = [{
+      fingerprint = "E067 520F 5EF2 C175 3F60  50C0 BA46 725F 6A26 7442";
+    }];
+  };
   solson = {
     email = "scott@solson.me";
     matrix = "@solson:matrix.org";
@@ -13415,6 +13734,12 @@
     githubId = 219362;
     name = "Sarah Brofeldt";
   };
+  srounce = {
+    name = "Samuel Rounce";
+    email = "me@samuelrounce.co.uk";
+    github = "srounce";
+    githubId = 60792;
+  };
   SShrike = {
     email = "severen@shrike.me";
     github = "severen";
@@ -13439,6 +13764,15 @@
     githubId = 7512804;
     name = "Martin Langlotz";
   };
+  starcraft66 = {
+    name = "Tristan Gosselin-Hane";
+    email = "starcraft66@gmail.com";
+    github = "starcraft66";
+    githubId = 1858154;
+    keys = [{
+      fingerprint = "8597 4506 EC69 5392 0443  0805 9D98 CDAC FF04 FD78";
+    }];
+  };
   stargate01 = {
     email = "christoph.honal@web.de";
     github = "StarGate01";
@@ -14036,6 +14370,11 @@
     githubId = 29044;
     name = "Jacek Galowicz";
   };
+  tfmoraes = {
+    name = "Thiago Franco de Moraes";
+    github = "tfmoraes";
+    githubId = 351108;
+  };
   tg-x = {
     email = "*@tg-x.net";
     github = "tg-x";
@@ -14324,6 +14663,16 @@
     githubId = 13026;
     name = "Jonathan Rudenberg";
   };
+  tjni = {
+    email = "43ngvg@masqt.com";
+    matrix = "@tni:matrix.org";
+    name = "Theodore Ni";
+    github = "tjni";
+    githubId = 3806110;
+    keys = [{
+      fingerprint = "4384 B8E1 299F C028 1641  7B8F EC30 EFBE FA7E 84A4";
+    }];
+  };
   tkerber = {
     email = "tk@drwx.org";
     github = "tkerber";
@@ -14577,6 +14926,12 @@
     githubId = 563054;
     name = "Thomas Tuegel";
   };
+  turbomack = {
+    email = "marek.faj@gmail.com";
+    github = "turboMaCk";
+    githubId = 2130305;
+    name = "Marek Fajkus";
+  };
   turion = {
     email = "programming@manuelbaerenz.de";
     github = "turion";
@@ -14871,6 +15226,12 @@
     githubId = 797581;
     name = "Vincent Bernardoff";
   };
+  vbrandl = {
+    name = "Valentin Brandl";
+    email = "mail+nixpkgs@vbrandl.net";
+    github = "vbrandl";
+    githubId = 20639051;
+  };
   vcanadi = {
     email = "vito.canadi@gmail.com";
     github = "vcanadi";
@@ -14894,6 +15255,12 @@
     githubId = 6508;
     name = "Vincent Demeester";
   };
+  vdot0x23 = {
+    name = "Victor Büttner";
+    email = "nix.victor@0x23.dk";
+    github = "vdot0x23";
+    githubId = 40716069;
+  };
   veehaitch = {
     name = "Vincent Haupert";
     email = "mail@vincent-haupert.de";
@@ -15114,6 +15481,18 @@
       fingerprint = "E595 7FE4 FEF6 714B 1AD3  1483 937F 2AE5 CCEF BF59";
     }];
   };
+  waelwindows = {
+    email = "waelwindows9922@gmail.com";
+    github = "Waelwindows";
+    githubId = 5228243;
+    name = "waelwindows";
+  };
+  waiting-for-dev = {
+    email = "marc@lamarciana.com";
+    github = "waiting-for-dev";
+    githubId = 52650;
+    name = "Marc Busqué";
+  };
   wakira = {
     name = "Sheng Wang";
     email = "sheng@a64.work";
@@ -15147,6 +15526,12 @@
     githubId = 34962284;
     name = "wchresta";
   };
+  wd15 = {
+    email = "daniel.wheeler2@gmail.com";
+    github = "wd15";
+    githubId = 1986844;
+    name = "Daniel Wheeler";
+  };
   wdavidw = {
     name = "David Worms";
     email = "david@adaltas.com";
@@ -15184,6 +15569,12 @@
       fingerprint = "2145 955E 3F5E 0C95 3458  41B5 11F7 BAEA 8567 43FF";
     }];
   };
+  wenngle = {
+    name = "Zeke Stephens";
+    email = "zekestephens@gmail.com";
+    github = "wenngle";
+    githubId = 63376671;
+  };
   wentam = {
     name = "Matt Egeler";
     email = "wentam42@gmail.com";
@@ -15196,6 +15587,12 @@
     github = "wentasah";
     githubId = 140542;
   };
+  wesleyjrz = {
+    email = "dev@wesleyjrz.com";
+    name = "Wesley V. Santos Jr.";
+    github = "wesleyjrz";
+    githubId = 60184588;
+  };
   wesnel = {
     name = "Wesley Nelson";
     email = "wgn@wesnel.dev";
@@ -15211,6 +15608,24 @@
     githubId = 13031455;
     name = "Jakob Schmutz";
   };
+  witchof0x20 = {
+    name = "Jade";
+    email = "jade@witchof.space";
+    github = "witchof0x20";
+    githubId = 36118348;
+    keys = [{
+      fingerprint = "69C9 876B 5797 1B2E 11C5  7C39 80A1 F76F C9F9 54AE";
+    }];
+  };
+  WhiteBlackGoose = {
+    email = "wbg@angouri.org";
+    github = "WhiteBlackGoose";
+    githubId = 31178401;
+    name = "WhiteBlackGoose";
+    keys = [{
+      fingerprint = "640B EDDE 9734 310A BFA3  B257 52ED AE6A 3995 AFAB";
+    }];
+  };
   WhittlesJr = {
     email = "alex.joseph.whitt@gmail.com";
     github = "WhittlesJr";
@@ -15243,6 +15658,12 @@
     githubId = 5185341;
     name = "Will Cohen";
   };
+  wilsonehusin = {
+    name = "Wilson E. Husin";
+    email = "wilsonehusin@gmail.com";
+    github = "wilsonehusin";
+    githubId = 14004487;
+  };
   winpat = {
     email = "patrickwinter@posteo.ch";
     github = "winpat";
@@ -15389,6 +15810,12 @@
     github = "wunderbrick";
     githubId = 52174714;
   };
+  wuyoli = {
+    name = "wuyoli";
+    email = "wuyoli@tilde.team";
+    github = "wuyoli";
+    githubId = 104238274;
+  };
   wyndon = {
     matrix = "@wyndon:envs.net";
     github = "wyndon";
@@ -15419,6 +15846,12 @@
     githubId = 11050617;
     name = "Dominik Xaver Hörl";
   };
+  xavierzwirtz = {
+    email = "me@xavierzwirtz.com";
+    github = "xavierzwirtz";
+    githubId = 474343;
+    name = "Xavier Zwirtz";
+  };
   xbreak = {
     email = "xbreak@alphaware.se";
     github = "xbreak";
@@ -15532,6 +15965,12 @@
     githubId = 1643293;
     name = "Yana Timoshenko";
   };
+  yanganto = {
+    name = "Antonio Yang";
+    email = "yanganto@gmail.com";
+    github = "yanganto";
+    githubId = 10803111;
+  };
   yarny = {
     github = "Yarny0";
     githubId = 41838844;
@@ -15550,6 +15989,15 @@
     githubId = 73759599;
     name = "Lara A.";
   };
+  ydlr = {
+    name = "ydlr";
+    email = "ydlr@ydlr.io";
+    github = "ydlr";
+    githubId = 58453832;
+    keys = [{
+      fingerprint = "FD0A C425 9EF5 4084 F99F 9B47 2ACC 9749 7C68 FAD4";
+    }];
+  };
   yesbox = {
     email = "jesper.geertsen.jonsson@gmail.com";
     github = "yesbox";
@@ -15562,6 +16010,12 @@
     githubId = 11229748;
     name = "Lin Yinfeng";
   };
+  yisuidenghua = {
+    email = "bileiner@gmail.com";
+    name = "Milena Yisui";
+    github = "YisuiDenghua";
+    githubId = 102890144;
+  };
   ylecornec = {
     email = "yves.stan.lecornec@tweag.io";
     github = "ylecornec";
@@ -15586,6 +16040,25 @@
     githubId = 1311192;
     name = "Alexander Kiselyov";
   };
+  ymarkus = {
+    name = "Yannick Markus";
+    email = "nixpkgs@ymarkus.dev";
+    github = "ymarkus";
+    githubId = 62380378;
+  };
+  ymatsiuk = {
+    name = "Yurii Matsiuk";
+    github = "ymatsiuk";
+    githubId = 24990891;
+    keys = [{
+      fingerprint = "7BB8 84B5 74DA FDB1 E194  ED21 6130 2290 2986 01AA";
+    }];
+  };
+  ymeister = {
+    name = "Yuri Meister";
+    github = "ymeister";
+    githubId = 47071325;
+  };
   yochai = {
     email = "yochai@titat.info";
     github = "yochai";
@@ -15617,6 +16090,12 @@
     github = "yrd";
     githubId = 1820447;
   };
+  yshym = {
+    name = "Yevhen Shymotiuk";
+    email = "yshym@pm.me";
+    github = "yshym";
+    githubId = 44244245;
+  };
   ysndr = {
     email = "me@ysndr.de";
     github = "ysndr";
@@ -15724,6 +16203,21 @@
     githubId = 1319905;
     name = "Uma Zalakain";
   };
+  zanculmarktum = {
+    name = "Azure Zanculmarktum";
+    email = "zanculmarktum@gmail.com";
+    github = "zanculmarktum";
+    githubId = 16958511;
+  };
+  zane = {
+    name = "Zane van Iperen";
+    email = "zane@zanevaniperen.com";
+    github = "vs49688";
+    githubId = 4423262;
+    keys = [{
+      fingerprint = "61AE D40F 368B 6F26 9DAE  3892 6861 6B2D 8AC4 DCC5";
+    }];
+  };
   zaninime = {
     email = "francesco@zanini.me";
     github = "zaninime";
@@ -15748,6 +16242,12 @@
     githubId = 6191421;
     name = "Edward d'Albon";
   };
+  zbioe = {
+    name = "Iury Fukuda";
+    email = "zbioe@protonmail.com";
+    github = "zbioe";
+    githubId = 7332055;
+  };
   zebreus = {
     matrix = "@lennart:cicen.net";
     email = "lennarteichhorn+nixpkgs@gmail.com";
@@ -15755,6 +16255,27 @@
     githubId = 1557253;
     name = "Lennart Eichhorn";
   };
+  zeri = {
+    name = "zeri";
+    matrix = "@zeri:matrix.org";
+    github = "zeri42";
+    githubId = 68825133;
+  };
+  zendo = {
+    name = "zendo";
+    email = "linzway@qq.com";
+    github = "zendo";
+    githubId = 348013;
+  };
+  zenithal = {
+    name = "zenithal";
+    email = "i@zenithal.me";
+    github = "ZenithalHourlyRate";
+    githubId = 19512674;
+    keys = [{
+      fingerprint = "1127 F188 280A E312 3619  3329 87E1 7EEF 9B18 B6C9";
+    }];
+  };
   zeratax = {
     email = "mail@zera.tax";
     github = "zeratax";
@@ -15783,6 +16304,12 @@
     githubId = 2189609;
     name = "Zhaofeng Li";
   };
+  ziguana = {
+    name = "Zig Uana";
+    email = "git@ziguana.dev";
+    github = "ziguana";
+    githubId = 45833444;
+  };
   zimbatm = {
     email = "zimbatm@zimbatm.com";
     github = "zimbatm";
@@ -15795,12 +16322,33 @@
     githubId = 1108325;
     name = "Théo Zimmermann";
   };
+  zoedsoupe = {
+    github = "zoedsoupe";
+    githubId = 44469426;
+    name = "Zoey de Souza Pessanha";
+    email = "zoey.spessanha@outlook.com";
+    keys = [{
+      fingerprint = "EAA1 51DB 472B 0122 109A  CB17 1E1E 889C DBD6 A315";
+    }];
+  };
   zohl = {
     email = "zohl@fmap.me";
     github = "zohl";
     githubId = 6067895;
     name = "Al Zohali";
   };
+  zokrezyl = {
+    email = "zokrezyl@gmail.com";
+    github = "zokrezyl";
+    githubId = 51886259;
+    name = "Zokre Zyl";
+  };
+  zombiezen = {
+    name = "Ross Light";
+    email = "ross@zombiezen.com";
+    github = "zombiezen";
+    githubId = 181535;
+  };
   zookatron = {
     email = "tim@zookatron.com";
     github = "zookatron";
@@ -15824,12 +16372,33 @@
     githubId = 8100652;
     name = "David Mell";
   };
+  zseri = {
+    name = "zseri";
+    email = "zseri.devel@ytrizja.de";
+    github = "zseri";
+    githubId = 1618343;
+    keys = [{
+      fingerprint = "7AFB C595 0D3A 77BD B00F  947B 229E 63AE 5644 A96D";
+    }];
+  };
   ztzg = {
     email = "dd@crosstwine.com";
     github = "ztzg";
     githubId = 393108;
     name = "Damien Diederen";
   };
+  zupo = {
+    name = "Nejc Zupan";
+    email = "nejczupan+nix@gmail.com";
+    github = "zupo";
+    githubId = 311580;
+  };
+  zuzuleinen = {
+    email = "andrey.boar@gmail.com";
+    name = "Andrei Boar";
+    github = "zuzuleinen";
+    githubId = 944919;
+  };
   zx2c4 = {
     email = "Jason@zx2c4.com";
     github = "zx2c4";
@@ -15848,574 +16417,4 @@
     githubId = 32876;
     name = "Diego Zamboni";
   };
-  turbomack = {
-    email = "marek.faj@gmail.com";
-    github = "turboMaCk";
-    githubId = 2130305;
-    name = "Marek Fajkus";
-  };
-  melling = {
-    email = "mattmelling@fastmail.com";
-    github = "mattmelling";
-    githubId = 1215331;
-    name = "Matt Melling";
-  };
-  wd15 = {
-    email = "daniel.wheeler2@gmail.com";
-    github = "wd15";
-    githubId = 1986844;
-    name = "Daniel Wheeler";
-  };
-  misuzu = {
-    email = "bakalolka@gmail.com";
-    github = "misuzu";
-    githubId = 248143;
-    name = "misuzu";
-  };
-  zokrezyl = {
-    email = "zokrezyl@gmail.com";
-    github = "zokrezyl";
-    githubId = 51886259;
-    name = "Zokre Zyl";
-  };
-  rakesh4g = {
-    email = "rakeshgupta4u@gmail.com";
-    github = "Rakesh4G";
-    githubId = 50867187;
-    name = "Rakesh Gupta";
-  };
-  mlatus = {
-    email = "wqseleven@gmail.com";
-    github = "Ninlives";
-    githubId = 17873203;
-    name = "mlatus";
-  };
-  waiting-for-dev = {
-    email = "marc@lamarciana.com";
-    github = "waiting-for-dev";
-    githubId = 52650;
-    name = "Marc Busqué";
-  };
-  snglth = {
-    email = "illia@ishestakov.com";
-    github = "snglth";
-    githubId = 8686360;
-    name = "Illia Shestakov";
-  };
-  masaeedu = {
-    email = "masaeedu@gmail.com";
-    github = "masaeedu";
-    githubId = 3674056;
-    name = "Asad Saeeduddin";
-  };
-  matthewcroughan = {
-    email = "matt@croughan.sh";
-    github = "MatthewCroughan";
-    githubId = 26458780;
-    name = "Matthew Croughan";
-  };
-  ngerstle = {
-    name = "Nicholas Gerstle";
-    email = "ngerstle@gmail.com";
-    github = "ngerstle";
-    githubId = 1023752;
-  };
-  shardy = {
-    email = "shardul@baral.ca";
-    github = "shardulbee";
-    githubId = 16765155;
-    name = "Shardul Baral";
-  };
-  xavierzwirtz = {
-    email = "me@xavierzwirtz.com";
-    github = "xavierzwirtz";
-    githubId = 474343;
-    name = "Xavier Zwirtz";
-  };
-  ymarkus = {
-    name = "Yannick Markus";
-    email = "nixpkgs@ymarkus.dev";
-    github = "ymarkus";
-    githubId = 62380378;
-  };
-  ymatsiuk = {
-    name = "Yurii Matsiuk";
-    github = "ymatsiuk";
-    githubId = 24990891;
-    keys = [{
-      fingerprint = "7BB8 84B5 74DA FDB1 E194  ED21 6130 2290 2986 01AA";
-    }];
-  };
-  ymeister = {
-    name = "Yuri Meister";
-    github = "ymeister";
-    githubId = 47071325;
-  };
-  cpcloud = {
-    name = "Phillip Cloud";
-    github = "cpcloud";
-    githubId = 417981;
-  };
-  davegallant = {
-    name = "Dave Gallant";
-    email = "davegallant@gmail.com";
-    github = "davegallant";
-    githubId = 4519234;
-  };
-  saulecabrera = {
-    name = "Saúl Cabrera";
-    email = "saulecabrera@gmail.com";
-    github = "saulecabrera";
-    githubId = 1423601;
-  };
-  tfmoraes = {
-    name = "Thiago Franco de Moraes";
-    github = "tfmoraes";
-    githubId = 351108;
-  };
-  deifactor = {
-    name = "Ash Zahlen";
-    email = "ext0l@riseup.net";
-    github = "deifactor";
-    githubId = 30192992;
-  };
-  deinferno = {
-    name = "deinferno";
-    github = "deinferno";
-    githubId = 14363193;
-  };
-  fzakaria = {
-    name = "Farid Zakaria";
-    email = "farid.m.zakaria@gmail.com";
-    matrix = "@fzakaria:matrix.org";
-    github = "fzakaria";
-    githubId = 605070;
-  };
-  nagisa = {
-    name = "Simonas Kazlauskas";
-    email = "nixpkgs@kazlauskas.me";
-    github = "nagisa";
-    githubId = 679122;
-  };
-  yshym = {
-    name = "Yevhen Shymotiuk";
-    email = "yshym@pm.me";
-    github = "yshym";
-    githubId = 44244245;
-  };
-  hmenke = {
-    name = "Henri Menke";
-    email = "henri@henrimenke.de";
-    matrix = "@hmenke:matrix.org";
-    github = "hmenke";
-    githubId = 1903556;
-    keys = [{
-      fingerprint = "F1C5 760E 45B9 9A44 72E9  6BFB D65C 9AFB 4C22 4DA3";
-    }];
-  };
-  berbiche = {
-    name = "Nicolas Berbiche";
-    email = "nicolas@normie.dev";
-    github = "berbiche";
-    githubId = 20448408;
-    keys = [{
-      fingerprint = "D446 E58D 87A0 31C7 EC15  88D7 B461 2924 45C6 E696";
-    }];
-  };
-  wenngle = {
-    name = "Zeke Stephens";
-    email = "zekestephens@gmail.com";
-    github = "wenngle";
-    githubId = 63376671;
-  };
-  yanganto = {
-    name = "Antonio Yang";
-    email = "yanganto@gmail.com";
-    github = "yanganto";
-    githubId = 10803111;
-  };
-  starcraft66 = {
-    name = "Tristan Gosselin-Hane";
-    email = "starcraft66@gmail.com";
-    github = "starcraft66";
-    githubId = 1858154;
-    keys = [{
-      fingerprint = "8597 4506 EC69 5392 0443  0805 9D98 CDAC FF04 FD78";
-    }];
-  };
-  hloeffler = {
-    name = "Hauke Löffler";
-    email = "nix@hauke-loeffler.de";
-    github = "hloeffler";
-    githubId = 6627191;
-  };
-  wilsonehusin = {
-    name = "Wilson E. Husin";
-    email = "wilsonehusin@gmail.com";
-    github = "wilsonehusin";
-    githubId = 14004487;
-  };
-  bb2020 = {
-    github = "bb2020";
-    githubId = 19290397;
-    name = "Tunc Uzlu";
-  };
-  pulsation = {
-    name = "Philippe Sam-Long";
-    github = "pulsation";
-    githubId = 1838397;
-  };
-  princemachiavelli = {
-    name = "Josh Hoffer";
-    email = "jhoffer@sansorgan.es";
-    matrix = "@princemachiavelli:matrix.org";
-    github = "Princemachiavelli";
-    githubId = 2730968;
-    keys = [{
-      fingerprint = "DD54 130B ABEC B65C 1F6B  2A38 8312 4F97 A318 EA18";
-    }];
-  };
-  ydlr = {
-    name = "ydlr";
-    email = "ydlr@ydlr.io";
-    github = "ydlr";
-    githubId = 58453832;
-    keys = [{
-      fingerprint = "FD0A C425 9EF5 4084 F99F 9B47 2ACC 9749 7C68 FAD4";
-    }];
-  };
-  zane = {
-    name = "Zane van Iperen";
-    email = "zane@zanevaniperen.com";
-    github = "vs49688";
-    githubId = 4423262;
-    keys = [{
-      fingerprint = "61AE D40F 368B 6F26 9DAE  3892 6861 6B2D 8AC4 DCC5";
-    }];
-  };
-  zbioe = {
-    name = "Iury Fukuda";
-    email = "zbioe@protonmail.com";
-    github = "zbioe";
-    githubId = 7332055;
-  };
-  zendo = {
-    name = "zendo";
-    email = "linzway@qq.com";
-    github = "zendo";
-    githubId = 348013;
-  };
-  zenithal = {
-    name = "zenithal";
-    email = "i@zenithal.me";
-    github = "ZenithalHourlyRate";
-    githubId = 19512674;
-    keys = [{
-      fingerprint = "1127 F188 280A E312 3619  3329 87E1 7EEF 9B18 B6C9";
-    }];
-  };
-  zeri = {
-    name = "zeri";
-    matrix = "@zeri:matrix.org";
-    github = "zeri42";
-    githubId = 68825133;
-  };
-  zoedsoupe = {
-    github = "zoedsoupe";
-    githubId = 44469426;
-    name = "Zoey de Souza Pessanha";
-    email = "zoey.spessanha@outlook.com";
-    keys = [{
-      fingerprint = "EAA1 51DB 472B 0122 109A  CB17 1E1E 889C DBD6 A315";
-    }];
-  };
-  zombiezen = {
-    name = "Ross Light";
-    email = "ross@zombiezen.com";
-    github = "zombiezen";
-    githubId = 181535;
-  };
-  zseri = {
-    name = "zseri";
-    email = "zseri.devel@ytrizja.de";
-    github = "zseri";
-    githubId = 1618343;
-    keys = [{
-      fingerprint = "7AFB C595 0D3A 77BD B00F  947B 229E 63AE 5644 A96D";
-    }];
-  };
-  zupo = {
-    name = "Nejc Zupan";
-    email = "nejczupan+nix@gmail.com";
-    github = "zupo";
-    githubId = 311580;
-  };
-  sei40kr = {
-    name = "Seong Yong-ju";
-    email = "sei40kr@gmail.com";
-    github = "sei40kr";
-    githubId = 11665236;
-  };
-  vdot0x23 = {
-    name = "Victor Büttner";
-    email = "nix.victor@0x23.dk";
-    github = "vdot0x23";
-    githubId = 40716069;
-  };
-  jpagex = {
-    name = "Jérémy Pagé";
-    email = "contact@jeremypage.me";
-    github = "jpagex";
-    githubId = 635768;
-  };
-  vbrandl = {
-    name = "Valentin Brandl";
-    email = "mail+nixpkgs@vbrandl.net";
-    github = "vbrandl";
-    githubId = 20639051;
-  };
-  portothree = {
-    name = "Gustavo Porto";
-    email = "gus@p8s.co";
-    github = "portothree";
-    githubId = 3718120;
-  };
-  pwoelfel = {
-    name = "Philipp Woelfel";
-    email = "philipp.woelfel@gmail.com";
-    github = "PhilippWoelfel";
-    githubId = 19400064;
-  };
-  qbit = {
-    name = "Aaron Bieber";
-    email = "aaron@bolddaemon.com";
-    github = "qbit";
-    githubId = 68368;
-    matrix = "@qbit:tapenet.org";
-    keys = [{
-      fingerprint = "3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE";
-    }];
-  };
-  ameer = {
-    name = "Ameer Taweel";
-    email = "ameertaweel2002@gmail.com";
-    github = "AmeerTaweel";
-    githubId = 20538273;
-  };
-  nigelgbanks = {
-    name = "Nigel Banks";
-    email = "nigel.g.banks@gmail.com";
-    github = "nigelgbanks";
-    githubId = 487373;
-  };
-  zanculmarktum = {
-    name = "Azure Zanculmarktum";
-    email = "zanculmarktum@gmail.com";
-    github = "zanculmarktum";
-    githubId = 16958511;
-  };
-  kuwii = {
-    name = "kuwii";
-    email = "kuwii.someone@gmail.com";
-    github = "kuwii";
-    githubId = 10705175;
-  };
-  kkharji = {
-    name = "kkharji";
-    email = "kkharji@protonmail.com";
-    github = "kkharji";
-    githubId = 65782666;
-  };
-  melias122 = {
-    name = "Martin Elias";
-    email = "martin+nixpkgs@elias.sx";
-    github = "melias122";
-    githubId = 1027766;
-  };
-  bryanhonof = {
-    name = "Bryan Honof";
-    email = "bryanhonof@gmail.com";
-    github = "bryanhonof";
-    githubId = 5932804;
-  };
-  bbenne10 = {
-    email = "Bryan.Bennett@protonmail.com";
-    matrix = "@bryan.bennett:matrix.org";
-    github = "bbenne10";
-    githubId = 687376;
-    name = "Bryan Bennett";
-    keys = [{
-      # compare with https://keybase.io/bbenne10
-      fingerprint = "41EA 00B4 00F9 6970 1CB2  D3AF EF90 E3E9 8B8F 5C0B";
-    }];
-  };
-  snpschaaf = {
-    email = "philipe.schaaf@secunet.com";
-    name = "Philippe Schaaf";
-    github = "snpschaaf";
-    githubId = 105843013;
-  };
-  SohamG = {
-    email = "sohamg2@gmail.com";
-    name = "Soham S Gumaste";
-    github = "SohamG";
-    githubId = 7116239;
-    keys = [{
-      fingerprint = "E067 520F 5EF2 C175 3F60  50C0 BA46 725F 6A26 7442";
-    }];
-  };
-  jali-clarke = {
-    email = "jinnah.ali-clarke@outlook.com";
-    name = "Jinnah Ali-Clarke";
-    github = "jali-clarke";
-    githubId = 17733984;
-  };
-  wesleyjrz = {
-    email = "dev@wesleyjrz.com";
-    name = "Wesley V. Santos Jr.";
-    github = "wesleyjrz";
-    githubId = 60184588;
-  };
-  npatsakula = {
-    email = "nikita.patsakula@gmail.com";
-    name = "Patsakula Nikita";
-    github = "npatsakula";
-    githubId = 23001619;
-  };
-  dfithian = {
-    email = "daniel.m.fithian@gmail.com";
-    name = "Daniel Fithian";
-    github = "dfithian";
-    githubId = 8409320;
-  };
-  nikstur = {
-    email = "nikstur@outlook.com";
-    name = "nikstur";
-    github = "nikstur";
-    githubId = 61635709;
-  };
-  yisuidenghua = {
-    email = "bileiner@gmail.com";
-    name = "Milena Yisui";
-    github = "YisuiDenghua";
-    githubId = 102890144;
-  };
-  macalinao = {
-    email = "me@ianm.com";
-    name = "Ian Macalinao";
-    github = "macalinao";
-    githubId = 401263;
-    keys = [{
-      fingerprint = "1147 43F1 E707 6F3E 6F4B  2C96 B9A8 B592 F126 F8E8";
-    }];
-  };
-  tjni = {
-    email = "43ngvg@masqt.com";
-    matrix = "@tni:matrix.org";
-    name = "Theodore Ni";
-    github = "tjni";
-    githubId = 3806110;
-    keys = [{
-      fingerprint = "4384 B8E1 299F C028 1641  7B8F EC30 EFBE FA7E 84A4";
-    }];
-  };
-  bezmuth = {
-    email = "benkel97@protonmail.com";
-    name = "Ben Kelly";
-    github = "bezmuth";
-    githubId = 31394095;
-  };
-  cafkafk = {
-    email = "christina@cafkafk.com";
-    matrix = "@cafkafk:matrix.cafkafk.com";
-    name = "Christina Sørensen";
-    github = "cafkafk";
-    githubId = 89321978;
-    keys = [
-      {
-        fingerprint = "7B9E E848 D074 AE03 7A0C  651A 8ED4 DEF7 375A 30C8";
-      }
-      {
-        fingerprint = "208A 2A66 8A2F CDE7 B5D3 8F64 CDDC 792F 6552 51ED";
-      }
-    ];
-  };
-  rb = {
-    email = "maintainers@cloudposse.com";
-    github = "nitrocode";
-    githubId = 7775707;
-    name = "RB";
-  };
-  bpaulin = {
-    email = "brunopaulin@bpaulin.net";
-    github = "bpaulin";
-    githubId = 115711;
-    name = "bpaulin";
-  };
-  zuzuleinen = {
-    email = "andrey.boar@gmail.com";
-    name = "Andrei Boar";
-    github = "zuzuleinen";
-    githubId = 944919;
-  };
-  waelwindows = {
-    email = "waelwindows9922@gmail.com";
-    github = "Waelwindows";
-    githubId = 5228243;
-    name = "waelwindows";
-  };
-  witchof0x20 = {
-    name = "Jade";
-    email = "jade@witchof.space";
-    github = "witchof0x20";
-    githubId = 36118348;
-    keys = [{
-      fingerprint = "69C9 876B 5797 1B2E 11C5  7C39 80A1 F76F C9F9 54AE";
-    }];
-  };
-  WhiteBlackGoose = {
-    email = "wbg@angouri.org";
-    github = "WhiteBlackGoose";
-    githubId = 31178401;
-    name = "WhiteBlackGoose";
-    keys = [{
-      fingerprint = "640B EDDE 9734 310A BFA3  B257 52ED AE6A 3995 AFAB";
-    }];
-  };
-  wuyoli = {
-    name = "wuyoli";
-    email = "wuyoli@tilde.team";
-    github = "wuyoli";
-    githubId = 104238274;
-  };
-  ziguana = {
-    name = "Zig Uana";
-    email = "git@ziguana.dev";
-    github = "ziguana";
-    githubId = 45833444;
-  };
-  detegr = {
-    name = "Antti Keränen";
-    email = "detegr@rbx.email";
-    github = "Detegr";
-    githubId = 724433;
-  };
-  RossComputerGuy = {
-    name = "Tristan Ross";
-    email = "tristan.ross@midstall.com";
-    github = "RossComputerGuy";
-    githubId = 19699320;
-  };
-  franzmondlichtmann = {
-    name = "Franz Schroepf";
-    email = "franz-schroepf@t-online.de";
-    github = "franzmondlichtmann";
-    githubId = 105480088;
-  };
-  srounce = {
-    name = "Samuel Rounce";
-    email = "me@samuelrounce.co.uk";
-    github = "srounce";
-    githubId = 60792;
-  };
 }

From c60c72872b9b1c7abc0e24e78201fc2c0835e7ce Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 29 Jan 2023 21:30:45 +0100
Subject: [PATCH 39/40] maintainers: add comment at the end of the file

---
 maintainers/maintainer-list.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 327122a4a363..a928917f4e05 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -16418,3 +16418,4 @@
     name = "Diego Zamboni";
   };
 }
+/* Keep the list alphabetically sorted. */

From 0c20db8f0cb31f1810f3cb482946dc0c76469bce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Fri, 27 Jan 2023 17:13:22 +0100
Subject: [PATCH 40/40] python3Packages.cvxopt: use openblas for darwin

---
 .../python-modules/cvxopt/default.nix          | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix
index 0bb4e8dbcbe6..c546d11ec3f6 100644
--- a/pkgs/development/python-modules/cvxopt/default.nix
+++ b/pkgs/development/python-modules/cvxopt/default.nix
@@ -1,8 +1,10 @@
-{ lib
+{ stdenv
+, lib
 , buildPythonPackage
 , fetchPypi
 , isPyPy
 , python
+, openblas
 , blas
 , lapack # build segfaults with 64-bit blas
 , suitesparse
@@ -28,13 +30,23 @@ buildPythonPackage rec {
     sha256 = "sha256-ALGyMvnR+QLVeKnXWBS2f6AgdY1a5CLijKjO9iafpcY=";
   };
 
-  buildInputs = [ blas lapack ];
+  buildInputs = (if stdenv.isDarwin then [ openblas ] else [ blas lapack ]);
+  doCheck = !stdenv.isDarwin;
 
   # similar to Gsl, glpk, fftw there is also a dsdp interface
   # but dsdp is not yet packaged in nixpkgs
-  preConfigure = ''
+  preConfigure = (if stdenv.isDarwin then
+  ''
+    export CVXOPT_BLAS_LIB=openblas
+    export CVXOPT_LAPACK_LIB=openblas
+  ''
+  else
+  ''
     export CVXOPT_BLAS_LIB=blas
     export CVXOPT_LAPACK_LIB=lapack
+  '') +
+  ''
+    export CVXOPT_BUILD_DSDP=0
     export CVXOPT_SUITESPARSE_LIB_DIR=${lib.getLib suitesparse}/lib
     export CVXOPT_SUITESPARSE_INC_DIR=${lib.getDev suitesparse}/include
   '' + lib.optionalString withGsl ''