movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

Revert "Add the tool "nixos-typecheck" that can check an option declaration to:"

Browse source 
This reverts commit cad8957eab. It
breaks NixOps, but more importantly, such major changes to the module
system really need to be reviewed.
This commit is contained in:
Eelco Dolstra 2016-03-01 20:47:08 +01:00
parent bf4cafd1dd
commit f3d94cfc23
24 changed files with 127 additions and 703 deletions
Download patch file Download diff file Expand all files Collapse all files

5
nixos/modules/services/misc/nixos-manual.nix
View file

@ -17,8 +17,6 @@ let
nixpkgs.system = config.nixpkgs.system;
};
internalModule = { _module = config._module; };
/* For the purpose of generating docs, evaluate options with each derivation
in `pkgs` (recursively) replaced by a fake with path "\${pkgs.attribute.path}".
It isn't perfect, but it seems to cover a vast majority of use cases.
@ -31,7 +29,7 @@ let
options =
let
scrubbedEval = evalModules {
modules = [ versionModule ] ++ baseModules ++ [ internalModule ];
modules = [ versionModule ] ++ baseModules;
args = (config._module.args) // { modules = [ ]; };
specialArgs = { pkgs = scrubDerivations "pkgs" pkgs; };
};
@ -45,7 +43,6 @@ let
)
pkgSet;
in scrubbedEval.options;
internalModule = config._module;
};
entry = "${manual.manual}/share/doc/nixos/index.html";