lix-project/lix
20
57
Fork 31
Code Issues 350 Code Review (Gerrit) Projects 3 Releases Wiki Activity

doc: consistently refer to 'fixed-output' with a dash

Browse source 
General cleanup that makes it easier to search for the term.
This commit is contained in:
Benjamin Hipple 2020-05-09 10:58:43 -04:00
parent d3d8186c9c
commit 146f9c114f
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/manual/command-ref/nix-store.xml
View file

@ -936,7 +936,7 @@ $ nix-store --add ./foo.c
<para>The operation <option>--add-fixed</option> adds the specified paths to <para>The operation <option>--add-fixed</option> adds the specified paths to
the Nix store. Unlike <option>--add</option> paths are registered using the the Nix store. Unlike <option>--add</option> paths are registered using the
specified hashing algorithm, resulting in the same output path as a fixed output specified hashing algorithm, resulting in the same output path as a fixed-output
derivation. This can be used for sources that are not available from a public derivation. This can be used for sources that are not available from a public
url or broke since the download expression was written. url or broke since the download expression was written.
</para> </para>

2
src/libstore/build.cc
View file

@ -3155,7 +3155,7 @@ void DerivationGoal::runChild()
// Only use nss functions to resolve hosts and // Only use nss functions to resolve hosts and
// services. Don’t use it for anything else that may // services. Don’t use it for anything else that may
// be configured for this system. This limits the // be configured for this system. This limits the
// potential impurities introduced in fixed outputs. // potential impurities introduced in fixed-outputs.
writeFile(chrootRootDir + "/etc/nsswitch.conf", "hosts: files dns\nservices: files\n"); writeFile(chrootRootDir + "/etc/nsswitch.conf", "hosts: files dns\nservices: files\n");
ss.push_back("/etc/services"); ss.push_back("/etc/services");