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
..
admin
amqp	nixos/rabbitmq: use an attrset for example configItems	2019-09-25 17:38:00 +00:00
audio	nixos/spotifyd: update spotifyd flags	2019-09-21 17:10:00 -05:00
backup	nixos/postgresql-wal-receiver: remove restart limit (#67857)	2019-09-23 22:51:26 +03:00
cluster	treewide: remove redundant quotes	2019-09-08 23:38:31 +00:00
computing	nixos: remove dependencies on local-fs.target	2019-09-01 19:06:38 +02:00
continuous-integration	nixos/jenkins: Copy plugins as .jpi to fix initialization errors	2019-09-17 19:54:57 +02:00
databases	Revert "nixos/doc: re-format"	2019-09-19 19:17:30 +02:00
desktops	Revert "nixos/doc: re-format"	2019-09-19 19:17:30 +02:00
development
editors	Revert "nixos/doc: re-format"	2019-09-19 19:17:30 +02:00
games	Merge branch 'master' into staging	2019-09-02 23:25:24 +02:00
hardware	Update nixos/modules/services/hardware/fancontrol.nix	2019-09-25 17:31:20 +02:00
logging	Merge branch 'master' into staging-next	2019-09-06 16:55:11 +02:00
mail	Merge pull request #68946 from volth/escape	2019-09-24 04:19:12 +01:00
misc	nixos/pymks: log to journal	2019-09-25 06:33:34 +08:00
monitoring	Merge pull request #69297 from aanderse/zabbix	2019-09-25 20:35:50 +02:00
network-filesystems	treewide: remove redundant quotes	2019-09-08 23:38:31 +00:00
networking	Merge branch 'master' into staging-next	2019-09-24 08:14:34 +02:00
printing	Merge pull request #68218 from worldofpeace/cups-pk/no-auth-wheel	2019-09-09 04:42:19 -04:00
scheduling	nixos: remove dependencies on local-fs.target	2019-09-01 19:06:38 +02:00
search	nixos/kibana: Filter empty lists	2019-09-07 13:24:24 +01:00
security	Merge branch 'master' into staging	2019-09-02 23:25:24 +02:00
system	Merge branch 'master' into staging	2019-09-02 23:25:24 +02:00
torrent	deluge service: fix my bad conflict resolution from f21211ebf	2019-09-08 08:42:53 +02:00
ttys	treewide: remove redundant quotes	2019-08-26 21:40:19 +00:00
web-apps	Merge pull request #68946 from volth/escape	2019-09-24 04:19:12 +01:00
web-servers	nginx: remove gzip_disable directive	2019-09-12 11:55:32 -05:00
x11	Merge pull request #68983 from worldofpeace/xfce-cleanup	2019-09-19 13:25:03 -04:00