picnoir/hnix
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use principled* functions for builtins.splitVersion

Browse source
This commit is contained in:
Ken Micklas 2018-11-17 17:43:36 -05:00
parent a488e9aa5c
commit 306d710527
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Nix/Builtins.hs
View file

@ -468,10 +468,12 @@ splitVersion s = case Text.uncons s of
in thisComponent : splitVersion rest
splitVersion_ :: MonadNix e m => m (NValue m) -> m (NValue m)
splitVersion_ = fromValue >=> \s -> do
let vals = flip map (splitVersion s) $ \c ->
valueThunk $ nvStr $ hackyMakeNixStringWithoutContext $ versionComponentToString c
return $ nvList vals
splitVersion_ = fromValue >=> \str ->
case principledStringIgnoreContextMaybe str of
Just s -> return $ nvList $ flip map (splitVersion s) $ \c ->
valueThunk $ nvStr $ principledMakeNixStringWithoutContext $ versionComponentToString c
Nothing -> throwError $ ErrorCall $
"builtins.splitVersion: string must not have context"
compareVersions :: Text -> Text -> Ordering
compareVersions s1 s2 =