Merge branch 'Cabal-3.2.1.0' into 'master'

Fix Cabal-3.2.1.0

See merge request ghc/head.hackage!131

patches/Cabal-3.2.0.0.patch → patches/Cabal-3.2.1.0.patch

@@ -25,10 +25,10 @@ index 803ce60..f58a918 100644
  fieldDescrsToList
      :: P.CabalParsing m
 diff --git a/Distribution/Simple/Utils.hs b/Distribution/Simple/Utils.hs
-index 96c8406..96818df 100644
+index ccc35f5..aea1c5a 100644
 --- a/Distribution/Simple/Utils.hs
 +++ b/Distribution/Simple/Utils.hs
-@@ -798,7 +798,7 @@ createProcessWithEnv verbosity path args mcwd menv inp out err = withFrozenCallS
+@@ -799,7 +799,7 @@ createProcessWithEnv verbosity path args mcwd menv inp out err = withFrozenCallS
  --
  -- The output is assumed to be text in the locale encoding.
  --
@@ -37,7 +37,7 @@ index 96c8406..96818df 100644
  rawSystemStdout verbosity path args = withFrozenCallStack $ do
    (output, errors, exitCode) <- rawSystemStdInOut verbosity path args
      Nothing Nothing Nothing (IOData.iodataMode :: IODataMode mode)
-@@ -1340,7 +1340,7 @@ withTempFileEx opts tmpDir template action =
+@@ -1341,7 +1341,7 @@ withTempFileEx opts tmpDir template action =
      (\(name, handle) -> do hClose handle
                             unless (optKeepTempFiles opts) $
                               handleDoesNotExist () . removeFile $ name)
@@ -46,7 +46,7 @@ index 96c8406..96818df 100644
  
  -- | Create and use a temporary directory.
  --
-@@ -1355,7 +1355,7 @@ withTempFileEx opts tmpDir template action =
+@@ -1356,7 +1356,7 @@ withTempFileEx opts tmpDir template action =
  withTempDirectory :: Verbosity -> FilePath -> String -> (FilePath -> IO a) -> IO a
  withTempDirectory verbosity targetDir template f = withFrozenCallStack $
    withTempDirectoryEx verbosity defaultTempFileOptions targetDir template
@@ -55,7 +55,7 @@ index 96c8406..96818df 100644
  
  -- | A version of 'withTempDirectory' that additionally takes a
  -- 'TempFileOptions' argument.
-@@ -1366,7 +1366,7 @@ withTempDirectoryEx _verbosity opts targetDir template f = withFrozenCallStack $
+@@ -1367,7 +1367,7 @@ withTempDirectoryEx _verbosity opts targetDir template f = withFrozenCallStack $
      (createTempDirectory targetDir template)
      (unless (optKeepTempFiles opts)
       . handleDoesNotExist () . removeDirectoryRecursive)