JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nixos/connman: add TODOs regarding connman + network-manager

Browse Source
This commit is contained in:
Doron Behar 2020-03-28 12:28:29 +03:00
parent 480397693e
commit bffec3d884
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/networking/connman.nix
View File

@ -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";
}];

2
pkgs/tools/networking/connman/default.nix
View File

@ -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;