Merge pull request #206171 from SuperSandro2000/morty

pkgs/servers/web-apps/morty/default.nix

@@ -1,43 +1,28 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage rec {
+buildGoModule {
   pname = "morty";
-  version = "0.2.0";
-
-  goPackagePath = "github.com/asciimoo/morty";
+  version = "unstable-2021-04-22";
 
   src = fetchFromGitHub {
     owner = "asciimoo";
     repo = "morty";
-    rev = "v${version}";
-    sha256 = "sha256-NWfsqJKJcRPKR8gWQbgal1JsenDesczPcz/+uzhtefM=";
+    rev = "f5bff1e285d3f973cacf73318e55175edafd633f";
+    sha256 = "sha256-ik2VAPdxllt76UVFt77c1ltxIwFNahAKjn3FuErNFYo=";
   };
 
-  goDeps = ./deps.nix;
+  vendorSha256 = "sha256-3sllcoTDYQBAyAT7e9KeKNrlTEbgnoZc0Vt0ksQByvo=";
 
   meta = with lib; {
-    homepage = "https://github.com/asciimoo/morty";
-    maintainers = with maintainers; [ leenaars ];
-    license = licenses.agpl3;
     description = "Privacy aware web content sanitizer proxy as a service";
     longDescription = ''
-      Morty is a web content sanitizer proxy as a service. It rewrites web
-      pages to exclude malicious HTML tags and attributes. It also replaces
-      external resource references to prevent third party information leaks.
+      Morty rewrites web pages to exclude malicious HTML tags and attributes.
+      It also replaces external resource references to prevent third party information leaks.
 
-      The main goal of morty is to provide a result proxy for searx, but it
-      can be used as a standalone sanitizer service too.
-
-      Features:
-
-      * HTML sanitization
-      * Rewrites HTML/CSS external references to locals
-      * JavaScript blocking
-      * No Cookies forwarded
-      * No Referrers
-      * No Caching/Etag
-      * Supports GET/POST forms and IFrames
-      * Optional HMAC URL verifier key to prevent service abuse
+      The main goal of morty is to provide a result proxy for searx, but it can be used as a standalone sanitizer service too.
     '';
+    homepage = "https://github.com/asciimoo/morty";
+    maintainers = with maintainers; [ leenaars SuperSandro2000 ];
+    license = licenses.agpl3;
   };
 }

pkgs/servers/web-apps/morty/deps.nix

@@ -1,57 +0,0 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
-[
-  {
-    goPackagePath = "github.com/klauspost/compress";
-    fetch = {
-      type = "git";
-      url = "https://github.com/klauspost/compress";
-      rev = "5698df94daded084fa836b7df2ffbf6cbd3dd63a";
-      sha256 = "1jligmzsyv08dysdaih3r95ki0dqnay9wlzganl4r0mamwhq22wz";
-    };
-  }
-  {
-    goPackagePath = "github.com/klauspost/cpuid";
-    fetch = {
-      type = "git";
-      url = "https://github.com/klauspost/cpuid";
-      rev = "ae832f27941af41db13bd6d8efd2493e3b22415a";
-      sha256 = "1h46y0lbzx0zjdnwbh0znf2ghgbvpzk1p269kkn7v8645xk3apk9";
-    };
-  }
-  {
-    goPackagePath = "github.com/valyala/bytebufferpool";
-    fetch = {
-      type = "git";
-      url = "https://github.com/valyala/bytebufferpool";
-      rev = "e746df99fe4a3986f4d4f79e13c1e0117ce9c2f7";
-      sha256 = "01lqzjddq6kz9v41nkky7wbgk7f1cw036sa7ldz10d82g5klzl93";
-    };
-  }
-  {
-    goPackagePath = "github.com/valyala/fasthttp";
-    fetch = {
-      type = "git";
-      url = "https://github.com/valyala/fasthttp";
-      rev = "e5f51c11919d4f66400334047b897ef0a94c6f3c";
-      sha256 = "0g24gys7xk449jd9ja89vr33i3amcb12jnmhsrmd5r2q8byv3l09";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/net";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/net";
-      rev = "f5dfe339be1d06f81b22525fe34671ee7d2c8904";
-      sha256 = "01y9j7pjnnld4ipmzjvs0hls0hh698f2sga8cxaw5y6r5j7igaah";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/text";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/text";
-      rev = "4e4a3210bb54bb31f6ab2cdca2edcc0b50c420c1";
-      sha256 = "10505r4xw1njnr2ns1s5r62s4pwif0kfaa30xxpgpz6qxrrmw15s";
-    };
-  }
-]