Merge branch 'master' of git://github.com/soenkehahn/nixpkgs

packaging hp2any-manager and dependencies
This commit is contained in:
Shea Levy 2014-06-15 11:00:40 -04:00
commit 7a0c66c829
3 changed files with 41 additions and 0 deletions

View File

@ -0,0 +1,16 @@
{ pkgs, cabal, gtk, gtk2hsBuildtools, pangox_compat }:
cabal.mkDerivation (self: {
pname = "gtkglext";
version = "0.12.5.0";
sha256 = "1xhalcb85cpswdpqxx64fxpmyqq7iakgaczjrbr25fp0h1glshhk";
buildDepends = [ gtk ];
buildTools = [ gtk2hsBuildtools ];
pkgconfigDepends = [ pkgs.gnome2.gtkglext pangox_compat ];
meta = {
homepage = "http://projects.haskell.org/gtk2hs/";
description = "Binding to the GTK+ OpenGL Extension";
license = self.stdenv.lib.licenses.lgpl21;
platforms = self.ghc.meta.platforms;
};
})

View File

@ -0,0 +1,21 @@
{ cabal, cairo, filepath, glade, glib, gtk, gtkglext, hp2anyCore
, hp2anyGraph, OpenGL, time
}:
cabal.mkDerivation (self: {
pname = "hp2any-manager";
version = "0.4.6";
sha256 = "143j3ylvzyq1s2l357vzqrwdcgg6rqhnmv0awb3nvm66c9smaarv";
isLibrary = false;
isExecutable = true;
buildDepends = [
cairo filepath glade glib gtk gtkglext hp2anyCore hp2anyGraph
OpenGL time
];
meta = {
homepage = "http://www.haskell.org/haskellwiki/Hp2any";
description = "A utility to visualise and compare heap profiles";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View File

@ -928,6 +928,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
libc = pkgs.stdenv.gcc.libc;
};
gtkglext = callPackage ../development/libraries/haskell/gtkglext {};
gtk2hsBuildtools = callPackage ../development/libraries/haskell/gtk2hs-buildtools {};
gtk2hsC2hs = self.gtk2hsBuildtools;
@ -2657,6 +2659,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
hlint = callPackage ../development/tools/haskell/hlint {};
hp2anyManager = callPackage ../development/tools/haskell/hp2any-manager {};
hscolour = callPackage ../development/tools/haskell/hscolour {};
hscolourBootstrap = self.hscolour.override {
cabal = self.cabal.override {