From 1bf2ae0396d119b0d36ab02d06a24b8427f53dd9 Mon Sep 17 00:00:00 2001
From: Daniel Kempkens <daniel+git@kempkens.io>
Date: Fri, 26 Jul 2024 17:41:48 +0200
Subject: [PATCH] controld: init

---
 .forgejo/workflows/build.yml        |  8 ++++++++
 .forgejo/workflows/update-flake.yml |  1 +
 flake.nix                           |  1 +
 packages/controld.nix               | 25 +++++++++++++++++++++++++
 packages/q.nix                      |  4 ++--
 5 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 packages/controld.nix

diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml
index c12789f..e9c2efa 100644
--- a/.forgejo/workflows/build.yml
+++ b/.forgejo/workflows/build.yml
@@ -26,6 +26,10 @@ jobs:
       run: |
         nix build '.#bulk-downloader-for-reddit'
         attic push ${{ secrets.ATTIC_CACHE }} $(nix-store -qR --include-outputs $(nix-store -qd ./result) | grep -v '\.drv$')
+    - name: Build controld
+      run: |
+        nix build '.#controld'
+        attic push ${{ secrets.ATTIC_CACHE }} $(nix-store -qR --include-outputs $(nix-store -qd ./result) | grep -v '\.drv$')
     - name: Build discord-downloader-go
       run: |
         nix build '.#discord-downloader-go'
@@ -74,6 +78,10 @@ jobs:
       run: |
         echo "Logging in ..."
         attic login --set-default attic ${{ secrets.ATTIC_ENDPOINT }} ${{ secrets.ATTIC_TOKEN }}
+    - name: Build controld
+      run: |
+        nix build '.#controld'
+        attic push ${{ secrets.ATTIC_CACHE }} $(nix-store -qR --include-outputs $(nix-store -qd ./result) | grep -v '\.drv$')
     - name: Build fennel-ls
       run: |
         nix build '.#fennel-ls'
diff --git a/.forgejo/workflows/update-flake.yml b/.forgejo/workflows/update-flake.yml
index 1ee23fd..53386cf 100644
--- a/.forgejo/workflows/update-flake.yml
+++ b/.forgejo/workflows/update-flake.yml
@@ -20,6 +20,7 @@ jobs:
       run: |
         nix-update --flake anonymous-overflow
         nix-update --flake --version development bulk-downloader-for-reddit
+        nix-update --flake controld
         nix-update --flake discord-downloader-go
         nix-update --flake q
         nix-update --flake redlib 
diff --git a/flake.nix b/flake.nix
index d41cb4c..47a4968 100644
--- a/flake.nix
+++ b/flake.nix
@@ -42,6 +42,7 @@
           {
             anonymous-overflow = callPackage ./packages/anonymous-overflow.nix { };
             bulk-downloader-for-reddit = callPackage ./packages/bulk-downloader-for-reddit.nix { };
+            controld = callPackage ./packages/controld.nix { };
             discord-downloader-go = callPackage ./packages/discord-downloader-go.nix { };
             fennel-ls = callPackage ./packages/fennel-ls.nix { };
             headscale-ui = callPackage ./packages/headscale-ui.nix { };
diff --git a/packages/controld.nix b/packages/controld.nix
new file mode 100644
index 0000000..0f7a2f9
--- /dev/null
+++ b/packages/controld.nix
@@ -0,0 +1,25 @@
+{ pkgs, lib }:
+
+pkgs.buildGoModule rec {
+  pname = "controld";
+  version = "1.3.7";
+
+  src = pkgs.fetchFromGitHub {
+    owner = "Control-D-Inc";
+    repo = "ctrld";
+    rev = "v${version}";
+    hash = "sha256-3rAGH3GfCQR+Ii5KazsgQzydeWlPeHpiEvHNHQXjNVQ=";
+  };
+
+  vendorHash = "sha256-UN0gOFxMS0iWvg6Iv+aeYoduffJ9Zanz1htRh3ANjkY=";
+
+  ldflags = [ "-s" "-w" "-X main.version=${version}" ];
+  doCheck = false;
+
+  meta = with lib; {
+    description = "A highly configurable, multi-protocol DNS forwarding proxy";
+    homepage = "https://github.com/Control-D-Inc/ctrld";
+    license = [ licenses.mit ];
+    platforms = [ "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "x86_64-linux" ];
+  };
+}
diff --git a/packages/q.nix b/packages/q.nix
index 51169ec..30a7fec 100644
--- a/packages/q.nix
+++ b/packages/q.nix
@@ -1,6 +1,6 @@
 { pkgs, lib }:
 
-pkgs.buildGo121Module rec {
+pkgs.buildGoModule rec {
   pname = "q";
   version = "0.19.2";
 
@@ -13,7 +13,7 @@ pkgs.buildGo121Module rec {
 
   vendorHash = "sha256-6kdf+LwMrIjwC3uZHlMdpEHvonxKfr86PQaMOgzgYOc=";
 
-  ldflags = [ "-s" "-w" "-X main.version=release" ];
+  ldflags = [ "-s" "-w" "-X main.version=${version}" ];
   doCheck = false;
 
   meta = with lib; {