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: 99a3d7a86fce
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 4b2151b9faf2
Choose a head ref
  • 3 commits
  • 4 files changed
  • 2 contributors

Commits on Mar 12, 2020

  1. tests/networking: remove pkgs.lib usages. 

    (cherry picked from commit 1115959)
    @picnoir @flokli
    picnoir authored and flokli committed Mar 12, 2020
    Copy the full SHA
    cde800d View commit details
    Browse the repository at this point in the history

  2. nixos/zerotierone: switch from manually generating the .link file to … 

    …use the module

Previously, systemd.network.links was only respected with networkd
enabled, but it's really udev taking care of links, no matter if
networkd is enabled or not.

With our module fixed, there's no need to manually manage the text file
anymore.

(cherry picked from commit 3d1079a)
    @flokli
    flokli committed Mar 12, 2020
    Copy the full SHA
    f549fbf View commit details
    Browse the repository at this point in the history

  3. nixos/networkd: respect systemd.network.links also with disabled syst… 

    …emd-networkd

This mirrors the behaviour of systemd - It's udev that parses `.link`
files, not `systemd-networkd`.

(cherry picked from commit 36ef112)
    @flokli
    flokli committed Mar 12, 2020
    Copy the full SHA
    4b2151b View commit details
    Browse the repository at this point in the history