Skip to content

Commit

Permalink
Merge pull request #45 from spacekitteh/patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
oddlama authored Nov 5, 2024
2 parents 927567a + 1a8c8d0 commit 1e3c638
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion nixos/extractors/systemd-network.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
(lib)
any
attrValues
catAttrs
concatLists
concatStringsSep
filter
Expand Down Expand Up @@ -113,7 +114,7 @@ in {
{
${interfaceName} = {
mac = mkIf ((network.matchConfig.MACAddress or null) != null) network.matchConfig.MACAddress;
addresses = map removeCidrMask (network.address ++ (network.networkConfig.Address or []));
addresses = map removeCidrMask (network.address ++ (catAttrs "Address" network.addresses) ++ (network.networkConfig.Address or []));
gateways = network.gateway ++ (network.networkConfig.Gateway or []);
};
}
Expand Down

0 comments on commit 1e3c638

Please sign in to comment.