Updated leksah-process and leksah-server to version 0.10.x.

Unfortunately, I cannot test these updates because gtksourceview doesn't
compile:

  ./gtksourceview2.h:10:48: fatal error: gtksourceview/gtksourceundomanager.h: No such file or directory

Not sure what that means.

svn path=/nixpkgs/trunk/; revision=28341
This commit is contained in:
Peter Simons 2011-08-07 22:02:40 +00:00
parent 033dfd7338
commit c5281ae175
3 changed files with 26 additions and 19 deletions

View File

@ -1,15 +1,22 @@
{cabal, haddock, binary, binaryShared, deepseq, hslogger, ltk, mtl, {cabal, binary, binaryShared, deepseq, ghc, haddock, hslogger, ltk,
network, parsec, processLeksah}: mtl, network, parsec, processLeksah} :
cabal.mkDerivation (self : { cabal.mkDerivation (self : {
pname = "leksah-server"; pname = "leksah-server";
version = "0.8.0.8"; version = "0.10.0.4";
sha256 = "10srf3wzrnyjhw7q8lzzfqammjr9k1fgwqlkkcfkljbmsz9j0nfm"; sha256 = "0g523dkiaclk5ym16vzqiabh7mwksjqp0kbx17a899k5gzfwfjp6";
propagatedBuildInputs = propagatedBuildInputs = [
[binary binaryShared deepseq hslogger ltk mtl network parsec processLeksah haddock]; binary binaryShared deepseq ghc haddock hslogger ltk mtl network
parsec processLeksah
];
meta = { meta = {
description = "The interface to GHC-API for leksah"; homepage = "http://leksah.org";
description = "Metadata collection for leksah";
license = "GPL"; license = "GPL";
maintainers = [self.stdenv.lib.maintainers.andres]; platforms = self.stdenv.lib.platforms.haskellPlatforms;
maintainers = [
self.stdenv.lib.maintainers.simons
self.stdenv.lib.maintainers.andres
];
}; };
}) })

View File

@ -2,11 +2,15 @@
cabal.mkDerivation (self : { cabal.mkDerivation (self : {
pname = "process-leksah"; pname = "process-leksah";
version = "1.0.1.3"; version = "1.0.1.4";
sha256 = "1pssbpcslrl39z495gf0v2xjgy2i6qpvxbrf4p0hkvrwycr7pnd8"; sha256 = "1899ybhnsj22sir2l933lhkk9fpcgjbb4qd6gscnby28qcs5bwbv";
meta = { meta = {
description = "This package contains libraries for dealing with system processes"; description = "Process libraries";
license = "BSD"; license = self.stdenv.lib.licenses.bsd3;
maintainers = [self.stdenv.lib.maintainers.andres]; platforms = self.stdenv.lib.platforms.haskellPlatforms;
maintainers = [
self.stdenv.lib.maintainers.simons
self.stdenv.lib.maintainers.andres
];
}; };
}) })

View File

@ -744,9 +744,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
jsonTypes = callPackage ../development/libraries/haskell/jsonTypes {}; jsonTypes = callPackage ../development/libraries/haskell/jsonTypes {};
leksahServer = callPackage ../development/libraries/haskell/leksah/leksah-server.nix { leksahServer = callPackage ../development/libraries/haskell/leksah/leksah-server.nix {};
network = self.network_2_2_1_7;
};
ListLike = callPackage ../development/libraries/haskell/ListLike {}; ListLike = callPackage ../development/libraries/haskell/ListLike {};
@ -1315,8 +1313,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
}; };
leksah = callPackage ../applications/editors/leksah { leksah = callPackage ../applications/editors/leksah {
network = self.network_2_2_1_7;
regexBase = self.regexBase_0_93_2;
inherit (pkgs) makeWrapper; inherit (pkgs) makeWrapper;
}; };