From 30aa1e15124b6f9ed311b817fe17de5fbe5d1f55 Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Fri, 27 May 2022 11:52:01 +0000
Subject: [PATCH] json2hcl: 0.0.6 -> 0.0.7

---
 pkgs/development/tools/json2hcl/default.nix | 22 ++++++++++-----------
 pkgs/development/tools/json2hcl/deps.nix    | 20 -------------------
 2 files changed, 11 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/development/tools/json2hcl/deps.nix

diff --git a/pkgs/development/tools/json2hcl/default.nix b/pkgs/development/tools/json2hcl/default.nix
index 4fe4e4c7eab3..7cf0e599cdc6 100644
--- a/pkgs/development/tools/json2hcl/default.nix
+++ b/pkgs/development/tools/json2hcl/default.nix
@@ -1,24 +1,24 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "json2hcl";
-  version = "0.0.6";
+  version = "0.0.7";
 
   src = fetchFromGitHub {
-    inherit owner;
+    owner = "kvz";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0knil88n2w41w3nzqz6ljgfjkl5r3x0bh7ifqgiyf6sin3pl4pn0";
+    sha256 = "sha256-H3jDZL/guVwJIZs7PD/rIvH3ZRYQzNTU/iUvy8aXs0o=";
   };
 
-  owner = "kvz";
-  goPackagePath = "github.com/${owner}/${pname}";
-  goDeps = ./deps.nix;
+  vendorSha256 = "sha256-GxYuFak+5CJyHgC1/RsS0ub84bgmgL+bI4YKFTb+vIY=";
+
+  ldflags = [ "-s" "-w" ];
 
   meta = with lib; {
     description = "Convert JSON to HCL, and vice versa";
-    license = with licenses; [ mit ];
-    maintainers = [ maintainers.matthewbauer ];
-    platforms = platforms.unix;
+    homepage = "https://github.com/kvz/json2hcl";
+    license = licenses.mit;
+    maintainers = with maintainers; [ matthewbauer ];
   };
 }
diff --git a/pkgs/development/tools/json2hcl/deps.nix b/pkgs/development/tools/json2hcl/deps.nix
deleted file mode 100644
index bb9df28ad87f..000000000000
--- a/pkgs/development/tools/json2hcl/deps.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-[
-  {
-    goPackagePath = "github.com/Acconut/hcl";
-    fetch = {
-      type = "git";
-      url = "https://github.com/Acconut/hcl";
-      rev = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8";
-      sha256 = "0db4lpqb5m130rmfy3s3gjjf4dxllypmyrzxv6ggqhkmwmc7w4mc";
-    };
-  }
-  {
-    goPackagePath = "github.com/hashicorp/hcl";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/hcl";
-      rev = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8";
-      sha256 = "0db4lpqb5m130rmfy3s3gjjf4dxllypmyrzxv6ggqhkmwmc7w4mc";
-    };
-  }
-]