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