Emacs module seems to work now... good enough for merge into master.

This commit is contained in:
Kevin Baensch 2019-11-17 23:13:50 +01:00
parent 986ca7f5cd
commit 886a3b0dc8
20 changed files with 903 additions and 94 deletions

View file

@ -13,14 +13,14 @@ let
name = pname;
value = rec {
pkgwrap = mkOption {
type = types.listOf types.package;
type = with types; oneOf [ package (listOf package) ];
default = cfg.pkgsets."${pname}".pkgs;
description = ''
Package Wrapper for packages using a wrapper function (like python, emacs, haskell, ...)
'';
};
pkgs = mkOption {
type = with types; listOf (nullOr attrs);
type = types.unspecified;
default = [];
description = ''
${pname} package list.
@ -37,7 +37,8 @@ in {
The list of metapackages to be installed.
'';
};
pkgsets = listToAttrs (map pkgOption metapkgs);
# Package names containing '::' are sub packages and should not have their own pkgset.
pkgsets = listToAttrs (map pkgOption (lists.filter (v: !(strings.hasInfix "::" v)) metapkgs));
services = mkOption {
type = types.listOf types.str;
default = [];