aboutsummaryrefslogtreecommitdiff
path: root/CabalHelper/Compile.hs
diff options
context:
space:
mode:
authorDaniel Gröber <dxld@darkboxed.org>2017-01-16 02:53:10 +0100
committerDaniel Gröber <dxld@darkboxed.org>2017-01-16 10:21:50 +0100
commitdf4cf7f43816d747f440b8b8e10df5a2244a847a (patch)
tree1c05cbe49cdc353a35e41975d6678fb0f967ce6f /CabalHelper/Compile.hs
parentfdc79a15d6b009f1003c7debeb1abe765e6c6ebd (diff)
Add patch for Cabal 1.24.1.0
Diffstat (limited to 'CabalHelper/Compile.hs')
-rw-r--r--CabalHelper/Compile.hs10
1 files changed, 9 insertions, 1 deletions
diff --git a/CabalHelper/Compile.hs b/CabalHelper/Compile.hs
index a9400b4..0f1942a 100644
--- a/CabalHelper/Compile.hs
+++ b/CabalHelper/Compile.hs
@@ -308,10 +308,17 @@ patchyCabalVersions = [
( [ Version [1,18,1] [] ]
, fixArrayConstraint
),
+
+
( [ Version [1,18,0] [] ]
, \dir -> do
fixArrayConstraint dir
fixOrphanInstance dir
+ ),
+
+ -- just want the pristine version
+ ( [ Version [1,24,1,0] [] ]
+ , \_ -> return ()
)
]
where
@@ -359,7 +366,8 @@ unpackCabal ::
unpackCabal opts cabalVer tmpdir = do
let cabal = "Cabal-" ++ showVersion cabalVer
dir = tmpdir </> cabal
- callProcessStderr (Just tmpdir) (cabalProgram opts) [ "get", cabal ]
+ callProcessStderr (Just tmpdir) (cabalProgram opts)
+ [ "get", "--pristine", cabal ]
return dir
unpackCabalHEAD :: FilePath -> IO (FilePath, String)