Merge remote-tracking branch 'origin/master' into haskell-updates.

2020-06-25 10:40:08 +02:00
parent 83b2c32969 c00bf081d9
commit db15e92dd0
341 changed files with 5173 additions and 1691 deletions
@@ -2661,6 +2661,9 @@ package-maintainers:
    - Agda
  roberth:
    - arion-compose
+    - hercules-ci-agent
+    - hercules-ci-api-core
+    - hercules-ci-api-agent
  cdepillabout:
    - pretty-simple
    - spago
@@ -96,6 +96,7 @@ self: super: builtins.intersectAttrs super {

  # profiling is disabled to allow C++/C mess to work, which is fixed in GHC 8.8
  cachix = disableLibraryProfiling super.cachix;
+  hercules-ci-agent = disableLibraryProfiling super.hercules-ci-agent;

  # avoid compiling twice by providing executable as a separate output (with small closure size)
  niv = enableSeparateBinOutput super.niv;