Merge pull request #172957 from aaronjheng/gohai

gohai: 2018-05-23 -> unstable-2022-04-12

2 files changed, 18 insertions, 46 deletions

diff --git a/pkgs/tools/system/gohai/default.nix b/pkgs/tools/system/gohai/default.nix
index a4b07f112ae3f..40fc48b8ffa69 100644
--- a/pkgs/tools/system/gohai/default.nix
+++ b/pkgs/tools/system/gohai/default.nix
@@ -1,26 +1,28 @@
-{ lib, buildGoPackage, fetchgit }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "gohai";
-  version = "2018-05-23";
-  rev = "60e13eaed98afa238ad6dfc98224c04fbb7b19b1";
+  version = "unstable-2022-04-12";
 
-  goPackagePath = "github.com/DataDog/gohai";
-
-  src = fetchgit {
-    inherit rev;
-    url    = "https://github.com/DataDog/gohai";
-    sha256 = "15hdw195f6ayrmj1nbyfpfswdai1r1z3qjw927mbma7rwql24dkr";
+  src = fetchFromGitHub {
+    owner = "DataDog";
+    repo = "gohai";
+    rev = "c614f513e87f04d3d19b2d4ae853cc5703f3a9bc";
+    sha256 = "sha256-vdzGGTg9SHYS0OQUn3VvrQGpKxzqxBRXDKOm0c7FvYY=";
   };
 
-  goDeps = ./deps.nix;
+  vendorSha256 = "sha256-aN1fwGbBm45e6qdRu+4wnv2ZI7SOsIPONB4vF9o2vlI=";
+
+  ldflags = [ "-s" "-w" ];
+
+  doCheck = false;
 
   meta = with lib; {
-    description      = "System information collector";
-    homepage         = "https://github.com/DataDog/gohai";
-    license          = licenses.mit;
-    maintainers      = [ maintainers.tazjin ];
-    platforms        = platforms.unix;
+    description = "System information collector";
+    homepage = "https://github.com/DataDog/gohai";
+    license = licenses.mit;
+    maintainers = with maintainers; [ tazjin ];
+    platforms = platforms.unix;
 
     longDescription = ''
       Gohai is a tool which collects an inventory of system
diff --git a/pkgs/tools/system/gohai/deps.nix b/pkgs/tools/system/gohai/deps.nix
deleted file mode 100644
index f6d63e460246d..0000000000000
--- a/pkgs/tools/system/gohai/deps.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
-[
-  {
-    goPackagePath = "github.com/cihub/seelog";
-    fetch = {
-      type = "git";
-      url = "https://github.com/cihub/seelog";
-      rev = "f561c5e57575bb1e0a2167028b7339b3a8d16fb4";
-      sha256 = "0r3228hvgljgpaggj6b9mvxfsizfw25q2c1761wsvcif8gz49cvl";
-    };
-  }
-  {
-    goPackagePath = "github.com/shirou/gopsutil";
-    fetch = {
-      type = "git";
-      url = "https://github.com/shirou/gopsutil";
-      rev = "eeb1d38d69593f121e060d24d17f7b1f0936b203";
-      sha256 = "01qsznk599225gf4pld7p2m30p61y77mvzhrs6raxpk6wf7icp4w";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/sys";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/sys";
-      rev = "77b0e4315053a57ed2962443614bdb28db152054";
-      sha256 = "1024gcv1b40i2rgvpgyw2hgy1k5g7473pn29yavwysj37m1rrplp";
-    };
-  }
-]