From 9ecd40908d2a8fb967b7f1bab573fac810229368 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 28 Oct 2020 17:14:12 +0100 Subject: [PATCH] zsh-powerlevel10k: pin gitstatus version The required gitstatus version compatible with zsh-powerlevel10k has been pinned, as even though it is written by the same author, gitstatus has received updates which are not yet compatible with zsh-p10k. Fixes: #101946 --- pkgs/shells/zsh/zsh-powerlevel10k/default.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index 39cb1f247fc..a978ac93a9b 100644 --- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -3,6 +3,20 @@ # To make use of this derivation, use # `programs.zsh.promptInit = "source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme";` +let + # match gitstatus version with given `gitstatus_version`: + # https://github.com/romkatv/powerlevel10k/blob/master/gitstatus/build.info + gitstatus = pkgs.gitAndTools.gitstatus.overrideAttrs (oldAtttrs: rec { + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "romkatv"; + repo = "gitstatus"; + rev = "v${version}"; + sha256 = "0xi5ab0rsj6xs4vqgn2j5rih1nncghr83yn395mk1is1f4bsmp0s"; + }; + }); +in stdenv.mkDerivation rec { pname = "powerlevel10k"; version = "1.13.0"; @@ -17,7 +31,7 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./gitstatusd.patch; - gitstatusdPath = "${pkgs.gitAndTools.gitstatus}/bin/gitstatusd"; + gitstatusdPath = "${gitstatus}/bin/gitstatusd"; }) ];