1 files changed, 17 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/development/tools/gron/default.nix b/nixpkgs/pkgs/development/tools/gron/default.nix
index 6d182b0b5f50..b8242cc3cd87 100644
--- a/nixpkgs/pkgs/development/tools/gron/default.nix
+++ b/nixpkgs/pkgs/development/tools/gron/default.nix
@@ -1,20 +1,25 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "gron";
-  version = "0.6.0";
-
-  owner = "tomnomnom";
-  repo = "gron";
-  goPackagePath = "github.com/${owner}/${repo}";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
-    inherit owner repo;
+    owner = "tomnomnom";
+    repo = "gron";
     rev = "v${version}";
-    sha256 = "05f3w4zr15wd7xk75l12y5kip4gnv719a2x9w2hy23q3pnss9wk0";
+    sha256 = "0qmzawkhg0qn9kxxrssbdjni2khvamhrcklv3yxc0ljmh77mh61m";
   };
 
-  goDeps = ./deps.nix;
+  patches = [
+    (fetchpatch {
+      name = "fix-inconsistent-vendoring.patch";
+      url = "https://github.com/tomnomnom/gron/pull/85/commits/d549a6cb68ed0e0ec7cc81d8275353acfe218725.patch";
+      sha256 = "1461v4f7w6q75l3988br0g1ynfhzsh34z38pd2w8fp57vrgkcfi5";
+    })
+  ];
+
+  vendorSha256 = "0va88c3rjlc2nbpqx4ila36rwrx57wcdhig4jp9q58vv4zqc2yxy";
 
   meta = with lib; {
     description = "Make JSON greppable!";
@@ -26,7 +31,7 @@ buildGoPackage rec {
     '';
     homepage = "https://github.com/tomnomnom/gron";
     license = licenses.mit;
-    maintainers = [ maintainers.fgaz ];
-    platforms = with platforms; linux ++ darwin;
+    maintainers = with maintainers; [ fgaz SuperSandro2000 ];
+    platforms = platforms.unix;
   };
 }