Vladimír Čunát 4c5a71f777 Merge master into x-updates ...

Conflicts:
	pkgs/desktops/gnome-2/desktop/gvfs/default.nix
	pkgs/development/libraries/cogl/default.nix
	pkgs/development/libraries/libsoup/2.44.nix

2013-12-18 23:21:29 +01:00

..

config

Disable various services when running inside a container

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

hardware

Add some primops to lib

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

installer

Put /efi and /loader on the main livecd partition for efi booting with unetbootin

2013-11-14 18:18:46 -05:00

misc

memcached: set uid to make it work with #1076

2013-12-13 10:09:08 +01:00

profiles

Hack to work around the lack of isPath

2013-10-28 22:45:57 +01:00

programs

nixos: capitalize a bunch of service descriptions

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

security

polkit: Add some examples

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

services

Merge master into x-updates

2013-12-18 23:21:29 +01:00

system

Fix passing of kernel parameters

2013-12-02 11:56:58 -05:00

tasks

Disable various services when running inside a container

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

testing

Allow running NixOS services outside of systemd

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

virtualisation

Google Compute image: fix punctuation in description, give disk image proper name with version and revision.

2013-12-12 12:48:09 +01:00

module-list.nix

nixos: add ntopng service

2013-12-09 21:35:01 +01:00

rename.nix

Drop environment.x11Packages

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