Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make it build with ghc-9.10 #1856

Merged
merged 6 commits into from
Oct 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/haskell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
# TODO: Add ghc910 when input-output-hk/devx is fixed
compiler-nix-name: [ghc810, ghc96, ghc98]
include:
# We want a single job, because macOS runners are scarce.
Expand Down
8 changes: 7 additions & 1 deletion cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,17 @@ package snap-server
flags: -openssl

allow-newer:
swagger2:aeson
, swagger2:aeson
-- The version of ouroboros-consensus specified by cardano-node uses an earlier version of
-- quickcheck-state-machine that does not compile with ghc-9.10 so we allow a never version
-- that builds with ghc-9.10 (and earlier).
, ouroboros-consensus:quickcheck-state-machine

constraints:
-- STM 2.5.2 is broken: https://github.com/haskell/stm/issues/76
, stm >= 2.5.3.1
-- Earlier versions do not compile with ghc-9.10.
, quickcheck-state-machine ^>= 0.10

-- ---------------------------------------------------------

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import Cardano.DbSync.Era.Shelley.Generic.Witness
import Cardano.DbSync.Types (DataHash)
import qualified Cardano.Ledger.Address as Ledger
import Cardano.Ledger.Allegra.Scripts (Timelock)
import Cardano.Ledger.Alonzo.Scripts (AsIx (..), ExUnits (..), PlutusPurpose (..), txscriptfee, unPlutusBinary)
import Cardano.Ledger.Alonzo.Scripts (AsIx (..), ExUnits (..), PlutusPurpose, txscriptfee, unPlutusBinary)
import qualified Cardano.Ledger.Alonzo.Scripts as Alonzo
import qualified Cardano.Ledger.Alonzo.Tx as Alonzo
import Cardano.Ledger.Alonzo.TxAuxData (AlonzoTxAuxData (..), getAlonzoTxAuxDataScripts)
Expand Down Expand Up @@ -265,7 +265,7 @@ resolveRedeemers ioExtraPlutus mprices tx toCert =

mkPurpose = \case
Strict.SNothing -> Nothing
Strict.SJust a -> toAlonzoPurpose txBody $ hoistPlutusPurpose Alonzo.toAsItem a
Strict.SJust a -> toAlonzoPurpose txBody $ Alonzo.hoistPlutusPurpose Alonzo.toAsItem a

handleTxInPtr :: Word64 -> Ledger.TxIn StandardCrypto -> RedeemerMaps -> (RedeemerMaps, Maybe (Either TxIn ByteString))
handleTxInPtr rdmrIx txIn mps = case Map.lookup txIn (rmInps mps) of
Expand Down Expand Up @@ -331,7 +331,7 @@ getPlutusSizes ::
( Core.EraTx era
, Core.TxWits era ~ Alonzo.AlonzoTxWits era
, Core.Script era ~ Alonzo.AlonzoScript era
, AlonzoEraScript era
, Alonzo.AlonzoEraScript era
) =>
Core.Tx era ->
[Word64]
Expand All @@ -341,7 +341,7 @@ getPlutusSizes tx =
tx ^. (Core.witsTxL . Alonzo.scriptAlonzoTxWitsL)

-- | Returns Nothing for non-plutus scripts.
getPlutusScriptSize :: AlonzoEraScript era => Alonzo.AlonzoScript era -> Maybe Word64
getPlutusScriptSize :: Alonzo.AlonzoEraScript era => Alonzo.AlonzoScript era -> Maybe Word64
getPlutusScriptSize script =
case script of
Alonzo.TimelockScript {} -> Nothing
Expand Down
12 changes: 6 additions & 6 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@
(final: prev: {
postgresql = prev.postgresql.overrideAttrs (_:
final.lib.optionalAttrs (final.stdenv.hostPlatform.isMusl) {
NIX_LDFLAGS = "--push-state --as-needed -lstdc++ --pop-state";
LC_CTYPE = "C";

doCheck = false;
});
})
Expand Down Expand Up @@ -146,7 +149,7 @@
let
compilers =
if (system == "x86_64-linux") then
["ghc96" "ghc98"]
["ghc96" "ghc98" "ghc910"]
else
["ghc98"];
in
Expand All @@ -163,8 +166,7 @@
};

shell.tools = {
cabal = "3.10.3.0";
ghcid = "0.8.8";
cabal = "latest";
haskell-language-server = {
src =
if config.compiler-nix-name == "ghc8107" then
Expand Down
Loading