initial commit

packages/ct.nix

@@ -0,0 +1,8 @@
+{
+  writeShellApplication,
+  dtach,
+}:
+import ./mk-script.nix { inherit writeShellApplication; } {
+  name = "ct";
+  runtimeInputs = [ dtach ];
+}

packages/hopper-lazy-resolve.patch

@@ -0,0 +1,92 @@
+diff --git a/src/config/router.rs b/src/config/router.rs
+index cfee4f8..9247cc3 100644
+--- a/src/config/router.rs
++++ b/src/config/router.rs
+@@ -58,11 +58,10 @@ impl Router for RouterConfig {
+             .or(self.default.as_ref())
+             .ok_or(RouterError::NoServer)?;
+ 
+-        let address: SocketAddr = match route.ip {
+-            RouteType::Simple(address) => address.into(),
+-            RouteType::Balanced(ref list) => {
+-                let hash = client.hash();
+-                list.get(hash as usize)
++        let address: SocketAddr = match &route.ip {
++            RouteType::Simple(addr) => addr.resolve().ok_or(RouterError::Unavailable)?,
++            RouteType::Balanced(list) => {
++                list.get(client.hash() as usize).ok_or(RouterError::Unavailable)?
+             }
+         };
+ 
+diff --git a/src/config/router/balancer.rs b/src/config/router/balancer.rs
+index 770a01b..b2e2491 100644
+--- a/src/config/router/balancer.rs
++++ b/src/config/router/balancer.rs
+@@ -22,7 +22,7 @@ pub struct Balanced {
+ // }
+ 
+ impl Balanced {
+-    pub(super) fn get(&self, n: usize) -> SocketAddr {
+-        self.servers[n & self.servers.len()].into()
++    pub(super) fn get(&self, n: usize) -> Option<SocketAddr> {
++        self.servers[n % self.servers.len()].resolve()
+     }
+ }
+diff --git a/src/config/router/resolver.rs b/src/config/router/resolver.rs
+index b66a16a..8fd3b0d 100644
+--- a/src/config/router/resolver.rs
++++ b/src/config/router/resolver.rs
+@@ -2,26 +2,26 @@ use std::net::{SocketAddr, ToSocketAddrs};
+ 
+ use serde::{Deserialize, Deserializer};
+ 
+-#[derive(Deserialize, Debug, Clone, Copy)]
+-pub(super) struct ResolvableAddr(#[serde(deserialize_with = "resolve_hostname")] SocketAddr);
++#[derive(Deserialize, Debug, Clone)]
++pub(super) struct ResolvableAddr(#[serde(deserialize_with = "parse_addr_string")] String);
+ 
+-fn resolve_hostname<'de, D>(deserializer: D) -> Result<SocketAddr, D::Error>
++fn parse_addr_string<'de, D>(deserializer: D) -> Result<String, D::Error>
+ where
+     D: Deserializer<'de>,
+ {
+     use serde::de::Error;
+ 
+-    let inner = <String>::deserialize(deserializer)?;
+-
+-    let mut addr = inner
+-        .to_socket_addrs()
+-        .map_err(|err| Error::custom(format!("invalid hostname format: {err}")))?;
+-
+-    addr.next().ok_or_else(|| Error::missing_field("address"))
++    let s = String::deserialize(deserializer)?;
++    if !s.contains(':') {
++        return Err(Error::custom(format!(
++            "invalid socket address syntax, expected host:port: {s}"
++        )));
++    }
++    Ok(s)
+ }
+ 
+-impl From<ResolvableAddr> for SocketAddr {
+-    fn from(addr: ResolvableAddr) -> Self {
+-        addr.0
++impl ResolvableAddr {
++    pub fn resolve(&self) -> Option<SocketAddr> {
++        self.0.to_socket_addrs().ok()?.next()
+     }
+ }
+diff --git a/src/server/router.rs b/src/server/router.rs
+index 4aae8e7..ad2849b 100644
+--- a/src/server/router.rs
++++ b/src/server/router.rs
+@@ -7,6 +7,9 @@ use thiserror::Error;
+ pub enum RouterError {
+     #[error("no server with such hostname has been found")]
+     NoServer,
++
++    #[error("backend server is currently unavailable")]
++    Unavailable,
+ }
+ 
+ // #[async_trait::async_trait]

packages/hopper-rs.nix

@@ -0,0 +1,29 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+}:
+rustPlatform.buildRustPackage {
+  pname = "hopper-rs";
+  version = "v0.6.2-2-g73cb171";
+
+  src = fetchFromGitHub {
+    owner = "bra1l0r";
+    repo = "hopper-rs";
+    rev = "73cb171e203cef6c9c444b69c43ceefa2da213e4";
+    hash = "sha256-QhDH03KHKtsh7Ch44TE02sr42i/CPD9BGK7QQ6PwHKc=";
+  };
+
+  patches = [ ./hopper-lazy-resolve.patch ];
+
+  cargoHash = "sha256-bC5BlP3opYYHkK/mauF9qdTczTdmGQD7yEOCOMylNOc=";
+
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Lightweight Minecraft reverse proxy";
+    homepage = "https://github.com/bra1l0r/hopper-rs";
+    license = licenses.gpl3Only;
+    mainProgram = "hopper";
+  };
+}

packages/kitty-terminfo.nix

@@ -0,0 +1,9 @@
+{
+  runCommand,
+  ncurses,
+  kitty,
+}:
+runCommand "kitty-terminfo" { nativeBuildInputs = [ ncurses ]; } ''
+  mkdir -p $out/share/terminfo
+  tic -x -o $out/share/terminfo ${kitty.src}/terminfo/kitty.terminfo
+''

packages/mk-script.nix

@@ -0,0 +1,9 @@
+{ writeShellApplication }:
+{
+  name,
+  runtimeInputs ? [ ],
+}:
+writeShellApplication {
+  inherit name runtimeInputs;
+  text = builtins.readFile (../scripts + "/${name}.sh");
+}

packages/server-kexec.nix

@@ -0,0 +1,8 @@
+{
+  writeShellApplication,
+  kexec-tools,
+}:
+import ./mk-script.nix { inherit writeShellApplication; } {
+  name = "server-kexec";
+  runtimeInputs = [ kexec-tools ];
+}

packages/server-rebuild.nix

@@ -0,0 +1,2 @@
+{ writeShellApplication }:
+import ./mk-script.nix { inherit writeShellApplication; } { name = "server-rebuild"; }

packages/server-status.nix

@@ -0,0 +1,2 @@
+{ writeShellApplication }:
+import ./mk-script.nix { inherit writeShellApplication; } { name = "server-status"; }

packages/sshpiper.nix

@@ -0,0 +1,33 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+buildGoModule {
+  pname = "sshpiper";
+  version = "unstable-2024";
+
+  src = fetchFromGitHub {
+    owner = "tg123";
+    repo = "sshpiper";
+    rev = "e5c5b904cfa57f7d60e37cb38cdb0bbcaadb022e";
+    hash = "sha256-8Lqf7pCcAWAgz7tclKiV0DyHhbaaBule6/X30Fzm8DY=";
+    fetchSubmodules = true;
+  };
+
+  vendorHash = "sha256-6FU1r6vY6AorbP5z+C3zJpHQzpqzkzK9iQFnxDmYv8c=";
+
+  subPackages = [
+    "cmd/sshpiperd"
+    "plugin/yaml"
+  ];
+
+  tags = [ "full" ];
+
+  meta = with lib; {
+    description = "SSH reverse proxy / multiplexer";
+    homepage = "https://github.com/tg123/sshpiper";
+    license = licenses.mit;
+    mainProgram = "sshpiperd";
+  };
+}