Skip to content

Commit 40d99b7

Browse files
authored
Bounds and project tidying (#378)
* Use more recent cabal * Give more generous bounds on base Also delete bounds on components other than the main library component, they don't do anything. * Delete now-unnecessary source pins * Try removing some constraints and see if we need them * Try bumping install-nix action
1 parent 8db20a5 commit 40d99b7

File tree

6 files changed

+8
-29
lines changed

6 files changed

+8
-29
lines changed

.github/workflows/haskell.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- uses: haskell/actions/setup@v1
2121
with:
2222
ghc-version: ${{ matrix.ghc }}
23-
cabal-version: '3.4'
23+
cabal-version: '3.6'
2424

2525
- name: Cache
2626
uses: actions/cache@v1

.github/workflows/nix.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- uses: actions/checkout@v2
1616
with:
1717
submodules: true
18-
- uses: cachix/install-nix-action@v12
18+
- uses: cachix/install-nix-action@v16
1919
with:
2020
nix_path: nixpkgs=channel:nixos-unstable
2121
- run: nix-shell --run "cabal update && cabal build all"

cabal.project

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,3 @@ tests: True
1010
benchmarks: True
1111
test-show-details: direct
1212
haddock-quickjump: True
13-
14-
allow-newer:
15-
lens:template-haskell,
16-
cryptohash-sha1:base,
17-
cryptohash-md5:base,
18-
hslogger:base,
19-
entropy:Cabal,
20-
21-
-- Required for ghc-9.0.1 support
22-
source-repository-package
23-
type: git
24-
location: https://github.com/anka-213/th-extras
25-
tag: 57a97b4df128eb7b360e8ab9c5759392de8d1659
26-
-- https://github.com/mokus0/th-extras/pull/8
27-
28-
source-repository-package
29-
type: git
30-
location: https://github.com/anka-213/dependent-sum
31-
tag: 8cf4c7fbc3bfa2be475a17bb7c94a1e1e9a830b5
32-
subdir: dependent-sum-template
33-
-- https://github.com/obsidiansystems/dependent-sum/pull/57

lsp-test/lsp-test.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ test-suite func-test
9999
main-is: FuncTest.hs
100100
hs-source-dirs: func-test
101101
type: exitcode-stdio-1.0
102-
build-depends: base <4.16
102+
build-depends: base
103103
, lsp-test
104104
, lsp
105105
, data-default
@@ -124,7 +124,7 @@ benchmark simple-bench
124124
main-is: SimpleBench.hs
125125
hs-source-dirs: bench
126126
type: exitcode-stdio-1.0
127-
build-depends: base <4.16
127+
build-depends: base
128128
, lsp-test
129129
, lsp
130130
, process

lsp-types/lsp-types.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ library
7070
, Language.LSP.Types.WorkspaceSymbol
7171
-- other-extensions:
7272
ghc-options: -Wall
73-
build-depends: base >= 4.11 && < 4.16
73+
build-depends: base >= 4.11 && < 5
7474
, aeson >=1.2.2.0
7575
, binary
7676
, bytestring

lsp/lsp.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ library
3131
, Language.LSP.Server.Control
3232
, Language.LSP.Server.Processing
3333
ghc-options: -Wall
34-
build-depends: base >= 4.11 && < 4.16
34+
build-depends: base >= 4.11 && < 5
3535
, async
3636
, aeson >=1.0.0.0
3737
, attoparsec
@@ -67,7 +67,7 @@ executable lsp-demo-reactor-server
6767
default-language: Haskell2010
6868
ghc-options: -Wall -Wno-unticked-promoted-constructors
6969

70-
build-depends: base >= 4.11 && < 4.16
70+
build-depends: base
7171
, aeson
7272
, bytestring
7373
, containers
@@ -91,7 +91,7 @@ executable lsp-demo-simple-server
9191
hs-source-dirs: example
9292
default-language: Haskell2010
9393
ghc-options: -Wall -Wno-unticked-promoted-constructors
94-
build-depends: base >= 4.11 && < 5
94+
build-depends: base
9595
-- the package library. Comment this out if you want repl changes to propagate
9696
, lsp
9797
, text

0 commit comments

Comments
 (0)