aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/shells/zsh
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/shells/zsh')
-rw-r--r--nixpkgs/pkgs/shells/zsh/antibody/default.nix8
-rw-r--r--nixpkgs/pkgs/shells/zsh/fzf-zsh/default.nix37
-rw-r--r--nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix4
-rw-r--r--nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix6
-rwxr-xr-xnixpkgs/pkgs/shells/zsh/oh-my-zsh/update.sh2
-rw-r--r--nixpkgs/pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix30
-rw-r--r--nixpkgs/pkgs/shells/zsh/zsh-history-substring-search/default.nix4
7 files changed, 79 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/shells/zsh/antibody/default.nix b/nixpkgs/pkgs/shells/zsh/antibody/default.nix
index 0ea3c8d158d..e1bfc68dc4d 100644
--- a/nixpkgs/pkgs/shells/zsh/antibody/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/antibody/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "antibody";
- version = "4.1.2";
+ version = "4.2.0";
goPackagePath = "github.com/getantibody/antibody";
@@ -10,15 +10,15 @@ buildGoModule rec {
owner = "getantibody";
repo = "antibody";
rev = "v${version}";
- sha256 = "1csanmvix7b2sa7nsy8nh3jq6gmhp8i51xivsabm1lj2y30c0ly3";
+ sha256 = "1vds7mxqxa7xlhvjvmnh1nr1ra3dciav0qlv45s1dmwn5qrcilci";
};
- modSha256 = "1p9cw92ivwgpkvjxvwd9anbd1vzhpicm9il4pg37z2kgr2ihhnyh";
+ modSha256 = "1n9sgrm16iig600f4q1cmbwwk0822isjvbyazplylha843510b17";
meta = with lib; {
description = "The fastest shell plugin manager";
homepage = https://github.com/getantibody/antibody;
license = licenses.mit;
- maintainers = with maintainers; [ worldofpeace ];
+ maintainers = with maintainers; [ filalex77 worldofpeace ];
};
}
diff --git a/nixpkgs/pkgs/shells/zsh/fzf-zsh/default.nix b/nixpkgs/pkgs/shells/zsh/fzf-zsh/default.nix
new file mode 100644
index 00000000000..e97ef1074f1
--- /dev/null
+++ b/nixpkgs/pkgs/shells/zsh/fzf-zsh/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, fzf }:
+
+stdenv.mkDerivation rec {
+ pname = "fzf-zsh-unstable";
+ version = "2019-09-09";
+
+ src = fetchFromGitHub {
+ owner = "Wyntau";
+ repo = "fzf-zsh";
+ rev = "829d7e40cc437dce8a6e234e259bbd4065e87124";
+ sha256 = "1irjmxhcg1fm4g8p3psjqk7sz5qhj5kw73pyhv91njvpdhn9l26z";
+ };
+
+ postPatch = ''
+ substituteInPlace fzf-zsh.plugin.zsh \
+ --replace \
+ 'fzf_path="$( cd "$fzf_zsh_path/../fzf/" && pwd )"' \
+ "fzf_path=${fzf}" \
+ --replace \
+ '$fzf_path/shell' \
+ '${fzf}/share/fzf'
+ '';
+
+ dontBuild = true;
+
+ installPhase = ''
+ install -Dm0644 fzf-zsh.plugin.zsh $out/share/zsh/plugins/fzf-zsh/fzf-zsh.plugin.zsh
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/wyntau/fzf-zsh;
+ description = "wrap fzf to use in oh-my-zsh";
+ license = licenses.mit;
+ maintainers = with maintainers; [ ma27 ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix b/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix
index 2d7dd4f24aa..80f51dbb763 100644
--- a/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix
@@ -5,13 +5,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "grml-zsh-config";
- version = "0.16.0";
+ version = "0.16.1";
src = fetchFromGitHub {
owner = "grml";
repo = "grml-etc-core";
rev = "v${version}";
- sha256 = "1b794c3hfhw51aqp8dg8smxqjv4x518rs1ib4pdglc4d785rlq1k";
+ sha256 = "1dmhwgs5v4f1yanbi6dg1lbpzmvq1l3dq7sra811ycsf4f6g0d7f";
};
buildInputs = [ zsh coreutils txt2tags procps ]
diff --git a/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix b/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix
index 6ebe81dc9f8..db19d340a57 100644
--- a/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
{ stdenv, fetchgit }:
stdenv.mkDerivation rec {
- version = "2019-10-19";
+ version = "2019-11-23";
pname = "oh-my-zsh";
- rev = "05dfd0ae8520e58e852c574f55c83fe6f49fb189";
+ rev = "7b73c9ca1ced57cdf545e860e880658753b81777";
src = fetchgit { inherit rev;
url = "https://github.com/robbyrussell/oh-my-zsh";
- sha256 = "1ky926ih9b56xgh8xp8dsnzjliwzd8rr0cqn4wjf74z42bg2cnw0";
+ sha256 = "1mxqa2gf309vjdb1snbczrqwpwi7y6rnmv3n77hsph41bb6j64rz";
};
pathsToLink = [ "/share/oh-my-zsh" ];
diff --git a/nixpkgs/pkgs/shells/zsh/oh-my-zsh/update.sh b/nixpkgs/pkgs/shells/zsh/oh-my-zsh/update.sh
index 08b0daa4387..9567a2b6ae5 100755
--- a/nixpkgs/pkgs/shells/zsh/oh-my-zsh/update.sh
+++ b/nixpkgs/pkgs/shells/zsh/oh-my-zsh/update.sh
@@ -3,7 +3,7 @@
set -eu -o pipefail
-oldVersion="$(nix-instantiate --eval -E "with import ./. {}; oh-my-zsh.version or (builtins.parseDrvName oh-my-zsh.name).version" | tr -d '"')"
+oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion oh-my-zsh" | tr -d '"')"
latestSha="$(curl -L -s https://api.github.com/repos/robbyrussell/oh-my-zsh/commits\?sha\=master\&since\=${oldVersion} | jq -r '.[0].sha')"
url="$(nix-instantiate --eval -E "with import ./. {}; oh-my-zsh.src.url" | tr -d '"')"
diff --git a/nixpkgs/pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix
new file mode 100644
index 00000000000..452419bf8b0
--- /dev/null
+++ b/nixpkgs/pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix
@@ -0,0 +1,30 @@
+{ stdenvNoCC, lib, fetchFromGitHub }:
+
+stdenvNoCC.mkDerivation rec {
+ pname = "zsh-fast-syntax-highlighting";
+ version = "1.54";
+
+ src = fetchFromGitHub {
+ owner = "zdharma";
+ repo = "fast-syntax-highlighting";
+ rev = "v${version}";
+ sha256 = "019hda2pj8lf7px4h1z07b9l6icxx4b2a072jw36lz9bh6jahp32";
+ };
+
+ dontConfigure = true;
+ dontBuild = true;
+
+ installPhase = ''
+ plugindir="$out/share/zsh/site-functions"
+
+ mkdir -p "$plugindir"
+ cp -r -- {,_,-}fast-* chroma themes "$plugindir"/
+ '';
+
+ meta = with lib; {
+ description = "Syntax-highlighting for Zshell";
+ homepage = "https://github.com/zdharma/fast-syntax-highlighting";
+ license = licenses.bsd3;
+ platforms = platforms.unix;
+ };
+}
diff --git a/nixpkgs/pkgs/shells/zsh/zsh-history-substring-search/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-history-substring-search/default.nix
index b7521654667..fcd294f4dce 100644
--- a/nixpkgs/pkgs/shells/zsh/zsh-history-substring-search/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/zsh-history-substring-search/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "zsh-history-substring-search";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchFromGitHub {
owner = "zsh-users";
repo = "zsh-history-substring-search";
rev = "v${version}";
- sha256 = "0lgmq1xcccnz5cf7vl0r0qj351hwclx9p80cl0qczxry4r2g5qaz";
+ sha256 = "0y8va5kc2ram38hbk2cibkk64ffrabfv1sh4xm7pjspsba9n5p1y";
};
installPhase = ''