2 files changed, 8 insertions, 68 deletions
diff --git a/pkgs/tools/networking/ua/default.nix b/pkgs/tools/networking/ua/default.nix
index 4190e810214..e9c7c34e9b5 100644
--- a/pkgs/tools/networking/ua/default.nix
+++ b/pkgs/tools/networking/ua/default.nix
@@ -1,26 +1,23 @@
-{ lib, buildGoPackage, fetchFromGitHub
-, pkg-config
-, glib, libxml2
-}:
+{ lib, buildGoModule, fetchFromGitHub, pkg-config, glib, libxml2 }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "ua";
-  version = "unstable-2017-02-24";
-
-  goPackagePath = "github.com/sloonz/ua";
+  version = "unstable-2021-12-18";
 
   src = fetchFromGitHub {
     owner = "sloonz";
     repo = "ua";
-    rev = "325dab92c60e0f028e55060f0c288aa70905fb17";
-    sha256 = "sha256-LlpxWwKO+gZltkmpQyWaG+qhZFnmETFKIqlOxOzEohA=";
+    rev = "b6d75970bb4f6f340887e1eadad5aa8ce78f30e3";
+    sha256 = "sha256-rCp8jyqQfq5eVdvKZz3vKuDfcR+gQOEAfBZx2It/rb0=";
   };
 
-  goDeps = ./deps.nix;
+  vendorSha256 = "sha256-0O80uhxSVsV9N7Z/FgaLwcjZqeb4MqSCE1YW5Zd32ns=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ glib libxml2 ];
 
+  ldflags = [ "-s" "-w" ];
+
   meta = with lib; {
     homepage = "https://github.com/sloonz/ua";
     license = licenses.isc;
diff --git a/pkgs/tools/networking/ua/deps.nix b/pkgs/tools/networking/ua/deps.nix
deleted file mode 100644
index e59b9f239a6..00000000000
--- a/pkgs/tools/networking/ua/deps.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.0
-[
-  {
-    goPackagePath = "github.com/sloonz/cfeedparser";
-    fetch = {
-      type = "git";
-      url = "https://github.com/sloonz/cfeedparser";
-      rev = "a220b181f09fa7fba347c7fa72168ed8a010907a";
-      sha256 = "1dsdzflwbb0cw39bs37shggmswggb326sfdb5x25f4bpd19z6qp0";
-    };
-  }
-  {
-    goPackagePath = "github.com/sloonz/go-maildir";
-    fetch = {
-      type = "git";
-      url = "https://github.com/sloonz/go-maildir";
-      rev = "4629e76d952bb24730bbe1b4c7bc628cd54babb6";
-      sha256 = "0i9r7hhk0ih47pmc9ixhv17fa6gba3j7vk9g8j0di0pr0siha65f";
-    };
-  }
-  {
-    goPackagePath = "github.com/sloonz/go-mime-message";
-    fetch = {
-      type = "git";
-      url = "https://github.com/sloonz/go-mime-message";
-      rev = "cf50e17d2410fee25cdb89485ab0d5996f2d3bfc";
-      sha256 = "09r45w2qfl0rx785xpgcjv9bvdnwkz7fyr272rdi3krwr900fwxs";
-    };
-  }
-  {
-    goPackagePath = "github.com/sloonz/go-qprintable";
-    fetch = {
-      type = "git";
-      url = "https://github.com/sloonz/go-qprintable";
-      rev = "775b3a4592d5bfc47b0ba398ec0d4dba018e5926";
-      sha256 = "19r8ica7kd946brdh1zn4hkzgbciqsz42a2p1h7hgzpmld51kg43";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/redis.v3";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-redis/redis";
-      rev = "b5e368500d0a508ef8f16e9c2d4025a8a46bcc29";
-      sha256 = "1syhnm1csrlfh1jgd1v9bzf2pp9ljyg4ks3z6xx0nqd83xmyhdzh";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/bsm/ratelimit.v1";
-    fetch = {
-      type = "git";
-      url = "https://github.com/bsm/ratelimit";
-      rev = "db14e161995a5177acef654cb0dd785e8ee8bc22";
-      sha256 = "1ph6dsvgwrsli9akh6arwkvz78hkdb42lyqmgfckjcsar1a2fcsh";
-    };
-  }
-]