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: 6323b0729a27
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5a3f14085618
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 5, 2018

  1. Bump version

    @edolstra
    edolstra committed Nov 5, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    zimbatm Jonas Chevalier
    GPG key ID: 71BAF6D40C1D63D7
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5a1a870 View commit details

Commits on Nov 7, 2018

  1. Fix preferLocalBuild description 

    preferLocalBuild does not in fact prevent substitution.
    @edolstra
    edolstra committed Nov 7, 2018
    1

    Verified

    This commit was signed with the committer’s verified signature.
    zimbatm Jonas Chevalier
    GPG key ID: 71BAF6D40C1D63D7
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1109193 View commit details

  2. Document allowSubstitutes

    @edolstra
    edolstra committed Nov 7, 2018
    2

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5a3f140 View commit details
Showing with 16 additions and 4 deletions.
  1. +15 −3 doc/manual/expressions/advanced-attributes.xml
  2. +1 −1 version
18 changes: 15 additions & 3 deletions doc/manual/expressions/advanced-attributes.xml
View file
Original file line number Diff line number Diff line change
@@ -312,9 +312,7 @@ big = "a very long string";
<varlistentry><term><varname>preferLocalBuild</varname></term>

<listitem><para>If this attribute is set to
<literal>true</literal>, it has two effects. First, the
derivation will always be built, not substituted, even if a
substitute is available. Second, if <link
<literal>true</literal> and <link
linkend="chap-distributed-builds">distributed building is
enabled</link>, then, if possible, the derivaton will be built
locally instead of forwarded to a remote machine. This is
@@ -324,6 +322,20 @@ big = "a very long string";

</varlistentry>


<varlistentry><term><varname>allowSubstitutes</varname></term>

<listitem><para>If this attribute is set to
<literal>false</literal>, then Nix will always build this
derivation; it will not try to substitute its outputs. This is
useful for very trivial derivations (such as
<function>writeText</function> in Nixpkgs) that are cheaper to
build locally than to substitute from a binary
cache.</para></listitem>

</varlistentry>


</variablelist>

</section>
2 changes: 1 addition & 1 deletion version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.2
2.3