From 21f8c5549ba880ed447b4d7ca9c02c3006e1a656 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sun, 30 Jul 2023 10:35:02 +0800
Subject: [PATCH] k3d: 5.4.4 -> 5.5.1

Diff: https://github.com/k3d-io/k3d/compare/v5.4.4...v5.5.1

Changelog: https://github.com/k3d-io/k3d/blob/v5.5.1/CHANGELOG.md
---
 pkgs/applications/networking/cluster/k3d/default.nix | 11 +++++++----
 pkgs/top-level/all-packages.nix                      |  4 +---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/cluster/k3d/default.nix b/pkgs/applications/networking/cluster/k3d/default.nix
index 473a12c4de00..7c60f7f783ee 100644
--- a/pkgs/applications/networking/cluster/k3d/default.nix
+++ b/pkgs/applications/networking/cluster/k3d/default.nix
@@ -15,15 +15,16 @@ let
 in
 buildGoModule rec {
   pname = "k3d";
-  version = "5.4.4";
+  version = "5.5.1";
 
   src = fetchFromGitHub {
     owner = "k3d-io";
     repo = "k3d";
-    rev = "v${version}";
-    sha256 = "sha256-3J25Aj/otKDCWJ+YqAsoJogU2vckZMy7fsS8XR2EMgE=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-cXUuWR5ALgCgr1bK/Qpdpo978p3PRL3/H6j1T7DKrT4=";
   };
-  vendorSha256 = null;
+
+  vendorHash = null;
 
   nativeBuildInputs = [ installShellFiles ];
 
@@ -54,6 +55,8 @@ buildGoModule rec {
     runHook postInstallCheck
   '';
 
+  env.GOWORK = "off";
+
   meta = with lib; {
     homepage = "https://github.com/k3d-io/k3d/";
     changelog = "https://github.com/k3d-io/k3d/blob/v${version}/CHANGELOG.md";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index faec8b71c97f..4f7438281c48 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -41329,9 +41329,7 @@ with pkgs;
 
   dapper = callPackage ../development/tools/dapper { };
 
-  k3d = callPackage ../applications/networking/cluster/k3d {
-    buildGoModule = buildGo118Module; # tests fail with 1.19
-  };
+  k3d = callPackage ../applications/networking/cluster/k3d { };
 
   zfs-prune-snapshots = callPackage ../tools/backup/zfs-prune-snapshots { };