diff options
Diffstat (limited to 'pkgs/shells/zsh')
33 files changed, 111 insertions, 86 deletions
diff --git a/pkgs/shells/zsh/agdsn-zsh-config/default.nix b/pkgs/shells/zsh/agdsn-zsh-config/default.nix index 9ff6c464bbe2f..8dae2edf21b6f 100644 --- a/pkgs/shells/zsh/agdsn-zsh-config/default.nix +++ b/pkgs/shells/zsh/agdsn-zsh-config/default.nix @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec { ''; meta = with lib; { - description = "A modified version of the Grml Zsh configuration specialised for the needs of system administration"; + description = "Modified version of the Grml Zsh configuration specialised for the needs of system administration"; homepage = "https://github.com/agdsn/agdsn-zsh-config"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/shells/zsh/agkozak-zsh-prompt/default.nix b/pkgs/shells/zsh/agkozak-zsh-prompt/default.nix index 21f265e846459..899cda1a5ea5f 100644 --- a/pkgs/shells/zsh/agkozak-zsh-prompt/default.nix +++ b/pkgs/shells/zsh/agkozak-zsh-prompt/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "agkozak-zsh-prompt"; - version = "3.11.3"; + version = "3.11.4"; src = fetchFromGitHub { owner = "agkozak"; repo = "agkozak-zsh-prompt"; rev = "v${version}"; - sha256 = "sha256-YBqFA/DK2K1effniwjPSe5VMx9tZGbmxyJp92TiingU="; + sha256 = "sha256-FC9LIZaS6fV20qq6cJC/xQvfsM3DHXatVleH7yBgoNg="; }; strictDeps = true; @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation rec { ''; meta = with lib; { - description = "A fast, asynchronous Zsh prompt"; + description = "Fast, asynchronous Zsh prompt"; homepage = "https://github.com/agkozak/agkozak-zsh-prompt"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix index 02f872730a743..7c1f0eb56cbd3 100644 --- a/pkgs/shells/zsh/antibody/default.nix +++ b/pkgs/shells/zsh/antibody/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { - description = "The fastest shell plugin manager"; + description = "Fastest shell plugin manager"; mainProgram = "antibody"; homepage = "https://github.com/getantibody/antibody"; license = licenses.mit; @@ -30,6 +30,6 @@ buildGoModule rec { # # but this package is no longer maintained. # - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/shells/zsh/antidote/default.nix b/pkgs/shells/zsh/antidote/default.nix index f570c813e5965..a4b29c4bd8919 100644 --- a/pkgs/shells/zsh/antidote/default.nix +++ b/pkgs/shells/zsh/antidote/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation (finalAttrs: { - version = "1.9.6"; + version = "1.9.7"; pname = "antidote"; src = fetchFromGitHub { owner = "mattmc3"; repo = "antidote"; rev = "v${finalAttrs.version}"; - hash = "sha256-8kNMCo/DwZvBwqh/434GqK7z4KXgkwZH9SazLbH8SfM="; + hash = "sha256-Gg69O35CpsI3Q3cdxBpRDOfSxRxWG3PHew59kJVH1eQ="; }; dontPatch = true; @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - description = "A zsh plugin manager made from the ground up thinking about performance"; + description = "Zsh plugin manager made from the ground up thinking about performance"; homepage = "https://getantidote.github.io/"; license = lib.licenses.mit; maintainers = [ lib.maintainers.hitsmaxft ]; diff --git a/pkgs/shells/zsh/antigen/default.nix b/pkgs/shells/zsh/antigen/default.nix index ca5fbee6e3687..1b2795ee971ef 100644 --- a/pkgs/shells/zsh/antigen/default.nix +++ b/pkgs/shells/zsh/antigen/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "The plugin manager for zsh"; + description = "Plugin manager for zsh"; homepage = "https://antigen.sharats.me/"; license = lib.licenses.mit; }; diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 5af94223ec83c..90ac2934f145a 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -39,11 +39,24 @@ stdenv.mkDerivation { hash = "sha256-nXB4w7qqjZJC7/+CDxnNy6wu9qNwmS3ezjj/xK7JfeU="; excludes = [ "ChangeLog" ]; }) + # Fixes compatibility with texinfo 7.1. This patch can be dropped with the next release of zsh. + (fetchpatch { + url = "https://github.com/zsh-users/zsh/commit/ecd3f9c9506c7720dc6c0833dc5d5eb00e4459c4.patch"; + hash = "sha256-oA8GC8LmuqNKGuPqGfiQVhL5nWb7ArLWGUI6wjpsIW8="; + excludes = [ "ChangeLog" ]; + }) + ] ++ lib.optionals stdenv.cc.isGNU [ + # Fixes compilation with gcc >= 14. + (fetchpatch { + url = "https://github.com/zsh-users/zsh/commit/4c89849c98172c951a9def3690e8647dae76308f.patch"; + hash = "sha256-l5IHQuIXo0N6ynLlZoQA7wJd/C7KrW3G7nMzfjQINkw="; + excludes = [ "ChangeLog" ]; + }) ]; strictDeps = true; nativeBuildInputs = [ autoreconfHook perl groff texinfo pkg-config ] - ++ lib.optionals stdenv.isLinux [ util-linux yodl ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux yodl ]; buildInputs = [ ncurses pcre ]; @@ -54,7 +67,7 @@ stdenv.mkDerivation { "--enable-pcre" "--enable-zshenv=${placeholder "out"}/etc/zshenv" "--disable-site-fndir" - "--enable-function-subdirs" + # --enable-function-subdirs is not enabled due to it being slow at runtime in some cases ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform && !stdenv.hostPlatform.isStatic) [ # Also see: https://github.com/buildroot/buildroot/commit/2f32e668aa880c2d4a2cce6c789b7ca7ed6221ba "zsh_cv_shared_environ=yes" @@ -127,7 +140,7 @@ EOF ''; meta = { - description = "The Z shell"; + description = "Z shell"; longDescription = '' Zsh is a UNIX command interpreter (shell) usable as an interactive login shell and as a shell script command processor. Of the standard shells, diff --git a/pkgs/shells/zsh/fzf-zsh/default.nix b/pkgs/shells/zsh/fzf-zsh/default.nix index 40c4edaff86e9..089a443a8237b 100644 --- a/pkgs/shells/zsh/fzf-zsh/default.nix +++ b/pkgs/shells/zsh/fzf-zsh/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/wyntau/fzf-zsh"; description = "wrap fzf to use in oh-my-zsh"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/shells/zsh/gradle-completion/default.nix b/pkgs/shells/zsh/gradle-completion/default.nix index fa40db3603b90..6112c2edfa1d6 100644 --- a/pkgs/shells/zsh/gradle-completion/default.nix +++ b/pkgs/shells/zsh/gradle-completion/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { description = "Gradle tab completion for bash and zsh"; homepage = "https://github.com/gradle/gradle-completion"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/pkgs/shells/zsh/grml-zsh-config/default.nix index cff5a814bd131..d7b745c63c5f1 100644 --- a/pkgs/shells/zsh/grml-zsh-config/default.nix +++ b/pkgs/shells/zsh/grml-zsh-config/default.nix @@ -1,8 +1,4 @@ -{ stdenv, fetchFromGitHub, lib -, zsh, coreutils, inetutils, procps, txt2tags }: - -with lib; - +{ stdenv, fetchFromGitHub, lib, zsh, coreutils, inetutils, procps, txt2tags }: stdenv.mkDerivation rec { pname = "grml-zsh-config"; version = "0.19.7"; @@ -17,7 +13,7 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ txt2tags ]; buildInputs = [ zsh coreutils procps ] - ++ optional stdenv.isLinux inetutils; + ++ lib.optional stdenv.hostPlatform.isLinux inetutils; buildPhase = '' cd doc @@ -36,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "grml's zsh setup"; homepage = "https://grml.org/zsh/"; - license = licenses.gpl2; + license = with licenses; [ gpl2Plus gpl2Only ]; platforms = platforms.unix; maintainers = with maintainers; [ msteen rvolosatovs ]; }; diff --git a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix index f64f96a60aa74..85bd6d5bf2e0a 100644 --- a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix +++ b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix @@ -17,10 +17,10 @@ stdenv.mkDerivation { ''; meta = with lib; { - description = "A ZSH theme optimized for people who use Git & Unicode-compatible fonts and terminals"; + description = "ZSH theme optimized for people who use Git & Unicode-compatible fonts and terminals"; homepage = "https://github.com/halfo/lambda-mod-zsh-theme/"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 09fe271892db7..cf4337a98fe7b 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,14 +5,14 @@ , git, nix, nixfmt-classic, jq, coreutils, gnused, curl, cacert, bash }: stdenv.mkDerivation rec { - version = "2024-04-25"; + version = "2024-09-22"; pname = "oh-my-zsh"; src = fetchFromGitHub { owner = "ohmyzsh"; repo = "ohmyzsh"; - rev = "803e1a784cd520f101d126b47deea3297e6a82fc"; - sha256 = "sha256-spfi3Jdd9yjZ+1l4uz6QX7HF996VvbHwgtlTaHSrAXM="; + rev = "f11cc8fea190eb9a1638dc67877436d0b8475ff5"; + sha256 = "sha256-9rk9iyz7uK1JfNfBq3jxrB3qzdR7xo43899KIivS/Zo="; }; strictDeps = true; @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A framework for managing your zsh configuration"; + description = "Framework for managing your zsh configuration"; longDescription = '' Oh My Zsh is a framework for managing your zsh configuration. diff --git a/pkgs/shells/zsh/pure-prompt/default.nix b/pkgs/shells/zsh/pure-prompt/default.nix index 2a1ba113ce196..20da12041805b 100644 --- a/pkgs/shells/zsh/pure-prompt/default.nix +++ b/pkgs/shells/zsh/pure-prompt/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchFromGitHub }: -with lib; - stdenv.mkDerivation rec { pname = "pure-prompt"; version = "1.23.0"; @@ -21,7 +19,7 @@ stdenv.mkDerivation rec { cp async.zsh "$OUTDIR/async" ''; - meta = { + meta = with lib; { description = "Pretty, minimal and fast ZSH prompt"; homepage = "https://github.com/sindresorhus/pure"; license = licenses.mit; diff --git a/pkgs/shells/zsh/spaceship-prompt/default.nix b/pkgs/shells/zsh/spaceship-prompt/default.nix index a9c6cb60df413..d47162296ec25 100644 --- a/pkgs/shells/zsh/spaceship-prompt/default.nix +++ b/pkgs/shells/zsh/spaceship-prompt/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "spaceship-prompt"; - version = "4.15.2"; + version = "4.16.1"; src = fetchFromGitHub { owner = "denysdovhan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-T5tilMwRc0vbj6Cq3xSf9Q77UfX2aQ+Y1RdkYtzD0k8="; + sha256 = "sha256-pGjVhFBDreVSY3RSqVZTVFeJst6+PhdDGlYqoDrbQgI="; }; strictDeps = true; diff --git a/pkgs/shells/zsh/zi/default.nix b/pkgs/shells/zsh/zi/default.nix index b1adbe8d66162..1649a6a7fe88f 100644 --- a/pkgs/shells/zsh/zi/default.nix +++ b/pkgs/shells/zsh/zi/default.nix @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { homepage = "https://github.com/z-shell/zi"; - description = "A Swiss Army Knife for Zsh - Unix Shell"; + description = "Swiss Army Knife for Zsh - Unix Shell"; license = licenses.mit; maintainers = with maintainers; [ sei40kr ]; }; diff --git a/pkgs/shells/zsh/zimfw/default.nix b/pkgs/shells/zsh/zimfw/default.nix index f91709a4c29a7..f1e7afa8c3841 100644 --- a/pkgs/shells/zsh/zimfw/default.nix +++ b/pkgs/shells/zsh/zimfw/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "zimfw"; - version = "1.13.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "zimfw"; repo = "zimfw"; rev = "v${version}"; ## zim only needs this one file to be installed. sparseCheckout = [ "zimfw.zsh" ]; - sha256 = "sha256-ZmOmdIvSs60GYT4zfhYONmfayDOEHG8acsf4u1A2wWQ="; + hash = "sha256-JBMrgUMGsvjYasEHJsZ0jZAHmrN3Z0d8T8agI9FiEPs="; }; strictDeps = true; dontConfigure = true; diff --git a/pkgs/shells/zsh/zinit/default.nix b/pkgs/shells/zsh/zinit/default.nix index c226b5565451d..0cdd61536bc12 100644 --- a/pkgs/shells/zsh/zinit/default.nix +++ b/pkgs/shells/zsh/zinit/default.nix @@ -24,6 +24,8 @@ stdenvNoCC.mkDerivation rec { install -m0644 zinit{,-side,-install,-autoload}.zsh "$outdir" install -m0755 share/git-process-output.zsh "$outdir" + installManPage doc/zinit.1 + # Zplugin autocompletion installShellCompletion --zsh _zinit @@ -32,6 +34,9 @@ stdenvNoCC.mkDerivation rec { # find zmodules/ -type f -exec install -m 744 "{}" "$outdir/{}" \; ''; + postInstall = '' + installManPage doc/zinit.1 + ''; #TODO:doc output meta = with lib; { diff --git a/pkgs/shells/zsh/zplug/default.nix b/pkgs/shells/zsh/zplug/default.nix index 7fdc682387d70..4f6231d141103 100644 --- a/pkgs/shells/zsh/zplug/default.nix +++ b/pkgs/shells/zsh/zplug/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A next-generation plugin manager for zsh"; + description = "Next-generation plugin manager for zsh"; homepage = "https://github.com/zplug/zplug"; license = licenses.mit; maintainers = [ maintainers.s1341 ]; diff --git a/pkgs/shells/zsh/zsh-abbr/default.nix b/pkgs/shells/zsh/zsh-abbr/default.nix index 668637ef1cc6a..842c6d975b92c 100644 --- a/pkgs/shells/zsh/zsh-abbr/default.nix +++ b/pkgs/shells/zsh/zsh-abbr/default.nix @@ -5,24 +5,27 @@ }: stdenv.mkDerivation rec { pname = "zsh-abbr"; - version = "5.4.1"; + version = "5.8.2"; src = fetchFromGitHub { owner = "olets"; repo = "zsh-abbr"; rev = "v${version}"; - hash = "sha256-gEBGMVR1lMVKNPVuPjtdPkgOXI1MWO0EAtk7JRmS0Ok="; + hash = "sha256-K3LOTnTS8XD6RsPi0c3VqYbO3Ep99iaA4BXRcKK2dgE="; }; strictDeps = true; installPhase = '' install -D zsh-abbr.zsh $out/share/zsh/${pname}/abbr.plugin.zsh + # Needed so that `man` can find the manpage, since it looks via PATH + mkdir -p $out/bin + mv man $out/share/man ''; meta = with lib; { homepage = "https://github.com/olets/zsh-abbr"; - description = "The zsh manager for auto-expanding abbreviations, inspired by fish shell"; + description = "Zsh manager for auto-expanding abbreviations, inspired by fish shell"; license = with licenses; [cc-by-nc-nd-40 hl3]; maintainers = with maintainers; [icy-thought]; platforms = platforms.all; diff --git a/pkgs/shells/zsh/zsh-autocomplete/default.nix b/pkgs/shells/zsh/zsh-autocomplete/default.nix index 1ecd96121972e..bd265a3868bae 100644 --- a/pkgs/shells/zsh/zsh-autocomplete/default.nix +++ b/pkgs/shells/zsh/zsh-autocomplete/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "zsh-autocomplete"; - version = "23.07.13"; + version = "24.09.04"; src = fetchFromGitHub { owner = "marlonrichert"; repo = "zsh-autocomplete"; rev = version; - sha256 = "sha256-0NW0TI//qFpUA2Hdx6NaYdQIIUpRSd0Y4NhwBbdssCs="; + sha256 = "sha256-o8IQszQ4/PLX1FlUvJpowR2Tev59N8lI20VymZ+Hp4w="; }; strictDeps = true; diff --git a/pkgs/shells/zsh/zsh-autopair/default.nix b/pkgs/shells/zsh/zsh-autopair/default.nix index 73b70c00405ae..8b0cfd6ed5232 100644 --- a/pkgs/shells/zsh/zsh-autopair/default.nix +++ b/pkgs/shells/zsh/zsh-autopair/default.nix @@ -1,27 +1,32 @@ -{ stdenv, lib, fetchFromGitHub }: +{ + stdenv, + lib, + fetchFromGitHub, +}: stdenv.mkDerivation rec { pname = "zsh-autopair"; - version = "1.0"; + version = "1.0-unstable-2024-07-14"; src = fetchFromGitHub { owner = "hlissner"; repo = "zsh-autopair"; - rev = "v${version}"; - sha256 = "1h0vm2dgrmb8i2pvsgis3lshc5b0ad846836m62y8h3rdb3zmpy1"; + rev = "449a7c3d095bc8f3d78cf37b9549f8bb4c383f3d"; + hash = "sha256-3zvOgIi+q7+sTXrT+r/4v98qjeiEL4Wh64rxBYnwJvQ="; }; - strictDeps = true; - installPhase = '' install -D autopair.zsh $out/share/zsh/${pname}/autopair.zsh ''; meta = with lib; { homepage = "https://github.com/hlissner/zsh-autopair"; - description = "A plugin that auto-closes, deletes and skips over matching delimiters in zsh intelligently"; + description = "Plugin that auto-closes, deletes and skips over matching delimiters in zsh intelligently"; license = licenses.mit; - maintainers = with maintainers; [ _0qq ]; + maintainers = with maintainers; [ + _0qq + DataHearth + ]; platforms = platforms.all; }; } diff --git a/pkgs/shells/zsh/zsh-bd/default.nix b/pkgs/shells/zsh/zsh-bd/default.nix index ebfa55ecd2292..b0704065901b1 100644 --- a/pkgs/shells/zsh/zsh-bd/default.nix +++ b/pkgs/shells/zsh/zsh-bd/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Jump back to a specific directory, without doing `cd ../../..` "; + description = "Jump back to a specific directory, without doing `cd ../../..`"; homepage = "https://github.com/Tarrasch/zsh-bd"; license = lib.licenses.free; diff --git a/pkgs/shells/zsh/zsh-completions/default.nix b/pkgs/shells/zsh/zsh-completions/default.nix index 1873c38fb9a16..0bb2c87267190 100644 --- a/pkgs/shells/zsh/zsh-completions/default.nix +++ b/pkgs/shells/zsh/zsh-completions/default.nix @@ -22,8 +22,13 @@ stdenv.mkDerivation rec { meta = { description = "Additional completion definitions for zsh"; homepage = "https://github.com/zsh-users/zsh-completions"; - license = lib.licenses.free; - + license = with lib.licenses; [ + asl20 + bsd3 + isc + mit + mit-modern + ]; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.olejorgenb ]; }; diff --git a/pkgs/shells/zsh/zsh-edit/default.nix b/pkgs/shells/zsh/zsh-edit/default.nix index 9c734c928c24e..b1ca81e30ce85 100644 --- a/pkgs/shells/zsh/zsh-edit/default.nix +++ b/pkgs/shells/zsh/zsh-edit/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/marlonrichert/zsh-edit"; - description = "A set of powerful extensions to the Zsh command line editor"; + description = "Set of powerful extensions to the Zsh command line editor"; license = licenses.mit; maintainers = with maintainers; [ deejayem ]; platforms = platforms.all; diff --git a/pkgs/shells/zsh/zsh-forgit/default.nix b/pkgs/shells/zsh/zsh-forgit/default.nix index 08f31a995aebc..0ace44e06f9d9 100644 --- a/pkgs/shells/zsh/zsh-forgit/default.nix +++ b/pkgs/shells/zsh/zsh-forgit/default.nix @@ -1,32 +1,33 @@ -{ stdenv +{ stdenvNoCC , lib , bash , coreutils , findutils , fetchFromGitHub , fzf +, gawk , git , gnugrep , gnused , makeWrapper }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "zsh-forgit"; - version = "24.02.0"; + version = "24.09.0"; src = fetchFromGitHub { owner = "wfxr"; repo = "forgit"; - rev = version; - sha256 = "sha256-DoOtrnEJwSxkCZtsVek+3w9RZH7j7LTvdleBC88xyfI="; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-8QgnEu41BHeX6heP2slQT+X+Dti+7Ij+J2zqmU4dm3I="; }; strictDeps = true; postPatch = '' substituteInPlace forgit.plugin.zsh \ - --replace "\$INSTALL_DIR/bin/git-forgit" "$out/bin/git-forgit" + --replace-fail "\$FORGIT_INSTALL_DIR/bin/git-forgit" "$out/bin/git-forgit" ''; dontBuild = true; @@ -38,20 +39,19 @@ stdenv.mkDerivation rec { install -D bin/git-forgit $out/bin/git-forgit install -D completions/_git-forgit $out/share/zsh/site-functions/_git-forgit - install -D completions/git-forgit.zsh $out/share/zsh/${pname}/git-forgit.zsh - install -D forgit.plugin.zsh $out/share/zsh/${pname}/forgit.plugin.zsh + install -D forgit.plugin.zsh $out/share/zsh/${finalAttrs.pname}/forgit.plugin.zsh wrapProgram $out/bin/git-forgit \ - --prefix PATH : ${lib.makeBinPath [ bash coreutils findutils fzf git gnugrep gnused ]} + --prefix PATH : ${lib.makeBinPath [ bash coreutils findutils fzf gawk git gnugrep gnused ]} runHook postInstall ''; meta = with lib; { homepage = "https://github.com/wfxr/forgit"; - description = "A utility tool powered by fzf for using git interactively"; + description = "Utility tool powered by fzf for using git interactively"; mainProgram = "git-forgit"; license = licenses.mit; maintainers = with maintainers; [ deejayem ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/shells/zsh/zsh-fzf-history-search/default.nix b/pkgs/shells/zsh/zsh-fzf-history-search/default.nix index c6d32f8d76120..d85171530a6ae 100644 --- a/pkgs/shells/zsh/zsh-fzf-history-search/default.nix +++ b/pkgs/shells/zsh/zsh-fzf-history-search/default.nix @@ -27,10 +27,10 @@ stdenvNoCC.mkDerivation { ''; meta = { - description = "A simple zsh plugin that replaces Ctrl+R with an fzf-driven select which includes date/times"; + description = "Simple zsh plugin that replaces Ctrl+R with an fzf-driven select which includes date/times"; homepage = "https://github.com/joshskidmore/zsh-fzf-history-search"; license = lib.licenses.mit; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ janik ]; + maintainers = [ ]; }; } diff --git a/pkgs/shells/zsh/zsh-fzf-tab/default.nix b/pkgs/shells/zsh/zsh-fzf-tab/default.nix index dcb3ffd19ec7f..1b96c5224d0eb 100644 --- a/pkgs/shells/zsh/zsh-fzf-tab/default.nix +++ b/pkgs/shells/zsh/zsh-fzf-tab/default.nix @@ -4,13 +4,13 @@ let INSTALL_PATH="${placeholder "out"}/share/fzf-tab"; in stdenv.mkDerivation rec { pname = "zsh-fzf-tab"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "Aloxaf"; repo = "fzf-tab"; rev = "v${version}"; - hash = "sha256-0/YOL1/G2SWncbLNaclSYUz7VyfWu+OB8TYJYm4NYkM="; + hash = "sha256-Qv8zAiMtrr67CbLRrFjGaPzFZcOiMVEFLg1Z+N6VMhg="; }; strictDeps = true; @@ -81,11 +81,11 @@ in stdenv.mkDerivation rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { homepage = "https://github.com/Aloxaf/fzf-tab"; description = "Replace zsh's default completion selection menu with fzf!"; - license = licenses.mit; - maintainers = with maintainers; [ vonfry ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ vonfry ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/shells/zsh/zsh-history/default.nix b/pkgs/shells/zsh/zsh-history/default.nix index 6693f466216c2..f2afd98de60a5 100644 --- a/pkgs/shells/zsh/zsh-history/default.nix +++ b/pkgs/shells/zsh/zsh-history/default.nix @@ -28,10 +28,10 @@ buildGoModule rec { }; meta = with lib; { - description = "A CLI to provide enhanced history for your ZSH shell"; + description = "CLI to provide enhanced history for your ZSH shell"; homepage = "https://github.com/b4b4r07/history"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "history"; }; } diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index 328360aa482ec..c9f610471f575 100644 --- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = { changelog = "https://github.com/romkatv/powerlevel10k/releases/tag/v${version}"; - description = "A fast reimplementation of Powerlevel9k ZSH theme"; + description = "Fast reimplementation of Powerlevel9k ZSH theme"; longDescription = '' To make use of this derivation, use `programs.zsh.promptInit = "source ''${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme";` diff --git a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix index 35d5aa48b0c1c..4a0b0bd02dd68 100644 --- a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { ''; meta = { - description = "A beautiful theme for zsh"; + description = "Beautiful theme for zsh"; longDescription = '' To make use of this derivation, use `programs.zsh.promptInit = "source ''${pkgs.zsh-powerlevel9k}/share/zsh-powerlevel9k/powerlevel9k.zsh-theme";` diff --git a/pkgs/shells/zsh/zsh-prezto/default.nix b/pkgs/shells/zsh/zsh-prezto/default.nix index 61b51a252fb65..ff79e8ea1a761 100644 --- a/pkgs/shells/zsh/zsh-prezto/default.nix +++ b/pkgs/shells/zsh/zsh-prezto/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zsh-prezto"; - version = "unstable-2024-04-15"; + version = "0-unstable-2024-06-03"; src = fetchFromGitHub { owner = "sorin-ionescu"; repo = "prezto"; - rev = "f5a8cb456b74d4d71caf46037a356d2deee27b50"; - sha256 = "iikJ/U7amsmMgFIEYuIIIymNeWr4ag/QPeyQjBJ/lOY="; + rev = "9195b66161b196238cbd52a8a4abd027bdaf5f73"; + sha256 = "wN/86uFBahUWl9RnKvdf88zVxou7B8Kh7/s3JfMye0g="; fetchSubmodules = true; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { passthru.updateScript = unstableGitUpdater {}; meta = with lib; { - description = "The configuration framework for Zsh"; + description = "Configuration framework for Zsh"; longDescription = '' Prezto is the configuration framework for Zsh; it enriches the command line interface environment with sane defaults, diff --git a/pkgs/shells/zsh/zsh-system-clipboard/default.nix b/pkgs/shells/zsh/zsh-system-clipboard/default.nix index 6e875b6ee086e..10853b4dc0f1d 100644 --- a/pkgs/shells/zsh/zsh-system-clipboard/default.nix +++ b/pkgs/shells/zsh/zsh-system-clipboard/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/kutsan/zsh-system-clipboard"; - description = "A plugin that adds key bindings support for ZLE (Zsh Line Editor) clipboard operations for vi emulation keymaps"; + description = "Plugin that adds key bindings support for ZLE (Zsh Line Editor) clipboard operations for vi emulation keymaps"; license = licenses.gpl3Only; maintainers = with maintainers; [ _0qq ]; platforms = platforms.all; diff --git a/pkgs/shells/zsh/zsh-vi-mode/default.nix b/pkgs/shells/zsh/zsh-vi-mode/default.nix index 42472625f13e8..b29dc4a344d17 100644 --- a/pkgs/shells/zsh/zsh-vi-mode/default.nix +++ b/pkgs/shells/zsh/zsh-vi-mode/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/jeffreytse/zsh-vi-mode"; license = licenses.mit; - description = "A better and friendly vi(vim) mode plugin for ZSH."; + description = "Better and friendly vi(vim) mode plugin for ZSH"; maintainers = with maintainers; [ kyleondy ]; platforms = platforms.all; }; diff --git a/pkgs/shells/zsh/zsh-you-should-use/default.nix b/pkgs/shells/zsh/zsh-you-should-use/default.nix index b3db825bbba68..222d958be1767 100644 --- a/pkgs/shells/zsh/zsh-you-should-use/default.nix +++ b/pkgs/shells/zsh/zsh-you-should-use/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zsh-you-should-use"; - version = "1.7.3"; + version = "1.8.0"; src = fetchFromGitHub { owner = "MichaelAquilina"; repo = pname; rev = version; - sha256 = "1dz48rd66priqhxx7byndqhbmlwxi1nfw8ik25k0z5k7k754brgy"; + sha256 = "sha256-fJX748lwVP1+GF/aIl1J3c6XAy/AtYCpEHsP8weUNo0="; }; strictDeps = true; @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/MichaelAquilina/zsh-you-should-use"; license = licenses.gpl3; description = "ZSH plugin that reminds you to use existing aliases for commands you just typed"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } |