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
..
2019-09-23 00:23:56 -04:00
2019-09-06 02:54:53 +02:00
2019-08-28 11:07:32 +00:00
2019-09-24 15:59:01 +02:00
2019-09-16 16:28:46 +02:00
2019-09-23 15:06:30 +02:00
2019-09-02 23:25:24 +02:00
2019-09-08 23:38:31 +00:00