Fix the haddock for external dependencies

The way bazel handles providers for aspects apparently changed, and there
is no need to forward a provider in the aspect if the base rule already
defines it

haskell/haddock.bzl

@@ -29,7 +29,7 @@ def _haskell_doc_aspect_impl(target, ctx):
     # Packages imported via `//haskell:import.bzl%haskell_import` already
     # contain an `HaddockInfo` provider, so we just forward it
     if HaddockInfo in target:
-        return target[HaddockInfo]
+        return []
 
     hs = haskell_context(ctx, ctx.rule.attr)
 

haskell/nix/default.nix

@@ -22,9 +22,8 @@ let
       query_haddock () {
         echo -n '['
         for FIELD in $(query_field "$@"); do
-          echo -n '"'
-          echo -n $(echo "$FIELD" | cut -d/ -f5-)
-          echo -n '*",'
+          echo -n "\"$(echo "$FIELD" | cut -d/ -f5-)*\","
+          echo -n "\"$(echo "$FIELD" | cut -d/ -f5-)/*\","
         done
         echo -n ']'
       }
@@ -72,7 +71,7 @@ let
           )
           native.filegroup(
             name = "html",
-            srcs = native.glob($(query_haddock haddock-html), exclude_directories=0),
+            srcs = native.glob($(query_haddock haddock-html), exclude_directories=1),
           )
           native.filegroup(
             name = "interfaces",