* Sync with the trunk.

svn path=/nixpkgs/branches/modular-python/; revision=26586

pkgs/development/compilers/ghc/7.0.2.nix

@@ -1,19 +1,16 @@
-{stdenv, fetchurl, ghc, perl, gmp, ncurses}:
+{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
 
 stdenv.mkDerivation rec {
   version = "7.0.2";
-  
   name = "ghc-${version}";
-  
-  # TODO: Does this have to be here, or can it go to meta?
-  homepage = "http://haskell.org/ghc";
 
   src = fetchurl {
     url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2";
     sha256 = "f0551f1af2f008a8a14a888b70c0557e00dd04f9ae309ac91897306cd04a6668";
   };
 
-  buildInputs = [ghc perl gmp ncurses];
+  buildInputs = [ghc perl gmp ncurses] ++
+    (if stdenv.isDarwin then [darwinInstallNameToolUtility] else []);
 
   buildMK = ''
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
@@ -22,6 +19,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     echo "${buildMK}" > mk/build.mk
+    sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
   '';
 
   configureFlags=[
@@ -33,13 +31,13 @@ stdenv.mkDerivation rec {
   stripDebugFlags=["-S" "--keep-file-symbols"];
 
   meta = {
-    inherit homepage;
+    homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
     maintainers = [
       stdenv.lib.maintainers.marcweber
       stdenv.lib.maintainers.andres
     ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
   };
 
 }

pkgs/development/compilers/pakcs/default.nix

@@ -0,0 +1,81 @@
+{ stdenv, fetchurl, ghc, swiProlog, syb, mtl, makeWrapper, rlwrap, tk }:
+
+stdenv.mkDerivation rec {
+  pname = "pakcs";
+  version = "1.9.2";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "http://www.informatik.uni-kiel.de/~pakcs/download/pakcs_src.tar.gz";
+    sha256 = "1sa6k4s5avn3qvica3a5zvb6q9vnawpp00zviqjwncwwd4a9bcwm";
+  };
+
+  buildInputs = [ ghc swiProlog syb mtl makeWrapper rlwrap tk ];
+
+  prePatch = ''
+    # Remove copying pakcsrc into $HOME.
+    sed -i '/update-pakcsrc/d' Makefile
+
+    # Remove copying pakcsinitrc into $HOME
+    sed -i '68d' configure-pakcs
+  '';
+
+  preConfigure = ''
+    # Path to GHC and SWI Prolog
+    sed -i 's@GHC=@GHC=${ghc}/bin/ghc@' bin/.pakcs_variables
+    sed -i 's@SWIPROLOG=@SWIPROLOG=${swiProlog}/bin/swipl@' bin/.pakcs_variables
+  '';
+
+  postInstall = ''
+    cp pakcsrc $out/
+    cp update-pakcsrc $out/
+    cp -r bin/ $out/
+    cp -r cpns/ $out/
+    cp -r curry2prolog/ $out/
+    cp -r docs/ $out/
+    cp -r examples/ $out/
+    cp -r include/ $out/
+    cp -r lib/ $out/
+    cp -r mccparser/ $out/
+    cp -r tools/ $out/
+    cp -r www/ $out/
+
+    # The Prolog sources must be built in their final directory.
+    (cd $out/curry2prolog/ ; make)
+
+    ensureDir $out/share/emacs/site-lisp/curry-pakcs
+    for e in $out/tools/emacs/*.el ; do
+      ln -s $out/tools/emacs/$e $out/share/emacs/site-lisp/curry-pakcs/;
+    done
+
+    sed -i 's@which@type -P@' $out/bin/.pakcs_wrapper
+
+    # Get the program name from the environment instead of the calling wrapper (for rlwrap).
+    sed -i 's@progname=`basename "$0"`@progname=$PAKCS_PROGNAME@' $out/bin/.pakcs_wrapper
+
+    wrapProgram $out/bin/.pakcs_wrapper \
+      --prefix PATH ":" "${rlwrap}/bin" \
+      --prefix PATH ":" "${tk}/bin" \
+      --run 'export PAKCS_PROGNAME=`basename "$0"`'
+  '';
+
+  meta = {
+    description = "PAKCS is an implementation of the multi-paradigm declarative language Curry.";
+    longDescription = ''
+      PAKCS is an implementation of the multi-paradigm declarative language
+      Curry jointly developed by the Portland State University, the Aachen
+      University of Technology, and the University of Kiel. Although this is
+      not a highly optimized implementation but based on a high-level
+      compilation of Curry programs into Prolog programs, it is not a toy
+      implementation but has been used for a variety of applications (e.g.,
+      graphical programming environments, an object-oriented front-end for
+      Curry, partial evaluators, database applications, HTML programming
+      with dynamic web pages, prototyping embedded systems).
+    '';
+
+    homepage = http://www.informatik.uni-kiel.de/~pakcs/;
+    license = stdenv.lib.licenses.bsd3;
+    maintainers = [ stdenv.lib.maintainers.kkallio ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}

pkgs/development/compilers/swi-prolog/default.nix

@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, gmp, readline, openssl, libjpeg, unixODBC, zlib, libXinerama, libXft, libXpm, libSM, libXt }:
+{ stdenv, fetchurl, gmp, readline, openssl, libjpeg, unixODBC, zlib, 
+   libXinerama, libXft, libXpm, libSM, libXt, freetype, pkgconfig,
+   fontconfig }:
 
 stdenv.mkDerivation rec {
   version = "5.10.2";
@@ -9,10 +11,15 @@ stdenv.mkDerivation rec {
     sha256 = "1a3ebbcd649f429a41b64561d38423692e00524c29227432d0eb5a0e24e2a4c9";
   };
 
-  buildInputs = [gmp readline openssl libjpeg unixODBC libXinerama libXft libXpm libSM libXt zlib];
+  buildInputs = [gmp readline openssl libjpeg unixODBC libXinerama 
+    libXft libXpm libSM libXt zlib freetype pkgconfig fontconfig];
   configureFlags = "--with-world --enable-gmp --enable-shared";
   makeFlags = "world";
 
+  preConfigure = ''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2"
+  '';
+
   meta = {
     homepage = http://www.swi-prolog.org/;
     description = "A Prolog compiler and interpreter";

pkgs/development/guile-modules/guile-lib/default.nix

@@ -1,17 +1,22 @@
 {stdenv, fetchurl, guile, texinfo}:
 
 stdenv.mkDerivation rec {
-  name = "guile-lib-0.1.9";
+  name = "guile-lib-0.2.0";
 
   src = fetchurl {
     url = "mirror://savannah/guile-lib/${name}.tar.gz";
-    sha256 = "13sc2x9x0rmfgfa69wabyhajc70yiywih9ibszjmkhxcm2zx0gan";
+    sha256 = "14acyznc0xgjd33fb9ngil102nvbhx12bvxi4hd25pl66i2d6izc";
   };
 
   buildInputs = [guile texinfo];
 
   doCheck = true;
 
+  preCheck =
+    # Make `libgcc_s.so' visible for `pthread_cancel'.
+    '' export LD_LIBRARY_PATH="$(dirname $(echo ${stdenv.gcc.gcc}/lib*/libgcc_s.so)):$LD_LIBRARY_PATH"
+    '';
+
   meta = {
     description = "Guile-Library, a collection of useful Guile Scheme modules";
     homepage = http://www.nongnu.org/guile-lib/;

pkgs/development/interpreters/j/default.nix

@@ -0,0 +1,81 @@
+x@{builderDefsPackage
+  , readline
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    [];
+
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  sourceInfo = rec {
+    baseName="j";
+    version="701_b";
+    name="${baseName}-${version}";
+    url="http://www.jsoftware.com/download/${baseName}${version}_source.tar.gz";
+    hash="1gmjlpxcd647x690c4dxnf8h6ays8ndir6cib70h3zfnkrc34cys";
+  };
+in
+rec {
+  src = a.fetchurl {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.hash;
+  };
+
+  inherit (sourceInfo) name version;
+  inherit buildInputs;
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doUnpack" "doBuildJ" "doDeploy"];
+
+  bits = if a.stdenv.system == "i686-linux" then 
+    "32"
+  else if a.stdenv.system == "x86_64-linux" then
+    "64"
+  else 
+    throw "Oops, unknown system: ${a.stdenv.system}";
+
+  doBuildJ = a.fullDepEntry ''
+    sed -i bin/jconfig -e 's@bits=32@bits=${bits}@g; s@readline=0@readline=1@; s@LIBREADLINE=""@LIBREADLINE=" -lreadline "@'
+    sed -i bin/build_libj -e 's@>& make.txt@ 2>\&1 | tee make.txt@'
+
+    touch *.c *.h
+    sh bin/build_jconsole
+    sh bin/build_libj
+    sh bin/build_defs
+    sh bin/build_tsdll
+
+    sed -i j/bin/profile.ijs -e "s@userx=[.] *'.j'@userx=. '/.j'@; 
+        s@bin,'/profilex.ijs'@user,'/profilex.ijs'@ ;
+	/install=./ainstall=. install,'/share/j'
+	"
+  '' ["doUnpack" "addInputs" "minInit"];
+
+  doDeploy = a.fullDepEntry ''
+    ensureDir "$out"
+    cp -r j/bin "$out/bin"
+    rm "$out/bin/profilex_template.ijs"
+    
+    ensureDir "$out/share/j"
+
+    cp -r docs j/addons j/system "$out/share/j"
+  '' ["doUnpack" "doBuildJ" "minInit" "defEnsureDir"];
+      
+  meta = {
+    description = "J programming language, an ASCII-based APL successor";
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux;
+    license = a.lib.licenses.gpl3Plus;
+  };
+  passthru = {
+    updateInfo = {
+      downloadPage = "http://jsoftware.com/source.htm";
+    };
+  };
+}) x
+

pkgs/development/interpreters/picolisp/default.nix

@@ -0,0 +1,66 @@
+x@{builderDefsPackage
+  , jdk /* only used in bootstrap */
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    [];
+
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  sourceInfo = rec {
+    baseName="picolisp";
+    tarballBaseName="picoLisp";
+    version="3.0.5";
+    name="${baseName}-${version}";
+    tarballName="${tarballBaseName}-${version}";
+    extension="tgz";
+    url="http://www.software-lab.de/${tarballName}.${extension}";
+    hash="07w2aygllkmnfcnby3dy88n9giqsas35s77rp2lr2ll5yy2hkc0x";
+  };
+in
+rec {
+  src = a.fetchurl {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.hash;
+  };
+
+  inherit (sourceInfo) name version;
+  inherit buildInputs;
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doMake" "doDeploy"];
+
+  goSrcDir = if a.stdenv.system == "x86_64-linux" then 
+    "cd src64" else "cd src";
+  makeFlags = [''PREFIX=$out''];
+
+  doDeploy = a.fullDepEntry (''
+    cd ..
+
+    sed -e "s@/usr/@$out/@g" -i bin/pil
+
+    ensureDir "$out/share/picolisp" "$out/lib" "$out/bin"
+    cp -r . "$out/share/picolisp/build-dir"
+    ln -s "$out/share/picolisp/build-dir" "$out/lib/picolisp"
+    ln -s "$out/lib/picolisp/bin/picolisp" "$out/bin/picolisp"
+  '') ["minInit" "defEnsureDir" "doMake"];
+      
+  meta = {
+    description = "An interpreter for a small Lisp dialect with builtin DB";
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux;
+    license = a.lib.licenses.mit;
+  };
+  passthru = {
+    updateInfo = {
+      downloadPage = "http://www.software-lab.de/down.html";
+    };
+  };
+}) x
+

pkgs/development/libraries/SDL_gfx/default.nix

@@ -12,7 +12,12 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--disable-mmx";
 
-  postInstall = "ln -s $out/include/SDL/*.h $out/include/";
+  postInstall = ''
+    sed -i -e 's,"SDL.h",<SDL/SDL.h>,' \
+      $out/include/SDL/*.h
+    
+    ln -s $out/include/SDL/*.h $out/include/;
+  '';
 
   meta = {
     description = "SDL graphics drawing primitives and support functions";

pkgs/development/libraries/SDL_image/default.nix

@@ -13,7 +13,15 @@ stdenv.mkDerivation rec {
 
   buildInputs = [SDL libpng libjpeg libtiff libungif libXpm];
 
-  postInstall = "ln -sv $out/include/SDL/SDL_image.h $out/include/";
+  postInstall = ''
+    sed -i -e 's,"SDL.h",<SDL/SDL.h>,' \
+    -e 's,"SDL_version.h",<SDL/SDL_version.h>,' \
+    -e 's,"begin_code.h",<SDL/begin_code.h>,' \
+    -e 's,"close_code.h",<SDL/close_code.h>,' \
+      $out/include/SDL/SDL_image.h
+
+    ln -sv $out/include/SDL/SDL_image.h $out/include/
+  '';
 
   meta = {
     description = "SDL image library";

pkgs/development/libraries/allegro/default.nix

@@ -1,7 +1,7 @@
 x@{builderDefsPackage
   , texinfo, libXext, xextproto, libX11, xproto, libXpm, libXt, libXcursor
   , alsaLib, cmake, zlib, libpng, libvorbis, libXxf86dga, libXxf86misc
-  , xf86dgaproto, xf86miscproto, xf86vidmodeproto, libXxf86vm, openal
+  , xf86dgaproto, xf86miscproto, xf86vidmodeproto, libXxf86vm, openal, mesa
   , ...}:
 builderDefsPackage
 (a :  

pkgs/development/libraries/asio/default.nix

@@ -0,0 +1,20 @@
+{stdenv, fetchurl, boost, openssl}:
+
+stdenv.mkDerivation rec {
+  name = "asio-1.5.3";
+  
+  src = fetchurl {
+    url = "mirror://sourceforge/asio/${name}.tar.bz2";
+    sha256 = "08fdsv1zhwbfwlx3r3dzl1371lxy5gw92ms0kqcscxqn0ycf3rlj";
+  };
+
+  propagatedBuildInputs = [ boost ];
+  buildInputs = [ openssl ];
+
+  meta = {
+    homepage = http://asio.sourceforge.net/;
+    description = "Cross-platform C++ library for network and low-level I/O programming";
+    license = "boost";
+  };
+
+}

pkgs/development/libraries/boost/default.nix

@@ -59,6 +59,16 @@ stdenv.mkDerivation {
 
   installPhase = ":";
 
+  patches = [
+    # Patch to get rid of following error, experienced by some packages like encfs, bitcoin:
+    #    terminate called after throwing an instance of 'std::runtime_error'
+    #    what():  locale::facet::_S_create_c_locale name not valid
+    (fetchurl { 
+       url = https://svn.boost.org/trac/boost/raw-attachment/ticket/4688/boost_filesystem.patch ;
+       sha256 = "15k91ihzs6190pnryh4cl0b3c2pjpl9d790mr14x16zq52y7px2d"; 
+     })
+  ];
+  
   crossAttrs = rec {
     buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ];
     # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to

pkgs/development/libraries/db4/db4-4.7.nix

@@ -0,0 +1,18 @@
+{stdenv, fetchurl, cxxSupport ? true, compat185 ? true}:
+
+stdenv.mkDerivation {
+  name = "db4-4.7.25";
+  
+  builder = ./builder.sh;
+  
+  src = fetchurl {
+    url = http://download-east.oracle.com/berkeley-db/db-4.7.25.tar.gz;
+    sha256 = "0gi667v9cw22c03hddd6xd6374l0pczsd56b7pba25c9sdnxjkzi";
+  };
+  
+  configureFlags = [
+    (if cxxSupport then "--enable-cxx" else "--disable-cxx")
+    (if compat185 then "--enable-compat185" else "--disable-compat185")
+  ];
+  
+}

pkgs/development/libraries/db4/db4-4.8.nix

@@ -0,0 +1,18 @@
+{stdenv, fetchurl, cxxSupport ? true, compat185 ? true}:
+
+stdenv.mkDerivation {
+  name = "db4-4.8.26";
+  
+  builder = ./builder.sh;
+  
+  src = fetchurl {
+    url = http://download-east.oracle.com/berkeley-db/db-4.8.26.tar.gz;
+    sha256 = "0hcxh0kb6m0wk3apjhs57p7b171zzn63rg4l3nkcavygg5gx2mgp";
+  };
+  
+  configureFlags = [
+    (if cxxSupport then "--enable-cxx" else "--disable-cxx")
+    (if compat185 then "--enable-compat185" else "--disable-compat185")
+  ];
+  
+}

pkgs/development/libraries/enet/default.nix

@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "enet-1.3.0";
+  name = "enet-1.3.1";
   
   src = fetchurl {
     url = "http://enet.bespin.org/download/${name}.tar.gz";
-    sha256 = "0b6nv3q546mr1vr74jccd4nsad9zkmjn17kdrqxxnyc944djf310";
+    sha256 = "1faszy5jvxcbjvnqzxaxpcm0rh8xib52pgn2zm1vyc9gg957hw99";
   };
 
   meta = {

pkgs/development/libraries/freeimage/default.nix

@@ -1,9 +1,9 @@
 {stdenv, fetchurl, unzip}:
 stdenv.mkDerivation {
-  name = "freeimage-3.14.1";
+  name = "freeimage-3.15.0";
   src = fetchurl {
-    url = mirror://sourceforge/freeimage/FreeImage3141.zip;
-    sha256 = "0rgzdjwzd64z5z9j4bq075h3kfqjk8ab2dwswy0lnzw9jvmbbifm";
+    url = mirror://sourceforge/freeimage/FreeImage3150.zip;
+    sha256 = "0diyj862sdqwjqb7v2nccf8cl6886v937jkw6dgszp86qpwsfx3n";
   };
   buildInputs = [ unzip ];
   prePatch = ''
@@ -12,7 +12,6 @@ stdenv.mkDerivation {
         -e 's@ldconfig@echo not running ldconfig@' \
         -i Makefile.gnu
   '';
-  patches = [ ./memset.patch ];
   preInstall = "mkdir -p $out/include $out/lib";
 
   meta = {

pkgs/development/libraries/freeimage/memset.patch

@@ -1,11 +0,0 @@
-diff -urN a/Source/OpenEXR/Imath/ImathMatrix.h b/Source/OpenEXR/Imath/ImathMatrix.h
---- a/Source/OpenEXR/Imath/ImathMatrix.h 2010-07-17 12:48:40.000000000 +0200
-+++ b/Source/OpenEXR/Imath/ImathMatrix.h 2010-09-03 18:38:37.138598422 +0200
-@@ -49,6 +49,7 @@
- #include "ImathVec.h"
- #include "ImathShear.h"
- 
-+#include <string.h>
- #include <iostream>
- #include <iomanip>
- 

pkgs/development/libraries/fribidi/default.nix

@@ -1,11 +1,12 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "fribidi-0.10.9";
+stdenv.mkDerivation rec {
+  name = "fribidi-${version}";
+  version = "0.19.2";
   
   src = fetchurl {
-    url = http://fribidi.org/download/fribidi-0.10.9.tar.gz;
-    sha256 = "1d479wbygqmxcsyg3g7d6nmzlaa3wngy21ci5qcc5nhbyn97bz5q";
+    url = "http://fribidi.org/download/${name}.tar.gz";
+    sha256 = "0xs1yr22zw9a1qq9ygsrqam0vzqdvb0ndzvjb3i2zda8drc93ks9";
   };
 
   meta = {

pkgs/development/libraries/gstreamer/gstreamer/default.nix

@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
   # Hm, apparently --disable-gtk-doc is ignored...
   postInstall = "rm -rf $out/share/gtk-doc";
 
+  setupHook = ./setup-hook.sh;
+
   meta = {
     homepage = http://gstreamer.freedesktop.org;
 

pkgs/development/libraries/haskell/AC-Vector/default.nix

@@ -9,5 +9,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 

pkgs/development/libraries/haskell/Agda/default.nix

@@ -14,5 +14,5 @@ cabal.mkDerivation (self : {
     description = "A dependently typed functional language and proof assistant";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 

pkgs/development/libraries/haskell/AspectAG/default.nix

@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "LGPL";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 

pkgs/development/libraries/haskell/Boolean/default.nix

@@ -9,5 +9,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 

pkgs/development/libraries/haskell/CS173Tourney/default.nix

@@ -3,16 +3,16 @@
 cabal.mkDerivation (self : {
   pname = "CS173Tourney";
   version = "2.5.2";
-  
+
   src = fetchgit {
     url = git://github.com/arjunguha/173tourney.git;
     rev = "dce044761b008cb685a675a1f35be6aff66fed21" ;
     md5 = "21e5e5c2e184b4b70696d4d6c60e51d3";
   };
-  patches = [./sendmail.patch]; 
+  patches = [./sendmail.patch];
   propagatedBuildInputs = [json time hslogger Crypto base64string CouchDB WebServer WebServerExtras];
   meta = {
     description = "";
   };
-})  
+})
 

pkgs/development/libraries/haskell/Chart/default.nix

@@ -11,5 +11,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 

pkgs/development/libraries/haskell/ConfigFile/default.nix

@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "LGPL";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 

pkgs/development/libraries/haskell/CouchDB/default.nix

@@ -3,12 +3,12 @@
 cabal.mkDerivation (self : {
   pname = "CouchDB";
   version = "0.8.1.1";
-  
+
   sha256 = "91edc35782e43a3b8dd5c5d3c303b88c05c57ba686e9565a11fe4d060f9372d7";
 
   propagatedBuildInputs = [network HTTP mtl json];
   meta = {
     description = "";
   };
-})  
+})
 

pkgs/development/libraries/haskell/Crypto/default.nix

@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Several encryption algorithms for Haskell";
   };
-})  
+})
 

pkgs/development/libraries/haskell/Diff/default.nix

@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "O(ND) diff algorithm in Haskell";
   };
-})  
+})
 

pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix

@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A binding for the OpenGL Utility Toolkit";
   };
-})  
+})
 

pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix

@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A binding for the OpenGL Utility Toolkit";
   };
-})  
+})
 

pkgs/development/libraries/haskell/Graphalyze/default.nix

@@ -9,5 +9,5 @@ cabal.mkDerivation (self : {
     description = "A library to use graph theory analysis";
     license = "OtherLicene";
   };
-})  
+})
 

pkgs/development/libraries/haskell/HList/default.nix

@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Heterogeneous lists";
   };
-})  
+})
 

pkgs/development/libraries/haskell/HStringTemplate/default.nix

@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "StringTemplate implementation in Haskell";
   };
-})  
+})
 

pkgs/development/libraries/haskell/HTTP/3001.1.5.nix

@@ -2,7 +2,7 @@
 
 cabal.mkDerivation (self : {
   pname = "HTTP";
-  version = "3001.1.5"; 
+  version = "3001.1.5";
   sha256 = "e34d9f979bafbbf2e45bf90a9ee9bfd291f3c67c291a250cc0a6378431578aeb";
   propagatedBuildInputs = [mtl network parsec];
   meta = {

pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix

@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A unit testing framework for Haskell";
   };
-})  
+})
 

pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix

@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A unit testing framework for Haskell";
   };
-})  
+})
 

pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix

@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A unit testing framework for Haskell";
   };
-})  
+})
 

pkgs/development/libraries/haskell/Hipmunk/default.nix

@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A Haskell binding for Chipmunk";
   };
-})  
+})
 

pkgs/development/libraries/haskell/MaybeT-transformers/default.nix

@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 

pkgs/development/libraries/haskell/MaybeT/default.nix

@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 

pkgs/development/libraries/haskell/MemoTrie/default.nix

@@ -9,5 +9,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 

pkgs/development/libraries/haskell/MissingH/default.nix

@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "GPL";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 

pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix

@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Monad-transformer version of the Control.Exception module";
   };
-})  
+})
 

pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix

@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Monad-transformer compatible version of the Control.Exception module";
   };
-})  
+})
 

pkgs/development/libraries/haskell/MonadPrompt/default.nix

@@ -0,0 +1,17 @@
+{cabal, mtl}:
+
+cabal.mkDerivation (self : {
+  pname = "MonadPrompt";
+  version = "1.0.0.2";
+  sha256 = "01inbw0lfjrsgs68fvak1rxi76nhwsiyarfwl1g5mis4glmh4w4c";
+  propagatedBuildInputs = [mtl];
+  preConfigure = ''
+    sed -i 's|base<=4|base >= 3 \&\& < 5|' ${self.pname}.cabal
+  '';
+  meta = {
+    description = "MonadPrompt, implementation & examples";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
+

pkgs/development/libraries/haskell/MonadRandom/default.nix

@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Random-number generation monad";
   };
-})  
+})
 

pkgs/development/libraries/haskell/OpenAL/default.nix

@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A binding to the OpenAL cross-platform 3D audio API";
   };
-})  
+})
 

pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix

@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A binding for the OpenGL graphics system";
   };
-})  
+})
 

pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix

@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A binding for the OpenGL graphics system";
   };
-})  
+})
 

pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix

@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Automatic testing of Haskell programs";
   };
-})  
+})
 

pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix

@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Automatic testing of Haskell programs";
   };
-})  
+})
 

pkgs/development/libraries/haskell/QuickCheck/2.1.0.3.nix

@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 

pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix

@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 

pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix

@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 

pkgs/development/libraries/haskell/Ranged-sets/default.nix

@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 

pkgs/development/libraries/haskell/SDL-image/default.nix

@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Binding to libSDL_image";
   };
-})  
+})
 

pkgs/development/libraries/haskell/SDL-mixer/default.nix

@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Binding to libSDL_mixer";
   };
-})  
+})
 

pkgs/development/libraries/haskell/SDL-ttf/default.nix

@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Binding to libSDL_ttf";
   };
-})  
+})
 

pkgs/development/libraries/haskell/SDL/default.nix

@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Binding to libSDL";
   };
-})  
+})
 

pkgs/development/libraries/haskell/SHA/default.nix

@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Implementations of the SHA suite of message digest functions";
   };
-})  
+})
 

pkgs/development/libraries/haskell/SMTPClient/default.nix

@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 

pkgs/development/libraries/haskell/Shellac/Shellac-haskeline.nix

@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Haskeline backend module for Shellac";
   };
-})  
+})
 

pkgs/development/libraries/haskell/Shellac/Shellac-readline.nix

@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Readline backend module for Shellac";
   };
-})  
+})
 

pkgs/development/libraries/haskell/Shellac/Shellac.nix

@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A framework for creating shell environments";
   };
-})  
+})
 

pkgs/development/libraries/haskell/Vec/default.nix

@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 

pkgs/development/libraries/haskell/WebServer-Extras/default.nix

@@ -4,16 +4,16 @@
 cabal.mkDerivation (self : {
   pname = "WebServer-Extras";
   version = "1.2";
-  
+
   src = fetchgit {
     url = git://github.com/arjunguha/haskell-web.git;
     rev = "76c9aabd31d03f052a80a0f6999dc7c5f1b11c41" ;
     sha256 = "afd550a4c6aeffe2f3adb38556b8e9ae198e98db17338ea6c8fa92d56c7eddb7";
   };
-  sourceRoot = "git-export/Extras"; 
+  sourceRoot = "git-export/Extras";
   propagatedBuildInputs = [Crypto WebServer base64string hslogger json mtl];
   meta = {
     description = "";
   };
-})  
+})
 

pkgs/development/libraries/haskell/WebServer/default.nix

@@ -3,7 +3,7 @@
 cabal.mkDerivation (self : {
   pname = "WebServer";
   version = "1.2";
-  
+
   src = fetchgit {
     url = git://github.com/arjunguha/haskell-web.git;
     rev = "76c9aabd31d03f052a80a0f6999dc7c5f1b11c41" ;
@@ -14,5 +14,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "";
   };
-})  
+})
 

pkgs/development/libraries/haskell/X11-xft/default.nix

@@ -1,10 +1,11 @@
-{ ghc, cabal, X11, utf8String, pkgconfig, libXft }:
+{ ghc, cabal, X11, utf8String, pkgconfig, libXft, freetype, fontconfig }:
 cabal.mkDerivation (self : {
   pname = "X11-xft";
   version = "0.3";
   sha256 = "48892d0d0a90d5b47658877facabf277bf8466b7388eaf6ce163b843432a567d";
-  buildInputs = [ ghc pkgconfig libXft ];
+  buildInputs = [ ghc pkgconfig libXft freetype fontconfig ];
   propagatedBuildInputs = [ X11 utf8String ];
+  configureFlags=["--extra-include-dirs=${freetype}/include/freetype2"];
   meta = {
     homepage = http://hackage.haskell.org/package/X11-xft;
     description = "Haskell bindings to the Xft and some Xrender parts";

pkgs/development/libraries/haskell/ansi-terminal/default.nix

@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Simple ANSI terminal support, with Windows compatibility";
   };
-})  
+})
 

pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix

@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output";
   };
-})  
+})
 

pkgs/development/libraries/haskell/base64-string/default.nix

@@ -3,12 +3,12 @@
 cabal.mkDerivation (self : {
   pname = "base64-string";
   version = "0.1";
-  
+
   sha256 = "f9a6f050f5d9993313a1ceb49eba827ecf1046af51266d10b0dc899b53f13d8c";
 
   propagatedBuildInputs = [];
   meta = {
     description = "";
   };
-})  
+})
 

pkgs/development/libraries/haskell/bimap/default.nix

@@ -9,5 +9,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 

pkgs/development/libraries/haskell/binary-shared/default.nix

@@ -10,4 +10,4 @@ cabal.mkDerivation (self : {
     license = "GPL";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})

pkgs/development/libraries/haskell/binary/default.nix

@@ -7,4 +7,4 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Efficient, pure binary serialisation using lazy ByteStrings";
   };
-})  
+})

pkgs/development/libraries/haskell/bktrees/default.nix

@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
     description = "Burkhard-Keller trees sets implementation";
     license = "BSD3";
   };
-})  
+})
 

pkgs/development/libraries/haskell/cautious-file/default.nix

@@ -9,5 +9,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 

pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix

@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A library for writing CGI programs";
   };
-})  
+})
 

pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix

@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A library for writing CGI programs";
   };
-})  
+})
 

pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix

@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A library for writing CGI programs";
   };
-})  
+})
 

pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix

@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A library for writing CGI programs";
   };
-})  
+})
 

pkgs/development/libraries/haskell/citeproc-hs/default.nix

@@ -9,5 +9,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A Citation Style Language implementation in Haskell";
   };
-})  
+})
 

pkgs/development/libraries/haskell/colorize-haskell/default.nix

@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Highlight Haskell source";
   };
-})  
+})
 

pkgs/development/libraries/haskell/colour/default.nix

@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
     description = "Data type, conversion and composition of colours";
     license = "OtherLicense";
   };
-})  
+})
 

pkgs/development/libraries/haskell/convertible/default.nix

@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Typeclasses and instances for converting between types";
   };
-})  
+})
 

pkgs/development/libraries/haskell/csv/default.nix

@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "CSV loader and dumper";
   };
-})  
+})
 

pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix

@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 

pkgs/development/libraries/haskell/data-accessor/data-accessor.nix

@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 

pkgs/development/libraries/haskell/data-default/default.nix

@@ -0,0 +1,13 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "data-default";
+  version = "0.2.0.1";
+  sha256 = "0hhrzaykwybqpig0kss4iq1i93ygb80g8i1chpr84akmvdr07w0i";
+  meta = {
+    description = "A class for types with a default value";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
+

pkgs/development/libraries/haskell/digest/default.nix

@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Various cryptographic hashes for bytestrings: CRC32 and Adler32 for now";
   };
-})  
+})
 

pkgs/development/libraries/haskell/dlist/default.nix

@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 

pkgs/development/libraries/haskell/dotgen/default.nix

@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "A simple interface for building .dot graph files";
   };
-})  
+})
 

pkgs/development/libraries/haskell/editline/default.nix

@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Binding to the BSD editline library (libedit)";
   };
-})  
+})
 

pkgs/development/libraries/haskell/emgm/default.nix

@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Extensible and Modular Generics for the Masses";
   };
-})  
+})
 

pkgs/development/libraries/haskell/erf/default.nix

@@ -9,5 +9,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 

pkgs/development/libraries/haskell/extensible-exceptions/default.nix

@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Extensible exceptions";
   };
-})  
+})
 

pkgs/development/libraries/haskell/fclabels/default.nix

@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 

pkgs/development/libraries/haskell/feed/default.nix

@@ -10,5 +10,5 @@ cabal.mkDerivation (self : {
     license = "BSD";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
+})
 

pkgs/development/libraries/haskell/fgl/5.4.2.2.nix

@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Martin Erwig's Functional Graph Library";
   };
-})  
+})
 

pkgs/development/libraries/haskell/fgl/5.4.2.3.nix

@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Martin Erwig's Functional Graph Library";
   };
-})  
+})
 

pkgs/development/libraries/haskell/filepath/default.nix

@@ -8,5 +8,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Library for manipulating FilePath's in a cross platform way";
   };
-})  
+})