From df4cf7f43816d747f440b8b8e10df5a2244a847a Mon Sep 17 00:00:00 2001 From: Daniel Gröber Date: Mon, 16 Jan 2017 02:53:10 +0100 Subject: Add patch for Cabal 1.24.1.0 --- CabalHelper/Compile.hs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'CabalHelper/Compile.hs') 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) -- cgit v1.2.3