From 4d12c4360bc05dac2921087082ad1fca8844a783 Mon Sep 17 00:00:00 2001
From: JuliusFreudenberger <julius+git@jfreudenberger.de>
Date: Mon, 7 Apr 2025 13:19:38 +0300
Subject: [PATCH 1/3] jd-diff-patch: modernize

---
 pkgs/by-name/jd/jd-diff-patch/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/jd/jd-diff-patch/package.nix b/pkgs/by-name/jd/jd-diff-patch/package.nix
index 873e8510e699..51642511f336 100644
--- a/pkgs/by-name/jd/jd-diff-patch/package.nix
+++ b/pkgs/by-name/jd/jd-diff-patch/package.nix
@@ -4,15 +4,15 @@
   fetchFromGitHub,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "jd-diff-patch";
   version = "2.1.2";
 
   src = fetchFromGitHub {
     owner = "josephburnett";
     repo = "jd";
-    rev = "v${version}";
-    sha256 = "sha256-chCxbbRZEE29KVnTQWID889kJ2H4qJGVL+vsxzr6VtA=";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-chCxbbRZEE29KVnTQWID889kJ2H4qJGVL+vsxzr6VtA=";
   };
 
   # not including web ui
@@ -23,13 +23,13 @@ buildGoModule rec {
 
   vendorHash = null;
 
-  meta = with lib; {
+  meta = {
     description = "Commandline utility and Go library for diffing and patching JSON values";
     homepage = "https://github.com/josephburnett/jd";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       bryanasdev000
     ];
     mainProgram = "jd";
   };
-}
+})

From 6893aa3cae43ee5ff609f342b3d9ae21fa140534 Mon Sep 17 00:00:00 2001
From: JuliusFreudenberger <julius+git@jfreudenberger.de>
Date: Mon, 7 Apr 2025 13:19:56 +0300
Subject: [PATCH 2/3] jd-diff-patch: add juliusfreudenberger as maintainer

---
 pkgs/by-name/jd/jd-diff-patch/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/jd/jd-diff-patch/package.nix b/pkgs/by-name/jd/jd-diff-patch/package.nix
index 51642511f336..cab70e23f7e6 100644
--- a/pkgs/by-name/jd/jd-diff-patch/package.nix
+++ b/pkgs/by-name/jd/jd-diff-patch/package.nix
@@ -29,6 +29,7 @@ buildGoModule (finalAttrs: {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       bryanasdev000
+      juliusfreudenberger
     ];
     mainProgram = "jd";
   };

From dd2880a5b2b0e57b5665a3e38ee5aa00100aa291 Mon Sep 17 00:00:00 2001
From: JuliusFreudenberger <julius+git@jfreudenberger.de>
Date: Mon, 7 Apr 2025 13:20:16 +0300
Subject: [PATCH 3/3] jd-diff-patch: 2.1.2 -> 2.2.2

Upstream does not ship a vendor directory anymore and moved the v2
sources into a subdirectory.
---
 pkgs/by-name/jd/jd-diff-patch/package.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/jd/jd-diff-patch/package.nix b/pkgs/by-name/jd/jd-diff-patch/package.nix
index cab70e23f7e6..6468239793fd 100644
--- a/pkgs/by-name/jd/jd-diff-patch/package.nix
+++ b/pkgs/by-name/jd/jd-diff-patch/package.nix
@@ -6,22 +6,24 @@
 
 buildGoModule (finalAttrs: {
   pname = "jd-diff-patch";
-  version = "2.1.2";
+  version = "2.2.2";
 
   src = fetchFromGitHub {
     owner = "josephburnett";
     repo = "jd";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-chCxbbRZEE29KVnTQWID889kJ2H4qJGVL+vsxzr6VtA=";
+    hash = "sha256-sA3NzCl9dR6cZnZNFa7Sqb1KUPSWA1h8ReZqR+SRjgk";
   };
 
+  sourceRoot = "${finalAttrs.src.name}/v2";
+
   # not including web ui
   excludedPackages = [
     "gae"
     "pack"
   ];
 
-  vendorHash = null;
+  vendorHash = "sha256-Ol+9YwtJ5P6au1aW2ss9mrU9l5G3iBviX5q1qC0K+vc=";
 
   meta = {
     description = "Commandline utility and Go library for diffing and patching JSON values";