From 8bac44036e9bf1e4452feaa9a231e22e6b29befe Mon Sep 17 00:00:00 2001 From: "Sam A. Horvath-Hunt" Date: Thu, 25 Apr 2024 10:56:24 +0100 Subject: [PATCH] Update inputs (GHC: 9.4.6 -> 9.6.4) --- .github/workflows/publish.yml | 2 +- README.md | 2 +- cli/CLI.hs | 3 +++ flake.lock | 12 ++++++------ flake.nix | 2 +- intlc.cabal | 6 +++--- 6 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a64837c..f584b98 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -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 diff --git a/README.md b/README.md index 7e79a6a..340a155 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/cli/CLI.hs b/cli/CLI.hs index 456de43..613c0e7 100644 --- a/cli/CLI.hs +++ b/cli/CLI.hs @@ -10,6 +10,9 @@ import Intlc.Printer (IndentStyle (..), def) import Options.Applicative import Prelude +-- False positive possibly fixed in v3.8. +{-# ANN module ("HLint: ignore Unused LANGUAGE pragma" :: String) #-} + data Opts = Compile FilePath Locale | Flatten FilePath JSON.Formatting [ICUModifiers] diff --git a/flake.lock b/flake.lock index 51ee8f8..c602b3f 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1694593561, - "narHash": "sha256-WSaIQZ5s9N9bDFkEMTw6P9eaZ9bv39ZhsiW12GtTNM0=", + "lastModified": 1713805509, + "narHash": "sha256-YgSEan4CcrjivCNO5ZNzhg7/8ViLkZ4CB/GrGBVSudo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1697b7d480449b01111e352021f46e5879e47643", + "rev": "1e1dc66fe68972a76679644a5577828b6a7e8be4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0cfd55f..f7c3942 100644 --- a/flake.nix +++ b/flake.nix @@ -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 { diff --git a/intlc.cabal b/intlc.cabal index 6c8ec91..b72602a 100644 --- a/intlc.cabal +++ b/intlc.cabal @@ -14,7 +14,7 @@ common common ghc-options: -Wall build-depends: - base ^>=4.17 + base ^>=4.18 , bytestring ^>=0.11 , comonad ^>=5.0 , containers ^>=0.6 @@ -22,7 +22,7 @@ common common , 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 @@ -39,7 +39,7 @@ executable intlc build-depends: intlc , githash ^>=0.1 - , optparse-applicative ^>=0.16 + , optparse-applicative ^>=0.18 other-modules: CLI