From fe7407362b356d44781f06b24168ac757850b343 Mon Sep 17 00:00:00 2001 From: Noratrieb <48135649+Noratrieb@users.noreply.github.com> Date: Mon, 12 Aug 2024 00:48:10 +0200 Subject: [PATCH] build --- default.nix | 10 ++++++++++ src/main.rs | 6 +++++- test-openssh/default.nix | 19 ------------------- 3 files changed, 15 insertions(+), 20 deletions(-) create mode 100644 default.nix delete mode 100644 test-openssh/default.nix diff --git a/default.nix b/default.nix new file mode 100644 index 0000000..40ad278 --- /dev/null +++ b/default.nix @@ -0,0 +1,10 @@ +{ pkgs ? import { }, ... }: pkgs.rustPlatform.buildRustPackage { + src = pkgs.lib.cleanSource ./.; + pname = "fakessh"; + version = "0.1.0"; + cargoLock.lockFile = ./Cargo.lock; + + meta = { + mainProgram = "fakessh"; + }; +} diff --git a/src/main.rs b/src/main.rs index 312751e..0524c25 100644 --- a/src/main.rs +++ b/src/main.rs @@ -22,7 +22,11 @@ async fn main() -> eyre::Result<()> { ) .init(); - let addr = "0.0.0.0:2222".parse::().unwrap(); + let addr = std::env::var("FAKESSH_LISTEN_ADDR").unwrap_or_else(|_| "0.0.0.0:2222".to_owned()); + + let addr = addr + .parse::() + .wrap_err_with(|| format!("failed to parse listen addr '{addr}'"))?; info!(?addr, "Starting server"); diff --git a/test-openssh/default.nix b/test-openssh/default.nix deleted file mode 100644 index f76bdc9..0000000 --- a/test-openssh/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ pkgs ? import { }, ... }: -let - optimizeWithFlags = pkg: flags: - pkgs.lib.overrideDerivation pkg (old: - let - newflags = pkgs.lib.foldl' (acc: x: "${acc} ${x}") "" flags; - oldflags = - if (pkgs.lib.hasAttr "NIX_CFLAGS_COMPILE" old) - then "${old.NIX_CFLAGS_COMPILE}" - else ""; - in - { - CFLAGS = "-DDEBUG_KEXDH -DDEBUG_KEX -DDEBUG_KEXECDH"; - NIX_CFLAGS_COMPILE = "${oldflags} ${newflags}"; - checkPhase = ""; - doCheck = false; - }); -in -optimizeWithFlags pkgs.openssh [ "-DDEBUG_KEXDH" ]