Dmitry Kalinkin c455adcc42 Merge branch 'master' into staging-next ... Fixes eval on darwin after #69072 Resolved conflict in pkgs/tools/security/thc-hydra/default.nix Basically had to revert a1c0e10564 which adapts #69210 to master that doesn't yet have 329a88efa7 Tested using maintainers/scripts/eval-release.sh before and after to see that the fix works		2019-09-25 19:21:46 -04:00
..
config	nixos/xdg/icons: match XCURSOR_PATH spec	2019-09-18 13:03:14 -04:00
hardware	hardware.brightnessctl: add brightnessctl to env	2019-09-18 00:06:11 +02:00
i18n/input-method	Revert "nixos/doc: re-format"	2019-09-19 19:17:30 +02:00
installer	Merge pull request #67232 from ck3d/container-useHostResolvConf	2019-09-25 09:34:17 +00:00
misc	Merge staging-next into staging	2019-08-31 10:04:20 +02:00
profiles	qemu-guest: allow to override security.rngd	2019-09-18 00:35:04 +09:00
programs	Merge pull request #68946 from volth/escape	2019-09-24 04:19:12 +01:00
security	Merge pull request #67748 from typetetris/yubico-local-auth	2019-09-24 03:31:39 +01:00
services	Merge branch 'master' into staging-next	2019-09-25 19:21:46 -04:00
system	Merge pull request #67232 from ck3d/container-useHostResolvConf	2019-09-25 09:34:17 +00:00
tasks	nixos/network: replace deprecated DHCP=both by DHCP=yes	2019-09-24 11:33:36 +02:00
testing	nixos/test: remove the stateVersion statement from the test-instrumentation	2019-06-03 15:05:24 +02:00
virtualisation	Merge pull request #67232 from ck3d/container-useHostResolvConf	2019-09-25 09:34:17 +00:00
module-list.nix	fancontrol service init	2019-09-25 05:05:32 +02:00
rename.nix	nixos/pymks: log to journal	2019-09-25 06:33:34 +08:00