File tree Expand file tree Collapse file tree 5 files changed +5
-5
lines changed Expand file tree Collapse file tree 5 files changed +5
-5
lines changed Original file line number Diff line number Diff line change 55
55
to work on haskell projects using nix without the need to add
56
56
nix files to the project.
57
57
58
- Any nix <command> that takes 'installables' as an argumnet should
58
+ Any nix <command> that takes 'installables' as an argument should
59
59
work and behave as if the project had a 'flake.nix' file that
60
60
was set up to work with haskell.nix.
61
61
Original file line number Diff line number Diff line change 128
128
# This works in a similar way to the `source-repository-package` but we are
129
129
# able to simply replace the `repository` blocks with local `file:/nix/store` ones.
130
130
# This works because `cabal configure` does not include any of the `/nix/sore/`
131
- # paths in the `plan.json` (so materialized plan-nix will still work as expeced ).
131
+ # paths in the `plan.json` (so materialized plan-nix will still work as expected ).
132
132
# See tests/unit.nix for examples of input and output.
133
133
parseRepositoryBlock = evalPackages : _cabalProjectFileName : sha256map : inputMap : nix-tools : block :
134
134
let
Original file line number Diff line number Diff line change 115
115
lib . any ( d : lib . strings . hasPrefix ( rPath + "/" ) d ) dirsNeeded )
116
116
|| traceReason "cabal package definition" ( lib . strings . hasPrefix subDir rPath
117
117
&& lib . strings . hasSuffix ".cabal" rPath )
118
- || traceReason "hpack package defintion " ( lib . strings . hasPrefix subDir rPath
118
+ || traceReason "hpack package definition " ( lib . strings . hasPrefix subDir rPath
119
119
&& rPath == "package.yaml" )
120
120
|| traceReason "data file" ( lib . strings . hasPrefix dataDir rPath
121
121
&& dataFileMatch rPath )
Original file line number Diff line number Diff line change 326
326
} ;
327
327
328
328
# Run evalModules passing the project function argument (m) as a module along with
329
- # the the a projectType module (../modules/cabal-project.nix or ../modules/stack-project.nix).
329
+ # the a projectType module (../modules/cabal-project.nix or ../modules/stack-project.nix).
330
330
# The resulting config is then passed to the project function's implementation.
331
331
evalProjectModule = projectType : m : f :
332
332
let project = f
Original file line number Diff line number Diff line change 20
20
# in a 32bit linux (via qemu-arm user mode emulation). If we have
21
21
# -pie enabled, it will produce a static-pie executable, which
22
22
# seems a lot like what we want but will crash on launch. It appears
23
- # the the __stack_chk_guard lookups go through some lookup table, and
23
+ # the __stack_chk_guard lookups go through some lookup table, and
24
24
# while the relocations for the lookup table are correct, the __stack_chk_guard
25
25
# address isn't properly relocated. This could also be because libc isn't
26
26
# supposed to be staticlly linked really. However because we are lacking
You can’t perform that action at this time.
0 commit comments