philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
%!d() commits 3 branches 0 tags 1.4 GiB
Commit graph

424 commits

Author SHA1 Message Date
Shea Levy c61d919941 Typographical conventions 
svn path=/nixos/trunk/; revision=33148
 2012-03-16 11:31:33 +00:00
Shea Levy 358b699c20 installation-cd-efi: Only build a minimal cd 
svn path=/nixos/trunk/; revision=33147
 2012-03-16 11:25:09 +00:00
Shea Levy a315eefca1 Restore old installation-cd-new-kernel.nix and create a new installation-cd-efi.nix 
svn path=/nixos/trunk/; revision=33146
 2012-03-16 11:22:05 +00:00
Shea Levy 95bec1c001 efiBootStub: Properly handle the removableMediaImage path on different architectures 
svn path=/nixos/trunk/; revision=33141
 2012-03-16 06:08:55 +00:00
Shea Levy 8efda48496 Enable building an efi-bootable ISO 
svn path=/nixos/trunk/; revision=33140
 2012-03-16 05:37:24 +00:00
Shea Levy 1bccbc30cd efiBootStub: Assert that the 
kernel has the efiBootStub feature

svn path=/nixos/trunk/; revision=33138
 2012-03-16 02:55:17 +00:00
Shea Levy 4caf3560be efiBootStub: Add the installRemovableMediaImage option 
svn path=/nixos/trunk/; revision=33135
 2012-03-16 02:34:07 +00:00
Eelco Dolstra f4903be57e * nixos-hardware-scan: detect if we're in a VirtualBox guest and 
enable the guest additions in that case.

svn path=/nixos/trunk/; revision=33133
 2012-03-16 01:57:23 +00:00
Shea Levy 001fcad421 First shot at EFI booting. 
Note: This feature is INCOMPLETE. Moreover, when runEfibootmgr is true it will
MODIFY NVRAM and, on Apple systems, possibly brick your firmware. PLEASE be
careful while further testing is performed

svn path=/nixos/trunk/; revision=33047
 2012-03-13 19:27:59 +00:00
Eelco Dolstra b4d16ef07e * Fix nixos-option. 
svn path=/nixos/trunk/; revision=33031
 2012-03-13 09:36:41 +00:00
Lluís Batlle i Rossell 29ca7f2c80 Adding VIA_RHINE to the system tarball pc. I need to boot one with PXE and nfsroot with via rhine. 
svn path=/nixos/trunk/; revision=32994
 2012-03-11 16:39:49 +00:00
Eelco Dolstra 45fab492fc * nixos-hardware-scan: "acpi-cpufreq" is automatically loaded, so we 
don't need to detect it.
* nixos-hardware-scan: don't use modulesPath.

svn path=/nixos/trunk/; revision=32972
 2012-03-10 14:35:31 +00:00
Eelco Dolstra 9d89ca0c03 * Modularise vfat support. Also add fsck.vfat to the initrd. This 
prevents errors when booting from VFAT (e.g. an ISO image converted
  using unetbootin).

svn path=/nixos/trunk/; revision=32956
 2012-03-09 16:17:37 +00:00
Lluís Batlle i Rossell 13ac0a309b Allow a way to install grub to multiple devices (for /boot on soft raid arrays). 
svn path=/nixos/trunk/; revision=32913
 2012-03-08 21:37:30 +00:00
Eelco Dolstra 4869175158 * Fix the installer. The nixos-config element in $NIX_PATH was not 
set (and neither was $NIXOS_CONFIG).
  (http://hydra.nixos.org/build/2230309).

svn path=/nixos/trunk/; revision=32857
 2012-03-07 21:17:46 +00:00
Eelco Dolstra a2417fd92f * Another workaround for the bug in substitute. 
svn path=/nixos/trunk/; revision=32814
 2012-03-06 10:57:52 +00:00
Eelco Dolstra 974a74ad49 * enableWLAN -> wireless.enable. 
svn path=/nixos/trunk/; revision=32788
 2012-03-04 21:15:34 +00:00
Lluís Batlle i Rossell 0b8e992d3d Setting the kernel 3.2 for the new-kernel nixos iso. 
svn path=/nixos/trunk/; revision=32785
 2012-03-04 21:01:20 +00:00
Eelco Dolstra 0d4eb37e16 * Fix the NixOS jobset. 
svn path=/nixos/trunk/; revision=32783
 2012-03-04 20:57:34 +00:00
Eelco Dolstra 65824d40e1 * nixos-rebuild: pass on the -I option to nix-build. 
svn path=/nixos/trunk/; revision=32741
 2012-03-02 13:31:12 +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
Lluís Batlle i Rossell 97e0131291 Adding support for 3c59x NICs to the system-tarball-pc. 
svn path=/nixos/trunk/; revision=32229
 2012-02-11 21:13:10 +00:00
Florian Friesdorf 007d56b69f intel-5150.nix: add Intel 5150 wireless firmware support 
Author:    Sergey Mironov <ierton@gmail.com>

svn path=/nixos/trunk/; revision=31231
 2012-01-03 14:12:41 +00:00
Florian Friesdorf da90f06ff8 4965agn was wrongly detected as a 3945abg 
svn path=/nixos/trunk/; revision=31164
 2011-12-30 23:26:06 +00:00
Nicolas Pierron 338bc7b9f8 Fix nixos-option without argument. 
svn path=/nixos/trunk/; revision=31139
 2011-12-29 06:33:34 +00:00
Eelco Dolstra 6b6cee46c7 * By popular demand, provide an ISO with a more recent kernel. 
svn path=/nixos/trunk/; revision=30344
 2011-11-08 19:51:39 +00:00
Eelco Dolstra 06843a45ef * Fix auto-login. 
svn path=/nixos/trunk/; revision=30341
 2011-11-08 19:02:51 +00:00
Eelco Dolstra dd28c62879 * My grep skills are lacking. 
svn path=/nixos/trunk/; revision=30335
 2011-11-08 16:39:13 +00:00
Eelco Dolstra b69dd8759c * minimal.nix: don't include base.nix. Also note it's not currently used. 
svn path=/nixos/trunk/; revision=30333
 2011-11-08 16:29:40 +00:00
Eelco Dolstra 295dafed8a * Refactoring: graphical.nix no longer includes base.nix so that it 
just does what it says (enable a "graphical" configuration).
* Enable KDM in the graphical CD.  The "auto" display manager doesn't
  properly handle shutdowns etc.

svn path=/nixos/trunk/; revision=30331
 2011-11-08 16:17:37 +00:00
Eelco Dolstra ba7f635f8b * Move the hardware bits of base.nix into a separate module, 
all-hardware.nix.  This allows base.nix (which should probably be
  renamed to something more descriptive) to be reused without getting
  the hardware configuration of the installation CD.

svn path=/nixos/trunk/; revision=30327
 2011-11-08 15:58:59 +00:00
Shea Levy 7f7eb341c8 Update the comment in the nixos-option generated configuration.nix in light of r30325 
svn path=/nixos/trunk/; revision=30326
 2011-11-08 15:51:39 +00:00
Eelco Dolstra a76fe106e7 * nixos-hardware-scan: don't emit an include of an "install profile". 
That's confusing and wrong: nixos-hardware-scan should just enable
  support for the detected hardware, not enable lots of software (let
  alone KDE).

svn path=/nixos/trunk/; revision=30325
 2011-11-08 15:39:13 +00:00
Eelco Dolstra 3e30d87c26 * aufs2 -> aufs. 
svn path=/nixos/trunk/; revision=30323
 2011-11-08 15:12:11 +00:00
Eelco Dolstra 848485a043 * Remove installation-cd-rescue as it's not used, and the other CDs 
should also contain all appropriate rescue tools.

svn path=/nixos/trunk/; revision=30320
 2011-11-08 14:29:35 +00:00
Eelco Dolstra b024940384 * Enable upower on the graphical ISO. 
svn path=/nixos/trunk/; revision=30156
 2011-10-31 21:08:22 +00:00
Peter Simons 20b364f4de Reverting revisions 30103-30106: "always set nixpkgs.config.{state,store}Dir", etc. 
After the change from revision 30103, nixos-rebuild suddenly consumed
freaky amounts of memory. I had to abort the process after it had
allocated well in excess of 30GB(!) of RAM. I'm not sure what is causing
this behavior, but undoing that assignment fixes the problem. The other
two commits needed to be revoked, too, because they depend on 30103.

svn path=/nixos/trunk/; revision=30127
 2011-10-30 15:19:58 +00:00
Shea Levy fe045dc949 sed -i -e 's|/nix/var|@stateDir@|g' -e 's|/nix/store|@storeDir@|g' modules/installer/tools/*.sh 
Use configurable storeDir and stateDir in the installer tools

svn path=/nixos/trunk/; revision=30106
 2011-10-29 22:14:27 +00:00
Shea Levy a16d43a8ac Make the stateDir and storeDir available for substitution into the tools 
svn path=/nixos/trunk/; revision=30105
 2011-10-29 22:00:25 +00:00
Shea Levy 09cf6ce70c find modules | fgrep .nix | fgrep -v .svn | fgrep -v nixpkgs.nix | xargs sed -i -e 's|/nix/var|${config.nixpkgs.config.nix.stateDir}|g' -e 's|/nix/store|${config.nixpkgs.config.nix.storeDir}|g' 
Don't assume /nix/store or /nix/var in NixOS modules, this is configurable

svn path=/nixos/trunk/; revision=30104
 2011-10-29 21:03:57 +00:00
Eelco Dolstra 0a1fee9ec8 * Add a module for the Broadcom firmware. Also, add it to the 
installation CD (though the kernel on the CD is not recent
  enough yet to actually support the device).  (This is kind of
  an abuse of "not-detected.nix".)

svn path=/nixos/trunk/; revision=30003
 2011-10-24 23:41:33 +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 18d52f8f4b modules/installer/scan/not-detected.nix: don't depend on pkgs.rt73fw 
The rt73 firmware has disappeared from the upstream server, and we don't
have a new URL yet.

svn path=/nixos/trunk/; revision=29620
 2011-10-04 08:45:15 +00:00
Shea Levy 3a201ef6a7 Enable building ISOs for aufs3 kernels 
svn path=/nixos/trunk/; revision=29538
 2011-09-28 22:43:53 +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
Nicolas Pierron def746fcdd Add Intel firmwars (iwlwifi-6000g2{a,b}-ucode). 
svn path=/nixos/trunk/; revision=29020
 2011-09-05 09:19:55 +00:00
Lluís Batlle i Rossell 4bc0bfec4c Making the system-tarball-pc boot fine with PXE, and include help files and a 
readme file as examples for an easy PXE setup.

This allows booting the NixOS in the system tarball, and thus allows installing nixos.


svn path=/nixos/trunk/; revision=28585
 2011-08-15 14:37:00 +00:00
Lluís Batlle i Rossell 8f6a4be721 Trying to make the system tarball for pc closer to PXE boot. 
svn path=/nixos/trunk/; revision=28573
 2011-08-14 22:01:58 +00:00
Eelco Dolstra 63e9ece771 * Support booting into another GRUB boot entry via ‘grub-reboot’. 
This requires grub.conf to honour the saved_entry GRUB environment
  variable.

svn path=/nixos/trunk/; revision=27807
 2011-07-17 11:42:44 +00:00
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
Sander van der Burg 9c722e474d - Added nixos-build-vms command, which builds a virtual network from a network.nix expression (also used by nixos-deploy-network) 
- Added a backdoor option to the interactive run-vms script. This allows me to intergrate the virtual network approach with Disnix
- Small documentation fixes

Some explanation:

The nixos-build-vms command line tool can be used to build a virtual network of a network.nix specification.
For example, a network configuration (network.nix) could look like this:

{
  test1 = 
    {pkgs, config, ...}:
 
    {
      services.openssh.enable = true;
      ...
    };

  test2 =
    {pkgs, config, ...}:
    
    {
      services.openssh.enable = true;
      services.xserver.enable = true;
    }

    ;
}

By typing the following instruction:

$ nixos-build-vms -n network.nix

a virtual network is built, which can be started by typing:

$ ./result/bin/run-vms

It is also possible to enable a backdoor. In this case *.socket files are stored in the current directory
which can be used by the end-user to invoke remote instruction on a VM in the network through a Unix
domain socket.

For example by building the network with the following instructions:

$ nixos-build-vms -n network.nix --use-backdoor

and launching the virtual network:

$ ./result/bin/run-vms

You can find two socket files in your current directory, namely: test1.socket and test2.socket.
These Unix domain sockets can be used to remotely administer the test1 and test2 machine
in the virtual network.

For example by running:

$ socat ./test1.socket stdio
ls /root

You can retrieve the contents of the /root directory of the virtual machine with identifier test1


svn path=/nixos/trunk/; revision=24410
 2010-10-21 22:50:12 +00:00
Lluís Batlle i Rossell 1acbc4a82f Updating from trunk. Blind commit - no coflicts. 
svn path=/nixos/branches/stdenv-updates/; revision=24370
 2010-10-19 20:45:35 +00:00
Sander van der Burg 936e4e73d7 Modified the nixos-deploy-network script to use a 2PC-like approach illustrated in the Disnix HotSWUp paper for system configurations 
svn path=/nixos/trunk/; revision=24352
 2010-10-18 19:47:46 +00:00
Lluís Batlle i Rossell 51d0ccdf3c Updating from trunk (to catch cron changes) 
I had some merge problems with the system-tarball; I hope I've resolved them.


svn path=/nixos/branches/stdenv-updates/; revision=24201
 2010-10-10 11:46:57 +00:00
Sander van der Burg 122e125d6b Added the nixos-deploy-network tool. With this tool you can write a network of NixOS configurations, e.g.: 
{
  test1 = {pkgs, config, ...}:
    {
       # NixOS config of machine test1
       ...
    };

  test2 = {pkgs, config, ...}:
    {
       # NixOS config of machine test2
       ...
    };
}

And an infrastructure expression, e.g:

{
  test1 = {
    hostName = "test1.example.org";
    system = "i686-linux";
  };
  test2 = {
    hostName = "test2.example.org";
    system = "x86_64-linux";
  };
}

And by executing:

nixos-deploy-network -n network.nix -i infrastructure.nix

The system configurations in the network expression are built, transferred to the machines in the network and finally activated. 


svn path=/nixos/trunk/; revision=24146
 2010-10-07 14:30:52 +00:00
Eelco Dolstra 17213c4f2a * When generating a GRUB 1 menu, don't use the "module" command to 
load the initrd, because pv-grub doesn't like it.

svn path=/nixos/trunk/; revision=24068
 2010-10-05 13:11:30 +00:00
Rob Vermaas 7468ad50e0 nixos-option.sh: fix typo 
svn path=/nixos/trunk/; revision=24015
 2010-10-01 06:31:27 +00:00
Nicolas Pierron 567f37f3e4 Export tools which may be useful for users that want to switch to NixOS 
without using a live CD.

svn path=/nixos/trunk/; revision=23939
 2010-09-26 13:39:16 +00:00
Nicolas Pierron 62c9591d0b Fix usage message (-description) and honor $NIXOS instead of $NIXOS_PATH. 
svn path=/nixos/trunk/; revision=23937
 2010-09-26 08:43:55 +00:00
Nicolas Pierron 7ea957fd3d Add --install option for nixos-option which is used to handle options of 
the target system (when installing) and also to generate a template
configuration file for users.

svn path=/nixos/trunk/; revision=23923
 2010-09-25 22:29:50 +00:00
Nicolas Pierron fe7c1eb16b Remove duplicated definitions. 
svn path=/nixos/trunk/; revision=23921
 2010-09-25 09:44:48 +00:00
Nicolas Pierron e20ef7564e Update live-dvd configuration. 
svn path=/nixos/trunk/; revision=23919
 2010-09-25 09:33:17 +00:00
Nicolas Pierron c18fe31160 Make nixos-hardware-scan adding a profile to the generated configuration 
file.

svn path=/nixos/trunk/; revision=23918
 2010-09-25 09:33:13 +00:00
Nicolas Pierron 5fb80fcc4b Extract rescue profile from the the corresponding CD. 
svn path=/nixos/trunk/; revision=23917
 2010-09-25 09:33:09 +00:00
Nicolas Pierron 9936a6f525 Simplify system-tarball-pc.nix. Factor detected / undetected devices into 
the instalaltion-device profile.

svn path=/nixos/trunk/; revision=23916
 2010-09-25 09:33:03 +00:00
Nicolas Pierron f3cc01bd3b Extract graphical and minimal profiles from the installation CDs. 
svn path=/nixos/trunk/; revision=23915
 2010-09-25 09:32:57 +00:00
Nicolas Pierron 59429aa449 Change the policy used to select files added in the import list of the 
generated configuration.  Use all files listed as modules of eval-config.

svn path=/nixos/trunk/; revision=23914
 2010-09-25 09:32:52 +00:00
Nicolas Pierron d2d139e920 Move the generation of the dummy configuration file into the installation 
device profile.

TODO: The current configuration does not reproduce exactly the CD
configuration, fix it.

svn path=/nixos/trunk/; revision=23913
 2010-09-25 09:32:48 +00:00
Nicolas Pierron 112cd0c4d4 Add an installation device profile, and use it it the basic installation CD. 
svn path=/nixos/trunk/; revision=23912
 2010-09-25 09:32:43 +00:00
Nicolas Pierron cf103b8d4d Add 2 index file to define the default case for detected and not-detected 
devices.  These are used to replace hand made listings in the basic
installation CD.

The configuration file, which is generated by nixos-hardware-scan, enables
not-detected devices by default.

svn path=/nixos/trunk/; revision=23911
 2010-09-25 09:32:37 +00:00
Nicolas Pierron c90a7b9be4 Remove duplicated (modules-list) includes from the basic installation cd. 
svn path=/nixos/trunk/; revision=23910
 2010-09-25 09:32:32 +00:00
Nicolas Pierron d304d12f37 Extract a base profile from the basic installation cd. 
svn path=/nixos/trunk/; revision=23909
 2010-09-25 09:32:27 +00:00
Lluís Batlle i Rossell c1e4586ed1 Again trying to get the kernelFile paths right 
svn path=/nixos/branches/stdenv-updates/; revision=23836
 2010-09-17 17:25:46 +00:00
Lluís Batlle i Rossell 743b75fbaf Making the fuloong2f system-tarball more specific for the fuloong, so, helping in how 
to use the system more easily.


svn path=/nixos/branches/stdenv-updates/; revision=23826
 2010-09-16 19:26:34 +00:00
Lluís Batlle i Rossell 3b216865d2 Writing better some sheevaplug system-tarball lines (kernel parameters in a single line, for example) 
svn path=/nixos/branches/stdenv-updates/; revision=23825
 2010-09-16 19:25:29 +00:00
Lluís Batlle i Rossell 83d012ba13 Trying to fix again system-tarball-pc (again, the kernel file name) 
svn path=/nixos/branches/stdenv-updates/; revision=23824
 2010-09-16 19:24:52 +00:00
Lluís Batlle i Rossell 7672c36a70 Trying to get system-tarball-pc build properly. 
svn path=/nixos/branches/stdenv-updates/; revision=23814
 2010-09-15 21:36:56 +00:00
Eelco Dolstra c4f910f550 * Substitute the path of the system derivation directly in the stage 2 
init script.  This removes the need for the `systemConfig' boot
  parameter; `init=<stage-2-init>' is enough.  However, the GRUB menu
  builder still needs to add `systemConfig' to the kernel command line
  for compatibility with old configurations.

svn path=/nixos/trunk/; revision=23775
 2010-09-13 22:10:25 +00:00
Lluís Batlle i Rossell 245df33c6c Making the system tarballs of fuloong and sheevaplug reference the proper nixpkgs, and not that of /etc/... 
svn path=/nixos/branches/stdenv-updates/; revision=23772
 2010-09-13 20:52:49 +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 987dd76811 * Added a module to enable the Xen hypervisor. 
svn path=/nixos/trunk/; revision=23739
 2010-09-12 22:43:45 +00:00
Eelco Dolstra 8edefa2960 * Grrr. Fix the sort order. 
svn path=/nixos/trunk/; revision=23732
 2010-09-10 17:35:13 +00:00
Eelco Dolstra 4ae4b7d47f * Support booting Xen in the Grub menu builder. 
svn path=/nixos/trunk/; revision=23730
 2010-09-10 17:15:35 +00:00
Eelco Dolstra 8f4139987e * Regex listing the system generations was selecting the number from 
only the first generation in the list.  (From Karn Kallio.)

svn path=/nixos/trunk/; revision=23728
 2010-09-10 15:47:06 +00:00
Eelco Dolstra 7b635ee4ed * "ls -d" -> "echo", since "ls" prints the current directory if 
nothing matches.

svn path=/nixos/trunk/; revision=23716
 2010-09-10 12:25:59 +00:00
Lluís Batlle i Rossell 9ba735714a Adding a system-tarball expression for the sheevaplug (which a previous commit already put a reference to) 
svn path=/nixos/branches/stdenv-updates/; revision=23690
 2010-09-08 17:15:31 +00:00
Lluís Batlle i Rossell ccf7852e11 Updating the system-tarball work, having just tested that of the fuloong2f. 
svn path=/nixos/branches/stdenv-updates/; revision=23689
 2010-09-08 16:53:36 +00:00
Nicolas Pierron c9dc3651da Replace mkOverride by its alias mkOverrideTemplate to remove the unused 
template argument of mkOverride later.

svn path=/nixos/trunk/; revision=23631
 2010-09-03 19:10:59 +00:00
Nicolas Pierron 1f69bc4b9d Remove deprecated notation in tools.nix. 
svn path=/nixos/trunk/; revision=23630
 2010-09-03 19:10:54 +00:00
Nicolas Pierron 9e04f67b3d Add nixos-option tool to investigate option details on the cmd-line. 
svn path=/nixos/trunk/; revision=23629
 2010-09-03 19:10:50 +00:00
Michael Raskin 597e083d82 Adding an option to include build dependencies into ISO image 
svn path=/nixos/trunk/; revision=23502
 2010-08-29 12:11:31 +00:00
Eelco Dolstra 8c960af984 * Handle the case where /boot is on the same filesystem as / 
but on a different filesystem than /nix/store.  In that case
  we need to copy the kernels and initrds to /boot.

svn path=/nixos/trunk/; revision=23085
 2010-08-10 08:36:59 +00:00
Eelco Dolstra cbc05c1480 * Enable wpa_supplicant on the installation CD. 
svn path=/nixos/trunk/; revision=23034
 2010-08-08 13:55:35 +00:00
Eelco Dolstra e8e7ee356c * In the installation CD, pass the label of the CD through the 
root=... kernel command line parameter, instead of hard-coding it in
  `fileSystems'.  This is to allow CD-to-USB converters such as
  UNetbootin to rewrite the kernel command line to the label or UUID
  of the USB stick.

svn path=/nixos/trunk/; revision=23024
 2010-08-07 14:16:18 +00:00
Eelco Dolstra d7d2d5e3d5 * Add some NLS modules required to mount FAT filesystems. We need 
this to boot the NixOS installer from a USB stick.

svn path=/nixos/trunk/; revision=23019
 2010-08-06 23:09:37 +00:00
Eelco Dolstra 05fc10f3a8 * Add dosfstools to the installation CD (for 
{mkfs,fsck}.{vfat,msdos}).

svn path=/nixos/trunk/; revision=23006
 2010-08-06 18:52:00 +00:00
Eelco Dolstra d659488209 * Use the regular GRUB menu builder for Amazon. There are two issues: 
we want to generate the GRUB menu without actually installing GRUB
  (because Amazon supplies its own pv-grub), and each menu entry
  requires "root (hd0)".  For the first, allow boot.loader.grub.device
  to be set to "nodev" to indicate that the GRUB menu should be
  generated without installing GRUB.  For the second, add an option
  boot.loader.grub.extraPerEntryConfig to allow commands to be added
  to each GRUB menu entry (in this case, "root (hd0)").

svn path=/nixos/trunk/; revision=22712
 2010-07-22 14:40:29 +00:00
Eelco Dolstra f1dde44ac1 * Added an action `nixos-rebuild pull' to just pull the Nixpkgs 
channel manifest and exit.  Useful if you don't want to use
  nix-channel.

svn path=/nixos/trunk/; revision=22601
 2010-07-14 14:18:27 +00:00
Eelco Dolstra baf54c517d * Fix the terminal_output command. (This used to work but not with 
the latest GRUB I guess.)

svn path=/nixos/trunk/; revision=22575
 2010-07-13 11:48:40 +00:00
Eelco Dolstra 54d201294b * Sync with the trunk. 
svn path=/nixos/branches/boot-order/; revision=22487
 2010-07-06 08:21:05 +00:00
Lluís Batlle i Rossell 41cc6ecdbb Trying to make the nixos-bootstrap-archive (nixos-minimal-archive in other places named) to have an 
hydra build product for easy tarball download.


svn path=/nixos/trunk/; revision=22440
 2010-07-01 17:54:03 +00:00
Eelco Dolstra d43d321e86 * Sync with the trunk. 
svn path=/nixos/branches/boot-order/; revision=22349
 2010-06-20 20:54:31 +00:00
Eelco Dolstra a65b5ec81c * Added an option boot.loader.grub.extraConfig to add commands to 
grub.cfg before the menu entries.  (This could also be done using
  `extraEntriesBeforeNixOS', but then you can't have entries *after*
  the main entry anymore.)
* In the installer test, redirect GRUB output to the serial port.

svn path=/nixos/branches/boot-order/; revision=22300
 2010-06-16 22:18:26 +00:00
Lluís Batlle i Rossell f69d7b1768 Fixing my previous bad commit on stat. Thank you David! 
svn path=/nixos/trunk/; revision=22297
 2010-06-16 15:17:02 +00:00
Lluís Batlle i Rossell fbb3046a87 Making the grub menu builder take a better path at distinguishing if / and /boot are different fs. 
I chose %D over %d because I like hex more.


svn path=/nixos/trunk/; revision=22294
 2010-06-16 13:58:15 +00:00
Eelco Dolstra ca1910e4b0 * Seems that we don't need the aufs2 mount helper. 
svn path=/nixos/trunk/; revision=22038
 2010-05-28 09:35:24 +00:00
Eelco Dolstra f9f224972a * Use AUFS2. 
svn path=/nixos/trunk/; revision=22033
 2010-05-28 07:09:34 +00:00
Yury G. Kudryashov 2dfd9b51ae gnupg2 is now called gnupg 
svn path=/nixos/trunk/; revision=21889
 2010-05-19 21:11:46 +00:00
Marc Weber ce642f0cc2 nixos-rebuild: accept both: -jn and -j n 
svn path=/nixos/trunk/; revision=21410
 2010-04-28 19:52:03 +00:00
Yury G. Kudryashov a30637aba5 Really use nix-worker in nixos-rebuild 
svn path=/nixos/trunk/; revision=21307
 2010-04-25 18:26:51 +00:00
Eelco Dolstra c1e313b5e1 * Remove obsolete references to kernelPackages in Nixpkgs. 
svn path=/nixos/trunk/; revision=20647
 2010-03-16 12:10:06 +00:00
Ludovic Courtès 8e16742b79 Update users of `services.sshd'. 
svn path=/nixos/trunk/; revision=20575
 2010-03-11 17:02:53 +00:00
Ludovic Courtès bcd3cd85f3 installation-cd: Add an `installer.basePackages' option. 
svn path=/nixos/trunk/; revision=20573
 2010-03-11 17:02:36 +00:00
Eelco Dolstra 1065e86642 * In nixos-rebuild, build config.environment.nix before trying nixFallback or nixUnstable. 
svn path=/nixos/trunk/; revision=20376
 2010-03-04 14:38:53 +00:00
Lluís Batlle i Rossell b6090bff9d Making the bootloaders respect the platform.kernelTarget set in nixpkgs. 
svn path=/nixos/trunk/; revision=20283
 2010-02-27 22:17:10 +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
Lluís Batlle i Rossell 1dd3162d7c First attempt at trying to get a tarball of a bootable nixos system. 
What I want with this derivation is to allow the sheevaplug nixos to
build a tarball with all the needed files to boot. Then, this can be
unpacked into an SD card, or into a NFS/TFTP server, and then the
user can boot the system with help of the uboot console.
By now, I have only tried to build the tarball in a PC, in order
to develop the nix expressions quicker.

There is nothing written specialy for the Sheevaplug in all this,
by now.


svn path=/nixos/trunk/; revision=20035
 2010-02-15 23:27:51 +00:00
Eelco Dolstra dbc03fbf68 * nixos-install: copy /etc/nsswitch.conf to the chroot. This seems 
necessary to have it use /etc/hosts.

svn path=/nixos/trunk/; revision=19905
 2010-02-10 14:31:46 +00:00
Eelco Dolstra 6a06118f85 * Use the build flags given on the command line while building Nix. 
svn path=/nixos/trunk/; revision=19799
 2010-02-03 22:49:50 +00:00
Lluís Batlle i Rossell 13ee735395 Making nixos work well with the new names 'linuxPackages' in stdenv-updates, additionally 
to the nixpkgs trunk 'kernelPackages'.
Seeing a strange kernelPackages mentioned in installation-cd-rescue (2.6.31_something) I
update that to 2.6.32.


svn path=/nixos/trunk/; revision=19443
 2010-01-14 19:50:49 +00:00
Eelco Dolstra 5c66611f3e svn path=/nixos/trunk/; revision=19333 2010-01-10 18:34:32 +00:00
Eelco Dolstra 1a0bb65901 * Added a regression test for whether the Nixpkgs channel works. This 
is done by instantiating a webserver that simulates nixos.org.
  Using nix-push we create a channel that contains some stuff (namely
  the GNU Hello source tarball and the rlwrap program).  This was a
  bit tricky because nix-push requires a writable Nix store.  Using
  AUFS this is possible, but not on recent Linux kernels (AUFS1 over
  CIFS fails).

svn path=/nixos/trunk/; revision=19327
 2010-01-10 01:26:01 +00:00
Eelco Dolstra 39796e26b4 * Removed the boot.isLiveCD option. Moved the code for mounting a 
tmpfs on top of the CD to iso-image.nix.

svn path=/nixos/trunk/; revision=19318
 2010-01-09 15:13:06 +00:00
Eelco Dolstra 34341d810a * Remove a debug line. 
svn path=/nixos/trunk/; revision=19285
 2010-01-07 13:53:09 +00:00
Eelco Dolstra 83478a0800 * Add klibc and klibcShrunk to the CD because they're always needed 
during an installation.

svn path=/nixos/trunk/; revision=19273
 2010-01-06 20:51:10 +00:00
Eelco Dolstra 8ebde1ea8a * Add the modules for all block devices. 
svn path=/nixos/trunk/; revision=19271
 2010-01-06 20:09:53 +00:00
Eelco Dolstra 1b21115f61 * Support creating a virtual disk in the test driver. 
svn path=/nixos/trunk/; revision=19263
 2010-01-06 14:37:23 +00:00
Eelco Dolstra 1da72333d9 * Put the NixOS boot at the top so that it's the default. 
svn path=/nixos/trunk/; revision=19255
 2010-01-06 12:24:20 +00:00
Eelco Dolstra 790368e315 * Removed installation-cd-minimal-fresh-kernel.nix since the kernel in 
installation-cd-minimal.nix is now 2.6.32.  Added most of its extra
  tools to installation-cd-base.nix.
* Put memtest86 at the bottom of the GRUB menu.  (There is currently
  no good way to do this other than to change the module inclusion
  order.)

svn path=/nixos/trunk/; revision=19188
 2010-01-03 17:13:30 +00:00
Eelco Dolstra 21216b0461 * Move some kernel modules around. 
svn path=/nixos/trunk/; revision=19187
 2010-01-03 16:29:17 +00:00
Marc Weber 4378018164 nixos-rebuild: allow passing --fallback 
replacing if .. fi by case .. esac

svn path=/nixos/trunk/; revision=19186
 2010-01-03 13:36:23 +00:00
Eelco Dolstra 64c75274e1 * Use Linux 2.6.32 on the installation CD. 
svn path=/nixos/trunk/; revision=19166
 2010-01-01 16:26:01 +00:00
Marc Weber 93cb9f819d cosmetic: remove redundancy 
svn path=/nixos/trunk/; revision=19040
 2009-12-18 15:08:50 +00:00
Eelco Dolstra 44dafe885b * Don't enable this by default. 
svn path=/nixos/trunk/; revision=19012
 2009-12-17 11:43:12 +00:00
Marc Weber 4ff6821a03 module creating /sbin/init 
svn path=/nixos/trunk/; revision=19009
 2009-12-17 06:04:36 +00:00
Eelco Dolstra aa445933a7 * Include some more firmware in the installation CD. 
svn path=/nixos/trunk/; revision=19007
 2009-12-16 23:52:02 +00:00
Eelco Dolstra 0ca7619e62 svn path=/nixos/trunk/; revision=18999 2009-12-16 18:58:34 +00:00
Eelco Dolstra deb4f88c2c * Let the GRUB menu builder detect whether /boot is on a different 
partition from /.  If so, copy the kernels and initrds to /boot and
  use paths relative to /boot in the GRUB configuration file.  This
  makes the boot.loader.grub.bootDevice option obsolete.  (Is there a
  way to mark obsolete options?)  It also makes it unnecessary to set
  boot.loader.grub.copyKernels, although that option is still
  available since it can speed up GRUB if the Nix store is very
  large.

svn path=/nixos/trunk/; revision=18998
 2009-12-16 18:57:02 +00:00
Eelco Dolstra 8d588424d2 * switch-to-configuration: force a reinstallation of GRUB whenever the 
GRUB version changes.  (That's the complete version from the name
  attribute, not the boot.loader.grub.version attribute.)  The current
  version is recorded in /boot/grub/version.  This is required to
  prevent massive breakage when we change the default value of
  boot.loader.grub.version to "2".

svn path=/nixos/trunk/; revision=18997
 2009-12-16 18:11:26 +00:00
Marc Weber 181f4bee26 fix nixos-intall(2). Now the configuration is built correctly. 
Passing --arg configuration does no longer work!

svn path=/nixos/trunk/; revision=18983
 2009-12-15 23:26:55 +00:00
Marc Weber 4b5864666e * refactoring kvm test and bootstrapping image. 
expose makeInfo (used by test now)
  expose config hack
* Adding tests to release.nix
* fixes
* removing dependency on perl

refactoring details:
Move all configuration modules used by the NixOS installation test script
into one directory.

svn path=/nixos/trunk/; revision=18982
 2009-12-15 23:26:52 +00:00
Eelco Dolstra 79bcc7618e * Make the graphical boot work on GRUB 2 in the case where /nix/store 
is not on the same partition as /boot (i.e. when
  boot.loader.grub.bootDevice is set): just copy the background image
  and the font to /boot.

svn path=/nixos/trunk/; revision=18979
 2009-12-15 21:11:39 +00:00
Eelco Dolstra cea70d24e9 * The default default menu item (sic) should be 0, not 1. (Or is this 
different for GRUB 2?)
* Clean up the option descriptions.

svn path=/nixos/trunk/; revision=18976
 2009-12-15 18:21:55 +00:00
Eelco Dolstra 6c9059e717 * Added an option `boot.initrd.availableKernelModules' that specifies 
modules that should be added to the initrd, but should only be
  loaded on demand (e.g. by the kernel or by udev).  This is
  especially useful in the installation CD, where we now only load the
  modules needed by the hardware.
* Enable automatic modprobing by udev in the initrd.

svn path=/nixos/trunk/; revision=18975
 2009-12-15 16:38:20 +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
Marc Weber 401fd84ae1 kvm installation test update + NixOS installation archive 
You can run the kvm nixos installation test by:
  nix-build --no-out-link tests/test-nixos-install-from-cd.nix
It boots the installed system.
It still fails sshd isn't started (yet)

adding nixos-bootstrapping-archive:
You can install NixOS easily using any live cd now.
See README-BOOTSTRAP-NIXOS

svn path=/nixos/trunk/; revision=18950
 2009-12-15 06:37:32 +00:00
Marc Weber 4d7e344f69 Adding initial version of the nixos cd insallation test script using 
qemu_kvm. Installation doesn't take place yet. VM is started
printing a remote controlled "Hello".

This serves as example how to run a vm within a bulid job.

svn path=/nixos/trunk/; revision=18887
 2009-12-11 00:51:13 +00:00
Marc Weber 086c3d6328 making default and timeout of grub overridable 
also updating grub option names to current names

svn path=/nixos/trunk/; revision=18886
 2009-12-11 00:51:07 +00:00
Eelco Dolstra f26080c5f4 * Clean up the nixos-rebuild output a bit. 
svn path=/nixos/trunk/; revision=18859
 2009-12-09 18:23:48 +00:00
Eelco Dolstra aa9d0a067e * Sync with the trunk. 
svn path=/nixos/branches/upstart-0.6/; revision=18408
 2009-11-18 11:50:06 +00:00
Michael Raskin f9958cbb44 Update kernel version for fresh-kernel 
svn path=/nixos/trunk/; revision=18379
 2009-11-17 09:00:49 +00:00