Thomas Tuegel a8c52d0958 Merge branch 'master' into staging

2015-06-25 09:15:05 -05:00

..

config

Some more type cleanup

2015-06-15 18:18:46 +02:00

hardware

types.uniq types.str -> types.str

2015-06-15 18:12:32 +02:00

installer

Move stuff to modules/profiles/installation-device.nix

2015-06-10 15:28:55 +02:00

misc

uwsgi-service: Add user/group for uwsgi service.

2015-06-24 14:48:53 +00:00

profiles

Replaces https://github.com/NixOS/nixpkgs/pull/8368

2015-06-17 19:26:17 +02:00

programs

Merge branch 'master.upstream' into staging.upstream

2015-06-17 11:57:40 -07:00

security

Merge branch 'master.upstream' into staging.upstream

2015-06-17 11:57:40 -07:00

services

kde5: JSON manifest format

2015-06-25 09:03:40 -05:00

system

nixos/install-grub: Fix grub1 installation

2015-06-17 11:47:36 -07:00

tasks

Some more type cleanup

2015-06-15 18:18:46 +02:00

testing

test-instrumentation.nix: Prevent calling a pager

2015-01-15 14:39:29 +01:00

virtualisation

fix argument in mkEnableOption

2015-06-21 18:21:21 +03:00

module-list.nix

tvheadend: init at 4.0.4

2015-06-24 13:22:09 +00:00

rename.nix

Make environment.checkConfigurationOptions an alias

2015-04-10 16:11:07 +02:00