From 20684d72b7d84b7e20b3eae7a2d325806b379dc7 Mon Sep 17 00:00:00 2001
From: Ashley Chiara <ashley@kira64.xyz>
Date: Wed, 20 Apr 2022 15:55:45 +0200
Subject: [PATCH 1/2] maintainers: update ashley

---
 maintainers/maintainer-list.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 8587a1fb02c..8dcfb68d3f7 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1043,8 +1043,8 @@
     name = "Kirill Boltaev";
   };
   ashley = {
-    email = "personavinny@protonmail.com";
-    github = "paranoidcat";
+    email = "ashley@kira64.xyz";
+    github = "kira64xyz";
     githubId = 84152630;
     name = "Ashley Chiara";
   };

From 88e0bd61198f79a50d2e03cd07d6b48a8e8e9445 Mon Sep 17 00:00:00 2001
From: Ashley Chiara <ashley@kira64.xyz>
Date: Wed, 20 Apr 2022 17:21:15 +0200
Subject: [PATCH 2/2] yafetch: unstable-2021-07-18 -> unstable-2022-04-20

---
 pkgs/tools/misc/yafetch/default.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/misc/yafetch/default.nix b/pkgs/tools/misc/yafetch/default.nix
index 5a082184400..f55926d0ae3 100644
--- a/pkgs/tools/misc/yafetch/default.nix
+++ b/pkgs/tools/misc/yafetch/default.nix
@@ -1,29 +1,29 @@
-{ lib, stdenv, fetchFromGitLab }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "yafetch";
-  version = "unstable-2021-07-18";
+  version = "unstable-2022-04-20";
 
-  src = fetchFromGitLab {
-    owner = "cyberkitty";
+  src = fetchFromGitHub {
+    owner = "kira64xyz";
     repo = pname;
-    rev = "f3efbca54df1ffea22cc40034114af141ccff9c1";
-    sha256 = "1cxhrjy9vzq87rzql4dcknkwca7nydysp1p1x4fh1qfw79dfdmxw";
+    rev = "a118cfc13f0b475db7c266105c10138d838788b8";
+    sha256 = "bSJlerfbJG6h5dDwWQKHnVLH6DEuvuUyqaRuJ7jvOsA=";
   };
 
   # Use the provided NixOS logo automatically
   prePatch = ''
     substituteInPlace ./config.h --replace \
-      "#include \"ascii/tux.h\"" "#include \"ascii/nixos.h\""
+      "#include \"ascii/gnu.h\"" "#include \"ascii/nixos.h\""
   '';
 
   # Fixes installation path
   PREFIX = placeholder "out";
 
   meta = with lib; {
-    homepage = "https://gitlab.com/cyberkitty/yafetch";
+    homepage = "https://github.com/kira64xyz/yafetch";
     description = "Yet another fetch clone written in C++";
-    license = licenses.gpl2Only;
+    license = licenses.gpl3Plus;
     maintainers = with maintainers; [ ivar ashley ];
     platforms = platforms.linux;
   };