From 30348fd24e823e94c9845c61b4a9f68b63e4d687 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Sun, 6 Apr 2025 13:05:22 +0800
Subject: [PATCH] anvil-editor: 0.4 -> 0.6

---
 pkgs/by-name/an/anvil-editor/extras.nix  | 14 ----------
 pkgs/by-name/an/anvil-editor/package.nix | 34 +++++++++++++-----------
 2 files changed, 19 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/by-name/an/anvil-editor/extras.nix

diff --git a/pkgs/by-name/an/anvil-editor/extras.nix b/pkgs/by-name/an/anvil-editor/extras.nix
deleted file mode 100644
index 4e130565fe4c..000000000000
--- a/pkgs/by-name/an/anvil-editor/extras.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  buildGoModule,
-  anvil-editor,
-}:
-
-buildGoModule {
-  inherit (anvil-editor) version src meta;
-
-  pname = "anvil-editor-extras";
-
-  modRoot = "anvil-extras";
-
-  vendorHash = "sha256-PH7HSMlCAHn4L1inJDbDcj6n+i6LXakIOqwdUkRjf9E=";
-}
diff --git a/pkgs/by-name/an/anvil-editor/package.nix b/pkgs/by-name/an/anvil-editor/package.nix
index 2466eb283aa0..918554209356 100644
--- a/pkgs/by-name/an/anvil-editor/package.nix
+++ b/pkgs/by-name/an/anvil-editor/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  buildGoModule,
+  buildGo123Module,
   fetchzip,
   pkg-config,
   copyDesktopItems,
@@ -12,26 +12,31 @@
   vulkan-headers,
   libGL,
   xorg,
-  callPackage,
   buildPackages,
-  anvilExtras ? callPackage ./extras.nix { },
 }:
 
-buildGoModule rec {
+buildGo123Module (finalAttrs: {
   pname = "anvil-editor";
-  version = "0.4";
+  version = "0.6";
 
   # has to update vendorHash of extra package manually
   # nixpkgs-update: no auto update
   src = fetchzip {
-    url = "https://anvil-editor.net/releases/anvil-src-v${version}.tar.gz";
-    hash = "sha256-0fi6UeppWC9KbWibjQYlPlRqsl9xsvij8YpJUS0S/wY=";
+    url = "https://anvil-editor.net/releases/anvil-src-v${finalAttrs.version}.tar.gz";
+    hash = "sha256-i0S5V3j6OPpu4z1ljDKP3WYa9L+EKwo/MBNgW2ENYk8=";
   };
 
   modRoot = "anvil/src/anvil";
 
   vendorHash = "sha256-1oFBV7D7JgOt5yYAxVvC4vL4ccFv3JrNngZbo+5pzrk=";
 
+  anvilExtras = buildGo123Module {
+    pname = "anvil-editor-extras";
+    inherit (finalAttrs) version src meta;
+    vendorHash = "sha256-4pfk5XuwDbCWFZIF+1l+dy8NfnGNjgHmSg9y6/RnTSo=";
+    modRoot = "anvil-extras";
+  };
+
   nativeBuildInputs =
     [
       pkg-config
@@ -60,8 +65,11 @@ buildGoModule rec {
       exec = "anvil";
       icon = "anvil";
       desktopName = "Anvil";
-      comment = meta.description;
-      categories = [ "TextEditor" ];
+      comment = finalAttrs.meta.description;
+      categories = [
+        "Utility"
+        "TextEditor"
+      ];
       startupWMClass = "anvil";
     })
   ];
@@ -76,13 +84,9 @@ buildGoModule rec {
         install -Dm644 anvil_''${square}x32.png $out/share/icons/hicolor/''${square}/apps/anvil.png
       done
     popd
-    cp ${anvilExtras}/bin/* $out/bin
+    cp ${finalAttrs.anvilExtras}/bin/* $out/bin
   '';
 
-  passthru = {
-    inherit anvilExtras;
-  };
-
   meta = {
     description = "Graphical, multi-pane tiling editor inspired by Acme";
     homepage = "https://anvil-editor.net";
@@ -91,4 +95,4 @@ buildGoModule rec {
     maintainers = with lib.maintainers; [ aleksana ];
     platforms = with lib.platforms; unix ++ windows;
   };
-}
+})