From fd439a461855108ca3d6e4399732c88739f4d51c Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 18 Dec 2023 15:51:53 +0100 Subject: [PATCH 1/2] zsh-powerlevel10k: make imports more diff friendly --- pkgs/shells/zsh/zsh-powerlevel10k/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index be1d69e3e2e3..3982de5557ae 100644 --- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, pkgs, bash }: +{ lib +, stdenv +, fetchFromGitHub +, substituteAll +, pkgs +, bash +}: let From 8e0593ccf348a835335ed644af69160e6c16ca90 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 18 Dec 2023 15:52:23 +0100 Subject: [PATCH 2/2] zsh-powerlevel10k: avoid importing `pkgs` --- pkgs/shells/zsh/zsh-powerlevel10k/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index 3982de5557ae..bc357be79bb8 100644 --- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , substituteAll -, pkgs +, gitstatus , bash }: @@ -10,7 +10,7 @@ let # match gitstatus version with given `gitstatus_version`: # https://github.com/romkatv/powerlevel10k/blob/master/gitstatus/build.info - gitstatus = pkgs.gitstatus.overrideAttrs (oldAtttrs: rec { + gitstatus' = gitstatus.overrideAttrs (oldAtttrs: rec { version = "1.5.4"; src = fetchFromGitHub { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./gitstatusd.patch; - gitstatusdPath = "${gitstatus}/bin/gitstatusd"; + gitstatusdPath = "${gitstatus'}/bin/gitstatusd"; }) ];