Add base tag

lib/GHCup/Types.hs

@@ -81,7 +81,9 @@ data VersionInfo = VersionInfo
 -- | A tag. These are currently attached to a version of a tool.
 data Tag = Latest
          | Recommended
-         deriving (Ord, Eq, Show)
+         | Base PVP
+         | UnknownTag String  -- ^ used for upwardscompat
+         deriving (Ord, Eq, Show) -- FIXME: manual JSON instance
 
 
 data Architecture = A_64

lib/GHCup/Types/JSON.hs

@@ -37,11 +37,24 @@ deriveJSON defaultOptions { fieldLabelModifier = removeLensFieldLabel } ''Tool
 deriveJSON defaultOptions { fieldLabelModifier = removeLensFieldLabel } ''VSep
 deriveJSON defaultOptions { fieldLabelModifier = removeLensFieldLabel } ''VUnit
 deriveJSON defaultOptions { fieldLabelModifier = removeLensFieldLabel } ''VersionInfo
-deriveJSON defaultOptions { fieldLabelModifier = removeLensFieldLabel } ''Tag
 deriveJSON defaultOptions { fieldLabelModifier = removeLensFieldLabel } ''DownloadInfo
 deriveJSON defaultOptions { fieldLabelModifier = removeLensFieldLabel } ''GHCupInfo
 deriveJSON defaultOptions { fieldLabelModifier = removeLensFieldLabel } ''Requirements
 
+instance ToJSON Tag where
+  toJSON Latest = String "Latest"
+  toJSON Recommended = String "Recommended"
+  toJSON (Base pvp'') = String ("base-" <> prettyPVP pvp'')
+  toJSON (UnknownTag x) = String (T.pack x)
+
+instance FromJSON Tag where
+  parseJSON = withText "Tag" $ \t -> case T.unpack t of
+    "Latest" -> pure Latest
+    "Recommended" -> pure Recommended
+    ('b':'a':'s':'e':'-':ver') -> case pvp (T.pack ver') of
+                                    Right x -> pure $ Base x
+                                    Left e -> fail . show $ e
+    x -> pure (UnknownTag x)
 
 instance ToJSON URI where
   toJSON = toJSON . decUTF8Safe . serializeURIRef'
@@ -143,6 +156,14 @@ instance FromJSONKey Version where
     Right x -> pure x
     Left  e -> fail $ "Failure in Version (FromJSONKey)" <> show e
 
+instance ToJSON PVP where
+  toJSON = toJSON . prettyPVP
+
+instance FromJSON PVP where
+  parseJSON = withText "PVP" $ \t -> case pvp t of
+    Right x -> pure x
+    Left  e -> fail $ "Failure in PVP (FromJSON)" <> show e
+
 instance ToJSONKey Tool where
   toJSONKey = genericToJSONKey defaultJSONKeyOptions
 

lib/GHCup/Utils.hs

@@ -279,6 +279,11 @@ getRecommended :: GHCupDownloads -> Tool -> Maybe Version
 getRecommended av tool = headOf (ix tool % getTagged Recommended % to fst) $ av
 
 
+-- | Gets the latest GHC with a given base version.
+getLatestBaseVersion :: GHCupDownloads -> PVP -> Maybe Version
+getLatestBaseVersion av pvpVer = headOf (ix GHC % getTagged (Base pvpVer) % to fst) av
+
+
 
     -----------------------
     --[ Settings Getter ]--

lib/GHCup/Version.hs

@@ -13,7 +13,7 @@ import qualified Data.Text                     as T
 
 -- | This reflects the API version of the JSON.
 ghcupURL :: URI
-ghcupURL = [uri|https://www.haskell.org/ghcup/data/ghcup-0.0.1.json|]
+ghcupURL = [uri|https://www.haskell.org/ghcup/data/ghcup-0.0.2.json|]
 
 ghcUpVer :: PVP
 ghcUpVer = [pver|0.1.4|]