Merge pull request #2483 from proger/haskell-ekg-0.4

haskell: bump ekg to 0.4, add ekg-core
This commit is contained in:
Peter Simons 2014-05-03 19:30:02 +02:00
commit 0138b81ed6
3 changed files with 21 additions and 6 deletions

View File

@ -0,0 +1,14 @@
{ cabal, text, unorderedContainers }:
cabal.mkDerivation (self: {
pname = "ekg-core";
version = "0.1.0.0";
sha256 = "19ghqj9zbb198d45bw7k9mlf2z57yq74wgbkp62b9li2ndbcpdzh";
buildDepends = [ text unorderedContainers ];
meta = {
homepage = "https://github.com/tibbe/ekg-core";
description = "Tracking of system metrics";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View File

@ -1,14 +1,14 @@
{ cabal, aeson, filepath, network, snapCore, snapServer, text, time
, transformers, unorderedContainers
{ cabal, aeson, ekgCore, filepath, network, snapCore, snapServer
, text, time, transformers, unorderedContainers
}:
cabal.mkDerivation (self: {
pname = "ekg";
version = "0.3.1.4";
sha256 = "0hr9962yx463rq53xfqfm7vlv9izn47v3css3m6n4v694qlyz95i";
version = "0.4.0.0";
sha256 = "1w448w17yp80zmb27yl90k3gz0nx3wxj52488lclmiapr6q4fgp8";
buildDepends = [
aeson filepath network snapCore snapServer text time transformers
unorderedContainers
aeson ekgCore filepath network snapCore snapServer text time
transformers unorderedContainers
];
meta = {
homepage = "https://github.com/tibbe/ekg";

View File

@ -1039,6 +1039,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
editline = self.editline_0_2_1_1;
ekg = callPackage ../development/libraries/haskell/ekg {};
ekgCore = callPackage ../development/libraries/haskell/ekg-core {};
elerea = callPackage ../development/libraries/haskell/elerea {};