Skip to content

chore: fix some minor issues in comments #2419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 20, 2025
+5 −5
Merged

chore: fix some minor issues in comments #2419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hix/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ let
to work on haskell projects using nix without the need to add
nix files to the project.

Any nix <command> that takes 'installables' as an argumnet should
Any nix <command> 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.

Expand Down
2 changes: 1 addition & 1 deletion lib/cabal-project-parser.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/clean-cabal-component.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion lib/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion overlays/linux-cross.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down