From e95de3555209d9cb71381f96d13e4651b8307848 Mon Sep 17 00:00:00 2001 From: Vaibhav Sagar Date: Mon, 30 Dec 2024 13:03:23 +1100 Subject: [PATCH] Update Setup.hs for Cabal 3.14 --- Setup.hs | 5 ++++- entropy.cabal | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Setup.hs b/Setup.hs index 4ddeeae..ab6c51c 100644 --- a/Setup.hs +++ b/Setup.hs @@ -106,7 +106,10 @@ checkGetentropy cc lbi = do where cArgs = ["-DHAVE_GETENTROPY"] myRawSystemExitCode :: Verbosity -> FilePath -> [String] -> IO ExitCode -#if __GLASGOW_HASKELL__ >= 704 +#if MIN_VERSION_Cabal(3,14,0) +myRawSystemExitCode verbosity program arguments = + rawSystemExitCode verbosity Nothing program arguments Nothing +#elif __GLASGOW_HASKELL__ >= 704 -- We know for sure, that if GHC >= 7.4 implies Cabal >= 1.14 myRawSystemExitCode = rawSystemExitCode #else diff --git a/entropy.cabal b/entropy.cabal index 45720f0..d7650b0 100644 --- a/entropy.cabal +++ b/entropy.cabal @@ -47,7 +47,7 @@ Flag DoNotGetEntropy Manual: True custom-setup - setup-depends: Cabal >= 1.10 && < 3.13 + setup-depends: Cabal >= 1.10 && < 3.15 , base < 5 , filepath < 1.6 , directory < 1.4