swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 12:29:02 +02:00
Code Issues Packages Projects Releases Wiki Activity
1449 commits 5 branches 0 tags 27 GiB
Commit graph

1449 commits

This branch
This branch
All branches
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 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
Marc Weber 8237528c4a samba job: put each daemon into its own job file 
use start/stop samba-control to start/stop them all

You can enable syncing samba passwords when using passwd as well now.
However you still have to add a user to the samba user database once
using smbpasswd -a username.

svn path=/nixos/branches/modular-nixos/; revision=15218
 2009-04-21 16:30:32 +00:00
Marc Weber 9f8aa03168 don't run portmap as daemon 
if you do upstart can't know (yet) when it exits

svn path=/nixos/branches/modular-nixos/; revision=15217
 2009-04-21 16:25:37 +00:00
Nicolas Pierron aac4fb7321 Temporary work-around to inherit configuration settings. 
svn path=/nixos/branches/modular-nixos/; revision=15133
 2009-04-18 17:16:46 +00:00
Nicolas Pierron 47b61bdd4a * upstart-jobs/manual.nix: 
- Replace "optional" function by one "mkIf".
  - Pretty-print (indentation, extra lines, no trailing-whitespaces).

svn path=/nixos/branches/modular-nixos/; revision=15025
 2009-04-14 12:31:08 +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 98eda94473 KDM: Add support for extra window & desktop manager. 
svn path=/nixos/branches/modular-nixos/; revision=15011
 2009-04-13 10:57:36 +00:00
Nicolas Pierron b1e05ed8fa * Synced with trunk @ 14913 
svn path=/nixos/branches/modular-nixos/; revision=15010
 2009-04-13 10:55:41 +00:00
Nicolas Pierron 0ff58754ae Move slim options into the displayManager attribute set. 
Add an enable flag to slim which is by default set to be true.

svn path=/nixos/branches/modular-nixos/; revision=15009
 2009-04-13 10:47:15 +00:00
Michael Raskin 49bd768f99 As we do not really generate ejabbred.cfg, allow at least overwriting it manually 
svn path=/nixos/trunk/; revision=15006
 2009-04-13 09:35:03 +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 3a8ef07934 Add wmii package in the environment if wmii WM is enabled. 
svn path=/nixos/branches/modular-nixos/; revision=14991
 2009-04-11 22:28:38 +00:00
Nicolas Pierron 33a0873f6f Add error messages to detect if the default (not override by the user) WM/DM is enable. 
Enable xterm desktop manager.

svn path=/nixos/branches/modular-nixos/; revision=14990
 2009-04-11 22:28:33 +00:00
Nicolas Pierron a67aecb38b Used the override version of nix and not the default one provided by nixpkgs. 
svn path=/nixos/branches/modular-nixos/; revision=14989
 2009-04-11 22:17:10 +00:00
Nicolas Pierron b72989eda0 Add a FIXME description to the requiredTTYs option. 
Fix manual compilation.

svn path=/nixos/branches/modular-nixos/; revision=14988
 2009-04-11 22:17:05 +00:00
Nicolas Pierron 23c03c3f46 Fix typo in kdeEnvironment. 
svn path=/nixos/branches/modular-nixos/; revision=14987
 2009-04-11 22:17:01 +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
Nicolas Pierron 840dc8c612 * Synced with branches/fix-style @ 14826 
svn path=/nixos/branches/modular-nixos/; revision=14952
 2009-04-08 13:53:29 +00:00
Nicolas Pierron 9ba1f01479 * Synced with trunk @ 14413 
svn path=/nixos/branches/modular-nixos/; revision=14951
 2009-04-08 13:50:32 +00:00
Nicolas Pierron 57a524368b * Synced with branches/fix-style @ 14408 
svn path=/nixos/branches/modular-nixos/; revision=14949
 2009-04-08 13:46:34 +00:00
Nicolas Pierron af88c29d5b * Synced with trunk @ 14148 
svn path=/nixos/branches/modular-nixos/; revision=14948
 2009-04-08 13:41:33 +00:00
Nicolas Pierron 9ac25ba853 * Synced with branches/fix-style @ 13861 
svn path=/nixos/branches/modular-nixos/; revision=14946
 2009-04-08 13:37:40 +00:00
Nicolas Pierron bb24373197 * Synced with trunk @ 13663 
svn path=/nixos/branches/modular-nixos/; revision=14945
 2009-04-08 13:32:37 +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