Eelco Dolstra 585983bc95 Merge remote-tracking branch 'origin/staging' ... Conflicts: pkgs/applications/version-management/subversion/default.nix		2014-09-08 11:42:09 +02:00
..
config	Merge remote-tracking branch 'origin/staging'	2014-09-08 11:42:09 +02:00
hardware	Get all lib functions from lib, not pkgs.lib, in modules	2014-07-02 12:28:18 -04:00
installer	Merge remote-tracking branch 'origin/staging'	2014-09-08 11:42:09 +02:00
misc	Merge pull request #3811 from nbp/options-json	2014-09-07 10:39:03 -07:00
profiles	Merge remote-tracking branch 'origin/staging'	2014-09-08 11:42:09 +02:00
programs	Replace environment.profileVariables by environment.profileRelativeEnvVars	2014-09-07 19:41:00 +02:00
security	Remove some setuid wrappers for non-standard programs	2014-09-05 14:46:36 +02:00
services	Updated Mediawiki to 1.23.3	2014-09-07 17:50:51 +02:00
system	Merge pull request #3961 from wkennington/master.grub	2014-09-05 20:01:08 -05:00
tasks	nixos/networking: Fix typo in ipv6prefixLength.	2014-09-05 02:54:39 +02:00
testing	Fix evaluation	2014-08-06 19:44:13 +02:00
virtualisation	Merge remote-tracking branch 'origin/staging'	2014-09-08 11:42:09 +02:00
module-list.nix	Mesos: services	2014-09-03 19:21:49 +02:00
rename.nix	Remove the option ‘programs.bash.enable’	2014-04-29 19:00:39 +02:00