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 a1c0e10564f9a6281e14d7a7279b8589521e2c48 which adapts #69210 to master that doesn't yet have 329a88efa78126ae7413807ce58000eab49e82d9 Tested using maintainers/scripts/eval-release.sh before and after to see that the fix works		2019-09-25 19:21:46 -04:00
..
default.nix	Merge branch 'master' into staging-next	2019-09-25 19:21:46 -04:00