Skip to content

Commit e38f090

Browse files
sgillespieCmdv
authored andcommitted
Disable postgresql flags for cardano-chain-gen:lib
cardano-chain-gen library no longer directly uses postgresql, all queries were moved to cardana-db. Because of that, we're unable to build cardana-chain-gen: cannot find -lpgcommon: No such file or directory cannot find -lpgport: No such file or directory collect2: error: ld returned 1 exit status Remove the postgresql-specific configure flags for the cardano-chain-gen library.
1 parent 0dacec4 commit e38f090

File tree

8 files changed

+25
-27
lines changed

8 files changed

+25
-27
lines changed

cabal.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ repository cardano-haskell-packages
1111

1212
index-state:
1313
, hackage.haskell.org 2025-08-03T21:32:16Z
14-
, cardano-haskell-packages 2025-06-25T13:51:34Z
14+
, cardano-haskell-packages 2025-07-30T14:13:57Z
1515

1616
packages:
1717
cardano-db

cardano-db-sync/src/Cardano/DbSync/Era/Universal/Insert/Grouped.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{-# LANGUAGE ApplicativeDo #-}
22
{-# LANGUAGE FlexibleContexts #-}
3+
{-# LANGUAGE GADTs #-}
34
{-# LANGUAGE OverloadedStrings #-}
45
{-# LANGUAGE RankNTypes #-}
56
{-# LANGUAGE RecordWildCards #-}
@@ -305,9 +306,8 @@ data PreparedMetadata = PreparedMetadata
305306
}
306307

307308
-- | Prepared Mint data for async execution
308-
data PreparedMint = PreparedMint
309-
{ pmtChunks :: ![[DB.MaTxMint]]
310-
}
309+
data PreparedMint where
310+
PreparedMint :: {pmtChunks :: ![[DB.MaTxMint]]} -> PreparedMint
311311

312312
-- | Prepare TxIn processing (can run in parallel with TxOut)
313313
prepareTxInProcessing :: SyncEnv -> BlockGroupedData -> PreparedTxIn

cardano-db-tool/app/cardano-db-tool.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{-# LANGUAGE OverloadedStrings #-}
2-
{-# LANGUAGE TypeApplications #-}
32

43
import Cardano.Db
54
import Cardano.DbSync.Config.Types hiding (CmdVersion, LogFileDir)

cardano-db/src/Cardano/Db/Statement/GovernanceAndVoting.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ insertBulkDrepDistrPiped :: HasCallStack => [[SGV.DrepDistr]] -> DbM ()
261261
insertBulkDrepDistrPiped drepDistrChunks =
262262
runSession mkDbCallStack $
263263
HsqlSes.pipeline $
264-
traverse_ (\chunk -> HsqlP.statement chunk insertBulkDrepDistrStmt) drepDistrChunks
264+
traverse_ (`HsqlP.statement` insertBulkDrepDistrStmt) drepDistrChunks
265265

266266
-- | QUERY
267267
queryDrepHashSpecialStmt ::
@@ -505,7 +505,7 @@ insertBulkTreasuryWithdrawal :: HasCallStack => [[SGV.TreasuryWithdrawal]] -> Db
505505
insertBulkTreasuryWithdrawal treasuryWithdrawalChunks =
506506
runSession mkDbCallStack $
507507
HsqlSes.pipeline $
508-
traverse_ (\chunk -> HsqlP.statement chunk insertBulkTreasuryWithdrawalStmt) treasuryWithdrawalChunks
508+
traverse_ (`HsqlP.statement` insertBulkTreasuryWithdrawalStmt) treasuryWithdrawalChunks
509509

510510
--------------------------------------------------------------------------------
511511
-- Voting

cardano-db/src/Cardano/Db/Statement/StakeDelegation.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ insertBulkRewardRestsPiped :: [[SS.RewardRest]] -> DbM ()
341341
insertBulkRewardRestsPiped rewardRestChunks =
342342
runSession mkDbCallStack $
343343
HsqlSes.pipeline $
344-
traverse_ (\chunk -> HsqlP.statement chunk insertBulkRewardRestsStmt) rewardRestChunks
344+
traverse_ (`HsqlP.statement` insertBulkRewardRestsStmt) rewardRestChunks
345345

346346
--------------------------------------------------------------------------------
347347
queryRewardRestCount :: DbM Word64

cardano-db/test/Test/IO/Cardano/Db/Rollback.hs

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -107,21 +107,20 @@ createAndInsertBlocks blockCount =
107107
then pure mTxOutId
108108
else do
109109
txId <-
110-
( insertTx $
111-
Tx
112-
(mkTxHash blkId 0)
113-
blkId
114-
0
115-
(DbLovelace 0)
116-
(DbLovelace 0)
117-
(Just 0)
118-
12
119-
Nothing
120-
Nothing
121-
True
122-
0
123-
(DbLovelace 0)
124-
)
110+
insertTx $
111+
Tx
112+
(mkTxHash blkId 0)
113+
blkId
114+
0
115+
(DbLovelace 0)
116+
(DbLovelace 0)
117+
(Just 0)
118+
12
119+
Nothing
120+
Nothing
121+
True
122+
0
123+
(DbLovelace 0)
125124

126125
void $ insertTxOut (mkTxOutCore blkId txId)
127126
pure $ Just txId

flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@
262262
"-optl-Wl,-lcrypto"
263263
];
264264
in {
265-
packages.cardano-chain-gen.ghcOptions = ghcOptions;
265+
packages.cardano-chain-gen.components.tests.cardano-chain-gen.ghcOptions = ghcOptions;
266266
packages.cardano-db-sync.ghcOptions = ghcOptions;
267267
packages.cardano-db.ghcOptions = ghcOptions;
268268
packages.cardano-db-tool.ghcOptions = ghcOptions;

0 commit comments

Comments
 (0)