Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump stack to latest #1137

Merged
merged 4 commits into from Jan 22, 2021
Merged

bump stack to latest #1137

merged 4 commits into from Jan 22, 2021

Conversation

ezzieyguywuf
Copy link
Contributor

  • dev-haskell/stack-2.3.3: drop old, including pantry mask
  • dev-haskell/stack: bump to 2.5.1.1

Leaving this as [draft] until #1118 is merged, as it depends on some of those
changes.

@trofi, similar to some of the conversations we had in #1118, how would you go
about ordering/squashing these commits?

I want/need to drop the old version, since it has a dependency on a masked
pandoc. However, after dropping the old version, we're left with only the
9999 version in the repository until the next commit which adds 2.5.1.1.
Should I just squash these two commits together?

@solpeth
Copy link
Member

solpeth commented Jan 21, 2021

Chiming in, as indicated in IRC.

I did a hackport merge stack-2.5.1.1 on master, and the only missing dep/QA issue picked up by either repoman or pkgcheck was missing pantry-0.5.1.3. Which other deps are you saying are required from #1118?

Regardless, my advice is to order your commits as follows:

  1. Bump pantry to 0.5.1.4 [latest]
  2. Unmask pantry [no inconsistency here: a new stack-2.3.3 merge will only pull <dev-haskell/pantry-0.5 due to upper bound constraint]
  3. Bump stack to 2.5.1.1
  4. Remove stack-2.3.3

There should be no inter-commit inconsistency with this sequence.

Copy link
Member

@solpeth solpeth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left a comment on masks. Thank you!

>=dev-haskell/hspec-discover-2.7.2
>=dev-haskell/hspec-core-2.7.2
>=dev-haskell/hspec-2.7.2

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The above unmasks do not seem to relate to the stack bump. Could you please explain this one to me?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, these must have been why I thought I needed #1118...I'll need to recreate things, see why I thought this was needed.

@ezzieyguywuf
Copy link
Contributor Author

2\. no inconsistency here: a new stack-2.3.3 merge will only pull `<dev-haskell/pantry-0.5`

If this results in no inconsistency then...why was the pantry ever masked to begin with?

The ghc and cabal version bumps are due to the latest hackport

Signed-off-by: Wolfgang E. Sanyer <WolfgangESanyer@gmail.com>
Signed-off-by: Wolfgang E. Sanyer <WolfgangESanyer@gmail.com>
The patch disables two tests that attempt to access the network.

Signed-off-by: Wolfgang E. Sanyer <WolfgangESanyer@gmail.com>
Signed-off-by: Wolfgang E. Sanyer <WolfgangESanyer@gmail.com>
@ezzieyguywuf ezzieyguywuf marked this pull request as ready for review January 22, 2021 21:22
@ezzieyguywuf ezzieyguywuf changed the title [draft] bump stack to latest bump stack to latest Jan 22, 2021
@ezzieyguywuf ezzieyguywuf merged commit dbccfa5 into gentoo-haskell:master Jan 22, 2021
@ezzieyguywuf ezzieyguywuf deleted the stack branch January 22, 2021 21:26
@solpeth
Copy link
Member

solpeth commented Jan 23, 2021

@ezzieyguywuf iirc it was masked to avoid having to have --backtrack=n when running emerge, or to speed up the calculation and avoid Portage trying to figure out how to both upgrade to pantry-0.5 as well as keeping stack-2.3.3 happy. Regardless, there was no inconsistency as regards any issues like non-existent deps, or anything like that.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants