Merge pull request #169140 from mirrexagon/kakoune-plugin-updates

Kakoune plugin updates

pkgs/applications/editors/kakoune/plugins/generated.nix

···
 # 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/";
···
 
   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/";
   };
···
 
   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/";
   };
···
 
   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/";
   };
···
 
   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/";
   };
···
 
   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/";
   };
···
     meta.homepage = "https://github.com/kakounedotcom/prelude.kak/";
   };
 
-  replace-mode-kak = buildKakounePluginFrom2Nix {
-    pname = "replace-mode-kak";
-    version = "2020-10-07";
-    src = fetchFromGitHub {
-      owner = "alexherbo2";
-      repo = "replace-mode.kak";
-      rev = "5f4c73cdbaf5aeb964ee35ad4b9081b233af90c0";
-      sha256 = "1cmylx99bm7jwfb4hclb69sdc4n8f29ssyy2byjiw53ni9rnc8q0";
-    };
-    meta.homepage = "https://github.com/alexherbo2/replace-mode.kak/";
-  };
-
-  sleuth-kak = buildKakounePluginFrom2Nix {
-    pname = "sleuth-kak";
-    version = "2020-11-06";
+  smarttab-kak = buildKakounePluginFrom2Nix {
+    pname = "smarttab-kak";
+    version = "2022-04-10";
     src = fetchFromGitHub {
-      owner = "alexherbo2";
-      repo = "sleuth.kak";
-      rev = "911db8bd208ad0d289b8fa15a2ac665ff39bd6bd";
-      sha256 = "0g41c0038fpmihqva71xl4vfbmvsp13i47gp6fnmaikajpynzc51";
+      owner = "andreyorst";
+      repo = "smarttab.kak";
+      rev = "86ac6599b13617ff938905ba4cdd8225d7eb6a2e";
+      sha256 = "1992xwf2aygzfd26lhg3yiy253g0hl1iagj0kq9yhcqg0i5xjcj9";
     };
-    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/";
   };
 
 });

pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names

···
 repo,branch,alias
-alexherbo2/auto-pairs.kak,,
-alexherbo2/replace-mode.kak,,
-alexherbo2/sleuth.kak,,
-andreyorst/fzf.kak,,
-andreyorst/powerline.kak,,
-basbebe/pandoc.kak,,
-danr/kakoune-easymotion,,
-Delapouite/kakoune-buffers,,
-Delapouite/kakoune-registers,,
-enricozb/tabs.kak@main,,
-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/,,

pkgs/applications/editors/kakoune/plugins/update.py

···
 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:
···
 
                 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}")