haskell-packages.nix: fix builds of 'terminfo' and 'readline'

These builds depend on the ncurses library, but that package was
shadowed when the 'ncurses' Haskell library was added.
This commit is contained in:
Peter Simons 2013-08-22 10:32:42 +02:00
parent d4cb9d11a1
commit 959e79f4c7

View File

@ -1473,7 +1473,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
naturals = callPackage ../development/libraries/haskell/naturals {}; naturals = callPackage ../development/libraries/haskell/naturals {};
ncurses = callPackage ../development/libraries/haskell/ncurses { inherit (pkgs) ncurses; }; ncurses = callPackage ../development/libraries/haskell/ncurses {
inherit (pkgs) ncurses;
};
netlist = callPackage ../development/libraries/haskell/netlist {}; netlist = callPackage ../development/libraries/haskell/netlist {};
@ -1697,7 +1699,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
ReadArgs = callPackage ../development/libraries/haskell/ReadArgs {}; ReadArgs = callPackage ../development/libraries/haskell/ReadArgs {};
readline = callPackage ../development/libraries/haskell/readline { readline = callPackage ../development/libraries/haskell/readline {
inherit (pkgs) readline; inherit (pkgs) readline ncurses;
}; };
recaptcha = callPackage ../development/libraries/haskell/recaptcha {}; recaptcha = callPackage ../development/libraries/haskell/recaptcha {};
@ -1927,7 +1929,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
terminalProgressBar = callPackage ../development/libraries/haskell/terminal-progress-bar {}; terminalProgressBar = callPackage ../development/libraries/haskell/terminal-progress-bar {};
terminfo = callPackage ../development/libraries/haskell/terminfo {}; terminfo = callPackage ../development/libraries/haskell/terminfo {
inherit (pkgs) ncurses;
};
testFramework = callPackage ../development/libraries/haskell/test-framework {}; testFramework = callPackage ../development/libraries/haskell/test-framework {};