make cabal.config be available whenever cabal install is run

Ensures the constraints are consistently applied.
This commit is contained in:
Joey Hess 2014-10-14 16:02:02 -04:00
parent cf005058e4
commit 395371ea37

View file

@ -30,11 +30,6 @@ setupcabal () {
export PATH export PATH
} }
cabalinstall () {
echo cabal install "$@" "$cabalopts"
eval cabal install "$@" "$cabalopts"
}
patched () { patched () {
pkg=$1 pkg=$1
ver=$2 ver=$2
@ -62,17 +57,22 @@ patched () {
fi fi
fi fi
done done
cabalinstall
ln -sf ../../cabal.config
cabal install "$@" "$cabalopts"
rm -f cabal.config
rm -rf $pkg* rm -rf $pkg*
cd .. cd ..
} }
installgitannexdeps () { installgitannexdeps () {
rm -f git-annex.cabal pushd
ln -s ../../git-annex.cabal cd ../..
echo cabal install --only-dependencies "$@" ln -sf standalone/android/cabal.config
cabal install --only-dependencies "$@" cabal install --only-dependencies "$@"
rm -f git-annex.cabal rm -f cabal.config
popd
} }
install_pkgs () { install_pkgs () {