From 47ec1c6e8c78e9d17884259a499e984fe270ae9c Mon Sep 17 00:00:00 2001 From: jishudashen Date: Sat, 19 Jul 2025 14:36:49 +0800 Subject: [PATCH] chore: fix some minor issues in comments Signed-off-by: jishudashen --- hix/default.nix | 2 +- lib/cabal-project-parser.nix | 2 +- lib/clean-cabal-component.nix | 2 +- lib/default.nix | 2 +- overlays/linux-cross.nix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hix/default.nix b/hix/default.nix index c0cbcb96d4..c24542da0e 100644 --- a/hix/default.nix +++ b/hix/default.nix @@ -55,7 +55,7 @@ let to work on haskell projects using nix without the need to add nix files to the project. - Any nix that takes 'installables' as an argumnet should + Any nix that takes 'installables' as an argument should work and behave as if the project had a 'flake.nix' file that was set up to work with haskell.nix. diff --git a/lib/cabal-project-parser.nix b/lib/cabal-project-parser.nix index 8b7633b679..f24771a89b 100644 --- a/lib/cabal-project-parser.nix +++ b/lib/cabal-project-parser.nix @@ -128,7 +128,7 @@ let # This works in a similar way to the `source-repository-package` but we are # able to simply replace the `repository` blocks with local `file:/nix/store` ones. # This works because `cabal configure` does not include any of the `/nix/sore/` - # paths in the `plan.json` (so materialized plan-nix will still work as expeced). + # paths in the `plan.json` (so materialized plan-nix will still work as expected). # See tests/unit.nix for examples of input and output. parseRepositoryBlock = evalPackages: _cabalProjectFileName: sha256map: inputMap: nix-tools: block: let diff --git a/lib/clean-cabal-component.nix b/lib/clean-cabal-component.nix index 28b79d4d88..86211e64e1 100644 --- a/lib/clean-cabal-component.nix +++ b/lib/clean-cabal-component.nix @@ -115,7 +115,7 @@ in lib.any (d: lib.strings.hasPrefix (rPath + "/") d) dirsNeeded) || traceReason "cabal package definition" (lib.strings.hasPrefix subDir rPath && lib.strings.hasSuffix ".cabal" rPath) - || traceReason "hpack package defintion" (lib.strings.hasPrefix subDir rPath + || traceReason "hpack package definition" (lib.strings.hasPrefix subDir rPath && rPath == "package.yaml") || traceReason "data file" (lib.strings.hasPrefix dataDir rPath && dataFileMatch rPath) diff --git a/lib/default.nix b/lib/default.nix index 5f7dfe4a23..bca69dd656 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -326,7 +326,7 @@ in { }; # Run evalModules passing the project function argument (m) as a module along with - # the the a projectType module (../modules/cabal-project.nix or ../modules/stack-project.nix). + # the a projectType module (../modules/cabal-project.nix or ../modules/stack-project.nix). # The resulting config is then passed to the project function's implementation. evalProjectModule = projectType: m: f: let project = f diff --git a/overlays/linux-cross.nix b/overlays/linux-cross.nix index d674140fe1..a420aed842 100644 --- a/overlays/linux-cross.nix +++ b/overlays/linux-cross.nix @@ -20,7 +20,7 @@ let # in a 32bit linux (via qemu-arm user mode emulation). If we have # -pie enabled, it will produce a static-pie executable, which # seems a lot like what we want but will crash on launch. It appears - # the the __stack_chk_guard lookups go through some lookup table, and + # the __stack_chk_guard lookups go through some lookup table, and # while the relocations for the lookup table are correct, the __stack_chk_guard # address isn't properly relocated. This could also be because libc isn't # supposed to be staticlly linked really. However because we are lacking