Skip to content

Comments

Update Setup.hs for unreleased Cabal changes#88

Closed
9999years wants to merge 1 commit intohaskell:mainfrom
MercuryTechnologies:update-setup-for-cabal
Closed

Update Setup.hs for unreleased Cabal changes#88
9999years wants to merge 1 commit intohaskell:mainfrom
MercuryTechnologies:update-setup-for-cabal

Conversation

@9999years
Copy link

No description provided.

@Bodigrim
Copy link

Bodigrim commented Dec 28, 2024

@9999years does it fix #89? Could you please finalise the PR?

@RyanGlScott
Copy link
Member

I think this is very nearly ready, except for the following details:

  • The upper version bounds on Cabal in the .cabal file should be bumped.
  • The CPP should be guarded against Cabal-3.14.0.0, not GHC 9.6.

That is, I would apply the following changes:

diff --git a/Setup.hs b/Setup.hs
index d28a64a..fca164b 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -106,7 +106,7 @@ checkGetentropy cc lbi = do
   where cArgs = ["-DHAVE_GETENTROPY"]
 
 myRawSystemExitCode :: Verbosity -> FilePath -> [String] -> IO ExitCode
-#if __GLASGOW_HASKELL__ >= 906
+#if MIN_VERSION_Cabal(3,14,0)
 -- Modified in unreleased (as of 2024-09-09) changes:
 -- https://github.com/haskell/cabal/commit/7b9058328e162a4cb707b5d5b25cd1d2df66680e
 -- https://github.com/haskell/cabal/commit/ee11ac6c7badc452def79116729bd16aea15c0df
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

@TomMD
Copy link
Collaborator

TomMD commented Jan 1, 2025

Thanks See #90

@TomMD TomMD closed this Jan 1, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants