From 5d476cc02c5025888961a01f841802db20621808 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 27 Dec 2024 09:56:19 +0100
Subject: [PATCH] zsh-powerlevel10k: 1.20.0 -> 1.20.14

Upstream doesn't use tags anymore but does increase the version in the
sources. Let's update to get some fixes and use gitstatus 1.5.5 like
upstream.
---
 pkgs/by-name/zs/zsh-powerlevel10k/package.nix | 34 +++----------------
 1 file changed, 5 insertions(+), 29 deletions(-)

diff --git a/pkgs/by-name/zs/zsh-powerlevel10k/package.nix b/pkgs/by-name/zs/zsh-powerlevel10k/package.nix
index 9474577c628a..8dbcdf74b3f8 100644
--- a/pkgs/by-name/zs/zsh-powerlevel10k/package.nix
+++ b/pkgs/by-name/zs/zsh-powerlevel10k/package.nix
@@ -3,44 +3,20 @@
   stdenv,
   fetchFromGitHub,
   replaceVars,
-  fetchpatch,
   gitstatus,
   bash,
 }:
 
-let
-  # match gitstatus version with given `gitstatus_version`:
-  # https://github.com/romkatv/powerlevel10k/blob/master/gitstatus/build.info
-  gitstatus' = gitstatus.overrideAttrs (oldAtttrs: rec {
-    version = "1.5.4";
-
-    src = fetchFromGitHub {
-      owner = "romkatv";
-      repo = "gitstatus";
-      rev = "refs/tags/v${version}";
-      hash = "sha256-mVfB3HWjvk4X8bmLEC/U8SKBRytTh/gjjuReqzN5qTk=";
-    };
-
-    patches = (oldAtttrs.patches or [ ]) ++ [
-      # remove when bumped to 1.5.5
-      (fetchpatch {
-        url = "https://github.com/romkatv/gitstatus/commit/62177e89b2b04baf242cd1526cc2661041dda0fb.patch";
-        sha256 = "sha256-DSRYRV89MLR/Eh4MFsXpDKH1xJiAWyJgSqmfjDTXhtU=";
-        name = "drop-Werror.patch";
-      })
-    ];
-
-  });
-in
 stdenv.mkDerivation rec {
   pname = "powerlevel10k";
-  version = "1.20.0";
+  version = "1.20.14";
 
   src = fetchFromGitHub {
     owner = "romkatv";
     repo = "powerlevel10k";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-ES5vJXHjAKw/VHjWs8Au/3R+/aotSbY7PWnWAMzCR8E=";
+    # upstream doesn't seem to use tags anymore
+    rev = "5e26473457d819fe148f7fff32db1082dae72012";
+    hash = "sha256-/+FEkgBR6EOTaCAc15vYGWNih2QZkN27ae6LMXlXZU4=";
   };
 
   strictDeps = true;
@@ -48,7 +24,7 @@ stdenv.mkDerivation rec {
 
   patches = [
     (replaceVars ./gitstatusd.patch {
-      gitstatusdPath = "${gitstatus'}/bin/gitstatusd";
+      gitstatusdPath = "${gitstatus}/bin/gitstatusd";
     })
   ];