diff --git a/pkgs/by-name/ra/rathole/package.nix b/pkgs/by-name/ra/rathole/package.nix new file mode 100644 index 000000000000..38d163daf8d8 --- /dev/null +++ b/pkgs/by-name/ra/rathole/package.nix @@ -0,0 +1,47 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + pkg-config, + openssl, + nixosTests, + darwin, +}: + +rustPlatform.buildRustPackage { + pname = "rathole"; + version = "0.5.0-unstable-2024-06-06"; + + src = fetchFromGitHub { + owner = "rapiz1"; + repo = "rathole"; + rev = "be14d124a22e298d12d92e56ef4fec0e51517998"; + hash = "sha256-C0/G4JOZ4pTAvcKZhRHsGvlLlwAyWBQ0rMScLvaLSuA="; + }; + + cargoHash = "sha256-zlwIgzqpoEgYqZe4Gv8owJQ3m7UFgPA5joRMiyq+T/M="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreServices ]); + + __darwinAllowLocalNetworking = true; + + passthru.tests = { + inherit (nixosTests) rathole; + }; + + meta = { + description = "Reverse proxy for NAT traversal"; + homepage = "https://github.com/rapiz1/rathole"; + license = lib.licenses.asl20; + mainProgram = "rathole"; + maintainers = with lib.maintainers; [ + dit7ya + xokdvium + ]; + }; +} diff --git a/pkgs/tools/networking/rathole/default.nix b/pkgs/tools/networking/rathole/default.nix deleted file mode 100644 index 8453792e703e..000000000000 --- a/pkgs/tools/networking/rathole/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rustPlatform -, pkg-config -, openssl -, nixosTests -, CoreServices -}: - -rustPlatform.buildRustPackage rec { - pname = "rathole"; - version = "0.5.0"; - - src = fetchFromGitHub { - owner = "rapiz1"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-YfLzR1lHk+0N3YU1XTNxz+KE1S3xaiKJk0zASm6cr1s="; - }; - - cargoHash = "sha256-UyQXAUPnp32THZJAs/p3bIXZjcXTvjy207QBVLCfkr8="; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.isDarwin [ - CoreServices - ]; - - __darwinAllowLocalNetworking = true; - - doCheck = false; # https://github.com/rapiz1/rathole/issues/222 - - passthru.tests = { inherit (nixosTests) rathole; }; - - meta = with lib; { - description = "Reverse proxy for NAT traversal"; - homepage = "https://github.com/rapiz1/rathole"; - changelog = "https://github.com/rapiz1/rathole/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ dit7ya ]; - mainProgram = "rathole"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3455cf20d6e8..fd30b0c30429 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18719,10 +18719,6 @@ with pkgs; ran = callPackage ../servers/http/ran { }; - rathole = callPackage ../tools/networking/rathole { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; - retry = callPackage ../tools/system/retry { }; rizin = pkgs.callPackage ../development/tools/analysis/rizin { };