Skip to content

Commit efb0e30

Browse files
committed
Workaround for haskell/cabal#5444
1 parent 5ce18d0 commit efb0e30

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -257,12 +257,10 @@ let
257257
echo >> ./cabal.project
258258
'' +
259259
# Add replacement `source-repository-package` blocks pointing to the minimal git repos
260+
# Using `optional-packages:` to work around https://github.com/haskell/cabal/issues/5444
260261
( pkgs.lib.strings.concatMapStrings (f: ''
261-
echo "source-repository-package" >> ./cabal.project
262-
echo " type: git" >> ./cabal.project
263-
echo " location: file://${f.location}" >> ./cabal.project
264-
echo " subdir: ${builtins.concatStringsSep " " f.subdirs}" >> ./cabal.project
265-
echo " tag: ${f.tag}" >> ./cabal.project
262+
echo "optional-packages:" >> ./cabal.project
263+
echo " ${f.location}/${builtins.concatStringsSep " " f.subdirs}" >> ./cabal.project
266264
'') sourceReposEval
267265
));
268266
# This will be used to replace refernces to the minimal git repos with just the index

0 commit comments

Comments
 (0)