From 34254e38eaf8deef928a5c614a8bfd7a79e0c0c1 Mon Sep 17 00:00:00 2001
From: Benjamin Manuel <ben@benmanuel.com>
Date: Thu, 10 Oct 2024 15:34:17 -0500
Subject: [PATCH 1/2] jfrog-cli: 2.56.1 -> 2.70.0, update go version

---
 pkgs/tools/misc/jfrog-cli/default.nix | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/pkgs/tools/misc/jfrog-cli/default.nix b/pkgs/tools/misc/jfrog-cli/default.nix
index ac6696bbb7fe..39a3e0ad8582 100644
--- a/pkgs/tools/misc/jfrog-cli/default.nix
+++ b/pkgs/tools/misc/jfrog-cli/default.nix
@@ -1,37 +1,22 @@
 { lib
-, buildGoModule
+, buildGo123Module
 , fetchFromGitHub
 , nodejs
 , nix-update-script
 }:
 
-buildGoModule rec {
+buildGo123Module rec {
   pname = "jfrog-cli";
-  version = "2.56.1";
+  version = "2.70.0";
 
   src = fetchFromGitHub {
     owner = "jfrog";
     repo = "jfrog-cli";
     rev = "refs/tags/v${version}";
-    hash = "sha256-oUICnpVHRNCauWEplz7xH6AdP6CbbYX/Uy/QUPjwGHc=";
+    hash = "sha256-ddwGmXb616kDNNNTNUykiEWX/2ihUpgetZ/va943RiQ=";
   };
 
-  vendorHash = "sha256-zQjOOUlqL0Mj2DKHiG9rOfu41SKMO7C99JBJDycXAs4=";
-
-  # Upgrade the Go version during the vendoring FOD build because it fails otherwise.
-  overrideModAttrs = _: {
-    preBuild = ''
-      substituteInPlace go.mod --replace-fail 'go 1.20' 'go 1.21'
-    '';
-    postInstall = ''
-      cp go.mod "$out/go.mod"
-    '';
-  };
-
-  # Copy the modified go.mod we got from the vendoring process.
-  preBuild = ''
-    cp vendor/go.mod go.mod
-  '';
+  vendorHash = "sha256-CT+flwvPC9IRWBMyCHtj25F/szeeno9OHMs3+D0J58g=";
 
   postPatch = ''
     # Patch out broken test cleanup.

From 25bea19c7130240c2ce607238c0fb92360c5179c Mon Sep 17 00:00:00 2001
From: Benjamin Manuel <ben@benmanuel.com>
Date: Thu, 10 Oct 2024 15:34:27 -0500
Subject: [PATCH 2/2] jfrog-cli: set proxyVendor due to case sensitivity issues
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Jonas Köhnen <mail@satoqz.net>
---
 pkgs/tools/misc/jfrog-cli/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/jfrog-cli/default.nix b/pkgs/tools/misc/jfrog-cli/default.nix
index 39a3e0ad8582..e3b06b2f76e4 100644
--- a/pkgs/tools/misc/jfrog-cli/default.nix
+++ b/pkgs/tools/misc/jfrog-cli/default.nix
@@ -16,7 +16,8 @@ buildGo123Module rec {
     hash = "sha256-ddwGmXb616kDNNNTNUykiEWX/2ihUpgetZ/va943RiQ=";
   };
 
-  vendorHash = "sha256-CT+flwvPC9IRWBMyCHtj25F/szeeno9OHMs3+D0J58g=";
+  proxyVendor = true;
+  vendorHash = "sha256-1xUCQF2UDHAmzibixv9pR6G2gvXxIStCyBuz608UpIQ=";
 
   postPatch = ''
     # Patch out broken test cleanup.