diff options
| author | Nicolas Pierron <nicolas.b.pierron@gmail.com> | 2009-11-07 12:15:39 +0000 |
|---|---|---|
| committer | Nicolas Pierron <nicolas.b.pierron@gmail.com> | 2009-11-07 12:15:39 +0000 |
| commit | 8b47086b85cb62a25b6cf167e085c86418a0e399 (patch) | |
| tree | 8e0be950964a93463d269b2fe9b464fdd160f389 /pkgs/lib/types.nix | |
| parent | 4d0e24acd32416a6cd296417b46b26971d372139 (diff) | |
| download | nixpkgs-8b47086b85cb62a25b6cf167e085c86418a0e399.tar nixpkgs-8b47086b85cb62a25b6cf167e085c86418a0e399.tar.gz nixpkgs-8b47086b85cb62a25b6cf167e085c86418a0e399.tar.bz2 nixpkgs-8b47086b85cb62a25b6cf167e085c86418a0e399.tar.lz nixpkgs-8b47086b85cb62a25b6cf167e085c86418a0e399.tar.xz nixpkgs-8b47086b85cb62a25b6cf167e085c86418a0e399.tar.zst nixpkgs-8b47086b85cb62a25b6cf167e085c86418a0e399.zip | |
* Change the check function to accept sub-modules with arguments in
option definitions. svn path=/nixpkgs/trunk/; revision=18252
Diffstat (limited to 'pkgs/lib/types.nix')
| -rw-r--r-- | pkgs/lib/types.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/lib/types.nix b/pkgs/lib/types.nix index c806e922e35..d71cb9df097 100644 --- a/pkgs/lib/types.nix +++ b/pkgs/lib/types.nix @@ -135,7 +135,7 @@ rec { name = "option set"; # merge is done in "options.nix > addOptionMakeUp > handleOptionSets" merge = lib.id; - check = x: lib.traceValIfNot builtins.isAttrs x; + check = x: isAttrs x || builtins.isFunction x; hasOptions = true; delayOnGlobalEval = true; }; |