diff --git a/cabal-install/bootstrap.sh b/cabal-install/bootstrap.sh index 6028b351e9dd6d26e27e2c4f2aa34d732aa4d317..e17c79f2ea98cf1b8f932420debd2ee8c769caaa 100755 --- a/cabal-install/bootstrap.sh +++ b/cabal-install/bootstrap.sh @@ -261,15 +261,10 @@ HACKAGE_SECURITY_VER="0.5.3.0"; HACKAGE_SECURITY_VER_REGEXP="0\.5\.((2\.[2-9]|[3 # >= 0.5.2 && < 0.6 TAR_VER="0.5.1.0"; TAR_VER_REGEXP="0\.5\.([1-9]|1[0-9]|0\.[3-9]|0\.1[0-9])\.?" # >= 0.5.0.3 && < 0.6 -# These two are temporary: https://github.com/jgm/zip-archive/pull/47 -OLD_LOCALE_VER="1.0.0.7"; OLD_LOCALE_REGEXP="1\.0\.?\.?" - # >= 1.0.0.0 && < 1.1.0.0 -OLD_TIME_VER="1.1.0.3"; OLD_TIME_REGEXP="1\.1\.(0\.[3-9]|[1-9]\.?)" - # >= 1.1.0.3 && < 1.2 DIGEST_VER="0.0.1.2"; DIGEST_REGEXP="0\.0\.(1\.[2-9]|[2-9]\.?)" # >= 0.0.1.2 && < 0.1 -ZIP_ARCHIVE_VER="0.3.2.5"; ZIP_ARCHIVE_REGEXP="0\.3\.(2\.[5-9]|[3-9]\.?)" - # >= 0.3.2.5 && < 0.4 +ZIP_ARCHIVE_VER="0.3.3"; ZIP_ARCHIVE_REGEXP="0\.3\.[3-9]" + # >= 0.3.3 && < 0.4 HACKAGE_URL="https://hackage.haskell.org/package" @@ -461,8 +456,6 @@ info_pkg "echo" ${ECHO_VER} ${ECHO_VER_REGEXP} info_pkg "edit-distance" ${EDIT_DISTANCE_VER} ${EDIT_DISTANCE_VER_REGEXP} info_pkg "ed25519" ${ED25519_VER} ${ED25519_VER_REGEXP} info_pkg "tar" ${TAR_VER} ${TAR_VER_REGEXP} -info_pkg "old-locale" ${OLD_LOCALE_VER} ${OLD_LOCALE_REGEXP} -info_pkg "old-time" ${OLD_TIME_VER} ${OLD_TIME_REGEXP} info_pkg "digest" ${DIGEST_VER} ${DIGEST_REGEXP} info_pkg "zip-archive" ${ZIP_ARCHIVE_VER} ${ZIP_ARCHIVE_REGEXP} info_pkg "hackage-security" ${HACKAGE_SECURITY_VER} \ @@ -501,8 +494,6 @@ do_pkg "echo" ${ECHO_VER} ${ECHO_VER_REGEXP} do_pkg "edit-distance" ${EDIT_DISTANCE_VER} ${EDIT_DISTANCE_VER_REGEXP} do_pkg "ed25519" ${ED25519_VER} ${ED25519_VER_REGEXP} do_pkg "tar" ${TAR_VER} ${TAR_VER_REGEXP} -do_pkg "old-locale" ${OLD_LOCALE_VER} ${OLD_LOCALE_REGEXP} -do_pkg "old-time" ${OLD_TIME_VER} ${OLD_TIME_REGEXP} do_pkg "digest" ${DIGEST_VER} ${DIGEST_REGEXP} do_pkg "zip-archive" ${ZIP_ARCHIVE_VER} ${ZIP_ARCHIVE_REGEXP} do_pkg "hackage-security" ${HACKAGE_SECURITY_VER} \