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
parent eab41878ac 96ac71d680
commit c455adcc42
106 changed files with 2823 additions and 5605 deletions
@@ -593,4 +593,8 @@ self: super: builtins.intersectAttrs super {
  http-download = dontCheck super.http-download;
  pantry = dontCheck super.pantry;

+  # Hadolint wants to build a statically linked binary by default.
+  hadolint = overrideCabal super.hadolint (drv: {
+    preConfigure = "sed -i -e /ld-options:/d hadolint.cabal";
+  });
 }