From 9193d221b4e24edc5ed8d9b4193cf3da1baf1f2e Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 25 Jan 2023 12:00:00 +0000 Subject: [PATCH] httplab: use buildGoModule --- pkgs/tools/networking/httplab/default.nix | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/httplab/default.nix b/pkgs/tools/networking/httplab/default.nix index 40851d370c79..4d4a798833ea 100644 --- a/pkgs/tools/networking/httplab/default.nix +++ b/pkgs/tools/networking/httplab/default.nix @@ -1,19 +1,28 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "httplab"; version = "0.4.0"; - rev = "v${version}"; - - goPackagePath = "github.com/gchaincl/httplab"; src = fetchFromGitHub { owner = "gchaincl"; repo = "httplab"; - inherit rev; - sha256 = "0442nnpxyfl2gi9pilv7q6cxs2cd98wblg8d4nw6dx98yh4h99zs"; + rev = "v${version}"; + hash = "sha256-+qcECfQo9Wa4JQ09ujhKjQndmcFn03hTfII636+1ghA="; }; + vendorHash = null; + + patches = [ + # Add Go Modules support + (fetchpatch { + url = "https://github.com/qustavo/httplab/commit/80680bebc83f1ed19216f60339c62cd9213d736b.patch"; + hash = "sha256-y4KO3FGwKNAfM+4uR3KDbV90d/4JeBGvWtfirDJrWZk="; + }) + ]; + + ldflags = [ "-s" "-w" ]; + meta = with lib; { homepage = "https://github.com/gchaincl/httplab"; description = "Interactive WebServer";