merge and website cleanup

Author: gbaz

hptool/src/OS/Win.hs

@@ -34,8 +34,9 @@ getPkgId :: C.HasUnitId pkg => pkg -> String
 getPkgId pkg = C.display $ C.installedUnitId pkg
 #elif MIN_VERSION_Cabal(1,24,0)
 getPkgId :: C.HasUnitId pkg => pkg -> String
-getPkgId pkg = case C.installedUnitId pkg of
+getPkgId pkg = display (C.installedUnitId pkg) {-case C.installedUnitId pkg of
   C.SimpleUnitId (C.ComponentId s) -> s
+-}
 #else
 getPkgId :: C.PackageInstalled pkg => pkg -> String
 getPkgId pkg = case C.installedPackageId pkg of

hptool/src/ReleaseFiles.hs

@@ -42,8 +42,6 @@ archBits :: Arch -> Int
 archBits ArchI386 = 32
 archBits ArchX86_64 = 64
 
-
-
 lin, mac, win :: Bool -> Arch -> Url -> Maybe Hash -> FileInfo
 lin isFull a u mh = (DistBinary OsLinux a,   u, mh, isFull)
 mac isFull a u mh = (DistBinary OsOSX a,     u, mh, isFull)

hptool/src/Releases2017.hs

@@ -109,7 +109,6 @@ hp_8_2_1 =
         , incLib "call-stack"               "0.1.0"
         ]
 
--- TO add: binary? semigroups? regexlib? safe? tagsoup? tagged? tasty? optparse-applicative? clock? criterion? reflection?
 
 hp_8_2_2 :: Release
 hp_8_2_2 =
@@ -122,4 +121,15 @@ hp_8_2_2 =
         and as such, do not carry the same stability guaruntees.
         , incGHCLib "ghc-prim"              "0.5.1.1"
         -}
+        , incTool "alex"                    "3.2.3"
+        , incTool "happy"                   "1.19.8"
+
+        , incTool "hscolour"                "1.24.2"
+        , incLib "HTTP"                     "4000.3.8"
+        , incLib "QuickCheck"               "2.10.1"
+        , incLib "scientific"               "0.3.5.2"
         ]
+
+
+
+-- TO add: binary? semigroups? regexlib? safe? tagsoup? tagged? tasty? optparse-applicative? clock? criterion? reflection?

hptool/src/Website.hs

@@ -102,9 +102,9 @@ historyCtx = mkStrContext outerCtx
     ctx "hpReleases" = mapListStrContext rlsCtx releasesNewToOld
     ctx "ncols" = MuVariable $ length releasesNewToOld + 1
     ctx "sections" = MuList
-        [ sectionCtx "Compiler"                              [isGhc, not . isLib] False
+        [ sectionCtx "Compiler"                              [isGhc, not . isLib, not . isTool] False
         , sectionCtx "Core Libraries, provided with GHC"     [isGhc, isLib] False
-        , sectionCtx "Additional Core Platform Libraries" [not . isGhc, isLib] True
+        , sectionCtx "Additional Core Platform Libraries"    [not . isGhc, isLib] True
         , sectionCtx "Programs and Tools"                    [isTool] False
         , extendedCtx "Libraries with Full Platform"
         ]

platform.sh

@@ -6,7 +6,7 @@ export MACOSX_DEPLOYMENT_TARGET=10.7
 
 set -e
 
-HPTOOL=hptool/dist-newstyle/build/hptool-0.1/build/hptool/hptool
+HPTOOL=hptool/dist-newstyle/build/x86_64-osx/ghc-8.2.1/hptool-0.1/c/hptool/build/hptool/hptool
 HPTOOL_ALT=hptool/.cabal-sandbox/bin/hptool
 
 #if ( cabal sandbox --help >/dev/null 2>&1 ) ; then