git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #74030 from ckauhaus/connman-to-services.networking

connman: move "networking.connman" options to "services.connman"

commit38178a9a5bf9c7c76e7c1e53b9ff12d0bd272e4f authorworldofpeace <worldofpeace@protonmail.ch> dateSun 24 Nov 2019, 21:24 (7 years ago) parent814f910edbf94d
3 files changed+7−6
nixos/modules/rename.nix+1 nixos/modules/services/networking/connman.nix+5−5 nixos/modules/virtualisation/qemu-vm.nix+1−1
nixos/modules/rename.nix+1
@@ -10,6 +10,7 @@ with lib;
1010 (mkRenamedOptionModule [ "networking" "enableRalinkFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
1111 (mkRenamedOptionModule [ "networking" "enableRTL8192cFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
1212 (mkRenamedOptionModule [ "networking" "networkmanager" "useDnsmasq" ] [ "networking" "networkmanager" "dns" ])
13+ (mkRenamedOptionModule [ "networking" "connman" ] [ "services" "connman" ])
1314 (mkChangedOptionModule [ "services" "printing" "gutenprint" ] [ "services" "printing" "drivers" ]
1415 (config:
1516 let enabled = getAttrFromPath [ "services" "printing" "gutenprint" ] config;
nixos/modules/services/networking/connman.nix+5−5
@@ -4,7 +4,7 @@ with pkgs;
44with lib;
55
66let
7− cfg = config.networking.connman;
7+ cfg = config.services.connman;
88 configFile = pkgs.writeText "connman.conf" ''
99 [General]
1010 NetworkInterfaceBlacklist=${concatStringsSep "," cfg.networkInterfaceBlacklist}
@@ -17,7 +17,7 @@ in {
1717
1818 options = {
1919
20− networking.connman = {
20+ services.connman = {
2121
2222 enable = mkOption {
2323 type = types.bool;
@@ -71,13 +71,13 @@ in {
7171
7272 assertions = [{
7373 assertion = !config.networking.useDHCP;
74− message = "You can not use services.networking.connman with services.networking.useDHCP";
74+ message = "You can not use services.connman with networking.useDHCP";
7575 }{
7676 assertion = config.networking.wireless.enable;
77− message = "You must use services.networking.connman with services.networking.wireless";
77+ message = "You must use services.connman with networking.wireless";
7878 }{
7979 assertion = !config.networking.networkmanager.enable;
80− message = "You can not use services.networking.connman with services.networking.networkmanager";
80+ message = "You can not use services.connman with networking.networkmanager";
8181 }];
8282
8383 environment.systemPackages = [ connman ];
nixos/modules/virtualisation/qemu-vm.nix+1−1
@@ -620,7 +620,7 @@ in
620620
621621 # Wireless won't work in the VM.
622622 networking.wireless.enable = mkVMOverride false;
623− networking.connman.enable = mkVMOverride false;
623+ services.connman.enable = mkVMOverride false;
624624
625625 # Speed up booting by not waiting for ARP.
626626 networking.dhcpcd.extraConfig = "noarp";