From b2cf4eb0d5336b294261a7630d3f264ec9d7e59d Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Fri, 28 Oct 2022 09:30:40 +0000
Subject: [PATCH] go-jsonnet: 0.18.0 -> 0.19.1

---
 .../compilers/go-jsonnet/default.nix          | 30 +++++++------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/compilers/go-jsonnet/default.nix b/pkgs/development/compilers/go-jsonnet/default.nix
index 0fb18de59f2..388059f2fc4 100644
--- a/pkgs/development/compilers/go-jsonnet/default.nix
+++ b/pkgs/development/compilers/go-jsonnet/default.nix
@@ -1,37 +1,30 @@
-{ lib
-, buildGoModule
-, fetchFromGitHub
-, fetchpatch
-, testers
-}:
+{ lib, buildGoModule, fetchFromGitHub, fetchpatch, testers, go-jsonnet }:
 
-let self = buildGoModule rec {
+buildGoModule rec {
   pname = "go-jsonnet";
-  version = "0.18.0";
+  version = "0.19.1";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-o/IjXskGaMhvQmTsAS745anGBMI2bwHf/EOEp57H8LU=";
+    hash = "sha256-FgQYnas0qkIedRAA8ApZXLzEylg6PS6+8zzl7j+yOeI=";
   };
 
+  vendorSha256 = "sha256-j1fTOUpLx34TgzW94A/BctLrg9XoTtb3cBizhVJoEEI=";
+
   patches = [
+    # See https://github.com/google/go-jsonnet/issues/653.
     (fetchpatch {
-      name = "update-x-sys-for-go-1.18-on-aarch64-darwin.patch";
-      url = "https://github.com/google/go-jsonnet/commit/7032dd729f7e684dcfb2574f4fe99499165ef9cb.patch";
-      hash = "sha256-emUcuE9Q4qkXFXLyLvLHjzrKAaQhjcSWLNafABvHxhM=";
+      url = "https://github.com/google/go-jsonnet/commit/5712f2ed2c8dfa685e4f1234eefc7690a580af6f.patch";
+      hash = "sha256-/+6BlAaul4FoD7pq7yAy1xG78apEBuH2LC4fsfbugFQ=";
     })
   ];
 
-  vendorHash = "sha256-H4vLVXpuPkECB15LHoS9N9IwUD7Fzccshwbo5hjeXXc=";
-
-  doCheck = false;
-
   subPackages = [ "cmd/jsonnet*" ];
 
   passthru.tests.version = testers.testVersion {
-    package = self;
+    package = go-jsonnet;
     version = "v${version}";
   };
 
@@ -42,5 +35,4 @@ let self = buildGoModule rec {
     maintainers = with maintainers; [ nshalman aaronjheng ];
     mainProgram = "jsonnet";
   };
-};
-in self
+}