nixpkgs/nixos/modules/config
Tuomas Tynkkynen e2c6740c37 Merge commit 'adaee73' from staging into master
This one was already merged into release-16.09, so let's not have the
stable branch is ahead of master and confuse things. In addition to
that, currently we have an odd situation that master has less things
actually finished building than in staging.

Conflicts:
	pkgs/data/documentation/man-pages/default.nix
2016-09-03 01:02:51 +03:00
..
fonts treewide: stop using fontbhttf 2016-08-29 22:28:50 +02:00
debug-info.nix treewide: rename extraOutputs{ToLink,ToInstall} 2016-04-07 15:59:44 +02:00
gnu.nix Revert "Remove lsh, broken & unmaintained" 2016-08-23 15:32:41 +00:00
i18n.nix kbd: split keymaps into kbdKeymaps 2016-07-08 12:52:39 +03:00
krb5.nix Add kerberos mappings for MIT exchange server 2016-05-11 09:09:24 -04:00
ldap.nix ldap: Add option for NSS integration 2016-08-23 21:12:51 +02:00
networking.nix networking config: specify resolv.conf options as list of strings 2016-05-28 14:28:13 +02:00
no-x-libs.nix
nsswitch.nix ldap: Add option for NSS integration 2016-08-23 21:12:51 +02:00
power-management.nix Remove default scsiLinkPolicy 2015-12-17 16:40:35 +01:00
pulseaudio.nix nixos/pulseaudio: remove stray load-modules 2016-08-25 19:34:57 +02:00
shells-environment.nix Use shell packages to select the user's shell 2016-06-12 20:35:34 +01:00
swap.nix nixos/…/swap.nix: add some safety assertions for randomEncryption 2016-08-31 15:29:11 +01:00
sysctl.nix Revert "Add the tool "nixos-typecheck" that can check an option declaration to:" 2016-03-01 20:52:06 +01:00
system-environment.nix nixos,lib: move environment generation related copy-paste to lib 2015-09-18 18:48:49 +00:00
system-path.nix docdev -> devdoc 2016-09-01 11:07:23 +02:00
timezone.nix nixos: let's not forget types in the timezone module 2015-07-31 01:57:47 +00:00
unix-odbc-drivers.nix unix-odbc-drivers module: update for new unixODBCDrivers 2016-04-26 23:58:11 +03:00
update-users-groups.pl update-users-groups.pl: correctly guard duplicate uids for declarative users 2016-08-30 17:14:14 +02:00
users-groups.nix modules/users-groups: add shell example 2016-06-25 19:41:24 +02:00
vpnc.nix nixos/vpnc: fix formatting of example 2016-02-27 22:25:39 +13:00
zram.nix modprobe service: drop kmod wrapper 2016-08-19 17:56:49 +03:00