Commit graph

534 commits

Author SHA1 Message Date
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
af07eae056 * This config.system.build.system thing doesn't seem to be used.
svn path=/nixos/branches/modular-nixos/; revision=15730
2009-05-25 18:42:44 +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
c96f0d75f0 * Move the setuid wrappers activation scriptlet to
modules/security/setuid-wrappers.nix.
* Removed the "path" activation scriptlet.  The partial ordering was
  underspecified (there was nothing ensuring that it came near the end
  of the activation script), and it wasn't needed in any case.

svn path=/nixos/branches/modular-nixos/; revision=15726
2009-05-25 15:36:57 +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
6e066c8e1d * Idem.
svn path=/nixos/branches/modular-nixos/; revision=15724
2009-05-25 13:55:36 +00:00
Eelco Dolstra
94993518d7 * I'm pretty sure the i18n module shouldn't be conditional on
pulseaudio :-)

svn path=/nixos/branches/modular-nixos/; revision=15723
2009-05-25 13:52:18 +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
Eelco Dolstra
d6b30cd513 * Include the Glibc locales.
svn path=/nixos/branches/modular-nixos/; revision=15701
2009-05-24 18:34:31 +00:00
Nicolas Pierron
91387275ee Remove unused require.
svn path=/nixos/branches/modular-nixos/; revision=15677
2009-05-20 15:43:31 +00:00
Marc Weber
eb91b27809 adoptadopt modular-nixos to stringsWithDeps changes in nixpkgs.
You can boot again. Also simplified some small code pieces

svn path=/nixos/branches/modular-nixos/; revision=15668
2009-05-20 01:35:46 +00:00
Marc Weber
c2362f1bf1 Synced with trunk @ 15661
svn path=/nixos/branches/modular-nixos/; revision=15667
2009-05-19 23:51:13 +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
Eelco Dolstra
8ff00dd4c5 svn path=/nixos/branches/modular-nixos/; revision=15653 2009-05-19 14:55:17 +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
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
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
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