From 9283bebab4c2e17eb01e4c2bde29af698f302914 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Thu, 16 May 2024 13:53:33 +0200
Subject: [PATCH 1/2] wakatime: 1.73.0 -> 1.90.0

---
 pkgs/tools/misc/wakatime/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix
index d27cfa112afc..1d8aeec10b84 100644
--- a/pkgs/tools/misc/wakatime/default.nix
+++ b/pkgs/tools/misc/wakatime/default.nix
@@ -1,17 +1,17 @@
-{ lib, buildGoModule, fetchFromGitHub, testers, wakatime }:
+{ lib, buildGo122Module, fetchFromGitHub, testers, wakatime }:
 
-buildGoModule rec {
+buildGo122Module rec {
   pname = "wakatime";
-  version = "1.73.0";
+  version = "1.90.0";
 
   src = fetchFromGitHub {
     owner = "wakatime";
     repo = "wakatime-cli";
     rev = "v${version}";
-    hash = "sha256-EUZgYRsQRqtp0yiqNYex+ILSZwGEdO4BhciEgUVdui4=";
+    hash = "sha256-A2YrDrXmMR4BJUOYuo3h3Pa5HqyYSoDr/qdH54INU3w=";
   };
 
-  vendorHash = "sha256-SlYYrlRDBvhNm2BxemK9HzzsqM/RGH/sDQXpoGEY8rw=";
+  vendorHash = "sha256-pejrUFcv9c4ZAE3Cuw7uytc1T2pr7SOZNJ/Wr8K+fas=";
 
   ldflags = [
     "-s"
@@ -28,6 +28,7 @@ buildGoModule rec {
         "TestSendHeartbeats_ExtraHeartbeats"
         "TestSendHeartbeats_IsUnsavedEntity"
         "TestSendHeartbeats_NonExistingExtraHeartbeatsEntity"
+        "TestFileExperts_Err(Auth|Api|BadRequest)"
 
         # Flaky tests
         "TestLoadParams_ApiKey_FromVault_Err_Darwin"

From 337284ccb99cb416a46c5042fd08039c5163cce1 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Thu, 16 May 2024 13:55:02 +0200
Subject: [PATCH 2/2] wakatime: migrate to by-name

---
 .../default.nix => by-name/wa/wakatime/package.nix}       | 8 +++++++-
 pkgs/top-level/all-packages.nix                           | 2 --
 2 files changed, 7 insertions(+), 3 deletions(-)
 rename pkgs/{tools/misc/wakatime/default.nix => by-name/wa/wakatime/package.nix} (94%)

diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/by-name/wa/wakatime/package.nix
similarity index 94%
rename from pkgs/tools/misc/wakatime/default.nix
rename to pkgs/by-name/wa/wakatime/package.nix
index 1d8aeec10b84..eb62951df210 100644
--- a/pkgs/tools/misc/wakatime/default.nix
+++ b/pkgs/by-name/wa/wakatime/package.nix
@@ -1,4 +1,10 @@
-{ lib, buildGo122Module, fetchFromGitHub, testers, wakatime }:
+{
+  lib,
+  buildGo122Module,
+  fetchFromGitHub,
+  testers,
+  wakatime,
+}:
 
 buildGo122Module rec {
   pname = "wakatime";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 05aca9f4018f..9af20ac2b5eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14211,8 +14211,6 @@ with pkgs;
 
   wakapi = callPackage ../tools/misc/wakapi { };
 
-  wakatime = callPackage ../tools/misc/wakatime { };
-
   wambo = callPackage ../development/tools/wambo { };
 
   weather = callPackage ../applications/misc/weather { };