hasufell/ghcup-hs
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove unnecessary micro version stripping

Browse Source 
Since we can specify version bounds now, this is unnecessary.
This commit is contained in:
Julian Ospald 2021-06-11 11:26:44 +02:00
parent 2b4088d068
commit ac21c19b7e
Signed by: hasufell
GPG Key ID: 3786C5262ECB4A3F
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/GHCup/Platform.hs
View File

@ -98,7 +98,6 @@ getPlatform = do
either (const Nothing) Just either (const Nothing) Just
. versioning . versioning
-- TODO: maybe do this somewhere else -- TODO: maybe do this somewhere else
. getMajorVersion
. decUTF8Safe' . decUTF8Safe'
<$> getDarwinVersion <$> getDarwinVersion
pure $ PlatformResult { _platform = Darwin, _distroVersion = ver } pure $ PlatformResult { _platform = Darwin, _distroVersion = ver }
@ -112,7 +111,6 @@ getPlatform = do
lift $ $(logDebug) [i|Identified Platform as: #{prettyShow pfr}|] lift $ $(logDebug) [i|Identified Platform as: #{prettyShow pfr}|]
pure pfr pure pfr
where where
getMajorVersion = T.intercalate "." . take 2 . T.split (== '.')
getFreeBSDVersion = lift $ fmap _stdOut $ executeOut "freebsd-version" [] Nothing getFreeBSDVersion = lift $ fmap _stdOut $ executeOut "freebsd-version" [] Nothing
getDarwinVersion = lift $ fmap _stdOut $ executeOut "sw_vers" getDarwinVersion = lift $ fmap _stdOut $ executeOut "sw_vers"
["-productVersion"] ["-productVersion"]