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

Commit c60ff95

Browse files
gbazgbaz
committed
prepare for 8.4.1 release
1 parent ec7db58 commit c60ff95

File tree

6 files changed

+122
-7
lines changed

6 files changed

+122
-7
lines changed

‎hptool/hptool.cabal

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ Executable hptool
3838
Releases2015,
3939
Releases2016,
4040
Releases2017,
41+
Releases2018,
4142
SourceTarball,
4243
Target,
4344
Templates,

‎hptool/os-extras/osx/bin/uninstall-hs.hs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,10 @@ alertOlderVersions appl m = when (not $ Map.null m) $ do
492492
msg = "There are older versions of GHC and/or \
493493
\Haskell Platform on this system.\r\
494494
\\r\
495-
\Run the command line tool uninstall-hs to \
495+
\You can switch between versions by using \
496+
\the command line tool activate-hs.\r\
497+
\\r\
498+
\You can also run the command line tool uninstall-hs to \
496499
\find out which and how to remove them."
497500

498501
-- | Remove file paths and associated other files.

‎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_2_2
91+
hpRelease = hp_8_4_1
9292
hpFullName = show $ relVersion hpRelease
9393
srcTarFile = productDir </> hpFullName <.> "tar.gz"
9494

‎hptool/src/Releases.hs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ module Releases
55
, module Releases2015
66
, module Releases2016
77
, module Releases2017
8+
, module Releases2018
89
, releases
910
)
1011

@@ -16,6 +17,7 @@ import Releases2014
1617
import Releases2015
1718
import Releases2016
1819
import Releases2017
20+
import Releases2018
1921
import Types
2022

2123
releases :: [Release]
@@ -26,4 +28,5 @@ releases = concat
2628
, releases2015
2729
, releases2016
2830
, releases2017
31+
, releases2018
2932
]

‎hptool/src/Releases2018.hs

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
module Releases2018 where
2+
3+
import PlatformDB
4+
import Types
5+
6+
releases2018 :: [Release]
7+
releases2018 = [hp_8_4_1]
8+
9+
10+
hp_8_4_1 :: Release
11+
hp_8_4_1 =
12+
releaseWithMinimal "8.4.1"
13+
[ incGHC "8.4.1"
14+
15+
, incGHCLib "Cabal" "2.2.0.0"
16+
, incGHCLib "array" "0.5.2.0"
17+
, incGHCLib "base" "4.11.0.0"
18+
, incGHCLib "bytestring" "0.10.8.2"
19+
, incGHCLib "containers" "0.5.11.0"
20+
, incGHCLib "deepseq" "1.4.3.0"
21+
, incGHCLib "directory" "1.3.1.5"
22+
, incGHCLib "filepath" "1.4.2"
23+
, incGHCLib "hpc" "0.6.0.3"
24+
, incGHCLib "mtl" "2.2.2"
25+
, incGHCLib "parsec" "3.1.13"
26+
, incGHCLib "pretty" "1.1.3.6"
27+
, incGHCLib "process" "1.6.3.0"
28+
, incGHCLib "stm" "2.4.5.0"
29+
, incGHCLib "template-haskell" "2.13.0.0"
30+
, incGHCLib "text" "1.2.3.0"
31+
, incGHCLib "time" "1.8.0.2"
32+
, incGHCLib "transformers" "0.5.5.0"
33+
, incGHCLib "xhtml" "3000.2.2"
34+
35+
{- These packages are in the GHC distribution, and hence bundled with
36+
the Platform. However, they are not officially part of the Platform,
37+
and as such, do not carry the same stability guaruntees.
38+
, incGHCLib "binary" "0.8.5.1"
39+
, incGHCLib "ghc-compact" "0.1.0.0"
40+
, incGHCLib "ghc-prim" "0.5.2.0"
41+
, incGHCLib "haskeline" "0.7.4.2"
42+
, incGHCLib "hoopl" "3.10.2.2"
43+
, incGHCLib "integer-gmp" "1.0.1.0"
44+
, incGHCLib "terminfo" "0.4.1.0"
45+
-}
46+
47+
, notWindows $ incGHCLib "unix" "2.7.2.2"
48+
49+
50+
--, onlyWindows $ incGHCLib "Win32" "2.6.1.0"
51+
52+
, incTool "alex" "3.2.3"
53+
, incTool "happy" "1.19.9"
54+
55+
, incTool "hscolour" "1.24.4"
56+
, incGHCTool "haddock" "2.19.0"
57+
, incGHCTool "cabal-install" "2.0.0.1"
58+
, incGHCTool "stack" "1.6.5"
59+
]
60+
[
61+
incLib "async" "2.2.1"
62+
, incLib "attoparsec" "0.13.2.2"
63+
, incLib "case-insensitive" "1.2.0.10"
64+
, incLib "fgl" "5.6.0.0"
65+
, incLib "GLUT" "2.7.0.12"
66+
, incLib "GLURaw" "2.0.0.3"
67+
, incLib "haskell-src" "1.0.2.0"
68+
, incLib "hashable" "1.2.7.0"
69+
, incLib "html" "1.0.1.2"
70+
, incLib "HTTP" "4000.3.7"
71+
, incLib "HUnit" "1.6.0.0"
72+
, incLib "network" "2.6.3.4"
73+
, incLib "OpenGL" "3.0.2.0"
74+
, incLib "OpenGLRaw" "3.2.7.0"
75+
, incLib "parallel" "3.2.1.1"
76+
, incLib "regex-base" "0.93.2"
77+
, incLib "regex-compat" "0.95.1"
78+
, incLib "regex-posix" "0.95.2"
79+
, incLib "split" "0.2.3.3"
80+
, incLib "syb" "0.7"
81+
, incLib "unordered-containers" "0.2.9.0"
82+
, incLib "vector" "0.12.0.1"
83+
, incLib "zlib" "0.6.2"
84+
85+
--needed for happy or alex
86+
, incLib "primitive" "0.6.3.0"
87+
, incLib "random" "1.1"
88+
, incLib "QuickCheck" "2.11.3"
89+
90+
-- Libs required by newer version of stuff - but not cleared for HP
91+
92+
-- needed by alex & QuickCheck
93+
, incLib "tf-random" "0.5"
94+
95+
-- was split out of network, so was in HP, just under different pacakge
96+
, incLib "network-uri" "2.6.1.0"
97+
98+
-- needed by attoparsec
99+
, incLib "scientific" "0.3.5.2"
100+
, incLib "integer-logarithms" "1.0.2.1"
101+
102+
-- needed by OpenGL
103+
, incLib "ObjectName" "1.1.0.1"
104+
, incLib "StateVar" "1.1.0.4"
105+
, incLib "half" "0.2.2.3"
106+
, incLib "fixed" "0.2.1.1"
107+
108+
-- needed by HUnit
109+
, incLib "call-stack" "0.1.0"
110+
]
111+
112+
-- TO add: binary? semigroups? regexlib? safe? tagsoup? tagged? tasty? optparse-applicative? clock? criterion? reflection?

‎website/templates/new-site/download-os-sections.html.mu

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11

22
<div class="container">
33
<h2 id="get-started">Let's get started</h2>
4-
<p>Note: the stack tool has been evolving
5-
relatively rapidly. Users who wish to ensure they are
4+
<p>Note: Users who wish to make use of stack and want to ensure they are
65
running the latest version may want to consider running "stack
76
upgrade" and ensuring the
87
proper <a href="http://docs.haskellstack.org/en/stable/install_and_upgrade/#path">path</a>
@@ -166,9 +165,6 @@
166165
where network connectivity should not be taken for
167166
granted.</p>
168167

169-
<p>The 8.2.1 platform release is for 64 bit Windows only, due to
170-
issues with GHC 8.2.1 on 32 bit Windows. Future releases are anticipated to resume
171-
32 bit support.</p>
172168

173169
{{#current}} {{#files}} {{#isWindows}}
174170
{{^isFull}}

0 commit comments

Comments
 (0)