From 1029cad4d5a218dab74325d23584ac01d2cec7d7 Mon Sep 17 00:00:00 2001
From: "Travis A. Everett" <travis.a.everett@gmail.com>
Date: Fri, 8 Jul 2022 10:44:48 -0500
Subject: [PATCH 1/2] Revert "tintin: remove due to lack of maintainers"

This reverts commit 58eae5a47e4067acb18a7e52d1896141062d69b2.
---
 pkgs/games/tintin/default.nix   | 35 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 +-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/games/tintin/default.nix

diff --git a/pkgs/games/tintin/default.nix b/pkgs/games/tintin/default.nix
new file mode 100644
index 000000000000..aac7cf8f6ab4
--- /dev/null
+++ b/pkgs/games/tintin/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, lib, zlib, pcre
+, memorymappingHook, memstreamHook
+, tlsSupport ? true, gnutls ? null
+# ^ set { tlsSupport = false; } to reduce closure size by ~= 18.6 MB
+}:
+
+assert tlsSupport -> gnutls != null;
+
+stdenv.mkDerivation rec {
+  pname = "tintin";
+  version = "2.02.12";
+
+  src = fetchurl {
+    url    = "mirror://sourceforge/tintin/tintin-${version}.tar.gz";
+    sha256 = "sha256-tvn9TywefNyM/0Fy16gAFJYbA5Q4DO2RgiCdw014GgA=";
+  };
+
+  nativeBuildInputs = lib.optional tlsSupport gnutls.dev;
+  buildInputs = [ zlib pcre ]
+    ++ lib.optionals (stdenv.system == "x86_64-darwin") [ memorymappingHook memstreamHook ]
+    ++ lib.optional tlsSupport gnutls;
+
+  preConfigure = ''
+    cd src
+  '';
+
+  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 ];
+    mainProgram = "tt++";
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index de50a74f5cea..553aca6619f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -33114,7 +33114,7 @@ with pkgs;
 
   tibia = pkgsi686Linux.callPackage ../games/tibia { };
 
-  tintin = throw "tintin has been removed due to lack of maintainers";
+  tintin = callPackage ../games/tintin { };
 
   tinyfugue = callPackage ../games/tinyfugue { };
 

From 3d55811e1cddffee2db7a4e487b0ab0ffa93db73 Mon Sep 17 00:00:00 2001
From: "Travis A. Everett" <travis.a.everett@gmail.com>
Date: Fri, 8 Jul 2022 11:06:04 -0500
Subject: [PATCH 2/2] 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
---
 pkgs/games/tintin/default.nix | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/pkgs/games/tintin/default.nix b/pkgs/games/tintin/default.nix
index aac7cf8f6ab4..7add5af64fc7 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;
   };