Skip to content

Bounds and project tidying #378

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Dec 15, 2021
Merged

Bounds and project tidying #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8474692
Use more recent cabal
michaelpj Dec 15, 2021
e04144d
Give more generous bounds on base
michaelpj Dec 15, 2021
01d83d6
Delete now-unnecessary source pins
michaelpj Dec 15, 2021
b9ce486
Try removing some constraints and see if we need them
michaelpj Dec 15, 2021
029be8b
Try bumping install-nix action
michaelpj Dec 15, 2021
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
2 changes: 1 addition & 1 deletion .github/workflows/haskell.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- uses: haskell/actions/setup@v1
with:
ghc-version: ${{ matrix.ghc }}
cabal-version: '3.4'
cabal-version: '3.6'

- name: Cache
uses: actions/cache@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nix.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: true
- uses: cachix/install-nix-action@v12
- uses: cachix/install-nix-action@v16
with:
nix_path: nixpkgs=channel:nixos-unstable
- run: nix-shell --run "cabal update && cabal build all"
21 changes: 0 additions & 21 deletions cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,3 @@ tests: True
benchmarks: True
test-show-details: direct
haddock-quickjump: True

allow-newer:
lens:template-haskell,
cryptohash-sha1:base,
cryptohash-md5:base,
hslogger:base,
entropy:Cabal,

-- Required for ghc-9.0.1 support
source-repository-package
type: git
location: https://github.com/anka-213/th-extras
tag: 57a97b4df128eb7b360e8ab9c5759392de8d1659
-- https://github.com/mokus0/th-extras/pull/8

source-repository-package
type: git
location: https://github.com/anka-213/dependent-sum
tag: 8cf4c7fbc3bfa2be475a17bb7c94a1e1e9a830b5
subdir: dependent-sum-template
-- https://github.com/obsidiansystems/dependent-sum/pull/57
4 changes: 2 additions & 2 deletions lsp-test/lsp-test.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ test-suite func-test
main-is: FuncTest.hs
hs-source-dirs: func-test
type: exitcode-stdio-1.0
build-depends: base <4.16
build-depends: base
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should not have the package base bounds?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It depends on lsp-test which has the bounds - adding them here just means extra work IMO.

Copy link
Member

@jneira jneira Dec 15, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh I missed the existing bound in the package lib 👍

, lsp-test
, lsp
, data-default
Expand All @@ -124,7 +124,7 @@ benchmark simple-bench
main-is: SimpleBench.hs
hs-source-dirs: bench
type: exitcode-stdio-1.0
build-depends: base <4.16
build-depends: base
, lsp-test
, lsp
, process
Expand Down
2 changes: 1 addition & 1 deletion lsp-types/lsp-types.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ library
, Language.LSP.Types.WorkspaceSymbol
-- other-extensions:
ghc-options: -Wall
build-depends: base >= 4.11 && < 4.16
build-depends: base >= 4.11 && < 5
, aeson >=1.2.2.0
, binary
, bytestring
Expand Down
6 changes: 3 additions & 3 deletions lsp/lsp.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ library
, Language.LSP.Server.Control
, Language.LSP.Server.Processing
ghc-options: -Wall
build-depends: base >= 4.11 && < 4.16
build-depends: base >= 4.11 && < 5
, async
, aeson >=1.0.0.0
, attoparsec
Expand Down Expand Up @@ -67,7 +67,7 @@ executable lsp-demo-reactor-server
default-language: Haskell2010
ghc-options: -Wall -Wno-unticked-promoted-constructors

build-depends: base >= 4.11 && < 4.16
build-depends: base
, aeson
, bytestring
, containers
Expand All @@ -91,7 +91,7 @@ executable lsp-demo-simple-server
hs-source-dirs: example
default-language: Haskell2010
ghc-options: -Wall -Wno-unticked-promoted-constructors
build-depends: base >= 4.11 && < 5
build-depends: base
-- the package library. Comment this out if you want repl changes to propagate
, lsp
, text
Expand Down