Use directory >=1.3.3.1 && <1.4 in bootstrap.sh

haskell · Nov 13, 2018 · 2a7e3b7 · 2a7e3b7
1 parent d8bae51
commit 2a7e3b7
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/cabal-install/bootstrap.sh b/cabal-install/bootstrap.sh
@@ -268,6 +268,8 @@ 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.3"; ZIP_ARCHIVE_REGEXP="0\.3\.[3-9]"
                        # >= 0.3.3 && < 0.4
+DIRECTORY_VER="1.3.3.1"; DIRECTORY_VER_REGEXP="1\.3\.(3\.1|[4-9]\.?)"
+                       # >= 1.3.3.1 && < 1.4
 
 HACKAGE_URL="https://hackage.haskell.org/package"
 
@@ -474,16 +476,18 @@ info_pkg "digest"            ${DIGEST_VER}           ${DIGEST_REGEXP}
 info_pkg "zip-archive"       ${ZIP_ARCHIVE_VER}      ${ZIP_ARCHIVE_REGEXP}
 info_pkg "hackage-security"  ${HACKAGE_SECURITY_VER} \
     ${HACKAGE_SECURITY_VER_REGEXP}
+info_pkg "directory"    ${DIRECTORY_VER} ${DIRECTORY_VER_REGEXP}
 
 do_pkg   "deepseq"      ${DEEPSEQ_VER} ${DEEPSEQ_VER_REGEXP}
 do_pkg   "binary"       ${BINARY_VER}  ${BINARY_VER_REGEXP}
 do_pkg   "time"         ${TIME_VER}    ${TIME_VER_REGEXP}
 
 # Cabal might depend on these
-do_pkg   "transformers" ${TRANS_VER}   ${TRANS_VER_REGEXP}
-do_pkg   "mtl"          ${MTL_VER}     ${MTL_VER_REGEXP}
-do_pkg   "text"         ${TEXT_VER}    ${TEXT_VER_REGEXP}
-do_pkg   "parsec"       ${PARSEC_VER}  ${PARSEC_VER_REGEXP}
+do_pkg   "transformers" ${TRANS_VER}     ${TRANS_VER_REGEXP}
+do_pkg   "mtl"          ${MTL_VER}       ${MTL_VER_REGEXP}
+do_pkg   "text"         ${TEXT_VER}      ${TEXT_VER_REGEXP}
+do_pkg   "parsec"       ${PARSEC_VER}    ${PARSEC_VER_REGEXP}
+do_pkg   "directory"    ${DIRECTORY_VER} ${DIRECTORY_VER_REGEXP}
 
 # Install the Cabal library from the local Git clone if possible.
 do_Cabal_pkg