From 07f760c9b78ad1b30b29170204c5441047e57bc3 Mon Sep 17 00:00:00 2001 From: Kiara Grouwstra Date: Fri, 20 Jun 2025 13:27:45 +0200 Subject: [PATCH] unrelated improvements --- .forgejo/workflows/ci.yaml | 4 ++-- deployment/check/common/deployerNode.nix | 13 ++++++------- infra/common/resource.nix | 4 ++-- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.forgejo/workflows/ci.yaml b/.forgejo/workflows/ci.yaml index f7f0a438..44133a5d 100644 --- a/.forgejo/workflows/ci.yaml +++ b/.forgejo/workflows/ci.yaml @@ -25,13 +25,13 @@ jobs: runs-on: native steps: - uses: actions/checkout@v4 - - run: cd services && nix-build -A tests.peertube + - run: nix-build services -A tests.peertube check-panel: runs-on: native steps: - uses: actions/checkout@v4 - - run: cd panel && nix-build -A tests + - run: nix-build panel -A tests check-deployment-basic: runs-on: native diff --git a/deployment/check/common/deployerNode.nix b/deployment/check/common/deployerNode.nix index 7236fc26..d2f287d6 100644 --- a/deployment/check/common/deployerNode.nix +++ b/deployment/check/common/deployerNode.nix @@ -53,13 +53,12 @@ in system.extraDependencies = [ - "${inputs.flake-parts}" - "${inputs.flake-parts.inputs.nixpkgs-lib}" - "${inputs.nixops4}" - "${inputs.nixops4-nixos}" - "${inputs.nixpkgs}" - - "${sources.flake-inputs}" + inputs.flake-parts + inputs.flake-parts.inputs.nixpkgs-lib + inputs.nixops4 + inputs.nixops4-nixos + inputs.nixpkgs + sources.flake-inputs pkgs.stdenv pkgs.stdenvNoCC diff --git a/infra/common/resource.nix b/infra/common/resource.nix index ebaea6c6..4fcf7f3c 100644 --- a/infra/common/resource.nix +++ b/infra/common/resource.nix @@ -34,8 +34,8 @@ in ## should go into the `./nixos` subdirectory. nixos.module = { imports = [ - (import "${agenix}/modules/age.nix") - (import "${disko}/module.nix") + "${agenix}/modules/age.nix" + "${disko}/module.nix" ./options.nix ./nixos ];