diff --git a/.forgejo/workflows/build-container-nix.yaml b/.forgejo/workflows/build-container-nix.yaml index ad5687e..b5aab17 100644 --- a/.forgejo/workflows/build-container-nix.yaml +++ b/.forgejo/workflows/build-container-nix.yaml @@ -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 diff --git a/nixos/ringtail/configuration.nix b/nixos/ringtail/configuration.nix index ad26b5d..5a0035b 100644 --- a/nixos/ringtail/configuration.nix +++ b/nixos/ringtail/configuration.nix @@ -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 = { diff --git a/nixos/ringtail/flake.nix b/nixos/ringtail/flake.nix index f3a5d61..70a1d73 100644 --- a/nixos/ringtail/flake.nix +++ b/nixos/ringtail/flake.nix @@ -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