Merge pull request #200631 from atorres1985-contrib/connman

Connman: refactor

pkgs/tools/networking/connman/default.nix

@@ -1,10 +1,11 @@
-{ callPackage }:
+{ lib, pkgs }:
+
+lib.makeScope pkgs.newScope (self: with self; {
 
-{
   # All the defaults
-  connman = callPackage ./connman.nix { };
+  connman = callPackage ./connman { };
 
-  connmanFull = callPackage ./connman.nix {
+  connmanFull = connman.override {
     # 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;
@@ -14,7 +15,7 @@
     enableTist = true;
   };
 
-  connmanMinimal = callPackage ./connman.nix {
+  connmanMinimal = connman.override {
     enableOpenconnect = false;
     enableOpenvpn = false;
     enableVpnc = false;
@@ -37,4 +38,12 @@
     enableClient = false;
     # enableDatafiles = false; # If disabled, configuration and data files are not installed
   };
-}
+
+  connman_dmenu = callPackage ./connman_dmenu { };
+
+  connman-gtk = callPackage ./connman-gtk { };
+
+  connman-ncurses = callPackage ./connman-ncurses { };
+
+  connman-notify = callPackage ./connman-notify { };
+})

pkgs/top-level/all-packages.nix

@@ -5370,20 +5370,18 @@ with pkgs;
 
   conspy = callPackage ../os-specific/linux/conspy {};
 
-  inherit (callPackage ../tools/networking/connman {})
+  connmanPackages =
+    recurseIntoAttrs (callPackage ../tools/networking/connman { });
+  inherit (connmanPackages)
     connman
     connmanFull
     connmanMinimal
+    connman_dmenu
+    connman-gtk
+    connman-ncurses
+    connman-notify
   ;
 
-  connman-gtk = callPackage ../tools/networking/connman/connman-gtk { };
-
-  connman-ncurses = callPackage ../tools/networking/connman/connman-ncurses { };
-
-  connman-notify = callPackage ../tools/networking/connman/connman-notify { };
-
-  connman_dmenu = callPackage ../tools/networking/connman/connman_dmenu  { };
-
   convertlit = callPackage ../tools/text/convertlit { };
 
   collectd = callPackage ../tools/system/collectd {