lambdabot: Get it building again against older packages

This commit is contained in:
John Wiegley 2014-10-16 21:44:25 -05:00
parent 0fac38fd48
commit 57eb7f107d
4 changed files with 59 additions and 1 deletions

View File

@ -0,0 +1,30 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, aeson, binary, blazeBuilder, Cabal, caseInsensitive
, cmdargs, conduit, deepseq, filepath, haskellSrcExts, httpTypes
, parsec, QuickCheck, random, resourcet, safe, shake, tagsoup
, temporary, text, time, transformers, uniplate, vector
, vectorAlgorithms, wai, warp
}:
cabal.mkDerivation (self: {
pname = "hoogle";
version = "4.2.34";
sha256 = "0vldc7s3nq70jxmnxdzlfrlwg0pxw0lq1lcd53klj2ksjkqhm5jg";
isLibrary = true;
isExecutable = true;
buildDepends = [
aeson binary blazeBuilder Cabal caseInsensitive cmdargs conduit
deepseq filepath haskellSrcExts httpTypes parsec QuickCheck random
resourcet safe shake tagsoup text time transformers uniplate vector
vectorAlgorithms wai warp
];
testDepends = [ filepath temporary ];
testTarget = "--test-option=--no-net";
meta = {
homepage = "http://www.haskell.org/hoogle/";
description = "Haskell API Search";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View File

@ -16,6 +16,7 @@ cabal.mkDerivation (self: {
sha256 = "19pkm4m2xk9ziai3ka4scxjavi0as8dmivz9q6vg3npmv0kyhkhb";
isLibrary = true;
isExecutable = true;
patches = [ ./deps.patch ];
buildDepends = [
arrows binary brainfuck dataMemocombinators dependentMap
dependentSum dependentSumTemplate dice editDistance filepath

View File

@ -0,0 +1,21 @@
--- a/lambdabot.cabal.orig 2014-10-16 17:39:16.000000000 -0500
+++ b/lambdabot.cabal 2014-10-16 18:26:58.000000000 -0500
@@ -166,7 +166,7 @@
edit-distance >= 0.2,
filepath >= 1.3,
haskeline >= 0.7,
- haskell-src-exts >= 1.14.0,
+ haskell-src-exts >= 1.14.0 && < 1.16,
hstatsd >= 0.1,
hslogger >= 1.2.1,
HTTP >= 4000,
@@ -174,7 +174,8 @@
misfortune >= 0.1,
monad-control >= 0.3,
mtl >= 2,
- network >= 2.3.0.13,
+ network >= 2.6,
+ network-uri >= 2.6,
oeis >= 0.3.1,
time >= 1.4,
parsec >= 3,

View File

@ -1244,6 +1244,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
hoodleTypes = callPackage ../development/libraries/haskell/hoodle-types {};
hoogle_4_2_34 = callPackage ../development/libraries/haskell/hoogle/4.2.34.nix {};
hoogle = callPackage ../development/libraries/haskell/hoogle {};
hoogleLocal = callPackage ../development/libraries/haskell/hoogle/local.nix {};
@ -1468,7 +1469,12 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
languageHaskellExtract = callPackage ../development/libraries/haskell/language-haskell-extract {};
lambdabot = callPackage ../development/libraries/haskell/lambdabot {};
lambdabot = callPackage ../development/libraries/haskell/lambdabot {
haskellSrcExts = self.haskellSrcExts_1_15_0_1;
hoogle = self.hoogle_4_2_34.override {
haskellSrcExts = self.haskellSrcExts_1_15_0_1;
};
};
lambdabotWrapper = callPackage ../development/libraries/haskell/lambdabot/wrapper.nix {
mueval = self.muevalWrapper.override {