diff options
Diffstat (limited to 'pkgs/development/libraries')
5 files changed, 36 insertions, 7 deletions
diff --git a/pkgs/development/libraries/haskell/cabal/cabal.nix b/pkgs/development/libraries/haskell/cabal/cabal.nix index fc719e032ac24..87e2563bc7b46 100644 --- a/pkgs/development/libraries/haskell/cabal/cabal.nix +++ b/pkgs/development/libraries/haskell/cabal/cabal.nix @@ -54,9 +54,12 @@ test -f $i && ghc --make $i done - for p in $propagatedBuildNativeInputs; do + for p in $extraBuildInputs $propagatedBuildNativeInputs; do + if [ -d "$p/include" ]; then + extraLibDirs="$extraLibDirs --extra-include-dir=$p/include" + fi for d in lib{,64}; do - if [ -e "$p/$d" ]; then + if [ -d "$p/$d" ]; then extraLibDirs="$extraLibDirs --extra-lib-dir=$p/$d" fi done diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix new file mode 100644 index 0000000000000..df4cdf5b46498 --- /dev/null +++ b/pkgs/development/libraries/haskell/cairo/default.nix @@ -0,0 +1,14 @@ +{cabal, gtk2hsBuildtools, pkgconfig, glibc, cairo, zlib, mtl}: + +cabal.mkDerivation (self : { + pname = "cairo"; + version = "0.11.0"; + sha256 = "f7971180bbd40c2a19b2e97fe40bd4a296b3aaf3edcf6621009780d723405c5a"; + extraBuildInputs = [pkgconfig glibc cairo zlib gtk2hsBuildtools]; + propagatedBuildInputs = [mtl]; + meta = { + description = "Binding to the Cairo library"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix new file mode 100644 index 0000000000000..41a3ac41e54dd --- /dev/null +++ b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix @@ -0,0 +1,13 @@ +{cabal, alex, happy}: + +cabal.mkDerivation (self : { + pname = "gtk2hs-buildtools"; + version = "0.9"; + sha256 = "2586c419394601c1840d827d32cdb9d76bc94d71c03fdfa23c8d04cba99c6b20"; + extraBuildInputs = [alex happy]; + meta = { + description = "Tools to build the Gtk2Hs suite of User Interface libraries"; + license = "GPL"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) diff --git a/pkgs/development/libraries/haskell/hashed-storage/default.nix b/pkgs/development/libraries/haskell/hashed-storage/default.nix index ff89b3b8f109b..fb096838ed4fe 100644 --- a/pkgs/development/libraries/haskell/hashed-storage/default.nix +++ b/pkgs/development/libraries/haskell/hashed-storage/default.nix @@ -2,12 +2,11 @@ cabal.mkDerivation (self : { pname = "hashed-storage"; - version = "0.4.11"; - sha256 = "c719f9b86c5a517324ce3448fcb4b6377ccbfa085268b396bec47b8bbcfbde1b"; + version = "0.4.13"; + sha256 = "c4e8dbd23469cde19696344f3e56088313ce5ee823e2d89ad2d0cb1fce602b63"; propagatedBuildInputs = [mtl zlib mmap binary dataenc]; meta = { description = "Hashed file storage support code"; maintainers = [self.stdenv.lib.maintainers.andres]; }; -}) - +}) diff --git a/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix index 95ee5e6beb3c6..5e39d3ddffb3a 100644 --- a/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix +++ b/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix @@ -7,7 +7,7 @@ cabal.mkDerivation (self : { version = "2010.2.0.0"; src = fetchurl { url = "http://hackage.haskell.org/platform/${self.version}/cabal/${self.pname}-${self.version}.tar.gz"; - sha256 = "b0f4e6827d653f68865f39679c7c4fd5c22030ef5d7d24df3270aa6db4b016d4"; + sha256 = "c0b0b45151e74cff759ae25083c2ff7a7af4d2f74c19294b78730c879864f3c0"; }; propagatedBuildInputs = [ GLUT HTTP HUnit OpenGL QuickCheck cgi fgl |