Skip to content

Commit b24da60

Browse files
authored
Add compiler packages to list of packages in Stackage LTS (#83)
1 parent 02be9d4 commit b24da60

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

lts2nix/Main.hs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,13 @@ lts2plan compilerPackagesMap lts = Plan { packages, compilerVersion, compilerPac
6060
compilerName = lts ^. key "resolver" . key "compiler" . _String
6161
compilerVersion = parseCompilerVersion compilerName
6262
compilerPackages = Just <$> Map.lookupDefault (error $ "failed to lookup the compiler packages for compiler: " ++ Text.unpack compilerName) compilerName compilerPackagesMap
63+
compilerPackages' = fmap vrToPkg <$> compilerPackages
64+
where vrToPkg v = Package v Nothing Map.empty
6365

6466
-- turn flags into HashMap Text (HashMap Text Bool)
6567
flags :: Map.HashMap Text (Map.HashMap Text Bool)
6668
flags = lts ^. key "flags" . _Object <&> (\v -> Map.mapMaybe (^? _Bool) $ v ^. _Object)
67-
packages = Map.fromList . V.toList $ lts ^. key "packages" . _Array <&> \v ->
69+
packages' = Map.fromList . V.toList $ lts ^. key "packages" . _Array <&> \v ->
6870
let (pkg, rev) = case (parsePackageIdentifier . Text.unpack $ v ^. key "hackage" . _String) of
6971
Just p -> p
7072
_ -> error $ "failed to parse: " ++ Text.unpack (v ^. key "hackage" . _String)
@@ -76,3 +78,5 @@ lts2plan compilerPackagesMap lts = Plan { packages, compilerVersion, compilerPac
7678
_ -> Nothing
7779
, packageFlags = Map.lookupDefault Map.empty name flags
7880
})
81+
82+
packages = packages' `Map.union` compilerPackages'

0 commit comments

Comments
 (0)