From 4f18481878be17e7b6d65b31810c988ecb13ab5a Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Mon, 21 Nov 2022 11:34:23 +0000
Subject: [PATCH] harmonist: use buildGoModule

---
 pkgs/games/harmonist/default.nix | 15 +++---
 pkgs/games/harmonist/deps.nix    | 92 --------------------------------
 2 files changed, 6 insertions(+), 101 deletions(-)
 delete mode 100644 pkgs/games/harmonist/deps.nix

diff --git a/pkgs/games/harmonist/default.nix b/pkgs/games/harmonist/default.nix
index ae7d6644ce75..9b132d4a862b 100644
--- a/pkgs/games/harmonist/default.nix
+++ b/pkgs/games/harmonist/default.nix
@@ -1,20 +1,17 @@
-{lib, fetchurl, buildGoPackage}:
-
-buildGoPackage rec {
+{lib, fetchurl, buildGoModule}:
 
+buildGoModule rec {
   pname = "harmonist";
   version = "0.4.1";
 
-  goPackagePath = "git.tuxfamily.org/harmonist/harmonist.git";
-
   src = fetchurl {
     url = "https://download.tuxfamily.org/harmonist/releases/${pname}-${version}.tar.gz";
-    sha256 = "19abqmzz9nnlnizkskvlkcpahk8lzrl57mgg6dfxn25l55vfznws";
+    hash = "sha256-mtvvdim0CNtdM+/VU2j+FE2oLpt0Tz1/tNTa9H/FS6U=";
   };
 
-  goDeps = ./deps.nix;
+  vendorHash = "sha256-SrvJXTyLtPZ2PyhSZz/gJvuso9r7e5NbGe7EJRf2XlI=";
 
-  postInstall = "mv $out/bin/harmonist.git $out/bin/harmonist";
+  ldflags = [ "-s" "-w" ];
 
   meta = with lib; {
     description = "A stealth coffee-break roguelike game";
@@ -29,6 +26,6 @@ buildGoPackage rec {
     homepage = "https://harmonist.tuxfamily.org/";
     license = licenses.isc;
     platforms = platforms.unix;
-    maintainers = with maintainers; [];
+    maintainers = with maintainers; [ aaronjheng ];
   };
 }
diff --git a/pkgs/games/harmonist/deps.nix b/pkgs/games/harmonist/deps.nix
deleted file mode 100644
index 8823ada42d43..000000000000
--- a/pkgs/games/harmonist/deps.nix
+++ /dev/null
@@ -1,92 +0,0 @@
-[
-  {
-    goPackagePath = "github.com/mattn/go-runewidth";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mattn/go-runewidth";
-      rev = "59616a248b91ae20bf3eb93636a24c87d9ce6cea";
-      sha256 = "0jh9552ppqvkdfni7x623n0x5mbiaqqhjhmr0zkh28x56k4ysii4";
-    };
-  }
-  {
-    goPackagePath = "github.com/anaseto/gruid";
-    fetch = {
-      type = "git";
-      url = "https://github.com/anaseto/gruid";
-      rev = "976b3db42d20169cf44eca1406b3cff104a80979";
-      sha256 = "0rvsavkvg2hziwdh8sjk3n5v92m5mfjb8v9m7ch22maxfwq5kv6y";
-    };
-  }
-  {
-    goPackagePath = "github.com/anaseto/gruid-tcell";
-    fetch = {
-      type = "git";
-      url = "https://github.com/anaseto/gruid-tcell";
-      rev = "4878126bb96fa0e529ec22c700d03b030e5c3bf7";
-      sha256 = "0spm9gqsdan1mvbpypywid00vvl92rii8akhmjdm8l1r9qk7a3i4";
-    };
-  }
-  {
-    goPackagePath = "github.com/gdamore/tcell";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gdamore/tcell";
-      rev = "f4d402906fa3d330545365abbf970c048e677b35";
-      sha256 = "1wcbm5vxrh5s8g4mas32y3n0pjvfmngmc2yrxg1yn4333mh9mgf3";
-    };
-  }
-  {
-    goPackagePath = "github.com/lucasb-eyer/go-colorful";
-    fetch = {
-      type = "git";
-      url = "https://github.com/lucasb-eyer/go-colorful";
-      rev = "4d8f45c41ac988423342507a1fb6050239b5a742";
-      sha256 = "1p2rl5353fi4p3l0bz3dg0lifhxqj8hjyh1b6z1cn286qxwnnnm8";
-    };
-  }
- {
-    goPackagePath = "github.com/gdamore/encoding";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gdamore/encoding";
-      rev = "6289cdc94c00ac4aa177771c5fce7af2f96b626d";
-      sha256 = "1vmm5zll92i2fm4ajqx0gyx0p9j36496x5nabi3y0x7h0inv0pk9";
-    };
-  }
-  {
-    goPackagePath = "github.com/rivo/uniseg";
-    fetch = {
-      type = "git";
-      url = "https://github.com/rivo/uniseg";
-      rev = "75711fccf6a3e85bc74c241e2dddd06a9bc9e53d";
-      sha256 = "0j7h22vfmjj562vr8gpsyrkrwp1pq9ayh5fylv24skxb467g9f0q";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/term/";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/term";
-      rev = "6a3ed077a48de71621ad530f9078fffa0bc0ce32";
-      sha256 = "0xni8n3q2r9f6fk223b2c1702fvqmgz7vk6738asri3fwby583q5";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/text/";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/text";
-      rev = "e3aa4adf54f644ca0cb35f1f1fb19b239c40ef04";
-      sha256 = "03q5kjmp4sfp5yzwb76lyf8cs9qca26vlwry5qgqf8w03rq700hf";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/sys/";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/sys";
-      rev = "88b6017d06564827ae436c619d52116f470a3611";
-      sha256 = "14n7b6833lhxjzsgvi14c6c8nfiqqb4r71wvv4z5ksyssi95i3r7";
-    };
-  }
-]