3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

219 commits

Author SHA1 Message Date
Sander van der Burg 8457873334 The 'resolution section' is not generated in the xorg.conf when using the vboxvideo driver. This allows us to perform dynamic resolution resizing
svn path=/nixos/trunk/; revision=17784
2009-10-13 15:16:30 +00:00
Sander van der Burg 4eea2539c1 Added udev permissions for virtualbox guest additions
svn path=/nixos/trunk/; revision=17783
2009-10-13 15:05:06 +00:00
Sander van der Burg b9d9802c45 Pass virtualbox package as HAL package, so that the guest mouse cursor will follow the host mouse cursor
svn path=/nixos/trunk/; revision=17781
2009-10-13 14:30:37 +00:00
Sander van der Burg 50902d2e58 Added some basic VirtualBox driver support. Input driver and dynamic resizing still remains on my todo list
svn path=/nixos/trunk/; revision=17779
2009-10-13 13:56:30 +00:00
Eelco Dolstra 1581d91330 * Fix the job name of the Nix daemon.
svn path=/nixos/trunk/; revision=17776
2009-10-13 10:09:06 +00:00
Nicolas Pierron 24cbefd7a8 Fix example value of httpd.
svn path=/nixos/trunk/; revision=17774
2009-10-13 09:49:26 +00:00
Eelco Dolstra eba8f94069 * jobAttrs -> jobs.
svn path=/nixos/trunk/; revision=17769
2009-10-12 18:09:34 +00:00
Eelco Dolstra d982f23f20 * Convert the remaining jobs to jobAttrs style.
svn path=/nixos/trunk/; revision=17764
2009-10-12 17:27:57 +00:00
Eelco Dolstra 9943e0762e * Update some more modules.
svn path=/nixos/trunk/; revision=17763
2009-10-12 17:09:38 +00:00
Eelco Dolstra e91d882a94 * Converted modules that were still using the old (concrete syntax)
style of declaring Upstart jobs.  While at it, converted them to the
  current NixOS module style and improved some option descriptions.
  Hopefully I didn't break too much :-)

svn path=/nixos/trunk/; revision=17761
2009-10-12 16:36:19 +00:00
Eelco Dolstra 4a78ef25e7 * Start mysql automatically on startup.
svn path=/nixos/trunk/; revision=17755
2009-10-12 11:30:43 +00:00
Rob Vermaas a39b238e69 symlink handling mode for sitecopy backup
svn path=/nixos/trunk/; revision=17716
2009-10-08 11:08:45 +00:00
Rob Vermaas 81e37d8475 added deps for activation scripts of backup modules
svn path=/nixos/trunk/; revision=17714
2009-10-08 09:29:16 +00:00
Rob Vermaas 8d9c51a991 activation script should have unique name
svn path=/nixos/trunk/; revision=17706
2009-10-07 20:05:08 +00:00
Nicolas Pierron 2e34baba3b Rename environment.extraPackages to environment.systemPackages.
svn path=/nixos/trunk/; revision=17705
2009-10-07 17:14:25 +00:00
Sander van der Burg 43b3ccc620 remove unnecessary concatstrings
svn path=/nixos/trunk/; revision=17699
2009-10-07 13:12:45 +00:00
Rob Vermaas 00668de9f1 removed unnecessary optional
svn path=/nixos/trunk/; revision=17697
2009-10-07 13:00:37 +00:00
Rob Vermaas ddf7a784e7 * removed unnecessary comments
svn path=/nixos/trunk/; revision=17696
2009-10-07 12:54:22 +00:00
Rob Vermaas cc5d5b3e77 * removed unnecessary comments
svn path=/nixos/trunk/; revision=17695
2009-10-07 12:53:59 +00:00
Rob Vermaas 06f26e1ad0 * removed unnecessary comments
svn path=/nixos/trunk/; revision=17694
2009-10-07 12:53:27 +00:00
Rob Vermaas e6e3c11dba * moved example to example attribute, changed description of sitecopy backup module
svn path=/nixos/trunk/; revision=17693
2009-10-07 12:52:04 +00:00
Rob Vermaas 15ffc4a296 shouldn't use <'s in description
svn path=/nixos/trunk/; revision=17692
2009-10-07 12:08:04 +00:00
Rob Vermaas 870b2ae68e PostgreSQL should be MySQL
svn path=/nixos/trunk/; revision=17691
2009-10-07 11:58:23 +00:00
Rob Vermaas 704e56667a added nixos modules to perform simple backup scheduling for directories, postgresql and mysql database dumps
svn path=/nixos/trunk/; revision=17690
2009-10-07 11:55:36 +00:00
Nicolas Pierron 9b5611e35e Option "kde.extraPackages" is now deprecated.
svn path=/nixos/trunk/; revision=17682
2009-10-06 19:25:25 +00:00
Marc Weber 7e72788a39 rewrite sshd using jobAtts serving as example
svn path=/nixos/trunk/; revision=17651
2009-10-05 18:31:30 +00:00
Rob Vermaas 0e2c160e2e added privoxy nixos module
svn path=/nixos/trunk/; revision=17646
2009-10-05 15:11:32 +00:00
Eelco Dolstra 8ab6828f31 * Export the manual under system.build.manual to make it easier to
test (nix-build /etc/nixos/nixos -A config.system.build.manual).

svn path=/nixos/trunk/; revision=17644
2009-10-05 13:55:33 +00:00
Eelco Dolstra e4c27acde3 * The mod_php option is no longer implemented.
svn path=/nixos/trunk/; revision=17578
2009-10-01 15:34:51 +00:00
Eelco Dolstra a5ad5a035e * Firewall: by default, only log rejected TCP connections. Otherwise
you get a lot of garbage in the log.  Also, an option to reject
  instead of drop packets.

svn path=/nixos/trunk/; revision=17505
2009-09-29 14:21:56 +00:00
Eelco Dolstra d142b8a13b * Remove the ACPI actions. There's obsolete now (handled by HAL /
pm-utils / KDE).

svn path=/nixos/trunk/; revision=17495
2009-09-29 09:52:25 +00:00
Eelco Dolstra 373445c410 * Start bluetoothd from udev.
svn path=/nixos/trunk/; revision=17475
2009-09-28 16:37:46 +00:00
Eelco Dolstra 647d9ba3b6 * udev: removed the /var/run/devices-created hack. It's no longer
needed now that we don't use pam_devperm anymore.  When udev is
  restarted, it now asks ConsoleKit to get the active users and sets
  device ACLs accordingly.

svn path=/nixos/trunk/; revision=17474
2009-09-28 16:27:01 +00:00
Lluís Batlle i Rossell 4163ff95b4 Reverting r17459 - I had wpa_supplicant addapted to my system (nic device), and
I didn't want to commit that for all nixos users. We may write some day a better
wpa_supplicant solution.

svn path=/nixos/trunk/; revision=17462
2009-09-27 21:54:38 +00:00
Lluís Batlle i Rossell b0a6c15f42 Fixing a reference to a grub in kdm, I hadn't tested before.
svn path=/nixos/trunk/; revision=17461
2009-09-27 21:51:47 +00:00
Lluís Batlle i Rossell 852478ff79 Making supplicant work on eth1
svn path=/nixos/trunk/; revision=17459
2009-09-27 21:51:22 +00:00
Nicolas Pierron a701637f94 Use servicePath instead of relative paths.
svn path=/nixos/trunk/; revision=17454
2009-09-26 23:04:43 +00:00
Eelco Dolstra 17d0b83eef * Enable power management support in HAL. So now you can for instance
suspend from within KDE.

svn path=/nixos/trunk/; revision=17451
2009-09-26 20:37:48 +00:00
Eelco Dolstra a83e308856 * Clean up ConsoleKit.
svn path=/nixos/trunk/; revision=17434
2009-09-25 23:18:52 +00:00
Eelco Dolstra 530c96761a * Start dbus after udev. Otherwise ConsoleKit may or may not
recognise X logins as active sessions (i.e. ck-list-sessions will
  show "active = FALSE", and the user doesn't get ownership of
  devices).  I guess console-kit-daemon (which is started by dbus)
  needs some device in /dev to exist.

svn path=/nixos/trunk/; revision=17428
2009-09-25 20:41:15 +00:00
Eelco Dolstra 3e5912833d * For consistency with Nixpkgs.
svn path=/nixos/trunk/; revision=17427
2009-09-25 20:12:35 +00:00
Eelco Dolstra 38898d5304 * r17391 changed the mingetty ttys to device names instead of tty
numbers.  This also requires kbd and tty-backgrounds to be updated
  (and by extension syslogd and rogue).  Also updated the style of
  those modules.

svn path=/nixos/trunk/; revision=17424
2009-09-25 19:55:08 +00:00
Lluís Batlle i Rossell b2334990db Making the mingetty module support not only vc ttys.
svn path=/nixos/trunk/; revision=17391
2009-09-23 20:50:53 +00:00
Marc Weber e49ea46466 nfs-kernel:
fix creating directories by skipping comments and interpreting quotes,
 take input from ${exports} which may be different from /etc/exports
 which also restarts the service in this case updating the export list
 Also run rpc.statd in forground so that it doesn't get respawned

svn path=/nixos/trunk/; revision=17358
2009-09-23 00:54:09 +00:00
Lluís Batlle i Rossell 67fa5622bf Adding support for the nvidia legacy drivers (videoDriver = "nvidiaLegacy")
svn path=/nixos/trunk/; revision=17285
2009-09-19 22:09:29 +00:00
Nicolas Pierron 2ebd1252aa Fix typo.
svn path=/nixos/trunk/; revision=17260
2009-09-18 15:47:02 +00:00
Nicolas Pierron 0e3981213f Add an option to change the policy of source file links inside the manual.
The default policy use local files instead of remote ones.

svn path=/nixos/trunk/; revision=17258
2009-09-18 15:27:10 +00:00
Eelco Dolstra 70a10c1720 * In the generation of machines.nix, support specifying a
speed factor and multiple system types.

svn path=/nixos/trunk/; revision=17231
2009-09-17 16:22:26 +00:00
Rob Vermaas bd6fbce0f3 * vsftpd typo
svn path=/nixos/trunk/; revision=17215
2009-09-17 07:39:21 +00:00
Rob Vermaas bb8c6b038d * use new job style for ddclient upstart
svn path=/nixos/trunk/; revision=17184
2009-09-16 11:57:41 +00:00
Rob Vermaas 44f99c64d4 * added ddclient module to allow synchronization of machine's ip address with dynamic dns provider
svn path=/nixos/trunk/; revision=17180
2009-09-16 11:22:45 +00:00
Rob Vermaas 185c8a3884 * add uptimed to system packages
svn path=/nixos/trunk/; revision=17175
2009-09-16 08:01:03 +00:00
Rob Vermaas ba1a9aecfd * added uptimed module, default disabled
svn path=/nixos/trunk/; revision=17174
2009-09-16 07:49:23 +00:00
Rob Vermaas 9587192c68 * added uptimed module
svn path=/nixos/trunk/; revision=17173
2009-09-16 07:48:47 +00:00
Nicolas Pierron 10e9705a86 Replace optionDeclarations by options which is directly computed by
moduleMerge.

svn path=/nixos/trunk/; revision=17166
2009-09-15 14:09:18 +00:00
Nicolas Pierron 36573e5e5c Convert module which are declaring options into modules separated with an
"options" set to declare options and a "config" set to define options.

svn path=/nixos/trunk/; revision=17148
2009-09-15 08:33:45 +00:00
Nicolas Pierron ff7e67f2d3 Use the system hostname as default for the avahi daemon.
svn path=/nixos/trunk/; revision=17104
2009-09-13 22:13:07 +00:00
Ludovic Courtès 66ebc25eb9 Bitlbee: Change ownership of `/var/lib/bitlbee'.
svn path=/nixos/trunk/; revision=17099
2009-09-13 18:26:05 +00:00
Eelco Dolstra 6ca8fa8949 * Enable Grub support in kdm, i.e., the reboot menu option can be used
to directly boot into any of the Grub menu entries.  This doesn't
  work yet though.  Probably Grub needs some messing with the
  savedefault option.

svn path=/nixos/trunk/; revision=17091
2009-09-13 15:03:07 +00:00
Eelco Dolstra 379778c385 * For X logins, don't use pam_ck_connector since it doesn't really
work for X logins.  (The documentation also says so.)  Instead just
  call ck-launch-session from the xsession script.

svn path=/nixos/trunk/; revision=17090
2009-09-13 14:05:21 +00:00
Eelco Dolstra 0806a8e203 * Support the custom session type (i.e. ~/.xsession) in SLiM.
svn path=/nixos/trunk/; revision=17088
2009-09-13 13:40:06 +00:00
Eelco Dolstra 6596a3ec55 * When using kdm, always use our xsession script, even when the
default session is selected.  This is because we always want to run
  our own initialisation (like starting ssh-agent).

* ssh-agent: don't start it is a child but have it re-exec the
  xsession script.  This ensures that ssh-agent quits when we log out.

* In the xsession script, don't redirect output to ~/.xsession-errors
  if the display manager is kdm, since kdm already does that.  In fact
  it uses ~/.xsession-errors<optional number> if there are concurrent
  X sessions.

* For consistency with other distros and the xdm manpage, exec the
  ~/.xsession script instead of sourcing it.  Do this for the "custom"
  session type provided by kdm.

svn path=/nixos/trunk/; revision=17087
2009-09-13 13:34:52 +00:00
Eelco Dolstra d1e7a90277 * KDE likes to have xprop.
svn path=/nixos/trunk/; revision=17086
2009-09-13 13:26:35 +00:00
Eelco Dolstra 6e2914fb9b * Make the KDE modules work with KDE 4.2 and 4.3. Also, when using
KDE 4.3, add Qt 4.5 instead of Qt 4.4 to the system path.

svn path=/nixos/trunk/; revision=17085
2009-09-13 11:09:58 +00:00
Nicolas Pierron 6b0487d47f Replace "mergeOneOption" by "types.uniq".
svn path=/nixos/trunk/; revision=17074
2009-09-12 22:46:53 +00:00
Sander van der Burg 5c53a29a01 Changed reference from KDE 4.2 to KDE 4.3
svn path=/nixos/trunk/; revision=17044
2009-09-11 10:48:54 +00:00
Sander van der Burg 297889f05c Switched KDE 4.2 to KDE 4.3
svn path=/nixos/trunk/; revision=17043
2009-09-11 10:43:13 +00:00
Lluís Batlle i Rossell ca241a4801 Making twm work with the new xserver expression.
svn path=/nixos/trunk/; revision=17042
2009-09-11 09:41:19 +00:00
Eelco Dolstra ecde113c52 * Fix logging out in X. Without this option, the X server dies for
some reason:

  Sep 10 17:52:49 dutibo kernel: mtrr: no MTRR for f0000000,400000 found
  Sep 10 17:52:50 dutibo kdm[2960]: X server for display :0 terminated unexpectedly
  Sep 10 17:52:50 dutibo kdm[2960]: Unable to fire up local display :0; disabling.

svn path=/nixos/trunk/; revision=17013
2009-09-10 15:58:39 +00:00
Eelco Dolstra 0156cfbe9e * Cleaned up the display manager module a bit.
svn path=/nixos/trunk/; revision=17012
2009-09-10 15:49:16 +00:00
Eelco Dolstra bc95e0fdf9 * Simplified the X server directory structure: x11/xserver/* -> x11/.
svn path=/nixos/trunk/; revision=17005
2009-09-10 12:50:58 +00:00
Eelco Dolstra 6920f43f1c Refactoring of the X server module:
* Modularised the xorg.conf generation.  For instance, the Wacom and
  Synaptics support has been moved into separate modules.  The
  contents of xorg.conf is defined by the option
  services.xserver.config, and various other options for specific
  sections (e.g. services.xserver.serverLayoutSection).

* displayManager.job.env: made this an attribute set.

* tcpEnable -> enableTCP for naming consistency.

* defaultDepth can be set to 0 to leave it undefined (needed for the
  vmware driver).

* Removed some options that seem obsolete or are now the default
  (e.g. RenderAccel, AllowGLXWithComposite).

* Removed services.xserver.package.  This can now be done using
  nixpkgs.config.packageOverrides.

svn path=/nixos/trunk/; revision=17004
2009-09-10 12:37:33 +00:00
Eelco Dolstra 93571df680 * Make sure that hal is really running when the X server starts,
otherwise we could end up without any input devices.

svn path=/nixos/trunk/; revision=16998
2009-09-09 21:22:00 +00:00
Sander van der Burg 17c063b627 Added an option that automatically creates the mount points in /etc/exports, so that everything is self initializing
svn path=/nixos/trunk/; revision=16963
2009-09-04 22:01:08 +00:00
Sander van der Burg f6f6bfbc2f The /var/trac directory needs to be accessible by the webserver user
svn path=/nixos/trunk/; revision=16962
2009-09-04 15:58:04 +00:00
Eelco Dolstra 17d287afa5 * Bump the number of maximum open files for Nix builders.
Our VM builds were causing Samba to go over this limit.

svn path=/nixos/trunk/; revision=16960
2009-09-04 15:27:52 +00:00
Sander van der Burg 9843fa2ed7 Various NFS server fixes:
- Added rpc.statd service, which prevents messages that tell you that you should use -o nolock
- Create /var/lib/nfs on initialization
- Create /etc/exports, so that exportfs can create /var/lib/nfs/etab. This prevents errors such as: mount.nfs: an incorrect mount option was specified


svn path=/nixos/trunk/; revision=16953
2009-09-03 14:47:58 +00:00
Eelco Dolstra 67db733123 * Simplify the generation of kdmrc. Instead of using sed to
substitute some values, just prepend them to the start of kdmrc.
  KDM will merge multiple sections with the same name (even though it
  complains a bit).  Option definitions that occur first have
  precedence.

svn path=/nixos/trunk/; revision=16940
2009-09-02 18:35:23 +00:00
Sander van der Burg 48f22eb62d Fixed errors with: export command not found
svn path=/nixos/trunk/; revision=16938
2009-09-02 17:59:46 +00:00
Eelco Dolstra a186b5e4b4 * Fix kdm logins. Doh!
svn path=/nixos/trunk/; revision=16936
2009-09-02 17:00:25 +00:00
Sander van der Burg 484580dbbd Updated disnix service to work with latest revision
svn path=/nixos/trunk/; revision=16929
2009-09-02 10:27:44 +00:00
Eelco Dolstra 2c5599f59b * Urgh, cleanSource doesn't work on paths in the store. Looks like a
bug.

svn path=/nixos/trunk/; revision=16905
2009-08-31 15:12:42 +00:00
Eelco Dolstra 9359bf11d5 * Build the Subversion test in Hydra (as a regression test for NixOS).
* Pass the location to the services tree around instead of requiring
  it to be in ../services.

svn path=/nixos/trunk/; revision=16901
2009-08-31 14:56:19 +00:00
Eelco Dolstra a2945a2eb2 svn path=/nixos/trunk/; revision=16900 2009-08-31 14:26:31 +00:00
Eelco Dolstra 921b838149 * test -> tests.
svn path=/nixos/trunk/; revision=16897
2009-08-31 13:40:57 +00:00
Sander van der Burg 4a0be54df0 Added subversion python modules to the PYTHONPATH
svn path=/nixos/trunk/; revision=16895
2009-08-30 19:45:15 +00:00
Sander van der Burg 8fd9fa36c4 Added an initial Trac subservice. Trac projects still have to be created by using the trac-admin tool
svn path=/nixos/trunk/; revision=16894
2009-08-30 19:11:47 +00:00
Marc Weber 39e12e13c4 cupsd: add bindirCmds so that you can test other backends easier.
svn path=/nixos/trunk/; revision=16879
2009-08-27 23:16:09 +00:00
Eelco Dolstra 8e6ad840f2 * Modularised the xinetd service. tftp has been factored out into a
separate module, which just declares a configuration value that
  causes the xinetd module to add it to xinetd.conf.  Also Nixified
  the service declarations to abstract over the inetd implementation.
  
* Renamed the services.xinetd.tftpd options to services.tftpd.  The
  fact that the tftpd module uses xinetd is an implementation detail.

* xinetd: use -dontfork to let Upstart monitor it, and use -syslog to
  get error messages at startup.

svn path=/nixos/trunk/; revision=16803
2009-08-21 13:05:45 +00:00
Eelco Dolstra fb730174a1 * Style change. Tried to have the kde4 module set a default for
services.xserver.desktopManager.default (so that the user doesn't
  have to) but it doesn't work yet.

svn path=/nixos/trunk/; revision=16800
2009-08-21 10:13:27 +00:00
Eelco Dolstra f1035de47c * For the generation of manual / manpages, don't evaluate the option
declarations again (because we already have them).  This cuts
  evaluation time from 7.2s to 4.9s.

svn path=/nixos/trunk/; revision=16798
2009-08-21 09:08:55 +00:00
Eelco Dolstra b48a1c394b * Since atd forks into the background, it wasn't properly monitored by
Upstart.

svn path=/nixos/trunk/; revision=16795
2009-08-21 00:02:45 +00:00
Lluís Batlle i Rossell 8db9b2ca54 Fixing a typo in nfs-kernel.nix (export -> exports)
svn path=/nixos/trunk/; revision=16785
2009-08-19 20:20:57 +00:00
Lluís Batlle i Rossell f250f69ee8 Adding xinetd with a possible tftpd server.
svn path=/nixos/trunk/; revision=16784
2009-08-19 20:20:51 +00:00
Nicolas Pierron 5980d130c9 Check sshd.permitRootLogin values.
svn path=/nixos/trunk/; revision=16769
2009-08-19 15:04:05 +00:00
Sander van der Burg 8b229a45c3 Removed the rm -rf command and replaced symlink operations by ln -sfn so that the state of tomcat can be retained \(unless somebody messes it up manually of course\)
svn path=/nixos/trunk/; revision=16757
2009-08-18 11:50:32 +00:00
Eelco Dolstra 447c1ac34a * SLiM / ConsoleKit compatibility hack.
svn path=/nixos/trunk/; revision=16744
2009-08-17 01:35:48 +00:00
Eelco Dolstra 7ab616f659 * Added support for ConsoleKit.
* Let ConsoleKit track the current logins instead of pam_console.
  Udev now takes care of setting the device permissions to the active
  user.  This works much better, since pam_console wouldn't apply
  permissions to new (hot-plugged) devices.  Also, the udev+ConsoleKit
  approach supports user switching.  (We don't have that for X yet,
  but it already works for logins on virtual consoles: if you switch
  between different users on differents VCs with Alt+Fn, the device
  ownership will be changed automatically.)

svn path=/nixos/trunk/; revision=16743
2009-08-17 01:16:38 +00:00
Eelco Dolstra 7dbf523ddc * dbus: enable support for system services (these are programs that
the bus daemon can start on demand).  ConsoleKit and PolicyKit need
  this.  This requires a setuid wrapper for dbus-daemon-launch-helper,
  as well as a "messagebus" group.

svn path=/nixos/trunk/; revision=16736
2009-08-16 21:46:26 +00:00
Eelco Dolstra 39bffdb34c * Make the generation of /etc/pam.d more declarative. There now is an
option security.pam.services containing the list of PAM services.
  For instance, the SLiM module simply declares:

    security.pam.services = [ { name = "slim"; localLogin = true; } ];

svn path=/nixos/trunk/; revision=16729
2009-08-16 14:49:14 +00:00