Shea Levy 75ec5c609e Merge remote-tracking branch 'upstream/master' into systemd ... Conflicts: maintainers/scripts/ec2/create-ebs-amis.py		2012-12-17 13:03:56 -05: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	systemd-vconsole-setup: Don't put the X server in non-raw mode	2012-10-18 11:58:37 -04:00
krb5.nix	strip trailing whitespace; no functional change	2011-09-14 18:20:50 +00:00
ldap.nix	Add support for nslcd (nss-pam-ldapd) as users.ldap.daemon option	2012-11-20 16:39:45 +01:00
networking.nix	Merge remote-tracking branch 'origin/master' into systemd	2012-11-30 16:12:04 +01:00
no-x-libs.nix	Remove HAL	2012-08-17 14:45:43 -04:00
nsswitch.nix	Add support for nslcd (nss-pam-ldapd) as users.ldap.daemon option	2012-11-20 16:39:45 +01:00
power-management.nix	Enable the power management module by default	2012-10-04 22:10:35 -04:00
pulseaudio.nix	Get rid of the last uses of mkAlways	2012-11-30 15:07:39 +01:00
shells.nix	Global replace /var/run/current-system -> /run/current-system	2012-07-16 11:34:21 -04:00
swap.nix	Port automatic filesystem creation to systemd	2012-10-12 17:32:36 -04:00
system-path.nix	Merge remote-tracking branch 'upstream/master' into systemd	2012-12-17 13:03:56 -05: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	Add user option ‘isAlias’ to allow one user account to alias another	2012-10-23 13:35:06 +02:00