movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-09 19:13:26 +03:00
Code Issues Projects Releases Packages Wiki Activity

Revert "nixos/lib/testing: fix network module"

Browse source 
This reverts commit 35fb55d21b.
This commit is contained in:
John Titor 2025-06-08 23:54:55 +05:30
parent 145f715b75
commit 7c873c2d00
No known key found for this signature in database
GPG key ID: 29B0514F4E3C1CC0
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
nixos/lib/testing/network.nix
View file

@ -13,7 +13,6 @@ let
nameValuePair
optionalAttrs
optionalString
optionals
range
toLower
types
@ -96,18 +95,16 @@ let
name: config:
let
hostnames =
[
"${config.networking.hostName}"
]
++ optionals (config.networking.domain != null) [
"${config.networking.hostName}.${config.networking.domain}"
];
optionalString (
config.networking.domain != null
) "${config.networking.hostName}.${config.networking.domain} "
+ "${config.networking.hostName}\n";
in
optionalAttrs (config.networking.primaryIPAddress != "") {
"${config.networking.primaryIPAddress}" = hostnames;
"${config.networking.primaryIPAddress}" = [ hostnames ];
}
// optionalAttrs (config.networking.primaryIPv6Address != "") {
"${config.networking.primaryIPv6Address}" = hostnames;
"${config.networking.primaryIPv6Address}" = [ hostnames ];
}
) nodes;