From dceb3ba5d1e6533ebfe7a24f216ca57ee6b10192 Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Thu, 14 Dec 2023 15:05:23 +0100
Subject: [PATCH 1/5] gofumpt: 0.3.1 -> 0.4.0

---
 pkgs/development/tools/gofumpt/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/gofumpt/default.nix b/pkgs/development/tools/gofumpt/default.nix
index 6c6ca492cbe7..fda21d661e13 100644
--- a/pkgs/development/tools/gofumpt/default.nix
+++ b/pkgs/development/tools/gofumpt/default.nix
@@ -2,16 +2,21 @@
 
 buildGoModule rec {
   pname = "gofumpt";
-  version = "0.3.1";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "mvdan";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-uXRYVLFDyRZ83mth8Fh+MG9fNv2lUfE3BTljM9v9rjI=";
+    sha256 = "sha256-8wTS8CAAL65VSN+sM275W5eWDivp9qOMbAQmFTCKUI0=";
   };
 
-  vendorHash = "sha256-Il1E1yOejLEdKRRMqelGeJbHRjx4qFymf7N98BEdFzg=";
+  vendorHash = "sha256-SFKS9lYPiZNu1w20Z7UEp2d0xjc5kuqVEADZaUF1Gyc=";
+
+  checkFlags = [
+    # Requires network access (Error: module lookup disabled by GOPROXY=off).
+    "-skip=^TestScript/diagnose$"
+  ];
 
   meta = with lib; {
     description = "A stricter gofmt";

From 6447db791a14802658d6ed0014c0e937315020c3 Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Thu, 14 Dec 2023 15:09:05 +0100
Subject: [PATCH 2/5] gofumpt: 0.4.0 -> 0.5.0

---
 pkgs/development/tools/gofumpt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/gofumpt/default.nix b/pkgs/development/tools/gofumpt/default.nix
index fda21d661e13..2e1f95e24518 100644
--- a/pkgs/development/tools/gofumpt/default.nix
+++ b/pkgs/development/tools/gofumpt/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "gofumpt";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "mvdan";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-8wTS8CAAL65VSN+sM275W5eWDivp9qOMbAQmFTCKUI0=";
+    hash = "sha256-3buGLgxAaAIwLXWLpX+K7VRx47DuvUI4W8vw4TuXSts=";
   };
 
-  vendorHash = "sha256-SFKS9lYPiZNu1w20Z7UEp2d0xjc5kuqVEADZaUF1Gyc=";
+  vendorHash = "sha256-W0WKEQgOIFloWsB4E1RTICVKVlj9ChGSpo92X+bjNEk=";
 
   checkFlags = [
     # Requires network access (Error: module lookup disabled by GOPROXY=off).

From 4016a8de10b33d08c37e5fd8e19dab4f717bc546 Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Thu, 14 Dec 2023 15:13:21 +0100
Subject: [PATCH 3/5] gofumpt: disable CGO, set ldflags, inject version

---
 pkgs/development/tools/gofumpt/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/tools/gofumpt/default.nix b/pkgs/development/tools/gofumpt/default.nix
index 2e1f95e24518..1a6e53afa025 100644
--- a/pkgs/development/tools/gofumpt/default.nix
+++ b/pkgs/development/tools/gofumpt/default.nix
@@ -13,6 +13,10 @@ buildGoModule rec {
 
   vendorHash = "sha256-W0WKEQgOIFloWsB4E1RTICVKVlj9ChGSpo92X+bjNEk=";
 
+  CGO_ENABLED = "0";
+
+  ldflags = "-s -w -X main.version=v${version}";
+
   checkFlags = [
     # Requires network access (Error: module lookup disabled by GOPROXY=off).
     "-skip=^TestScript/diagnose$"

From 9eaf29c2b8146882d2ffafbad35333852df25deb Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Thu, 14 Dec 2023 15:20:53 +0100
Subject: [PATCH 4/5] gofumpt: add updateScript, version test, changelog

---
 pkgs/development/tools/gofumpt/default.nix | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/gofumpt/default.nix b/pkgs/development/tools/gofumpt/default.nix
index 1a6e53afa025..5682796bafaf 100644
--- a/pkgs/development/tools/gofumpt/default.nix
+++ b/pkgs/development/tools/gofumpt/default.nix
@@ -1,4 +1,10 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, nix-update-script
+, testVersion
+, gofumpt
+}:
 
 buildGoModule rec {
   pname = "gofumpt";
@@ -22,9 +28,18 @@ buildGoModule rec {
     "-skip=^TestScript/diagnose$"
   ];
 
+  passthru = {
+    updateScript = nix-update-script { };
+    tests.version = testVersion {
+      package = gofumpt;
+      version = "v${version}";
+    };
+  };
+
   meta = with lib; {
     description = "A stricter gofmt";
     homepage = "https://github.com/mvdan/gofumpt";
+    changelog = "https://github.com/mvdan/gofumpt/releases/tag/v${version}";
     license = licenses.bsd3;
     maintainers = with maintainers; [ rvolosatovs ];
     mainProgram = "gofumpt";

From e68297b1ff9387751e78a2502516eada67515110 Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Thu, 14 Dec 2023 15:22:35 +0100
Subject: [PATCH 5/5] gofumpt: add katexochen as maintainer

---
 pkgs/development/tools/gofumpt/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/gofumpt/default.nix b/pkgs/development/tools/gofumpt/default.nix
index 5682796bafaf..0949c1ff9dd6 100644
--- a/pkgs/development/tools/gofumpt/default.nix
+++ b/pkgs/development/tools/gofumpt/default.nix
@@ -41,7 +41,7 @@ buildGoModule rec {
     homepage = "https://github.com/mvdan/gofumpt";
     changelog = "https://github.com/mvdan/gofumpt/releases/tag/v${version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ rvolosatovs ];
+    maintainers = with maintainers; [ rvolosatovs katexochen ];
     mainProgram = "gofumpt";
   };
 }