JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nixos manual: replace /etc/nixos/nixos which no longer exists with more generic and more

Browse Source 
correct /path/to/nixpkgs/nixos
This commit is contained in:
Evgeny Egorochkin 2013-10-27 08:39:32 +02:00
parent 6dcca9e096
commit 9cb699f587
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
nixos/doc/manual/development.xml
View File

@ -250,7 +250,7 @@ let
in in
{ {
imports = [ /etc/nixos/nixos/modules/services/scheduling/cron.nix ]; imports = [ /path/to/nixpkgs/nixos/modules/services/scheduling/cron.nix ];
options = { options = {
services.locate = { services.locate = {
@ -307,10 +307,10 @@ in
<para> <para>
<screen> <screen>
$ nix-build /etc/nixos/nixos -A <replaceable>attr</replaceable></screen> $ nix-build /path/to/nixpkgs/nixos -A <replaceable>attr</replaceable></screen>
where <replaceable>attr</replaceable> is an attribute in where <replaceable>attr</replaceable> is an attribute in
<filename>/etc/nixos/nixos/default.nix</filename>. Attributes of interest include: <filename>/path/to/nixpkgs/nixos/default.nix</filename>. Attributes of interest include:
<variablelist> <variablelist>
@ -344,7 +344,7 @@ Most parts of NixOS can be built through the <varname>config</varname>
attribute set. This attribute set allows you to have a view of the merged attribute set. This attribute set allows you to have a view of the merged
option definitions and all its derivations. Important derivations are store option definitions and all its derivations. Important derivations are store
inside the option <option>system.build</option> and can be listed with the inside the option <option>system.build</option> and can be listed with the
command <command>nix-instantiate --xml --eval-only /etc/nixos/nixos -A command <command>nix-instantiate --xml --eval-only /path/to/nixpkgs/nixos -A
config.system.build</command> config.system.build</command>
</para> </para>
@ -368,8 +368,8 @@ you have to set <envar>NIXOS_CONFIG</envar> before
running <command>nix-build</command> to build the ISO. running <command>nix-build</command> to build the ISO.
<screen> <screen>
$ export NIXOS_CONFIG=/etc/nixos/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix $ export NIXOS_CONFIG=/path/to/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
$ nix-build /etc/nixos/nixos -A config.system.build.isoImage</screen> $ nix-build /path/to/nixpkgs/nixos -A config.system.build.isoImage</screen>
</para> </para>
@ -413,8 +413,8 @@ tedious, so here is a quick way to see if the installer works
properly: properly:
<screen> <screen>
$ export NIXOS_CONFIG=/etc/nixos/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix $ export NIXOS_CONFIG=/path/to/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
$ nix-build /etc/nixos/nixos -A config.system.build.nixos-install $ nix-build /path/to/nixpkgs/nixos -A config.system.build.nixos-install
$ dd if=/dev/zero of=diskimage seek=2G count=0 bs=1 $ dd if=/dev/zero of=diskimage seek=2G count=0 bs=1
$ yes | mke2fs -j diskimage $ yes | mke2fs -j diskimage
$ mount -o loop diskimage /mnt $ mount -o loop diskimage /mnt
@ -437,8 +437,8 @@ boot correctly is to use QEMU’s <option>-kernel</option> and
<option>-initrd</option> options: <option>-initrd</option> options:
<screen> <screen>
$ nix-build /etc/nixos/nixos -A config.system.build.initialRamdisk -o initrd $ nix-build /path/to/nixpkgs/nixos -A config.system.build.initialRamdisk -o initrd
$ nix-build /etc/nixos/nixos -A config.system.build.kernel -o kernel $ nix-build /path/to/nixpkgs/nixos -A config.system.build.kernel -o kernel
$ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/null $ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/null
</screen> </screen>

8
nixos/doc/manual/man-nixos-option.xml
View File

@ -120,10 +120,10 @@ Declared by:
/mnt/data/nix-sources/nixos/modules/services/hardware/udev.nix /mnt/data/nix-sources/nixos/modules/services/hardware/udev.nix
Defined by: Defined by:
/etc/nixos/nixos/modules/system/boot/kernel.nix /path/to/nixpkgs/nixos/modules/system/boot/kernel.nix
/etc/nixos/nixos/modules/hardware/network/rt73.nix /path/to/nixpkgs/nixos/modules/hardware/network/rt73.nix
/etc/nixos/nixos/modules/hardware/network/intel-3945abg.nix /path/to/nixpkgs/nixos/modules/hardware/network/intel-3945abg.nix
/etc/nixos/nixos/modules/hardware/network/intel-2200bg.nix</screen></para> /path/to/nixpkgs/nixos/modules/hardware/network/intel-2200bg.nix</screen></para>
</refsection> </refsection>

2
nixos/doc/manual/man-nixos-rebuild.xml
View File

@ -106,7 +106,7 @@ desired operation. It must be one of the following:
points to the output of the top-level “system” derivation. This points to the output of the top-level “system” derivation. This
is essentially the same as doing is essentially the same as doing
<screen> <screen>
$ nix-build /etc/nixos/nixos -A system $ nix-build /path/to/nixpkgs/nixos -A system
</screen> </screen>
Note that you do not need to be <literal>root</literal> to run Note that you do not need to be <literal>root</literal> to run
<command>nixos-rebuild build</command>.</para> <command>nixos-rebuild build</command>.</para>