From 9a584068b438be375dc258adbe010bdbdf70eab1 Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Mon, 27 Feb 2023 05:20:31 +0000
Subject: [PATCH] wakatime: 1.61.0 -> 1.68.1

---
 pkgs/tools/misc/wakatime/default.nix | 43 +++++++++++++++++++++-------
 pkgs/top-level/all-packages.nix      |  2 +-
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix
index db52bae523f6..ed0a8cba8d2d 100644
--- a/pkgs/tools/misc/wakatime/default.nix
+++ b/pkgs/tools/misc/wakatime/default.nix
@@ -1,28 +1,49 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, testers, wakatime }:
 
 buildGoModule rec {
   pname = "wakatime";
-  version = "1.61.0";
+  version = "1.68.1";
 
   src = fetchFromGitHub {
     owner = "wakatime";
     repo = "wakatime-cli";
     rev = "v${version}";
-    sha256 = "sha256-pd6kK1591dLEau9oKdd+A2y8rRerFQ+z2yY+/BsNUAI=";
+    hash = "sha256-Q9LmQEcw3oehGE4DXIzQERNEZgwRzb1o8/qGOC1JGZc=";
   };
 
-  vendorHash = "sha256-R+VqIw8fztBH2WTf5vjqtMfASNnOTjA3DEndXYyyMi4=";
+  vendorHash = "sha256-KY4niegPSLOILZgC7H7TFK6r5v3mjN9sUA5c8AuaOys=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/wakatime/wakatime-cli/pkg/version.Version=${version}"
+  ];
+
+  preCheck =
+    let
+      skippedTests = [
+        "TestFileExperts"
+        "TestSendHeartbeats"
+        "TestSendHeartbeats_ExtraHeartbeats"
+        "TestSendHeartbeats_IsUnsavedEntity"
+        "TestSendHeartbeats_NonExistingExtraHeartbeatsEntity"
+      ];
+    in
+    ''
+      # Disable tests requiring network
+      buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]")
+    '';
+
+  passthru.tests.version = testers.testVersion {
+    package = wakatime;
+    command = "HOME=$(mktemp -d) wakatime-cli --version";
+  };
 
   meta = with lib; {
-    inherit (src.meta) homepage;
+    homepage = "https://wakatime.com/";
     description = "WakaTime command line interface";
-    longDescription = ''
-      Command line interface to WakaTime used by all WakaTime text editor
-      plugins. You shouldn't need to directly use this package unless you
-      are building your own plugin or your text editor's plugin asks you
-      to install the wakatime CLI interface manually.
-    '';
     license = licenses.bsd3;
+    maintainers = with maintainers; [ aaronjheng ];
     mainProgram = "wakatime-cli";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 985ec28e99b1..4e79260adc87 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13175,7 +13175,7 @@ with pkgs;
 
   wakapi = callPackage ../tools/misc/wakapi { };
 
-  wakatime = python2Packages.callPackage ../tools/misc/wakatime { };
+  wakatime = callPackage ../tools/misc/wakatime { };
 
   wambo = callPackage ../development/tools/wambo { };