movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 13:40:28 +03:00
Code Activity

Revert "Add nixosSubmodule option type"

Browse source 
Moving recent types work to a separate branch for now

This reverts commit ca1c5cfa8f.
This commit is contained in:
Shea Levy 2014-02-13 12:08:15 -05:00
parent 4fd825cc94
commit c8f1a6ac1e
2 changed files with 1 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/types.nix
View file

@ -195,25 +195,6 @@ rec {
args = { name = ""; }; }).options;
};
nixosSubmodule = nixos: args: mkOptionType rec {
name = "submodule containing a NixOS config";
check = x: isAttrs x || isFunction x;
merge = loc: defs:
let
coerce = def: if isFunction def then def else { config = def; };
in (import (nixos + "/lib/eval-config.nix") (args // {
modules = (args.modules or []) ++
map (def: { _file = def.file; imports = [(coerce def.value)]; }) defs;
prefix = loc;
})).config;
getSubOptions = prefix: (import (nixos + "/lib/eval-config.nix") (args // {
modules = (args.modules or []);
inherit prefix;
})).options;
};
# Obsolete alternative to configOf. It takes its option
# declarations from the ‘options’ attribute of containing option
# declaration.