tintin: 2.02.12 -> 2.02.20, adopt

- update version to match #165797
- change homepage to the independent project site (which
  sourceforge now redirects to)
- update source to github (linked from project site above)
- get rid of the "option" to exclude tlsSupport per PR feedback

1 files changed, 13 insertions, 16 deletions

diff --git a/pkgs/games/tintin/default.nix b/pkgs/games/tintin/default.nix
index aac7cf8f6ab..7add5af64fc 100644
--- a/pkgs/games/tintin/default.nix
+++ b/pkgs/games/tintin/default.nix
@@ -1,24 +1,21 @@
-{ stdenv, fetchurl, lib, zlib, pcre
+{ stdenv, fetchFromGitHub, lib, zlib, pcre
 , memorymappingHook, memstreamHook
-, tlsSupport ? true, gnutls ? null
-# ^ set { tlsSupport = false; } to reduce closure size by ~= 18.6 MB
+, gnutls
 }:
 
-assert tlsSupport -> gnutls != null;
-
 stdenv.mkDerivation rec {
   pname = "tintin";
-  version = "2.02.12";
+  version = "2.02.20";
 
-  src = fetchurl {
-    url    = "mirror://sourceforge/tintin/tintin-${version}.tar.gz";
-    sha256 = "sha256-tvn9TywefNyM/0Fy16gAFJYbA5Q4DO2RgiCdw014GgA=";
+  src = fetchFromGitHub {
+    owner = "scandum";
+    repo = "tintin";
+    rev = version;
+    hash = "sha256-H9Cjg/GkyV50pgewv77zOJ8/Op78P9sQmZ5LorO4L+A=";
   };
 
-  nativeBuildInputs = lib.optional tlsSupport gnutls.dev;
-  buildInputs = [ zlib pcre ]
-    ++ lib.optionals (stdenv.system == "x86_64-darwin") [ memorymappingHook memstreamHook ]
-    ++ lib.optional tlsSupport gnutls;
+  buildInputs = [ zlib pcre gnutls ]
+    ++ lib.optionals (stdenv.system == "x86_64-darwin") [ memorymappingHook memstreamHook ];
 
   preConfigure = ''
     cd src
@@ -26,9 +23,9 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "A free MUD client for macOS, Linux and Windows";
-    homepage    = "http://tintin.sourceforge.net";
-    license     = licenses.gpl2;
-    maintainers = with maintainers; [ lovek323 ];
+    homepage    = "https://tintin.mudhalla.net/index.php";
+    license     = licenses.gpl3Plus;
+    maintainers = with maintainers; [ abathur ];
     mainProgram = "tt++";
     platforms   = platforms.unix;
   };