Skip to content

Commit a9fd2b6

Browse files
committed
fix cabal-hpack tests
1 parent c04191e commit a9fd2b6

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

overlays/haskell.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -752,8 +752,9 @@ final: prev: {
752752
let cabal2nix = import (nixFilesDir + "/.plan.nix/${p.pkg-name}.nix") (args // { hsPkgs = {}; });
753753
in final.lib.optionalAttrs (p ? pkg-src-sha256) {
754754
sha256 = p.pkg-src-sha256;
755-
} // final.lib.optionalAttrs (p.pkg-src.type or "" == "local") {
755+
} // final.lib.optionalAttrs (p.pkg-src.type or "" == "local" && cabal2nix ? cabal-generator) {
756756
inherit (cabal2nix) cabal-generator;
757+
} // final.lib.optionalAttrs (p.pkg-src.type or "" == "local") {
757758
src = if final.lib.hasPrefix "/" p.pkg-src.path
758759
then p.pkg-src.path
759760
else callProjectResults.src + final.lib.removeSuffix "/." (final.lib.removeSuffix "/." (

0 commit comments

Comments
 (0)