about summary refs log tree commit diff
path: root/nixpkgs/pkgs/applications/editors/kakoune
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/applications/editors/kakoune')
-rw-r--r--nixpkgs/pkgs/applications/editors/kakoune/default.nix4
-rw-r--r--nixpkgs/pkgs/applications/editors/kakoune/plugins/case.kak.nix27
-rw-r--r--nixpkgs/pkgs/applications/editors/kakoune/plugins/default.nix2
-rw-r--r--nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix6
-rw-r--r--nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix25
5 files changed, 59 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/applications/editors/kakoune/default.nix b/nixpkgs/pkgs/applications/editors/kakoune/default.nix
index 6a468bd67eb5..eec14f286ba7 100644
--- a/nixpkgs/pkgs/applications/editors/kakoune/default.nix
+++ b/nixpkgs/pkgs/applications/editors/kakoune/default.nix
@@ -4,12 +4,12 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "kakoune-unwrapped";
-  version = "2020.01.16";
+  version = "2020.09.01";
   src = fetchFromGitHub {
     repo = "kakoune";
     owner = "mawww";
     rev = "v${version}";
-    sha256 = "16v6z1nzj54j19fraxhb18jdby4zfs1br91gxpg9s2s4nsk0km0b";
+    sha256 = "091qzk0qs7hql0q51hix99srgma35mhdnjfd5ncfba1bmc1h8x5i";
   };
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ ncurses asciidoc docbook_xsl libxslt ];
diff --git a/nixpkgs/pkgs/applications/editors/kakoune/plugins/case.kak.nix b/nixpkgs/pkgs/applications/editors/kakoune/plugins/case.kak.nix
new file mode 100644
index 000000000000..20df2872628f
--- /dev/null
+++ b/nixpkgs/pkgs/applications/editors/kakoune/plugins/case.kak.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitLab }:
+
+stdenv.mkDerivation {
+  name = "case.kak";
+  version = "unstable-2020-04-06";
+
+  src = fetchFromGitLab {
+    owner = "FlyingWombat";
+    repo = "case.kak";
+    rev = "6f1511820aa3abfa118e0f856118adc8113e2185";
+    sha256 = "002njrlwgakqgp74wivbppr9qyn57dn4n5bxkr6k6nglk9qndwdp";
+  };
+
+  installPhase = ''
+    mkdir -p $out/share/kak/autoload/plugins
+    cp -r rc/case.kak $out/share/kak/autoload/plugins
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Ease navigation between opened buffers in Kakoune";
+    homepage = "https://gitlab.com/FlyingWombat/case.kak";
+    license = licenses.unlicense;
+    maintainers = with maintainers; [ eraserhd ];
+    platform = platforms.all;
+  };
+}
+
diff --git a/nixpkgs/pkgs/applications/editors/kakoune/plugins/default.nix b/nixpkgs/pkgs/applications/editors/kakoune/plugins/default.nix
index 4e92887bccb3..3926973f7ead 100644
--- a/nixpkgs/pkgs/applications/editors/kakoune/plugins/default.nix
+++ b/nixpkgs/pkgs/applications/editors/kakoune/plugins/default.nix
@@ -3,11 +3,13 @@
 {
   inherit parinfer-rust;
 
+  case-kak = pkgs.callPackage ./case.kak.nix { };
   kak-ansi = pkgs.callPackage ./kak-ansi.nix { };
   kak-auto-pairs = pkgs.callPackage ./kak-auto-pairs.nix { };
   kak-buffers = pkgs.callPackage ./kak-buffers.nix { };
   kak-fzf = pkgs.callPackage ./kak-fzf.nix { };
   kak-plumb = pkgs.callPackage ./kak-plumb.nix { };
   kak-powerline = pkgs.callPackage ./kak-powerline.nix { };
+  kak-prelude = pkgs.callPackage ./kak-prelude.nix { };
   kak-vertical-selection = pkgs.callPackage ./kak-vertical-selection.nix { };
 }
diff --git a/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix b/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix
index dd0faf63453b..657f4a19bbfc 100644
--- a/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix
+++ b/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix
@@ -4,12 +4,12 @@ assert stdenv.lib.asserts.assertOneOf "fzf" fzf.pname [ "fzf" "skim" ];
 
 stdenv.mkDerivation {
   name = "kak-fzf";
-  version = "2019-07-16";
+  version = "2020-05-24";
   src = fetchFromGitHub {
     owner = "andreyorst";
     repo = "fzf.kak";
-    rev = "ede90d3e02bceb714f997adfcbab8260b42e0a19";
-    sha256 = "18w90j3fpk2ddn68497s33n66aap8phw5636y1r7pqsa641zdxcv";
+    rev = "b2aeb26473962ab0bf3b51ba5c81c50c1d8253d3";
+    sha256 = "0bg845i814xh4y688p2zx726rsg0pd6nb4a7qv2fckmk639f4wzc";
   };
 
   configurePhase = ''
diff --git a/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix b/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix
new file mode 100644
index 000000000000..ee9c125827c8
--- /dev/null
+++ b/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub }:
+stdenv.mkDerivation {
+  name = "kak-prelude";
+  version = "2020-03-15";
+
+  src = fetchFromGitHub {
+    owner = "alexherbo2";
+    repo = "prelude.kak";
+    rev = "05b2642b1e014bd46423f9d738cc38a624947b63";
+    sha256 = "180p8hq8z7mznzd9w9ma5as3ijs7zbzcj96prcpswqg263a0b329";
+  };
+
+  installPhase = ''
+    mkdir -p $out/share/kak/autoload/plugins
+    cp -r rc $out/share/kak/autoload/plugins/auto-pairs
+  '';
+
+  meta = with stdenv.lib;
+  { description = "Prelude of shell blocks for Kakoune.";
+    homepage = "https://github.com/alexherbo2/prelude.kak";
+    license = licenses.unlicense;
+    maintainers = with maintainers; [ buffet ];
+    platform = platforms.all;
+  };
+}