Jan Malakhovski 7079e744d4 Merge branch 'master' into staging ...

Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):

   pkgs/development/libraries/epoxy/default.nix
   pkgs/development/libraries/gtk+/3.x.nix
   pkgs/development/python-modules/asgiref/default.nix
   pkgs/development/python-modules/daphne/default.nix
   pkgs/os-specific/linux/systemd/default.nix

2018-03-10 20:38:13 +00:00

..

fonts

fonts: fix fontconfig.localConf when used with penultimate

2017-11-10 16:57:45 -05:00

krb5

krb5: add deprecation date for old configuration

2017-10-03 11:01:05 +01:00

debug-info.nix

Set $NIX_DEBUG_INFO_DIRS when environment.enableDebugInfo is enabled

2017-10-10 12:04:57 +02:00

gnu.nix

fix indentation in several nixos option descriptions

2016-12-16 18:29:25 +01:00

i18n.nix

nixos: Take glibcLocales from buildPackages.

2018-02-28 15:01:32 -05:00

ldap.nix

nixos/ldap: remove tls_checkpeer no when using TLS

2017-07-19 19:23:40 -04:00

networking.nix

nixos/networking: support static resolv.conf

2017-12-04 13:58:54 +00:00

no-x-libs.nix

gobjectIntrospection: Enable building without X11 support.

2018-03-01 07:36:36 -05:00

nsswitch.nix

nsswitch: use [NOTFOUND=return] for mdns

2017-10-16 15:11:58 +02:00

power-management.nix

nixos/powerManagement: remove duplicate definition

2018-01-28 21:53:07 +01:00

pulseaudio.nix

nixos/pulseaudio: document audio group for system wide access

2017-11-30 06:37:01 +00:00

shells-environment.nix

environment.variables: give an example

2018-01-22 10:40:23 +09:00

swap.nix

change swap.randomEncryption config option to "coercedTo" for backwards compatibility

2017-07-26 20:57:10 +03:00

sysctl.nix

tree-wide: remove uses of features.grsecurity

2017-05-14 15:08:51 +02:00

system-environment.nix

types: loeOf -> listOf

2016-11-05 21:46:42 +01:00

system-path.nix

nix-info: include in nixos' default system-path, nixpkgs's channel

2017-10-14 22:01:30 -04:00

terminfo.nix

terminfo: symlink terminfo to /etc for ncurses

2017-06-30 11:17:11 +02:00

timezone.nix

nixos/config/timezone: Disallow spaces

2017-10-09 20:52:25 +02: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: Keep track of deallocated UIDs/GIDs

2017-03-29 18:13:18 +02:00

users-groups.nix

Create /home with the right permissions

2018-02-27 20:28:49 +01:00

vpnc.nix

nixos/vpnc: fix formatting of example

2016-02-27 22:25:39 +13:00

zram.nix

nixos: Move uses of stdenv.shell to runtimeShell.

2018-03-01 14:38:53 -05:00