From eef41061ad6287018c5a27d531cc9391fab07118 Mon Sep 17 00:00:00 2001 From: tinyfoolish Date: Fri, 14 Nov 2025 16:08:47 +0800 Subject: [PATCH] chore: fix some minor issues in the comments Signed-off-by: tinyfoolish --- compiler/ghc/default.nix | 8 ++++---- compiler/ghcjs/ghcjs.nix | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/compiler/ghc/default.nix b/compiler/ghc/default.nix index 4eb98d1eed..b1b47109e9 100644 --- a/compiler/ghc/default.nix +++ b/compiler/ghc/default.nix @@ -50,7 +50,7 @@ let self = # Terminfo does not work on older ghc cross arm and windows compilers (!haskell-nix.haskellLib.isCrossTarget || !(stdenv.targetPlatform.isAarch32 || stdenv.targetPlatform.isAarch64 || stdenv.targetPlatform.isWindows) || builtins.compareVersions ghc-version "8.10" >= 0) -, # Wheter to build in NUMA support +, # Whether to build in NUMA support enableNUMA ? true , # What flavour to build. An empty string indicates no @@ -282,7 +282,7 @@ let "fp_cv_prog_ar_supports_dash_l=no" ] ++ lib.optionals (targetPlatform.isDarwin) [ "--without-libcharset" - ] ++ lib.optional (targetPlatform.isGhcjs) "--target=javascript-unknown-ghcjs" # TODO use configurePlatforms once tripple is updated in nixpkgs + ] ++ lib.optional (targetPlatform.isGhcjs) "--target=javascript-unknown-ghcjs" # TODO use configurePlatforms once triple is updated in nixpkgs ; # Splicer will pull out correct variations @@ -374,7 +374,7 @@ let hadrian = hadrianProject.hsPkgs.hadrian.components.exes.hadrian; - # For a discription of hadrian command line args + # For a description of hadrian command line args # see https://gitlab.haskell.org/ghc/ghc/blob/master/hadrian/README.md # For build flavours and flavour transformers # see https://gitlab.haskell.org/ghc/ghc/blob/master/hadrian/doc/flavours.md @@ -927,7 +927,7 @@ haskell-nix.haskellLib.makeCompilerDeps (stdenv.mkDerivation (rec { export XATTR=$(mktemp -d)/nothing '' # We need to point at a stand in `windows.h` header file so that the RTS headers can - # work on the hostPlatform. We also need to work around case sensitve file system issues. + # work on the hostPlatform. We also need to work around case sensitive file system issues. + lib.optionalString stdenv.targetPlatform.isWindows '' export NIX_CFLAGS_COMPILE_${ # We want this only to apply to the non windows hostPlatform (the diff --git a/compiler/ghcjs/ghcjs.nix b/compiler/ghcjs/ghcjs.nix index 3240ba0628..edf048009e 100644 --- a/compiler/ghcjs/ghcjs.nix +++ b/compiler/ghcjs/ghcjs.nix @@ -139,7 +139,7 @@ let dontPatchShebangs = true; dontPatchELF = true; buildPhase = '' - # Copy the ghcjs exectuables + # Copy the ghcjs executables mkdir -p $out/bin cp $src/${libexec}/* $out/bin @@ -161,7 +161,7 @@ let install_name_tool -id "@executable_path/libffi.6.dylib" "$out/bin/libffi.6.dylib" # Modify all the references so we look for the libraries in the system location or - # @executable_path (the directory containin the exetubable itself). + # @executable_path (the directory containing the exetubable itself). for fn in $out/bin/*; do install_name_tool -change "${pkgs.libiconv}/lib/libiconv.dylib" /usr/lib/libiconv.dylib "$fn" install_name_tool -change "${pkgs.stdenv.libc}/lib/libSystem.B.dylib" /usr/lib/libSystem.B.dylib "$fn" @@ -211,7 +211,7 @@ let dontPatchShebangs = true; dontPatchELF = true; buildPhase = '' - # Copy the ghcjs exectuables + # Copy the ghcjs executables mkdir -p $out/bin lndir ${ghcjs-relocatable-bin}/bin $out/bin @@ -233,7 +233,7 @@ let chmod -R +w $out/$(basename ${hostDb})/lib/links # Modify all the references so we look for the libraries in the system location or - # @executable_path (the directory containin the exetubable itself). + # @executable_path (the directory containing the exetubable itself). for fn in $out/$(basename ${hostDb})/lib/links/*; do install_name_tool -change "${pkgs.libiconv}/lib/libiconv.dylib" /usr/lib/libiconv.dylib "$fn" install_name_tool -change "${pkgs.stdenv.libc}/lib/libSystem.B.dylib" /usr/lib/libSystem.B.dylib "$fn"