ansible: Hypsipyla – make cabal-installed packages work in haddoc

ansible/files/merge-haddocs

@@ -14,7 +14,7 @@ unversion() {
 for i in "$VERSIONED_GHCS/*"; do
     SRCDIR=$i/libraries
     for F in $SRCDIR/*; do
-        ln -sf $(readlink -f $F) $LIBDIR
+        ln -sf $(readlink -f $F) $LIBDIR/$(basename $F)
     done
 done
 
@@ -23,7 +23,7 @@ for F in $VERSIONED_GHCS/$PRIMARY_GHC_VERS/libraries/*; do
     if [[ -d $F ]]; then
         ln -sf $(basename $F) $LIBDIR/$(unversion $(basename $F))
     else
-        ln -sf $(readlink -f $F) $LIBDIR/
+        ln -sf $(readlink -f $F) $LIBDIR/$(basename $F)
     fi
 done
 

ansible/hypsipyla.yml

@@ -180,6 +180,8 @@
 
         - name: "Generate database"
           command: "hoogle generate --haddock=/home/haskell/doc/libraries {{builtin_haddock_packages | join(' ')}} {{cabal_install | join(' ')}}"
+          environment:
+            GHC_PACKAGE_PATH: '/opt/ghc/{{ghc_primary_version}}/lib/ghc-{{ghc_primary_version}}/package.conf.d:/home/haskell/.cabal/store/ghc-{{ghc_primary_version}}/package.db'
 
         - name: "Landing page git"
           git: