Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'

2 files changed, 8 insertions, 119 deletions

diff --git a/nixpkgs/pkgs/tools/misc/zabbixctl/default.nix b/nixpkgs/pkgs/tools/misc/zabbixctl/default.nix
index 81d81b6794eb..3b25d479388e 100644
--- a/nixpkgs/pkgs/tools/misc/zabbixctl/default.nix
+++ b/nixpkgs/pkgs/tools/misc/zabbixctl/default.nix
@@ -1,19 +1,19 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "zabbixctl";
-  version = "unstable-2019-07-06";
-
-  goPackagePath = "github.com/kovetskiy/zabbixctl";
+  version = "unstable-2021-05-25";
 
   src = fetchFromGitHub {
     owner = "kovetskiy";
     repo = pname;
-    rev = "f2e856b7ab7d8ff9f494fe9f481bbaef18ea6ff7";
-    sha256 = "1lr3g9h3aa2px2kh5b2qcpj3aqyhqwq7kj1s9wifgmri9q7fsdzy";
+    rev = "872d73b12901b143898bffe3711b93a34ca75abe";
+    sha256 = "sha256-fWT3cgIHjHcKwFDjWIf3BUUUaVZ7hyc2ibkpU+AsW0I=";
   };
 
-  goDeps = ./deps.nix;
+  vendorSha256 = "sha256-BphQcPPmeNU7RDtaHJQxIoW8xxD86xWgqLBsLR08Tag=";
+
+  ldflags = [ "-s" "-w" ];
 
   meta = with lib; {
     description = "Most effective way for operating in Zabbix Server";
diff --git a/nixpkgs/pkgs/tools/misc/zabbixctl/deps.nix b/nixpkgs/pkgs/tools/misc/zabbixctl/deps.nix
deleted file mode 100644
index 2bf015acf5f5..000000000000
--- a/nixpkgs/pkgs/tools/misc/zabbixctl/deps.nix
+++ /dev/null
@@ -1,111 +0,0 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
-[
-  {
-    goPackagePath = "github.com/BurntSushi/toml";
-    fetch = {
-      type = "git";
-      url = "https://github.com/BurntSushi/toml";
-      rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005";
-      sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
-    };
-  }
-  {
-    goPackagePath = "github.com/jinzhu/configor";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jinzhu/configor";
-      rev = "9064de4b2535f218bde55dc8de50a3904ef800d0";
-      sha256 = "13wd7s2kff3s0bz5mi0m2zcz1r8mwnwhd944gxymzkwij71lhasn";
-    };
-  }
-  {
-    goPackagePath = "github.com/kovetskiy/godocs";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kovetskiy/godocs";
-      rev = "2d9428f80f3442e07f67daf7ba378cd0ff6cfe24";
-      sha256 = "128dlvxqk31crzl9p3ps0nir724cjzxv4lxpgdvsir0wvfp8f83j";
-    };
-  }
-  {
-    goPackagePath = "github.com/kovetskiy/lorg";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kovetskiy/lorg";
-      rev = "9c6042b7edb0c491dd0722fad91e2b5e833d6b43";
-      sha256 = "0j1cm7mni47vraxnyigc55cq0yxw8zdyjmrq2c7vnm5s4kiia8pi";
-    };
-  }
-  {
-    goPackagePath = "github.com/kovetskiy/spinner-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kovetskiy/spinner-go";
-      rev = "00597fd24fe0d8079821b68f71d73b0661401752";
-      sha256 = "19qcpnvs61fsk7xgcj5b6s3zksnkc5rk9n5hx73v9ya7m2k7xr2n";
-    };
-  }
-  {
-    goPackagePath = "github.com/mattn/go-runewidth";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mattn/go-runewidth";
-      rev = "703b5e6b11ae25aeb2af9ebb5d5fdf8fa2575211";
-      sha256 = "0znpyz71gajx3g0j2zp63nhjj2c07g16885vxv4ykwnrfmzbgk4w";
-    };
-  }
-  {
-    goPackagePath = "github.com/olekukonko/tablewriter";
-    fetch = {
-      type = "git";
-      url = "https://github.com/olekukonko/tablewriter";
-      rev = "cc27d85e17cec9768d2ac401ea5d619a9628f16d";
-      sha256 = "1y3pkvypkxjrhlnsv8lcyd0c2q8mn5asfny2zi9j2vs77s5bd9qm";
-    };
-  }
-  {
-    goPackagePath = "github.com/reconquest/karma-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/reconquest/karma-go";
-      rev = "1094651bd246b1685f7b368e099aba6fca9efd8f";
-      sha256 = "0jiayzxwp0h7skg86q58rh58m2imdg3ng2vzpc2bxiz67lzcpk3r";
-    };
-  }
-  {
-    goPackagePath = "github.com/simplereach/timeutils";
-    fetch = {
-      type = "git";
-      url = "https://github.com/simplereach/timeutils";
-      rev = "1a719258b86a08630289b86902ab16817ba641e9";
-      sha256 = "08mf2j0dk07c9p279ydbrjxbjf113azmq0x8vhf7jvldcgjpw3m6";
-    };
-  }
-  {
-    goPackagePath = "github.com/zazab/zhash";
-    fetch = {
-      type = "git";
-      url = "https://github.com/zazab/zhash";
-      rev = "ad45b89afe7af57319ca32f174e4dabeb00c44e4";
-      sha256 = "16b6f70qwfyg0zvbpk0yj5jx4cv2ggkyiqc5nk8n0165z46i62hs";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/mgo.v2";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/mgo.v2";
-      rev = "9856a29383ce1c59f308dd1cf0363a79b5bef6b5";
-      sha256 = "1gfbcmvpwwf1lydxj3g42wv2g9w3pf0y02igqk4f4f21h02sazkw";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/yaml.v2";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/yaml.v2";
-      rev = "51d6538a90f86fe93ac480b35f37b2be17fef232";
-      sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
-    };
-  }
-]