connmanPackages: group all connman-related expressions

This commit is contained in:
AndersonTorres 2022-11-10 22:53:33 -03:00
parent aaa6a5cf0b
commit ad4e35bc15
2 changed files with 19 additions and 12 deletions

View file

@ -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 { };
})

View file

@ -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 {