diff --git a/cabal.project b/cabal.project index 0983ea7adba..efccf4b406d 100644 --- a/cabal.project +++ b/cabal.project @@ -169,6 +169,7 @@ allow-newer: async-timer:unliftio-core , servant-openapi3:* , katip:Win32 + , ekg-wai:time constraints: base >= 4.18.2.0 && < 5 @@ -177,6 +178,13 @@ constraints: , bech32 >= 1.1.7 + -- Force newer version of `lobemo-backend-ekg` here, + -- because older versions depend on `snap-server`, + -- which in turns fails to link on linux musl + -- due to some missing `sendfile64` hack. + -- (We use linux musl to get statically linked binaries.) + , lobemo-backend-ekg >= 0.2.0.0 + -- lower versions of katip won't build with the Win32-2.12.0.1 -- which is shipped with the ghc-9.2.8 , katip >= 0.8.7.4 @@ -185,10 +193,10 @@ constraints: -- Cardano Node dependencies: , io-classes >= 1.4 , io-classes -asserts - - , cardano-ledger-api ==1.9.4.0 - , ouroboros-network == 0.17.1.2 + , cardano-ledger-api ^>= 1.9 + + , ouroboros-network ^>= 0.17 -- Related to: https://github.com/haskell/cabal/issues/8554 diff --git a/nix/haskell.nix b/nix/haskell.nix index 4d416538f9b..51aed7f7960 100644 --- a/nix/haskell.nix +++ b/nix/haskell.nix @@ -295,9 +295,6 @@ CHaP: haskell-nix: nixpkgs-recent: nodePkgs: haskell-nix.cabalProject' [ # does not require any messing with cabal files. packages.katip.doExactConfig = true; - # split data output for ekg to reduce closure size - packages.ekg.components.library.enableSeparateDataOutput = true; - # Avoid this error on the windows build: # Wrap.hsc:96:10: fatal error: regex.h: No such file or directory packages.regex-posix.flags._regex-posix-clib = stdenv.hostPlatform.isWindows;