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

Commit 3edb6b2

Browse files
authored
Toolchain update (#545)
1 parent 5f8edff commit 3edb6b2

File tree

6 files changed

+100
-75
lines changed

6 files changed

+100
-75
lines changed

base.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ENV \
1212
PATH=/home/asterius/.asterius-local-install-root/bin:/home/asterius/.asterius-snapshot-install-root/bin:/home/asterius/.asterius-compiler-bin:/home/asterius/.local/bin:${PATH}
1313

1414
RUN \
15-
echo 'deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20200331T083805Z sid main contrib non-free' > /etc/apt/sources.list && \
15+
echo 'deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20200406T084528Z sid main contrib non-free' > /etc/apt/sources.list && \
1616
apt update && \
1717
apt full-upgrade -y && \
1818
apt install -y \
@@ -46,7 +46,7 @@ WORKDIR /home/asterius
4646

4747
RUN \
4848
mkdir -p ~/.local/bin && \
49-
curl -L https://github.com/commercialhaskell/stack/releases/download/v2.1.3/stack-2.1.3-linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack' && \
49+
curl -L https://github.com/commercialhaskell/stack/releases/download/v2.3.0.1/stack-2.3.0.1-linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack' && \
5050
curl -L https://downloads.haskell.org/~cabal/cabal-install-3.0.0.0/cabal-install-3.0.0.0-x86_64-unknown-linux.tar.xz | tar xJ -C ~/.local/bin 'cabal' && \
5151
npm config set prefix ~/.local && \
5252
mkdir ~/.asterius

dev.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ENV \
99
PATH=/home/asterius/.local/bin:${PATH}
1010

1111
RUN \
12-
echo 'deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20200331T083805Z sid main contrib non-free' > /etc/apt/sources.list && \
12+
echo 'deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20200406T084528Z sid main contrib non-free' > /etc/apt/sources.list && \
1313
apt update && \
1414
apt full-upgrade -y && \
1515
apt install -y \
@@ -49,7 +49,7 @@ WORKDIR /home/asterius
4949
RUN \
5050
echo "eval \"\$(direnv hook bash)\"" >> ~/.bashrc && \
5151
mkdir -p ~/.local/bin && \
52-
curl -L https://github.com/commercialhaskell/stack/releases/download/v2.1.3/stack-2.1.3-linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack' && \
52+
curl -L https://github.com/commercialhaskell/stack/releases/download/v2.3.0.1/stack-2.3.0.1-linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack' && \
5353
curl -L https://downloads.haskell.org/~cabal/cabal-install-3.0.0.0/cabal-install-3.0.0.0-x86_64-unknown-linux.tar.xz | tar xJ -C ~/.local/bin 'cabal' && \
5454
pip3 install \
5555
recommonmark \

ghc-toolkit/boot-libs/base/Foreign/C/Types.hs

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ module Foreign.C.Types
2727
( -- * Representations of C types
2828
-- $ctypes
2929

30-
-- ** Platform differences
30+
-- ** #platform# Platform differences
3131
-- | This module contains platform specific information about types.
32-
-- __/As such the types presented on this page reflect the platform
33-
-- on which the documentation was generated and may not coincide with
34-
-- the types on your platform./__
32+
-- __/As such, the types presented on this page reflect the/__
33+
-- __/platform on which the documentation was generated and may/__
34+
-- __/not coincide with the types on your platform./__
3535

3636
-- ** Integral types
3737
-- | These types are represented as @newtype@s of
@@ -105,33 +105,45 @@ import GHC.Num
105105
#include "CTypes.h"
106106

107107
-- | Haskell type representing the C @char@ type.
108+
-- /(The concrete types of "Foreign.C.Types#platform" are platform-specific.)/
108109
INTEGRAL_TYPE(CChar,HTYPE_CHAR)
109110
-- | Haskell type representing the C @signed char@ type.
111+
-- /(The concrete types of "Foreign.C.Types#platform" are platform-specific.)/
110112
INTEGRAL_TYPE(CSChar,HTYPE_SIGNED_CHAR)
111113
-- | Haskell type representing the C @unsigned char@ type.
114+
-- /(The concrete types of "Foreign.C.Types#platform" are platform-specific.)/
112115
INTEGRAL_TYPE(CUChar,HTYPE_UNSIGNED_CHAR)
113116

114117
-- | Haskell type representing the C @short@ type.
118+
-- /(The concrete types of "Foreign.C.Types#platform" are platform-specific.)/
115119
INTEGRAL_TYPE(CShort,HTYPE_SHORT)
116120
-- | Haskell type representing the C @unsigned short@ type.
121+
-- /(The concrete types of "Foreign.C.Types#platform" are platform-specific.)/
117122
INTEGRAL_TYPE(CUShort,HTYPE_UNSIGNED_SHORT)
118123

119124
-- | Haskell type representing the C @int@ type.
125+
-- /(The concrete types of "Foreign.C.Types#platform" are platform-specific.)/
120126
INTEGRAL_TYPE(CInt,HTYPE_INT)
121127
-- | Haskell type representing the C @unsigned int@ type.
128+
-- /(The concrete types of "Foreign.C.Types#platform" are platform-specific.)/
122129
INTEGRAL_TYPE(CUInt,HTYPE_UNSIGNED_INT)
123130

124131
-- | Haskell type representing the C @long@ type.
132+
-- /(The concrete types of "Foreign.C.Types#platform" are platform-specific.)/
125133
INTEGRAL_TYPE(CLong,HTYPE_LONG)
126134
-- | Haskell type representing the C @unsigned long@ type.
135+
-- /(The concrete types of "Foreign.C.Types#platform" are platform-specific.)/
127136
INTEGRAL_TYPE(CULong,HTYPE_UNSIGNED_LONG)
128137

129138
-- | Haskell type representing the C @long long@ type.
139+
-- /(The concrete types of "Foreign.C.Types#platform" are platform-specific.)/
130140
INTEGRAL_TYPE(CLLong,HTYPE_LONG_LONG)
131141
-- | Haskell type representing the C @unsigned long long@ type.
142+
-- /(The concrete types of "Foreign.C.Types#platform" are platform-specific.)/
132143
INTEGRAL_TYPE(CULLong,HTYPE_UNSIGNED_LONG_LONG)
133144

134145
-- | Haskell type representing the C @bool@ type.
146+
-- /(The concrete types of "Foreign.C.Types#platform" are platform-specific.)/
135147
--
136148
-- @since 4.10.0.0
137149
INTEGRAL_TYPE_WITH_CTYPE(CBool,bool,HTYPE_BOOL)
@@ -164,8 +176,10 @@ INTEGRAL_TYPE_WITH_CTYPE(CBool,bool,HTYPE_BOOL)
164176
#-}
165177

166178
-- | Haskell type representing the C @float@ type.
179+
-- /(The concrete types of "Foreign.C.Types#platform" are platform-specific.)/
167180
FLOATING_TYPE(CFloat,HTYPE_FLOAT)
168181
-- | Haskell type representing the C @double@ type.
182+
-- /(The concrete types of "Foreign.C.Types#platform" are platform-specific.)/
169183
FLOATING_TYPE(CDouble,HTYPE_DOUBLE)
170184
-- XXX GHC doesn't support CLDouble yet
171185

@@ -182,12 +196,16 @@ FLOATING_TYPE(CDouble,HTYPE_DOUBLE)
182196
-- "realToFrac/CLDouble->a" realToFrac = \(CLDouble x) -> realToFrac x
183197

184198
-- | Haskell type representing the C @ptrdiff_t@ type.
199+
-- /(The concrete types of "Foreign.C.Types#platform" are platform-specific.)/
185200
INTEGRAL_TYPE(CPtrdiff,HTYPE_PTRDIFF_T)
186201
-- | Haskell type representing the C @size_t@ type.
202+
-- /(The concrete types of "Foreign.C.Types#platform" are platform-specific.)/
187203
INTEGRAL_TYPE(CSize,HTYPE_SIZE_T)
188204
-- | Haskell type representing the C @wchar_t@ type.
205+
-- /(The concrete types of "Foreign.C.Types#platform" are platform-specific.)/
189206
INTEGRAL_TYPE(CWchar,HTYPE_WCHAR_T)
190207
-- | Haskell type representing the C @sig_atomic_t@ type.
208+
-- /(The concrete types of "Foreign.C.Types#platform" are platform-specific.)/
191209
INTEGRAL_TYPE(CSigAtomic,HTYPE_SIG_ATOMIC_T)
192210

193211
{-# RULES
@@ -203,25 +221,32 @@ INTEGRAL_TYPE(CSigAtomic,HTYPE_SIG_ATOMIC_T)
203221
#-}
204222

205223
-- | Haskell type representing the C @clock_t@ type.
224+
-- /(The concrete types of "Foreign.C.Types#platform" are platform-specific.)/
206225
ARITHMETIC_TYPE(CClock,HTYPE_CLOCK_T)
207226
-- | Haskell type representing the C @time_t@ type.
227+
-- /(The concrete types of "Foreign.C.Types#platform" are platform-specific.)/
208228
ARITHMETIC_TYPE(CTime,HTYPE_TIME_T)
209229
-- | Haskell type representing the C @useconds_t@ type.
230+
-- /(The concrete types of "Foreign.C.Types#platform" are platform-specific.)/
210231
--
211232
-- @since 4.4.0.0
212233

213234
ARITHMETIC_TYPE(CUSeconds,HTYPE_USECONDS_T)
214235
-- | Haskell type representing the C @suseconds_t@ type.
236+
-- /(The concrete types of "Foreign.C.Types#platform" are platform-specific.)/
215237
--
216238
-- @since 4.4.0.0
217239
ARITHMETIC_TYPE(CSUSeconds,HTYPE_SUSECONDS_T)
218240

219241
-- FIXME: Implement and provide instances for Eq and Storable
220242
-- | Haskell type representing the C @FILE@ type.
243+
-- /(The concrete types of "Foreign.C.Types#platform" are platform-specific.)/
221244
data CFile = CFile
222245
-- | Haskell type representing the C @fpos_t@ type.
246+
-- /(The concrete types of "Foreign.C.Types#platform" are platform-specific.)/
223247
data CFpos = CFpos
224248
-- | Haskell type representing the C @jmp_buf@ type.
249+
-- /(The concrete types of "Foreign.C.Types#platform" are platform-specific.)/
225250
data CJmpBuf = CJmpBuf
226251

227252
INTEGRAL_TYPE(CIntPtr,HTYPE_INTPTR_T)

0 commit comments

Comments
 (0)