Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8b4fbb8d315f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4a03ddd08d47
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Oct 8, 2019

  1. nixos/tests/{ferm,networking}: fix eval with networkd 

    The networking.virtual test does not work with networkd yet, for
multiple reasons:

- network-online.target is not reached, because tun0 and tap0 are
  considered as required for online but _not_ brought up or assigned
  the configured addresses
- the commands later in the test rely on some units from the scripted
  network setup

cc @fpletz networkd exper
cc @globin we looked at this together

(cherry picked from commit a3a441c)
    @lheckemann
    lheckemann committed Oct 8, 2019
    Copy the full SHA
    4a03ddd View commit details
Showing with 2 additions and 0 deletions.
  1. +1 −0 nixos/tests/ferm.nix
  2. +1 −0 nixos/tests/networking.nix
1 change: 1 addition & 0 deletions nixos/tests/ferm.nix
View file
Original file line number Diff line number Diff line change
@@ -23,6 +23,7 @@ import ./make-test.nix ({ pkgs, ...} : {
networking = {
dhcpcd.enable = false;
useNetworkd = true;
useDHCP = false;
interfaces.eth1.ipv6.addresses = mkOverride 0 [ { address = "fd00::1"; prefixLength = 64; } ];
interfaces.eth1.ipv4.addresses = mkOverride 0 [ { address = "192.168.1.1"; prefixLength = 24; } ];
};
1 change: 1 addition & 0 deletions nixos/tests/networking.nix
View file
Original file line number Diff line number Diff line change
@@ -450,6 +450,7 @@ let
name = "Virtual";
machine = {
networking.useNetworkd = networkd;
networking.useDHCP = false;
networking.interfaces.tap0 = {
ipv4.addresses = [ { address = "192.168.1.1"; prefixLength = 24; } ];
ipv6.addresses = [ { address = "2001:1470:fffd:2096::"; prefixLength = 64; } ];