Merge pull request #269 from IntersectMBO/erikd/ghc-9.8

Make it build with ghc 9.8

cabal.project

@@ -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
 
@@ -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
-
 packages:
   command-line/cardano-addresses-cli.cabal
   core/cardano-addresses.cabal

flake.nix

@@ -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";

jsapi/test/Main.hs

@@ -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))
 #endif
 
 -- When runing the native version, point a browser at http://localhost:3757/