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.

Sign up for GitHub

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

Jump to bottom

Fix build issues related to GHC-version dependend constraints #108

Merged
merged 4 commits into from
Jul 25, 2023
Merged

Fix build issues related to GHC-version dependend constraints #108

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8364f5d
Fix GHC 9.6 build
carbolymer Jul 25, 2023
885c198
cardano-cli-test: fix windows build
disassembler Jul 25, 2023
d435ca5
hlint: ignore fewer imports warning
disassembler Jul 25, 2023
1340dc1
flake: add HLS to devshell
disassembler Jul 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/haskell.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

env:
# Modify this value to "invalidate" the cabal cache.
CABAL_CACHE_VERSION: "2023-07-11"
CABAL_CACHE_VERSION: "2023-07-25_108-1"

concurrency:
group: >
Expand Down
4 changes: 2 additions & 2 deletions cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ repository cardano-haskell-packages
-- See CONTRIBUTING for information about these, including some Nix commands
-- you need to run if you change them
index-state:
, hackage.haskell.org 2023-07-10T22:41:49Z
, cardano-haskell-packages 2023-07-17T06:35:34Z
, hackage.haskell.org 2023-07-27T22:41:49Z
, cardano-haskell-packages 2023-07-27T06:35:34Z

packages:
cardano-cli
Expand Down
2 changes: 1 addition & 1 deletion cardano-cli/cardano-cli.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ library cardano-cli-test-lib
, transformers

test-suite cardano-cli-test
import: project-config, maybe-unix
import: project-config

hs-source-dirs: test/cardano-cli-test
main-is: cardano-cli-test.hs
Expand Down
4 changes: 2 additions & 2 deletions cardano-cli/src/Cardano/CLI/Run/Legacy/Address.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ runAddressKeyGenToFile fmt kt vkf skf = case kt of

generateAndWriteByronKeyFiles
:: Key keyrole
#if __GLASGOW_HASKELL__ >= 940
#if __GLASGOW_HASKELL__ >= 902
-- GHC 8.10 considers the HasTypeProxy constraint redundant but ghc-9.4 and above complains if its
-- not present.
=> HasTypeProxy keyrole
Expand All @@ -93,7 +93,7 @@ generateAndWriteByronKeyFiles asType vkf skf = do

generateAndWriteKeyFiles
:: Key keyrole
#if __GLASGOW_HASKELL__ >= 940
#if __GLASGOW_HASKELL__ >= 902
-- GHC 8.10 considers the HasTypeProxy constraint redundant but ghc-9.4 and above complains if its
-- not present.
=> HasTypeProxy keyrole
Expand Down
2 changes: 1 addition & 1 deletion cardano-cli/src/Cardano/CLI/Run/Legacy/Genesis.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ toSKeyJSON :: Key a => SigningKey a -> ByteString
toSKeyJSON = LBS.toStrict . textEnvelopeToJSON Nothing

toVkeyJSON ::
#if __GLASGOW_HASKELL__ >= 940
#if __GLASGOW_HASKELL__ >= 902
-- GHC 8.10 considers the HasTypeProxy constraint redundant but ghc-9.4 and above complains if its
-- not present.
(Key a, HasTypeProxy a) =>
Expand Down
2 changes: 1 addition & 1 deletion cardano-cli/src/Cardano/CLI/Types/Key.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ readVerificationKeyOrHashOrTextEnvFile asType verKeyOrHashOrFile =
VerificationKeyHash vkHash -> pure (Right vkHash)

generateKeyPair ::
#if __GLASGOW_HASKELL__ >= 940
#if __GLASGOW_HASKELL__ >= 902
-- GHC 8.10 considers the HasTypeProxy constraint redundant but ghc-9.4 and above complains if its
-- not present.
(Key keyrole, HasTypeProxy keyrole) =>
Expand Down
6 changes: 3 additions & 3 deletions flake.lock
View file
Open in desktop

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

1 change: 1 addition & 0 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@
);
in
lib.recursiveUpdate flake rec {
project = cabalProject;
# add a required job, that's basically all hydraJobs.
hydraJobs =
nixpkgs.callPackages inputs.iohkNix.utils.ciJobsAggregates
Expand Down