Skip to content

Commit

Permalink
Update inputs (GHC: 9.4.6 -> 9.6.4)
Browse files Browse the repository at this point in the history
  • Loading branch information
samhh committed Apr 25, 2024
1 parent 8e0d0e3 commit cc7d7c6
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
# would be substantially better.)
- uses: haskell-actions/setup@v2
with:
ghc-version: 9.4.6
ghc-version: 9.6.4
- run: cabal freeze
- uses: ./.github/actions/cabal-cache
- name: Build
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,4 +120,4 @@ The description is optional and ignored by intlc. It can be used documentatively

Check out `ARCHITECTURE.md`.

Currently building against GHC 9.4.6. A Nix flake is included with all necessary dependencies.
Currently building against GHC 9.6.4. A Nix flake is included with all necessary dependencies.
4 changes: 4 additions & 0 deletions cli/CLI.hs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ import Intlc.Printer (IndentStyle (..), def)
import Options.Applicative
import Prelude

-- False positive possibly fixed in v3.8. Annotation must be placed here to
-- avoid a parse error.
{-# ANN module "HLint: ignore" #-}

data Opts
= Compile FilePath Locale
| Flatten FilePath JSON.Formatting [ICUModifiers]
Expand Down
12 changes: 6 additions & 6 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 @@ -11,7 +11,7 @@
# We'll stick with the "default" version of GHC in nixpkgs to benefit
# from the binary cache:
# https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks/haskell.section.md#available-packages-haskell-available-packages
ghcVer = "ghc946";
ghcVer = "ghc964";

haskPkgs = pkgs.haskell.packages."${ghcVer}";
in {
Expand Down
6 changes: 3 additions & 3 deletions intlc.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ common common
ghc-options:
-Wall
build-depends:
base ^>=4.17
base ^>=4.18
, bytestring ^>=0.11
, comonad ^>=5.0
, containers ^>=0.6
, data-fix ^>=0.3
, deriving-compat ^>=0.6
, extra ^>=1.7
, free ^>=5.1
, mtl ^>=2.2
, mtl ^>=2.3
, recursion-schemes ^>=5.2
, relude ^>=1.2
, text ^>=2.0
Expand All @@ -39,7 +39,7 @@ executable intlc
build-depends:
intlc
, githash ^>=0.1
, optparse-applicative ^>=0.16
, optparse-applicative ^>=0.18
other-modules:
CLI

Expand Down

0 comments on commit cc7d7c6

Please sign in to comment.