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

Use principledStringIngoreContextMaybe for builtins.compareVersions

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

5
src/Nix/Builtins.hs
View file

@ -486,10 +486,13 @@ compareVersions_ :: MonadNix e m => m (NValue m) -> m (NValue m) -> m (NValue m)
compareVersions_ t1 t2 =
fromValue t1 >>= \s1 ->
fromValue t2 >>= \s2 ->
return $ nvConstant $ NInt $ case compareVersions s1 s2 of
case (principledStringIgnoreContextMaybe s1, principledStringIgnoreContextMaybe s2) of
(Just str1, Just str2) -> return $ nvConstant $ NInt $
case compareVersions str1 str2 of
LT -> -1
EQ -> 0
GT -> 1
_ -> throwError $ ErrorCall "builtins.compareVersions: expecting strings with no context"
splitDrvName :: Text -> (Text, Text)
splitDrvName s =