Eelco Dolstra 06fc1ec34d Merge remote-tracking branch 'origin/master' into staging ...

Conflicts:
	pkgs/servers/serfdom/default.nix

2014-07-01 11:25:41 +02:00

..

config

Merge pull request #2283 from wizeman/u/sysctl-merge

2014-06-30 09:03:33 +04:00

hardware

fixup the previous: got renamed to sessionVariables

2014-06-15 20:28:30 +02:00

installer

Merge pull request #2888 from nilcons/no-random-arch-downgrades

2014-06-30 12:47:17 +04:00

misc

nixos: add gitolite module

2014-06-25 22:54:18 -05:00

profiles

nixos: f2fs filesystem module support (close #2085)

2014-05-11 13:53:26 +02:00

programs

nixos: change EDITOR and PAGER environment variables to mkDefaults

2014-06-25 17:07:10 +02:00

security

nixos/pam: make pam_loginuid optional if in container

2014-06-30 11:08:39 +02:00

services

Merge remote-tracking branch 'origin/master' into staging

2014-07-01 11:25:41 +02:00

system

Another attempt to eradicate ensureDir

2014-06-30 14:56:10 +02:00

tasks

Merge remote-tracking branch 'origin/master' into staging

2014-07-01 11:25:41 +02:00

testing

Fix the installer test

2014-04-20 01:56:11 +02:00

virtualisation

Another attempt to eradicate ensureDir

2014-06-30 14:56:10 +02:00

module-list.nix

Merge pull request #2778 from edwtjo/radicale

2014-06-30 10:11:23 +04:00

rename.nix

Remove the option ‘programs.bash.enable’

2014-04-29 19:00:39 +02:00