From e5c7114db14c77ed89078e7471ac7e6fa6b5686f Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 17 Jul 2025 08:39:52 -0500
Subject: [PATCH 1/2] gazelle-origin: migrate to by-name

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

diff --git a/pkgs/tools/misc/gazelle-origin/default.nix b/pkgs/by-name/ga/gazelle-origin/package.nix
similarity index 100%
rename from pkgs/tools/misc/gazelle-origin/default.nix
rename to pkgs/by-name/ga/gazelle-origin/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 17d3cb80f782..de1e77cc8941 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12133,8 +12133,6 @@ with pkgs;
 
   gauche = callPackage ../development/interpreters/gauche { };
 
-  gazelle-origin = python3Packages.callPackage ../tools/misc/gazelle-origin { };
-
   geany = callPackage ../applications/editors/geany { };
   geany-with-vte = callPackage ../applications/editors/geany/with-vte.nix { };
 

From 5f36419fef80bca81941a5923f158f4c47625385 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 17 Jul 2025 08:40:46 -0500
Subject: [PATCH 2/2] gazelle-origin: refactor meta section and dependencies

---
 pkgs/by-name/ga/gazelle-origin/package.nix | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ga/gazelle-origin/package.nix b/pkgs/by-name/ga/gazelle-origin/package.nix
index 37ef0aedd9cc..3fa2a2431b86 100644
--- a/pkgs/by-name/ga/gazelle-origin/package.nix
+++ b/pkgs/by-name/ga/gazelle-origin/package.nix
@@ -1,26 +1,23 @@
 {
   lib,
-  buildPythonApplication,
   fetchFromGitHub,
-  bencoder,
-  pyyaml,
-  requests,
+  python3Packages,
 }:
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "gazelle-origin";
   version = "3.0.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
-    repo = pname;
+    repo = "gazelle-origin";
     # Use the spinfast319 fork, since it seems that upstream
     # at <https://github.com/x1ppy/gazelle-origin> is inactive
     owner = "spinfast319";
-    rev = version;
+    tag = version;
     hash = "sha256-+yMKnfG2f+A1/MxSBFLaHfpCgI2m968iXqt+2QanM/c=";
   };
 
-  propagatedBuildInputs = [
+  dependencies = with python3Packages; [
     bencoder
     pyyaml
     requests
@@ -28,12 +25,12 @@ buildPythonApplication rec {
 
   pythonImportsCheck = [ "gazelleorigin" ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool for generating origin files using the API of Gazelle-based torrent trackers";
     homepage = "https://github.com/spinfast319/gazelle-origin";
     # TODO license is unspecified in the upstream, as well as the fork
-    license = licenses.unfree;
-    maintainers = with maintainers; [ somasis ];
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ somasis ];
     mainProgram = "gazelle-origin";
   };
 }