Eelco Dolstra 916793cf13 Merge branch 'master' into systemd-219 ...

Conflicts:
	nixos/modules/system/boot/systemd.nix
	pkgs/applications/networking/p2p/transmission/default.nix
	pkgs/development/libraries/libseccomp/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/top-level/all-packages.nix

2015-09-07 21:28:33 +02:00

..

config

Rename users.extraUsers -> users.users, users.extraGroup -> users.groups

2015-09-02 17:34:23 +02:00

hardware

Put all firmware in $out/lib/firmware

2015-08-25 00:40:34 +02:00

installer

nixos-generate-config: Don't enable vbox guest via deprecated option

2015-08-16 00:32:37 +02:00

misc

And next release is called Emu!

2015-09-03 11:39:56 +02:00

profiles

nixos/ISO profile: fix defaultLocales :-)

2015-08-06 12:30:38 +02:00

programs

command-not-found: Fix nix-env invocation

2015-09-02 19:49:34 +02:00

security

Merge pull request #7344 from joachifm/apparmor-pam

2015-08-29 18:59:53 +02:00

services

nixos/gdm: add assertion for the autoLogin.user option

2015-09-03 22:30:07 +02:00

system

Merge branch 'master' into systemd-219

2015-09-07 21:28:33 +02:00

tasks

Don't include wireless tools in containers

2015-07-22 12:51:21 +02:00

testing

test-instrumentation.nix: Prevent calling a pager

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

virtualisation

docker: Minor improvements, fix failing test

2015-09-04 00:23:38 +01:00

module-list.nix

reverse_proxy module: helper to run nginx as reverse proxy

2015-08-28 09:33:08 +02:00

rename.nix

Rename users.extraUsers -> users.users, users.extraGroup -> users.groups

2015-09-02 17:34:23 +02:00