From 3af07aa4d35df5029509c353220b6801867c882d Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Thu, 21 Nov 2024 19:15:58 -0800 Subject: [PATCH] haskellPackages.{hz3,z3}: add compile flags for newer Z3 versions --- .../haskell-modules/configuration-common.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a62b2f5bc784..e7c2539c1d32 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1196,6 +1196,21 @@ self: super: { ''; }) super.cryptol; + # Z3 removed aliases for boolean types in 4.12 + inherit ( + let + fixZ3 = appendConfigureFlags [ + "--hsc2hs-option=-DZ3_Bool=bool" + "--hsc2hs-option=-DZ3_TRUE=true" + "--hsc2hs-option=-DZ3_FALSE=false" + ]; + in + { + z3 = fixZ3 super.z3; + hz3 = fixZ3 super.hz3; + } + ) z3 hz3; + # Tests try to invoke external process and process == 1.4 grakn = dontCheck (doJailbreak super.grakn);