Eelco Dolstra dd3fe9d792 Merge remote-tracking branch 'origin/master' into systemd ...

Conflicts:
	modules/services/system/nscd.nix

2012-10-08 13:47:37 -04:00

..

fonts.nix

Reverting revisions 30103-30106: "always set nixpkgs.config.{state,store}Dir", etc.

2011-10-30 15:19:58 +00:00

gnu.nix

GNU: Comment `fdisk' out.

2012-04-24 12:54:42 +00:00

i18n.nix

Create /etc/locale.conf and /etc/vconsole.conf

2012-07-24 13:53:17 -04:00

krb5.nix

strip trailing whitespace; no functional change

2011-09-14 18:20:50 +00:00

ldap.nix

Add more options for LDAP module. (timeLimit, bind.timeLimit, bind.policy)

2011-10-30 18:46:31 +00:00

networking.nix

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

2012-10-08 13:47:37 -04:00

no-x-libs.nix

Remove HAL

2012-08-17 14:45:43 -04:00

nsswitch.nix

Don't include NSS modules in $LD_LIBRARY_PATH

2012-10-07 00:37:36 -04:00

power-management.nix

Enable the power management module by default

2012-10-04 22:10:35 -04:00

pulseaudio.nix

* Revert r30370, it's no longer needed.

2011-11-11 15:02:30 +00:00

shells.nix

Global replace /var/run/current-system -> /run/current-system

2012-07-16 11:34:21 -04:00

swap.nix

The kernel needs swap support if swapDevices are enabled

2012-08-07 17:34:10 -04:00

system-path.nix

Merge branch 'master' of github.com:NixOS/nixos into systemd

2012-07-16 17:27:11 -04:00

timezone.nix

Rename time.clockLocal -> time.hardwareClockInLocalTime.

2012-07-11 15:33:34 -04:00

unix-odbc-drivers.nix

strip trailing whitespace; no functional change

2011-09-14 18:20:50 +00:00

users-groups.nix

Merge branch 'master' of github.com:NixOS/nixos into systemd

2012-08-20 11:27:38 -04:00