Skip to content

Commit f5f959a

Browse files
committed
Fix using wrong .cabal file
1 parent 89a13e8 commit f5f959a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

overlays/haskell.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,7 @@ final: prev: {
724724
else if builtins.pathExists (nixFilesDir + "/.plan.nix/${p.pkg-name}.nix")
725725
then import (nixFilesDir + "/.plan.nix/${p.pkg-name}.nix")
726726
else (((hackage.${p.pkg-name}).${p.pkg-version}).revisions).default) (args // { hsPkgs = {}; });
727-
in builtins.removeAttrs cabal2nix ["src"] // final.lib.optionalAttrs (p ? pkg-src-sha256) {
727+
in final.lib.optionalAttrs (p ? pkg-src-sha256) {
728728
sha256 = p.pkg-src-sha256;
729729
} // final.lib.optionalAttrs (p.pkg-src.type or "" == "source-repo") {
730730
src = final.lib.lists.elemAt callProjectResults.sourceRepos (final.lib.strings.toInt p.pkg-src.source-repo.location);
@@ -750,7 +750,7 @@ final: prev: {
750750
value =
751751
{hsPkgs, ...}@args:
752752
let cabal2nix = import (nixFilesDir + "/.plan.nix/${p.pkg-name}.nix") (args // { hsPkgs = {}; });
753-
in builtins.removeAttrs cabal2nix ["src"] // final.lib.optionalAttrs (p ? pkg-src-sha256) {
753+
in final.lib.optionalAttrs (p ? pkg-src-sha256) {
754754
sha256 = p.pkg-src-sha256;
755755
} // final.lib.optionalAttrs (p.pkg-src.type or "" == "local") {
756756
src = if final.lib.hasPrefix "/" p.pkg-src.path

0 commit comments

Comments
 (0)