diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-17 14:09:05 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-17 14:09:05 +0200 |
| commit | 04690da3bd76c99c4fa549814ff1c7d3a8695c4f (patch) | |
| tree | 1a7e9b051bca72a5aa6afad22b565fe9efb17d35 /nixos/doc/manual/default.nix | |
| parent | 82ad8c5ce09fe942efac95c176509f1e13da10b8 (diff) | |
| download | nixpkgs-04690da3bd76c99c4fa549814ff1c7d3a8695c4f.tar nixpkgs-04690da3bd76c99c4fa549814ff1c7d3a8695c4f.tar.gz nixpkgs-04690da3bd76c99c4fa549814ff1c7d3a8695c4f.tar.bz2 nixpkgs-04690da3bd76c99c4fa549814ff1c7d3a8695c4f.tar.lz nixpkgs-04690da3bd76c99c4fa549814ff1c7d3a8695c4f.tar.xz nixpkgs-04690da3bd76c99c4fa549814ff1c7d3a8695c4f.tar.zst nixpkgs-04690da3bd76c99c4fa549814ff1c7d3a8695c4f.zip | |
Rename newOptionAttrSetToDocList -> optionAttrSetToDocList
Diffstat (limited to 'nixos/doc/manual/default.nix')
| -rw-r--r-- | nixos/doc/manual/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index e6edb30985c..56ad652c60e 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -3,6 +3,8 @@ , revision ? "HEAD" }: +with pkgs.lib; + let # To prevent infinite recursion, remove system.path from the @@ -12,7 +14,7 @@ let { system = removeAttrs options.system ["path"]; }; optionsXML = builtins.toFile "options.xml" (builtins.unsafeDiscardStringContext - (builtins.toXML (pkgs.lib.optionAttrSetToDocList "" options_))); + (builtins.toXML (optionAttrSetToDocList options_))); optionsDocBook = pkgs.runCommand "options-db.xml" {} '' ${pkgs.libxslt}/bin/xsltproc \ @@ -26,7 +28,7 @@ in rec { manual = pkgs.stdenv.mkDerivation { name = "nixos-manual"; - sources = pkgs.lib.sourceFilesBySuffices ./. [".xml"]; + sources = sourceFilesBySuffices ./. [".xml"]; buildInputs = [ pkgs.libxml2 pkgs.libxslt ]; @@ -71,7 +73,7 @@ in rec { manpages = pkgs.stdenv.mkDerivation { name = "nixos-manpages"; - sources = pkgs.lib.sourceFilesBySuffices ./. [".xml"]; + sources = sourceFilesBySuffices ./. [".xml"]; buildInputs = [ pkgs.libxml2 pkgs.libxslt ]; |