moar extraDependencies

[wip] handling env file (still fails)
rm unused dep nix-templating fix imports
2025-07-03 17:07:27 +02:00 · 2025-07-03 17:07:27 +02:00 · 2025-07-03 17:06:54 +02:00 · 2025-07-03 17:06:54 +02:00 · 2025-07-03 17:06:04 +02:00 · 2025-07-03 17:06:04 +02:00
3 changed files with 10 additions and 11 deletions
--- a/deployment/check/common/deployerNode.nix
+++ b/deployment/check/common/deployerNode.nix
@ -54,15 +54,15 @@ in

    system.extraDependencies =
      [
-        "${inputs.flake-parts}"
-        "${inputs.flake-parts.inputs.nixpkgs-lib}"
-        "${inputs.nixops4}"
-        "${inputs.nixops4-nixos}"
-        "${inputs.nixpkgs}"
+        inputs.flake-parts
+        inputs.flake-parts.inputs.nixpkgs-lib
+        inputs.nixops4
+        inputs.nixops4-nixos
+        inputs.nixpkgs

-        "${sources.nixpkgs}"
-        "${sources.flake-inputs}"
-        "${sources.vars}"
+        sources.nixpkgs
+        sources.flake-inputs
+        sources.vars

        pkgs.stdenv
        pkgs.stdenvNoCC
--- a/infra/common/resource.nix
+++ b/infra/common/resource.nix
@ -50,9 +50,9 @@ in
    ## the secret's file.
    age.secrets = concatMapAttrs (
      name: secret:
-      optionalAttrs (elem config.fediversityVm.hostPublicKey secret.publicKeys) ({
+      optionalAttrs (elem config.fediversityVm.hostPublicKey secret.publicKeys) {
        ${removeSuffix ".age" name}.file = secrets.rootPath + "/${name}";
-      })
+      }
    ) secrets.mapping;

    ## FIXME: Remove direct root authentication once the NixOps4 NixOS provider
--- a/infra/makeInstallerIso.nix
+++ b/infra/makeInstallerIso.nix
@ -15,7 +15,6 @@ let

  installer =
    {
-      config,
      pkgs,
      lib,
      ...
Author	SHA1	Message	Date
Nicolas “Niols” Jeannerod	1e51393fb8	moar extraDependencies	2025-07-03 17:07:27 +02:00
Kiara Grouwstra	099484d8f4	[wip] handling env file (still fails) rm unused dep nix-templating fix imports	2025-07-03 17:07:27 +02:00
Kiara Grouwstra	152548535e	use templating fork	2025-07-03 17:06:54 +02:00
Kiara Grouwstra	7763c4db1f	add tests, fix some things upgrade memory to resolve oom	2025-07-03 17:06:54 +02:00
Kiara Grouwstra	df35afcca1	move from dev to operator revert add qemu import	2025-07-03 17:06:04 +02:00
Kiara Grouwstra	24e1a092c4	WIP: add attic cache, see #92 flesh out attic TODO keys nginx-port testing fix key fix key	2025-07-03 17:06:04 +02:00
Kiara Grouwstra	a882de0b8e	address linter gripes in nix files (#430 ) Reviewed-on: Fediversity/Fediversity#430 Reviewed-by: Nicolas Jeannerod <nicolas.jeannerod@moduscreate.com> Co-authored-by: Kiara Grouwstra <kiara@procolix.eu> Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>	2025-07-03 15:56:16 +02:00
Kiara Grouwstra	05572ff69e	remove string interpolation from imports (#429 ) Reviewed-on: Fediversity/Fediversity#429 Reviewed-by: Nicolas Jeannerod <nicolas.jeannerod@moduscreate.com> Co-authored-by: Kiara Grouwstra <kiara@procolix.eu> Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>	2025-07-03 15:55:39 +02:00