From f620b06647fdd0529ee2ceb23f86dfa16bcab058 Mon Sep 17 00:00:00 2001
From: Miroslav Vadkerti <mvadkert@redhat.com>
Date: Mon, 7 Jul 2025 13:09:14 +0200
Subject: [PATCH 1/2] maintainers: add thrix

Signed-off-by: Miroslav Vadkerti <mvadkert@redhat.com>
---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 813c267fe665..785e153aee1f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -25309,6 +25309,12 @@
     githubId = 1761259;
     name = "Eric Roberts";
   };
+  thrix = {
+    email = "mvadkert@redhat.com";
+    github = "thrix";
+    githubId = 633969;
+    name = "Miroslav Vadkerti";
+  };
   thtrf = {
     email = "thtrf@proton.me";
     github = "thtrf";

From 00cc60953c18c84550ac5c76eea9a5475547c0c5 Mon Sep 17 00:00:00 2001
From: Miroslav Vadkerti <mvadkert@redhat.com>
Date: Fri, 27 Jun 2025 02:35:18 +0200
Subject: [PATCH 2/2] toolhive: init at 0.0.47

Signed-off-by: Miroslav Vadkerti <mvadkert@redhat.com>
Co-authored-by: Acid Bong <acidbong@tilde.club>
---
 pkgs/by-name/to/toolhive/package.nix | 55 ++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 pkgs/by-name/to/toolhive/package.nix

diff --git a/pkgs/by-name/to/toolhive/package.nix b/pkgs/by-name/to/toolhive/package.nix
new file mode 100644
index 000000000000..3271d421732c
--- /dev/null
+++ b/pkgs/by-name/to/toolhive/package.nix
@@ -0,0 +1,55 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+  testers,
+  toolhive,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "toolhive";
+  version = "0.0.47";
+
+  src = fetchFromGitHub {
+    owner = "stacklok";
+    repo = "toolhive";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-FXJUEEyCw7ChuzmSAzwXd2LoJXT6vpH+j3muXx5TjPI=";
+  };
+
+  vendorHash = "sha256-aP923ezK4/2zTaU9QQLUmNN6KIddOaTlpsYMT2flRaE=";
+
+  # Build only the main CLI and operator binaries
+  subPackages = [
+    "cmd/thv"
+    "cmd/thv-operator"
+  ];
+
+  doCheck = true;
+
+  passthru = {
+    updateScript = nix-update-script { };
+    tests = {
+      version = testers.testVersion {
+        package = toolhive;
+        command = "thv version";
+        version = "ToolHive build-unknown";
+      };
+    };
+  };
+
+  meta = {
+    description = "Run any MCP server — securely, instantly, anywhere";
+    longDescription = ''
+      ToolHive is an open-source tool for deploying Model Context Protocol (MCP)
+      servers with a focus on security and ease of use. It provides a CLI to
+      discover and deploy MCP servers, run servers in isolated containers,
+      manage server configurations, and auto-configure clients like GitHub Copilot.
+    '';
+    homepage = "https://github.com/stacklok/toolhive";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ thrix ];
+    mainProgram = "thv";
+  };
+})