From 46e8aa0a08a2393472963397b7cc8da6b876d9a7 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Tue, 27 Jun 2023 21:11:36 +0800
Subject: [PATCH 1/3] tmate: use msgpack-c instead of msgpack

---
 pkgs/tools/misc/tmate/default.nix | 44 ++++++++++++++++++++++++++-----
 1 file changed, 38 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/tools/misc/tmate/default.nix
index 76a2afcfb6b0..1956f25fb97f 100644
--- a/pkgs/tools/misc/tmate/default.nix
+++ b/pkgs/tools/misc/tmate/default.nix
@@ -1,7 +1,20 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, cmake, libtool, pkg-config
-, zlib, openssl, libevent, ncurses, ruby, msgpack, libssh }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, cmake
+, libtool
+, pkg-config
+, zlib
+, openssl
+, libevent
+, ncurses
+, ruby
+, msgpack-c
+, libssh
+}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "tmate";
   version = "unstable-2022-08-07";
 
@@ -12,10 +25,29 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-t96gfmAMcsjkGf8pvbEx2fNx4Sj3W6oYoQswB3Dklb8=";
   };
 
-  dontUseCmakeConfigure = true;
+  postPatch = ''
+    substituteInPlace configure.ac \
+      --replace 'msgpack >= 1.1.0' 'msgpack-c >= 1.1.0'
+  '';
 
-  buildInputs = [ libtool zlib openssl libevent ncurses ruby msgpack libssh ];
-  nativeBuildInputs = [ autoreconfHook cmake pkg-config ];
+  nativeBuildInputs = [
+    autoreconfHook
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = [
+    libtool
+    zlib
+    openssl
+    libevent
+    ncurses
+    ruby
+    msgpack-c
+    libssh
+  ];
+
+  dontUseCmakeConfigure = true;
 
   meta = with lib; {
     homepage    = "https://tmate.io/";

From 198edce0bb36332be2256f0312f01e5fa2d3fb95 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Tue, 27 Jun 2023 21:13:40 +0800
Subject: [PATCH 2/3] tmate-ssh-server: unstable-2021-10-17 ->
 unstable-2023-06-02

Diff: https://github.com/tmate-io/tmate-ssh-server/compare/1f314123df2bb29cb07427ed8663a81c8d9034fd...d7334ee4c3c8036c27fb35c7a24df3a88a15676b
---
 pkgs/servers/tmate-ssh-server/default.nix | 35 +++++++++++++++++------
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/tmate-ssh-server/default.nix b/pkgs/servers/tmate-ssh-server/default.nix
index 539b456c9d7f..dff7f050fbf9 100644
--- a/pkgs/servers/tmate-ssh-server/default.nix
+++ b/pkgs/servers/tmate-ssh-server/default.nix
@@ -10,26 +10,45 @@
 , libevent
 , ncurses
 , ruby
-, msgpack
+, msgpack-c
 , libssh
 , nixosTests
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "tmate-ssh-server";
-  version = "unstable-2021-10-17";
+  version = "unstable-2023-06-02";
 
   src = fetchFromGitHub {
     owner = "tmate-io";
     repo = "tmate-ssh-server";
-    rev = "1f314123df2bb29cb07427ed8663a81c8d9034fd";
-    sha256 = "sha256-9/xlMvtkNWUBRYYnJx20qEgtEcjagH2NtEKZcDOM1BY=";
+    rev = "d7334ee4c3c8036c27fb35c7a24df3a88a15676b";
+    sha256 = "sha256-V3p0vagt13YjQPdqpbSatx5DnIEXL4t/kfxETSFYye0=";
   };
 
-  dontUseCmakeConfigure = true;
+  postPatch = ''
+    substituteInPlace configure.ac \
+      --replace 'msgpack >= 1.2.0' 'msgpack-c >= 1.2.0'
+  '';
 
-  buildInputs = [ libtool zlib openssl libevent ncurses ruby msgpack libssh ];
-  nativeBuildInputs = [ autoreconfHook cmake pkg-config ];
+  nativeBuildInputs = [
+    autoreconfHook
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = [
+    libtool
+    zlib
+    openssl
+    libevent
+    ncurses
+    ruby
+    msgpack-c
+    libssh
+  ];
+
+  dontUseCmakeConfigure = true;
 
   passthru.tests.tmate-ssh-server = nixosTests.tmate-ssh-server;
 

From 6ecfdd3fa4692c863e28a48f2be4a256db5bd9b5 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Tue, 27 Jun 2023 21:20:50 +0800
Subject: [PATCH 3/3] nixos/tmate-ssh-server: fix test by opening port on
 firewall

---
 nixos/tests/tmate-ssh-server.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/tests/tmate-ssh-server.nix b/nixos/tests/tmate-ssh-server.nix
index e7f94db9bfcf..122434c505c1 100644
--- a/nixos/tests/tmate-ssh-server.nix
+++ b/nixos/tests/tmate-ssh-server.nix
@@ -24,6 +24,7 @@ in
         services.tmate-ssh-server = {
           enable = true;
           port = 2223;
+          openFirewall = true;
         };
       };
       client = { ... }: {