From 9601caba4fed725415a7fcd7a6d65fdc1c057ab3 Mon Sep 17 00:00:00 2001 From: catvayor Date: Tue, 10 Dec 2024 13:46:14 +0100 Subject: [PATCH] fix(netconf/dgn-hardware): missing parenthesis --- hive.nix | 3 +-- machines/netconf/netcore02.nix | 1 + modules/netconf/dgn-hardware/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hive.nix b/hive.nix index d0ee857..60716f6 100644 --- a/hive.nix +++ b/hive.nix @@ -126,8 +126,7 @@ in }; netconf = { - evalConfig = - args: (import nixpkgs.nixos.unstable.path { }).lib.evalModules (builtins.trace args.modules args); + evalConfig = (import nixpkgs.nixos.unstable.path { }).lib.evalModules; defaults = { nodeMeta, nodePath, ... }: diff --git a/machines/netconf/netcore02.nix b/machines/netconf/netcore02.nix index 862adb8..b104fbf 100644 --- a/machines/netconf/netcore02.nix +++ b/machines/netconf/netcore02.nix @@ -40,6 +40,7 @@ in ]; }; }; + dgn-hardware.model = "EX2300-48P"; dgn-interfaces = { # "ge-0/0/0" = AP-staging; # "ge-0/0/1" = AP-staging; diff --git a/modules/netconf/dgn-hardware/default.nix b/modules/netconf/dgn-hardware/default.nix index e49c062..49261e3 100644 --- a/modules/netconf/dgn-hardware/default.nix +++ b/modules/netconf/dgn-hardware/default.nix @@ -22,7 +22,7 @@ let interfaces // ( let - ports = import ./. + "${model}.nix" range; + ports = import (./. + "/${model}.nix") range; in (mkInterfaces { supportPoE = true;