f08279b · haskell.nix · git.iko.soy

git.iko.soy/haskell.nix

on iko/ghcjs-patch-master help sign in

Fix for tests broken in #359 (#371)

f08279bHamish Mackenzie7 years ago

builder/comp-builder.nix+11−9

@@ -236,18 +236,20 @@ stdenv.mkDerivation ({

236 "--html" \

237 ${lib.optionalString doHoogle "--hoogle"} \

238 ${lib.optionalString hyperlinkSource "--hyperlink-source"} \

239− ${lib.concatStringsSep " " (component.setupHaddockFlags ++ setupGhcOptions)} \

239+ ${lib.concatStringsSep " " (component.setupHaddockFlags ++ setupGhcOptions)}

240

241 html="dist/doc/html/${componentId.cname}"

242

243+ if [ -d "$html" ]; then

243− # Ensure that libraries are not pulled into the docs closure.

244+ # Ensure that libraries are not pulled into the docs closure.

244− # As an example, the prettified source code of a

245+ # As an example, the prettified source code of a

245− # Paths_package module will contain store paths of the library package.

246+ # Paths_package module will contain store paths of the library package.

246− for x in "$html/src/"*.html; do

247+ for x in "$html/src/"*.html; do

247− remove-references-to -t $out $x

248+ remove-references-to -t $out $x

248− done

249+ done

249−

250+

250− cp -R "$html" "$docdir"/html

251+ cp -R "$html" "$docdir"/html

252+ fi

251 }

253 }

252 runHook postHaddock

254 runHook postHaddock

253 '';

255 '';