From 4434e57cf7c64b25bba9e03b32c818d704d1b389 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Tue, 3 Jan 2023 03:31:34 +0000 Subject: [PATCH] go-bindata: Use buildGoModule --- pkgs/development/tools/go-bindata/default.nix | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/go-bindata/default.nix b/pkgs/development/tools/go-bindata/default.nix index 2f40aed044b..11f42d81a3e 100644 --- a/pkgs/development/tools/go-bindata/default.nix +++ b/pkgs/development/tools/go-bindata/default.nix @@ -1,20 +1,30 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "go-bindata"; version = "3.24.0"; - goPackagePath = "github.com/kevinburke/go-bindata"; - src = fetchFromGitHub { owner = "kevinburke"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dEfD5oV2nXLVg+a7PlB6LqhEBosG7eTptqKKDWcQAss="; + hash = "sha256-dEfD5oV2nXLVg+a7PlB6LqhEBosG7eTptqKKDWcQAss="; }; + vendorHash = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + + patches = [ + # Add go modules support + (fetchpatch { + url = "https://github.com/kevinburke/go-bindata/commit/b5c6f880d411b9c24a8ae1c8b608ab80cb9aacb4.patch"; + hash = "sha256-dzzp5p+jdg09oo6jeSlms+MMMDWUXpsescj132MT6D8="; + }) + ]; + subPackages = [ "go-bindata" ]; + ldflags = [ "-s" "-w" ]; + meta = with lib; { homepage = "https://github.com/kevinburke/go-bindata"; changelog = "https://github.com/kevinburke/go-bindata/blob/v${version}/CHANGELOG.md";