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

Commit 9d3ef27

Browse files
gbazgbaz
committed
8.6.3
1 parent 401d68a commit 9d3ef27

File tree

3 files changed

+105
-2
lines changed

3 files changed

+105
-2
lines changed

‎hptool/src/Main.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ main = hSetEncoding stdout utf8 >> shakeArgsWith opts flags main'
8888

8989
opts = shakeOptions
9090

91-
hpRelease = hp_8_4_3
91+
hpRelease = hp_8_6_3
9292
hpFullName = show $ relVersion hpRelease
9393
srcTarFile = productDir </> hpFullName <.> "tar.gz"
9494

‎hptool/src/Releases2018.hs‎

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,4 +116,106 @@ hp_8_4_3 =
116116
, incLib "primitive" "0.6.4.0"
117117
]
118118

119+
hp_8_6_3 :: Release
120+
hp_8_6_3 =
121+
releaseWithMinimal "8.6.3"
122+
[ incGHC "8.6.3"
123+
124+
, incGHCLib "Cabal" "2.4.0.1"
125+
, incGHCLib "array" "0.5.3.0"
126+
, incGHCLib "base" "4.12.0.0"
127+
, incGHCLib "bytestring" "0.10.8.2"
128+
, incGHCLib "containers" "0.6.0.1"
129+
, incGHCLib "deepseq" "1.4.4.0"
130+
, incGHCLib "directory" "1.3.3.0"
131+
, incGHCLib "filepath" "1.4.2.1"
132+
, incGHCLib "hpc" "0.6.0.3"
133+
, incGHCLib "mtl" "2.2.2"
134+
, incGHCLib "parsec" "3.1.13.0"
135+
, incGHCLib "pretty" "1.1.3.6"
136+
, incGHCLib "process" "1.6.3.0"
137+
, incGHCLib "stm" "2.4.5.0"
138+
, incGHCLib "template-haskell" "2.14.0.0"
139+
, incGHCLib "text" "1.2.3.1"
140+
, incGHCLib "time" "1.8.0.2"
141+
, incGHCLib "transformers" "0.5.5.0"
142+
, incGHCLib "xhtml" "3000.2.2.1"
143+
144+
{- These packages are in the GHC distribution, and hence bundled with
145+
the Platform. However, they are not officially part of the Platform,
146+
and as such, do not carry the same stability guaruntees.
147+
, incGHCLib "binary" "0.8.6.0"
148+
, incGHCLib "ghc-compact" "0.1.0.0"
149+
, incGHCLib "ghc-prim" "0.5.3"
150+
, incGHCLib "haskeline" "0.7.4.3"
151+
, incGHCLib "hoopl" "3.10.2.2"
152+
, incGHCLib "integer-gmp" "1.0.2.0"
153+
, incGHCLib "terminfo" "0.4.1.0"
154+
-}
155+
156+
, notWindows $ incGHCLib "unix" "2.7.2.2"
157+
158+
159+
--, onlyWindows $ incGHCLib "Win32" "2.6.1.0"
160+
161+
, incTool "alex" "3.2.4"
162+
, incTool "happy" "1.19.9"
163+
164+
, incTool "hscolour" "1.24.4" --drop it?
165+
, incGHCTool "haddock" "2.21.0" --Correct?
166+
, incGHCTool "cabal-install" "2.4.1.0"
167+
, incGHCTool "stack" "1.9.1"
168+
]
169+
[
170+
incLib "async" "2.2.1"
171+
, incLib "attoparsec" "0.13.2.2"
172+
, incLib "case-insensitive" "1.2.0.11"
173+
, incLib "fgl" "5.7.0.1"
174+
, incLib "GLUT" "2.7.0.14"
175+
, incLib "GLURaw" "2.0.0.4"
176+
, incLib "haskell-src" "1.0.3.0"
177+
, incLib "hashable" "1.2.7.0"
178+
, incLib "html" "1.0.1.2"
179+
, incLib "HTTP" "4000.3.12"
180+
, incLib "HUnit" "1.6.0.0"
181+
, incLib "network" "2.8.0.0"
182+
, incLib "OpenGL" "3.0.2.2"
183+
, incLib "OpenGLRaw" "3.3.1.0"
184+
, incLib "parallel" "3.2.2.0"
185+
, incLib "regex-base" "0.93.2"
186+
, incLib "regex-compat" "0.95.1"
187+
, incLib "regex-posix" "0.95.2"
188+
, incLib "split" "0.2.3.3"
189+
, incLib "syb" "0.7"
190+
, incLib "unordered-containers" "0.2.9.0"
191+
, incLib "vector" "0.12.0.1"
192+
, incLib "zlib" "0.6.2"
193+
194+
--needed for happy or alex
195+
, incLib "primitive" "0.6.4.0"
196+
, incLib "random" "1.1"
197+
, incLib "QuickCheck" "2.12.6.1"
198+
199+
-- Libs required by newer version of stuff - but not cleared for HP
200+
201+
-- needed by alex & QuickCheck
202+
, incLib "tf-random" "0.5"
203+
204+
-- was split out of network, so was in HP, just under different pacakge
205+
, incLib "network-uri" "2.6.1.0"
206+
207+
-- needed by attoparsec
208+
, incLib "scientific" "0.3.6.2"
209+
, incLib "integer-logarithms" "1.0.2.2"
210+
211+
-- needed by OpenGL
212+
, incLib "ObjectName" "1.1.0.1"
213+
, incLib "StateVar" "1.1.1.1"
214+
, incLib "half" "0.3"
215+
, incLib "fixed" "0.2.1.1"
216+
217+
-- needed by HUnit
218+
, incLib "call-stack" "0.1.0"
219+
]
220+
119221
-- TO add: binary? semigroups? regexlib? safe? tagsoup? tagged? tasty? optparse-applicative? clock? criterion? reflection?

‎hptool/src/Target.hs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ buildAction buildDir hpRel bc = do
8787
cabalVerbosity <- show . fromEnum <$> shakeToCabalVerbosity
8888
let cabal c as = localCommand' [Cwd buildDir] "cabal" $
8989
c : ("--verbose=" ++ cabalVerbosity) : as
90-
when (not isAlexOrHappy) $
90+
when (not isAlexOrHappy && not isNetwork) $
9191
cabal "clean" [] -- This is a hack to handle when packages, other
9292
-- than alex or happy themselves, have outdated
9393
-- bootstrap files in their sdist tarballs.
@@ -121,6 +121,7 @@ buildAction buildDir hpRel bc = do
121121
depsDB = packageDepsDB pkg
122122

123123
isAlexOrHappy = pkgName pkg `elem` ["alex", "happy"]
124+
isNetwork = pkgName pkg `elem` ["network"]
124125
usesTool pats =
125126
if not isAlexOrHappy
126127
then (not . null) <$> getDirectoryFiles sourceDir pats

0 commit comments

Comments
 (0)