Merge pull request #69229 from marsam/use-buildGoPackage

treewide: use buildGoPackage in packages which vendor dependencies

3 files changed, 7 insertions, 11 deletions

diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix
index 7a3d7882715f..b8026a9f8852 100644
--- a/pkgs/development/tools/golangci-lint/default.nix
+++ b/pkgs/development/tools/golangci-lint/default.nix
@@ -1,6 +1,6 @@
-{ buildGoModule, fetchFromGitHub, lib }:
+{ buildGoPackage, fetchFromGitHub, lib }:
 
-buildGoModule rec {
+buildGoPackage rec {
   pname = "golangci-lint";
   version = "1.17.1";
   goPackagePath = "github.com/golangci/golangci-lint";
@@ -14,8 +14,6 @@ buildGoModule rec {
     sha256 = "1hs24nimv11c63a90ds8ps1lli16m3apsbrd9vpbq2rmxdbpwqac";
   };
 
-  modSha256 = "0k0831rg6ygjffrq5y9488aiacskky7g6bvsfrgfz0g7i0mig1n6";
-
   meta = with lib; {
     description = "Linters Runner for Go. 5x faster than gometalinter. Nice colored output.";
     homepage = https://golangci.com/;
diff --git a/pkgs/development/tools/misc/elfinfo/default.nix b/pkgs/development/tools/misc/elfinfo/default.nix
index cb127906c0bf..b1a51a771448 100644
--- a/pkgs/development/tools/misc/elfinfo/default.nix
+++ b/pkgs/development/tools/misc/elfinfo/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
-buildGoModule rec {
+buildGoPackage rec {
   pname = "elfinfo";
   version = "0.7.6";
 
@@ -12,8 +12,6 @@ buildGoModule rec {
     sha256 = "0f6ik4d157assxdfslnyc91mg70kfh396rapikfv473znx2v2pg9";
   };
 
-  modSha256 = "1xr0pylaqcb4f4g862120cgqdxp0bpwsk77zd6g7kk91lqdcvsdf";
-
   meta = with stdenv.lib; {
     description = "Small utility for showing information about ELF files";
     homepage = https://elfinfo.roboticoverlords.org/;
diff --git a/pkgs/development/tools/misc/mkcert/default.nix b/pkgs/development/tools/misc/mkcert/default.nix
index 7a3ccaa9fbc4..b9b1f83322d1 100644
--- a/pkgs/development/tools/misc/mkcert/default.nix
+++ b/pkgs/development/tools/misc/mkcert/default.nix
@@ -1,6 +1,6 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
-buildGoModule rec {
+buildGoPackage rec {
   pname = "mkcert";
   version = "1.4.0";
 
@@ -11,7 +11,7 @@ buildGoModule rec {
     sha256 = "0xcmvzh5lq8vs3b0f1zw645fxdr8471v7prl1656q02v38f58ly7";
   };
 
-  modSha256 = "0an12l15a82mks6gipczdpcf2vklk14wjjnk0ccl3kdjwiw7f4wd";
+  goPackagePath = "github.com/FiloSottile/mkcert";
 
   meta = with lib; {
     homepage = https://github.com/FiloSottile/mkcert;