Skip to content

Commit

Permalink
Support GHC 9.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
TheDaemoness committed Dec 4, 2023
1 parent fd3f8aa commit 5b05db8
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/haskell-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ jobs:
strategy:
matrix:
include:
- compiler: ghc-9.4.7
- compiler: ghc-9.0.2
compilerKind: ghc
compilerVersion: 9.4.7
compilerVersion: 9.0.2
setup-method: ghcup
allow-failure: false
fail-fast: false
Expand Down
4 changes: 2 additions & 2 deletions glirc.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ extra-source-files: exec/linux_exported_symbols.txt
extra-doc-files: glirc.1 ChangeLog.md README.md
homepage: https://github.com/glguy/irc-core
bug-reports: https://github.com/glguy/irc-core/issues
tested-with: GHC==9.4.7
tested-with: GHC == 9.0.2, GHC == 9.2.2, GHC == 9.4.7

custom-setup
setup-depends: base >=4.12 && <4.20,
setup-depends: base >=4.15 && <4.20,
filepath >=1.4 && <1.6,
Cabal >=2.2 && <4

Expand Down
5 changes: 3 additions & 2 deletions src/Client/Commands/ZNC.hs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Maintainer : [email protected]

module Client.Commands.ZNC (zncCommands) where

import Control.Applicative (asum, liftA2)
import Control.Applicative ((<|>), empty, liftA2)
import Client.Commands.Arguments.Spec (optionalArg, remainingArg, simpleToken)
import Client.Commands.TabCompletion (noNetworkTab, simpleNetworkTab)
import Client.Commands.Types
Expand Down Expand Up @@ -91,7 +91,8 @@ cmdZncPlayback cs st args =
timeFormats = ["%k:%M:%S","%k:%M"]
dateFormats = ["%F"]
parseFormats formats str =
asum (map (parseTimeM False defaultTimeLocale ?? str) formats)
-- asum requires base >= 4.16
foldr (<|>) empty (map (parseTimeM False defaultTimeLocale ?? str) formats)

successZoned = success . formatTime defaultTimeLocale "%s"

Expand Down

0 comments on commit 5b05db8

Please sign in to comment.