From 73b573ce6111fc7f2102c22c916393cc1a8c8918 Mon Sep 17 00:00:00 2001
From: Lily Foster <lily@lily.flowers>
Date: Mon, 1 Aug 2022 18:05:11 -0400
Subject: [PATCH] hyfetch: 1.1.2 -> 1.3.0

---
 pkgs/tools/misc/hyfetch/default.nix | 26 ++++++++++++--------------
 pkgs/top-level/all-packages.nix     |  2 +-
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/pkgs/tools/misc/hyfetch/default.nix b/pkgs/tools/misc/hyfetch/default.nix
index 8a346855a7b4..80582524eee2 100644
--- a/pkgs/tools/misc/hyfetch/default.nix
+++ b/pkgs/tools/misc/hyfetch/default.nix
@@ -1,25 +1,26 @@
-{ lib, python3Packages, fetchFromGitHub }:
+{ lib, buildPythonPackage, fetchFromGitHub, typing-extensions, setuptools }:
 
-python3Packages.buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "HyFetch";
-  version = "1.1.2";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     repo = "hyfetch";
     owner = "hykilpikonna";
-    rev = "92623417f90f0cf006c0dd2adcf3f24f4308fe0c";
-    sha256 = "sha256-26L2qt+RarRf3+L6+mMy/ZJNVBVirKs5oEclEsImtC0=";
+    rev = version;
+    sha256 = "sha256-8Mp3MV9HVzXzT/W6F/lD34tT0uOgqyydg31PlR3sMUA=";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  # TODO: Remove with next release bump since it has been fixed upstream (hykilpikonna/hyfetch@d797a8c)
+  postPatch = ''
+    chmod +x neofetch
+  '';
+
+  propagatedBuildInputs = [
     typing-extensions
     setuptools
   ];
 
-  preCheck = ''
-    rm -rf hyfetch/color_scale_numpy.py
-  '';
-
   meta = with lib; {
     description = "neofetch with pride flags <3";
     longDescription = ''
@@ -34,9 +35,6 @@ python3Packages.buildPythonPackage rec {
     homepage = "https://github.com/hykilpikonna/HyFetch";
     license = licenses.mit;
     mainProgram = "hyfetch";
-    maintainers = [
-      maintainers.yisuidenghua
-    ];
-
+    maintainers = with maintainers; [ yisuidenghua ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab51047fb39b..6592ba23ee6b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -34861,7 +34861,7 @@ with pkgs;
 
   hplipWithPlugin = hplip.override { withPlugin = true; };
 
-  hyfetch = callPackage ../tools/misc/hyfetch { };
+  hyfetch = python3Packages.callPackage ../tools/misc/hyfetch { };
 
   hyperfine = callPackage ../tools/misc/hyperfine {
     inherit (darwin.apple_sdk.frameworks) Security;