lol

Merge pull request #3921 from wkennington/master.ipfix

nixos/tests: Fix usage of head function without pkgs.lib

lethalman e453c3c6 ba0c5e7b

+4 -4
+3 -3
nixos/tests/bittorrent.nix
··· 16 16 miniupnpdConf = nodes: pkgs.writeText "miniupnpd.conf" 17 17 '' 18 18 ext_ifname=eth1 19 - listening_ip=${(head nodes.router.config.networking.interfaces.eth2.ip4).address}/24 19 + listening_ip=${(pkgs.lib.head nodes.router.config.networking.interfaces.eth2.ip4).address}/24 20 20 allow 1024-65535 192.168.2.0/24 1024-65535 21 21 ''; 22 22 ··· 53 53 { environment.systemPackages = [ pkgs.transmission ]; 54 54 virtualisation.vlans = [ 2 ]; 55 55 networking.defaultGateway = 56 - (head nodes.router.config.networking.interfaces.eth2.ip4).address; 56 + (pkgs.lib.head nodes.router.config.networking.interfaces.eth2.ip4).address; 57 57 networking.firewall.enable = false; 58 58 }; 59 59 ··· 81 81 # Create the torrent. 82 82 $tracker->succeed("mkdir /tmp/data"); 83 83 $tracker->succeed("cp ${file} /tmp/data/test.tar.bz2"); 84 - $tracker->succeed("transmission-create /tmp/data/test.tar.bz2 -t http://${(head nodes.tracker.config.networking.interfaces.eth1.ip4).address}:6969/announce -o /tmp/test.torrent"); 84 + $tracker->succeed("transmission-create /tmp/data/test.tar.bz2 -t http://${(pkgs.lib.head nodes.tracker.config.networking.interfaces.eth1.ip4).address}:6969/announce -o /tmp/test.torrent"); 85 85 $tracker->succeed("chmod 644 /tmp/test.torrent"); 86 86 87 87 # Start the tracker. !!! use a less crappy tracker
+1 -1
nixos/tests/nat.nix
··· 13 13 { virtualisation.vlans = [ 1 ]; 14 14 networking.firewall.allowPing = true; 15 15 networking.defaultGateway = 16 - (head nodes.router.config.networking.interfaces.eth2.ip4).address; 16 + (pkgs.lib.head nodes.router.config.networking.interfaces.eth2.ip4).address; 17 17 }; 18 18 19 19 router =