Repin wine to 3.21 as file access from TH breaks otherwise #1508
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
bors try |
tryBuild failed: |
|
Sadly it looks like this breaks windows cross compilation on ghc 9.0 and 9.2 again, but I am going to merge it as a temporary fix for #1487 while we figure out a better solution. |
hamishmack
added a commit
to IntersectMBO/cardano-node
that referenced
this pull request
Jun 7, 2022
29 tasks
newhoggy
pushed a commit
to IntersectMBO/cardano-node
that referenced
this pull request
Jun 10, 2022
newhoggy
pushed a commit
to IntersectMBO/cardano-node
that referenced
this pull request
Jun 10, 2022
iohk-bors bot
added a commit
to cardano-foundation/cardano-wallet
that referenced
this pull request
Jun 17, 2022
3280: Update to cardano-node 1.35-rc2 r=Anviking a=Anviking
### Overview
- Updates dependencies to target `cardano-node 1.35-rc2`
- Adds support to make the wallet _mostly_ work in Babbage
- Rework of nix setup: we now derive nix files from `cabal.project` rather than the weird `stack.yaml`-based approach we had before.
### Detailed todo-list
- [x] Get nix happy with the new dependencies
- [x] Make `cabal build all` work with modulo warnings
- [x] Update to more recent revisions
- [x] Fix compilation in tests again
- [x] Make `cabal build all` work with _no_ warnings
- [x] Fix puzzling persistent TH name shadowing warnings -> fixed by sam?
- [x] Ensure existing tests pass
- [x] unit
- [x] Look closer at balanceTx golden unit failure after first seeing if balanceTx integration tests pass on both alonzo and Babbage
- [x] Integration (on alonzo like on master)
- [x] Was blocked by readTVar, fixed with input-output-hk/io-sim#6 (review)
- [x] Fix failures relating to Babbage era -> fixed with a hack 9e2568e
- [x] Fix cardano-wallet-core Aeson failures
- [x] More closely review code-changes
- [x] Clean up git commit history
- [x] Flatten merge commits
- [x] Squash back-and-forth nix and revision changes
- [x] Rebase off master
- [x] Ensure revisions in stack.yaml and cabal.project are updated consistently
- Alternatively remove `stack.yaml` and ensure ./nix/regenerate.sh still works and that we know how to update sha256map.nix — #3328 but without the sha256map.nix
- [x] Ensure CI is completely green: [Hydra jobset](https://hydra.iohk.io/jobset/Cardano/cardano-wallet-pr-3280), ADP-1888
- There may be CI specific problems with nix, windows and more (there probably are)
- [x] fix hydra wine TH error e.g. `$(TH.lift =<< TH.runIO (readFile "app/foo.txt"))`
- seems relevant input-output-hk/haskell.nix#1508
- seems gone now
- [x] `Ambiguous module name` https://hydra.iohk.io/build/15469467
- https://input-output-rnd.slack.com/archives/C48HA39RS/p1654388106509579
- Bumping Haskell.nix again should help?
- Didn't seem like it worked...
- https://input-output-rnd.slack.com/archives/CAP8NM7N0/p1654828014483969
- [x] Remove-iserv problem https://hydra.iohk.io/build/15604435
- Update from Hamish https://input-output-rnd.slack.com/archives/CAP8NM7N0/p1655213059547499?thread_ts=1654828014.483969&cid=CAP8NM7N0
- [x] Docs shell - we don't need explicit emanote input in nix config
- [x] Profiled shell: `recursionzmschemeszm5zi2zi2zi2zm6NC6xZZx2tI3826DrVhqI9v_DataziFunctorziFoldableziTH_zdfMakeBaseFunctorNamezuzdcmakeBaseFunctor_closure` https://hydra.iohk.io/build/15694577/nixlog/2/tail
- [x] musl cli goldens https://hydra.iohk.io/build/15694618/nixlog/82
- [x] `hie-bios: hie-bios: this operation requires -fexternal-interpreter
- [x] `Ambiguous module name 'Options.Applicative':` in HLS - now we at least have an ugly `-XPackageImport` workaround.
- [x] Update node revision in readme.md
### Things we need eventually, but not strictly for this PR
> - Update to final 1.35 tag once it is released - can be done in separate PR
> - Run existing integration tests on both Alonzo and Babbage eras in CI
> - Depend on cardano-addresses with aeson2 support merged, tagged and released
> - Depend on a cardano-sl-x509 where aeson 2 support is merged to master
> - Consider appropriateness Tx deserialisation hack 9e2568e
Moved to jira tasks in https://input-output.atlassian.net/browse/ADP-1538
### Comments
Includes #3258, #3293
<!-- Additional comments, links, or screenshots to attach, if any. -->
### Issue Number
ADP-1744
<!-- Reference the Jira/GitHub issue that this PR relates to, and which requirements it tackles.
Note: Jira issues of the form ADP- will be auto-linked. -->
Co-authored-by: Johannes Lund <[email protected]>
Co-authored-by: Pawel Jakubas <[email protected]>
Co-authored-by: Samuel Evans-Powell <[email protected]>
Co-authored-by: Jonathan Knowles <[email protected]>
iohk-bors bot
added a commit
to cardano-foundation/cardano-wallet
that referenced
this pull request
Jun 17, 2022
3280: Update to cardano-node 1.35-rc2 r=Anviking a=Anviking
### Overview
- Updates dependencies to target `cardano-node 1.35-rc2`
- Adds support to make the wallet _mostly_ work in Babbage
- Rework of nix setup: we now derive nix files from `cabal.project` rather than the weird `stack.yaml`-based approach we had before.
### Detailed todo-list
- [x] Get nix happy with the new dependencies
- [x] Make `cabal build all` work with modulo warnings
- [x] Update to more recent revisions
- [x] Fix compilation in tests again
- [x] Make `cabal build all` work with _no_ warnings
- [x] Fix puzzling persistent TH name shadowing warnings -> fixed by sam?
- [x] Ensure existing tests pass
- [x] unit
- [x] Look closer at balanceTx golden unit failure after first seeing if balanceTx integration tests pass on both alonzo and Babbage
- [x] Integration (on alonzo like on master)
- [x] Was blocked by readTVar, fixed with input-output-hk/io-sim#6 (review)
- [x] Fix failures relating to Babbage era -> fixed with a hack 9e2568e
- [x] Fix cardano-wallet-core Aeson failures
- [x] More closely review code-changes
- [x] Clean up git commit history
- [x] Flatten merge commits
- [x] Squash back-and-forth nix and revision changes
- [x] Rebase off master
- [x] Ensure revisions in stack.yaml and cabal.project are updated consistently
- Alternatively remove `stack.yaml` and ensure ./nix/regenerate.sh still works and that we know how to update sha256map.nix — #3328 but without the sha256map.nix
- [x] Ensure CI is completely green: [Hydra jobset](https://hydra.iohk.io/jobset/Cardano/cardano-wallet-pr-3280), ADP-1888
- There may be CI specific problems with nix, windows and more (there probably are)
- [x] fix hydra wine TH error e.g. `$(TH.lift =<< TH.runIO (readFile "app/foo.txt"))`
- seems relevant input-output-hk/haskell.nix#1508
- seems gone now
- [x] `Ambiguous module name` https://hydra.iohk.io/build/15469467
- https://input-output-rnd.slack.com/archives/C48HA39RS/p1654388106509579
- Bumping Haskell.nix again should help?
- Didn't seem like it worked...
- https://input-output-rnd.slack.com/archives/CAP8NM7N0/p1654828014483969
- [x] Remove-iserv problem https://hydra.iohk.io/build/15604435
- Update from Hamish https://input-output-rnd.slack.com/archives/CAP8NM7N0/p1655213059547499?thread_ts=1654828014.483969&cid=CAP8NM7N0
- [x] Docs shell - we don't need explicit emanote input in nix config
- [x] Profiled shell: `recursionzmschemeszm5zi2zi2zi2zm6NC6xZZx2tI3826DrVhqI9v_DataziFunctorziFoldableziTH_zdfMakeBaseFunctorNamezuzdcmakeBaseFunctor_closure` https://hydra.iohk.io/build/15694577/nixlog/2/tail
- [x] musl cli goldens https://hydra.iohk.io/build/15694618/nixlog/82
- [x] `hie-bios: hie-bios: this operation requires -fexternal-interpreter
- [x] `Ambiguous module name 'Options.Applicative':` in HLS - now we at least have an ugly `-XPackageImport` workaround.
- [x] Update node revision in readme.md
### Things we need eventually, but not strictly for this PR
> - Update to final 1.35 tag once it is released - can be done in separate PR
> - Run existing integration tests on both Alonzo and Babbage eras in CI
> - Depend on cardano-addresses with aeson2 support merged, tagged and released
> - Depend on a cardano-sl-x509 where aeson 2 support is merged to master
> - Consider appropriateness Tx deserialisation hack 9e2568e
Moved to jira tasks in https://input-output.atlassian.net/browse/ADP-1538
### Comments
Includes #3258, #3293
<!-- Additional comments, links, or screenshots to attach, if any. -->
### Issue Number
ADP-1744
<!-- Reference the Jira/GitHub issue that this PR relates to, and which requirements it tackles.
Note: Jira issues of the form ADP- will be auto-linked. -->
Co-authored-by: Johannes Lund <[email protected]>
Co-authored-by: Pawel Jakubas <[email protected]>
Co-authored-by: Samuel Evans-Powell <[email protected]>
Co-authored-by: Jonathan Knowles <[email protected]>
iohk-bors bot
added a commit
to cardano-foundation/cardano-wallet
that referenced
this pull request
Jun 17, 2022
3280: Update to cardano-node 1.35-rc2 r=Anviking a=Anviking
### Overview
- Updates dependencies to target `cardano-node 1.35-rc2`
- Adds support to make the wallet _mostly_ work in Babbage
- Rework of nix setup: we now derive nix files from `cabal.project` rather than the weird `stack.yaml`-based approach we had before.
### Detailed todo-list
- [x] Get nix happy with the new dependencies
- [x] Make `cabal build all` work with modulo warnings
- [x] Update to more recent revisions
- [x] Fix compilation in tests again
- [x] Make `cabal build all` work with _no_ warnings
- [x] Fix puzzling persistent TH name shadowing warnings -> fixed by sam?
- [x] Ensure existing tests pass
- [x] unit
- [x] Look closer at balanceTx golden unit failure after first seeing if balanceTx integration tests pass on both alonzo and Babbage
- [x] Integration (on alonzo like on master)
- [x] Was blocked by readTVar, fixed with input-output-hk/io-sim#6 (review)
- [x] Fix failures relating to Babbage era -> fixed with a hack 9e2568e
- [x] Fix cardano-wallet-core Aeson failures
- [x] More closely review code-changes
- [x] Clean up git commit history
- [x] Flatten merge commits
- [x] Squash back-and-forth nix and revision changes
- [x] Rebase off master
- [x] Ensure revisions in stack.yaml and cabal.project are updated consistently
- Alternatively remove `stack.yaml` and ensure ./nix/regenerate.sh still works and that we know how to update sha256map.nix — #3328 but without the sha256map.nix
- [x] Ensure CI is completely green: [Hydra jobset](https://hydra.iohk.io/jobset/Cardano/cardano-wallet-pr-3280), ADP-1888
- There may be CI specific problems with nix, windows and more (there probably are)
- [x] fix hydra wine TH error e.g. `$(TH.lift =<< TH.runIO (readFile "app/foo.txt"))`
- seems relevant input-output-hk/haskell.nix#1508
- seems gone now
- [x] `Ambiguous module name` https://hydra.iohk.io/build/15469467
- https://input-output-rnd.slack.com/archives/C48HA39RS/p1654388106509579
- Bumping Haskell.nix again should help?
- Didn't seem like it worked...
- https://input-output-rnd.slack.com/archives/CAP8NM7N0/p1654828014483969
- [x] Remove-iserv problem https://hydra.iohk.io/build/15604435
- Update from Hamish https://input-output-rnd.slack.com/archives/CAP8NM7N0/p1655213059547499?thread_ts=1654828014.483969&cid=CAP8NM7N0
- [x] Docs shell - we don't need explicit emanote input in nix config
- [x] Profiled shell: `recursionzmschemeszm5zi2zi2zi2zm6NC6xZZx2tI3826DrVhqI9v_DataziFunctorziFoldableziTH_zdfMakeBaseFunctorNamezuzdcmakeBaseFunctor_closure` https://hydra.iohk.io/build/15694577/nixlog/2/tail
- [x] musl cli goldens https://hydra.iohk.io/build/15694618/nixlog/82
- [x] `hie-bios: hie-bios: this operation requires -fexternal-interpreter
- [x] `Ambiguous module name 'Options.Applicative':` in HLS - now we at least have an ugly `-XPackageImport` workaround.
- [x] Update node revision in readme.md
### Things we need eventually, but not strictly for this PR
> - Update to final 1.35 tag once it is released - can be done in separate PR
> - Run existing integration tests on both Alonzo and Babbage eras in CI
> - Depend on cardano-addresses with aeson2 support merged, tagged and released
> - Depend on a cardano-sl-x509 where aeson 2 support is merged to master
> - Consider appropriateness Tx deserialisation hack 9e2568e
Moved to jira tasks in https://input-output.atlassian.net/browse/ADP-1538
### Comments
Includes #3258, #3293
<!-- Additional comments, links, or screenshots to attach, if any. -->
### Issue Number
ADP-1744
<!-- Reference the Jira/GitHub issue that this PR relates to, and which requirements it tackles.
Note: Jira issues of the form ADP- will be auto-linked. -->
Co-authored-by: Johannes Lund <[email protected]>
Co-authored-by: Pawel Jakubas <[email protected]>
Co-authored-by: Samuel Evans-Powell <[email protected]>
Co-authored-by: Jonathan Knowles <[email protected]>
iohk-bors bot
added a commit
to cardano-foundation/cardano-wallet
that referenced
this pull request
Jun 17, 2022
3280: Update to cardano-node 1.35-rc2 r=Anviking a=Anviking
### Overview
- Updates dependencies to target `cardano-node 1.35-rc2`
- Adds support to make the wallet _mostly_ work in Babbage
- Rework of nix setup: we now derive nix files from `cabal.project` rather than the weird `stack.yaml`-based approach we had before.
### Detailed todo-list
- [x] Get nix happy with the new dependencies
- [x] Make `cabal build all` work with modulo warnings
- [x] Update to more recent revisions
- [x] Fix compilation in tests again
- [x] Make `cabal build all` work with _no_ warnings
- [x] Fix puzzling persistent TH name shadowing warnings -> fixed by sam?
- [x] Ensure existing tests pass
- [x] unit
- [x] Look closer at balanceTx golden unit failure after first seeing if balanceTx integration tests pass on both alonzo and Babbage
- [x] Integration (on alonzo like on master)
- [x] Was blocked by readTVar, fixed with input-output-hk/io-sim#6 (review)
- [x] Fix failures relating to Babbage era -> fixed with a hack 9e2568e
- [x] Fix cardano-wallet-core Aeson failures
- [x] More closely review code-changes
- [x] Clean up git commit history
- [x] Flatten merge commits
- [x] Squash back-and-forth nix and revision changes
- [x] Rebase off master
- [x] Ensure revisions in stack.yaml and cabal.project are updated consistently
- Alternatively remove `stack.yaml` and ensure ./nix/regenerate.sh still works and that we know how to update sha256map.nix — #3328 but without the sha256map.nix
- [x] Ensure CI is completely green: [Hydra jobset](https://hydra.iohk.io/jobset/Cardano/cardano-wallet-pr-3280), ADP-1888
- There may be CI specific problems with nix, windows and more (there probably are)
- [x] fix hydra wine TH error e.g. `$(TH.lift =<< TH.runIO (readFile "app/foo.txt"))`
- seems relevant input-output-hk/haskell.nix#1508
- seems gone now
- [x] `Ambiguous module name` https://hydra.iohk.io/build/15469467
- https://input-output-rnd.slack.com/archives/C48HA39RS/p1654388106509579
- Bumping Haskell.nix again should help?
- Didn't seem like it worked...
- https://input-output-rnd.slack.com/archives/CAP8NM7N0/p1654828014483969
- [x] Remove-iserv problem https://hydra.iohk.io/build/15604435
- Update from Hamish https://input-output-rnd.slack.com/archives/CAP8NM7N0/p1655213059547499?thread_ts=1654828014.483969&cid=CAP8NM7N0
- [x] Docs shell - we don't need explicit emanote input in nix config
- [x] Profiled shell: `recursionzmschemeszm5zi2zi2zi2zm6NC6xZZx2tI3826DrVhqI9v_DataziFunctorziFoldableziTH_zdfMakeBaseFunctorNamezuzdcmakeBaseFunctor_closure` https://hydra.iohk.io/build/15694577/nixlog/2/tail
- [x] musl cli goldens https://hydra.iohk.io/build/15694618/nixlog/82
- [x] `hie-bios: hie-bios: this operation requires -fexternal-interpreter
- [x] `Ambiguous module name 'Options.Applicative':` in HLS - now we at least have an ugly `-XPackageImport` workaround.
- [x] Update node revision in readme.md
### Things we need eventually, but not strictly for this PR
> - Update to final 1.35 tag once it is released - can be done in separate PR
> - Run existing integration tests on both Alonzo and Babbage eras in CI
> - Depend on cardano-addresses with aeson2 support merged, tagged and released
> - Depend on a cardano-sl-x509 where aeson 2 support is merged to master
> - Consider appropriateness Tx deserialisation hack 9e2568e
Moved to jira tasks in https://input-output.atlassian.net/browse/ADP-1538
### Comments
Includes #3258, #3293
<!-- Additional comments, links, or screenshots to attach, if any. -->
### Issue Number
ADP-1744
<!-- Reference the Jira/GitHub issue that this PR relates to, and which requirements it tackles.
Note: Jira issues of the form ADP- will be auto-linked. -->
Co-authored-by: Johannes Lund <[email protected]>
Co-authored-by: Pawel Jakubas <[email protected]>
Co-authored-by: Samuel Evans-Powell <[email protected]>
Co-authored-by: Jonathan Knowles <[email protected]>
newhoggy
pushed a commit
to IntersectMBO/cardano-node
that referenced
this pull request
Jun 26, 2022
newhoggy
pushed a commit
to IntersectMBO/cardano-node
that referenced
this pull request
Jul 4, 2022
newhoggy
pushed a commit
to IntersectMBO/cardano-node
that referenced
this pull request
Jul 4, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1487