git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Use evalPackages to write cabal.project file (#630)
91a7ac7Hamish Mackenzie
lib/call-cabal-project-to-nix.nix+1−1
compare with iko/ghcjs-patch-master
unifiedsplit
@@ -171,7 +171,7 @@ let
171 initialText = pkgs.lib.lists.take 1 blocks;
171 initialText = pkgs.lib.lists.take 1 blocks;
172 repoBlocks = builtins.map parseBlock (pkgs.lib.lists.drop 1 blocks);
172 repoBlocks = builtins.map parseBlock (pkgs.lib.lists.drop 1 blocks);
173 sourceRepos = pkgs.lib.lists.concatMap (x: x.sourceRepo) repoBlocks;
173 sourceRepos = pkgs.lib.lists.concatMap (x: x.sourceRepo) repoBlocks;
174− otherText = pkgs.writeText "cabal.project" (pkgs.lib.strings.concatStringsSep "\n" (
174+ otherText = pkgs.evalPackages.writeText "cabal.project" (pkgs.lib.strings.concatStringsSep "\n" (
175 initialText
175 initialText
176 ++ (builtins.map (x: x.otherText) repoBlocks)));
176 ++ (builtins.map (x: x.otherText) repoBlocks)));
177 in {
177 in {