Use nix eval instead of dagger for nix runner version extraction
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:
parent
de037ae51f
commit
02f2be5523
3 changed files with 6 additions and 10 deletions
|
|
@ -82,9 +82,10 @@ jobs:
|
|||
| sed 's/^ARG CONTAINER_APP_VERSION=//')
|
||||
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
|
||||
VERSION=$(dagger call nix-version --package="$CONTAINER")
|
||||
VERSION=$(nix --extra-experimental-features "nix-command flakes" \
|
||||
eval --raw "nixpkgs#${CONTAINER}.version")
|
||||
fi
|
||||
|
||||
if [ -z "$VERSION" ]; then
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, pkgs, lib, dagger-pkg, ... }:
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
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-pkg gawk gitMinimal gnused jq nodejs wget
|
||||
bash coreutils curl gawk gitMinimal gnused jq nodejs wget
|
||||
nix skopeo
|
||||
];
|
||||
settings = {
|
||||
|
|
|
|||
|
|
@ -3,10 +3,6 @@
|
|||
|
||||
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";
|
||||
|
|
@ -17,10 +13,9 @@
|
|||
};
|
||||
};
|
||||
|
||||
outputs = { nixpkgs, dagger, disko, home-manager, ... }: {
|
||||
outputs = { nixpkgs, 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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue