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
base: a3099c9d35c2
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: b1aa9cbdbfaa
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 26, 2018

  1. nixos/tests/networking: fix routes tests 

    The output format of `ip route` changed, it now explicitly
shows "proto static" for static routes.
    @xeji
    xeji committed Aug 26, 2018
    Configuration menu
    Copy the full SHA
    f021702 View commit details
    Browse the repository at this point in the history

  2. nixos/tests/networking: fix "virtual" tests 

    `ip route` now displays extended tun attributes, so the expected
output of this test changed.

Upstream change: https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=118eda77d6602616bc523a17ee45171e879d1818
    @xeji
    xeji committed Aug 26, 2018
    Configuration menu
    Copy the full SHA
    3f8756c View commit details
    Browse the repository at this point in the history

  3. Merge pull request #45649 from xeji/p/networking-tests 

    nixos/tests/networking: fix routes and virtual tests
    @Mic92
    Mic92 committed Aug 26, 2018
    Configuration menu
    Copy the full SHA
    b1aa9cb View commit details
    Browse the repository at this point in the history