ouroboros-network icon indicating copy to clipboard operation
ouroboros-network copied to clipboard

Move to get Haskell packages from CHaP

Open andreabedini opened this issue 3 years ago • 3 comments

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

This is currently blocked by https://github.com/input-output-hk/io-sim/pull/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.

andreabedini avatar Oct 14 '22 06:10 andreabedini

This is currently blocked by https://github.com/input-output-hk/io-sim/pull/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 avatar Oct 14 '22 09:10 michaelpj

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

michaelpj avatar Oct 14 '22 10:10 michaelpj

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.

andreabedini avatar Oct 14 '22 14:10 andreabedini

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.

andreabedini avatar Oct 21 '22 08:10 andreabedini

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

michaelpj avatar Oct 26 '22 09:10 michaelpj

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 avatar Oct 26 '22 09:10 andreabedini

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

andreabedini avatar Oct 26 '22 09:10 andreabedini

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 :sweat_smile: So I think let's move on for now.

michaelpj avatar Oct 26 '22 10:10 michaelpj

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

andreabedini avatar Oct 26 '22 10:10 andreabedini

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

michaelpj avatar Oct 26 '22 14:10 michaelpj

Worked locally, pushing it.

michaelpj avatar Oct 26 '22 15:10 michaelpj

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

nfrisby avatar Oct 26 '22 15:10 nfrisby

@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.

michaelpj avatar Oct 26 '22 15:10 michaelpj

@coot is this good to go?

michaelpj avatar Oct 31 '22 10:10 michaelpj

@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.

coot avatar Nov 02 '22 08:11 coot

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.

andreabedini avatar Nov 02 '22 09:11 andreabedini

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.

michaelpj avatar Nov 02 '22 09:11 michaelpj

bors r+

michaelpj avatar Nov 02 '22 10:11 michaelpj

bors r+

michaelpj avatar Nov 02 '22 11:11 michaelpj

Already running a review

iohk-bors[bot] avatar Nov 02 '22 11:11 iohk-bors[bot]

I don't understand what bors is saying. The status say "merge conflict", but there isn't one, and I can't rerun it?

michaelpj avatar Nov 02 '22 11:11 michaelpj

bors r-

michaelpj avatar Nov 02 '22 13:11 michaelpj

Canceled.

iohk-bors[bot] avatar Nov 02 '22 13:11 iohk-bors[bot]

bors r+

michaelpj avatar Nov 02 '22 13:11 michaelpj

bors r-

michaelpj avatar Nov 02 '22 13:11 michaelpj

bors r+

michaelpj avatar Nov 02 '22 13:11 michaelpj

Build failed:

iohk-bors[bot] avatar Nov 02 '22 13:11 iohk-bors[bot]

I rebased on master and now the windows CI is failing because it can't find the system libsecp256k1 in order to build secp256k1-haskell. I don't think anything in this PR should affect that, so I'm quite confused. Any ideas?

michaelpj avatar Nov 02 '22 16:11 michaelpj

Thanks for the comments Nick!

michaelpj avatar Nov 03 '22 11:11 michaelpj

I think I've addressed all the comments. Just trying to work out why the windows CI doesn't like me :thinking:

michaelpj avatar Nov 03 '22 15:11 michaelpj