Commit graph

360 commits

Author SHA1 Message Date
Eelco Dolstra
2d7beac377 * New directory modules/programs that contains system-wide
configuration for specific programs.  For instance, ssh.nix provides
  the configuration for the SSH client; ssmtp.nix provides the
  configuration for the `ssmtp' MTA.

svn path=/nixos/branches/modular-nixos/; revision=15757
2009-05-27 23:59:14 +00:00
Eelco Dolstra
3c6ae39a0d * Refactoring: moved some options out of system/options.nix (almost
empty now), do more of bashrc.sh declaratively, and moved nsswitch
  generation to modules/config/nsswitch.nix.

svn path=/nixos/branches/modular-nixos/; revision=15754
2009-05-27 23:14:38 +00:00
Eelco Dolstra
700a1f8f21 * Move the modulesTree and modprobe options to the kernel.nix module.
svn path=/nixos/branches/modular-nixos/; revision=15747
2009-05-27 09:57:30 +00:00
Eelco Dolstra
690416cf1a * Move initrd-related options to the appropriate module.
svn path=/nixos/branches/modular-nixos/; revision=15746
2009-05-27 09:46:50 +00:00
Eelco Dolstra
cfa218a26b * Move the list of modules into a separate file. This file could be
generated by some find/grep hackery as Nicolas suggested.

svn path=/nixos/branches/modular-nixos/; revision=15743
2009-05-27 09:09:17 +00:00
Eelco Dolstra
98cce35041 * Turn the top-level derivation of a NixOS configuration ("system")
into a NixOS module (modules/system/activation/top-level.nix -
  couldn't think of a better name).  The top-level derivation is
  returned in config.system.build.system.
* Inlined system.sh in top-level.nix so that we don't have to pass
  everything through environment variables.

svn path=/nixos/branches/modular-nixos/; revision=15740
2009-05-27 09:00:45 +00:00
Eelco Dolstra
7ac0b3aaea * Make modules/system/boot/stage-1.nix a proper module that exports
the initial ramdisk as config.system.build.bootStage1.

svn path=/nixos/branches/modular-nixos/; revision=15739
2009-05-27 08:14:06 +00:00
Eelco Dolstra
d4a87dd5e2 svn path=/nixos/branches/modular-nixos/; revision=15728 2009-05-25 17:52:43 +00:00
Eelco Dolstra
60b3f95ad8 * Move the definition of the set of system packages to
modules/config/system-path.nix.  system/system.nix is now almost
  empty.
* Removed the cleanStart option - it should be possible to get the
  same functionality by overriding config.system.path (or defining
  config.system.systemPackages with a higher priority - don't know if
  that works though).

svn path=/nixos/branches/modular-nixos/; revision=15727
2009-05-25 17:41:03 +00:00
Eelco Dolstra
278b15d840 * More moving.
svn path=/nixos/branches/modular-nixos/; revision=15725
2009-05-25 14:19:33 +00:00
Eelco Dolstra
a65aae0140 * Moved more modules.
svn path=/nixos/branches/modular-nixos/; revision=15722
2009-05-25 13:42:46 +00:00
Eelco Dolstra
5ebdee3577 * Continued refactoring the tree: moved most Upstart jobs (namely
those that run daemons) to modules/services.  This probably broke
  some things since there are a few relative paths in modules
  (e.g. imports of system/ids.nix).
* Moved some PAM modules out of etc/pam.d to the directories of NixOS
  modules that use them.

svn path=/nixos/branches/modular-nixos/; revision=15717
2009-05-24 23:13:23 +00:00
Nicolas Pierron
bb8fc2646e Substitute the "require" of imported modules by module paths.
$ sed -i '/require =/ { :b; s,(import \([^)]*\)),\1,; /];/ { b e }; n; b b; :e }' *.nix


svn path=/nixos/branches/modular-nixos/; revision=15660
2009-05-19 23:14:45 +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
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
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