Commit graph

225 commits

Author SHA1 Message Date
Sander van der Burg ab70d480ab The machines in the network should be accessed by the node function parameter
svn path=/nixos/trunk/; revision=27538
2011-06-24 12:35:58 +00:00
Eelco Dolstra d72ba42187 * Revert to GRUB 1 as the default. The switch to GRUB 2 seems to
cause more problems than expected, so we should probably think about
  the proper migration path for a while.  In the meantime, of course,
  everybody is encouraged to set boot.loader.grub.version = 2.

svn path=/nixos/trunk/; revision=27209
2011-05-10 10:35:20 +00:00
Michael Raskin f24a78fe35 Fix typo in emergency grub config
svn path=/nixos/trunk/; revision=27196
2011-05-09 14:21:02 +00:00
Ludovic Courtès 9c3d72cf8e Default to GRUB version 2.
svn path=/nixos/trunk/; revision=27165
2011-05-05 15:07:37 +00:00
Sander van der Burg deb6cce4bb Adapted deploy-network to accept multiple network configurations which are zipped together. With this you can run the tool like this:
$ nixos-deploy-network network1.nix network2.nix


svn path=/nixos/trunk/; revision=27028
2011-04-28 11:02:58 +00:00
Eelco Dolstra 3ae283e8c3 * Remove installer2 and nixos-bootstrap-archive for lack of
documentation / maintenance / clear use cases.

svn path=/nixos/trunk/; revision=27008
2011-04-27 16:16:47 +00:00
Eelco Dolstra b8a1e98180 * nixos-checkout depends on subversion. (The original nixos-checkout
did a "nix-env -i subversion", which may be preferable to a static
  dependency.)

svn path=/nixos/trunk/; revision=27006
2011-04-27 15:42:14 +00:00
Eelco Dolstra 41a8f23189 * Revert to the old (r10556) version of the nixos-checkout script. It
was never intended as a generic "check out anything" script; it's
  just a convenience script to obtain the NixOS trunk after
  installation.  So that's what it should do.

svn path=/nixos/trunk/; revision=27005
2011-04-27 15:34:33 +00:00
Eelco Dolstra 650d14be8d * Remove most references to the "services" tree.
svn path=/nixos/trunk/; revision=26990
2011-04-27 13:16:33 +00:00
Eelco Dolstra be7a7a5b78 * nixos-build-vms/build-vms.nix: drop the "nixos" function argument,
since the path to the NixOS source tree is known.

svn path=/nixos/trunk/; revision=26989
2011-04-27 13:01:42 +00:00
Nicolas Pierron 6839bddd1b modules/installer/tools: nixos-gui: Fix derivation.
svn path=/nixos/trunk/; revision=26972
2011-04-25 17:48:59 +00:00
Nicolas Pierron 921231b555 Add nixos-gui among the installer tools.
Add it as a default for the graphical profile.

svn path=/nixos/trunk/; revision=26960
2011-04-25 01:03:57 +00:00
Nicolas Pierron 66eed7681d nixos-option: Add xml output to reduce the effort in nixos-gui.
svn path=/nixos/trunk/; revision=26950
2011-04-24 15:30:25 +00:00
Nicolas Pierron ba2d96cf85 nixos-option: Handle Lambdas in the injection of previously pretty-printed
output.

svn path=/nixos/trunk/; revision=26936
2011-04-23 17:53:05 +00:00
Eelco Dolstra ee3269cbbd * Put "minimal" or "graphical" in the ISO name to distinguish between
the files.

svn path=/nixos/trunk/; revision=26901
2011-04-20 10:48:52 +00:00
Shea Levy 8dd6f42a91 Fixed formatting
svn path=/nixos/trunk/; revision=26647
2011-03-31 23:06:36 +00:00
Shea Levy f269206972 Update iso-image.nix to work with kernels that use AUFS 2.1 instead of AUFS 2. Older kernels are unaffected.
svn path=/nixos/trunk/; revision=26646
2011-03-31 23:03:54 +00:00
Eelco Dolstra 6c55079ab0 * nixos-hardware-scan: It's not necessary to detect Intel graphics
cards because the default X config contains the Intel driver.
  Likewise, there is no need for the "vesa" default.
* nixos-hardware-scan: Clean up the output a bit.

svn path=/nixos/trunk/; revision=26423
2011-03-18 13:52:09 +00:00
Eelco Dolstra 6ee609a0a3 * On the installation CD, set the overcommit heuristic to "always
overcommit".  This makes it less likely that the installer fails
  randomly in low memory environments.

svn path=/nixos/trunk/; revision=26369
2011-03-16 15:17:54 +00:00
Eelco Dolstra 6646268c95 * This should no longer be needed.
svn path=/nixos/trunk/; revision=26331
2011-03-15 18:47:56 +00:00
Eelco Dolstra d8b69f2fad * grub-mkimage now requires a format flag. Also, the "sh" module has
disappeared.  Hopefully it's not important :-)

svn path=/nixos/trunk/; revision=26234
2011-03-09 16:26:03 +00:00
Eelco Dolstra 6f1068b0b7 * Remove the unnecessary warning printed by `nixos-rebuild test'. The
current configuration (/var/run/current-system) is always a GC root.

svn path=/nixos/trunk/; revision=26227
2011-03-09 12:14:06 +00:00
Eelco Dolstra f1277862cd * Handle --cores.
svn path=/nixos/trunk/; revision=26188
2011-03-07 12:12:53 +00:00
Eelco Dolstra 5cff6eda3d * Revert r21410 because it breaks handling of "--max-jobs".
svn path=/nixos/trunk/; revision=26187
2011-03-07 12:12:39 +00:00
Eelco Dolstra 34dea57f8a * Add wicd to the NixOS CD.
svn path=/nixos/trunk/; revision=26083
2011-02-23 19:11:32 +00:00
Eelco Dolstra 9fca36bfa3 * Add the Intel 5000/6000 firmwares to the installation media.
svn path=/nixos/trunk/; revision=26081
2011-02-23 19:06:14 +00:00
Ludovic Courtès 0513b31f73 Improve the documentation of `generationsDir'.
svn path=/nixos/trunk/; revision=25718
2011-01-29 23:07:02 +00:00
Eelco Dolstra 8361444f9b * Disable compositing for now in the graphical installation CD. It
seems to cause problems with KDE 4.5 on some graphics drivers (such
  as Cirrus and VGA in QEMU).  (NixOS/121)

svn path=/nixos/trunk/; revision=25659
2011-01-21 13:38:30 +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
Sander van der Burg c7a5960101 Removed backdoor argument
svn path=/nixos/trunk/; revision=25592
2011-01-16 21:59:17 +00:00
Sander van der Burg 51d66f647a Fixed nixos-build-vms to use the new test driver. Backdoor option does not work anymore though. I have to look for another solution
svn path=/nixos/trunk/; revision=25591
2011-01-16 21:57:09 +00:00
Ludovic Courtès ef54cd3d1f system-tarball-sheevaplug: Add hint about the serial console parameters.
svn path=/nixos/trunk/; revision=25583
2011-01-15 22:42:07 +00:00
Ludovic Courtès c56e039107 system-tarball-sheevaplug: Fix `kernelparams.txt'.
This is a followup to r23775 ("Substitute the path of the system
derivation directly in the stage 2 init script.").

svn path=/nixos/trunk/; revision=25582
2011-01-15 22:38:28 +00:00
Evgeny Egorochkin d8ad975a1f nixos-checkout: add support for git svn. Patch by Florian Friesdorf.
svn path=/nixos/trunk/; revision=25349
2011-01-02 22:13:56 +00:00
Tobias Hammerschmidt ddc6f84d9c updated broadcom wl driver
svn path=/nixos/trunk/; revision=25334
2011-01-02 11:05:46 +00:00
Eelco Dolstra ace958f669 * Sync with the trunk.
svn path=/nixos/branches/stdenv-updates/; revision=25307
2010-12-28 15:56:22 +00:00
Sander van der Burg 09c30053a2 Also pass the location of NixOS as argument to the deployment expression
svn path=/nixos/trunk/; revision=25275
2010-12-24 16:42:31 +00:00
Eelco Dolstra ba459a0bf3 * Fix the broken installer (http://hydra.nixos.org/build/811980). The
hardware scan was generating a hardware.nix containing
  "pkgs.linuxPackages" without having "pkgs" in scope.  Also, it
  shouldn't define boot.kernelPackages.

svn path=/nixos/trunk/; revision=25192
2010-12-18 17:56:04 +00:00
Lluís Batlle i Rossell 3f7751b9c2 Merging from trunk
svn path=/nixos/branches/stdenv-updates/; revision=25176
2010-12-17 14:59:04 +00:00
Eelco Dolstra 37a9ffffb0 * Provide a default hostname and deployment target equal to the
attribute name of the machine in the model.  This allows
  networking.hostName and deployment.targetHost to be omitted for
  typical networks.

svn path=/nixos/trunk/; revision=25125
2010-12-14 13:36:54 +00:00
Tobias Hammerschmidt 05c25d3fb2 check for broadcom wireless driver - patch by Vladimír Čunát
svn path=/nixos/trunk/; revision=25045
2010-12-09 19:08:33 +00:00
Sander van der Burg c318bd097e Fixed the --no-out-link option
svn path=/nixos/trunk/; revision=25034
2010-12-08 14:30:55 +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 755c30c7a2 - nixos-deploy-network no longer uses an infrastructure model => use nixpkgs.system and deployment.hostname instead
- implemented --no-out-link option so that invoking these tools from scripts leave no garbage behind
- some misc. cleanups


svn path=/nixos/trunk/; revision=25019
2010-12-06 22:02:37 +00:00
Eelco Dolstra 651a38019d * nixos-deploy-network: build the deploy script locally as an
optimisation and workaround for Nix/210.

svn path=/nixos/trunk/; revision=24956
2010-12-02 18:09:53 +00:00
Eelco Dolstra e97a3d9cb6 * Fix incorrect path to switch-to-configuration.
svn path=/nixos/trunk/; revision=24955
2010-12-02 17:22:24 +00:00
Lluís Batlle i Rossell 25b9c03571 Updating from trunk (specially for the enableFontDir option, as it was not up
to date for nixpkgs)


svn path=/nixos/branches/stdenv-updates/; revision=24871
2010-11-26 14:16:12 +00:00
Nicolas Pierron 30943d2dc0 Fix nixos-option, accept long arguments.
svn path=/nixos/trunk/; revision=24631
2010-11-09 18:42:59 +00:00
Lluís Batlle i Rossell ccc99b3fc0 Updating from trunk
svn path=/nixos/branches/stdenv-updates/; revision=24555
2010-10-31 19:36:37 +00:00
Lluís Batlle i Rossell 8c27201ce0 Fixing mkOverride and openssh things on system-tarballs
svn path=/nixos/branches/stdenv-updates/; revision=24554
2010-10-31 19:34:39 +00:00