Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
ghcup-hs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Haskell
ghcup-hs
Commits
c05876cc
Verified
Commit
c05876cc
authored
3 years ago
by
Julian Ospald
Browse files
Options
Downloads
Patches
Plain Diff
Fix build with ghc-8.6.5
parent
b9c4c9a0
No related branches found
No related tags found
No related merge requests found
Pipeline
#43407
passed
3 years ago
Stage: checks
Stage: quick-test
Stage: test
Stage: expensive-test
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
app/ghcup/BrickMain.hs
+3
-0
3 additions, 0 deletions
app/ghcup/BrickMain.hs
ghcup.cabal
+3
-3
3 additions, 3 deletions
ghcup.cabal
lib/GHCup/Platform.hs
+4
-0
4 additions, 0 deletions
lib/GHCup/Platform.hs
lib/GHCup/Utils/Version/QQ.hs
+3
-0
3 additions, 0 deletions
lib/GHCup/Utils/Version/QQ.hs
with
13 additions
and
3 deletions
app/ghcup/BrickMain.hs
+
3
−
0
View file @
c05876cc
...
...
@@ -27,6 +27,9 @@ import Brick.Widgets.List ( listSelectedFocusedAttr
)
import
Codec.Archive
import
Control.Exception.Safe
#
if
!
MIN_VERSION_base
(
4
,
13
,
0
)
import
Control.Monad.Fail
(
MonadFail
)
#
endif
import
Control.Monad.Reader
import
Control.Monad.Trans.Except
import
Control.Monad.Trans.Resource
...
...
This diff is collapsed.
Click to expand it.
ghcup.cabal
+
3
−
3
View file @
c05876cc
...
...
@@ -96,7 +96,7 @@ library
build-depends:
, aeson >=1.4
, async >=0.8 && <2.3
, base >=4.1
3
&& <5
, base >=4.1
2
&& <5
, base16-bytestring >=0.1.1.6 && <1.1
, binary ^>=0.8.6.0
, bytestring ^>=0.10
...
...
@@ -219,7 +219,7 @@ executable ghcup
, aeson >=1.4
, aeson-pretty ^>=0.8.8
, async ^>=2.2.3
, base >=4.1
3
&& <5
, base >=4.1
2
&& <5
, bytestring ^>=0.10
, cabal-plan ^>=0.7.2
, containers ^>=0.6
...
...
@@ -287,7 +287,7 @@ test-suite ghcup-test
-fwarn-incomplete-record-updates
build-depends:
, base >=4.1
3
&& <5
, base >=4.1
2
&& <5
, bytestring ^>=0.10
, containers ^>=0.6
, generic-arbitrary ^>=0.1.0
...
...
This diff is collapsed.
Click to expand it.
lib/GHCup/Platform.hs
+
4
−
0
View file @
c05876cc
{-# LANGUAGE CPP #-}
{-# LANGUAGE DataKinds #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE FlexibleInstances #-}
...
...
@@ -27,6 +28,9 @@ import GHCup.Utils.Logger
import
GHCup.Utils.Prelude
import
GHCup.Utils.String.QQ
#
if
!
MIN_VERSION_base
(
4
,
13
,
0
)
import
Control.Monad.Fail
(
MonadFail
)
#
endif
import
Control.Applicative
import
Control.Exception.Safe
import
Control.Monad
...
...
This diff is collapsed.
Click to expand it.
lib/GHCup/Utils/Version/QQ.hs
+
3
−
0
View file @
c05876cc
...
...
@@ -53,6 +53,9 @@ deriving instance Data VUnit
#
if
!
MIN_VERSION_base
(
4
,
13
,
0
)
deriving
instance
Lift
(
NonEmpty
Word
)
deriving
instance
Lift
(
NonEmpty
VChunk
)
deriving
instance
Lift
(
NonEmpty
MChunk
)
deriving
instance
Lift
(
NonEmpty
VUnit
)
#
endif
qq
::
(
Text
->
Q
Exp
)
->
QuasiQuoter
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment