From 0ae051ffcdce8cd89c3402d033add7ef96f9dd5d Mon Sep 17 00:00:00 2001
From: Andrew Kvalheim <andrew@kvalhe.im>
Date: Fri, 23 Aug 2024 14:36:23 -0700
Subject: [PATCH 1/3] gcalcli: format with nixfmt-rfc-style

---
 pkgs/applications/misc/gcalcli/default.nix | 26 ++++++++++++++++------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix
index 47950616578e..bdd8feb9cb2d 100644
--- a/pkgs/applications/misc/gcalcli/default.nix
+++ b/pkgs/applications/misc/gcalcli/default.nix
@@ -1,5 +1,10 @@
-{ stdenv, lib, fetchFromGitHub, python3
-, libnotify ? null }:
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  python3,
+  libnotify ? null,
+}:
 
 with python3.pkgs;
 
@@ -8,9 +13,9 @@ buildPythonApplication rec {
   version = "4.3.0";
 
   src = fetchFromGitHub {
-    owner  = "insanum";
-    repo   = pname;
-    rev    = "v${version}";
+    owner = "insanum";
+    repo = pname;
+    rev = "v${version}";
     sha256 = "0s5fhcmz3n0dwh3vkqr4aigi59q43v03ch5jhh6v75149icwr0df";
   };
 
@@ -20,8 +25,15 @@ buildPythonApplication rec {
   '';
 
   propagatedBuildInputs = [
-    python-dateutil gflags httplib2 parsedatetime six vobject
-    google-api-python-client oauth2client uritemplate
+    python-dateutil
+    gflags
+    httplib2
+    parsedatetime
+    six
+    vobject
+    google-api-python-client
+    oauth2client
+    uritemplate
     libnotify
   ];
 

From 02f40d422cef71c7699bae5ac3c06fc6bdeb0a87 Mon Sep 17 00:00:00 2001
From: Andrew Kvalheim <andrew@kvalhe.im>
Date: Fri, 23 Aug 2024 14:38:24 -0700
Subject: [PATCH 2/3] gcalcli: enable tests

Tests were added in 4.0.0 and should have been enabled in #55597.
---
 pkgs/applications/misc/gcalcli/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix
index bdd8feb9cb2d..759d4983921e 100644
--- a/pkgs/applications/misc/gcalcli/default.nix
+++ b/pkgs/applications/misc/gcalcli/default.nix
@@ -37,8 +37,7 @@ buildPythonApplication rec {
     libnotify
   ];
 
-  # There are no tests as of 4.0.0a4
-  doCheck = false;
+  nativeCheckInputs = [ pytestCheckHook ];
 
   meta = with lib; {
     description = "CLI for Google Calendar";

From fcfb3a1106c37d2dc55322b1f01d6d8a8f97d71f Mon Sep 17 00:00:00 2001
From: Andrew Kvalheim <andrew@kvalhe.im>
Date: Fri, 23 Aug 2024 18:45:48 -0700
Subject: [PATCH 3/3] gcalcli: normalize source
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Robert Schütz <mail@dotlambda.de>
---
 pkgs/applications/misc/gcalcli/default.nix | 23 +++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix
index 759d4983921e..6a55f0ff7420 100644
--- a/pkgs/applications/misc/gcalcli/default.nix
+++ b/pkgs/applications/misc/gcalcli/default.nix
@@ -2,29 +2,30 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  python3,
-  libnotify ? null,
+  python3Packages,
+  libnotify,
 }:
 
-with python3.pkgs;
-
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "gcalcli";
   version = "4.3.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "insanum";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "0s5fhcmz3n0dwh3vkqr4aigi59q43v03ch5jhh6v75149icwr0df";
+    repo = "gcalcli";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-roHMWUwklLMNhLJANsAeBKcSX1Qk47kH5A3Y8SuDrmg=";
   };
 
   postPatch = lib.optionalString stdenv.isLinux ''
     substituteInPlace gcalcli/argparsers.py \
-      --replace "'notify-send" "'${libnotify}/bin/notify-send"
+      --replace-fail "'notify-send" "'${lib.getExe libnotify}"
   '';
 
-  propagatedBuildInputs = [
+  build-system = with python3Packages; [ setuptools ];
+
+  dependencies = with python3Packages; [
     python-dateutil
     gflags
     httplib2
@@ -37,7 +38,7 @@ buildPythonApplication rec {
     libnotify
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
 
   meta = with lib; {
     description = "CLI for Google Calendar";