Vladimír Čunát b5fba47147 Merge branch master into x-updates ...

Conflicts (not used, deleted):
	pkgs/desktops/xfce/common.nix

2013-11-23 10:22:26 +01:00

..

amqp

Move all of NixOS to nixos/ in preparation of the repository merge

2013-10-10 13:28:20 +02:00

audio

Substitute "types.uniq types.string" -> "types.str"

2013-10-30 14:57:42 +01:00

backup

Move all of NixOS to nixos/ in preparation of the repository merge

2013-10-10 13:28:20 +02:00

databases

Allow running NixOS services outside of systemd

2013-11-18 18:04:17 +01:00

games

Strictly check the arguments to mkOption

2013-10-30 15:35:09 +01:00

hardware

Add a nix module for AMD Hybrid Graphics

2013-11-20 11:27:28 -06:00

logging

nixos/logstash: add option examples

2013-11-01 17:15:54 +01:00

mail

Substitute "types.uniq types.string" -> "types.str"

2013-10-30 14:57:42 +01:00

misc

Add some primops to lib

2013-11-12 13:48:30 +01:00

monitoring

Make dd-agent services restart when killed.

2013-11-22 15:23:45 +01:00

network-filesystems

nixos: capitalize a bunch of service descriptions

2013-11-09 20:45:50 +01:00

networking

networkmanager NixOS service: Make it possible to append or insert name servers in /etc/resolv.conf

2013-11-13 01:52:57 +01:00

printing

Add lots of missing option types

2013-10-30 18:47:43 +01:00

scheduling

fcron: Fix error when cron.mailto is null.

2013-11-04 11:07:11 +00:00

search

Removed unnecessary mkIf

2013-11-05 08:52:23 +01:00

security

Use the "assertions" option instead of mkAssert

2013-10-30 18:47:44 +01:00

system

Add lots of missing option types

2013-10-30 18:47:43 +01:00

torrent

Add some primops to lib

2013-11-12 13:48:30 +01:00

ttys

Add lots of missing option types

2013-10-30 18:47:43 +01:00

web-servers

httpd.nix: Support non-root operation

2013-11-18 18:04:17 +01:00

x11

xfce4notifyd: minor update, add to the default installation

2013-11-18 21:08:25 +01:00