From e67cc49668c782ea2e0e250ea832237b1a4aa725 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Tue, 31 Dec 2024 01:01:40 +0900
Subject: [PATCH 1/3] pybugz: migrate from python312Packages.bugz

---
 .../bugz/default.nix => by-name/py/pybugz/package.nix}        | 4 ++--
 pkgs/top-level/python-aliases.nix                             | 1 +
 pkgs/top-level/python-packages.nix                            | 2 --
 3 files changed, 3 insertions(+), 4 deletions(-)
 rename pkgs/{development/python-modules/bugz/default.nix => by-name/py/pybugz/package.nix} (88%)

diff --git a/pkgs/development/python-modules/bugz/default.nix b/pkgs/by-name/py/pybugz/package.nix
similarity index 88%
rename from pkgs/development/python-modules/bugz/default.nix
rename to pkgs/by-name/py/pybugz/package.nix
index c44c9c5fdc73..20b23147e2dc 100644
--- a/pkgs/development/python-modules/bugz/default.nix
+++ b/pkgs/by-name/py/pybugz/package.nix
@@ -1,10 +1,10 @@
 {
   lib,
-  buildPythonPackage,
   fetchFromGitHub,
+  python3Packages,
 }:
 
-buildPythonPackage {
+python3Packages.buildPythonApplication {
   pname = "bugz-0.9.3";
   version = "0.13";
 
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 83264b2be12a..bf272fbb5ec5 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -90,6 +90,7 @@ mapAliases ({
   boto = throw "boto was removed as it is deprecated upstream, had not been updated since 2018, and failed to build; please use boto3 and botocore"; # Added 2024-09-22
   bsblan = python-bsblan; # added 2022-11-04
   btchip = btchip-python; # added 2023-03-03
+  bugz = throw "use pkgs.pybugz instead"; # added 2024-12-31
   bugzilla = python-bugzilla; # added 2024-10-17
   buildbot = throw "use pkgs.buildbot instead"; # added 2022-04-07
   buildbot-ui = throw "use pkgs.buildbot-ui instead"; # added 2022-04-07
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 67e850576181..3de77224827f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1952,8 +1952,6 @@ self: super: with self; {
 
   bugwarrior = callPackage ../development/python-modules/bugwarrior { };
 
-  bugz = callPackage ../development/python-modules/bugz { };
-
   buienradar = callPackage ../development/python-modules/buienradar { };
 
   build = callPackage ../development/python-modules/build { };

From 5e540e33f035bdd700a1a768c099df2c880c86b8 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Tue, 31 Dec 2024 01:06:38 +0900
Subject: [PATCH 2/3] pybugz: refactor

---
 pkgs/by-name/py/pybugz/package.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/py/pybugz/package.nix b/pkgs/by-name/py/pybugz/package.nix
index 20b23147e2dc..e7d4170797a8 100644
--- a/pkgs/by-name/py/pybugz/package.nix
+++ b/pkgs/by-name/py/pybugz/package.nix
@@ -4,24 +4,30 @@
   python3Packages,
 }:
 
-python3Packages.buildPythonApplication {
-  pname = "bugz-0.9.3";
+python3Packages.buildPythonApplication rec {
+  pname = "pybugz";
   version = "0.13";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "williamh";
     repo = "pybugz";
-    rev = "0.13";
-    sha256 = "1nw07q7r078dp82rcrhvvnhmnaqjx6f8a6cdjgrsiy6fryrx9dwz";
+    tag = version;
+    hash = "sha256-n7fUs8/O+Kjzk40ZhZzpEitbod0bZpYFug0dkA8+gNs=";
   };
 
+  build-system = [ python3Packages.setuptools ];
+
+  pythonImportsCheck = [ "bugz" ];
+
+  # no tests
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/williamh/pybugz";
     description = "Command line interface for Bugzilla";
     mainProgram = "bugz";
-    license = licenses.gpl2;
+    license = lib.licenses.gpl2Plus;
     maintainers = [ ];
   };
 }

From 7d9d7d3a3c063faa824d814c486688f7da59aa9b Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Tue, 31 Dec 2024 01:07:26 +0900
Subject: [PATCH 3/3] pybugz: 0.13 -> 0.14

Diff: https://github.com/williamh/pybugz/compare/0.13...0.14
---
 pkgs/by-name/py/pybugz/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/py/pybugz/package.nix b/pkgs/by-name/py/pybugz/package.nix
index e7d4170797a8..d4f35743f7a8 100644
--- a/pkgs/by-name/py/pybugz/package.nix
+++ b/pkgs/by-name/py/pybugz/package.nix
@@ -6,17 +6,17 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "pybugz";
-  version = "0.13";
+  version = "0.14";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "williamh";
     repo = "pybugz";
     tag = version;
-    hash = "sha256-n7fUs8/O+Kjzk40ZhZzpEitbod0bZpYFug0dkA8+gNs=";
+    hash = "sha256-rhiCQPSh987QEM4aMd3R/7e6l+pm2eJDE7f5LckIuho=";
   };
 
-  build-system = [ python3Packages.setuptools ];
+  build-system = [ python3Packages.flit-core ];
 
   pythonImportsCheck = [ "bugz" ];