From a0317d844db18403bd8d3d0d19443e2d22273d3c Mon Sep 17 00:00:00 2001
From: Kenneth Tan <i.am@kennethtan.xyz>
Date: Sat, 6 Sep 2025 18:57:38 +0800
Subject: [PATCH 1/2] maintainers: add dustyhorizon

---
 maintainers/maintainer-list.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 762e8f8f00c4..c58cf5f7f843 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7029,6 +7029,13 @@
     name = "Duncan Dean";
     keys = [ { fingerprint = "9484 44FC E03B 05BA 5AB0  591E C37B 1C1D 44C7 86EE"; } ];
   };
+  dustyhorizon = {
+    name = "Kenneth Tan";
+    email = "i.am@kennethtan.xyz";
+    github = "dustyhorizon";
+    githubId = 4987132;
+    keys = [ { fingerprint = "1021 2207 286B F15B 0CF1  C5EA D70C C9F5 CEF4 EEB8"; } ];
+  };
   DutchGerman = {
     name = "Stefan Visser";
     email = "stefan.visser@apm-ecampus.de";

From 34e35a0ca6c348bd05bbe5bab3ded066ff576b68 Mon Sep 17 00:00:00 2001
From: Kenneth Tan <i.am@kennethtan.xyz>
Date: Sat, 6 Sep 2025 18:59:25 +0800
Subject: [PATCH 2/2] lightway: init at 0-unstable-2025-09-04

Co-Authored-By: usertam <code@usertam.dev>
---
 pkgs/by-name/li/lightway/package.nix | 59 ++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 pkgs/by-name/li/lightway/package.nix

diff --git a/pkgs/by-name/li/lightway/package.nix b/pkgs/by-name/li/lightway/package.nix
new file mode 100644
index 000000000000..051d056855e6
--- /dev/null
+++ b/pkgs/by-name/li/lightway/package.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoconf,
+  automake,
+  libtool,
+  rustPlatform,
+}:
+
+rustPlatform.buildRustPackage {
+  pname = "lightway";
+  version = "0-unstable-2025-09-04";
+
+  src = fetchFromGitHub {
+    owner = "expressvpn";
+    repo = "lightway";
+    rev = "4eb836158607c83d47226703de5a043519586782";
+    hash = "sha256-sNhTdJTxNxHMVswyzizgBfGbmJhYmMZY/5nVD7ScLjM=";
+  };
+
+  cargoHash = "sha256-3/6yEyGntyxxCqrMy2M9dtV2pWiD4M0Rtnb52I4n9nU=";
+  cargoDepsName = "lightway";
+
+  cargoBuildFlags = lib.cli.toGNUCommandLine { } {
+    package = [
+      "lightway-client"
+      "lightway-server"
+    ];
+
+    features = lib.optionals stdenv.hostPlatform.isLinux [
+      "io-uring"
+    ];
+  };
+
+  # Some tests rely on debug_assert! and fail in release.
+  # https://github.com/expressvpn/lightway/issues/274
+  checkType = "debug";
+
+  # For wolfSSL.
+  nativeBuildInputs = [
+    autoconf
+    automake
+    libtool
+    rustPlatform.bindgenHook
+  ];
+
+  meta = {
+    description = "A modern VPN protocol in Rust";
+    homepage = "https://expressvpn.com/lightway";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [
+      dustyhorizon
+      usertam
+    ];
+    platforms = with lib.platforms; darwin ++ linux;
+    mainProgram = "lightway-client";
+  };
+}