Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

ghcWithHoogle: fix haddocks for GHCJS builtin libs

+4 -1
+4 -1
pkgs/development/haskell-modules/hoogle.nix
··· 31 31 inherit (stdenv.lib) optional; 32 32 wrapper = ./hoogle-local-wrapper.sh; 33 33 isGhcjs = ghc.isGhcjs or false; 34 + opts = lib.optionalString; 34 35 haddockExe = 35 36 if !isGhcjs 36 37 then "haddock" ··· 79 80 80 81 echo importing builtin packages 81 82 for docdir in ${ghc}/${docLibGlob}/*; do 83 + name="$(basename $docdir)" 84 + ${opts isGhcjs ''docdir="$docdir/html"''} 82 85 if [[ -d $docdir ]]; then 83 86 import_dbs $docdir 84 - ln -sfn $docdir $out/share/doc/hoogle 87 + ln -sfn $docdir $out/share/doc/hoogle/$name 85 88 fi 86 89 done 87 90