Commit graph

1426 commits

Author SHA1 Message Date
Marc Weber cb411d1a3d Synced with trunk @ 15580
svn path=/nixos/branches/modular-nixos/; revision=15645
2009-05-18 12:59:01 +00:00
Marc Weber 908e8fe2d4 Synced with trunk @ 15577
svn path=/nixos/branches/modular-nixos/; revision=15644
2009-05-18 12:57:01 +00:00
Marc Weber 7dc33353c4 Synced with trunk @ 15548
svn path=/nixos/branches/modular-nixos/; revision=15643
2009-05-18 12:54:54 +00:00
Marc Weber 5cff1db403 Synced with trunk @ 15509
svn path=/nixos/branches/modular-nixos/; revision=15642
2009-05-18 12:03:11 +00:00
Marc Weber f51620cdff Synced with trunk @ 15508
svn path=/nixos/branches/modular-nixos/; revision=15641
2009-05-18 12:02:27 +00:00
Marc Weber 81d6032c43 Synced with trunk @ 15505
svn path=/nixos/branches/modular-nixos/; revision=15640
2009-05-18 12:01:31 +00:00
Marc Weber 1d0c0a4291 Synced with trunk @ 15480
svn path=/nixos/branches/modular-nixos/; revision=15639
2009-05-18 11:59:40 +00:00
Marc Weber c14ccdae91 Synced with trunk @ 15469
svn path=/nixos/branches/modular-nixos/; revision=15638
2009-05-18 11:58:45 +00:00
Marc Weber bbeb12b77d Synced with trunk @ 15468
svn path=/nixos/branches/modular-nixos/; revision=15637
2009-05-18 11:58:02 +00:00
Marc Weber 56e78c810a Synced with trunk @ 15430
svn path=/nixos/branches/modular-nixos/; revision=15636
2009-05-18 11:55:32 +00:00
Eelco Dolstra 551c80db47 * Sync.
svn path=/nixos/branches/modular-nixos/; revision=15635
2009-05-18 11:36:01 +00:00
Marc Weber 65908cccd1 Synced with trunk @ 15428, 15620
svn path=/nixos/branches/modular-nixos/; revision=15634
2009-05-18 11:30:33 +00:00
Eelco Dolstra 4dc9b6d378 * Function renamed.
svn path=/nixos/branches/modular-nixos/; revision=15631
2009-05-18 10:49:28 +00:00
Marc Weber 9dc4edbd4d Synced with trunk @ 15427
svn path=/nixos/branches/modular-nixos/; revision=15630
2009-05-18 10:25:36 +00:00
Marc Weber 3148755063 * Synced with trunk @ 15424
svn path=/nixos/branches/modular-nixos/; revision=15619
2009-05-15 15:21:33 +00:00
Marc Weber aacdff7ad9 * Synced with trunk @ 15413
svn path=/nixos/branches/modular-nixos/; revision=15618
2009-05-15 15:19:59 +00:00
Marc Weber 7ef8db8aad * Synced with trunk @ 15408
svn path=/nixos/branches/modular-nixos/; revision=15617
2009-05-15 15:16:58 +00:00
Marc Weber d26f944b98 * Synced with trunk @ 15406
svn path=/nixos/branches/modular-nixos/; revision=15616
2009-05-15 15:15:59 +00:00
Marc Weber d29eaa100e * Synced with trunk @ 15396, 15397 (-> configurations repo)
svn path=/nixos/branches/modular-nixos/; revision=15615
2009-05-15 15:12:46 +00:00
Marc Weber d44206d2c4 * Synced with trunk @ 15391
svn path=/nixos/branches/modular-nixos/; revision=15612
2009-05-15 08:00:20 +00:00
Marc Weber 48e4b8f573 * Synced with trunk @ 15370
svn path=/nixos/branches/modular-nixos/; revision=15611
2009-05-15 07:55:47 +00:00
Marc Weber 1e16e6dee4 * Synced with trunk @ 15369
also adding missing assertion fixed in 15609

svn path=/nixos/branches/modular-nixos/; revision=15610
2009-05-15 07:51:51 +00:00
Marc Weber ecff4f580c * Synced with trunk @ 15368
svn path=/nixos/branches/modular-nixos/; revision=15608
2009-05-15 06:43:02 +00:00
Marc Weber 738fc4e48c adding support for openvpn daemon client and/or server
svn path=/nixos/branches/modular-nixos/; revision=15421
2009-05-01 17:57:07 +00:00
Marc Weber 4f2725c54a adding autofs support to modular nixos.
autofs/automount is used to mount cdroms
floppies or network drivers on the fly..

svn path=/nixos/branches/modular-nixos/; revision=15420
2009-05-01 05:43:41 +00:00
Marc Weber 19ef6c7a1c put wmii in a loop cause it crashes once or twice a month
This also let's you change orientation. See comments

svn path=/nixos/branches/modular-nixos/; revision=15412
2009-04-30 11:37:23 +00:00
Marc Weber 3636fa1a04 fixing assertions using new assertion implementation
svn path=/nixos/branches/modular-nixos/; revision=15409
2009-04-30 02:29:58 +00:00
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 84b5d26ffc doh. my typo while merging
svn path=/nixos/branches/modular-nixos/; revision=15376
2009-04-28 14:01:11 +00:00
Marc Weber 0ba7449c11 * Synced with trunk @ 15348
svn path=/nixos/branches/modular-nixos/; revision=15374
2009-04-28 13:53:04 +00:00
Marc Weber fa9ceac862 * Synced with trunk @ 15346
svn path=/nixos/branches/modular-nixos/; revision=15373
2009-04-28 13:51:58 +00:00
Marc Weber fb1e6d5c80 * Synced with trunk @ 15345
svn path=/nixos/branches/modular-nixos/; revision=15372
2009-04-28 13:49:05 +00:00
Marc Weber addf00b1cf * Synced with trunk @ 15344
svn path=/nixos/branches/modular-nixos/; revision=15371
2009-04-28 13:44:43 +00:00
Marc Weber 8e5eeccb75 * Synced with trunk @ 15340
svn path=/nixos/branches/modular-nixos/; revision=15367
2009-04-28 13:42:43 +00:00
Marc Weber cc7f5eba97 * Synced with trunk @ 15326
svn path=/nixos/branches/modular-nixos/; revision=15366
2009-04-28 13:40:55 +00:00
Marc Weber e28250470f * Synced with trunk @ 15312
svn path=/nixos/branches/modular-nixos/; revision=15365
2009-04-28 13:38:22 +00:00
Marc Weber 818baa7dd3 * Synced with trunk @ 15274
svn path=/nixos/branches/modular-nixos/; revision=15364
2009-04-28 13:34:47 +00:00
Marc Weber ab9cde5a83 * Synced with trunk @ 15211
svn path=/nixos/branches/modular-nixos/; revision=15363
2009-04-28 13:34:22 +00:00
Marc Weber bb2de6da2e * Synced with trunk @ 15208
svn path=/nixos/branches/modular-nixos/; revision=15362
2009-04-28 13:33:52 +00:00
Marc Weber a9360de947 * Synced with trunk @ 15204
svn path=/nixos/branches/modular-nixos/; revision=15361
2009-04-28 13:32:37 +00:00
Marc Weber e96fada917 * Synced with trunk @ 15192
svn path=/nixos/branches/modular-nixos/; revision=15360
2009-04-28 13:30:31 +00:00
Marc Weber c1bae06376 * Synced with trunk @ 15145
svn path=/nixos/branches/modular-nixos/; revision=15359
2009-04-28 13:29:56 +00:00
Marc Weber 160c7588b3 * Synced with trunk @ 15086
svn path=/nixos/branches/modular-nixos/; revision=15358
2009-04-28 13:29:28 +00:00
Marc Weber 3b934b9d03 * Synced with trunk @ 15074
svn path=/nixos/branches/modular-nixos/; revision=15357
2009-04-28 13:28:38 +00:00
Marc Weber bd6eb4ae29 * Synced with trunk @ 15062
svn path=/nixos/branches/modular-nixos/; revision=15356
2009-04-28 13:27:37 +00:00
Marc Weber 55c787a308 * Synced with trunk @ 15061
svn path=/nixos/branches/modular-nixos/; revision=15355
2009-04-28 13:26:31 +00:00
Marc Weber c4ad0f5454 * Synced with trunk @ 15058
svn path=/nixos/branches/modular-nixos/; revision=15354
2009-04-28 13:18:38 +00:00
Marc Weber 56be444092 * Synced with trunk @ 15032
svn path=/nixos/branches/modular-nixos/; revision=15353
2009-04-28 13:17:04 +00:00
Marc Weber 7cb7349747 fix copy paste error
reported by Nicolas

svn path=/nixos/branches/modular-nixos/; revision=15221
2009-04-21 19:26:47 +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