Skip to content

Commit

Permalink
Merge pull request #49146 from Mic92/breakpoint2
Browse files Browse the repository at this point in the history
doc/breakpointHook: improve documentation
  • Loading branch information
Mic92 committed Oct 26, 2018
2 parents 463a2d9 + 764d165 commit 67adcd1
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 19 deletions.
4 changes: 2 additions & 2 deletions doc/languages-frameworks/coq.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

<para>
Some extensions (plugins) might require OCaml and sometimes other OCaml
packages. The <literal>coq.ocamlPackages</literal> attribute can be used
to depend on the same package set Coq was built against.
packages. The <literal>coq.ocamlPackages</literal> attribute can be used to
depend on the same package set Coq was built against.
</para>

<para>
Expand Down
37 changes: 20 additions & 17 deletions doc/stdenv.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2099,13 +2099,13 @@ someVar=$(stripHash $name)
</para>

<para>
In order to alleviate this burden, the <firstterm>setup
hook</firstterm> mechanism was written, where any package can include a
shell script that [by convention rather than enforcement by Nix], any
downstream reverse-dependency will source as part of its build process. That
allows the downstream dependency to merely specify its dependencies, and
lets those dependencies effectively initialize themselves. No boilerplate
mirroring the list of dependencies is needed.
In order to alleviate this burden, the <firstterm>setup hook</firstterm>
mechanism was written, where any package can include a shell script that [by
convention rather than enforcement by Nix], any downstream
reverse-dependency will source as part of its build process. That allows the
downstream dependency to merely specify its dependencies, and lets those
dependencies effectively initialize themselves. No boilerplate mirroring the
list of dependencies is needed.
</para>

<para>
Expand Down Expand Up @@ -2451,16 +2451,19 @@ addEnvHooks "$hostOffset" myBashFunction
</term>
<listitem>
<para>
This hook will make a build pause instead of stopping
when a failure happen. It prevents nix to cleanup the build
environment immediatly and allows the user to attach
to a build environemnt using the <varname>cntr</varname> command.
On build error it will print the instruction that are neccessary for cntr.
Note that <varname>cntr</varname> is not installed by default and
needs to be installed seperatly. <varname>cntr</varname> also needs to be executed
on the machine that is doing the build, which might be not the case
when remote builders are enabled. <varname>cntr</varname> is only supported
on linux based platforms.
This hook will make a build pause instead of stopping when a failure
happen. It prevents nix to cleanup the build environment immediatly and
allows the user to attach to a build environment using the
<command>cntr</command> command. On build error it will print the
instruction that are neccessary for <command>cntr</command>. Installing
cntr and running the command will provide shell access to the build
sandbox of failed build. At <filename>/var/lib/cntr</filename> the
sandbox filesystem is mounted. All commands and files of the system are
still accessible within the shell. To execute commands from the sandbox
use the cntr exec subcommand. Note that <command>cntr</command> also
needs to be executed on the machine that is doing the build, which might
be not the case when remote builders are enabled.
<command>cntr</command> is only supported on linux based platforms.
</para>
</listitem>
</varlistentry>
Expand Down

0 comments on commit 67adcd1

Please sign in to comment.