Commit graph

344 commits

Author SHA1 Message Date
Marc Weber d804730382 adding assertion support to modular-nixos
problem: the nix language assert function can't be used because
of the fix-style used in modular-nixos. A minimal stripped down version
illustrating the problem looks like this:

fix (x : assert x.cfg.foo; { upstartJob = ...; cfg = ...; } )

Now nix has to evaluate x.cfg.foo in order to check the assertion.
However to do so it has to access x.cfg.foo beeing defined in the body
The body can only be evaluated after the assertion passes.
So in the end you get an infinite recursion error.

pierron mentioned that adding another mkIf like function could
work. Maybe this implementation is even simpler. It adds
another option collecting assertions only.
The evaluation is forced by a function adding an empty list to
extraPackages. extraPackages is evaluated by nixos in all cases.
If there are assertions evaluating to false all assertion messages are
presented to the user using throw.

svn path=/nixos/branches/modular-nixos/; revision=15387
2009-04-28 23:05:03 +00:00
Marc Weber 8ddf34fa3d adding kernel nfs daemon upstart job
svn path=/nixos/branches/modular-nixos/; revision=15219
2009-04-21 16:34:56 +00:00
Nicolas Pierron 16a916f297 * Synced with trunk @ 14905
svn path=/nixos/branches/modular-nixos/; revision=14986
2009-04-11 22:12:02 +00:00
Nicolas Pierron 3f1dd56e9e * Synced with trunk @ 14801
svn path=/nixos/branches/modular-nixos/; revision=14953
2009-04-08 14:01:16 +00:00
Eelco Dolstra 4be528a72c * An option to activate additional KDE packages.
svn path=/nixos/trunk/; revision=14888
2009-04-05 19:10:34 +00:00
Eelco Dolstra 3b494865b1 * Don't symlink all of /share as we don't need it and we
end up with a zillion extra symlinks which is somewhat
  expensive.

svn path=/nixos/trunk/; revision=14886
2009-04-05 18:25:21 +00:00
Sander van der Burg 525e4e961d Added console kit upstart job
svn path=/nixos/trunk/; revision=14839
2009-04-02 15:02:13 +00:00
Marc Weber d7fcb32e9b readding synergy
svn path=/nixos/branches/fix-style/; revision=14789
2009-03-30 14:58:05 +00:00
Eelco Dolstra ccbcf58062 * nvidiaDrivers -> nvidia_x11.
svn path=/nixos/trunk/; revision=14788
2009-03-30 14:54:22 +00:00
Wouter den Breejen 7eab893010 vsftpd userlist options added
svn path=/nixos/trunk/; revision=14650
2009-03-22 15:34:28 +00:00
Marc Weber aeba0af8dd Allow specifying [] as filesystem option
because you don't need any on vservers
You still get a warning when not setting the value so that you can't
forget it.

svn path=/nixos/branches/fix-style/; revision=14477
2009-03-09 19:18:27 +00:00
Marc Weber 321763dd84 Convert "ifplugd" (interfaceMonitor)
svn path=/nixos/branches/fix-style/; revision=14408
2009-03-06 12:27:50 +00:00
Marc Weber 8cad533a76 Convert "reboot/halt" events
svn path=/nixos/branches/fix-style/; revision=14407
2009-03-06 12:27:47 +00:00
Marc Weber 76f7978cc6 Convert "ctrl-alt-delete"
svn path=/nixos/branches/fix-style/; revision=14406
2009-03-06 12:27:45 +00:00
Marc Weber f76096bdf9 Convert "maintenance-shell"
svn path=/nixos/branches/fix-style/; revision=14405
2009-03-06 12:27:42 +00:00
Marc Weber 4a01e5afc8 Convert "sncd"
svn path=/nixos/branches/fix-style/; revision=14404
2009-03-06 12:27:40 +00:00
Marc Weber 4963abf63e Convert "nework-interfaces"
svn path=/nixos/branches/fix-style/; revision=14403
2009-03-06 12:27:38 +00:00
Marc Weber ed8bfc1c78 Convert "swap"
svn path=/nixos/branches/fix-style/; revision=14402
2009-03-06 12:27:35 +00:00
Marc Weber d964466c1a Convert "filesystems"
svn path=/nixos/branches/fix-style/; revision=14401
2009-03-06 12:27:33 +00:00
Marc Weber ea60090213 Convert "swraid"
svn path=/nixos/branches/fix-style/; revision=14400
2009-03-06 12:27:30 +00:00
Marc Weber f05cccbc66 Convert "lvm"
svn path=/nixos/branches/fix-style/; revision=14399
2009-03-06 12:27:28 +00:00
Marc Weber bfc722e83d Convert "klogd"
svn path=/nixos/branches/fix-style/; revision=14398
2009-03-06 12:27:23 +00:00
Marc Weber dd0f98fe22 added FIXME notes
svn path=/nixos/branches/fix-style/; revision=14397
2009-03-06 12:27:20 +00:00
Marc Weber 98ea167131 Convert "tty-backgrounds"
svn path=/nixos/branches/fix-style/; revision=14396
2009-03-06 12:27:18 +00:00
Marc Weber 3679813f37 Convert "mingetty"
svn path=/nixos/branches/fix-style/; revision=14395
2009-03-06 12:27:15 +00:00
Marc Weber c0ed553c87 Convert "bind"
svn path=/nixos/branches/fix-style/; revision=14394
2009-03-06 12:27:13 +00:00
Marc Weber a0b0bba762 Convert "dovecot"
svn path=/nixos/branches/fix-style/; revision=14393
2009-03-06 12:27:10 +00:00
Marc Weber 32ec389b15 Convert "postfix"
svn path=/nixos/branches/fix-style/; revision=14392
2009-03-06 12:27:07 +00:00
Marc Weber e5fd3f271e Convert "openfire" (problem with assertion)
svn path=/nixos/branches/fix-style/; revision=14391
2009-03-06 12:27:05 +00:00
Marc Weber 8e840a7aa4 Convert "postgresql"
svn path=/nixos/branches/fix-style/; revision=14390
2009-03-06 12:27:02 +00:00
Marc Weber 72303e9b6c Convert "mysql"
svn path=/nixos/branches/fix-style/; revision=14389
2009-03-06 12:27:00 +00:00
Marc Weber aa78690465 Convert "xfs", problems when enabling warning!
svn path=/nixos/branches/fix-style/; revision=14388
2009-03-06 12:26:57 +00:00
Marc Weber 030a30b4b6 Convert "irc-hybrid"
svn path=/nixos/branches/fix-style/; revision=14387
2009-03-06 12:26:55 +00:00
Marc Weber e6144b4763 Convert "samba"
svn path=/nixos/branches/fix-style/; revision=14386
2009-03-06 12:26:50 +00:00
Marc Weber e0240ddf3d Convert "udev"
svn path=/nixos/branches/fix-style/; revision=14385
2009-03-06 12:26:48 +00:00
Marc Weber d0733953e1 Convert "printing", CUPS daemon
svn path=/nixos/branches/fix-style/; revision=14384
2009-03-06 12:26:46 +00:00
Marc Weber 4d0761beb2 Convert "vsftpd"
svn path=/nixos/branches/fix-style/; revision=14383
2009-03-06 12:26:43 +00:00
Marc Weber e7b7d62777 Convert "httpd" and "apache-httpd"
svn path=/nixos/branches/fix-style/; revision=14382
2009-03-06 12:26:41 +00:00
Marc Weber eacbb7c38e Convert "tomcat"
svn path=/nixos/branches/fix-style/; revision=14380
2009-03-06 12:26:34 +00:00
Marc Weber b17f9995d5 Convert "jboss" (untested)
svn path=/nixos/branches/fix-style/; revision=14379
2009-03-06 12:26:31 +00:00
Marc Weber 0c7129316c Convert "ejabbered" (untested)
svn path=/nixos/branches/fix-style/; revision=14378
2009-03-06 12:26:29 +00:00
Marc Weber 931f68c924 Convert "gnunet"
svn path=/nixos/branches/fix-style/; revision=14377
2009-03-06 12:26:26 +00:00
Marc Weber f9f61c0a1e Convert "bitlbee"
svn path=/nixos/branches/fix-style/; revision=14376
2009-03-06 12:26:24 +00:00
Marc Weber adafcb8f32 Convert "portmap"
svn path=/nixos/branches/fix-style/; revision=14375
2009-03-06 12:26:22 +00:00
Marc Weber 2e93c3cdb9 Convert "ntp" daemon
svn path=/nixos/branches/fix-style/; revision=14374
2009-03-06 12:26:19 +00:00
Marc Weber 7b0071781d Convert "lshd" GNU ssh daemon
svn path=/nixos/branches/fix-style/; revision=14371
2009-03-06 12:26:10 +00:00
Marc Weber d285fea2da Convert "sshd" daemon
Should the client config in etc/default.nix be moved as wel?

svn path=/nixos/branches/fix-style/; revision=14370
2009-03-06 12:26:08 +00:00
Marc Weber 4768fd6488 Convert "dhcpd" daemon
svn path=/nixos/branches/fix-style/; revision=14369
2009-03-06 12:26:05 +00:00
Marc Weber e52ada51a4 commment
svn path=/nixos/branches/fix-style/; revision=14368
2009-03-06 12:26:01 +00:00
Marc Weber 29cca0f34c Convert "syslogd"
svn path=/nixos/branches/fix-style/; revision=14367
2009-03-06 12:25:57 +00:00