alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
1738 commits 217 branches 116 tags 4 GiB
Commit graph

206 commits

Author SHA1 Message Date
Eelco Dolstra c4780a8953 * dhcp 4.1 requires IPv6 support. 
svn path=/nixos/branches/modular-nixos/; revision=16450
 2009-07-24 00:31:22 +00:00
Eelco Dolstra 32b311a0f5 * Add gzip to the $PATH of nix-daemon, otherwise distributed builds 
don't work.  This is a regression wrt the trunk.

svn path=/nixos/branches/modular-nixos/; revision=16448
 2009-07-23 23:25:50 +00:00
Marc Weber dbd6ea7f63 adding daemonNiceLevel option. running biulds with niceness 0 can be annoying 
svn path=/nixos/branches/modular-nixos/; revision=16420
 2009-07-18 16:14:03 +00:00
Eelco Dolstra d591559609 * A simple module for running wpa_supplicant. 
svn path=/nixos/branches/modular-nixos/; revision=16409
 2009-07-16 21:08:32 +00:00
Eelco Dolstra 3abf509637 * Don't try to start dhclient on the wmaster0 interface. This just 
gets rid of endless dhclient log messages such as

    Jul 16 19:09:30 dutibo dhclient: DHCPDISCOVER on wmaster0 to 255.255.255.255 port 67 interval 19
    Jul 16 19:09:30 dutibo dhclient: send_packet: Network is down

svn path=/nixos/branches/modular-nixos/; revision=16407
 2009-07-16 17:25:50 +00:00
Eelco Dolstra b58682401e * Give a type to networking.interfaces. 
* Simplified the pre-start script of the network-interfaces module.
* Removed wireless support from the network-interfaces module.  It
  only worked for static WEP configurations anyway, and AFAIK nobody
  used it.

svn path=/nixos/branches/modular-nixos/; revision=16406
 2009-07-16 17:18:54 +00:00
Eelco Dolstra f53c9d70ec * The lack of a newline at the end of "EnableSendFile Off" caused a 
broken httpd.conf to be generated.  We should really have a merge
  function that appends newlines to every value of options like
  services.httpd.extraConfig.

svn path=/nixos/branches/modular-nixos/; revision=16404
 2009-07-16 16:13:35 +00:00
Eelco Dolstra 2cd3e205f4 svn path=/nixos/branches/modular-nixos/; revision=16397 2009-07-16 15:01:56 +00:00
Eelco Dolstra 6119c399d8 * Support tasks in the new Upstart formalism. 
* Swap task: fixed removing disabled swap devices.
* Swap task: specified the type of swapDevices.

svn path=/nixos/branches/modular-nixos/; revision=16396
 2009-07-16 14:51:49 +00:00
Eelco Dolstra 7cb4503ad6 * More Upstart refactoring. 
svn path=/nixos/branches/modular-nixos/; revision=16394
 2009-07-16 13:55:11 +00:00
Eelco Dolstra bb292fdf04 * Support post-stop actions. 
svn path=/nixos/branches/modular-nixos/; revision=16393
 2009-07-16 13:46:49 +00:00
Michael Raskin 8f7b33c87d I thought squashfs would not require loop.ko 
svn path=/nixos/branches/modular-nixos/; revision=16388
 2009-07-16 10:28:58 +00:00
Michael Raskin fac9d09941 Oops, forgot FS modules 
svn path=/nixos/branches/modular-nixos/; revision=16387
 2009-07-16 10:06:53 +00:00
Michael Raskin e155a46516 Forgot all-module fixes for the correct booting in rescue CD 
svn path=/nixos/branches/modular-nixos/; revision=16386
 2009-07-16 09:48:22 +00:00
Michael Raskin a7f24fd4bb Trying to build a good rescue CD.. 
svn path=/nixos/branches/modular-nixos/; revision=16385
 2009-07-16 09:22:40 +00:00
Eelco Dolstra 889311f4ca * Refactored the sshd module. 
svn path=/nixos/branches/modular-nixos/; revision=16377
 2009-07-15 15:53:39 +00:00
Eelco Dolstra c45cf3a28e * In the jobs attribute, support a more high-level way of specifying 
jobs, e.g. (from the nscd job)

    { name = "nscd";

      description = "Name Service Cache Daemon";

      startOn = "startup";
      stopOn = "shutdown";

      environment = { LD_LIBRARY_PATH = nssModulesPath; };
        
      preStart =
        ''
          mkdir -m 0755 -p /var/run/nscd
          mkdir -m 0755 -p /var/db/nscd
        '';

      exec = "${pkgs.glibc}/sbin/nscd -f ${./nscd.conf} -d 2> /dev/null";
    };

  The Upstart job is generated from this.  The main goal is to provide
  some abstraction from the Upstart syntax.  For instance, this should
  make it easier to upgrade to newer versions of Upstart, to switch to
  an entirely different process management system (e.g. initng or
  launchd), or to test a job independantly from Upstart.  (However the
  startOn and stopOn attributes are tied to Upstart's event model.)

svn path=/nixos/branches/modular-nixos/; revision=16376
 2009-07-15 15:24:11 +00:00
Eelco Dolstra 0e3bef4195 * Declare the type of jobs. 
svn path=/nixos/branches/modular-nixos/; revision=16375
 2009-07-15 13:41:00 +00:00
Eelco Dolstra 1424399002 * Simplify. 
svn path=/nixos/branches/modular-nixos/; revision=16373
 2009-07-15 12:52:32 +00:00
Eelco Dolstra 96fe3ba1b7 * Inline make-job.nix. 
svn path=/nixos/branches/modular-nixos/; revision=16372
 2009-07-15 11:38:17 +00:00
Eelco Dolstra 9d1e31117f * Get rid of the "users" and "groups" fields in jobs. 
svn path=/nixos/branches/modular-nixos/; revision=16371
 2009-07-15 11:34:55 +00:00
Eelco Dolstra ca8e00cafa * Got rid of the extraPath field in jobs (use 
environment.systemPackages instead).  Also renamed
  services.extraJobs to jobs.

svn path=/nixos/branches/modular-nixos/; revision=16370
 2009-07-15 11:19:11 +00:00
Eelco Dolstra def0be732f * job.extraHttpdConfig: not used anywhere. 
svn path=/nixos/branches/modular-nixos/; revision=16369
 2009-07-15 09:14:24 +00:00
Eelco Dolstra 118418ba31 * Refactoring the Upstart module. Got rid of job.extraEtc, it's 
redundant now (modules can just define environment.etc).

svn path=/nixos/branches/modular-nixos/; revision=16367
 2009-07-15 09:06:36 +00:00
Eelco Dolstra b66fd2364c * Don't put /etc/nixos/nixos in ~/.nix-defexpr. 
svn path=/nixos/branches/modular-nixos/; revision=16366
 2009-07-15 08:45:29 +00:00
Eelco Dolstra da996583ee * Include the NixOS manpages in the system environment. Actually 
there is only one currently: configuration.nix(5), which contains a
  list of all the options.

svn path=/nixos/branches/modular-nixos/; revision=16360
 2009-07-14 16:27:46 +00:00
Eelco Dolstra ab1676b457 * Urgh, this should have been in commit r16350. 
svn path=/nixos/branches/modular-nixos/; revision=16353
 2009-07-14 13:28:50 +00:00
Eelco Dolstra b84bab7873 * Use the relatime mount option by default. (This is the default 
anyway in Linux 2.6.30.)

svn path=/nixos/branches/modular-nixos/; revision=16348
 2009-07-14 12:07:17 +00:00
Lluís Batlle i Rossell c331fd106b Updated the xserver video drivers list, removing the old via, and putting the new openchrome. 
svn path=/nixos/branches/modular-nixos/; revision=16330
 2009-07-11 10:33:42 +00:00
Marc Weber d4a37c2f1b fix copy paste error 
svn path=/nixos/branches/modular-nixos/; revision=16278
 2009-07-09 14:35:03 +00:00
Ludovic Courtès 6d2cc812c2 Make the Liberation Fonts available by default. 
svn path=/nixos/branches/modular-nixos/; revision=16274
 2009-07-09 12:10:58 +00:00
Ludovic Courtès fa9f557b96 Add `localhost' under its "real" host name to /etc/hosts. 
svn path=/nixos/branches/modular-nixos/; revision=16258
 2009-07-08 16:10:09 +00:00
Ludovic Courtès a62e1cf2dd Disable proprietary fonts by default. 
svn path=/nixos/branches/modular-nixos/; revision=16253
 2009-07-08 14:52:58 +00:00
Michael Raskin 35011ade4e Adding back passthru functionality 
svn path=/nixos/branches/modular-nixos/; revision=16237
 2009-07-08 09:10:48 +00:00
Michael Raskin 9a66d59786 Fixing wrong assertion sign 
svn path=/nixos/branches/modular-nixos/; revision=16236
 2009-07-08 09:10:26 +00:00
Michael Raskin 1118c4b6d1 Fix service tree paths 
svn path=/nixos/branches/modular-nixos/; revision=16235
 2009-07-08 09:09:57 +00:00
Ludovic Courtès 1f9d8f45ea lshd: Fix typo; comment on the seed generation. 
svn path=/nixos/branches/modular-nixos/; revision=16142
 2009-07-02 14:05:01 +00:00
Ludovic Courtès 74738de1f8 Make NSS modules visible to `avahi-daemon'. 
It allows it to know whether `libnss-mdns' is available, which clients
can ask via the `IsNSSSupportAvailable' D-Bus method.

svn path=/nixos/branches/modular-nixos/; revision=16125
 2009-07-01 12:27:35 +00:00
Ludovic Courtès e2e373b89c bitlbee: Fix `systemPackages' attribute. 
svn path=/nixos/branches/modular-nixos/; revision=16090
 2009-06-30 08:01:14 +00:00
Ludovic Courtès 6566bc4882 gpsd: Fix UID/GID declaration. 
svn path=/nixos/branches/modular-nixos/; revision=16089
 2009-06-30 07:56:08 +00:00
Ludovic Courtès d68e177909 Oops. 
svn path=/nixos/branches/modular-nixos/; revision=16064
 2009-06-26 21:39:31 +00:00
Ludovic Courtès dbac392266 Fix typo in `config/nsswitch.nix'. 
svn path=/nixos/branches/modular-nixos/; revision=16063
 2009-06-26 21:24:18 +00:00
Nicolas Pierron 5f59ac0447 Fix a bad use of pkgs.lib.optional. (detect with bad type error on x11Packages) 
svn path=/nixos/branches/modular-nixos/; revision=16053
 2009-06-26 12:14:02 +00:00
Eelco Dolstra 0d5ea86748 * Merge some stuff from the trunk. 
svn path=/nixos/branches/modular-nixos/; revision=16051
 2009-06-26 11:36:38 +00:00
Nicolas Pierron f61a3ebd2c Generate hal configuration file form the xserver settings. 
svn path=/nixos/branches/modular-nixos/; revision=16046
 2009-06-25 23:29:49 +00:00
Nicolas Pierron 0bd210bb78 Fix typos in type names. (types.packages -> types.package) 
svn path=/nixos/branches/modular-nixos/; revision=16045
 2009-06-25 22:49:05 +00:00
Nicolas Pierron 6e802e5d75 Replace extraPackages by x11Packages for all windows/desktop managers. 
-> No longer install graphical packages if the xserver is disabled.
-> avoid duplication of "mkIf config.services.xserver.enable".

svn path=/nixos/branches/modular-nixos/; revision=16044
 2009-06-25 22:08:03 +00:00
Eelco Dolstra b701207ead * Typo. 
svn path=/nixos/branches/modular-nixos/; revision=16039
 2009-06-24 22:27:54 +00:00
Eelco Dolstra 9704472d1c Some hacks to support clean shutdowns of VMs that mount the Nix store 
ove QEMU (and other NixOS instances that use a remote filesystem like
NFS):

* Don't take down the network interfaces during shutdown.
* Don't try to unmount the Nix store.  Usually, this doesn't work
  because it's still in use, but on remote filesystems like CIFS the
  `-f' umount flag actually works.

svn path=/nixos/branches/modular-nixos/; revision=16036
 2009-06-24 13:33:03 +00:00
Eelco Dolstra aa075f089e * Set the default gateway. 
svn path=/nixos/branches/modular-nixos/; revision=16034
 2009-06-24 12:16:06 +00:00
Eelco Dolstra 1803c67d13 * Leave out HAL and d-bus (not needed). 
svn path=/nixos/branches/modular-nixos/; revision=16032
 2009-06-24 09:11:26 +00:00
Eelco Dolstra 2346754f5e * Don't add xterm and feh to the system path if the X server is 
disabled.  Other desktop/display/window manager modules should be
  conditional on config.services.xserver.enable as well, but at least
  they're disabled by default due to other options.

svn path=/nixos/branches/modular-nixos/; revision=16031
 2009-06-22 20:34:51 +00:00
Eelco Dolstra 74995fe553 * The CD volume label was just over the limit of 32 characters. 
svn path=/nixos/branches/modular-nixos/; revision=16027
 2009-06-22 16:38:11 +00:00
Eelco Dolstra 64d8af9677 svn path=/nixos/branches/modular-nixos/; revision=16024 2009-06-22 14:45:28 +00:00
Eelco Dolstra 0b39f614e9 * Don't wait for CIFS "devices" (//share/path) to appear since they 
won't.  This speeds up booting from CIFS a lot.

svn path=/nixos/branches/modular-nixos/; revision=16023
 2009-06-22 14:44:48 +00:00
Eelco Dolstra 0f6d7c8862 * Use insmod from module_init_tools in the initrd, since the latest 
klibc no longer has it.

svn path=/nixos/branches/modular-nixos/; revision=16019
 2009-06-22 14:10:11 +00:00
Eelco Dolstra 97a4e1fcb3 * Rename the CD modules to something more sensible. 
* Make sure that reconfiguration in the live CD works properly by
  including the proper configuration module in
  /etc/nixos/configuration.nix.  Ugly.

svn path=/nixos/branches/modular-nixos/; revision=16016
 2009-06-22 10:03:58 +00:00
Eelco Dolstra fc3eecad91 * Remove some references to the services tree. 
svn path=/nixos/branches/modular-nixos/; revision=16015
 2009-06-22 10:01:14 +00:00
Eelco Dolstra da77a6437f * qemu-vm.nix: automatically create and initialise the disk image if 
it doesn't already exist.  Also set up some ad hoc port forwarding
  from the host to the guest.

svn path=/nixos/branches/modular-nixos/; revision=16012
 2009-06-19 15:19:56 +00:00
Eelco Dolstra aa60f3e9a7 * sendfile() is broken over CIFS. 
svn path=/nixos/branches/modular-nixos/; revision=16011
 2009-06-19 14:30:56 +00:00
Eelco Dolstra d06556e274 * Get rid of the `experimental' flag. 
svn path=/nixos/branches/modular-nixos/; revision=16010
 2009-06-19 14:27:43 +00:00
Eelco Dolstra 9460a30851 * Use the fileSystems option to mount the host filesystem. Also, it 
seems that mount.cifs isn't actually needed (anymore?).

svn path=/nixos/branches/modular-nixos/; revision=16000
 2009-06-18 16:47:00 +00:00
Eelco Dolstra 8179e5213f * A module for building KVM/QEMU virtual machines from a NixOS 
configuration.  No virtual disk image is generated; the VM shares a
  Nix store with the host.  This makes it very fast to build new VMs.

svn path=/nixos/branches/modular-nixos/; revision=15999
 2009-06-18 16:16:12 +00:00
Eelco Dolstra e08e7aedbc * Option boot.initrd.postMountCommands to specify additional shell 
commands for in stage 1 of the boot.

svn path=/nixos/branches/modular-nixos/; revision=15998
 2009-06-18 16:03:18 +00:00
Eelco Dolstra c46dc8ad10 * Fix nixos-hardware-scan. BTW the model is now to do something like 
$ nixos-hardware-scan > /etc/nixos/hardware.nix

  and import the hardware.nix module in /etc/nixos/configuration.nix.
  That way you can easily rescan for new hardware.

svn path=/nixos/branches/modular-nixos/; revision=15979
 2009-06-17 10:41:17 +00:00
Eelco Dolstra c3ea825c23 * Fix installing from the modular branch. system/system.nix no longer 
exists.  $NIXPKGS needs to be set, otherwise NixOS can't find
  Nixpkgs (because in the chroot it's in /mnt/etc/nixos/nixpkgs).
  Also clear LANG to shut up Perl warnings about the locale.

svn path=/nixos/branches/modular-nixos/; revision=15978
 2009-06-17 10:07:31 +00:00
Eelco Dolstra 16937dd23d * Make fsck on journaling filesystems optional (enabled by default). 
This is because fsck.ext3 takes several minutes to recover the
  journal, whereas the ext3 implementation in the kernel only takes a
  few seconds.  I'd love to know why this is the case...

svn path=/nixos/branches/modular-nixos/; revision=15965
 2009-06-15 16:47:37 +00:00
Eelco Dolstra 048e03377f * Don't try to run fsck on ISO-9660/UDF filesystems. 
svn path=/nixos/branches/modular-nixos/; revision=15963
 2009-06-15 15:50:36 +00:00
Eelco Dolstra ff58b5dede * Booting was broken when using the "label" option. 
svn path=/nixos/branches/modular-nixos/; revision=15957
 2009-06-14 11:08:44 +00:00
Eelco Dolstra f258edcb80 * autocreate should be a boolean. 
svn path=/nixos/branches/modular-nixos/; revision=15956
 2009-06-14 11:07:44 +00:00
Eelco Dolstra 1c6bbf6784 * Add diffutils, gawk and patch to the system path. 
svn path=/nixos/branches/modular-nixos/; revision=15943
 2009-06-12 11:12:46 +00:00
Nicolas Pierron 6cee6e9d87 Replace special rule by a module-list.mask file which enumerates all 
patterns matching the files which should not figure in module-list.nix.

svn path=/nixos/branches/modular-nixos/; revision=15941
 2009-06-11 17:59:47 +00:00
Nicolas Pierron 4001b66c88 Move the option declaration of filesystems.*.neededForBoot to boot/stage-1.nix. 
svn path=/nixos/branches/modular-nixos/; revision=15940
 2009-06-11 16:04:03 +00:00
Nicolas Pierron 0657b26ab1 Use types in to improve filesystems.nix 
svn path=/nixos/branches/modular-nixos/; revision=15939
 2009-06-11 16:03:57 +00:00
Eelco Dolstra 03760c0c03 * `installation-cd-big.nix' builds a NixOS installation CD containing 
an X server and KDE 4.  Thanks to squashfs it's only 466 MiB large.
  `installation-cd-small.nix' builds the original, text-only
  installation CD.

svn path=/nixos/branches/modular-nixos/; revision=15934
 2009-06-11 09:51:27 +00:00
Eelco Dolstra cd1e4aefc1 * Break the cyclic dependency between the system derivation and 
Grub's menu.lst.

svn path=/nixos/branches/modular-nixos/; revision=15931
 2009-06-10 21:46:42 +00:00
Eelco Dolstra 1cea6b09ef * Compress the Nix store on the CD using squashfs. This reduces the 
size of the i686-linux ISO image from 463 MiB to 147 MiB.  Hopefully
  it also speeds up installation due to reduced seek time and larger
  block sizes, but I haven't tested that yet (on real hardware).

svn path=/nixos/branches/modular-nixos/; revision=15930
 2009-06-10 16:29:48 +00:00
Eelco Dolstra 31c6852403 * The menu.lst fragment in the top-level system derivation doesn't 
seem to be used anywhere.  Removed.

svn path=/nixos/branches/modular-nixos/; revision=15928
 2009-06-10 16:05:25 +00:00
Eelco Dolstra e940f1fbd7 * Cleaned up the error messages in the stage 1 init script. 
* Use the basename from coreutils rather than a bash hack.

svn path=/nixos/branches/modular-nixos/; revision=15927
 2009-06-10 15:02:39 +00:00
Eelco Dolstra 262ddf0854 * Move the manual/Rogue from virtual consoles 7/8 to 8/9 
respectively so that the X server can run on 7.

svn path=/nixos/branches/modular-nixos/; revision=15924
 2009-06-10 12:53:45 +00:00
Eelco Dolstra 135240e05f * Sigh. The nix-env call has to come after nix-store --load-db. 
Should really allow an ordering between postBootCommands.

svn path=/nixos/branches/modular-nixos/; revision=15923
 2009-06-10 12:51:16 +00:00
Eelco Dolstra 463cf8efdd * Provide a /etc/nixos/configuration.nix in the booted CD to make 
nixos-rebuild work.  This makes it a true live CD.

svn path=/nixos/branches/modular-nixos/; revision=15922
 2009-06-10 12:34:58 +00:00
Eelco Dolstra 1f8602afd2 * Get rid of the old CD/DVD expressions. live-dvd.nix is basically 
rescue-dvd.nix (not tested though), i.e. it has all its extra
  packages and includes the build-time dependencies.

svn path=/nixos/branches/modular-nixos/; revision=15917
 2009-06-10 11:00:29 +00:00
Eelco Dolstra ba43b5d000 * Set the CD volume ID and the ISO filename. 
svn path=/nixos/branches/modular-nixos/; revision=15912
 2009-06-09 15:23:03 +00:00
Eelco Dolstra 803d8b646f * Option isoImage.storeContents to add extra paths to the Nix store on 
the CD.

svn path=/nixos/branches/modular-nixos/; revision=15906
 2009-06-09 13:27:50 +00:00
Eelco Dolstra 45e6fe420c svn path=/nixos/branches/modular-nixos/; revision=15905 2009-06-09 13:14:43 +00:00
Eelco Dolstra 6023722135 * Provide Memtest86 as a module. 
svn path=/nixos/branches/modular-nixos/; revision=15904
 2009-06-09 12:02:52 +00:00
Eelco Dolstra 37edcf4fae * Provide an option to add more files to the ISO image. 
svn path=/nixos/branches/modular-nixos/; revision=15903
 2009-06-09 12:01:31 +00:00
Eelco Dolstra ca061eb628 * Include the NixOS/Nixpkgs trees on the CD. 
svn path=/nixos/branches/modular-nixos/; revision=15897
 2009-06-08 22:45:45 +00:00
Eelco Dolstra b7cad3c059 * Style fix. 
svn path=/nixos/branches/modular-nixos/; revision=15896
 2009-06-08 22:44:59 +00:00
Eelco Dolstra 42513650d8 svn path=/nixos/branches/modular-nixos/; revision=15895 2009-06-08 22:44:05 +00:00
Eelco Dolstra 606a8c87a1 svn path=/nixos/branches/modular-nixos/; revision=15894 2009-06-08 22:43:41 +00:00
Eelco Dolstra eb8b534173 * Include only the en_US locale on the CD. This saves 75 MiB or so. 
svn path=/nixos/branches/modular-nixos/; revision=15883
 2009-06-05 17:19:30 +00:00
Eelco Dolstra dbe229f3aa * $LOCALE_ARCHIVE needs to be set, otherwise the "locale" command will 
fail and the ttys won't initialised in Unicode mode.

svn path=/nixos/branches/modular-nixos/; revision=15882
 2009-06-05 17:18:20 +00:00
Eelco Dolstra 0a0260514d * Renamed boot.localCommands to boot.postBootCommands since it wasn't 
such a good name (local to what?).

svn path=/nixos/branches/modular-nixos/; revision=15879
 2009-06-05 16:02:58 +00:00
Eelco Dolstra 5cf8604b1e * Module that contains the configuration for the NixOS installation CD 
(not yet complete).

svn path=/nixos/branches/modular-nixos/; revision=15878
 2009-06-05 15:10:15 +00:00
Eelco Dolstra f4b5a21d59 * Fix building the manual. 
svn path=/nixos/branches/modular-nixos/; revision=15877
 2009-06-05 15:04:58 +00:00
Eelco Dolstra f9cfe7c4ee * The activation script can't use /bin/sh as its interpreter because 
it creates the /bin/sh symlink, which may not exist yet (esp. when
  booting from CD).

svn path=/nixos/branches/modular-nixos/; revision=15875
 2009-06-05 15:03:56 +00:00
Eelco Dolstra e4e408293e * Modularise the building of the installation CD/DVD. The module 
iso-image.nix contains the minimal stuff necessary to build a
  bootable ISO image containing the given configuration.  The idea is
  that this can be customised by providing additional modules, e.g. to
  add extra packages to the image.

  The ISO image is exported in the configuration attribute
  system.build.isoImage.  So it can be built as follows:

  $ nix-build lib/eval-config.nix \
      --arg configuration 'import ./modules/installer/cd-dvd/iso-image.nix' \
      -A config.system.build.isoImage


svn path=/nixos/branches/modular-nixos/; revision=15871
 2009-06-05 13:35:27 +00:00
Eelco Dolstra a4fa62aaf0 * The fileSystems option shouldn't have a default. 
svn path=/nixos/branches/modular-nixos/; revision=15867
 2009-06-05 13:30:30 +00:00