From efc3208be2c7ebaf28aae15fa60f3f447f5d2c13 Mon Sep 17 00:00:00 2001 From: Colin Date: Sun, 2 Jun 2024 05:57:51 +0000 Subject: [PATCH] nixos/networkmanager: add a `package` option this is helpful for testing module changes or making downstream patches in a way which doesn't force large rebuilds as an overlay would. --- nixos/modules/services/networking/networkmanager.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index c46ba8fce7b1..caa7b0fffffd 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -129,7 +129,7 @@ let packages = [ - pkgs.networkmanager + cfg.package ] ++ cfg.plugins ++ lib.optionals (!delegateWireless && !enableIwd) [ @@ -161,6 +161,8 @@ in ''; }; + package = mkPackageOption pkgs "networkmanager" { }; + connectionConfig = mkOption { type = with types; @@ -643,7 +645,7 @@ in ${pkgs.envsubst}/bin/envsubst -i ${ini.generate (lib.escapeShellArg profile.n) profile.v} > ${path (lib.escapeShellArg profile.n)} '') (lib.mapAttrsToList (n: v: { inherit n v; }) cfg.ensureProfiles.profiles) + '' - ${pkgs.networkmanager}/bin/nmcli connection reload + ${cfg.package}/bin/nmcli connection reload ''; serviceConfig = { EnvironmentFile = cfg.ensureProfiles.environmentFiles;