From aaa6a5cf0b440eec67c2f7febe63578183a9ef4e Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Thu, 10 Nov 2022 07:41:02 -0300
Subject: [PATCH 1/2] connman: move its expression to a dedicated directory

It is a typical pattern of Nixpkgs, and also helps when adding extra files like
updating scripts, custom patches &c.
---
 .../networking/connman/{connman.nix => connman/default.nix} | 0
 pkgs/tools/networking/connman/default.nix                   | 6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename pkgs/tools/networking/connman/{connman.nix => connman/default.nix} (100%)

diff --git a/pkgs/tools/networking/connman/connman.nix b/pkgs/tools/networking/connman/connman/default.nix
similarity index 100%
rename from pkgs/tools/networking/connman/connman.nix
rename to pkgs/tools/networking/connman/connman/default.nix
diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix
index ccceaa30b043..12646617b58a 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/pkgs/tools/networking/connman/default.nix
@@ -2,9 +2,9 @@
 
 {
   # 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 +14,7 @@
     enableTist = true;
   };
 
-  connmanMinimal = callPackage ./connman.nix {
+  connmanMinimal = connman.override {
     enableOpenconnect = false;
     enableOpenvpn = false;
     enableVpnc = false;

From ad4e35bc155df3c294fc51c3ccc48fb49ada0dc8 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Thu, 10 Nov 2022 22:53:33 -0300
Subject: [PATCH 2/2] connmanPackages: group all connman-related expressions

---
 pkgs/tools/networking/connman/default.nix | 15 ++++++++++++---
 pkgs/top-level/all-packages.nix           | 16 +++++++---------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix
index 12646617b58a..4cc9e5e2b318 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/pkgs/tools/networking/connman/default.nix
@@ -1,6 +1,7 @@
-{ callPackage }:
+{ lib, pkgs }:
+
+lib.makeScope pkgs.newScope (self: with self; {
 
-{
   # All the defaults
   connman = callPackage ./connman { };
 
@@ -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 { };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c940bfd431e..e69c8a604614 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5362,20 +5362,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 {