Merge pull request #7052 from phadej/backport-to-3.4-20200910

Backport to 3.4 20200910

Cabal/Distribution/Utils/Structured.hs

@@ -87,7 +87,11 @@ import GHC.Generics
 
 import qualified Data.ByteString              as BS
 import qualified Data.ByteString.Lazy         as LBS
+#if MIN_VERSION_bytestring(0,10,4)
+import qualified Data.ByteString.Builder      as Builder
+#else
 import qualified Data.ByteString.Lazy.Builder as Builder
+#endif
 import qualified Data.IntMap                  as IM
 import qualified Data.IntSet                  as IS
 import qualified Data.Map                     as Map

cabal-install/Distribution/Client/Dependency.hs

@@ -397,6 +397,7 @@ dontUpgradeNonUpgradeablePackages params =
       -- If you change this enumeration, make sure to update the list in
       -- "Distribution.Solver.Modular.Solver" as well
       , pkgname <- [ mkPackageName "base"
+                   , mkPackageName "ghc-bignum"
                    , mkPackageName "ghc-prim"
                    , mkPackageName "integer-gmp"
                    , mkPackageName "integer-simple"

release.py

@@ -121,7 +121,7 @@ def step_config(args: Args):
     if platform.system() == 'Windows':
         msysbin = Path('C:\\tools\\msys64\\usr\\bin')
         if msysbin.is_dir():
-            extraprogpath = extraprogpath + ";" + str(msysbin)
+            extraprogpath = extraprogpath + "," + str(msysbin)
 
     config = dedent(f"""
         repository hackage.haskell.org