diff options
Diffstat (limited to 'nixos/doc/manual')
5 files changed, 61 insertions, 40 deletions
diff --git a/nixos/doc/manual/development/development.xml b/nixos/doc/manual/development/development.xml index 747159c44270..2983c76c770b 100644 --- a/nixos/doc/manual/development/development.xml +++ b/nixos/doc/manual/development/development.xml @@ -15,6 +15,7 @@ NixOS.</para> <xi:include href="writing-modules.xml" /> <xi:include href="building-parts.xml" /> <xi:include href="building-nixos.xml" /> +<xi:include href="nixos-tests.xml" /> <xi:include href="testing-installer.xml" /> </part> diff --git a/nixos/doc/manual/development/nixos-tests.xml b/nixos/doc/manual/development/nixos-tests.xml index a98da9933309..c09c41ea3bdc 100644 --- a/nixos/doc/manual/development/nixos-tests.xml +++ b/nixos/doc/manual/development/nixos-tests.xml @@ -15,5 +15,6 @@ required for the test.</para> <xi:include href="writing-nixos-tests.xml" /> <xi:include href="running-nixos-tests.xml" /> +<xi:include href="running-nixos-tests-interactively.xml" /> -</chapter> \ No newline at end of file +</chapter> diff --git a/nixos/doc/manual/development/running-nixos-tests-interactively.xml b/nixos/doc/manual/development/running-nixos-tests-interactively.xml new file mode 100644 index 000000000000..e47490777815 --- /dev/null +++ b/nixos/doc/manual/development/running-nixos-tests-interactively.xml @@ -0,0 +1,43 @@ +<section xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:xi="http://www.w3.org/2001/XInclude" + version="5.0" + xml:id="sec-running-nixos-tests"> +<title>Running Tests interactively</title> + +<para>The test itself can be run interactively. This is +particularly useful when developing or debugging a test: + +<screen> +$ nix-build nixos/tests/login.nix -A driver +$ ./result/bin/nixos-test-driver +starting VDE switch for network 1 +> +</screen> + +You can then take any Perl statement, e.g. + +<screen> +> startAll +> testScript +> $machine->succeed("touch /tmp/foo") +</screen> + +The function <command>testScript</command> executes the entire test +script and drops you back into the test driver command line upon its +completion. This allows you to inspect the state of the VMs after the +test (e.g. to debug the test script).</para> + +<para>To just start and experiment with the VMs, run: + +<screen> +$ nix-build nixos/tests/login.nix -A driver +$ ./result/bin/nixos-run-vms +</screen> + +The script <command>nixos-run-vms</command> starts the virtual +machines defined by test. The root file system of the VMs is created +on the fly and kept across VM restarts in +<filename>./</filename><varname>hostname</varname><filename>.qcow2</filename>.</para> + +</section> diff --git a/nixos/doc/manual/development/running-nixos-tests.xml b/nixos/doc/manual/development/running-nixos-tests.xml index 156dcd205a55..908c0a66a32d 100644 --- a/nixos/doc/manual/development/running-nixos-tests.xml +++ b/nixos/doc/manual/development/running-nixos-tests.xml @@ -2,7 +2,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" - xml:id="sec-running-nixos-tests"> + xml:id="sec-running-nixos-tests-interactively"> <title>Running Tests</title> @@ -38,42 +38,4 @@ $ firefox result/log.html </screen> </para> - -<title>Running Tests interactively</title> - -<para>The test itself can be run interactively. This is -particularly useful when developing or debugging a test: - -<screen> -$ nix-build nixos/tests/login.nix -A driver -$ ./result/bin/nixos-test-driver -starting VDE switch for network 1 -> -</screen> - -You can then take any Perl statement, e.g. - -<screen> -> startAll -> testScript -> $machine->succeed("touch /tmp/foo") -</screen> - -The function <command>testScript</command> executes the entire test -script and drops you back into the test driver command line upon its -completion. This allows you to inspect the state of the VMs after the -test (e.g. to debug the test script).</para> - -<para>To just start and experiment with the VMs, run: - -<screen> -$ nix-build nixos/tests/login.nix -A driver -$ ./result/bin/nixos-run-vms -</screen> - -The script <command>nixos-run-vms</command> starts the virtual -machines defined by test. The root file system of the VMs is created -on the fly and kept across VM restarts in -<filename>./</filename><varname>hostname</varname><filename>.qcow2</filename>.</para> - </section> diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml index 34ffe1d6d323..cdbd074e7828 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -35,6 +35,20 @@ and old <literal>steam</literal> package -- to <literal>steamOriginal</literal>. was accordingly renamed to <literal>bomi</literal> </para></listitem> +<listitem> + <para> + The default <literal>NIX_PATH</literal> for NixOS now includes + <literal>/nix/var/nix/profiles/per-user/root/channels</literal>, so it's + easy to add custom channels. + </para> + <para> + Moreover, whenever a <command>nixos-rebuild <action> + --upgrade</command> is issued, every channel that includes a file + called <filename>.update-on-nixos-rebuild</filename> will be upgraded + alongside of the <literal>nixos</literal> channel. + </para> +</listitem> + </itemizedlist> </para> |