From 65121a80804feaa02d4da23694b398fc737aca56 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Tue, 24 Dec 2024 10:43:21 +0100
Subject: [PATCH] ubports-click: Migrate to by-pkgs

---
 .../ub/ubports-click/package.nix}                | 16 +++++-----------
 pkgs/top-level/all-packages.nix                  |  2 --
 2 files changed, 5 insertions(+), 13 deletions(-)
 rename pkgs/{development/tools/click/default.nix => by-name/ub/ubports-click/package.nix} (94%)

diff --git a/pkgs/development/tools/click/default.nix b/pkgs/by-name/ub/ubports-click/package.nix
similarity index 94%
rename from pkgs/development/tools/click/default.nix
rename to pkgs/by-name/ub/ubports-click/package.nix
index c722dcfe7266..f00b1a302597 100644
--- a/pkgs/development/tools/click/default.nix
+++ b/pkgs/by-name/ub/ubports-click/package.nix
@@ -1,5 +1,4 @@
 {
-  buildPythonApplication,
   fetchFromGitLab,
   fetchpatch,
   gitUpdater,
@@ -19,17 +18,12 @@
   perl,
   pkg-config,
   properties-cpp,
-  pygobject3,
-  python-apt,
-  python-debian,
-  setuptools,
-  six,
-  unittestCheckHook,
+  python3Packages,
   vala,
   wrapGAppsHook3,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "click";
   version = "0.5.2";
   format = "other";
@@ -93,7 +87,7 @@ buildPythonApplication rec {
     properties-cpp
   ];
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with python3Packages; [
     python-debian
     pygobject3
     setuptools
@@ -102,10 +96,10 @@ buildPythonApplication rec {
   nativeCheckInputs = [
     dbus
     dpkg
-    unittestCheckHook
+    python3Packages.unittestCheckHook
   ];
 
-  checkInputs = [
+  checkInputs = with python3Packages; [
     python-apt
     six
   ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7057e2550531..b57fc088dbea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6957,8 +6957,6 @@ with pkgs;
     llvmPackages = llvmPackages_18;
   };
 
-  ubports-click = python3Packages.callPackage ../development/tools/click { };
-
   urweb = callPackage ../development/compilers/urweb {
     icu = icu67;
   };