Skip to content

Commit 37ec089

Browse files
committed
Remove head.hackage
1 parent 774e6d7 commit 37ec089

File tree

4 files changed

+22
-53
lines changed

4 files changed

+22
-53
lines changed

cabal.project

Lines changed: 19 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -50,34 +50,11 @@ package mfsolve
5050
tests: False
5151

5252
if impl(ghc >= 9.5)
53-
source-repository-package
54-
type:git
55-
location: https://github.com/wz1000/HieDb
56-
tag: 721bd0ce7392b8eff8d7643cf132a6448466fd52
57-
5853
source-repository-package
5954
type:git
6055
location: https://github.com/wz1000/retrie
6156
tag: 3ad8ca0450ea4619bbc8007251582ffc828faa37
6257

63-
source-repository-package
64-
type:git
65-
location: https://github.com/haskell/hie-bios
66-
tag: 8519812ad7501cab31347cd46ad1312b8413b8ad
67-
68-
source-repository-package
69-
type:git
70-
location: https://github.com/wz1000/ghc-exactprint/
71-
tag: 58d88820399b66304f3bb18f0b2602c3a90d5bea
72-
73-
-- Remove when fix for
74-
-- https://github.com/kazu-yamamoto/http2/issues/42
75-
-- is released on hackage
76-
source-repository-package
77-
type:git
78-
location: https://github.com/kazu-yamamoto/http2
79-
tag: aa56ded3494dd4f0efb0bbcb5378879ce785a647
80-
8158
package *
8259
ghc-options: -haddock
8360
test-show-details: direct
@@ -87,19 +64,24 @@ write-ghc-environment-files: never
8764
if impl(ghc >= 9.5)
8865
allow-newer:
8966
-- ghc-9.6
90-
template-haskell,
91-
unordered-containers:template-haskell,
92-
base,
93-
ghc-prim,
94-
ghc,
95-
ghc-boot,
96-
mtl,
97-
transformers,
98-
Cabal
99-
67+
algebraic-graphs:transformers,
68+
cryptohash-md5:base,
69+
cryptohash-sha1:base,
70+
ekg-core:ghc-prim,
71+
focus:transformers,
72+
ghc-trace-events:base,
73+
implicit-hie-cradle:transformers,
74+
retrie:base,
75+
retrie:ghc,
76+
retrie:ghc-exactprint,
77+
retrie:mtl,
78+
retrie:transformers,
79+
semigroupoids:base,
80+
stm-hamt:transformers,
81+
entropy:Cabal,
82+
10083
-- head.hackage doesn't like index-state
101-
if impl(ghc < 9.5)
102-
index-state: 2023-03-15T00:00:00Z
84+
index-state: 2023-03-23T00:00:00Z
10385

10486
constraints:
10587
-- For GHC 9.4, older versions of entropy fail to build on Windows
@@ -116,10 +98,9 @@ constraints:
11698
ghc-lib-parser-ex -auto,
11799
stylish-haskell +ghc-lib,
118100
fourmolu -fixity-th,
119-
-- http2 doesn't build with -haddock on ghc-8.10
120-
http2 < 4.0.0,
121101
setup.happy == 1.20.1.1,
122-
happy == 1.20.1.1
102+
happy == 1.20.1.1,
103+
filepath installed,
123104

124105
-- This is benign and won't affect our ability to release to Hackage,
125106
-- because we only depend on `ekg-json` when a non-default flag
@@ -157,15 +138,3 @@ allow-newer:
157138
uuid:time,
158139
vector-space:base,
159140
ekg-wai:time,
160-
161-
if impl(ghc >= 9.5)
162-
repository head.hackage.ghc.haskell.org
163-
url: https://ghc.gitlab.haskell.org/head.hackage/
164-
secure: True
165-
key-threshold: 3
166-
root-keys:
167-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
168-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
169-
7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
170-
171-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override

ghcide/ghcide.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ library
6868
hls-plugin-api ^>= 1.6,
6969
lens,
7070
list-t,
71-
hiedb == 0.4.2.*,
71+
hiedb == 0.4.3.*,
7272
lsp-types ^>= 1.6.0.0,
7373
lsp ^>= 1.6.0.0 ,
7474
mtl,

hie-compat/hie-compat.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ flag ghc-lib
2929
library
3030
default-language: Haskell2010
3131
build-depends:
32-
base < 4.18, array, bytestring, containers, directory, filepath, transformers
32+
base < 4.19, array, bytestring, containers, directory, filepath, transformers
3333
if flag(ghc-lib) && impl(ghc < 9)
3434
build-depends: ghc-lib < 9.0
3535
else

plugins/hls-cabal-plugin/hls-cabal-plugin.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ library
4444
-- automatically, forcing us to manually update the packages revision id.
4545
-- This is a lot of work for almost zero benefit, so we just allow more versions here
4646
-- and we eventually completely drop support for building HLS with stack.
47-
, Cabal ^>=3.2 || ^>=3.4 || ^>=3.6 || ^>= 3.8
47+
, Cabal ^>=3.2 || ^>=3.4 || ^>=3.6 || ^>= 3.8 || ^>= 3.10
4848
, deepseq
4949
, directory
5050
, extra >=1.7.4

0 commit comments

Comments
 (0)