From f41abe7cb9cbd20454f984134474a017aa1fb131 Mon Sep 17 00:00:00 2001
From: nat <nat@nekopon.pl>
Date: Sun, 22 Oct 2023 17:28:35 +0200
Subject: [PATCH 1/2] doggo: 0.5.5 -> 0.5.7

---
 pkgs/tools/networking/doggo/default.nix | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/pkgs/tools/networking/doggo/default.nix b/pkgs/tools/networking/doggo/default.nix
index ebebb1fcca05..cdd19bc37b90 100644
--- a/pkgs/tools/networking/doggo/default.nix
+++ b/pkgs/tools/networking/doggo/default.nix
@@ -1,31 +1,21 @@
-{ lib
-, buildGoModule
+{ buildGoModule
 , fetchFromGitHub
 , installShellFiles
-, fetchpatch
+, lib
 }:
 
 buildGoModule rec {
   pname = "doggo";
-  version = "0.5.5";
+  version = "0.5.7";
 
   src = fetchFromGitHub {
     owner = "mr-karan";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-qc6RYz2bVaY/IBGIXUYO6wyh7iUDAJ1ASCK0dFwZo6s=";
+    hash = "sha256-hzl7BE3vsE2G9O2nwN/gkqQTJ+9aDfNIjmpmgN1AYq8=";
   };
 
-  patches = [
-    # go 1.20 support
-    # https://github.com/mr-karan/doggo/pull/66
-    (fetchpatch {
-      url = "https://github.com/mr-karan/doggo/commit/7db5c2144fa4a3f18afe1c724b9367b03f84aed7.patch";
-      hash = "sha256-cx8s23e02zIvJOtuqTz8XC9ApYODh96Ubl1KhsFUZ9g=";
-    })
-  ];
-
-  vendorHash = "sha256-GVLfPK1DFVSfNSdIxYSaspHFphd8ft2HUK0SMeWiVUg=";
+  vendorHash = "sha256-uonybBLABPj9CPtc+y82ajvQI7kubK+lKi4eLcZIUqA=";
   nativeBuildInputs = [ installShellFiles ];
   subPackages = [ "cmd/doggo" ];
 

From 662cc7d367558d4808d2f7326a19cd6c2865ad35 Mon Sep 17 00:00:00 2001
From: nat <nat@nekopon.pl>
Date: Sun, 22 Oct 2023 17:32:01 +0200
Subject: [PATCH 2/2] doggo: migrate to by-name

---
 .../doggo/default.nix => by-name/do/doggo/package.nix}          | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/networking/doggo/default.nix => by-name/do/doggo/package.nix} (100%)

diff --git a/pkgs/tools/networking/doggo/default.nix b/pkgs/by-name/do/doggo/package.nix
similarity index 100%
rename from pkgs/tools/networking/doggo/default.nix
rename to pkgs/by-name/do/doggo/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5a23e5416f95..f6dad29b3ae0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7579,8 +7579,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  doggo = callPackage ../tools/networking/doggo { };
-
   dq = callPackage ../tools/networking/dq { };
 
   dool = callPackage ../tools/system/dool { };