summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoron Behar <doron.behar@gmail.com>2020-03-28 12:28:29 +0300
committerDoron Behar <doron.behar@gmail.com>2020-03-28 12:28:29 +0300
commitbffec3d88448c57c84527fe02bdfc988573b3db2 (patch)
treeac97dc99456be8062823bb7dcafa7e0fad1c4f5a
parent480397693ef6e9ca92ab6e1d015e31232d62f2c7 (diff)
nixos/connman: add TODOs regarding connman + network-manager
-rw-r--r--nixos/modules/services/networking/connman.nix2
-rw-r--r--pkgs/tools/networking/connman/default.nix2
2 files changed, 4 insertions, 0 deletions
diff --git a/nixos/modules/services/networking/connman.nix b/nixos/modules/services/networking/connman.nix
index 53adc337fa47..6ccc2dffb267 100644
--- a/nixos/modules/services/networking/connman.nix
+++ b/nixos/modules/services/networking/connman.nix
@@ -96,6 +96,8 @@ in {
assertion = !config.networking.useDHCP;
message = "You can not use services.connman with networking.useDHCP";
}{
+ # TODO: connman seemingly can be used along network manager and
+ # connmanFull supports this - so this should be worked out somehow
assertion = !config.networking.networkmanager.enable;
message = "You can not use services.connman with networking.networkmanager";
}];
diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix
index 9e87c9742ea0..ccceaa30b043 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/pkgs/tools/networking/connman/default.nix
@@ -5,6 +5,8 @@
connman = callPackage ./connman.nix { };
connmanFull = callPackage ./connman.nix {
+ # TODO: Why is this in `connmanFull` and not the default build? See TODO in
+ # nixos/modules/services/networking/connman.nix (near the assertions)
enableNetworkManager = true;
enableHh2serialGps = true;
enableL2tp = true;