wakapi: 2.11.2 -> 2.12.0; modernize (NixOS#340779)

chriscoffee · Sep 26, 2024 · 8a7b35c · 8a7b35c
2 parents 769ffb7 + 7bee8c8
commit 8a7b35c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/pkgs/tools/misc/wakapi/default.nix → pkgs/by-name/wa/wakapi/package.nix b/pkgs/tools/misc/wakapi/default.nix → pkgs/by-name/wa/wakapi/package.nix
@@ -1,17 +1,23 @@
-{ lib, buildGoModule, fetchFromGitHub }:
-
-buildGoModule rec {
+{
+  lib,
+  buildGo123Module,
+  fetchFromGitHub,
+}:
+let
+  version = "2.12.0";
+in
+buildGo123Module {
   pname = "wakapi";
-  version = "2.11.2";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "muety";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-lBjYtb64blFUH/iW/SmC4A7nX9asokvsNKu6QVYgmZ8=";
+    repo = "wakapi";
+    rev = "refs/tags/${version}";
+    hash = "sha256-/aacT/VLA5S4PeGcxEGaCpgAw++b3VFD7T0CldZWcQI=";
   };
 
-  vendorHash = "sha256-Kt7RzAGZeLFhwvq+V6AK88rivqkoTE1Zep7NMh3BXXQ=";
+  vendorHash = "sha256-Q56Ud0MtkstB/dhn+QyAHTzIqHsmKvHEK+5PAt5lIMM=";
 
   # Not a go module required by the project, contains development utilities
   excludedPackages = [ "scripts" ];
@@ -24,12 +30,15 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://wakapi.dev/";
     changelog = "https://github.com/muety/wakapi/releases/tag/${version}";
     description = "Minimalist self-hosted WakaTime-compatible backend for coding statistics";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ t4ccer ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
+      t4ccer
+      isabelroses
+    ];
     mainProgram = "wakapi";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -13565,8 +13565,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) OpenCL;
   };
 
-  wakapi = callPackage ../tools/misc/wakapi { };
-
   wambo = callPackage ../development/tools/wambo { };
 
   weather = callPackage ../applications/misc/weather { };