cafkafk/lix
cafkafk/lix
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge pull request #3380 from contrun/no-attr-path-for-installed

Browse source 
display attr-path only when queried available
This commit is contained in:
Eelco Dolstra 2020-03-13 19:26:20 +01:00 committed by GitHub
commit 779ef8f5ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/manual/command-ref/nix-env.xml
View file

@ -1066,7 +1066,8 @@ user environment elements, etc. -->
the derivation, which can be used to unambiguously select it using the derivation, which can be used to unambiguously select it using
the <link linkend="opt-attr"><option>--attr</option> option</link> the <link linkend="opt-attr"><option>--attr</option> option</link>
available in commands that install derivations like available in commands that install derivations like
<literal>nix-env --install</literal>.</para></listitem> <literal>nix-env --install</literal>. This option only works
together with <option>--available</option></para></listitem>
</varlistentry> </varlistentry>

2
src/nix-env/nix-env.cc
View file

@ -914,6 +914,8 @@ static void opQuery(Globals & globals, Strings opFlags, Strings opArgs)
throw UsageError(format("unknown flag '%1%'") % arg); throw UsageError(format("unknown flag '%1%'") % arg);
} }
if (printAttrPath && source != sAvailable)
throw UsageError("--attr-path(-P) only works with --available");
/* Obtain derivation information from the specified source. */ /* Obtain derivation information from the specified source. */
DrvInfos availElems, installedElems; DrvInfos availElems, installedElems;