Skip to content
This repository was archived by the owner on Feb 3, 2022. It is now read-only.

Commit 48aff26

Browse files
U-CIQDEV\gbazermanU-CIQDEV\gbazerman
authored andcommitted
teach contents.html about minimal/full split
1 parent fe63519 commit 48aff26

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

hptool/src/PlatformDB.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ release vstr incs = Release (HpVersion $ version vstr) incs []
3232

3333
-- | Construct list of Includes as a delta to packages in another release
3434
deltaFrom :: Release -> [Include] -> [Include]
35-
deltaFrom base deltas = go (relIncludes base) deltas
35+
deltaFrom base deltas = go (allRelIncludes base) deltas
3636
where
3737
go [] dIncs = dIncs
3838
go (bInc : bIncs) dIncs =

hptool/src/Website.hs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,11 @@ historyCtx = mkStrContext outerCtx
8686
ctx "hpReleases" = mapListStrContext rlsCtx releasesNewToOld
8787
ctx "ncols" = MuVariable $ length releasesNewToOld + 1
8888
ctx "sections" = MuList
89-
[ sectionCtx "Compiler" [isGhc, not . isLib]
90-
, sectionCtx "Core Libraries, provided with GHC" [isGhc, isLib]
91-
, sectionCtx "Additional Platform Libraries" [not . isGhc, isLib]
92-
, sectionCtx "Programs and Tools" [isTool]
93-
, extendedCtx "Full Platform Only"
89+
[ sectionCtx "Compiler" [isGhc, not . isLib]
90+
, sectionCtx "Core Libraries, provided with GHC" [isGhc, isLib]
91+
, sectionCtx "Additional Minimal Platform Libraries" [not . isGhc, isLib]
92+
, sectionCtx "Programs and Tools" [isTool]
93+
, extendedCtx "Libraries with Full Platform"
9494
]
9595
ctx _ = MuNothing
9696

@@ -113,7 +113,7 @@ sectionCtx name tests = mkStrContext ctx
113113
pCtx pName "package" = MuVariable pName
114114
pCtx pName "hackageUrl" =
115115
MuVariable $ "http://hackage.haskell.org/package/" ++ pName
116-
pCtx pName "releases" = mapListStrContext pvCtx $ packageVersionInfo pName
116+
pCtx pName "releases" = mapListStrContext pvCtx $ packageVersionInfo False pName
117117
pCtx _ _ = MuNothing
118118

119119
pvCtx (c, _) "class" = MuVariable c
@@ -157,7 +157,7 @@ packageVersionInfo pName = curr $ zipWith comp vers (drop 1 vers ++ [Nothing])
157157
curr ((c, v) : cvs) = (c ++ " current", v) : cvs
158158
curr [] = []
159159

160-
vers = map (fmap pkgVersion . find ((==pName) . pkgName) . map snd . allRelIncludes)
160+
vers = map (fmap pkgVersion . find ((==pName) . pkgName) . map snd . (if searchFull then allRelIncludes else relMinimalIncludes))
161161
releasesNewToOld
162162

163163
releasesNewToOld :: [Release]

0 commit comments

Comments
 (0)