install: fix missing cassava-megaparsec dependency
This commit is contained in:
parent
ca4a7fae3b
commit
87e54507e0
@ -86,7 +86,10 @@ HLEDGER_DIFF_VERSION=0.2.0.14
|
|||||||
HLEDGER_IADD_VERSION=1.3.6
|
HLEDGER_IADD_VERSION=1.3.6
|
||||||
HLEDGER_INTEREST_VERSION=1.5.2
|
HLEDGER_INTEREST_VERSION=1.5.2
|
||||||
|
|
||||||
|
# extra dependencies that aren't in stackage
|
||||||
|
EXTRA_DEPS="\
|
||||||
|
cassava-megaparsec-1.0.0 \
|
||||||
|
"
|
||||||
|
|
||||||
# start of (most of) get-stack.sh, https://github.com/commercialhaskell/stack/blob/master/etc/scripts/get-stack.sh
|
# start of (most of) get-stack.sh, https://github.com/commercialhaskell/stack/blob/master/etc/scripts/get-stack.sh
|
||||||
# CHANGED marks (some of) our customisations
|
# CHANGED marks (some of) our customisations
|
||||||
@ -911,7 +914,7 @@ quietly_run uname -rsv
|
|||||||
quietly_run lsb_release -a
|
quietly_run lsb_release -a
|
||||||
|
|
||||||
# show current installed hledger packages
|
# show current installed hledger packages
|
||||||
echo "Install status:"
|
echo "Install status before:"
|
||||||
print_hledger_versions
|
print_hledger_versions
|
||||||
|
|
||||||
if [[ $STATUSFLAG ]] ; then
|
if [[ $STATUSFLAG ]] ; then
|
||||||
@ -962,53 +965,53 @@ echo ----------
|
|||||||
|
|
||||||
if [[ $(cmpver "$(cmd_version hledger 2>/dev/null)" $HLEDGER_VERSION) = 2 ]]; then
|
if [[ $(cmpver "$(cmd_version hledger 2>/dev/null)" $HLEDGER_VERSION) = 2 ]]; then
|
||||||
echo Installing hledger
|
echo Installing hledger
|
||||||
try_install hledger-$HLEDGER_VERSION hledger-lib-$HLEDGER_LIB_VERSION
|
try_install hledger-$HLEDGER_VERSION hledger-lib-$HLEDGER_LIB_VERSION $EXTRA_DEPS
|
||||||
echo
|
echo
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ $(cmpver "$(cmd_version hledger-ui 2>/dev/null)" $HLEDGER_UI_VERSION) = 2 ]]; then
|
if [[ $(cmpver "$(cmd_version hledger-ui 2>/dev/null)" $HLEDGER_UI_VERSION) = 2 ]]; then
|
||||||
echo Installing hledger-ui
|
echo Installing hledger-ui
|
||||||
try_install hledger-ui-$HLEDGER_UI_VERSION hledger-$HLEDGER_VERSION hledger-lib-$HLEDGER_LIB_VERSION \
|
try_install hledger-ui-$HLEDGER_UI_VERSION hledger-$HLEDGER_VERSION hledger-lib-$HLEDGER_LIB_VERSION $EXTRA_DEPS \
|
||||||
fsnotify-0.3.0.1
|
# brick-X.Y # when hledger-iadd requires a special brick, use the same here to reduce rebuilding
|
||||||
# brick-0.19 data-clist-0.1.2.0
|
|
||||||
# ^ when hledger-iadd requires a non-stack brick, use the same version here to avoid rebuilding
|
|
||||||
echo
|
echo
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ $(cmpver "$(cmd_version hledger-web 2>/dev/null)" $HLEDGER_WEB_VERSION) = 2 ]]; then
|
if [[ $(cmpver "$(cmd_version hledger-web 2>/dev/null)" $HLEDGER_WEB_VERSION) = 2 ]]; then
|
||||||
echo Installing hledger-web
|
echo Installing hledger-web
|
||||||
try_install hledger-web-$HLEDGER_WEB_VERSION hledger-$HLEDGER_VERSION hledger-lib-$HLEDGER_LIB_VERSION
|
try_install hledger-web-$HLEDGER_WEB_VERSION hledger-$HLEDGER_VERSION hledger-lib-$HLEDGER_LIB_VERSION $EXTRA_DEPS
|
||||||
echo
|
echo
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ $(cmpver "$(cmd_version hledger-api 2>/dev/null)" $HLEDGER_API_VERSION) = 2 ]]; then
|
if [[ $(cmpver "$(cmd_version hledger-api 2>/dev/null)" $HLEDGER_API_VERSION) = 2 ]]; then
|
||||||
echo Installing hledger-api
|
echo Installing hledger-api
|
||||||
try_install hledger-api-$HLEDGER_API_VERSION hledger-$HLEDGER_VERSION hledger-lib-$HLEDGER_LIB_VERSION
|
try_install hledger-api-$HLEDGER_API_VERSION hledger-$HLEDGER_VERSION hledger-lib-$HLEDGER_LIB_VERSION $EXTRA_DEPS
|
||||||
echo
|
echo
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Third-party addons. We allow these to use an older version of
|
# Third-party addons. We sometimes build these with an older version
|
||||||
# hledger-lib, in case their bounds have not been updated yet.
|
# of hledger[-lib], if their bounds have not been updated yet.
|
||||||
if [[ $(cmpver "$(cmd_version hledger-diff 2>/dev/null)" $HLEDGER_DIFF_VERSION) = 2 ]]; then
|
if [[ $(cmpver "$(cmd_version hledger-diff 2>/dev/null)" $HLEDGER_DIFF_VERSION) = 2 ]]; then
|
||||||
echo Installing hledger-diff
|
echo Installing hledger-diff
|
||||||
try_install hledger-diff-$HLEDGER_DIFF_VERSION hledger-lib-$HLEDGER_LIB_VERSION
|
try_install hledger-diff-$HLEDGER_DIFF_VERSION hledger-lib-$HLEDGER_LIB_VERSION $EXTRA_DEPS
|
||||||
echo
|
echo
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ $(cmpver "$(cmd_version hledger-iadd 2>/dev/null)" $HLEDGER_IADD_VERSION) = 2 ]]; then
|
if [[ $(cmpver "$(cmd_version hledger-iadd 2>/dev/null)" $HLEDGER_IADD_VERSION) = 2 ]]; then
|
||||||
echo Installing hledger-iadd
|
echo Installing hledger-iadd
|
||||||
try_install hledger-iadd-$HLEDGER_IADD_VERSION hledger-lib-$HLEDGER_LIB_VERSION
|
try_install hledger-iadd-$HLEDGER_IADD_VERSION hledger-lib-$HLEDGER_LIB_VERSION $EXTRA_DEPS
|
||||||
echo
|
echo
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ $(cmpver "$(cmd_version hledger-interest 2>/dev/null)" $HLEDGER_INTEREST_VERSION) = 2 ]]; then
|
if [[ $(cmpver "$(cmd_version hledger-interest 2>/dev/null)" $HLEDGER_INTEREST_VERSION) = 2 ]]; then
|
||||||
echo Installing hledger-interest
|
echo Installing hledger-interest
|
||||||
try_install hledger-interest-$HLEDGER_INTEREST_VERSION hledger-lib-$HLEDGER_LIB_VERSION
|
try_install hledger-interest-$HLEDGER_INTEREST_VERSION hledger-lib-$HLEDGER_LIB_VERSION $EXTRA_DEPS
|
||||||
echo
|
echo
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo ----------
|
echo ----------
|
||||||
|
|
||||||
# show new installation status
|
# show new installation status
|
||||||
|
echo "Install status after:"
|
||||||
print_hledger_versions
|
print_hledger_versions
|
||||||
|
|
||||||
# warn if $HOME/.local/bin isn't in $PATH
|
# warn if $HOME/.local/bin isn't in $PATH
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user