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

Make it build with ghc 9.8 #269

Merged
merged 5 commits into from
Nov 27, 2024
Merged

Make it build with ghc 9.8 #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
efaf8c7
Make it build with ghc-9.8
erikd Nov 25, 2024
3bb48b4
cabal.project: Update index-states
erikd Nov 25, 2024
072c741
Nix updates
erikd Nov 25, 2024
eeddc11
update flake.lock
angerman Nov 25, 2024
8197a11
revert accidental nixpkgs bump
angerman Nov 26, 2024
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
8 changes: 4 additions & 4 deletions cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ repository cardano-haskell-packages
c00aae8461a256275598500ea0e187588c35a5d5d7454fb57eac18d9edb86a56
d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee

index-state:
, hackage.haskell.org 2024-11-14T09:17:39Z
, cardano-haskell-packages 2024-11-20T20:05:41Z

-- See CONTRIBUTING for information about these, including some Nix commands
-- you need to run if you change them

Expand Down Expand Up @@ -56,10 +60,6 @@ else

active-repositories: hackage.haskell.org, cardano-haskell-packages

index-state:
, hackage.haskell.org 2024-06-05T16:48:53Z
, cardano-haskell-packages 2024-06-05T16:48:53Z

erikd marked this conversation as resolved.
Show resolved Hide resolved
packages:
command-line/cardano-addresses-cli.cabal
core/cardano-addresses.cabal
Expand Down
93 changes: 50 additions & 43 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.

10 changes: 9 additions & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,17 @@

inputs = {
nixpkgs.follows = "haskellNix/nixpkgs-2305";
hostNixpkgs.follows = "nixpkgs";
hackageNix = {
url = "github:input-output-hk/hackage.nix";
flake = false;
};
haskellNix = {
url = "github:input-output-hk/haskell.nix";
# GHC 8.10.7 cross compilation for windows is broken in newer versions of haskell.nix.
# Unpin this once we no longer need GHC 8.10.7.
url = "github:input-output-hk/haskell.nix/cb139fa956158397aa398186bb32dd26f7318784";
inputs.nixpkgs.follows = "nixpkgs";
inputs.hackage.follows = "hackageNix";
};
CHaP = {
url = "github:intersectmbo/cardano-haskell-packages?ref=repo";
Expand Down
4 changes: 2 additions & 2 deletions jsapi/test/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ foreign import javascript interruptible "testStart($1, $c);" initComplete
#else
initComplete :: Object -> JSM ()
initComplete api =
void $ api ^. js1 "version" (fun $ \ _ _ [ver] ->
fromJSValUnchecked ver >>= (liftIO . putStrLn))
void $ api ^. js1 "version" (fun $ \ _ _ xs ->
fromJSValUnchecked (head xs) >>= (liftIO . putStrLn))
erikd marked this conversation as resolved.
Show resolved Hide resolved
#endif

-- When runing the native version, point a browser at http://localhost:3757/
Expand Down
Loading