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
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
0931665782
ghcup-hs
Commits
997dcadf
Verified
Commit
997dcadf
authored
4 years ago
by
Julian Ospald
Browse files
Options
Downloads
Patches
Plain Diff
Show the version when doing 'ghcup set'
parent
b2312629
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/ghcup/Main.hs
+2
-2
2 additions, 2 deletions
app/ghcup/Main.hs
lib/GHCup.hs
+3
-3
3 additions, 3 deletions
lib/GHCup.hs
with
5 additions
and
5 deletions
app/ghcup/Main.hs
+
2
−
2
View file @
997dcadf
...
...
@@ -699,8 +699,8 @@ Check the logs at ~/.ghcup/logs and the build directory #{tmpdir} for more clues
liftE
$
setGHC
v
SetGHCOnly
)
>>=
\
case
VRight
_
->
runLogger
$
$
(
logInfo
)
(
"
GHC successfully set
"
)
VRight
v
->
runLogger
$
$
(
logInfo
)
[
i
|
GHC
#{prettyVer v}
successfully set
as default version
|]
VLeft
e
->
runLogger
(
$
(
logError
)
[
i
|
#{e}
|]
)
>>
exitFailure
...
...
This diff is collapsed.
Click to expand it.
lib/GHCup.hs
+
3
−
3
View file @
997dcadf
...
...
@@ -228,7 +228,7 @@ installCabalBin bDls ver mpfReq = do
setGHC
::
(
MonadLogger
m
,
MonadThrow
m
,
MonadFail
m
,
MonadIO
m
)
=>
Version
->
SetGHC
->
Excepts
'
[
NotInstalled
]
m
()
->
Excepts
'
[
NotInstalled
]
m
Version
setGHC
ver
sghc
=
do
let
verBS
=
verToBS
ver
ghcdir
<-
liftIO
$
ghcupGHCDir
ver
...
...
@@ -266,7 +266,7 @@ setGHC ver sghc = do
-- create symlink for share dir
lift
$
symlinkShareDir
ghcdir
verBS
pure
()
pure
ver
where
...
...
@@ -732,7 +732,7 @@ postGHCInstall :: (MonadLogger m, MonadThrow m, MonadFail m, MonadIO m)
=>
Version
->
Excepts
'
[
NotInstalled
]
m
()
postGHCInstall
ver
=
do
liftE
$
setGHC
ver
SetGHC_XYZ
void
$
liftE
$
setGHC
ver
SetGHC_XYZ
-- Create ghc-x.y symlinks. This may not be the current
-- version, create it regardless.
...
...
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