From 2d2c472e777f36991541b0627e8ef21c1ac43e01 Mon Sep 17 00:00:00 2001
From: Robin Appelman <robin@icewind.nl>
Date: Fri, 21 Oct 2022 21:47:41 +0200
Subject: [PATCH 1/2] maintainers: add icewind1991

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 426ffbe7666f..c5499dc7945d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5698,6 +5698,12 @@
     githubId = 3661115;
     name = "Ingo Blechschmidt";
   };
+  icewind1991 = {
+    name = "Robin Appelman";
+    email = "robin@icewind.nl";
+    github = "icewind1991";
+    githubId = 1283854;
+  };
   icy-thought = {
     name = "Icy-Thought";
     email = "gilganyx@pm.me";

From d1e1c91a13fe203d46a6af7a33dce7aee1285cb7 Mon Sep 17 00:00:00 2001
From: Robin Appelman <robin@icewind.nl>
Date: Fri, 21 Oct 2022 22:00:54 +0200
Subject: [PATCH 2/2] rconc: init at version 0.1.4

---
 pkgs/tools/networking/rconc/default.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/tools/networking/rconc/default.nix

diff --git a/pkgs/tools/networking/rconc/default.nix b/pkgs/tools/networking/rconc/default.nix
new file mode 100644
index 000000000000..53fc4d0b5aa0
--- /dev/null
+++ b/pkgs/tools/networking/rconc/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, lib, fetchFromGitHub, rustPlatform, pkgs }:
+
+rustPlatform.buildRustPackage rec {
+  version = "0.1.4";
+  pname = "rconc";
+
+  src = fetchFromGitHub {
+    owner = "klemens";
+    repo = pname;
+    rev = "11def656970b9ccf35c40429b5c599a4de7b28fc";
+    sha256 = "sha256-6Bff9NnG1ZEQhntzH5Iq0XEbJBKdwcb0BOn8nCkeWTY=";
+  };
+
+  cargoSha256 = "sha256-rSN/wm52ZhJ8JUEUC51Xv5eIpwvOR3LvTdFjGl64VVk=";
+
+  meta = with lib; {
+    description = "Simple cross-platform RCON client written in rust";
+    homepage = "https://github.com/klemens/rconc";
+    license = licenses.gpl3Only;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 87352531ddf6..bd8b170a0b7e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10730,6 +10730,8 @@ with pkgs;
 
   rcon = callPackage ../tools/networking/rcon { };
 
+  rconc = callPackage ../tools/networking/rconc { };
+
   rdap = callPackage ../tools/networking/rdap { };
 
   rdbtools = callPackage ../development/tools/rdbtools { python = python3; };