Commit graph

102 commits

Author SHA1 Message Date
Eelco Dolstra cc357c7e64 nixos-rebuild: Add a convenience option ‘--upgrade’
This is equivalent to running ‘nix-channel --update nixos’ before
running ‘nixos-rebuild’.
2012-06-25 16:17:34 -04:00
Eelco Dolstra a85555cd27 Remove the obsolete --no-pull option from the nixos-rebuild man page 2012-06-25 16:08:19 -04:00
Eelco Dolstra ef15fa63c8 * Ad-hockery to support the Charon manual.
svn path=/nixos/trunk/; revision=34392
2012-06-08 21:10:11 +00:00
Eelco Dolstra 825a84c8f6 * Fix generated module links in the manual to point to GitHub.
* Use <nixos/...> instead of /etc/nixos/...

svn path=/nixos/trunk/; revision=34391
2012-06-08 20:59:26 +00:00
Eelco Dolstra 29b05fb62a * nixos-checkout: add an argument to specify the directory where the
sources should be stored.  E.g. "nixos-checkout /home/eelco/srcs"
  will check out to /home/eelco/srcs/{nixos,nixpkgs}.  Probably the
  /etc/nixos default should be removed eventually because /etc is a
  pretty weird place to keep large source trees.

svn path=/nixos/trunk/; revision=34086
2012-05-14 04:12:43 +00:00
Eelco Dolstra 846cb81234 * Comment out the "Configuration in home directory" chapter.
Everything described in that chapter is a bug (e.g. needing to
  manually create symlinks) that properly belongs in the issue tracker
  or wiki, not in the manual.

svn path=/nixos/trunk/; revision=34085
2012-05-14 04:01:47 +00:00
Eelco Dolstra ae8d4a2f7c * Describe the NixOS channel.
svn path=/nixos/trunk/; revision=34084
2012-05-14 03:59:38 +00:00
Eelco Dolstra b57e12dfee * Update the installation instructions.
svn path=/nixos/trunk/; revision=34083
2012-05-14 02:02:45 +00:00
Eelco Dolstra 71d867daf6 * Sync CSS.
svn path=/nixos/trunk/; revision=34067
2012-05-11 23:42:18 +00:00
Eelco Dolstra d3ce00bdc3 * Revert unintended commit.
svn path=/nixos/trunk/; revision=33958
2012-04-30 17:47:32 +00:00
Eelco Dolstra be189991e0 * Revert r33928: veth* can also be a bridged interface requiring dhcp.
See e.g. https://nixos.org/repos/nix/configurations/trunk/tud/stan.nix

  So we need a better solution for this...

svn path=/nixos/trunk/; revision=33957
2012-04-30 17:46:11 +00:00
Eelco Dolstra e3470145e0 * Fix some links.
svn path=/nixos/trunk/; revision=33910
2012-04-24 15:19:24 +00:00
Eelco Dolstra d4c202b311 * Remove redundant section on building the installation CD.
svn path=/nixos/trunk/; revision=33909
2012-04-24 15:14:26 +00:00
Eelco Dolstra d2a6be078e * Typo.
svn path=/nixos/trunk/; revision=33724
2012-04-10 14:12:49 +00:00
Eelco Dolstra 301c4d96b1 * Remove nixos-deploy-network. It has been superceded by Charon.
svn path=/nixos/trunk/; revision=33662
2012-04-07 13:26:35 +00:00
Eelco Dolstra 29d84af677 * Remove the use of the NIXPKGS and NIXOS environment variables.
Instead use $NIX_PATH.  NIXOS_CONFIG is still supported.

svn path=/nixos/trunk/; revision=32739
2012-03-02 12:38:22 +00:00
Eelco Dolstra 00ce9aaf1a * svn.nixos.org -> nixos.org.
svn path=/nixos/trunk/; revision=29690
2011-10-06 11:29:44 +00:00
Peter Simons eb6e1310b8 strip trailing whitespace; no functional change
svn path=/nixos/trunk/; revision=29285
2011-09-14 18:20:50 +00:00
Eelco Dolstra 453675c5c1 * Allow literal examples to be included in the manual.
svn path=/nixos/trunk/; revision=29025
2011-09-05 10:14:42 +00:00
Eelco Dolstra 5932de5c1a svn path=/nixos/trunk/; revision=28430 2011-08-09 14:08:24 +00:00
Ludovic Courtès 610839eb29 doc: Attempt to placate Docbook.
svn path=/nixos/trunk/; revision=27476
2011-06-15 14:46:06 +00:00
Ludovic Courtès 7fe48226c0 doc: Add more details on `lib/testing.nix'.
svn path=/nixos/trunk/; revision=27474
2011-06-15 14:12:45 +00:00
Nicolas Pierron 729d19536c Manual (user configuration): Fix minor typo.
svn path=/nixos/trunk/; revision=27071
2011-05-01 10:24:41 +00:00
Nicolas Pierron 1c69051ba8 Manual: Clarify NixOS modules.
svn path=/nixos/trunk/; revision=27070
2011-05-01 10:24:37 +00:00
Nicolas Pierron 4aa86107fd Remove references to other kind of VCS from the manual.
svn path=/nixos/trunk/; revision=27069
2011-05-01 10:24:28 +00:00
Shea Levy 2ddda472c4 Put vim on the live cd in place of nvi
svn path=/nixos/trunk/; revision=26679
2011-04-04 13:45:16 +00:00
Shea Levy 817cc79cb5 The live cd contains vi, not vim
svn path=/nixos/trunk/; revision=26654
2011-04-01 12:22:57 +00:00
Ludovic Courtès b7a8b26d09 doc: Fix the manual.
svn path=/nixos/trunk/; revision=26220
2011-03-09 10:38:18 +00:00
Ludovic Courtès 7cb3958e4b doc: Use a <footnote>, not a <note>.
svn path=/nixos/trunk/; revision=26214
2011-03-08 21:54:18 +00:00
Ludovic Courtès 36cf4ba40b doc: Escape `&'.
svn path=/nixos/trunk/; revision=26213
2011-03-08 21:31:00 +00:00
Ludovic Courtès d028ec95d0 doc: Escape `>'.
svn path=/nixos/trunk/; revision=26212
2011-03-08 21:14:21 +00:00
Ludovic Courtès 79a322f050 doc: Add a section on VM testing, mostly copied from the wiki.
svn path=/nixos/trunk/; revision=26211
2011-03-08 20:55:43 +00:00
Michael Raskin 75d4861077 Fix Nixpkgs link; typo noticed by Shea Levy
svn path=/nixos/trunk/; revision=26181
2011-03-07 07:55:53 +00:00
Sander van der Burg 96b769c979 Removed the backdoor, because it does not work anymore and it has also become obsolete (Disnix uses something else now)
svn path=/nixos/trunk/; revision=25601
2011-01-17 16:15:59 +00:00
Ludovic Courtès 41fcad19fb manual: Recommend `-O dir_index'.
svn path=/nixos/trunk/; revision=25580
2011-01-15 21:51:56 +00:00
Sander van der Burg 11d2cd78e0 - deployment.targetHost is now used for connecting to remote hosts instead of deployment.hostname. This makes more sense.
- fixed error in the manual (nixos-deploy-network => nixos-build-vms)


svn path=/nixos/trunk/; revision=25031
2010-12-07 20:13:50 +00:00
Sander van der Burg 9df8293d63 Wrote manual pages for the nixos-deploy-network and nixos-build-vms commands
svn path=/nixos/trunk/; revision=25030
2010-12-07 16:33:18 +00:00
Nicolas Pierron b6f2fde0e0 man nixos-option: Fix typos.
svn path=/nixos/trunk/; revision=23940
2010-09-26 13:46:44 +00:00
Nicolas Pierron 0a9b2f6e44 Add a man page for nixos-option.
svn path=/nixos/trunk/; revision=23938
2010-09-26 08:43:59 +00:00
Nicolas Pierron 26417566c4 Re-word installation, and use "nixos-option --install" to generate a
template for configuration.nix which uses the result of
nixos-hardware-scan.

svn path=/nixos/trunk/; revision=23926
2010-09-25 22:30:02 +00:00
Nicolas Pierron 93029d3c4f Update installation instructions.
svn path=/nixos/trunk/; revision=23925
2010-09-25 22:29:58 +00:00
Nicolas Pierron 757a0002a2 Simplify the installation instruction for building a CD.
svn path=/nixos/trunk/; revision=23924
2010-09-25 22:29:54 +00:00
Eelco Dolstra c1295661c4 * Added a command `nixos-rebuild build-vm-with-bootloader'. This is
like `build-vm', but boots using the regular boot loader (i.e. GRUB
  1 or 2) rather than booting directly from the kernel/initrd.  Thus
  it allows testing of GRUB.

svn path=/nixos/trunk/; revision=23747
2010-09-13 12:34:58 +00:00
Eelco Dolstra 2ec105cc85 * Separate building of the NixOS manual and manpages. Usually we only
need the manpages, and the manual takes much longer to build.

svn path=/nixos/trunk/; revision=23112
2010-08-11 12:28:53 +00:00
Lluís Batlle i Rossell 093b51a562 Removing references to linux kernel 'vmlinuz', and making them point to 'bzImage'.
That should match with a related change in nixpkgs.


svn path=/nixos/trunk/; revision=20095
2010-02-18 11:35:39 +00:00
Eelco Dolstra a612fd0d5e * Obsoleted boot.initrd.extraKernelModules (use
boot.initrd.kernelModules instead).

svn path=/nixos/trunk/; revision=18969
2009-12-15 14:05:01 +00:00
Eelco Dolstra e0d69c92a8 * Added a manpage for nixos-rebuild.
svn path=/nixos/trunk/; revision=18855
2009-12-09 15:05:13 +00:00
Eelco Dolstra ad17a6dce3 * Changes related to the xorg-7.5 merge.
svn path=/nixos/trunk/; revision=18126
2009-11-04 22:44:40 +00:00
Nicolas Pierron f656741395 Manual: Update nixos-checkout comments.
svn path=/nixos/trunk/; revision=17955
2009-10-26 09:50:33 +00:00
Nicolas Pierron 56d6afaa8a When nixos is used inside a /nix/store, the store path is replace by
/etc/nixos/nixos which is the default location of nixos.

svn path=/nixos/trunk/; revision=17681
2009-10-06 19:07:09 +00:00