From 8a98f989fb9e93668d95c7b44756d75e7447d7dd Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Wed, 23 Oct 2024 22:54:20 +0100
Subject: [PATCH 1/4] hyfetch: move to by-name

---
 .../misc/hyfetch/default.nix => by-name/hy/hyfetch/package.nix} | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/misc/hyfetch/default.nix => by-name/hy/hyfetch/package.nix} (100%)

diff --git a/pkgs/tools/misc/hyfetch/default.nix b/pkgs/by-name/hy/hyfetch/package.nix
similarity index 100%
rename from pkgs/tools/misc/hyfetch/default.nix
rename to pkgs/by-name/hy/hyfetch/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a80d2fc17fa1..088074b9f238 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -37129,8 +37129,6 @@ with pkgs;
 
   hplipWithPlugin = hplip.override { withPlugin = true; };
 
-  hyfetch = callPackage ../tools/misc/hyfetch { };
-
   hyperfine = callPackage ../tools/misc/hyperfine {
     inherit (darwin.apple_sdk.frameworks) Security;
   };

From beed7cee4ea46e3c99f11cd8865319add5cee542 Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Wed, 23 Oct 2024 22:58:11 +0100
Subject: [PATCH 2/4] hyfetch: 1.4.11 -> 1.99.0

---
 pkgs/by-name/hy/hyfetch/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/hy/hyfetch/package.nix b/pkgs/by-name/hy/hyfetch/package.nix
index 2e906541bda1..c83bf1d697c2 100644
--- a/pkgs/by-name/hy/hyfetch/package.nix
+++ b/pkgs/by-name/hy/hyfetch/package.nix
@@ -5,14 +5,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "hyfetch";
-  version = "1.4.11";
+  version = "1.99.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "hykilpikonna";
     repo = "hyfetch";
     rev = "refs/tags/${version}";
-    hash = "sha256-xzN/tbS5BUvpKeozesE99gNp3NRDjvf4Qx7BHLc4svo=";
+    hash = "sha256-GL1/V+LgSXJ4b28PfinScDrJhU9VDa4pVi24zWEzbAk=";
   };
 
   propagatedBuildInputs = with python3.pkgs; [
@@ -44,3 +44,5 @@ python3.pkgs.buildPythonApplication rec {
     maintainers = with maintainers; [ yisuidenghua ];
   };
 }
+
+

From 5429f7f841ec70238ff89dc6856f29ec2d650010 Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Wed, 23 Oct 2024 22:58:41 +0100
Subject: [PATCH 3/4] hyfetch: reformat with nixfmt-rfc-style

---
 pkgs/by-name/hy/hyfetch/package.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/hy/hyfetch/package.nix b/pkgs/by-name/hy/hyfetch/package.nix
index c83bf1d697c2..0c1cfe85c27a 100644
--- a/pkgs/by-name/hy/hyfetch/package.nix
+++ b/pkgs/by-name/hy/hyfetch/package.nix
@@ -1,8 +1,8 @@
-{ lib
-, fetchFromGitHub
-, python3
+{
+  lib,
+  fetchFromGitHub,
+  python3,
 }:
-
 python3.pkgs.buildPythonApplication rec {
   pname = "hyfetch";
   version = "1.99.0";
@@ -44,5 +44,3 @@ python3.pkgs.buildPythonApplication rec {
     maintainers = with maintainers; [ yisuidenghua ];
   };
 }
-
-

From f625128f925ea82b14a7b709c955424a17c990f4 Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Wed, 23 Oct 2024 23:03:33 +0100
Subject: [PATCH 4/4] hyfetch: use modern builders

---
 pkgs/by-name/hy/hyfetch/package.nix | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/hy/hyfetch/package.nix b/pkgs/by-name/hy/hyfetch/package.nix
index 0c1cfe85c27a..e88178b7880e 100644
--- a/pkgs/by-name/hy/hyfetch/package.nix
+++ b/pkgs/by-name/hy/hyfetch/package.nix
@@ -1,12 +1,12 @@
 {
   lib,
   fetchFromGitHub,
-  python3,
+  python3Packages,
 }:
-python3.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "hyfetch";
   version = "1.99.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "hykilpikonna";
@@ -15,9 +15,12 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-GL1/V+LgSXJ4b28PfinScDrJhU9VDa4pVi24zWEzbAk=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
-    typing-extensions
-    setuptools
+  build-system = [
+    python3Packages.setuptools
+  ];
+
+  dependencies = [
+    python3Packages.typing-extensions
   ];
 
   # No test available
@@ -27,7 +30,7 @@ python3.pkgs.buildPythonApplication rec {
     "hyfetch"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "neofetch with pride flags <3";
     longDescription = ''
       HyFetch is a command-line system information tool fork of neofetch.
@@ -39,8 +42,11 @@ python3.pkgs.buildPythonApplication rec {
       icon set you are using, etc.
     '';
     homepage = "https://github.com/hykilpikonna/HyFetch";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     mainProgram = "hyfetch";
-    maintainers = with maintainers; [ yisuidenghua ];
+    maintainers = with lib.maintainers; [
+      yisuidenghua
+      isabelroses
+    ];
   };
 }