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

Use hi-file-parser-0.1.6.0 and remove GHC 9.8 warning #6328

Merged
merged 1 commit into from
Nov 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 7 additions & 13 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Behavior changes:

Other enhancements:

* Consider GHC 9.8 to be a tested compiler and remove warnings.
* Add flag `--no-init` to Stack's `new` command to skip the initialisation of
the newly-created project for use with Stack.
* The HTML file paths produced at the end of `stack haddock` are printed on
Expand Down Expand Up @@ -87,6 +88,8 @@ Behavior changes:

Other enhancements:

* Consider GHC 9.6 to be a tested compiler and remove warnings.
* Consider Cabal 3.10 to be a tested library and remove warnings.
* Bump to Hpack 0.36.0.
* Depend on `pantry-0.9.2`, for support for long filenames and directory names
in archives created by `git archive`.
Expand Down Expand Up @@ -287,6 +290,8 @@ Behavior changes:

Other enhancements:

* Consider GHC 9.2 and 9.4 to be tested compilers and remove warnings.
* Consider Cabal 3.6 and 3.8 to be a tested libraries and remove warnings.
* Bump to Hpack 0.35.0.
* On Windows, the installer now sets `DisplayVersion` in the registry, enabling
tools like `winget` to properly read the version number.
Expand Down Expand Up @@ -345,7 +350,6 @@ Behavior changes:
Other enhancements:

* `stack setup` supports installing GHC for macOS aarch64 (M1)

* `stack upload` supports authentication with a Hackage API key (via
`HACKAGE_KEY` environment variable).

Expand Down Expand Up @@ -405,33 +409,27 @@ Behavior changes:
packages. It also sets now proper working directory when invoked with
one package. See
[#5421](https://github.com/commercialhaskell/stack/issues/5421)

* `custom-setup` dependencies are now properly initialized for `stack dist`.
This makes `explicit-setup-deps` no longer required and that option was
removed. See
[#4006](https://github.com/commercialhaskell/stack/issues/4006)

Other enhancements:

* Consider GHC 9.0 to be a tested compiler and remove warnings.
* Consider Cabal 3.6 to be a tested library and remove warnings.
* Nix integration now passes `ghcVersion` (in addition to existing `ghc`) to
`shell-file` as an identifier that can be looked up in a compiler attribute
set.

* Nix integration now allows Nix integration if the user is ready in nix-shell.
This gets rid of "In Nix shell but reExecL is False" error.

* `stack list` is a new command to list package versions in a snapshot.
See [#5431](https://github.com/commercialhaskell/stack/pull/5431)

* Consider GHC 9.0 a tested compiler and remove warnings.

* `custom-preprocessor-extensions` is a new configuration option for allowing
Stack to be aware of any custom preprocessors you have added to `Setup.hs`.
See [#3491](https://github.com/commercialhaskell/stack/issues/3491)

* Added `--candidate` flag to `upload` command to upload a package candidate
rather than publishing the package.

* Error output using `--no-interleaved-output` no longer prepends indenting
whitespace. This allows emacs compilation-mode and vim quickfix to locate
and track errors. See
Expand All @@ -442,14 +440,11 @@ Bug fixes:
* `stack new` now supports branches other than `master` as default for GitHub
repositories. See
[#5422](https://github.com/commercialhaskell/stack/issues/5422)

* Ignore all errors from `hi-file-parser`. See
[#5445](https://github.com/commercialhaskell/stack/issues/5445) and
[#5486](https://github.com/commercialhaskell/stack/issues/5486).

* Support basic auth in package-indices. See
[#5509](https://github.com/commercialhaskell/stack/issues/5509).

* Add support for parsing `.hi`. files from GHC 8.10 and 9.0. See
[hi-file-parser#2](https://github.com/commercialhaskell/hi-file-parser/pull/2).

Expand All @@ -471,7 +466,6 @@ Major changes:
override the default location of snapshot configuration files. This option
affects how snapshot synonyms (LTS/Nightly) are expanded to URLs by the
`pantry` library.

* `docker-network` configuration key added to override docker `--net` arg

Behavior changes:
Expand Down
22 changes: 11 additions & 11 deletions cabal.config
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ constraints:
, base ==4.17.2.0
, base-compat ==0.12.3
, base-compat-batteries ==0.12.3
, base-orphans ==0.9.0
, base-orphans ==0.9.1
, base16-bytestring ==1.0.2.0
, base64-bytestring ==1.2.1.0
, basement ==0.0.16
Expand All @@ -34,7 +34,7 @@ constraints:
, bitvec ==1.1.5.0
, blaze-builder ==0.4.2.3
, blaze-html ==0.9.1.2
, blaze-markup ==0.8.2.8
, blaze-markup ==0.8.3.0
, byteorder ==1.0.4
, bytestring ==0.11.5.2
, casa-client ==0.0.2
Expand Down Expand Up @@ -87,7 +87,7 @@ constraints:
, githash ==0.1.7.0
, hackage-security ==0.6.2.3
, hashable ==1.4.3.0
, hi-file-parser ==0.1.4.0
, hi-file-parser ==0.1.6.0
, hinotify ==0.4.1
, hourglass ==0.2.12
, hpack ==0.36.0
Expand All @@ -98,7 +98,7 @@ constraints:
, http-conduit ==2.3.8.1
, http-download ==0.2.1.0
, http-types ==0.12.3
, indexed-traversable ==0.1.2.1
, indexed-traversable ==0.1.3
, indexed-traversable-instances ==0.1.1.2
, infer-license ==0.2.0
, integer-gmp ==1.1
Expand All @@ -122,7 +122,7 @@ constraints:
, mtl ==2.2.2
, mtl-compat ==0.2.2
, mustache ==2.4.2
, neat-interpolation ==0.5.1.3
, neat-interpolation ==0.5.1.4
, network ==3.1.4.0
, network-uri ==2.6.4.2
, old-locale ==1.0.0.7
Expand All @@ -137,8 +137,8 @@ constraints:
, path-io ==1.8.1
, path-pieces ==0.2.1
, pem ==0.2.4
, persistent ==2.14.5.2
, persistent-sqlite ==2.13.1.1
, persistent ==2.14.6.0
, persistent-sqlite ==2.13.2.0
, persistent-template ==2.12.0.0
, pretty ==1.1.3.6
, prettyprinter ==1.7.1
Expand All @@ -162,7 +162,7 @@ constraints:
, silently ==1.2.5.3
, socks ==0.6.1
, split ==0.2.3.5
, splitmix ==0.1.0.4
, splitmix ==0.1.0.5
, stack ==2.14.0
, static-bytes ==0.1.0
, stm ==2.5.1.0
Expand All @@ -188,16 +188,16 @@ constraints:
, transformers ==0.5.6.2
, transformers-base ==0.4.6
, transformers-compat ==0.7.2
, typed-process ==0.2.11.0
, typed-process ==0.2.11.1
, unix ==2.7.3
, unix-compat ==0.7
, unix-time ==0.4.11
, unliftio ==0.2.25.0
, unliftio-core ==0.2.1.0
, unordered-containers ==0.2.19.1
, uuid-types ==1.0.5
, uuid-types ==1.0.5.1
, vault ==0.3.1.5
, vector ==0.13.0.0
, vector ==0.13.1.0
, vector-algorithms ==0.9.0.1
, vector-stream ==0.1.0.0
, witherable ==0.4.2
Expand Down
2 changes: 1 addition & 1 deletion package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ dependencies:
- fsnotify >= 0.4.1
- generic-deriving
- ghc-boot
- hi-file-parser >= 0.1.5.0
- hi-file-parser >= 0.1.6.0
- hpack >= 0.36.0
- hpc
- http-client
Expand Down
4 changes: 2 additions & 2 deletions src/Stack/Setup.hs
Original file line number Diff line number Diff line change
Expand Up @@ -1009,9 +1009,9 @@ warnUnsupportedCompiler ghcVersion = do
, style Url "https://github.com/commercialhaskell/stack/issues/648" <> "."
]
pure True
| ghcVersion >= mkVersion [9, 7] && notifyIfGhcUntested -> do
| ghcVersion >= mkVersion [9, 9] && notifyIfGhcUntested -> do
prettyWarnL
[ flow "Stack has not been tested with GHC versions 9.8 and above, \
[ flow "Stack has not been tested with GHC versions 9.10 and above, \
\and using"
, fromString (versionString ghcVersion) <> ","
, flow "this may fail."
Expand Down
4 changes: 3 additions & 1 deletion stack-ghc-9.6.3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
# built with GHC 9.6.3.

# GHC 9.6.3
resolver: nightly-2023-10-21
resolver: nightly-2023-11-04

extra-deps:
# Cabal is pruned because process is a GHC boot package, and has to be specified
# again.
- Cabal-3.10.1.0@sha256:6d11adf7847d9734e7b02785ff831b5a0d11536bfbcefd6634b2b08411c63c94,12316
# nightly-2023-11-04 specifies hi-file-parser-0.1.5.0
- hi-file-parser-0.1.6.0@sha256:3e9d4e346f32b24db5093c549458d9fd529cee7a94a28f3c7a4d40b232fcda6c,2850
# GHC 9.6.3 comes with process-1.6.17.0, which can segfault on macOS.
- process-1.6.18.0@sha256:cd0a3e0376b5a8525983d3131a31e52f9ffefc278ce635eec45a9d3987b8be3e,3025

Expand Down
15 changes: 11 additions & 4 deletions stack-ghc-9.6.3.yaml.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@ packages:
size: 9223
original:
hackage: Cabal-3.10.1.0@sha256:6d11adf7847d9734e7b02785ff831b5a0d11536bfbcefd6634b2b08411c63c94,12316
- completed:
hackage: hi-file-parser-0.1.6.0@sha256:3e9d4e346f32b24db5093c549458d9fd529cee7a94a28f3c7a4d40b232fcda6c,2850
pantry-tree:
sha256: 7f7f370a95e095f5a0e992e5eae01d9ec6fa9ddc513b70aff0677efad9897f8a
size: 2393
original:
hackage: hi-file-parser-0.1.6.0@sha256:3e9d4e346f32b24db5093c549458d9fd529cee7a94a28f3c7a4d40b232fcda6c,2850
- completed:
hackage: process-1.6.18.0@sha256:cd0a3e0376b5a8525983d3131a31e52f9ffefc278ce635eec45a9d3987b8be3e,3025
pantry-tree:
Expand All @@ -20,7 +27,7 @@ packages:
hackage: process-1.6.18.0@sha256:cd0a3e0376b5a8525983d3131a31e52f9ffefc278ce635eec45a9d3987b8be3e,3025
snapshots:
- completed:
sha256: 215cd7b317bc056574f30bdaaf10326af4c95c9f8e412462a126e55bbb6d66c6
size: 695331
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2023/10/21.yaml
original: nightly-2023-10-21
sha256: bc10860c965faa1545615eab1bba5bd5a6f6d7d7b896a5f97e6ae8ff47ae192c
size: 698319
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2023/11/4.yaml
original: nightly-2023-11-04
8 changes: 4 additions & 4 deletions stack.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ library
, fsnotify >=0.4.1
, generic-deriving
, ghc-boot
, hi-file-parser >=0.1.5.0
, hi-file-parser >=0.1.6.0
, hpack >=0.36.0
, hpc
, http-client
Expand Down Expand Up @@ -483,7 +483,7 @@ executable stack
, fsnotify >=0.4.1
, generic-deriving
, ghc-boot
, hi-file-parser >=0.1.5.0
, hi-file-parser >=0.1.6.0
, hpack >=0.36.0
, hpc
, http-client
Expand Down Expand Up @@ -584,7 +584,7 @@ executable stack-integration-test
, fsnotify >=0.4.1
, generic-deriving
, ghc-boot
, hi-file-parser >=0.1.5.0
, hi-file-parser >=0.1.6.0
, hpack >=0.36.0
, hpc
, hspec
Expand Down Expand Up @@ -701,7 +701,7 @@ test-suite stack-unit-test
, fsnotify >=0.4.1
, generic-deriving
, ghc-boot
, hi-file-parser >=0.1.5.0
, hi-file-parser >=0.1.6.0
, hpack >=0.36.0
, hpc
, hspec
Expand Down
2 changes: 2 additions & 0 deletions stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ extra-deps:
- crypton-x509-store-1.6.9@sha256:422b9b9f87a7382c66385d047615b16fc86a68c08ea22b1e0117c143a2d44050,1750
- crypton-x509-system-1.6.7@sha256:023ed573d82983bc473a37a89e0434a085b413be9f68d07e085361056afd4637,1532
- crypton-x509-validation-1.6.12@sha256:85989721b64be4b90de9f66ef641c26f57575cffed1a50d707065fb60176f386,2227
# lts-21.16 specifies hi-file-parser-0.1.5.0
- hi-file-parser-0.1.6.0@sha256:3e9d4e346f32b24db5093c549458d9fd529cee7a94a28f3c7a4d40b232fcda6c,2850
# lts-21.16 specifies hpack-0.35.2
- hpack-0.36.0@sha256:c2daa6556afc57367a5d1dbd878bf515d442d201e24b27473051359abd47ed08,5187
- http-client-tls-0.3.6.3@sha256:a5909ce412ee65c141b8547f8fe22236f175186c95c708e86a46b5547394f910,2046
Expand Down
7 changes: 7 additions & 0 deletions stack.yaml.lock
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,13 @@ packages:
size: 639
original:
hackage: crypton-x509-validation-1.6.12@sha256:85989721b64be4b90de9f66ef641c26f57575cffed1a50d707065fb60176f386,2227
- completed:
hackage: hi-file-parser-0.1.6.0@sha256:3e9d4e346f32b24db5093c549458d9fd529cee7a94a28f3c7a4d40b232fcda6c,2850
pantry-tree:
sha256: 7f7f370a95e095f5a0e992e5eae01d9ec6fa9ddc513b70aff0677efad9897f8a
size: 2393
original:
hackage: hi-file-parser-0.1.6.0@sha256:3e9d4e346f32b24db5093c549458d9fd529cee7a94a28f3c7a4d40b232fcda6c,2850
- completed:
hackage: hpack-0.36.0@sha256:c2daa6556afc57367a5d1dbd878bf515d442d201e24b27473051359abd47ed08,5187
pantry-tree:
Expand Down