From 9a17eaa32adf91c89f47853f5f84749957aec33e Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Sat, 21 Oct 2023 19:23:02 +0800 Subject: [PATCH] Bump metadata version since we added new distros --- lib/GHCup/Version.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/GHCup/Version.hs b/lib/GHCup/Version.hs index aeee2bc..c009848 100644 --- a/lib/GHCup/Version.hs +++ b/lib/GHCup/Version.hs @@ -34,7 +34,7 @@ import GHCup.Errors (ParseError(..)) -- Note that when updating this, CI requires that the file exsists AND the same file exists at -- 'https://www.haskell.org/ghcup/exp/ghcup-.yaml' with some newlines added. ghcupURL :: URI -ghcupURL = [uri|https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-0.0.7.yaml|] +ghcupURL = [uri|https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-0.0.8.yaml|] -- | The current ghcup version. ghcUpVer :: V.PVP @@ -53,7 +53,7 @@ versionCmp ver1 (VR_eq ver2) = ver1 == ver2 versionRange :: V.Versioning -> VersionRange -> Bool versionRange ver' (SimpleRange cmps) = all (versionCmp ver') cmps -versionRange ver' (OrRange cmps range) = +versionRange ver' (OrRange cmps range) = versionRange ver' (SimpleRange cmps) || versionRange ver' range pvpToVersion :: MonadThrow m => V.PVP -> Text -> m V.Version