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
debug-info.nix
gnu.nix
i18n.nix	nixos: Take glibcLocales from buildPackages.	2018-02-28 15:01:32 -05:00
ldap.nix
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
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
sysctl.nix
system-environment.nix
system-path.nix
terminfo.nix
timezone.nix
unix-odbc-drivers.nix
update-users-groups.pl
users-groups.nix	Create /home with the right permissions	2018-02-27 20:28:49 +01:00
vpnc.nix
zram.nix	nixos: Move uses of stdenv.shell to runtimeShell.	2018-03-01 14:38:53 -05:00