From 9d4dab5df84d0ee1d973d563415d9bf6de8563bd Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sat, 15 Jul 2023 17:26:24 +1000 Subject: [PATCH] doggo: unpin go --- pkgs/tools/networking/doggo/default.nix | 12 +++++++++++- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/doggo/default.nix b/pkgs/tools/networking/doggo/default.nix index 10d2fef2ef3a..ebebb1fcca05 100644 --- a/pkgs/tools/networking/doggo/default.nix +++ b/pkgs/tools/networking/doggo/default.nix @@ -2,6 +2,7 @@ , buildGoModule , fetchFromGitHub , installShellFiles +, fetchpatch }: buildGoModule rec { @@ -15,7 +16,16 @@ buildGoModule rec { sha256 = "sha256-qc6RYz2bVaY/IBGIXUYO6wyh7iUDAJ1ASCK0dFwZo6s="; }; - vendorHash = "sha256-UhSdYpK54c4+BAP/d/zU91LIBE05joOLHoV1XkNMYNw="; + 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="; nativeBuildInputs = [ installShellFiles ]; subPackages = [ "cmd/doggo" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ecd3c1373b1..b476e60a3ce6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7186,9 +7186,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - doggo = callPackage ../tools/networking/doggo { - buildGoModule = buildGo119Module; # build fails with 1.20 - }; + doggo = callPackage ../tools/networking/doggo { }; dool = callPackage ../tools/system/dool { };