Move to get Haskell packages from CHaP #4078

andreabedini · 2022-10-14T06:35:22Z

This moves the repository to use cardano-haskell-packages (CHaP) repository.

This is currently blocked by input-output-hk/io-sim#37. CHaP had been pre-populated with the dependencies of the lastest release of cardano-node, but ouroboros-network has progressed in the meantime requiring a newer version of io-sim which is not in CHaP yet.

michaelpj · 2022-10-14T09:06:21Z

This is currently blocked by input-output-hk/io-sim#37.

It doesn't have to be blocked: use a s-r-p for now, and then we can remove it once that is merged. We can still get this PR in before that.

michaelpj · 2022-10-14T10:27:43Z

Note that shell.nix is using cabalWrapped, which can and should go.

andreabedini · 2022-10-14T14:07:46Z

It doesn't have to be blocked: use a s-r-p for now, and then we can remove it once that is merged. We can still get this PR in before that.

ok, I will chase this up on Monday.

michaelpj

it went green!

cabal.project

andreabedini · 2022-10-21T08:09:46Z

Now at least it builds. Left to do is to remove one srp at the time so see if we can improve on the situation.

michaelpj · 2022-10-26T09:39:32Z

I think we could merge this as is and then work from this point? any objections?

andreabedini · 2022-10-26T09:46:17Z

I think we could merge this as is and then work from this point? any objections?

I am just trying to see if the new io-sim packages help.

andreabedini · 2022-10-26T09:47:10Z

But perhaps you made a good point that it can be done in a separate PR

michaelpj · 2022-10-26T10:05:02Z

I am just trying to see if the new io-sim packages help.

I just tried that and they don't work with the version of typed-protocols being used 😅 So I think let's move on for now.

andreabedini · 2022-10-26T10:07:17Z

Ok, let's call this done. We will improve on it later.

michaelpj · 2022-10-26T14:30:10Z

We just got compatible typed-protocols published, I'm just trying to see if I can roll that into this also.

michaelpj · 2022-10-26T15:03:07Z

Worked locally, pushing it.

nfrisby · 2022-10-26T15:08:03Z

By reading the new text in CONTRIBUTING.md, will I understand everything I need to understand in order to review the rest of this PR? Thanks!

cc @andreabedini @michaelpj

michaelpj · 2022-10-26T15:11:38Z

@nfrisby if you read it and you don't understand, then I regard that as a deficiency in the text and please say so :) you might also need to read the CHaP readme, which is linked.

CONTRIBUTING.md

michaelpj · 2022-10-31T10:20:45Z

@coot is this good to go?

CONTRIBUTING.md

coot · 2022-11-02T08:47:26Z

@michaelpj this is only about using CHaP, not releasing anything to it, right? The next version of packages from this repo needs to be released from the release/cardano-node.1.35.x branch not master.

andreabedini · 2022-11-02T09:38:03Z

this is only about using CHaP, not releasing anything to it, right? The next version of packages from this repo needs to be released from the release/cardano-node.1.35.x branch not master.

@coot correct, we are only replacing source-repository-packages with equivalent ones in CHaP.

michaelpj · 2022-11-02T09:50:20Z

Yes, this doesn't say anything about how you release your packages. It should help with releasing packages, in that if you have a "clean" cabal.project with CHaP, then you know that your released package will build downstream without any additional config. However, I'm not sure it's worth backporting these changes to the release branch just for that! We can do what we need to do for the 1.35 release and just take this forward on master.

amesgen · 2022-11-04T16:34:51Z

I'm hoping to be able to borrow the Windows CI fix from input-output-hk/cardano-node#4590 when it lands, if it works...

FYI: @coot already tries to integrate it as part of #4134

michaelpj · 2022-11-07T15:50:59Z

bors try

This moves the repository to use cardano-haskell-packages (CHaP) repository.

michaelpj · 2022-11-07T16:54:35Z

So close. It went green but conflicts with #4103. Rebased to fix conflicts.

iohk-bors · 2022-11-07T19:06:06Z

try

Timed out.

iohk-bors · 2022-11-07T19:06:07Z

try

Timed out.

andreabedini · 2022-11-08T03:47:30Z

bors try

iohk-bors · 2022-11-08T05:50:20Z

try

Build failed:

ci/hydra:Cardano:ouroboros-network:required

andreabedini · 2022-11-08T06:02:17Z

building of '/nix/store/xnyardh9jz8l16yrv80d2azx1rvlbg0y-ouroboros-consensus-byron-test-test-test-0.1.0.0-check' timed out after 900 seconds of silence

amesgen · 2022-11-08T10:21:14Z

bors retry

iohk-bors · 2022-11-08T12:11:33Z

try

Build succeeded:

michaelpj · 2022-11-08T12:36:14Z

bors merge

michaelpj · 2022-11-08T12:36:30Z

no idea if that will work

iohk-bors · 2022-11-08T14:43:04Z

Build succeeded:

michaelpj · 2022-11-08T14:45:06Z

hallelujah

4148: Add simple `hie.yaml` r=amesgen a=amesgen # Description This is necessary due to a bug somewhere in HLS 1.7 vs 1.8, which was upgraded in #4078. Co-authored-by: Alexander Esgen <[email protected]>

This input was added in #3661, but was not actually used. Now, that we tell people to run `niv update hackage.nix` in the CONTRIBUTING guide (see #4078), we should fix this.

andreabedini requested review from coot and michaelpj October 14, 2022 06:35

andreabedini force-pushed the chap branch from 52162ef to eb0c5f9 Compare October 20, 2022 09:29

michaelpj reviewed Oct 20, 2022

View reviewed changes

cabal.project Outdated Show resolved Hide resolved

andreabedini marked this pull request as ready for review October 26, 2022 10:06

andreabedini requested review from newhoggy, a team, bolt12 and nfrisby as code owners October 26, 2022 10:06

michaelpj requested a review from dnadales as a code owner October 26, 2022 15:02

coot reviewed Oct 26, 2022

View reviewed changes

CONTRIBUTING.md Outdated Show resolved Hide resolved

michaelpj force-pushed the chap branch from c2d57a4 to e7b8be5 Compare October 27, 2022 13:37

coot approved these changes Nov 2, 2022

View reviewed changes

CONTRIBUTING.md Outdated Show resolved Hide resolved

michaelpj force-pushed the chap branch from dfe5817 to e4cb82f Compare November 7, 2022 13:23

iohk-bors bot added a commit that referenced this pull request Nov 7, 2022

Try #4078:

2de3bb0

Move to get Haskell packages from CHaP

6375799

This moves the repository to use cardano-haskell-packages (CHaP) repository.

michaelpj force-pushed the chap branch from e4cb82f to 6375799 Compare November 7, 2022 16:53

iohk-bors bot added a commit that referenced this pull request Nov 8, 2022

Try #4078:

c18337c

iohk-bors bot added a commit that referenced this pull request Nov 8, 2022

Try #4078:

57964de

iohk-bors bot merged commit 8b21e2b into master Nov 8, 2022

iohk-bors bot deleted the chap branch November 8, 2022 14:43

amesgen mentioned this pull request Nov 15, 2022

Add simple hie.yaml #4148

Merged

9 tasks

amesgen added a commit that referenced this pull request Dec 14, 2022

Actually use hackage.nix Niv input

753649a

This input was added in #3661, but was not actually used. Now, that we tell people to run `niv update hackage.nix` in the CONTRIBUTING guide (see #4078), we should fix this.

amesgen added a commit that referenced this pull request Dec 15, 2022

Actually use hackage.nix Niv input

36af9c2

This input was added in #3661, but was not actually used. Now, that we tell people to run `niv update hackage.nix` in the CONTRIBUTING guide (see #4078), we should fix this.

newhoggy pushed a commit that referenced this pull request Jan 2, 2023

Actually use hackage.nix Niv input

2a10451

This input was added in #3661, but was not actually used. Now, that we tell people to run `niv update hackage.nix` in the CONTRIBUTING guide (see #4078), we should fix this.

newhoggy pushed a commit that referenced this pull request Jan 5, 2023

Actually use hackage.nix Niv input

0777305

This input was added in #3661, but was not actually used. Now, that we tell people to run `niv update hackage.nix` in the CONTRIBUTING guide (see #4078), we should fix this.

coot pushed a commit that referenced this pull request Jan 5, 2023

Actually use hackage.nix Niv input

3be7306

This input was added in #3661, but was not actually used. Now, that we tell people to run `niv update hackage.nix` in the CONTRIBUTING guide (see #4078), we should fix this.

Move to get Haskell packages from CHaP #4078

Move to get Haskell packages from CHaP #4078

Uh oh!

Conversation

andreabedini commented Oct 14, 2022

Uh oh!

michaelpj commented Oct 14, 2022

Uh oh!

michaelpj commented Oct 14, 2022

Uh oh!

andreabedini commented Oct 14, 2022

Uh oh!

michaelpj left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

andreabedini commented Oct 21, 2022

Uh oh!

michaelpj commented Oct 26, 2022

Uh oh!

andreabedini commented Oct 26, 2022

Uh oh!

andreabedini commented Oct 26, 2022

Uh oh!

michaelpj commented Oct 26, 2022

Uh oh!

andreabedini commented Oct 26, 2022

Uh oh!

michaelpj commented Oct 26, 2022

Uh oh!

michaelpj commented Oct 26, 2022

Uh oh!

nfrisby commented Oct 26, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

michaelpj commented Oct 26, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

michaelpj commented Oct 31, 2022

Uh oh!

Uh oh!

coot commented Nov 2, 2022

Uh oh!

andreabedini commented Nov 2, 2022

Uh oh!

michaelpj commented Nov 2, 2022

Uh oh!

amesgen commented Nov 4, 2022

Uh oh!

michaelpj commented Nov 7, 2022

Uh oh!

michaelpj commented Nov 7, 2022

Uh oh!

iohk-bors bot commented Nov 7, 2022

try

Uh oh!

iohk-bors bot commented Nov 7, 2022

try

Uh oh!

andreabedini commented Nov 8, 2022

Uh oh!

iohk-bors bot commented Nov 8, 2022

try

Uh oh!

andreabedini commented Nov 8, 2022

Uh oh!

amesgen commented Nov 8, 2022

Uh oh!

iohk-bors bot commented Nov 8, 2022

try

Uh oh!

michaelpj commented Nov 8, 2022

Uh oh!

michaelpj commented Nov 8, 2022

Uh oh!

iohk-bors bot commented Nov 8, 2022

Uh oh!

michaelpj commented Nov 8, 2022

Uh oh!

nfrisby commented Oct 26, 2022 •

edited

Loading

michaelpj commented Oct 26, 2022 •

edited

Loading