haskell-trifecta: bring back 1.1 for idris

This commit is contained in:
Mathijs Kwik 2013-10-31 11:01:25 +01:00
parent 07d68731ff
commit 3c2b7f5e33
3 changed files with 36 additions and 2 deletions

View File

@ -0,0 +1,30 @@
{ cabal, ansiTerminal, ansiWlPprint, blazeBuilder, blazeHtml
, blazeMarkup, charset, comonad, deepseq, doctest, filepath
, fingertree, hashable, lens, mtl, parsers, reducers, semigroups
, transformers, unorderedContainers, utf8String
}:
cabal.mkDerivation (self: {
pname = "trifecta";
version = "1.1";
sha256 = "19wnblpn31hvdi5dc8ir24s0hfjj4vvzr43gg9ydl2qdjq6s166w";
buildDepends = [
ansiTerminal ansiWlPprint blazeBuilder blazeHtml blazeMarkup
charset comonad deepseq fingertree hashable lens mtl parsers
reducers semigroups transformers unorderedContainers utf8String
];
testDepends = [ doctest filepath ];
postPatch = ''
substituteInPlace trifecta.cabal \
--replace "blaze-html >= 0.5 && < 0.6," "blaze-html >= 0.5 && < 0.7," \
--replace "hashable >= 1.2 && < 1.3," "hashable >= 1.1 && < 1.3," \
--replace "fingertree >= 0.0.1 && < 0.1," "fingertree >= 0.0.1 && < 0.2," \
--replace "comonad == 3.*," "comonad >= 3 && < 5,"
'';
meta = {
homepage = "http://github.com/ekmett/trifecta/";
description = "A modern parser combinator library with convenient diagnostics";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View File

@ -2116,7 +2116,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
transformersCompat = callPackage ../development/libraries/haskell/transformers-compat {}; transformersCompat = callPackage ../development/libraries/haskell/transformers-compat {};
trifecta = callPackage ../development/libraries/haskell/trifecta {}; trifecta_1_1 = callPackage ../development/libraries/haskell/trifecta/1.1.nix {};
trifecta_1_2 = callPackage ../development/libraries/haskell/trifecta/1.2.nix {};
trifecta = self.trifecta_1_2;
tuple = callPackage ../development/libraries/haskell/tuple {}; tuple = callPackage ../development/libraries/haskell/tuple {};
@ -2442,7 +2444,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
darcs = callPackage ../applications/version-management/darcs {}; darcs = callPackage ../applications/version-management/darcs {};
idris_plain = callPackage ../development/compilers/idris {}; idris_plain = callPackage ../development/compilers/idris {
trifecta = self.trifecta_1_1;
};
idris = callPackage ../development/compilers/idris/wrapper.nix {}; idris = callPackage ../development/compilers/idris/wrapper.nix {};