Bump base for ghc-8.4 by philderbeast · Pull Request #306 · haskell/hackage-security

philderbeast · 2024-01-20T20:09:10Z

Fixes #303. I bumped base to >=4.11, matched ghc-8.4.4 included packages' lower bounds, and fixed warnings including cabal check warnings except for the example.

This is the change to cabal.project (or the contents of cabal.project.local if you prefer) I used for testing:

git diff
diff --git a/cabal.project b/cabal.project
index 73f0f8e..8d0c7e6 100644
--- a/cabal.project
+++ b/cabal.project
@@ -15,3 +15,12 @@ package hackage-security
 -- packages: precompute-fileinfo
 
 -- constraints: hackage-security -lukko
+
+program-options
+  ghc-options: -Werror=incomplete-uni-patterns
+if impl(ghc >= 8.6)
+  program-options
+    ghc-options: -Werror=star-is-type
+if impl(ghc >= 8.10)
+  program-options
+    ghc-options: -Werror=unused-record-wildcards
\ No newline at end of file

Even though I much prefer -XStandaloneKindSignatures, we can't use that until ghc >= 8.10.

I cleaned up some unused {-# LANGUAGE CPP #-} pragmas but note that some of the packages set this extension in default-extensions or other-extensions:

$ grep -rwn --exclude-dir=".git" --include="*.cabal" . -e 'CPP'
./example-client/example-client.cabal:57:  other-extensions:    CPP
./hackage-security/hackage-security.cabal:174:                       CPP
./hackage-root-tool/hackage-root-tool.cabal:46:  other-extensions:    CPP, ScopedTypeVariables, RecordWildCards
./hackage-security-HTTP/hackage-security-HTTP.cabal:60:  other-extensions:    CPP

I've not tested this with cabal yet.

philderbeast · 2024-01-20T20:13:52Z

Warning

I got a ghc panic with ghc-8.4.3 building Cabal-syntax

$ cabal build all --enable-tests --enable-benchmark
...
Failed to build Cabal-syntax-3.10.2.0.
...
[ 29 of 137] Compiling Distribution.CabalSpecVersion ( src/Distribution/CabalSpecVersion.hs, dist/build/Distribution/CabalSpecVersion.o )
ghc: panic! (the 'impossible' happened)
  (GHC version 8.4.3 for x86_64-unknown-linux):
	Prelude.!!: index too large

Please report this as a GHC bug:  http://www.haskell.org/ghc/reportabug

Error: cabal: Failed to build Cabal-syntax-3.10.2.0 (which is required by
test:TestSuite from hackage-security-0.6.2.4, exe:example-client from
example-client-0.1.0.0 and others). See the build log above for details.

Bodigrim · 2024-01-20T20:18:08Z

Yeah, that's the same issue as https://gitlab.haskell.org/ghc/ghc/-/issues/21905 and probably similar to https://gitlab.haskell.org/ghc/ghc/-/issues/15436, fixed in GHC 8.4.4, which never happened.

philderbeast · 2024-01-20T20:55:03Z

Thanks @Bodigrim. No worries then as we're targeting ghc >= 8.4.4. I didn't go with base >=4.11.1 because that doesn't distinguish between GHC versions {8.4.2, 8.4.3, 8.4.4} and, from the 8.4.2 release notes, base doesn't look much different to base-4.11.0.0.

philderbeast · 2024-01-20T21:26:05Z

@andreasabel, I used your fork of haskell-ci.

philderbeast · 2024-01-20T21:27:08Z

I saw the TODO and added precompute-fileinfo to the project. I hope that is alright.

Mikolaj · 2024-01-22T19:32:17Z

I saw the TODO and added precompute-fileinfo to the project. I hope that is alright.

As far as I can see that's fine. What an impressive cleanup, BTW. Thanks a lot!

andreasabel · 2024-01-22T19:48:05Z

Atm cabal check seems to fail causing Haskell CI to fail...

andreasabel · 2024-01-22T19:49:50Z

@philderbeast wrote:

I cleaned up some unused {-# LANGUAGE CPP #-} pragmas but note that some of the packages set this extension in default-extensions or other-extensions:

If none of the files of a package uses {-# LANGUAGE CPP #-}, it can be removed from other-extensions...

philderbeast · 2024-01-22T20:17:35Z

Atm cabal check seems to fail causing Haskell CI to fail...

I wonder why this wasn't failing before this pull request as cabal check fails on the master branch when cabal >= 3.10?

$ pwd
~/.../hackage-security/hackage-security

$ cabal --version
cabal-install version 3.8.1.0
compiled using version 3.8.1.0 of the Cabal library 

$ cabal check
No errors or warnings could be found in the package.

$ cabal --version
cabal-install version 3.10.1.0
compiled using version 3.10.1.0 of the Cabal library 

$ cabal check
Warning: These warnings may cause trouble when distributing the package:
Warning: These packages miss upper bounds:
- ghc-prim
- text
Please add them, using `cabal gen-bounds` for suggestions. For more
information see: https://pvp.haskell.org/

$ cabal --version
cabal-install version 3.10.2.0
compiled using version 3.10.2.1 of the Cabal library 

$ cabal check
Warning: These warnings may cause trouble when distributing the package:
Warning: These packages miss upper bounds:
- ghc-prim
Please add them, using `cabal gen-bounds` for suggestions. For more
information see: https://pvp.haskell.org/

$ cabal --version
cabal-install version 3.10.2.1
compiled using version 3.10.2.1 of the Cabal library 

$ cabal check
Warning: These warnings may cause trouble when distributing the package:
Warning: These packages miss upper bounds:
- ghc-prim
Please add them, using `cabal gen-bounds` for suggestions. For more
information see: https://pvp.haskell.org/

philderbeast · 2024-01-23T00:26:12Z

If none of the files of a package uses {-# LANGUAGE CPP #-}, it can be removed from other-extensions...

I've never previously bothered with other-extensions with my own packages. Maintaining this list would be quite manual, wouldn't it or is there tooling to help with that?

Mikolaj · 2024-01-23T00:27:43Z

I haven't heard of any tooling.

philderbeast · 2024-01-23T00:27:57Z

I've bumped the lower bounds to match the either the ghc-8.4.4 release notes or cabal gen-bounds.

philderbeast · 2024-01-23T00:29:31Z

I've also removed a couple of if impl(ghc >= 8.2) conditionals in .cabal files.

hackage-security/src/Hackage/Security/TUF/Patterns.hs

precompute-fileinfo/src/Main.hs

andreasabel · 2024-01-23T12:59:18Z

Excellent work!

However, I think this refactoring should preserve the "impossibles" of the original code, i.e., crash when the original code crashed.

precompute-fileinfo/src/Main.hs

andreasabel

Thanks!

Mikolaj · 2024-01-24T10:03:30Z

@philderbeast: ready for merge?

philderbeast · 2024-01-24T11:10:57Z

@Mikolaj, I'll first setup the cabal CI to do a run through with source-repository-package back to this change, as you suggested in #303 (comment). While I could do this locally, I feel the CI version is a more complete check.

- Match ghc-8.4.4 included package lower bounds - Add cabal gen-bounds bounds

Preserve the original behaviour

evaluate . rnf should blow up it words aren't as expected

andreasabel

Great maintenance work!

philderbeast · 2024-03-18T13:04:45Z

@philderbeast: ready for merge?

Yes please @Mikolaj.

andreasabel · 2024-03-19T04:35:07Z

@Mikolaj The banner "pr: squash" is up but the individual commits were merged. Was this intentional? If yes, please change the banner to "pr: preserve commits".

Mikolaj · 2024-03-19T10:22:55Z

My fault, I haven't seen the banner. Will do better next time. :)

Mikolaj · 2024-03-19T10:23:46Z

Actually, since this wasn't intentional, let me preserve the documentation of the mistake.

andreasabel · 2024-03-19T13:08:51Z

No problem.

I guess we wait for Cabal-3.12 before we release, what do you think?

philderbeast force-pushed the bump/ghc-8.4 branch from a0bbf78 to 2e0bb86 Compare January 23, 2024 00:19

andreasabel reviewed Jan 23, 2024

View reviewed changes

hackage-security/src/Hackage/Security/TUF/Patterns.hs Show resolved Hide resolved

andreasabel requested changes Jan 23, 2024

View reviewed changes

precompute-fileinfo/src/Main.hs Outdated Show resolved Hide resolved

philderbeast requested a review from andreasabel January 23, 2024 14:45

andreasabel reviewed Jan 23, 2024

View reviewed changes

precompute-fileinfo/src/Main.hs Outdated Show resolved Hide resolved

philderbeast requested a review from andreasabel January 23, 2024 16:17

andreasabel approved these changes Jan 24, 2024

View reviewed changes

andreasabel added the pr: squash PR should be squashed upon merge label Jan 24, 2024

philderbeast mentioned this pull request Jan 24, 2024

Validate hackage-security/pull/306 haskell/cabal#9656

Closed

philderbeast added 5 commits March 17, 2024 11:33

Bump base lower bound to >=4.11

928d05e

Satisfy -Wunused-imports

aa561d2

Follow hlint suggestion: use fewer imports

bec837b

Remove unused -XCPP

e8bb54a

Satisfy -Wunused-record-wildcards

51d8113

philderbeast added 12 commits March 17, 2024 11:33

Satisfy -Wstar-is-type

07a05c7

Satisfy -Wincomplete-uni-patterns with _ex2

f8a7d43

Satisfy -Wincomplete-uni-patterns with splitExtension

3486f36

Satisfy -Wincomplete-uni-patterns with toTarPath

f3f5c0a

Add precompute-fileinfo to project

09e11ab

Satisfy -Wincomplete-uni-patterns in precompute-fileinfo

c18e76e

Bump tested-with in packages

1ef5ff2

Bounds covering ghc-8.4.4 and ghc-9.8.1

4dcc2b6

- Match ghc-8.4.4 included package lower bounds - Add cabal gen-bounds bounds

Use undefined instead of const Nothing

45d6bbe

Preserve the original behaviour

Preserve previous behaviour

13dbda2

evaluate . rnf should blow up it words aren't as expected

Go for minimal diff

593e4e9

Regenerate haskell-ci

036165c

philderbeast force-pushed the bump/ghc-8.4 branch from c0ad47c to 036165c Compare March 17, 2024 16:02

andreasabel approved these changes Mar 18, 2024

View reviewed changes

Mikolaj merged commit 1066cab into haskell:master Mar 18, 2024

andreasabel assigned Mikolaj Mar 19, 2024

Mikolaj added pr: preserve commits Merge the individual commits of this PR (rather than squashing) and removed pr: squash PR should be squashed upon merge labels Mar 19, 2024

Mikolaj added pr: squash PR should be squashed upon merge and removed pr: preserve commits Merge the individual commits of this PR (rather than squashing) labels Mar 19, 2024

andreasabel added this to the 0.6.2.5 milestone Mar 19, 2024

philderbeast mentioned this pull request Apr 6, 2024

-Werror being used always, not only on validate haskell/cabal#9866

Closed

Conversation

philderbeast commented Jan 20, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

philderbeast commented Jan 20, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Bodigrim commented Jan 20, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

philderbeast commented Jan 20, 2024

Uh oh!

philderbeast commented Jan 20, 2024

Uh oh!

philderbeast commented Jan 20, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Mikolaj commented Jan 22, 2024

Uh oh!

andreasabel commented Jan 22, 2024

Uh oh!

andreasabel commented Jan 22, 2024

Uh oh!

philderbeast commented Jan 22, 2024

Uh oh!

philderbeast commented Jan 23, 2024

Uh oh!

Mikolaj commented Jan 23, 2024

Uh oh!

philderbeast commented Jan 23, 2024

Uh oh!

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

Uh oh!

Uh oh!

Uh oh!

Uh oh!

andreasabel commented Jan 23, 2024

Uh oh!

Uh oh!

andreasabel left a comment

Choose a reason for hiding this comment

Uh oh!

Mikolaj commented Jan 24, 2024

Uh oh!

philderbeast commented Jan 24, 2024

Uh oh!

andreasabel left a comment

Choose a reason for hiding this comment

Uh oh!

philderbeast commented Mar 18, 2024

Uh oh!

andreasabel commented Mar 19, 2024

Uh oh!

Mikolaj commented Mar 19, 2024

Uh oh!

Mikolaj commented Mar 19, 2024

Uh oh!

andreasabel commented Mar 19, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

philderbeast commented Jan 20, 2024 •

edited

Loading

philderbeast commented Jan 20, 2024 •

edited

Loading

Bodigrim commented Jan 20, 2024 •

edited

Loading

philderbeast commented Jan 20, 2024 •

edited

Loading

philderbeast commented Jan 23, 2024 •

edited

Loading