diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-29 10:19:48 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-29 10:19:48 +0100 |
commit | de0af30716493d647e369f434008a67999ed9e28 (patch) | |
tree | 2fda05ead70be669e4325e0d661aaafd5d04d3c0 /nixos/doc | |
parent | 2ecb6b4574399cf710f09061357ae59526743a05 (diff) | |
parent | 4f8f5732fc1a24329cbe5f7eb9dcb7599e282a0c (diff) | |
download | nixlib-de0af30716493d647e369f434008a67999ed9e28.tar nixlib-de0af30716493d647e369f434008a67999ed9e28.tar.gz nixlib-de0af30716493d647e369f434008a67999ed9e28.tar.bz2 nixlib-de0af30716493d647e369f434008a67999ed9e28.tar.lz nixlib-de0af30716493d647e369f434008a67999ed9e28.tar.xz nixlib-de0af30716493d647e369f434008a67999ed9e28.tar.zst nixlib-de0af30716493d647e369f434008a67999ed9e28.zip |
Merge branch 'master' into staging
Diffstat (limited to 'nixos/doc')
-rw-r--r-- | nixos/doc/manual/default.nix | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index bd558dac971d..eb2ceb7fd021 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -1,4 +1,4 @@ -{ pkgs, options, version, revision }: +{ pkgs, options, version, revision, extraSources ? [] }: with pkgs; with pkgs.lib; @@ -17,19 +17,27 @@ let # Clean up declaration sites to not refer to the NixOS source tree. optionsList' = flip map optionsList (opt: opt // { - declarations = map (fn: stripPrefix fn) opt.declarations; + declarations = map (fn: stripAnyPrefixes fn) opt.declarations; } // optionalAttrs (opt ? example) { example = substFunction opt.example; } // optionalAttrs (opt ? default) { default = substFunction opt.default; } // optionalAttrs (opt ? type) { type = substFunction opt.type; }); - prefix = toString ../../..; - - stripPrefix = fn: - if substring 0 (stringLength prefix) fn == prefix then - substring (stringLength prefix + 1) 1000 fn - else - fn; + # We need to strip references to /nix/store/* from options, + # including any `extraSources` if some modules came from elsewhere, + # or else the build will fail. + # + # E.g. if some `options` came from modules in ${pkgs.customModules}/nix, + # you'd need to include `extraSources = [ "#{pkgs.customModules}" ]` + herePrefix = toString ../../..; + prefixesToStrip = [ herePrefix ] ++ extraSources; + + stripAnyPrefixes = fn: + flip (flip fold fn) prefixesToStrip (fn: prefix: + if substring 0 (stringLength prefix) fn == prefix then + substring (stringLength prefix + 1) 1000 fn + else + fn); # Convert the list of options into an XML file. optionsXML = builtins.toFile "options.xml" (builtins.toXML optionsList'); |