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
8e5eeccb75
* Synced with trunk @ 15340
...
svn path=/nixos/branches/modular-nixos/; revision=15367
2009-04-28 13:42:43 +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
160c7588b3
* Synced with trunk @ 15086
...
svn path=/nixos/branches/modular-nixos/; revision=15358
2009-04-28 13:29:28 +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
9741be988c
* Synced with trunk @ 15006
...
svn path=/nixos/branches/modular-nixos/; revision=15012
2009-04-13 11:15:19 +00:00
Nicolas Pierron
313fa38e2e
Remove useless require attribute in system/nixos-environment.nix.
...
svn path=/nixos/branches/modular-nixos/; revision=14994
2009-04-12 14:38:41 +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
Eelco Dolstra
bec0e32034
* Add the programs provided by the acl, attr and libcap libraries to
...
the system path. (They were in the closure already anyway so it
doesn't cost us anything.)
svn path=/nixos/trunk/; revision=14973
2009-04-09 14:11:55 +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
Sander van der Burg
5e7a768336
Added very experimental KDM support
...
svn path=/nixos/trunk/; revision=14913
2009-04-07 15:33:59 +00:00
Lluís Batlle i Rossell
d9b6234e9f
Adding nfsutils on mount-helpers. That adds more binaries to mount-helpers, but at
...
least allows mounting nfs paths.
svn path=/nixos/trunk/; revision=14905
2009-04-06 19:25:45 +00:00
Michael Raskin
5dadce8770
Adding comment about child configurations
...
svn path=/nixos/trunk/; revision=14889
2009-04-05 19:13:52 +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
d5e97ab056
* Let KDEDIRS, XDG_CONFIG_DIRS and XDG_DATA_DIRS contain the KDE
...
packages that we need rather than just /var/run/current-system/sw.
This ensures consistency when upgrading a system (e.g. you don't end
up with a mix of KDE versions at runtime). This partially reverts
r14148 (in particular the update-mime-database hack in the
systemPath post-build).
svn path=/nixos/trunk/; revision=14887
2009-04-05 18:30:39 +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
Eelco Dolstra
723b0dc74b
* Use utillinuxng.override.
...
svn path=/nixos/trunk/; revision=14801
2009-03-31 09:33:35 +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
Eelco Dolstra
b470feb916
* nixpkgsPath -> nixpkgs.
...
svn path=/nixos/trunk/; revision=14702
2009-03-25 15:47:29 +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
