From 4f7f85c10246deb78b577fa5f11214f21e33b1ad Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Mon, 17 Oct 2022 03:15:25 +0000
Subject: [PATCH] spicy: unstable-2020-02-21 -> 0.6.2

---
 pkgs/development/tools/spicy/default.nix | 18 ++++----
 pkgs/development/tools/spicy/deps.nix    | 56 ------------------------
 2 files changed, 9 insertions(+), 65 deletions(-)
 delete mode 100644 pkgs/development/tools/spicy/deps.nix

diff --git a/pkgs/development/tools/spicy/default.nix b/pkgs/development/tools/spicy/default.nix
index 691a105941a9..65385d7fe139 100644
--- a/pkgs/development/tools/spicy/default.nix
+++ b/pkgs/development/tools/spicy/default.nix
@@ -1,19 +1,19 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "spicy";
-  version = "unstable-2020-02-21";
-
-  goPackagePath = "github.com/trhodeos/spicy";
+  version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "trhodeos";
     repo = "spicy";
-    rev = "47409fb73e0b20b323c46cc06a3858d0a252a817";
-    sha256 = "022r8klmr21vaz5qd72ndrzj7pyqpfxc3jljz7nzsa50fjf82c3a";
+    rev = "v${version}";
+    sha256 = "sha256-TodMm4UbnLB+LiyfPVXT7bcVLbyBFbGoOYQSsz3IMfM=";
   };
 
-  goDeps = ./deps.nix;
+  vendorSha256 = "sha256-uy33vfsvyLCep1aN8qO0BMmpPylhzTLhosjjD5ghmHE=";
+
+  ldflags = [ "-s" "-w" ];
 
   meta = with lib; {
     description = "A Nintendo 64 segment assembler";
@@ -23,6 +23,6 @@ buildGoPackage rec {
     '';
     homepage = "https://github.com/trhodeos/spicy";
     license = licenses.mit;
-    maintainers = [ maintainers._414owen];
+    maintainers = with maintainers; [ _414owen ];
   };
 }
diff --git a/pkgs/development/tools/spicy/deps.nix b/pkgs/development/tools/spicy/deps.nix
deleted file mode 100644
index 9532b01decb4..000000000000
--- a/pkgs/development/tools/spicy/deps.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-[
-  {
-    goPackagePath = "github.com/alecthomas/participle";
-    fetch = {
-      type = "git";
-      url = "https://github.com/alecthomas/participle.git";
-      rev = "fed0e8fbb638b11091014aa838748210dc9ff576";
-      sha256 = "0yhhm42lis8ak9m6x6aai280xq0652vcq5v17pibbf74dalxyims";
-    };
-  }
-  {
-    goPackagePath = "github.com/sirupsen/logrus";
-    fetch = {
-      type = "git";
-      url = "https://github.com/sirupsen/logrus.git";
-      rev = "f104497f2b2129ab888fd274891f3a278756bcde";
-      sha256 = "0gr2c7s3ffdaynzn1zplp79zz16qgqpnsq2z9zg79wxksq5mz5l1";
-    };
-  }
-  {
-    goPackagePath = "github.com/ogier/pflag";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ogier/pflag.git";
-      rev = "73e519546fc0bce0c395610afcf6aa4e5aec88eb";
-      sha256 = "114zpgl6l47gsz0sifpq62hi2i6k0ra9hi8wx7d39giablf9i4ii";
-    };
-  }
-  {
-    goPackagePath = "github.com/trhodeos/n64rom";
-    fetch = {
-      type = "git";
-      url = "https://github.com/trhodeos/n64rom.git";
-      rev = "504dba7b4d4675bd3396c052d64016c5725c2f5e";
-      sha256 = "01hybm8nxh1lym0wc9sxrms3wyqhhs0dm1a2nwz6xc60lkjcp8kb";
-    };
-  }
-  {
-    goPackagePath = "github.com/trhodeos/ecoff";
-    fetch = {
-      type = "git";
-      url = "https://github.com/trhodeos/ecoff.git";
-      rev = "e54570a0fac23c0fa7f605681345611f345ce0f6";
-      sha256 = "0pc0yj7hy43m00br0q0f1y5a3bc3a134imcyy2jvzim45g6g12kj";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/sys";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/sys";
-      rev = "9a76102bfb4322425a1228caa377974426e82c84";
-      sha256 = "07qn19yla2w604p3dc8h1c75xj2pxc4fajvg0mf0d4c72d5qiss4";
-    };
-  }
-]