From a2d2808270da053cb782d1bc0c01d7a0acd43b73 Mon Sep 17 00:00:00 2001
From: Erich Blume <blume.erich@gmail.com>
Date: Fri, 20 Feb 2026 23:14:46 -0800
Subject: [PATCH] Add dagger CLI to nix runner via github:dagger/nix flake

Dagger was removed from nixpkgs due to trademark concerns. Use the
official dagger/nix flake as a flake input instead, passing the package
through via specialArgs.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 nixos/ringtail/configuration.nix | 4 ++--
 nixos/ringtail/flake.nix         | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/nixos/ringtail/configuration.nix b/nixos/ringtail/configuration.nix
index 83246e4..ad26b5d 100644
--- a/nixos/ringtail/configuration.nix
+++ b/nixos/ringtail/configuration.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, lib, dagger-pkg, ... }:
 
 let
   # Libraries needed by mise-compiled runtimes (python-build, etc.)
@@ -500,7 +500,7 @@ in
       tokenFile = "/etc/forgejo-runner/token.env";
       labels = [ "nix-container-builder:host" ];
       hostPackages = with pkgs; [
-        bash coreutils curl dagger gawk gitMinimal gnused jq nodejs wget
+        bash coreutils curl dagger-pkg gawk gitMinimal gnused jq nodejs wget
         nix skopeo
       ];
       settings = {
diff --git a/nixos/ringtail/flake.nix b/nixos/ringtail/flake.nix
index 70a1d73..f3a5d61 100644
--- a/nixos/ringtail/flake.nix
+++ b/nixos/ringtail/flake.nix
@@ -3,6 +3,10 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
+    dagger = {
+      url = "github:dagger/nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     disko = {
       url = "github:nix-community/disko";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -13,9 +17,10 @@
     };
   };
 
-  outputs = { nixpkgs, disko, home-manager, ... }: {
+  outputs = { nixpkgs, dagger, disko, home-manager, ... }: {
     nixosConfigurations.ringtail = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
+      specialArgs = { dagger-pkg = dagger.packages.x86_64-linux.dagger; };
       modules = [
         disko.nixosModules.disko
         home-manager.nixosModules.home-manager