diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/by-name/co/connman-gtk/package.nix (renamed from pkgs/tools/networking/connman/connman-gtk/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/by-name/co/connman-ncurses/package.nix (renamed from pkgs/tools/networking/connman/connman-ncurses/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/by-name/co/connman-notify/package.nix (renamed from pkgs/tools/networking/connman/connman-notify/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/by-name/co/connman/create-libppp-compat.h.patch (renamed from pkgs/tools/networking/connman/connman/create-libppp-compat.h.patch) | 0 | ||||
-rw-r--r-- | pkgs/by-name/co/connman/package.nix (renamed from pkgs/tools/networking/connman/connman/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/by-name/co/connman_dmenu/package.nix (renamed from pkgs/tools/networking/connman/connman_dmenu/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/tools/networking/connman/default.nix | 49 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 43 |
8 files changed, 32 insertions, 60 deletions
diff --git a/pkgs/tools/networking/connman/connman-gtk/default.nix b/pkgs/by-name/co/connman-gtk/package.nix index c75254a27b158..c75254a27b158 100644 --- a/pkgs/tools/networking/connman/connman-gtk/default.nix +++ b/pkgs/by-name/co/connman-gtk/package.nix diff --git a/pkgs/tools/networking/connman/connman-ncurses/default.nix b/pkgs/by-name/co/connman-ncurses/package.nix index 9d638c48000a9..9d638c48000a9 100644 --- a/pkgs/tools/networking/connman/connman-ncurses/default.nix +++ b/pkgs/by-name/co/connman-ncurses/package.nix diff --git a/pkgs/tools/networking/connman/connman-notify/default.nix b/pkgs/by-name/co/connman-notify/package.nix index cbf500913038c..cbf500913038c 100644 --- a/pkgs/tools/networking/connman/connman-notify/default.nix +++ b/pkgs/by-name/co/connman-notify/package.nix diff --git a/pkgs/tools/networking/connman/connman/create-libppp-compat.h.patch b/pkgs/by-name/co/connman/create-libppp-compat.h.patch index dde8a174ca2a6..dde8a174ca2a6 100644 --- a/pkgs/tools/networking/connman/connman/create-libppp-compat.h.patch +++ b/pkgs/by-name/co/connman/create-libppp-compat.h.patch diff --git a/pkgs/tools/networking/connman/connman/default.nix b/pkgs/by-name/co/connman/package.nix index a90fb1ffd727a..a90fb1ffd727a 100644 --- a/pkgs/tools/networking/connman/connman/default.nix +++ b/pkgs/by-name/co/connman/package.nix diff --git a/pkgs/tools/networking/connman/connman_dmenu/default.nix b/pkgs/by-name/co/connman_dmenu/package.nix index 86e5a62fb8dec..86e5a62fb8dec 100644 --- a/pkgs/tools/networking/connman/connman_dmenu/default.nix +++ b/pkgs/by-name/co/connman_dmenu/package.nix diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix deleted file mode 100644 index 6c2ea19c54fc8..0000000000000 --- a/pkgs/tools/networking/connman/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, pkgs }: - -lib.makeScope pkgs.newScope (self: with self; { - - # All the defaults - connman = callPackage ./connman { }; - - 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) - enableNetworkManagerCompatibility = true; - enableHh2serialGps = true; - enableL2tp = true; - enableIospm = true; - enableTist = true; - }; - - connmanMinimal = connman.override { - enableOpenconnect = false; - enableOpenvpn = false; - enableVpnc = false; - vpnc = false; - enablePolkit = false; - enablePptp = false; - enableLoopback = false; - # enableEthernet = false; # If disabled no ethernet connection can be performed - enableWireguard = false; - enableGadget = false; - # enableWifi = false; # If disabled no WiFi connection can be performed - enableBluetooth = false; - enableOfono = false; - enableDundee = false; - enablePacrunner = false; - enableNeard = false; - enableWispr = false; - enableTools = false; - enableStats = false; - 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 cf4c27b271682..123931d8533ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6905,17 +6905,38 @@ with pkgs; conspy = callPackage ../os-specific/linux/conspy { }; - connmanPackages = - recurseIntoAttrs (callPackage ../tools/networking/connman { }); - inherit (connmanPackages) - connman - connmanFull - connmanMinimal - connman_dmenu - connman-gtk - connman-ncurses - connman-notify - ; + 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) + enableNetworkManagerCompatibility = true; + enableHh2serialGps = true; + enableL2tp = true; + enableIospm = true; + enableTist = true; + }; + + connmanMinimal = connman.override { + # enableDatafiles = false; # If disabled, configuration and data files are not installed + # enableEthernet = false; # If disabled no ethernet connection can be performed + # enableWifi = false; # If disabled no WiFi connection can be performed + enableBluetooth = false; + enableClient = false; + enableDundee = false; + enableGadget = false; + enableLoopback = false; + enableNeard = false; + enableOfono = false; + enableOpenconnect = false; + enableOpenvpn = false; + enablePacrunner = false; + enablePolkit = false; + enablePptp = false; + enableStats = false; + enableTools = false; + enableVpnc = false; + enableWireguard = false; + enableWispr = false; + }; convertlit = callPackage ../tools/text/convertlit { }; |