From afc4caf22f65d7d23f55bd7eac770528d1204c44 Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Fri, 27 May 2022 12:08:01 +0000
Subject: [PATCH] unconvert: unstable-2018-07-03 -> unstable-2020-02-28

---
 pkgs/development/tools/unconvert/default.nix | 25 ++++++-----------
 pkgs/development/tools/unconvert/deps.nix    | 29 --------------------
 2 files changed, 9 insertions(+), 45 deletions(-)
 delete mode 100644 pkgs/development/tools/unconvert/deps.nix

diff --git a/pkgs/development/tools/unconvert/default.nix b/pkgs/development/tools/unconvert/default.nix
index d3372ec1b6e..9541e7f78e3 100644
--- a/pkgs/development/tools/unconvert/default.nix
+++ b/pkgs/development/tools/unconvert/default.nix
@@ -1,31 +1,24 @@
+{ lib, buildGoModule, fetchFromGitHub }:
 
-{ buildGoPackage
-, lib
-, fetchFromGitHub
-}:
-
-buildGoPackage rec {
-  pname = "unconvert-unstable";
-  version = "2018-07-03";
-  rev = "1a9a0a0a3594e9363e49545fb6a4e24ac4c68b7b";
-
-  goPackagePath = "github.com/mdempsky/unconvert";
+buildGoModule rec {
+  pname = "unconvert";
+  version = "unstable-2020-02-28";
 
   src = fetchFromGitHub {
-    inherit rev;
-
     owner = "mdempsky";
     repo = "unconvert";
-    sha256 = "1ww5qk1cmdis4ig5mb0b0w7nzrf3734s51plmgdxqsr35y88q4p9";
+    rev = "95ecdbfc0b5f3e65790c43c77874ee5357ad8a8f";
+    sha256 = "sha256-jC2hbpGJeW9TBWIWdeLeGaoNdsm/gOKY4oaDsO5Fwlw=";
   };
 
-  goDeps = ./deps.nix;
+  vendorSha256 = "sha256-HmksSYA4974w+J/7PkMKEkXEfIkldj+kVywvsfLgE38=";
+
+  ldflags = [ "-s" "-w" ];
 
   meta = with lib; {
     description = "Remove unnecessary type conversions from Go source";
     homepage = "https://github.com/mdempsky/unconvert";
     license = licenses.bsd3;
     maintainers = with maintainers; [ kalbasit ];
-    platforms = platforms.linux ++ platforms.darwin;
   };
 }
diff --git a/pkgs/development/tools/unconvert/deps.nix b/pkgs/development/tools/unconvert/deps.nix
deleted file mode 100644
index 333ec7ca3b1..00000000000
--- a/pkgs/development/tools/unconvert/deps.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-[
-  {
-    goPackagePath = "github.com/kisielk/gotool";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kisielk/gotool";
-      rev = "80517062f582ea3340cd4baf70e86d539ae7d84d";
-      sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/text";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/text";
-      rev = "6f44c5a2ea40ee3593d98cdcc905cc1fdaa660e2";
-      sha256 = "00mwzxly5isgf0glz7k3k2dkyqkjfc4z55qxajx4lgcp3h8xn9xj";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/tools";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/tools";
-      rev = "96e9e165b75e735822645eff82850b08c377be36";
-      sha256 = "1zj9ck5sg9b0pphxybmvxf64hhcap7v7j37fx3v5aknf18crjjdg";
-    };
-  }
-]