Skip to content

Commit eef4106

Browse files
committed
chore: fix some minor issues in the comments
Signed-off-by: tinyfoolish <tinyfoolish@outlook.com>
1 parent 7631ffa commit eef4106

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

compiler/ghc/default.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ let self =
5050
# Terminfo does not work on older ghc cross arm and windows compilers
5151
(!haskell-nix.haskellLib.isCrossTarget || !(stdenv.targetPlatform.isAarch32 || stdenv.targetPlatform.isAarch64 || stdenv.targetPlatform.isWindows) || builtins.compareVersions ghc-version "8.10" >= 0)
5252

53-
, # Wheter to build in NUMA support
53+
, # Whether to build in NUMA support
5454
enableNUMA ? true
5555

5656
, # What flavour to build. An empty string indicates no
@@ -282,7 +282,7 @@ let
282282
"fp_cv_prog_ar_supports_dash_l=no"
283283
] ++ lib.optionals (targetPlatform.isDarwin) [
284284
"--without-libcharset"
285-
] ++ lib.optional (targetPlatform.isGhcjs) "--target=javascript-unknown-ghcjs" # TODO use configurePlatforms once tripple is updated in nixpkgs
285+
] ++ lib.optional (targetPlatform.isGhcjs) "--target=javascript-unknown-ghcjs" # TODO use configurePlatforms once triple is updated in nixpkgs
286286
;
287287

288288
# Splicer will pull out correct variations
@@ -374,7 +374,7 @@ let
374374

375375
hadrian = hadrianProject.hsPkgs.hadrian.components.exes.hadrian;
376376

377-
# For a discription of hadrian command line args
377+
# For a description of hadrian command line args
378378
# see https://gitlab.haskell.org/ghc/ghc/blob/master/hadrian/README.md
379379
# For build flavours and flavour transformers
380380
# see https://gitlab.haskell.org/ghc/ghc/blob/master/hadrian/doc/flavours.md
@@ -927,7 +927,7 @@ haskell-nix.haskellLib.makeCompilerDeps (stdenv.mkDerivation (rec {
927927
export XATTR=$(mktemp -d)/nothing
928928
''
929929
# We need to point at a stand in `windows.h` header file so that the RTS headers can
930-
# work on the hostPlatform. We also need to work around case sensitve file system issues.
930+
# work on the hostPlatform. We also need to work around case sensitive file system issues.
931931
+ lib.optionalString stdenv.targetPlatform.isWindows ''
932932
export NIX_CFLAGS_COMPILE_${
933933
# We want this only to apply to the non windows hostPlatform (the

compiler/ghcjs/ghcjs.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ let
139139
dontPatchShebangs = true;
140140
dontPatchELF = true;
141141
buildPhase = ''
142-
# Copy the ghcjs exectuables
142+
# Copy the ghcjs executables
143143
mkdir -p $out/bin
144144
cp $src/${libexec}/* $out/bin
145145
@@ -161,7 +161,7 @@ let
161161
install_name_tool -id "@executable_path/libffi.6.dylib" "$out/bin/libffi.6.dylib"
162162
163163
# Modify all the references so we look for the libraries in the system location or
164-
# @executable_path (the directory containin the exetubable itself).
164+
# @executable_path (the directory containing the exetubable itself).
165165
for fn in $out/bin/*; do
166166
install_name_tool -change "${pkgs.libiconv}/lib/libiconv.dylib" /usr/lib/libiconv.dylib "$fn"
167167
install_name_tool -change "${pkgs.stdenv.libc}/lib/libSystem.B.dylib" /usr/lib/libSystem.B.dylib "$fn"
@@ -211,7 +211,7 @@ let
211211
dontPatchShebangs = true;
212212
dontPatchELF = true;
213213
buildPhase = ''
214-
# Copy the ghcjs exectuables
214+
# Copy the ghcjs executables
215215
mkdir -p $out/bin
216216
lndir ${ghcjs-relocatable-bin}/bin $out/bin
217217
@@ -233,7 +233,7 @@ let
233233
chmod -R +w $out/$(basename ${hostDb})/lib/links
234234
235235
# Modify all the references so we look for the libraries in the system location or
236-
# @executable_path (the directory containin the exetubable itself).
236+
# @executable_path (the directory containing the exetubable itself).
237237
for fn in $out/$(basename ${hostDb})/lib/links/*; do
238238
install_name_tool -change "${pkgs.libiconv}/lib/libiconv.dylib" /usr/lib/libiconv.dylib "$fn"
239239
install_name_tool -change "${pkgs.stdenv.libc}/lib/libSystem.B.dylib" /usr/lib/libSystem.B.dylib "$fn"

0 commit comments

Comments
 (0)