Skip to content

Commit

Permalink
Merge #2088 #2092
Browse files Browse the repository at this point in the history
2088: Bump cardano-base so that shelley-spec-ledger-test compiles r=rvl a=rvl

### Issue Number

Found during #2077.

### Overview

If you are keen enough to build the test suites of all our dependencies, you would have found `shelley-spec-ledger-test` failing to compile, because it needs a later revision of `cardano-base`. This will fix it.


2092: Fix stack build on windows r=rvl a=rvl

### Issue Number

None

### Overview

On windows, the stack build would fail with some missing dependencies. There is some stack issue with GHC boot packages. The recommended course of action is to add them as `extra-deps` in `stack.yaml`. This fixes the build.

### Comments

Since the libsodium VRF was added, there is now an extra step to get stack builds working on windows. I have updated our [iohk-setup.ps1](https://github.com/input-output-hk/adrestia/wiki/scripts/iohk-setup.ps1) script to install libsodium and configure stack to use it.


Co-authored-by: Rodney Lorrimar <rodney.lorrimar@iohk.io>
Co-authored-by: IOHK <devops+stack-project@iohk.io>
  • Loading branch information
3 people committed Aug 31, 2020
3 parents ba42959 + 00e853f + e2dd29e commit 0fc3538
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 13 deletions.
4 changes: 2 additions & 2 deletions cardano-1.19.x.yaml → cardano-1.19.dev1.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: cardano-1.19.x
name: cardano-1.19.dev1

resolver: lts-14.25

Expand Down Expand Up @@ -60,7 +60,7 @@ packages:
- Win32-2.6.2.0

- git: https://github.com/input-output-hk/cardano-base
commit: df8687488449f71dce3d881800c21e41fe1b7fc1
commit: 3e2d92b25c675fd923a07237eb1d0859b29a79d3
subdirs:
- binary
- binary/test
Expand Down
4 changes: 2 additions & 2 deletions nix/.stack.nix/cardano-binary-test.nix

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

4 changes: 2 additions & 2 deletions nix/.stack.nix/cardano-binary.nix

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

4 changes: 2 additions & 2 deletions nix/.stack.nix/cardano-crypto-class.nix

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

4 changes: 2 additions & 2 deletions nix/.stack.nix/cardano-crypto-praos.nix

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

4 changes: 2 additions & 2 deletions nix/.stack.nix/cardano-slotting.nix

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

3 changes: 3 additions & 0 deletions nix/.stack.nix/default.nix

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

7 changes: 6 additions & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: cardano-1.19.x.yaml
resolver: cardano-1.19.dev1.yaml

packages:
- lib/core
Expand Down Expand Up @@ -29,6 +29,11 @@ extra-deps:
# Needed for recently introduced support of TLS-1.3
- tls-1.5.4

# Pruned GHC boot packages which need to be here for stack to work on windows.
- directory-1.3.3.0
- process-1.6.5.0
- time-1.8.0.2

# persistent-2.10.2 with CASCADE DELETE support for SQLite.
#
# See: https://github.com/input-output-hk/persistent/tree/cardano-wallet
Expand Down

0 comments on commit 0fc3538

Please sign in to comment.