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: 9d2eec3c599c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d82663c89512
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 9, 2019

  1. networkmanager: no network-manager.service symlink 

    We removed the symlinks for the alias in
* f99bdb2

but we also need to move this definition into the module.
Else we get issues like #70301.

Fixes #70301.
    @worldofpeace
    worldofpeace committed Oct 9, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    callahad Dan Callahan
    GPG key ID: 8D6DD713E9EBA7FD
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cc40ae7 View commit details

  2. nixos/networkmanager: add compat alias for modem-manager.service 

    We probably need this as well.
    @worldofpeace
    worldofpeace committed Oct 9, 2019
    Copy the full SHA
    d82663c View commit details
Showing with 8 additions and 9 deletions.
  1. +8 −2 nixos/modules/services/networking/networkmanager.nix
  2. +0 −7 pkgs/tools/networking/network-manager/default.nix
10 changes: 8 additions & 2 deletions nixos/modules/services/networking/networkmanager.nix
View file
Original file line number Diff line number Diff line change
@@ -465,14 +465,20 @@ in {
mkdir -m 755 -p ${stateDirs}
'';

aliases = [ "dbus-org.freedesktop.NetworkManager.service" ];
aliases = [
"dbus-org.freedesktop.NetworkManager.service"
"network-manager.service"
];
};

systemd.services.NetworkManager-wait-online = {
wantedBy = [ "network-online.target" ];
};

systemd.services.ModemManager.aliases = [ "dbus-org.freedesktop.ModemManager1.service" ];
systemd.services.ModemManager.aliases = [
"dbus-org.freedesktop.ModemManager1.service"
"modem-manager.service"
];

systemd.services.nm-setup-hostsdirs = mkIf dynamicHostsEnabled {
wantedBy = [ "NetworkManager.service" ];
7 changes: 0 additions & 7 deletions pkgs/tools/networking/network-manager/default.nix
View file
Original file line number Diff line number Diff line change
@@ -96,13 +96,6 @@ in stdenv.mkDerivation rec {
ln -s $PWD/libnm/libnm.so.0 ${placeholder "out"}/lib/libnm.so.0
'';

postInstall = ''
# Add the legacy service name from before #51382 to prevent NetworkManager
# from not starting back up:
# TODO: remove this once 19.10 is released
ln -s $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/network-manager.service
'';

passthru = {
updateScript = gnome3.updateScript {
packageName = pname;