From 178bc185636a7d293f185ce1642fe0102178cb1b Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Wed, 6 Aug 2025 12:16:10 -0700
Subject: [PATCH 1/4] grc: use callPackage

---
 pkgs/tools/misc/grc/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix
index 109b1b347938..46935a9211ed 100644
--- a/pkgs/tools/misc/grc/default.nix
+++ b/pkgs/tools/misc/grc/default.nix
@@ -1,11 +1,11 @@
 {
   lib,
+  python3Packages,
   fetchFromGitHub,
-  buildPythonApplication,
   installShellFiles,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "grc";
   version = "1.13";
   format = "other";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index da067c8860bf..dbe645cdad36 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1721,7 +1721,7 @@ with pkgs;
 
   guglielmo = libsForQt5.callPackage ../applications/radio/guglielmo { };
 
-  grc = python3Packages.callPackage ../tools/misc/grc { };
+  grc = callPackage ../tools/misc/grc { };
 
   gremlin-console = callPackage ../applications/misc/gremlin-console {
     openjdk = openjdk11;

From 0b4bb3b3d310f44a73d65f56c4c25f6d11af5b8e Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Wed, 6 Aug 2025 12:16:33 -0700
Subject: [PATCH 2/4] grc: remove with lib

---
 pkgs/tools/misc/grc/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix
index 46935a9211ed..70f832d00005 100644
--- a/pkgs/tools/misc/grc/default.nix
+++ b/pkgs/tools/misc/grc/default.nix
@@ -39,20 +39,20 @@ python3Packages.buildPythonApplication rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "http://kassiopeia.juls.savba.sk/~garabik/software/grc.html";
     description = "Generic text colouriser";
     longDescription = ''
       Generic Colouriser is yet another colouriser (written in Python) for
       beautifying your logfiles or output of commands.
     '';
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [
       azahi
       lovek323
       peterhoeg
     ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
     mainProgram = "grc";
   };
 }

From 1c25fa62c266e340681d9f9fc2ca5a079600a26e Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Wed, 6 Aug 2025 12:16:48 -0700
Subject: [PATCH 3/4] grc: remove pname refrence

---
 pkgs/tools/misc/grc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix
index 70f832d00005..d5a7dc67a3e8 100644
--- a/pkgs/tools/misc/grc/default.nix
+++ b/pkgs/tools/misc/grc/default.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
 
   src = fetchFromGitHub {
     owner = "garabik";
-    repo = pname;
+    repo = "grc";
     rev = "v${version}";
     sha256 = "1h0h88h484a9796hai0wasi1xmjxxhpyxgixn6fgdyc5h69gv8nl";
   };

From 6bb7ba540ca0b592a95311605947949d437ee319 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Wed, 6 Aug 2025 12:17:32 -0700
Subject: [PATCH 4/4] grc: move to by-name

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

diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/by-name/gr/grc/package.nix
similarity index 100%
rename from pkgs/tools/misc/grc/default.nix
rename to pkgs/by-name/gr/grc/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dbe645cdad36..7ac9c28a4466 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1721,8 +1721,6 @@ with pkgs;
 
   guglielmo = libsForQt5.callPackage ../applications/radio/guglielmo { };
 
-  grc = callPackage ../tools/misc/grc { };
-
   gremlin-console = callPackage ../applications/misc/gremlin-console {
     openjdk = openjdk11;
   };