From 3ced681d2ce92c9cdc4725f912e5220013e96584 Mon Sep 17 00:00:00 2001 From: Flakebi Date: Mon, 15 Mar 2021 23:49:53 +0100 Subject: [PATCH 1/3] kakounePlugins: update --- .../editors/kakoune/plugins/generated.nix | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/editors/kakoune/plugins/generated.nix b/pkgs/applications/editors/kakoune/plugins/generated.nix index 3ea3ea51478..ab3f9460fae 100644 --- a/pkgs/applications/editors/kakoune/plugins/generated.nix +++ b/pkgs/applications/editors/kakoune/plugins/generated.nix @@ -29,24 +29,24 @@ let connect-kak = buildKakounePluginFrom2Nix { pname = "connect-kak"; - version = "2021-02-13"; + version = "2021-02-24"; src = fetchFromGitHub { owner = "alexherbo2"; repo = "connect.kak"; - rev = "0858c0e50c6ca6d214fb088f052385a242548e83"; - sha256 = "1w4pwybg3v916hcyc49gz0blygv54ivv81x8fxp44ck0sy98idr3"; + rev = "a536605a208149eed58986bda54f3dda215dfe61"; + sha256 = "1svw64zk28sn271vjyzvq21zaln13vnx59rxnxah6adq8n5nkr4a"; }; meta.homepage = "https://github.com/alexherbo2/connect.kak/"; }; fzf-kak = buildKakounePluginFrom2Nix { pname = "fzf-kak"; - version = "2021-01-27"; + version = "2021-03-15"; src = fetchFromGitHub { owner = "andreyorst"; repo = "fzf.kak"; - rev = "e10de405e2a98e910d0808059200d206ba80f865"; - sha256 = "1hbsm1k8k0cgv7gxqicvnl22n2lb1plhkanniggk694gll22lq68"; + rev = "4e6c9a857511fccdbbc835a1c9acb205b6486a4c"; + sha256 = "0syhhdlsm7vg6hcd2n2acag9g562z49rbb5smh5p2gnplhmp93i0"; }; meta.homepage = "https://github.com/andreyorst/fzf.kak/"; }; @@ -149,23 +149,23 @@ let powerline-kak = buildKakounePluginFrom2Nix { pname = "powerline-kak"; - version = "2021-02-15"; + version = "2021-02-25"; src = fetchFromGitHub { - owner = "jdugan6240"; + owner = "andreyorst"; repo = "powerline.kak"; - rev = "322a760daa099d519ff50d14c29b27f3e2af00d1"; - sha256 = "0mb8f8p6g75p05ifp45i0gbq2mib8c8giz7r1xfd0yrwspp4aksc"; + rev = "64ad98b6c85e63345563671b043960464d51c4b0"; + sha256 = "09w2sk19qi64hgsyg4gb407vyppnlgk272mqbinz2r3apy6szkl3"; }; - meta.homepage = "https://github.com/jdugan6240/powerline.kak/"; + meta.homepage = "https://github.com/andreyorst/powerline.kak/"; }; prelude-kak = buildKakounePluginFrom2Nix { pname = "prelude-kak"; - version = "2020-09-06"; + version = "2021-02-24"; src = fetchFromGitHub { owner = "alexherbo2"; repo = "prelude.kak"; - rev = "f1e0f4d5cb62a36924e3f8ba6824d6aed8c19d23"; + rev = "5dbdc020c546032885c1fdb463e366cc89fc15ad"; sha256 = "1pncr8azqvl2z9yvzhc68p1s9fld8cvak8yz88zgrp5ypx2cxl8c"; }; meta.homepage = "https://github.com/alexherbo2/prelude.kak/"; From 188b23fb323baf0f05e021cc2adf40f83bce3f58 Mon Sep 17 00:00:00 2001 From: Flakebi Date: Mon, 15 Mar 2021 23:49:55 +0100 Subject: [PATCH 2/3] kakounePlugins: resolve github repository redirects --- pkgs/applications/editors/kakoune/plugins/generated.nix | 8 ++++---- .../editors/kakoune/plugins/kakoune-plugin-names | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/kakoune/plugins/generated.nix b/pkgs/applications/editors/kakoune/plugins/generated.nix index ab3f9460fae..4fada31a0f5 100644 --- a/pkgs/applications/editors/kakoune/plugins/generated.nix +++ b/pkgs/applications/editors/kakoune/plugins/generated.nix @@ -31,12 +31,12 @@ let pname = "connect-kak"; version = "2021-02-24"; src = fetchFromGitHub { - owner = "alexherbo2"; + owner = "kakounedotcom"; repo = "connect.kak"; rev = "a536605a208149eed58986bda54f3dda215dfe61"; sha256 = "1svw64zk28sn271vjyzvq21zaln13vnx59rxnxah6adq8n5nkr4a"; }; - meta.homepage = "https://github.com/alexherbo2/connect.kak/"; + meta.homepage = "https://github.com/kakounedotcom/connect.kak/"; }; fzf-kak = buildKakounePluginFrom2Nix { @@ -163,12 +163,12 @@ let pname = "prelude-kak"; version = "2021-02-24"; src = fetchFromGitHub { - owner = "alexherbo2"; + owner = "kakounedotcom"; repo = "prelude.kak"; rev = "5dbdc020c546032885c1fdb463e366cc89fc15ad"; sha256 = "1pncr8azqvl2z9yvzhc68p1s9fld8cvak8yz88zgrp5ypx2cxl8c"; }; - meta.homepage = "https://github.com/alexherbo2/prelude.kak/"; + meta.homepage = "https://github.com/kakounedotcom/prelude.kak/"; }; replace-mode-kak = buildKakounePluginFrom2Nix { diff --git a/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names b/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names index 6cd856cb6c2..b1874146089 100644 --- a/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names +++ b/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names @@ -1,16 +1,16 @@ alexherbo2/auto-pairs.kak -alexherbo2/connect.kak -alexherbo2/prelude.kak alexherbo2/replace-mode.kak alexherbo2/sleuth.kak andreyorst/fzf.kak +andreyorst/powerline.kak danr/kakoune-easymotion Delapouite/kakoune-buffers Delapouite/kakoune-registers enricozb/tabs.kak@main greenfork/active-window.kak -jdugan6240/powerline.kak kakoune-editor/kakoune-extra-filetypes +kakounedotcom/connect.kak +kakounedotcom/prelude.kak listentolist/kakoune-rainbow mayjs/openscad.kak occivink/kakoune-buffer-switcher From 04184cd64f5c38cb5a9f882d2026f8663e6742c8 Mon Sep 17 00:00:00 2001 From: Flakebi Date: Mon, 22 Mar 2021 22:56:44 +0100 Subject: [PATCH 3/3] scripts.pluginupdate: write final newline json.dump does not write any newline, so the final newline in the file is missing. --- maintainers/scripts/pluginupdate.py | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/scripts/pluginupdate.py b/maintainers/scripts/pluginupdate.py index 9ac1ccffb78..00a205313be 100644 --- a/maintainers/scripts/pluginupdate.py +++ b/maintainers/scripts/pluginupdate.py @@ -416,6 +416,7 @@ def rewrite_input( } with open(deprecated, "w") as f: json.dump(deprecations, f, indent=4, sort_keys=True) + f.write("\n") lines = sorted(lines, key=str.casefold)