Skip to content

Commit 22d5210

Browse files
committed
Respond to review
1 parent 5d88582 commit 22d5210

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

lib/call-cabal-project-to-nix.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,8 @@ let
126126
# access to the store is restricted. If origSrc was already in the store
127127
# you can pass the project in as a string.
128128
rawCabalProject =
129+
# Even if `cabal.project` doesn't exist, `cabal.project.local` is still used by cabal.
130+
# We tested this: https://github.com/input-output-hk/haskell.nix/pull/1588
129131
if cabalProject == null && cabalProjectLocal == null
130132
then null
131133
else (

modules/hackage-project.nix

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ in {
2626
# Avoid readDir and readFile IFD functions looking for these files in the hackage source
2727
# `mkOverride 1100` means this will be used in preference to the mkOption default,
2828
# but a `mkDefault` can still override this.
29-
cabalProject = lib.mkOverride 1100 ''
30-
packages: .
31-
'';
3229
cabalProjectLocal = lib.mkOverride 1100 null;
3330
cabalProjectFreeze = lib.mkOverride 1100 null;
3431
src =

0 commit comments

Comments
 (0)