Skip to content

Commit

Permalink
Move to GHC 9.4
Browse files Browse the repository at this point in the history
Generate new version bounds with cabal-plan-bounds.
See: https://github.com/nomeata/cabal-plan-bounds
  • Loading branch information
mkoppmann committed Oct 5, 2023
1 parent 65ed46f commit ba06680
Show file tree
Hide file tree
Showing 5 changed files with 71 additions and 71 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- uses: haskell-actions/setup@9933312ae77442f1fc8a613c182206d0e45ea0e8
id: setup-haskell-cabal
with:
ghc-version: "9.2"
ghc-version: "9.4"
cabal-version: "latest"

- name: Update Hackage snapshot
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ LABEL maintainer="mkoppmann <[email protected]>"
###############
# Build image #
###############
FROM haskell:9.2.7-slim@sha256:c8e991032dae465648df40a9cac5ca26b3e5bb416728f56abff53bbf684e95b7 AS build
FROM haskell:9.4-slim@sha256:05c991e739da861079f7a3213020818ebbd8d3d62ac212584bab7736f9e5ec95 AS build

# Create the data folder for the deployment stage here, because there is no
# shell in distroless images available.
Expand Down
118 changes: 59 additions & 59 deletions eselsohr.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ license: EUPL-1.2
license-file: LICENSE
maintainer: mkoppmann <[email protected]>
author: Michael Koppmann
tested-with: ghc ==9.2
tested-with: ghc ==9.4
homepage: https://github.com/mkoppmann/eselsohr
bug-reports: https://github.com/mkoppmann/eselsohr/issues
category: Web
Expand Down Expand Up @@ -104,40 +104,40 @@ library
-fwrite-ide-info -hiedir=.hie -Wunused-packages -j -freverse-errors

build-depends:
aeson >=2.0.3 && <2.3,
base >=4.16 && <4.19,
base32 >=0.2.2 && <0.4,
co-log >=0.5.0 && <0.7,
dotenv >=0.9.0.2 && <0.12,
exceptions >=0.10.4 && <0.11,
filepath >=1.4.2 && <1.5,
http-api-data >=0.4.3 && <0.7,
http-client >=0.7.13 && <0.8,
http-client-tls >=0.3.6 && <0.4,
ip >=1.7.6 && <1.8,
lucid >=2.11.1 && <2.12,
microlens >=0.4.12 && <0.5,
modern-uri >=0.3.6 && <0.4,
mtl >=2.2.2 && <2.4,
network >=3.1.2 && <3.2,
relude >=1.1.0 && <1.3,
scalpel >=0.6.2 && <0.7,
serialise >=0.2.6 && <0.3,
serialise-uuid >=0.1 && <0.2,
servant >=0.19.1 && <0.21,
servant-lucid >=0.9.0 && <0.10,
servant-server >=0.19.2 && <0.21,
time >=1.11.1 && <1.14,
tls >=1.5.8 && <1.10,
unliftio >=0.2.23 && <0.3,
uuid >=1.3.15 && <1.4,
validation-selective >=0.1.0 && <0.3,
wai >=3.2.3 && <3.3,
wai-enforce-https >=1.0.0 && <1.1,
wai-extra >=3.1.13 && <3.2,
warp >=3.3.23 && <3.4,
warp-tls >=3.3.4 && <3.5,
zlib >=0.6.3 && <0.7
aeson ^>=2.1.2,
base ^>=4.17.2,
base32 ^>=0.3.1,
co-log ^>=0.6.0,
dotenv ^>=0.11.0,
exceptions ^>=0.10.5,
filepath ^>=1.4.2,
http-api-data ^>=0.5,
http-client ^>=0.7.14,
http-client-tls ^>=0.3.6,
ip ^>=1.7.7,
lucid ^>=2.11.20230408,
microlens ^>=0.4.13,
modern-uri ^>=0.3.6,
mtl ^>=2.2.2,
network ^>=3.1.4,
relude ^>=1.2.1,
scalpel ^>=0.6.2,
serialise ^>=0.2.6,
serialise-uuid ^>=0.1,
servant ^>=0.19.1,
servant-lucid ^>=0.9.0,
servant-server ^>=0.19.2,
time ^>=1.12.2,
tls ^>=1.9.0,
unliftio ^>=0.2.25,
uuid ^>=1.3.15,
validation-selective ^>=0.2.0,
wai ^>=3.2.3,
wai-enforce-https ^>=1.0.0,
wai-extra ^>=3.1.13,
warp ^>=3.3.29,
warp-tls ^>=3.4.3,
zlib ^>=0.6.3

mixins:
base hiding (Prelude),
Expand All @@ -150,9 +150,9 @@ executable eselsohr-exe
default-language: Haskell2010
ghc-options: -threaded -rtsopts -with-rtsopts=-N
build-depends:
base >=4.16 && <4.19,
base ^>=4.17.2,
eselsohr,
optparse-applicative >=0.17 && <0.19
optparse-applicative ^>=0.18.1

test-suite eselsohr-test
type: exitcode-stdio-1.0
Expand Down Expand Up @@ -202,29 +202,29 @@ test-suite eselsohr-test
-threaded -rtsopts -with-rtsopts=-N

build-depends:
base >=4.16 && <4.19,
bytestring >=0.11.3 && <0.13,
co-log >=0.5.0 && <0.7,
base ^>=4.17.2,
bytestring ^>=0.11.5,
co-log ^>=0.6.0,
eselsohr,
filepath >=1.4.2 && <1.5,
hedgehog >=1.1 && <1.5,
hspec >=2.8.4 && <2.12,
hspec-wai >=0.11.1 && <0.12,
http-api-data >=0.4.3 && <0.7,
http-types >=0.12.3 && <0.13,
mtl >=2.2.2 && <2.4,
relude >=1.1.0 && <1.3,
servant >=0.19.1 && <0.21,
tasty >=1.4.2.3 && <1.6,
tasty-hedgehog >=1.1.0 && <1.5,
tasty-hspec >=1.2.0 && <1.3,
temporary >=1.3 && <1.4,
time >=1.11.1 && <1.14,
unliftio >=0.2.23 && <0.3,
uuid >=1.3.15 && <1.4,
wai >=3.2.3 && <3.3,
wai-extra >=3.1.13 && <3.2,
warp >=3.3.23 && <3.4
filepath ^>=1.4.2,
hedgehog ^>=1.4,
hspec ^>=2.11.5,
hspec-wai ^>=0.11.1,
http-api-data ^>=0.5,
http-types ^>=0.12.3,
mtl ^>=2.2.2,
relude ^>=1.2.1,
servant ^>=0.19.1,
tasty ^>=1.5,
tasty-hedgehog ^>=1.4.0,
tasty-hspec ^>=1.2.0,
temporary ^>=1.3,
time ^>=1.12.2,
unliftio ^>=0.2.25,
uuid ^>=1.3.15,
wai ^>=3.2.3,
wai-extra ^>=3.1.13,
warp ^>=3.3.29

mixins:
base hiding (Prelude),
Expand Down
18 changes: 9 additions & 9 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
overlays = [ ];
pkgs =
import nixpkgs { inherit system overlays; config.allowBroken = true; };
hp = pkgs.haskell.packages.ghc927;
hp = pkgs.haskell.packages.ghc94;
project = returnShellEnv:
hp.developPackage {
inherit returnShellEnv;
Expand Down

0 comments on commit ba06680

Please sign in to comment.