From b99f2ea02b9a76eaa3ea921965dfcf1de82dbf82 Mon Sep 17 00:00:00 2001
From: Perchun Pak <git@perchun.it>
Date: Sun, 17 May 2026 01:20:23 +0200
Subject: [PATCH] gh-cherry-pick -> ghcherry: 1.5.0 -> 1.6.0

---
 .../gh/{gh-cherry-pick => ghcherry}/package.nix | 17 +++++++++--------
 pkgs/top-level/aliases.nix                      |  1 +
 2 files changed, 10 insertions(+), 8 deletions(-)
 rename pkgs/by-name/gh/{gh-cherry-pick => ghcherry}/package.nix (72%)

diff --git a/pkgs/by-name/gh/gh-cherry-pick/package.nix b/pkgs/by-name/gh/ghcherry/package.nix
similarity index 72%
rename from pkgs/by-name/gh/gh-cherry-pick/package.nix
rename to pkgs/by-name/gh/ghcherry/package.nix
index 328f82354b60..ff15b24f600d 100644
--- a/pkgs/by-name/gh/gh-cherry-pick/package.nix
+++ b/pkgs/by-name/gh/ghcherry/package.nix
@@ -4,15 +4,16 @@
   fetchFromGitHub,
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
-  pname = "gh-cherry-pick";
-  version = "1.5.0";
+  pname = "ghcherry";
+  version = "1.6.0";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "PerchunPak";
-    repo = "gh-cherry-pick";
+    repo = "ghcherry";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-a2vhQ9upJYc+t4Juq+eukNc7dzq6MafNxDUULPZs9sQ=";
+    hash = "sha256-yUsYf0v5IZh4yxkG+nu8cG4L/WcJTFDefc//l4v36sY=";
   };
 
   build-system = with python3Packages; [
@@ -39,13 +40,13 @@ python3Packages.buildPythonApplication (finalAttrs: {
     pytestCheckHook
   ];
 
-  pythonImportsCheck = [ "gh_cherry_pick" ];
+  pythonImportsCheck = [ "ghcherry" ];
 
   meta = {
     description = "Cherry-pick commits across GitHub repositories using only the GitHub API";
-    homepage = "https://github.com/PerchunPak/gh-cherry-pick";
-    license = lib.licenses.mit;
+    homepage = "https://github.com/PerchunPak/ghcherry";
+    license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.PerchunPak ];
-    mainProgram = "gh-cherry-pick";
+    mainProgram = "ghcherry";
   };
 })
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 51bb2987a152..b9f45c211998 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -838,6 +838,7 @@ mapAliases {
   gfortran12 = throw "gfortran12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gg = throw "'gg' has been renamed to/replaced by 'go-graft'"; # Converted to throw 2025-10-27
   ggobi = throw "'ggobi' has been removed from Nixpkgs, as it is unmaintained and broken"; # Added 2025-05-18
+  gh-cherry-pick = warnAlias "'gh-cherry-pick' has been renamed to 'ghcherry'" ghcherry; # Added 2026-05-17
   gh-copilot = throw "'gh-copilot' has been removed since it has been deprecated and archived upstream. Consider using 'github-copilot-cli' instead"; # Added 2026-01-20
   gImageReader = gimagereader; # Added 2026-02-08
   gImageReader-qt = gimagereader-qt; # Added 2026-02-08