From 9aa231abfafed902b7a04f28275af6e04460715f Mon Sep 17 00:00:00 2001 From: Vladimir Kirillov Date: Mon, 5 May 2014 14:42:39 +0300 Subject: [PATCH] buildLocalCabal: include cabalInstall to buildDepends to preserve developer experience --- pkgs/top-level/haskell-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 80503663dcb..337c8d41e10 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -3096,7 +3096,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ${self.cabal2nix}/bin/cabal2nix ${src + "/${name}.cabal"} --sha256=FILTERME \ | grep -v FILTERME | sed \ -e 's/licenses.proprietary/licenses.unfree/' \ - -e 's/{ cabal/{ cabal, src/' \ + -e 's/{ cabal/{ cabal, cabalInstall, src/' \ + -e 's/buildDepends = \[/buildDepends = \[ cabalInstall/' \ -e 's/pname = \([^\n]*\)/pname = \1\n inherit src;\n jailbreak = true;/' > $out '';