Skip to content

Commit 60e33b2

Browse files
teggoticextsoft
authored andcommitted
Switch haskell project to new GHC verion
Version `9.2.5` was selected as it's currently the latest LTS on `stackage`. `Universum` deprecated reexported functions from `microlens` which forces us to hide them from `Unversum` imports. They will be removed in version `1.9.0`. #284
1 parent a18ffa0 commit 60e33b2

File tree

6 files changed

+14
-10
lines changed

6 files changed

+14
-10
lines changed

hie.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ cradle:
44
component: "elegant-git:lib"
55

66
- path: "./app/Main.hs"
7-
component: "elegant-git:exe:elegant-git-exe"
7+
component: "elegant-git:exe:git-elegant"
88

99
- path: "./app/Paths_elegant_git.hs"
10-
component: "elegant-git:exe:elegant-git-exe"
10+
component: "elegant-git:exe:git-elegant"
1111

1212
- path: "./test"
1313
component: "elegant-git:test:elegant-git-test"

src/Elegit/Git/Runner/Real.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import System.Process.Typed (ExitCode (ExitFailure, ExitSuccess),
99
proc, readProcess)
1010
import Universum
1111

12-
runGit :: (MonadCatch m, MonadIO m) => Text -> m (Maybe Text)
12+
runGit :: (MonadIO m) => Text -> m (Maybe Text)
1313
runGit cmd = do
1414
(eCode, outputBS, _errBS) <- readProcess $ proc "git" (toString <$> words cmd)
1515
case eCode of

src/Elegit/Git/Runner/Simulated.hs

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ import qualified Data.List.NonEmpty as NE
1010
import qualified Elegit.Git.Action as GA
1111
import Fmt
1212
import Lens.Micro
13+
import Lens.Micro.Mtl
1314
import Lens.Micro.TH
14-
import Universum as U
15+
import Universum as U hiding ((^.), (%~), use, preuse, view)
1516

1617
-- | Describes all the metrics we collect from the git action execution
1718
data GitCommand

stack.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# resolver: ./custom-snapshot.yaml
1919
# resolver: https://example.com/snapshots/2018-01-01.yaml
2020
resolver:
21-
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/19/22.yaml
21+
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/4.yaml
2222

2323
# User packages to be built.
2424
# Various formats can be used as shown in the example below.
@@ -65,3 +65,5 @@ packages:
6565
#
6666
# Allow a newer minor version of GHC than the snapshot specifies
6767
# compiler-check: newer-minor
68+
ghc-options:
69+
'$everything': -haddock

stack.yaml.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
packages: []
77
snapshots:
88
- completed:
9-
sha256: 5098594e71bdefe0c13e9e6236f12e3414ef91a2b89b029fd30e8fc8087f3a07
10-
size: 619399
11-
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/19/22.yaml
9+
sha256: 3770dfd79f5aed67acdcc65c4e7730adddffe6dba79ea723cfb0918356fc0f94
10+
size: 648660
11+
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/4.yaml
1212
original:
13-
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/19/22.yaml
13+
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/4.yaml

test/Elegit/Cli/Action/ShowWorkSpec.hs

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ import qualified Data.List.NonEmpty as NE
44
import qualified Elegit.Cli.Action.ShowWork as ShowWork
55
import Elegit.Git.Runner.Simulated
66
import Lens.Micro
7+
import Lens.Micro.Mtl
78
import Test.Hspec
8-
import Universum
9+
import Universum hiding ((^.), (.~), (%~), view)
910

1011

1112
defaultRepository :: GRepository

0 commit comments

Comments
 (0)