rm-old-base: remove ifdefs for pre-4.13 bases #10092

NadiaYvette · 2024-06-09T15:46:02Z

Template B: This PR does not modify behaviour or interface

4.13 and older have fallen out of the support window. Hence this commit removes code only conditionally included for base 4.13 and older. Some occasional transitive removals were implied and done in this same commit.

Patches conform to the coding conventions.
Is this a PR that fixes CI? If so, it will need to be backported to older cabal release branches (ask maintainers for directions).

geekosaur · 2024-06-09T16:41:19Z

You're supposed to pick a template based on whether your PR changes the user-visible or programming API. This one should not, so you would use template B.

andreabedini

LGTM. Thank you so much! <3

Cabal-syntax/src/Distribution/Compat/Prelude.hs

Cabal-syntax/src/Distribution/Fields/ParseResult.hs

Cabal/src/Distribution/Simple/Build/PathsModule/Z.hs

Cabal-syntax/Cabal-syntax.cabal

Cabal-tests/Cabal-tests.cabal

Cabal/Cabal.cabal

cabal-testsuite/PackageTests/Regression/T6906/cabal.test.hs

andreabedini · 2024-06-20T15:30:35Z

@fgaz Can you have another look when you have time?

andreabedini · 2024-06-27T02:06:22Z

@fgaz @ulysses4ever @Mikolaj @Kleidukos could you give a review?

NadiaYvette · 2024-06-27T02:16:54Z

@fgaz @ulysses4ever @Mikolaj @Kleidukos could you give a review?

Thank you so much Andrea! That's a lot of LOC you put into the fixups!

geekosaur

It might be worth looking for more instances of FOURMOLU_DISABLE and see if CPP has been removed; in general, CPP causes fourmolu to choke.

Cabal/src/Distribution/Compat/Async.hs

cabal-install/src/Distribution/Deprecated/ParseUtils.hs

Kleidukos · 2024-06-27T07:10:56Z

Yes! Less CPP makes happier tooling

Mikolaj · 2024-06-27T07:50:25Z

I see "base >= 4.11" in Cabal/Cabal.cabal. Can we update it, too? Probably in a separate PR, because it would modify the interface. It would also need a little changelog file stating what it does.

andreabedini · 2024-06-27T09:01:19Z

Maybe something went wrong with the rebase I had changed the bounds the cabal files in my commit acffcd4.

Edit: I pushed my last commit (9ce4213) to https://github.com/andreabedini/cabal/tree/rm-old-base-001

fgaz

Some of my previous comments are still unresolved, I marked them as such.

templates/Paths_pkg.template.hs

Mikolaj · 2024-06-27T17:36:41Z

Maybe something went wrong with the rebase I had changed the bounds the cabal files in my commit acffcd4.

Edit: I pushed my last commit (9ce4213) to https://github.com/andreabedini/cabal/tree/rm-old-base-001

Right here it's as it should be. That's rather disturbing. Was this mergify's rebase or your manual one? Can you recover from this corruption?

This needs to be included so running with older bases and ghcs can be done even while building cabal itself demands recent ghcs.

ulysses4ever · 2024-07-23T18:06:47Z

@fgaz you requested changes in this PR, and the issue, they claim, was fixed (I didn't check). Could you see if you could reevaluate it and maybe approve?

geekosaur · 2024-07-23T19:28:50Z

FWIW everything except the import is marked Outdated, suggesting they've already been fixed. I'm validating locally with the import removed. (ETA: build fails without the import.)

geekosaur · 2024-07-23T20:00:51Z

I stand corrected; I misunderstood what was being requested, and removed the wrong thing. Testing again now. (ETA: builds with 9.6.6; trying with 8.8.4 locally now.)

fgaz · 2024-07-23T20:29:49Z

@fgaz you requested changes in this PR, and the issue, they claim, was fixed (I didn't check). Could you see if you could reevaluate it and maybe approve?

All opened conversations (3 at this time) are still unresolved

geekosaur · 2024-07-23T20:51:15Z

[27 of 51] Compiling Distribution.Solver.Types.ConstraintSource ( src/Distribution/Solver/Types/ConstraintSource.hs, /home/allbery/Sources/cabal/dist-newstyle/build/x86_64-linux/ghc-8.8.4/cabal-install-solver-3.13.0.0/build/Distribution/Solver/Types/ConstraintSource.o )

src/Distribution/Solver/Types/ConstraintSource.hs:48:3: error:
    parse error on input ‘-- | The source of the constraint is not specified.’
   |
48 |   -- | The source of the constraint is not specified.
   |   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

It's not needed with our currently supported ghcs.

geekosaur · 2024-07-24T02:52:08Z

@fgaz, I think we've dealt with the remaining issues, could you confirm?

andreabedini · 2024-07-24T09:24:49Z

@geekosaur @fgaz @ulysses4ever Thank you for the help. I am afraid some changes kept getting lost in the rebases :-/

fgaz

Looks good!

* rm-old-base: remove ifdefs for pre-4.13 bases 4.13 and older have fallen out of the support window. Hence this commit removes code only conditionally included for base 4.13 and older. Some occasional transitive removals were implied and done in this same commit. * Remove 8.6.5 from CI and Makefile * Remove test for GHC <8.6.5 * Update GHC versions mentioned in the user guide * rm-old-base: use Distribution.Compat.Prelude The change was likely an artifact of a rebase. * rm-old-base: restore builds not of cabal itself The #ifdefs being generated need to be kept here so that projects other than cabal can be built using older ghc versions and current cabal versions. * rm-old-base: restore older catchIO This needs to be included so running with older bases and ghcs can be done even while building cabal itself demands recent ghcs. * Bump base lower bounds to >=4.13 * Update a few package version in the documentation * rm-old-base: remove Distribution.Compat.Typeable It's not needed with our currently supported ghcs. * rm-old-base: restore T6906 --------- Co-authored-by: Andrea Bedini <[email protected]> Co-authored-by: brandon s allbery kf8nh <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

NadiaYvette force-pushed the nadia.chambers/rm-old-base-001 branch 3 times, most recently from a09118a to 442c7bd Compare June 10, 2024 11:31

NadiaYvette marked this pull request as ready for review June 10, 2024 13:53

NadiaYvette force-pushed the nadia.chambers/rm-old-base-001 branch from 442c7bd to f175323 Compare June 11, 2024 02:48

andreabedini approved these changes Jun 11, 2024

View reviewed changes

andreabedini added the squash+merge me Tell Mergify Bot to squash-merge label Jun 11, 2024

fgaz requested changes Jun 14, 2024

View reviewed changes

andreabedini force-pushed the nadia.chambers/rm-old-base-001 branch 4 times, most recently from e14ce68 to 9ce4213 Compare June 25, 2024 07:26

andreabedini added the attention: needs-review label Jun 27, 2024

NadiaYvette force-pushed the nadia.chambers/rm-old-base-001 branch from 9ce4213 to 5ce9664 Compare June 27, 2024 02:05

NadiaYvette force-pushed the nadia.chambers/rm-old-base-001 branch from 5ce9664 to b8e89de Compare June 27, 2024 02:12

geekosaur approved these changes Jun 27, 2024

View reviewed changes

Cabal/src/Distribution/Compat/Async.hs Outdated Show resolved Hide resolved

cabal-install/src/Distribution/Deprecated/ParseUtils.hs Show resolved Hide resolved

NadiaYvette force-pushed the nadia.chambers/rm-old-base-001 branch from b8e89de to 4ec4202 Compare June 27, 2024 03:08

fgaz requested changes Jun 27, 2024

View reviewed changes

templates/Paths_pkg.template.hs Show resolved Hide resolved

mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Jun 29, 2024

fgaz removed squash+merge me Tell Mergify Bot to squash-merge merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days labels Jul 5, 2024

NadiaYvette force-pushed the nadia.chambers/rm-old-base-001 branch from 1d2926a to 47c0067 Compare July 10, 2024 14:24

NadiaYvette and others added 3 commits July 23, 2024 23:07

rm-old-base: restore older catchIO

e4acaa1

This needs to be included so running with older bases and ghcs can be done even while building cabal itself demands recent ghcs.

Bump base lower bounds to >=4.13

94db5c2

Update a few package version in the documentation

356e6f7

andreabedini force-pushed the nadia.chambers/rm-old-base-001 branch from e4208ca to 356e6f7 Compare July 23, 2024 15:07

rm-old-base: remove Distribution.Compat.Typeable

5e34b38

It's not needed with our currently supported ghcs.

geekosaur mentioned this pull request Jul 23, 2024

reorder Haddock markup for dynprof constructor #10226

Merged

2 tasks

rm-old-base: restore T6906

a58ae2f

geekosaur requested a review from fgaz July 24, 2024 03:20

fgaz approved these changes Jul 24, 2024

View reviewed changes

fgaz added squash+merge me Tell Mergify Bot to squash-merge and removed attention: needs-review labels Jul 24, 2024

mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Jul 26, 2024

Merge branch 'master' into nadia.chambers/rm-old-base-001

d964ad0

mergify bot merged commit 356c2f4 into haskell:master Jul 26, 2024

This was referenced Jan 5, 2025

CPP guards for very old Cabal versions in the tests: what do we do? #8998

Open

Remove some of the MIN_VERSION_base conditionals? #9042

Closed

Follow HLint suggestion: use fewer imports #10719

Merged

Remove unused -XCPP #10723

Merged

This was referenced Jan 9, 2025

Backport #10719: Follow HLint suggestion: use fewer imports #10733

Merged

Backport #10723: Remove unused -XCPP #10752

Merged

ulysses4ever mentioned this pull request Jul 15, 2025

CI doesn't test GHC 8.6.5 in the "old GHCs" section but it should #11073

Closed

rm-old-base: remove ifdefs for pre-4.13 bases #10092

rm-old-base: remove ifdefs for pre-4.13 bases #10092

Uh oh!

Conversation

NadiaYvette commented Jun 9, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

geekosaur commented Jun 9, 2024

Uh oh!

andreabedini left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

andreabedini commented Jun 20, 2024

Uh oh!

andreabedini commented Jun 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

NadiaYvette commented Jun 27, 2024

Uh oh!

geekosaur left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Kleidukos commented Jun 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Mikolaj commented Jun 27, 2024

Uh oh!

andreabedini commented Jun 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

fgaz left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Mikolaj commented Jun 27, 2024

Uh oh!

ulysses4ever commented Jul 23, 2024

Uh oh!

geekosaur commented Jul 23, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

geekosaur commented Jul 23, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

fgaz commented Jul 23, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

geekosaur commented Jul 23, 2024

Uh oh!

geekosaur commented Jul 24, 2024

Uh oh!

andreabedini commented Jul 24, 2024

Uh oh!

fgaz left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

NadiaYvette commented Jun 9, 2024 •

edited

Loading

andreabedini commented Jun 27, 2024 •

edited

Loading

Kleidukos commented Jun 27, 2024 •

edited

Loading

andreabedini commented Jun 27, 2024 •

edited

Loading

geekosaur commented Jul 23, 2024 •

edited

Loading

geekosaur commented Jul 23, 2024 •

edited

Loading

fgaz commented Jul 23, 2024 •

edited

Loading