Vladimír Čunát 6690c97569 Merge branch 'master' into x-updates ...

Conflicts (just different styles, same semantics):
	pkgs/development/libraries/libusb1/default.nix

2013-12-07 14:17:16 +01:00

..

amqp

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

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

audio

Disable various services when running inside a container

2013-11-26 18:19:45 +01:00

backup

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

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

databases

postgresql: Fix shutdown

2013-12-03 12:04:20 -05:00

games

Strictly check the arguments to mkOption

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

hardware

Add support for lightweight NixOS containers

2013-11-27 17:14:10 +01:00

logging

Disable various services when running inside a container

2013-11-26 18:19:45 +01:00

mail

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

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

misc

When setting $NIX_REMOTE, check whether /nix/var/nix/db is writable

2013-11-27 17:09:17 +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

nixos/avahi-service: small documentation update

2013-12-07 12:03:50 +01:00

printing

cups: Allow users in the wheel group to do admin actions

2013-12-01 17:30:12 -05: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