From 1ad058ab82f7934a94a4b7819392061bb7fe81ec Mon Sep 17 00:00:00 2001 From: Mike Pilgrem Date: Tue, 22 Oct 2024 01:39:14 +0100 Subject: [PATCH] Fix #6655 Specify hi-file-parser >= 0.1.7.0 --- package.yaml | 2 +- stack-ghc-9.10.1.yaml | 3 +++ stack-ghc-9.10.1.yaml.lock | 14 ++++++++++++ stack-ghc-9.8.3.yaml | 7 ++++-- stack-ghc-9.8.3.yaml.lock | 22 +++++++++++++++---- stack.cabal | 8 +++---- stack.yaml | 16 ++++++++------ stack.yaml.lock | 45 ++++++++++++++++++++++---------------- 8 files changed, 80 insertions(+), 37 deletions(-) diff --git a/package.yaml b/package.yaml index 8207058ecb..adc6848e37 100644 --- a/package.yaml +++ b/package.yaml @@ -84,7 +84,7 @@ dependencies: - generic-deriving - ghc-boot - hashable -- hi-file-parser >= 0.1.6.0 +- hi-file-parser >= 0.1.7.0 - hpack >= 0.36.0 - hpc - http-client diff --git a/stack-ghc-9.10.1.yaml b/stack-ghc-9.10.1.yaml index 293c35b98e..0a109356c5 100644 --- a/stack-ghc-9.10.1.yaml +++ b/stack-ghc-9.10.1.yaml @@ -14,8 +14,11 @@ extra-deps: - directory-1.3.8.3@rev:3 - filepath-1.5.2.0 - ghc-boot-9.10.1@rev:1 +# nightly-2024-10-21 provides hi-file-parser-0.1.6.0 +- hi-file-parser-0.1.7.0@sha256:6cb54bc4bcc07c3b4c7b5dca73bc81e6b052636dc212eb6791608e70aab1ddfe,3012 - hpc-0.7.0.1@rev:1 - http-api-data-0.6.1 +- pantry-0.10.0@sha256:d13f99099753b0acf0695a00dc4d82f2671d3c604161d169ac0fc8fcf3004dec,7912 - process-1.6.19.0@rev:1 # nightly-2024-10-21 provides static-bytes-0.1.0 - static-bytes-0.1.1@sha256:e090886a4752a816cfff7ccb2c51c533cc8e39ec2d27e485427577fc92d9e9f9,1627 diff --git a/stack-ghc-9.10.1.yaml.lock b/stack-ghc-9.10.1.yaml.lock index 903d481346..6da6b74f26 100644 --- a/stack-ghc-9.10.1.yaml.lock +++ b/stack-ghc-9.10.1.yaml.lock @@ -46,6 +46,13 @@ packages: size: 942 original: hackage: ghc-boot-9.10.1@rev:1 +- completed: + hackage: hi-file-parser-0.1.7.0@sha256:6cb54bc4bcc07c3b4c7b5dca73bc81e6b052636dc212eb6791608e70aab1ddfe,3012 + pantry-tree: + sha256: 6aa8f0023bb0ea61d62c3b60ffa5720d497847bc55c7f0e50254acc30f9bfe68 + size: 2693 + original: + hackage: hi-file-parser-0.1.7.0@sha256:6cb54bc4bcc07c3b4c7b5dca73bc81e6b052636dc212eb6791608e70aab1ddfe,3012 - completed: hackage: hpc-0.7.0.1@sha256:637509832c52b3dcb8013e07cf2f73358df789737e4ba865cbb9baf4481734ca,1170 pantry-tree: @@ -60,6 +67,13 @@ packages: size: 819 original: hackage: http-api-data-0.6.1 +- completed: + hackage: pantry-0.10.0@sha256:d13f99099753b0acf0695a00dc4d82f2671d3c604161d169ac0fc8fcf3004dec,7912 + pantry-tree: + sha256: 9b2d3bc9156c7daed86c591ccf777ccf86973baf4072c953d5fbd30d64d06f55 + size: 2722 + original: + hackage: pantry-0.10.0@sha256:d13f99099753b0acf0695a00dc4d82f2671d3c604161d169ac0fc8fcf3004dec,7912 - completed: hackage: process-1.6.19.0@sha256:807bfa9b4038b59ae0c362bd94a783f898fbe0b42dbe1f2ede3c392bf2b8727d,3148 pantry-tree: diff --git a/stack-ghc-9.8.3.yaml b/stack-ghc-9.8.3.yaml index ddd06ff9ee..c5ec38173f 100644 --- a/stack-ghc-9.8.3.yaml +++ b/stack-ghc-9.8.3.yaml @@ -5,10 +5,13 @@ snapshot: nightly-2024-10-21 # GHC 9.8.2 compiler: ghc-9.8.3 extra-deps: -# nightly-2024-10-21 provides tls-2.0.6 -- tls-2.1.0@sha256:39f9a6183a6dafc3365e99f4f3b99a55154f8a3a3114d9475459a066f56a3a32,6173 +# nightly-2024-10-21 provides hi-file-parser-0.1.6.0 +- hi-file-parser-0.1.7.0@sha256:6cb54bc4bcc07c3b4c7b5dca73bc81e6b052636dc212eb6791608e70aab1ddfe,3012 +- pantry-0.10.0@sha256:d13f99099753b0acf0695a00dc4d82f2671d3c604161d169ac0fc8fcf3004dec,7912 # nightly-2024-10-21 provides static-bytes-0.1.0 - static-bytes-0.1.1@sha256:e090886a4752a816cfff7ccb2c51c533cc8e39ec2d27e485427577fc92d9e9f9,1627 +# nightly-2024-10-21 provides tls-2.0.6 +- tls-2.1.0@sha256:39f9a6183a6dafc3365e99f4f3b99a55154f8a3a3114d9475459a066f56a3a32,6173 docker: enable: false diff --git a/stack-ghc-9.8.3.yaml.lock b/stack-ghc-9.8.3.yaml.lock index 8adff04689..9c2245b8cf 100644 --- a/stack-ghc-9.8.3.yaml.lock +++ b/stack-ghc-9.8.3.yaml.lock @@ -5,12 +5,19 @@ packages: - completed: - hackage: tls-2.1.0@sha256:39f9a6183a6dafc3365e99f4f3b99a55154f8a3a3114d9475459a066f56a3a32,6173 + hackage: hi-file-parser-0.1.7.0@sha256:6cb54bc4bcc07c3b4c7b5dca73bc81e6b052636dc212eb6791608e70aab1ddfe,3012 pantry-tree: - sha256: eaa57b1302d6e68d064f126094360df6ecb7cf5e1c79837bf832595eb800590a - size: 6452 + sha256: 6aa8f0023bb0ea61d62c3b60ffa5720d497847bc55c7f0e50254acc30f9bfe68 + size: 2693 original: - hackage: tls-2.1.0@sha256:39f9a6183a6dafc3365e99f4f3b99a55154f8a3a3114d9475459a066f56a3a32,6173 + hackage: hi-file-parser-0.1.7.0@sha256:6cb54bc4bcc07c3b4c7b5dca73bc81e6b052636dc212eb6791608e70aab1ddfe,3012 +- completed: + hackage: pantry-0.10.0@sha256:d13f99099753b0acf0695a00dc4d82f2671d3c604161d169ac0fc8fcf3004dec,7912 + pantry-tree: + sha256: 9b2d3bc9156c7daed86c591ccf777ccf86973baf4072c953d5fbd30d64d06f55 + size: 2722 + original: + hackage: pantry-0.10.0@sha256:d13f99099753b0acf0695a00dc4d82f2671d3c604161d169ac0fc8fcf3004dec,7912 - completed: hackage: static-bytes-0.1.1@sha256:e090886a4752a816cfff7ccb2c51c533cc8e39ec2d27e485427577fc92d9e9f9,1627 pantry-tree: @@ -18,6 +25,13 @@ packages: size: 440 original: hackage: static-bytes-0.1.1@sha256:e090886a4752a816cfff7ccb2c51c533cc8e39ec2d27e485427577fc92d9e9f9,1627 +- completed: + hackage: tls-2.1.0@sha256:39f9a6183a6dafc3365e99f4f3b99a55154f8a3a3114d9475459a066f56a3a32,6173 + pantry-tree: + sha256: eaa57b1302d6e68d064f126094360df6ecb7cf5e1c79837bf832595eb800590a + size: 6452 + original: + hackage: tls-2.1.0@sha256:39f9a6183a6dafc3365e99f4f3b99a55154f8a3a3114d9475459a066f56a3a32,6173 snapshots: - completed: sha256: 867086a789eaf6da9f48a56bb5e8bfd6df27b120023c144cc7bbec5c95717915 diff --git a/stack.cabal b/stack.cabal index 5374866f70..ebf4078e3a 100644 --- a/stack.cabal +++ b/stack.cabal @@ -423,7 +423,7 @@ library , generic-deriving , ghc-boot , hashable - , hi-file-parser >=0.1.6.0 + , hi-file-parser >=0.1.7.0 , hpack >=0.36.0 , hpc , http-client @@ -546,7 +546,7 @@ executable stack , generic-deriving , ghc-boot , hashable - , hi-file-parser >=0.1.6.0 + , hi-file-parser >=0.1.7.0 , hpack >=0.36.0 , hpc , http-client @@ -648,7 +648,7 @@ executable stack-integration-test , generic-deriving , ghc-boot , hashable - , hi-file-parser >=0.1.6.0 + , hi-file-parser >=0.1.7.0 , hpack >=0.36.0 , hpc , hspec @@ -766,7 +766,7 @@ test-suite stack-unit-test , generic-deriving , ghc-boot , hashable - , hi-file-parser >=0.1.6.0 + , hi-file-parser >=0.1.7.0 , hpack >=0.36.0 , hpc , hspec diff --git a/stack.yaml b/stack.yaml index c81ca3ed22..4a16ff3e7f 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,18 +1,20 @@ snapshot: lts-22.28 # GHC 9.6.6 extra-deps: +# lts-22.28 provides crypton-connection-0.3.2 +- crypton-connection-0.4.1@sha256:a03dabfac16fcc58b4089c2f75ad1e97fc71c4a44f3aeb790db65cebb9ebd1d0,1590 +# lts-22.28 provides hi-file-parser-0.1.6.0 +- hi-file-parser-0.1.7.0@sha256:6cb54bc4bcc07c3b4c7b5dca73bc81e6b052636dc212eb6791608e70aab1ddfe,3012 +# lts-22.28 provides hpack-0.36.0 +- hpack-0.37.0@sha256:b7c91b0416a55c134172a9fd9a02f3815ba68c4b92cca4e320c36906d5e970e0,5187 # lts-22.28 provides pantry-0.9.3.2. -- pantry-0.10.0@sha256:6f99ee8d7cfeeb0e2513638618acf80c72d018e7f10120048fa120a409b9dcd2,7864 +- pantry-0.10.0@sha256:d13f99099753b0acf0695a00dc4d82f2671d3c604161d169ac0fc8fcf3004dec,7912 +# lts-22.28 provides static-bytes-0.1.0 +- static-bytes-0.1.1@sha256:e090886a4752a816cfff7ccb2c51c533cc8e39ec2d27e485427577fc92d9e9f9,1627 # lts-22.28 provides tar-0.5.1.1, which does not support Unicode filenames: - tar-0.6.2.0@sha256:619828cae098a7b6deeb0316e12f55011101d88f756787ed024ceedb81cf1eba,4576 -# lts-22.28 provides hpack-0.36.0 -- hpack-0.37.0@sha256:b7c91b0416a55c134172a9fd9a02f3815ba68c4b92cca4e320c36906d5e970e0,5187 # lts-22.28 provides tls-1.8.0 - tls-2.1.0@sha256:39f9a6183a6dafc3365e99f4f3b99a55154f8a3a3114d9475459a066f56a3a32,6173 -# lts-22.28 provides crypton-connection-0.3.2 -- crypton-connection-0.4.1@sha256:a03dabfac16fcc58b4089c2f75ad1e97fc71c4a44f3aeb790db65cebb9ebd1d0,1590 -# lts-22.28 provides static-bytes-0.1.0 -- static-bytes-0.1.1@sha256:e090886a4752a816cfff7ccb2c51c533cc8e39ec2d27e485427577fc92d9e9f9,1627 docker: enable: false diff --git a/stack.yaml.lock b/stack.yaml.lock index e344aae163..718efbee70 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -5,19 +5,19 @@ packages: - completed: - hackage: pantry-0.10.0@sha256:6f99ee8d7cfeeb0e2513638618acf80c72d018e7f10120048fa120a409b9dcd2,7864 + hackage: crypton-connection-0.4.1@sha256:a03dabfac16fcc58b4089c2f75ad1e97fc71c4a44f3aeb790db65cebb9ebd1d0,1590 pantry-tree: - sha256: 780acb3eaec5c14b3905d5343a8b0152165643634741590a96a5b0d5904a9bcc - size: 2722 + sha256: 821d6ea277735b78fe6df218f158188aed4081317d3ef614a50aac44bb7a4061 + size: 394 original: - hackage: pantry-0.10.0@sha256:6f99ee8d7cfeeb0e2513638618acf80c72d018e7f10120048fa120a409b9dcd2,7864 + hackage: crypton-connection-0.4.1@sha256:a03dabfac16fcc58b4089c2f75ad1e97fc71c4a44f3aeb790db65cebb9ebd1d0,1590 - completed: - hackage: tar-0.6.2.0@sha256:619828cae098a7b6deeb0316e12f55011101d88f756787ed024ceedb81cf1eba,4576 + hackage: hi-file-parser-0.1.7.0@sha256:6cb54bc4bcc07c3b4c7b5dca73bc81e6b052636dc212eb6791608e70aab1ddfe,3012 pantry-tree: - sha256: 1dde50961e9d1a6e6f820d918c0edbbd9673c83afdd300e0aae40a691e8151df - size: 2168 + sha256: 6aa8f0023bb0ea61d62c3b60ffa5720d497847bc55c7f0e50254acc30f9bfe68 + size: 2693 original: - hackage: tar-0.6.2.0@sha256:619828cae098a7b6deeb0316e12f55011101d88f756787ed024ceedb81cf1eba,4576 + hackage: hi-file-parser-0.1.7.0@sha256:6cb54bc4bcc07c3b4c7b5dca73bc81e6b052636dc212eb6791608e70aab1ddfe,3012 - completed: hackage: hpack-0.37.0@sha256:b7c91b0416a55c134172a9fd9a02f3815ba68c4b92cca4e320c36906d5e970e0,5187 pantry-tree: @@ -26,19 +26,12 @@ packages: original: hackage: hpack-0.37.0@sha256:b7c91b0416a55c134172a9fd9a02f3815ba68c4b92cca4e320c36906d5e970e0,5187 - completed: - hackage: tls-2.1.0@sha256:39f9a6183a6dafc3365e99f4f3b99a55154f8a3a3114d9475459a066f56a3a32,6173 + hackage: pantry-0.10.0@sha256:d13f99099753b0acf0695a00dc4d82f2671d3c604161d169ac0fc8fcf3004dec,7912 pantry-tree: - sha256: eaa57b1302d6e68d064f126094360df6ecb7cf5e1c79837bf832595eb800590a - size: 6452 - original: - hackage: tls-2.1.0@sha256:39f9a6183a6dafc3365e99f4f3b99a55154f8a3a3114d9475459a066f56a3a32,6173 -- completed: - hackage: crypton-connection-0.4.1@sha256:a03dabfac16fcc58b4089c2f75ad1e97fc71c4a44f3aeb790db65cebb9ebd1d0,1590 - pantry-tree: - sha256: 821d6ea277735b78fe6df218f158188aed4081317d3ef614a50aac44bb7a4061 - size: 394 + sha256: 9b2d3bc9156c7daed86c591ccf777ccf86973baf4072c953d5fbd30d64d06f55 + size: 2722 original: - hackage: crypton-connection-0.4.1@sha256:a03dabfac16fcc58b4089c2f75ad1e97fc71c4a44f3aeb790db65cebb9ebd1d0,1590 + hackage: pantry-0.10.0@sha256:d13f99099753b0acf0695a00dc4d82f2671d3c604161d169ac0fc8fcf3004dec,7912 - completed: hackage: static-bytes-0.1.1@sha256:e090886a4752a816cfff7ccb2c51c533cc8e39ec2d27e485427577fc92d9e9f9,1627 pantry-tree: @@ -46,6 +39,20 @@ packages: size: 440 original: hackage: static-bytes-0.1.1@sha256:e090886a4752a816cfff7ccb2c51c533cc8e39ec2d27e485427577fc92d9e9f9,1627 +- completed: + hackage: tar-0.6.2.0@sha256:619828cae098a7b6deeb0316e12f55011101d88f756787ed024ceedb81cf1eba,4576 + pantry-tree: + sha256: 1dde50961e9d1a6e6f820d918c0edbbd9673c83afdd300e0aae40a691e8151df + size: 2168 + original: + hackage: tar-0.6.2.0@sha256:619828cae098a7b6deeb0316e12f55011101d88f756787ed024ceedb81cf1eba,4576 +- completed: + hackage: tls-2.1.0@sha256:39f9a6183a6dafc3365e99f4f3b99a55154f8a3a3114d9475459a066f56a3a32,6173 + pantry-tree: + sha256: eaa57b1302d6e68d064f126094360df6ecb7cf5e1c79837bf832595eb800590a + size: 6452 + original: + hackage: tls-2.1.0@sha256:39f9a6183a6dafc3365e99f4f3b99a55154f8a3a3114d9475459a066f56a3a32,6173 snapshots: - completed: sha256: 87da71cb0ae9ee1ea1bf51a8eb9812f39f779be76abc0a3c926defd8afda05d1