From ed9a5b9855b1c9e568df0c67bb9af8d8cfd812f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 25 Mar 2025 12:16:01 -0700
Subject: [PATCH] goobook: move to top-level

---
 .../go/goobook/package.nix}                   | 45 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 -
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 4 files changed, 20 insertions(+), 30 deletions(-)
 rename pkgs/{development/python-modules/goobook/default.nix => by-name/go/goobook/package.nix} (54%)

diff --git a/pkgs/development/python-modules/goobook/default.nix b/pkgs/by-name/go/goobook/package.nix
similarity index 54%
rename from pkgs/development/python-modules/goobook/default.nix
rename to pkgs/by-name/go/goobook/package.nix
index 921c08f8bbec..b48bb251f40d 100644
--- a/pkgs/development/python-modules/goobook/default.nix
+++ b/pkgs/by-name/go/goobook/package.nix
@@ -1,46 +1,39 @@
 {
   lib,
-  buildPythonPackage,
   fetchFromGitLab,
-  pythonOlder,
   docutils,
   installShellFiles,
-  poetry-core,
-  google-api-python-client,
-  simplejson,
-  oauth2client,
-  setuptools,
-  pyxdg,
+  python3Packages,
 }:
 
-buildPythonPackage rec {
+python3Packages.buildPythonApplication rec {
   pname = "goobook";
   version = "3.5.2";
-
-  format = "pyproject";
-  disabled = pythonOlder "3.7";
+  pyproject = true;
 
   src = fetchFromGitLab {
     owner = "goobook";
     repo = "goobook";
-    rev = version;
+    tag = version;
     hash = "sha256-gWmeRlte+lP7VP9gbPuMHwhVkx91wQ0GpQFQRLJ29h8=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace 'setuptools = "^62.6.0"' 'setuptools = "*"' \
-      --replace 'google-api-python-client = "^1.7.12"' 'google-api-python-client = "*"' \
-      --replace 'pyxdg = "^0.28"' 'pyxdg = "*"'
-  '';
+  build-system = with python3Packages; [
+    poetry-core
+  ];
 
   nativeBuildInputs = [
     docutils
     installShellFiles
-    poetry-core
   ];
 
-  propagatedBuildInputs = [
+  pythonRelaxDeps = [
+    "google-api-python-client"
+    "pyxdg"
+    "setuptools"
+  ];
+
+  dependencies = with python3Packages; [
     google-api-python-client
     simplejson
     oauth2client
@@ -58,7 +51,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "goobook" ];
 
-  meta = with lib; {
+  meta = {
     description = "Access your Google contacts from the command line";
     mainProgram = "goobook";
     longDescription = ''
@@ -66,9 +59,9 @@ buildPythonPackage rec {
       from the command-line and from MUAs such as Mutt.
       It can be used from Mutt the same way as abook.
     '';
-    homepage = "https://pypi.org/project/goobook/";
-    changelog = "https://gitlab.com/goobook/goobook/-/blob/${version}/CHANGES.rst";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ primeos ];
+    homepage = "https://gitlab.com/goobook/goobook";
+    changelog = "https://gitlab.com/goobook/goobook/-/blob/${src.tag}/CHANGES.rst";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ primeos ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3d8891d808f0..f4ceab0a7b79 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14043,8 +14043,6 @@ with pkgs;
 
   luddite = with python3Packages; toPythonApplication luddite;
 
-  goobook = with python3Packages; toPythonApplication goobook;
-
   lumail = callPackage ../applications/networking/mailreaders/lumail {
     lua = lua5_1;
   };
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 316da20d8088..1654fd55c96e 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -272,6 +272,7 @@ mapAliases ({
   glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28
   glasgow = throw "glasgow has been promoted to a top-level attribute name: `pkgs.glasgow`"; # added 2023-02-05
   globre = throw "globre was removed, because it was disabled on all python version since 3.7 and last updated in 2020."; # added 2024-05-13
+  goobook = throw "goobook has been promoted to a top-level attribute name: `pkgs.goobook`"; # Added 2025-03-25
   google-reauth = throw "google-reauth has been removed because the upstream repository was archived in 2023"; # Added 2024-10-04
   google_api_python_client = google-api-python-client; # added 2021-03-19
   googleapis_common_protos = googleapis-common-protos; # added 2021-03-19
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9abac7174fad..07bbcf46b6d0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5594,8 +5594,6 @@ self: super: with self; {
 
   gocardless-pro = callPackage ../development/python-modules/gocardless-pro { };
 
-  goobook = callPackage ../development/python-modules/goobook { };
-
   goocalendar = callPackage ../development/python-modules/goocalendar { };
 
   goodwe = callPackage ../development/python-modules/goodwe { };