Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nixos/nixos-option: Show values inside aggregate options uniformly #2

Merged
merged 3 commits into from
Dec 19, 2019
Merged

nixos/nixos-option: Show values inside aggregate options uniformly #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3366ca1
nixos/nixos-option: Show values inside aggregate options uniformly
chkno Dec 12, 2019
55e1db3
nixos/nixos-option: Refactor: Move functions around
chkno Dec 17, 2019
16d6c6d
nixos/nixos-option: Convert --all into -r
chkno Dec 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions nixos/doc/manual/man-nixos-option.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,16 @@
<refsynopsisdiv>
<cmdsynopsis>
<command>nixos-option</command>

<arg>
<option>-I</option> <replaceable>path</replaceable>
<group choice='req'>
<arg choice='plain'><option>-r</option></arg>
<arg choice='plain'><option>--recursive</option></arg>
</group>
</arg>

<arg>
<option>--all</option>
<option>-I</option> <replaceable>path</replaceable>
</arg>

<arg>
Expand All @@ -46,23 +50,22 @@
</para>
<variablelist>
<varlistentry>
<term>
<option>-I</option> <replaceable>path</replaceable>
</term>
<term><option>-r</option></term>
<term><option>--recursive</option></term>
<listitem>
<para>
This option is passed to the underlying
<command>nix-instantiate</command> invocation.
Print all the values at or below the specified path recursively.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<option>--all</option>
<option>-I</option> <replaceable>path</replaceable>
</term>
<listitem>
<para>
Print the values of all options.
This option is passed to the underlying
<command>nix-instantiate</command> invocation.
</para>
</listitem>
</varlistentry>
Expand Down
2 changes: 1 addition & 1 deletion nixos/doc/manual/release-notes/rl-2003.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<listitem>
<para>
<command>nixos-option</command> has been rewritten in C++, speeding it up, improving correctness,
and adding a <option>--all</option> option which prints all options and their values.
and adding a <option>-r</option> option which prints all options and their values recursively.
</para>
</listitem>
</itemizedlist>
Expand Down
Loading