eblume/blumeops
1
1
Fork 0
Code Issues Pull requests Projects Releases 83 Packages Wiki Activity Actions

Use nix eval instead of dagger for nix runner version extraction

Browse source 
Dagger CLI needs a container runtime (Docker/containerd) to start its
engine, which the bare nix runner doesn't have. Use nix eval directly
instead — it's already available and more appropriate for a nix host.

Reverts the dagger flake input since it's not usable here.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Erich Blume 2026-02-20 23:21:16 -08:00
commit 02f2be5523
3 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.forgejo/workflows/build-container-nix.yaml
View file

@ -82,9 +82,10 @@ jobs:
| sed 's/^ARG CONTAINER_APP_VERSION=//') | sed 's/^ARG CONTAINER_APP_VERSION=//')
fi fi
# Last resort: dagger call nix-version for nixpkgs packages (e.g. authentik) # Last resort: nix eval for nixpkgs packages (e.g. authentik)
if [ -z "$VERSION" ]; then if [ -z "$VERSION" ]; then
VERSION=$(dagger call nix-version --package="$CONTAINER") VERSION=$(nix --extra-experimental-features "nix-command flakes" \
eval --raw "nixpkgs#${CONTAINER}.version")
fi fi
if [ -z "$VERSION" ]; then if [ -z "$VERSION" ]; then

4
nixos/ringtail/configuration.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, lib, dagger-pkg, ... }: { config, pkgs, lib, ... }:
let let
# Libraries needed by mise-compiled runtimes (python-build, etc.) # Libraries needed by mise-compiled runtimes (python-build, etc.)
@ -500,7 +500,7 @@ in
tokenFile = "/etc/forgejo-runner/token.env"; tokenFile = "/etc/forgejo-runner/token.env";
labels = [ "nix-container-builder:host" ]; labels = [ "nix-container-builder:host" ];
hostPackages = with pkgs; [ hostPackages = with pkgs; [
bash coreutils curl dagger-pkg gawk gitMinimal gnused jq nodejs wget bash coreutils curl gawk gitMinimal gnused jq nodejs wget
nix skopeo nix skopeo
]; ];
settings = { settings = {

7
nixos/ringtail/flake.nix
View file

@ -3,10 +3,6 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
dagger = {
url = "github:dagger/nix";
inputs.nixpkgs.follows = "nixpkgs";
};
disko = { disko = {
url = "github:nix-community/disko"; url = "github:nix-community/disko";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -17,10 +13,9 @@
}; };
}; };
outputs = { nixpkgs, dagger, disko, home-manager, ... }: { outputs = { nixpkgs, disko, home-manager, ... }: {
nixosConfigurations.ringtail = nixpkgs.lib.nixosSystem { nixosConfigurations.ringtail = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { dagger-pkg = dagger.packages.x86_64-linux.dagger; };
modules = [ modules = [
disko.nixosModules.disko disko.nixosModules.disko
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager