diff options
| author | Shea Levy <shea@shealevy.com> | 2011-09-23 16:58:45 +0000 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2011-09-23 16:58:45 +0000 |
| commit | 01df54f5cc19244915417a606e23d4b0b8c94c06 (patch) | |
| tree | 87dac4390baec5d6d4f6397523d5abada0a79557 /pkgs/lib | |
| parent | 99863cb87b3231e6bfef139a7b54c35f6aa63a16 (diff) | |
| parent | 8770aaea0ee564e99befb4a5c28e260f94b4b359 (diff) | |
| download | nixlib-01df54f5cc19244915417a606e23d4b0b8c94c06.tar nixlib-01df54f5cc19244915417a606e23d4b0b8c94c06.tar.gz nixlib-01df54f5cc19244915417a606e23d4b0b8c94c06.tar.bz2 nixlib-01df54f5cc19244915417a606e23d4b0b8c94c06.tar.lz nixlib-01df54f5cc19244915417a606e23d4b0b8c94c06.tar.xz nixlib-01df54f5cc19244915417a606e23d4b0b8c94c06.tar.zst nixlib-01df54f5cc19244915417a606e23d4b0b8c94c06.zip | |
Merge from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=29461
Diffstat (limited to 'pkgs/lib')
| -rw-r--r-- | pkgs/lib/maintainers.nix | 1 | ||||
| -rw-r--r-- | pkgs/lib/options.nix | 9 |
2 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index dadc7f813e9d..4cf215ee3b8e 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -18,6 +18,7 @@ neznalek = "Vladimír Čunát <vcunat@gmail.com>"; phreedom = "Evgeny Egorochkin <phreedom.stdin@gmail.com>"; pierron = "Nicolas B. Pierron <nixos@nbp.name>"; + piotr = "Piotr Pietraszkiewicz <ppietrasa@gmail.com>"; qknight = "Joachim Schiele <js@lastlog.de>"; raskin = "Michael Raskin <7c6f434c@mail.ru>"; roconnor = "Russell O'Connor <roconnor@theorem.ca>"; diff --git a/pkgs/lib/options.nix b/pkgs/lib/options.nix index d742544bef2a..cd60b8f3b88c 100644 --- a/pkgs/lib/options.nix +++ b/pkgs/lib/options.nix @@ -287,5 +287,12 @@ rec { else if isAttrs x then mapAttrs (n: v: scrubOptionValue v) (removeAttrs x ["_args"]) else x; - + + /* For use in the ‘example’ option attribute. It causes the given + text to be included verbatim in documentation. This is necessary + for example values that are not simple values, e.g., + functions. */ + literalExample = text: { _type = "literalExample"; inherit text; }; + + } |