Skip to content

Commit

Permalink
nix: Try to fix integration tests build
Browse files Browse the repository at this point in the history
  • Loading branch information
rvl committed Sep 29, 2019
1 parent 051c1d2 commit 475160e
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 11 deletions.
2 changes: 2 additions & 0 deletions lib/http-bridge/cardano-wallet-http-bridge.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,8 @@ test-suite integration
, text-class
, time
, transformers
build-tools:
cardano-wallet-http-bridge
type:
exitcode-stdio-1.0
hs-source-dirs:
Expand Down
3 changes: 3 additions & 0 deletions lib/jormungandr/cardano-wallet-jormungandr.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,9 @@ test-suite integration
, transformers
, warp
, yaml
build-tools:
nodejs
, cardano-wallet-jormungandr
type:
exitcode-stdio-1.0
hs-source-dirs:
Expand Down
3 changes: 3 additions & 0 deletions nix/.stack.nix/cardano-wallet-http-bridge.nix

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

4 changes: 4 additions & 0 deletions nix/.stack.nix/cardano-wallet-jormungandr.nix

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

15 changes: 4 additions & 11 deletions nix/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,8 @@ let
unit.build-tools = [ cardano-http-bridge ];
};

# fixme: better way of setting environment variables
packages.cardano-wallet-http-bridge.preBuild = "export NETWORK=testnet";

packages.cardano-wallet-jormungandr.components.tests = {
# provide jormungandr command to test suites
integration.build-tools = [ jormungandr ];
unit.build-tools = [ jormungandr ];
};
Expand Down Expand Up @@ -121,19 +119,14 @@ let
packages.katip.doExactConfig = true;
}

# the iohk-module will supply us with the necessary
# The iohk-module will supply us with the necessary
# cross compilation plumbing to make Template Haskell
# work when cross compiling. For now we need to
# list the packages that require template haskell
# explicity here.
# work when cross compiling.
iohk-module
];
pkg-def-extras = [
# Use the iohk-extras patched GHC for cross-compiling.
iohk-extras.${compiler}
(hackage: { packages = {
"transformers" = (((hackage.transformers)."0.5.6.2").revisions).default;
"process" = (((hackage.process)."1.6.5.0").revisions).default;
}; })
];
};

Expand Down

0 comments on commit 475160e

Please sign in to comment.