Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0352c1a4f8fd
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fd900c45b5ff
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 10, 2019

  1. manual: nix-shell: Elaborate on using -p with expressions. 

    This documents the outcome of the change in
#454:

> We can also automatically add parentheses in the generated
> `buildInputs`, so you can type `nix-shell -p "expr"`
> instead of `"(expr").
    @nh2
    nh2 committed Nov 10, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    endocrimes Danielle
    GPG key ID: 8D65584EF3DDF91B
    Verified
    Learn about vigilant mode
    Copy the full SHA
    07294e9 View commit details

Commits on Nov 14, 2019

  1. Merge pull request #3220 from nh2/manual-nix-shell-p-expr 

    manual: nix-shell: Elaborate on using `-p` with expressions
    @edolstra
    edolstra authored Nov 14, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    endocrimes Danielle
    GPG key ID: 8D65584EF3DDF91B
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fd900c4 View commit details
Showing with 27 additions and 6 deletions.
  1. +19 −5 doc/manual/command-ref/nix-shell.xml
  2. +8 −1 doc/manual/command-ref/opt-common.xml
24 changes: 19 additions & 5 deletions doc/manual/command-ref/nix-shell.xml
View file
Original file line number Diff line number Diff line change
@@ -39,7 +39,12 @@
<arg choice='plain'><option>--packages</option></arg>
<arg choice='plain'><option>-p</option></arg>
</group>
<arg choice='plain' rep='repeat'><replaceable>packages</replaceable></arg>
<arg choice='plain' rep='repeat'>
<group choice='req'>
<arg choice="plain"><replaceable>packages</replaceable></arg>
<arg choice="plain"><replaceable>expressions</replaceable></arg>
</group>
</arg>
</arg>
<arg><replaceable>path</replaceable></arg>
</group>
@@ -189,8 +194,8 @@ also <xref linkend="sec-common-options" />.</phrase></para>
<variablelist>

<varlistentry><term><envar>NIX_BUILD_SHELL</envar></term>
<listitem><para>Shell used to start the interactive environment.

<listitem><para>Shell used to start the interactive environment.
Defaults to the <command>bash</command> found in <envar>PATH</envar>.</para></listitem>

</varlistentry>
@@ -222,8 +227,9 @@ $ nix-shell '&lt;nixpkgs>' -A pan --pure \
--command 'export NIX_DEBUG=1; export NIX_CORES=8; return'
</screen>

Nix expressions can also be given on the command line. For instance,
the following starts a shell containing the packages
Nix expressions can also be given on the command line using the
<command>-E</command> and <command>-p</command> flags.
For instance, the following starts a shell containing the packages
<literal>sqlite</literal> and <literal>libX11</literal>:

<screen>
@@ -238,6 +244,14 @@ $ nix-shell -p sqlite xorg.libX11
… -L/nix/store/j1zg5v…-sqlite-3.8.0.2/lib -L/nix/store/0gmcz9…-libX11-1.6.1/lib …
</screen>

Note that <command>-p</command> accepts multiple full nix expressions that
are valid in the <literal>buildInputs = [ ... ]</literal> shown above,
not only package names. So the following is also legal:

<screen>
$ nix-shell -p sqlite 'git.override { withManual = false; }'
</screen>

The <command>-p</command> flag looks up Nixpkgs in the Nix search
path. You can override it by passing <option>-I</option> or setting
<envar>NIX_PATH</envar>. For example, the following gives you a shell
9 changes: 8 additions & 1 deletion doc/manual/command-ref/opt-common.xml
View file
Original file line number Diff line number Diff line change
@@ -323,7 +323,14 @@
Nix expressions to be parsed and evaluated, rather than as a list
of file names of Nix expressions.
(<command>nix-instantiate</command>, <command>nix-build</command>
and <command>nix-shell</command> only.)</para></listitem>
and <command>nix-shell</command> only.)</para>

<para>For <command>nix-shell</command>, this option is commonly used
to give you a shell in which you can build the packages returned
by the expression. If you want to get a shell which contain the
<emphasis>built</emphasis> packages ready for use, give your
expression to the <command>nix-shell -p</command> convenience flag
instead.</para></listitem>

</varlistentry>