From 2637496059e0912abd8ec0ef0ef4f109bdae6a55 Mon Sep 17 00:00:00 2001 From: pinpox Date: Mon, 11 Aug 2025 13:48:33 +0200 Subject: [PATCH] zt-tcp-relay: drop --- checks/flake-module.nix | 1 - checks/zt-tcp-relay/default.nix | 24 ------------------------ pkgs/flake-module.nix | 1 - pkgs/zt-tcp-relay/default.nix | 27 --------------------------- 4 files changed, 53 deletions(-) delete mode 100644 checks/zt-tcp-relay/default.nix delete mode 100644 pkgs/zt-tcp-relay/default.nix diff --git a/checks/flake-module.nix b/checks/flake-module.nix index fee7e9755..5c2263836 100644 --- a/checks/flake-module.nix +++ b/checks/flake-module.nix @@ -97,7 +97,6 @@ in # Container Tests nixos-test-container = self.clanLib.test.containerTest ./container nixosTestArgs; - nixos-test-zt-tcp-relay = self.clanLib.test.containerTest ./zt-tcp-relay nixosTestArgs; nixos-test-user-firewall-iptables = self.clanLib.test.containerTest ./user-firewall/iptables.nix nixosTestArgs; nixos-test-user-firewall-nftables = self.clanLib.test.containerTest ./user-firewall/nftables.nix nixosTestArgs; diff --git a/checks/zt-tcp-relay/default.nix b/checks/zt-tcp-relay/default.nix deleted file mode 100644 index ed8283c72..000000000 --- a/checks/zt-tcp-relay/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -( - { pkgs, ... }: - { - name = "zt-tcp-relay"; - - nodes.machine = - { self, ... }: - { - imports = [ - self.nixosModules.clanCore - self.clanModules.zt-tcp-relay - { - clan.core.settings.directory = ./.; - } - ]; - }; - testScript = '' - start_all() - machine.wait_for_unit("zt-tcp-relay.service") - out = machine.succeed("${pkgs.netcat}/bin/nc -z -v localhost 4443") - print(out) - ''; - } -) diff --git a/pkgs/flake-module.nix b/pkgs/flake-module.nix index 28b4f18b1..3ad2b3708 100644 --- a/pkgs/flake-module.nix +++ b/pkgs/flake-module.nix @@ -19,7 +19,6 @@ agit = pkgs.callPackage ./agit { }; tea-create-pr = pkgs.callPackage ./tea-create-pr { }; zerotier-members = pkgs.callPackage ./zerotier-members { }; - zt-tcp-relay = pkgs.callPackage ./zt-tcp-relay { }; moonlight-sunshine-accept = pkgs.callPackage ./moonlight-sunshine-accept { }; merge-after-ci = pkgs.callPackage ./merge-after-ci { inherit (config.packages) tea-create-pr; }; minifakeroot = pkgs.callPackage ./minifakeroot { }; diff --git a/pkgs/zt-tcp-relay/default.nix b/pkgs/zt-tcp-relay/default.nix deleted file mode 100644 index 06174f09b..000000000 --- a/pkgs/zt-tcp-relay/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, -}: - -rustPlatform.buildRustPackage { - pname = "zt-tcp-relay"; - version = "unstable-2025-07-03"; - - src = fetchFromGitHub { - owner = "alexander-akhmetov"; - repo = "zt-tcp-relay"; - rev = "f6300870efc63a4dd06ed9b40a61a389de606bf5"; - hash = "sha256-yXCSE0I1u34doQ5PJ8kK6BabopVp5404R5kiJ6lGRa4="; - }; - - cargoHash = "sha256-8RCiGi/w0Qjmfppe236q2ojVbYo/jWIa7j6Nrz8GRiQ="; - - meta = with lib; { - description = "ZeroTier One TCP relay"; - homepage = "https://github.com/alexander-akhmetov/zt-tcp-relay"; - license = licenses.mit; - maintainers = with maintainers; [ mic92 ]; - mainProgram = "zt-tcp-relay"; - }; -}