haskell-ncurses: this package requires a pre 0.21 version of c2hs

Otherwise, the build fails, saying:

    c2hs: Errors during expansion of binding hooks:

    /nix/store/d6m9m2wqaymfiwbx11frdsm1cz7qjkdm-ncurses-5.9/include/curses.h:405: (column 2) [ERROR]  >>> Illegal type!
      The type specifiers of this declaration do not form a legal ANSI C(89) type.

This patch fixes https://github.com/NixOS/nixpkgs/issues/5873.
This commit is contained in:
Peter Simons 2015-01-20 22:52:08 +01:00
parent 1d61ab7860
commit 99b46b64df
2 changed files with 27 additions and 1 deletions

View File

@ -317,6 +317,9 @@ self: super: {
# https://github.com/athanclark/dag/issues/2
dag = addBuildTool super.dag self.Cabal_1_22_0_0; # http://hydra.cryp.to/build/498554/log/raw
# The build fails with the most recent version of c2hs.
ncurses = super.ncurses.override { c2hs = self.c2hs_0_20_1; };
}
// {
# Not on Hackage yet.

View File

@ -25758,6 +25758,30 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
"c2hs_0_20_1" = callPackage
({ mkDerivation, array, base, containers, directory, dlist
, filepath, HUnit, language-c, pretty, process, shelly
, test-framework, test-framework-hunit, text, transformers
}:
mkDerivation {
pname = "c2hs";
version = "0.20.1";
sha256 = "1w2w9zxirzjd5lniwqakq59glgsh4mw3565x2l9qrin0bfjxkn3h";
isLibrary = false;
isExecutable = true;
buildDepends = [
array base containers directory dlist filepath language-c pretty
process
];
testDepends = [
base filepath HUnit shelly test-framework test-framework-hunit text
transformers
];
homepage = "https://github.com/haskell/c2hs";
description = "C->Haskell FFI tool that gives some cross-language type safety";
license = stdenv.lib.licenses.gpl2;
}) {};
"c2hs" = callPackage
({ mkDerivation, array, base, containers, directory, dlist
, filepath, HUnit, language-c, pretty, process, shelly
@ -82816,7 +82840,6 @@ self: {
homepage = "https://john-millikin.com/software/haskell-ncurses/";
description = "Modernised bindings to GNU ncurses";
license = stdenv.lib.licenses.gpl3;
hydraPlatforms = stdenv.lib.platforms.none;
}) { inherit (pkgs) ncurses;};
"neat" = callPackage