From db6b88a50b68aeae7a9967df3c261753aff7c6bd Mon Sep 17 00:00:00 2001
From: Alexander Foremny <alexanderforemny@gmail.com>
Date: Tue, 24 Jul 2012 00:41:58 +0200
Subject: [PATCH 1/7] attempt on Nix expression for xbmc

configure fails while trying to lookup the sonames of some libraries.
---
 pkgs/applications/multimedia/xbmc/default.nix | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 pkgs/applications/multimedia/xbmc/default.nix

diff --git a/pkgs/applications/multimedia/xbmc/default.nix b/pkgs/applications/multimedia/xbmc/default.nix
new file mode 100644
index 00000000000..081d6108793
--- /dev/null
+++ b/pkgs/applications/multimedia/xbmc/default.nix
@@ -0,0 +1,25 @@
+{
+  stdenv, fetchurl, boost, mesa, glew, mysql, libass, libmpeg2, libmad,
+  libjpeg, libsamplerate, libogg, libvorbis, libmodplug, curl, flac, libgcrypt,
+  bzip2, libtiff, lzo, yajl, pkgconfig, fontconfig, fribidi, sqlite, libpng,
+  pcre, libcdio, freetype, jasper, SDL, SDL_mixer, SDL_image, alsaLib, dbus,
+  libbluray
+}:
+
+stdenv.mkDerivation {
+  buildInputs = [
+    boost mesa glew mysql libass libmpeg2 libmad libjpeg libsamplerate libogg
+    libvorbis libmodplug curl flac libgcrypt bzip2 libtiff lzo yajl pkgconfig
+    fontconfig fribidi sqlite libpng pcre libcdio freetype jasper SDL SDL_mixer
+    SDL_image alsaLib dbus libbluray
+  ];
+  name = "xbmc-11.0";
+  src = fetchurl {
+    url = http://mirrors.xbmc.org/releases/source/xbmc-11.0.tar.gz;
+    sha256 = "068bgg6h593xwwinyqy8wsn4hpz90ib59g0k5dpg4f31q48d7r8z";
+  };
+  configurePhase = ''
+    ./configure || cat config.log
+    exit 1
+  '';
+}

From d6e12aa1f62788a00f8560be984a755c674b2cd3 Mon Sep 17 00:00:00 2001
From: Alexander Foremny <alexanderforemny@gmail.com>
Date: Wed, 25 Jul 2012 15:43:34 +0200
Subject: [PATCH 2/7] more progress on XBMC build

---
 pkgs/applications/multimedia/xbmc/default.nix | 51 +++++++++++++++----
 pkgs/development/tools/misc/autoconf/2.67.nix | 48 +++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 +++
 3 files changed, 96 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/development/tools/misc/autoconf/2.67.nix

diff --git a/pkgs/applications/multimedia/xbmc/default.nix b/pkgs/applications/multimedia/xbmc/default.nix
index 081d6108793..0647652f2c4 100644
--- a/pkgs/applications/multimedia/xbmc/default.nix
+++ b/pkgs/applications/multimedia/xbmc/default.nix
@@ -3,23 +3,56 @@
   libjpeg, libsamplerate, libogg, libvorbis, libmodplug, curl, flac, libgcrypt,
   bzip2, libtiff, lzo, yajl, pkgconfig, fontconfig, fribidi, sqlite, libpng,
   pcre, libcdio, freetype, jasper, SDL, SDL_mixer, SDL_image, alsaLib, dbus,
-  libbluray
+  libbluray, libmicrohttpd, libXmu, samba, udev, libusb, python, cmake, hal,
+  gperf, unzip, avahi, zip, nasm, pulseaudio, ftgl,
+
+  # TODO: Check which of these are actually necessary.
+  
+  autoconf, automake, libtool, gettext
 }:
 
+# TODO: Check whether unzip is actually needed.
+
 stdenv.mkDerivation {
-  buildInputs = [
-    boost mesa glew mysql libass libmpeg2 libmad libjpeg libsamplerate libogg
-    libvorbis libmodplug curl flac libgcrypt bzip2 libtiff lzo yajl pkgconfig
-    fontconfig fribidi sqlite libpng pcre libcdio freetype jasper SDL SDL_mixer
-    SDL_image alsaLib dbus libbluray
-  ];
   name = "xbmc-11.0";
+
   src = fetchurl {
     url = http://mirrors.xbmc.org/releases/source/xbmc-11.0.tar.gz;
     sha256 = "068bgg6h593xwwinyqy8wsn4hpz90ib59g0k5dpg4f31q48d7r8z";
   };
+
+  buildInputs = [
+    boost mesa glew mysql libass libmpeg2 libmad libjpeg libsamplerate libogg
+    libvorbis libmodplug curl flac libgcrypt bzip2 libtiff lzo yajl pkgconfig
+    fontconfig fribidi sqlite libpng pcre libcdio freetype jasper SDL SDL_mixer
+    SDL_image alsaLib dbus libbluray libmicrohttpd libXmu samba udev libusb
+    python cmake hal gperf unzip avahi zip nasm pulseaudio ftgl
+
+    autoconf automake libtool gettext
+  ];
+
+  # TODO: Can we leave out some of these options?
+
+  dontFixCmake = true;
+  dontUseCmakeBuildDir = true;
+  dontUseCmakeConfigure = true;
+
+  # configure performs a SONAME check for some libraries by
+  #
+  # > $CC -nostdlib -o /dev/null $LDFLAGS -l$2 -Wl,-M 2>/dev/null
+  #
+  # The $2 is the library name under inspection, e.g. bluray. However, the
+  # option -o /dev/null raises an error.  Since this doesn't appear to be
+  # necessary, we can simply remove this option. Note that ./configure is
+  # generated by ./bootstrap.
+
+  patchPhase = ''
+    sed -i 's@CC -nostdlib -o /dev/null@CC -nostdlib@g' configure.in
+  '';
+
   configurePhase = ''
-    ./configure || cat config.log
-    exit 1
+    ./bootstrap
+    ./configure --prefix="$out"
   '';
 }
+
diff --git a/pkgs/development/tools/misc/autoconf/2.67.nix b/pkgs/development/tools/misc/autoconf/2.67.nix
new file mode 100644
index 00000000000..71e67b1f21c
--- /dev/null
+++ b/pkgs/development/tools/misc/autoconf/2.67.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl, m4, perl }:
+
+stdenv.mkDerivation rec {
+  name = "autoconf-2.67";
+
+  src = fetchurl {
+    url = "mirror://gnu/autoconf/${name}.tar.xz";
+    sha256 = "80c6bda1dd6ab04510d42f594c69a06f98dc5e589683b03c11abd89270502ac1";
+  };
+
+  buildInputs = [ m4 perl ];
+
+  # Work around a known issue in Cygwin.  See
+  # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for
+  # details.
+  # There are many test failures on `i386-pc-solaris2.11'.
+  # doCheck = ((!stdenv.isCygwin) && (!stdenv.isSunOS));
+  # doCheck = false;
+  # TODO: Enable tests again.
+
+  # Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the
+  # "fixed" path in generated files!
+  dontPatchShebangs = true;
+
+  enableParallelBuilding = true;
+
+  preCheck =
+    # Make the Autotest test suite run in parallel.
+    '' export TESTSUITEFLAGS="-j$NIX_BUILD_CORES"
+    '';
+
+  meta = {
+    homepage = http://www.gnu.org/software/autoconf/;
+    description = "GNU Autoconf, a part of the GNU Build System";
+
+    longDescription = ''
+      GNU Autoconf is an extensible package of M4 macros that produce
+      shell scripts to automatically configure software source code
+      packages.  These scripts can adapt the packages to many kinds of
+      UNIX-like systems without manual user intervention.  Autoconf
+      creates a configuration script for a package from a template
+      file that lists the operating system features that the package
+      can use, in the form of M4 macro calls.
+    '';
+
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7498fb7638c..6d782e04fad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2848,6 +2848,8 @@ let
 
   autoconf213 = callPackage ../development/tools/misc/autoconf/2.13.nix { };
 
+  autoconf267 = callPackage ../development/tools/misc/autoconf/2.67.nix { };
+
   automake = automake112x;
 
   automake110x = callPackage ../development/tools/misc/automake/automake-1.10.x.nix { };
@@ -8752,4 +8754,8 @@ let
 
   bullet = callPackage ../development/libraries/bullet {};
 
+  xbmc = callPackage ../applications/multimedia/xbmc {
+    #autoconf = autoconf267;
+  };
+
 }; in pkgs

From d4d1f785dbf309d4284f1205a3ec9cf41d5a2d48 Mon Sep 17 00:00:00 2001
From: Alexander Foremny <alexanderforemny@gmail.com>
Date: Wed, 25 Jul 2012 15:45:17 +0200
Subject: [PATCH 3/7] removed unofficial autoconf-2.67 from xbmc branch

---
 pkgs/development/tools/misc/autoconf/2.67.nix | 48 -------------------
 pkgs/top-level/all-packages.nix               |  6 ---
 2 files changed, 54 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/autoconf/2.67.nix

diff --git a/pkgs/development/tools/misc/autoconf/2.67.nix b/pkgs/development/tools/misc/autoconf/2.67.nix
deleted file mode 100644
index 71e67b1f21c..00000000000
--- a/pkgs/development/tools/misc/autoconf/2.67.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ stdenv, fetchurl, m4, perl }:
-
-stdenv.mkDerivation rec {
-  name = "autoconf-2.67";
-
-  src = fetchurl {
-    url = "mirror://gnu/autoconf/${name}.tar.xz";
-    sha256 = "80c6bda1dd6ab04510d42f594c69a06f98dc5e589683b03c11abd89270502ac1";
-  };
-
-  buildInputs = [ m4 perl ];
-
-  # Work around a known issue in Cygwin.  See
-  # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for
-  # details.
-  # There are many test failures on `i386-pc-solaris2.11'.
-  # doCheck = ((!stdenv.isCygwin) && (!stdenv.isSunOS));
-  # doCheck = false;
-  # TODO: Enable tests again.
-
-  # Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the
-  # "fixed" path in generated files!
-  dontPatchShebangs = true;
-
-  enableParallelBuilding = true;
-
-  preCheck =
-    # Make the Autotest test suite run in parallel.
-    '' export TESTSUITEFLAGS="-j$NIX_BUILD_CORES"
-    '';
-
-  meta = {
-    homepage = http://www.gnu.org/software/autoconf/;
-    description = "GNU Autoconf, a part of the GNU Build System";
-
-    longDescription = ''
-      GNU Autoconf is an extensible package of M4 macros that produce
-      shell scripts to automatically configure software source code
-      packages.  These scripts can adapt the packages to many kinds of
-      UNIX-like systems without manual user intervention.  Autoconf
-      creates a configuration script for a package from a template
-      file that lists the operating system features that the package
-      can use, in the form of M4 macro calls.
-    '';
-
-    license = "GPLv2+";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6d782e04fad..7498fb7638c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2848,8 +2848,6 @@ let
 
   autoconf213 = callPackage ../development/tools/misc/autoconf/2.13.nix { };
 
-  autoconf267 = callPackage ../development/tools/misc/autoconf/2.67.nix { };
-
   automake = automake112x;
 
   automake110x = callPackage ../development/tools/misc/automake/automake-1.10.x.nix { };
@@ -8754,8 +8752,4 @@ let
 
   bullet = callPackage ../development/libraries/bullet {};
 
-  xbmc = callPackage ../applications/multimedia/xbmc {
-    #autoconf = autoconf267;
-  };
-
 }; in pkgs

From 932574a52938c933540ce2ba572dd1a73cb45c97 Mon Sep 17 00:00:00 2001
From: Alexander Foremny <alexanderforemny@gmail.com>
Date: Thu, 26 Jul 2012 12:17:26 +0200
Subject: [PATCH 4/7] Add package haskell-snap and dependencies

comonad-1.1.1.6
comonad-3.0.0.1
configurator-0.2.0.0
contravariant-0.2.0.2
data-lens-2.10.1
data-lens-template-2.1.5
distributive-0.2.2
heist-0.8.1.1
semigroupoids-1.3.4
snap-0.9.1.1
xmlhtml-0.2.0.0
---
 .../haskell/comonad-transformers/default.nix  | 19 +++++++++++++
 .../libraries/haskell/comonad/1.1.1.6.nix     | 14 ++++++++++
 .../libraries/haskell/comonad/default.nix     | 14 ++++++++++
 .../haskell/configurator/default.nix          | 18 ++++++++++++
 .../haskell/contravariant/default.nix         | 14 ++++++++++
 .../haskell/data-lens-template/default.nix    | 14 ++++++++++
 .../libraries/haskell/data-lens/default.nix   | 17 +++++++++++
 .../haskell/distributive/default.nix          | 14 ++++++++++
 .../libraries/haskell/heist/default.nix       | 21 ++++++++++++++
 .../haskell/semigroupoids/default.nix         | 14 ++++++++++
 .../libraries/haskell/snap/snap.nix           | 28 +++++++++++++++++++
 .../libraries/haskell/xmlhtml/default.nix     | 17 +++++++++++
 pkgs/top-level/haskell-packages.nix           | 26 +++++++++++++++++
 13 files changed, 230 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/comonad-transformers/default.nix
 create mode 100644 pkgs/development/libraries/haskell/comonad/1.1.1.6.nix
 create mode 100644 pkgs/development/libraries/haskell/comonad/default.nix
 create mode 100644 pkgs/development/libraries/haskell/configurator/default.nix
 create mode 100644 pkgs/development/libraries/haskell/contravariant/default.nix
 create mode 100644 pkgs/development/libraries/haskell/data-lens-template/default.nix
 create mode 100644 pkgs/development/libraries/haskell/data-lens/default.nix
 create mode 100644 pkgs/development/libraries/haskell/distributive/default.nix
 create mode 100644 pkgs/development/libraries/haskell/heist/default.nix
 create mode 100644 pkgs/development/libraries/haskell/semigroupoids/default.nix
 create mode 100644 pkgs/development/libraries/haskell/snap/snap.nix
 create mode 100644 pkgs/development/libraries/haskell/xmlhtml/default.nix

diff --git a/pkgs/development/libraries/haskell/comonad-transformers/default.nix b/pkgs/development/libraries/haskell/comonad-transformers/default.nix
new file mode 100644
index 00000000000..1dd7c212c71
--- /dev/null
+++ b/pkgs/development/libraries/haskell/comonad-transformers/default.nix
@@ -0,0 +1,19 @@
+{ cabal, comonad, contravariant, distributive, semigroupoids
+, semigroups, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "comonad-transformers";
+  version = "2.1.2";
+  sha256 = "0yhpsifnqxrg1p8f9hjslwkrakiaxa2kk9726q923a5sj225cvis";
+  buildDepends = [
+    comonad contravariant distributive semigroupoids semigroups
+    transformers
+  ];
+  meta = {
+    homepage = "http://github.com/ekmett/comonad-transformers/";
+    description = "Comonad transformers";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/comonad/1.1.1.6.nix b/pkgs/development/libraries/haskell/comonad/1.1.1.6.nix
new file mode 100644
index 00000000000..53e014fb8ac
--- /dev/null
+++ b/pkgs/development/libraries/haskell/comonad/1.1.1.6.nix
@@ -0,0 +1,14 @@
+{ cabal, semigroups, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "comonad";
+  version = "1.1.1.6";
+  sha256 = "1sg0pa7393mzfm27pl52nchplhkls3k0f4ff8vzk76wzrgvhysg5";
+  buildDepends = [ semigroups transformers ];
+  meta = {
+    homepage = "http://github.com/ekmett/comonad/";
+    description = "Haskell 98 compatible comonads";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/comonad/default.nix b/pkgs/development/libraries/haskell/comonad/default.nix
new file mode 100644
index 00000000000..b73e29fc1e0
--- /dev/null
+++ b/pkgs/development/libraries/haskell/comonad/default.nix
@@ -0,0 +1,14 @@
+{ cabal, semigroups, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "comonad";
+  version = "3.0.0.1";
+  sha256 = "03xslpfil96v1qgk2g29vi46mb7l0fafy446ng1p4xgq9ddb2yaz";
+  buildDepends = [ semigroups transformers ];
+  meta = {
+    homepage = "http://github.com/ekmett/comonad/";
+    description = "Haskell 98 compatible comonads";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/configurator/default.nix b/pkgs/development/libraries/haskell/configurator/default.nix
new file mode 100644
index 00000000000..0c4c610106e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/configurator/default.nix
@@ -0,0 +1,18 @@
+{ cabal, attoparsec, hashable, text, unixCompat
+, unorderedContainers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "configurator";
+  version = "0.2.0.0";
+  sha256 = "0zkcmziyfq2sm9i75ysi5nxd21fynp88m0safhmn3jld7plj03la";
+  buildDepends = [
+    attoparsec hashable text unixCompat unorderedContainers
+  ];
+  meta = {
+    homepage = "http://github.com/bos/configurator";
+    description = "Configuration management";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/contravariant/default.nix b/pkgs/development/libraries/haskell/contravariant/default.nix
new file mode 100644
index 00000000000..526b9e1f997
--- /dev/null
+++ b/pkgs/development/libraries/haskell/contravariant/default.nix
@@ -0,0 +1,14 @@
+{ cabal, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "contravariant";
+  version = "0.2.0.2";
+  sha256 = "0142s1c914zbfnvysvcc9s3bv8qs6wimnqcmxca1gxaxqvyfkf3p";
+  buildDepends = [ transformers ];
+  meta = {
+    homepage = "http://github.com/ekmett/contravariant/";
+    description = "Haskell 98 contravariant functors";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/data-lens-template/default.nix b/pkgs/development/libraries/haskell/data-lens-template/default.nix
new file mode 100644
index 00000000000..fc058b92e54
--- /dev/null
+++ b/pkgs/development/libraries/haskell/data-lens-template/default.nix
@@ -0,0 +1,14 @@
+{ cabal, dataLens }:
+
+cabal.mkDerivation (self: {
+  pname = "data-lens-template";
+  version = "2.1.5";
+  sha256 = "09i9lby5jd2kcg0l7y4hkga7jxixcpqw4dc7h1kngqdz92a1ydxc";
+  buildDepends = [ dataLens ];
+  meta = {
+    homepage = "http://github.com/ekmett/data-lens-template/";
+    description = "Utilities for Data.Lens";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/data-lens/default.nix b/pkgs/development/libraries/haskell/data-lens/default.nix
new file mode 100644
index 00000000000..48d49324bb5
--- /dev/null
+++ b/pkgs/development/libraries/haskell/data-lens/default.nix
@@ -0,0 +1,17 @@
+{ cabal, comonad, comonadTransformers, semigroupoids, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "data-lens";
+  version = "2.10.1";
+  sha256 = "01n5lsq8nbn2lqsyz6y3md47zwpmdpfvhhlwn4fdpcl2d4hdh6xh";
+  buildDepends = [
+    comonad comonadTransformers semigroupoids transformers
+  ];
+  meta = {
+    homepage = "http://github.com/roconnor/data-lens/";
+    description = "Haskell 98 Lenses";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/distributive/default.nix b/pkgs/development/libraries/haskell/distributive/default.nix
new file mode 100644
index 00000000000..a8b07c608d8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/distributive/default.nix
@@ -0,0 +1,14 @@
+{ cabal, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "distributive";
+  version = "0.2.2";
+  sha256 = "13wvr2wb3h2nr1qd3dwjqx0b6g4igjqm3q2cyi4mc41gwihkbhr2";
+  buildDepends = [ transformers ];
+  meta = {
+    homepage = "http://github.com/ekmett/distributive/";
+    description = "Haskell 98 Distributive functors -- Dual to Traversable";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix
new file mode 100644
index 00000000000..44ba8ba15ee
--- /dev/null
+++ b/pkgs/development/libraries/haskell/heist/default.nix
@@ -0,0 +1,21 @@
+{ cabal, aeson, attoparsec, blazeBuilder, blazeHtml, directoryTree
+, filepath, MonadCatchIOTransformers, mtl, random, text, time
+, transformers, unorderedContainers, vector, xmlhtml
+}:
+
+cabal.mkDerivation (self: {
+  pname = "heist";
+  version = "0.8.1.1";
+  sha256 = "0ad56izskafpc1dx2nq0a8w71ayppwx8dc7kdaw1by972kh3nflh";
+  buildDepends = [
+    aeson attoparsec blazeBuilder blazeHtml directoryTree filepath
+    MonadCatchIOTransformers mtl random text time transformers
+    unorderedContainers vector xmlhtml
+  ];
+  meta = {
+    homepage = "http://snapframework.com/";
+    description = "An (x)html templating system";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/semigroupoids/default.nix b/pkgs/development/libraries/haskell/semigroupoids/default.nix
new file mode 100644
index 00000000000..776e452eafe
--- /dev/null
+++ b/pkgs/development/libraries/haskell/semigroupoids/default.nix
@@ -0,0 +1,14 @@
+{ cabal, comonad, contravariant, semigroups, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "semigroupoids";
+  version = "1.3.4";
+  sha256 = "0vnipjndbsldk5w1qw35i2zrd418rq13y10g0i33ylg1gwnsrqph";
+  buildDepends = [ comonad contravariant semigroups transformers ];
+  meta = {
+    homepage = "http://github.com/ekmett/semigroupoids";
+    description = "Haskell 98 semigroupoids: Category sans id";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix
new file mode 100644
index 00000000000..505c9bcb0cc
--- /dev/null
+++ b/pkgs/development/libraries/haskell/snap/snap.nix
@@ -0,0 +1,28 @@
+{ cabal, aeson, attoparsec, cereal, clientsession, configurator
+, dataLens, dataLensTemplate, directoryTree, filepath, hashable
+, heist, logict, MonadCatchIOTransformers, mtl, mwcRandom
+, pwstoreFast, snapCore, snapServer, stm, syb, text, time
+, transformers, unorderedContainers, utf8String, vector
+, vectorAlgorithms, xmlhtml
+}:
+
+cabal.mkDerivation (self: {
+  pname = "snap";
+  version = "0.9.1.1";
+  sha256 = "1g8jvnwrhna5g064dmv4v4khrpwwn0vcqw8l7rcpkp75l46fq29z";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    aeson attoparsec cereal clientsession configurator dataLens
+    dataLensTemplate directoryTree filepath hashable heist logict
+    MonadCatchIOTransformers mtl mwcRandom pwstoreFast snapCore
+    snapServer stm syb text time transformers unorderedContainers
+    utf8String vector vectorAlgorithms xmlhtml
+  ];
+  meta = {
+    homepage = "http://snapframework.com/";
+    description = "Snap: A Haskell Web Framework: project starter executable and glue code library";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/xmlhtml/default.nix b/pkgs/development/libraries/haskell/xmlhtml/default.nix
new file mode 100644
index 00000000000..654da2e76b5
--- /dev/null
+++ b/pkgs/development/libraries/haskell/xmlhtml/default.nix
@@ -0,0 +1,17 @@
+{ cabal, blazeBuilder, blazeHtml, blazeMarkup, parsec, text
+, unorderedContainers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "xmlhtml";
+  version = "0.2.0.2";
+  sha256 = "0dqlqx3cnrqap3ficdkmwm8661j8i7qknb8xhjqvfmnb9pwqdks2";
+  buildDepends = [
+    blazeBuilder blazeHtml blazeMarkup parsec text unorderedContainers
+  ];
+  meta = {
+    description = "XML parser and renderer with HTML 5 quirks mode";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index a295b8fd654..f808b0feb7f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -532,12 +532,22 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   colour = callPackage ../development/libraries/haskell/colour {};
 
+  comonad_1_1_1_6 = callPackage ../development/libraries/haskell/comonad/1.1.1.6.nix {};
+
+  comonad = callPackage ../development/libraries/haskell/comonad/default.nix {};
+
+  comonadTransformers = callPackage ../development/libraries/haskell/comonad-transformers {};
+
   compactStringFix = callPackage ../development/libraries/haskell/compact-string-fix {};
 
   conduit = callPackage ../development/libraries/haskell/conduit {};
 
   ConfigFile = callPackage ../development/libraries/haskell/ConfigFile {};
 
+  configurator = callPackage ../development/libraries/haskell/configurator {};
+
+  contravariant = callPackage ../development/libraries/haskell/contravariant {};
+
   convertible = callPackage ../development/libraries/haskell/convertible {
     time = self.time_1_1_3;
   };
@@ -588,6 +598,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   dataInttrie = callPackage ../development/libraries/haskell/data-inttrie {};
 
+  dataLens = callPackage ../development/libraries/haskell/data-lens {};
+
+  dataLensTemplate = callPackage ../development/libraries/haskell/data-lens-template {};
+
   dataMemocombinators = callPackage ../development/libraries/haskell/data-memocombinators {};
 
   dataReify = callPackage ../development/libraries/haskell/data-reify {};
@@ -616,6 +630,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   directoryTree = callPackage ../development/libraries/haskell/directory-tree {};
 
+  distributive = callPackage ../development/libraries/haskell/distributive {};
+
   dlist = callPackage ../development/libraries/haskell/dlist {};
 
   dotgen = callPackage ../development/libraries/haskell/dotgen {};
@@ -841,6 +857,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   HDBCSqlite = callPackage ../development/libraries/haskell/HDBC/HDBC-sqlite3.nix {};
 
+  heist = callPackage ../development/libraries/haskell/heist {};
+
   HFuse = callPackage ../development/libraries/haskell/hfuse {};
 
   HGL = callPackage ../development/libraries/haskell/HGL {};
@@ -1289,6 +1307,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   sendfile = callPackage ../development/libraries/haskell/sendfile {};
 
+  semigroupoids = callPackage ../development/libraries/haskell/semigroupoids {
+    comonad = self.comonad_1_1_1_6;
+  };
+
   semigroups = callPackage ../development/libraries/haskell/semigroups {};
 
   shelly = callPackage ../development/libraries/haskell/shelly {};
@@ -1299,6 +1321,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   smallcheck = callPackage ../development/libraries/haskell/smallcheck {};
 
+  snap = callPackage ../development/libraries/haskell/snap/snap.nix {};
+
   snapCore = callPackage ../development/libraries/haskell/snap/core.nix {};
 
   snapServer = callPackage ../development/libraries/haskell/snap/server.nix {};
@@ -1571,6 +1595,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   xmlConduit = callPackage ../development/libraries/haskell/xml-conduit {};
 
+  xmlhtml = callPackage ../development/libraries/haskell/xmlhtml {};
+
   xmlTypes = callPackage ../development/libraries/haskell/xml-types {};
 
   xssSanitize = callPackage ../development/libraries/haskell/xss-sanitize {};

From eea626a6b34398464d2801c7295711073dd56194 Mon Sep 17 00:00:00 2001
From: Alexander Foremny <alexanderforemny@gmail.com>
Date: Thu, 26 Jul 2012 12:32:38 +0200
Subject: [PATCH 5/7] fixed some dependencies

---
 pkgs/top-level/haskell-packages.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 6470cea4361..c8ec5b2bad1 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -536,7 +536,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   comonad = callPackage ../development/libraries/haskell/comonad {};
 
-  comonadTransformers_2_1_2 = callPackage ../development/libraries/haskell/comonad-transformers/2.1.2.nix {};
+  comonadTransformers_2_1_2 = callPackage ../development/libraries/haskell/comonad-transformers/2.1.2.nix {
+    comonad = self.comonad_1_1_1_6;
+    semigroupoids = self.semigroupoids_1_3_4;
+  };
 
   comonadTransformers = callPackage ../development/libraries/haskell/comonad-transformers {};
 
@@ -600,7 +603,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   dataInttrie = callPackage ../development/libraries/haskell/data-inttrie {};
 
-  dataLens = callPackage ../development/libraries/haskell/data-lens {};
+  dataLens = callPackage ../development/libraries/haskell/data-lens {
+    comonadTransformers = self.comonadTransformers_2_1_2;
+    semigroupoids = self.semigroupoids_1_3_4;
+  };
 
   dataLensTemplate = callPackage ../development/libraries/haskell/data-lens-template {};
 
@@ -1312,7 +1318,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   semigroups = callPackage ../development/libraries/haskell/semigroups {};
 
   semigroupoids_1_3_4 = callPackage ../development/libraries/haskell/semigroupoids/1.3.4.nix {
-    comonad = self.comonad_1_1_16;
+    comonad = self.comonad_1_1_1_6;
   };
 
   semigroupoids = callPackage ../development/libraries/haskell/semigroupoids {};

From a992abd00c3b65adb784b5f8a3fc1d13acb5a744 Mon Sep 17 00:00:00 2001
From: Alexander Foremny <alexanderforemny@gmail.com>
Date: Thu, 26 Jul 2012 12:39:51 +0200
Subject: [PATCH 6/7] Removed bogus XBMC build not belonging here

---
 pkgs/applications/multimedia/xbmc/default.nix | 58 -------------------
 1 file changed, 58 deletions(-)
 delete mode 100644 pkgs/applications/multimedia/xbmc/default.nix

diff --git a/pkgs/applications/multimedia/xbmc/default.nix b/pkgs/applications/multimedia/xbmc/default.nix
deleted file mode 100644
index 0647652f2c4..00000000000
--- a/pkgs/applications/multimedia/xbmc/default.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  stdenv, fetchurl, boost, mesa, glew, mysql, libass, libmpeg2, libmad,
-  libjpeg, libsamplerate, libogg, libvorbis, libmodplug, curl, flac, libgcrypt,
-  bzip2, libtiff, lzo, yajl, pkgconfig, fontconfig, fribidi, sqlite, libpng,
-  pcre, libcdio, freetype, jasper, SDL, SDL_mixer, SDL_image, alsaLib, dbus,
-  libbluray, libmicrohttpd, libXmu, samba, udev, libusb, python, cmake, hal,
-  gperf, unzip, avahi, zip, nasm, pulseaudio, ftgl,
-
-  # TODO: Check which of these are actually necessary.
-  
-  autoconf, automake, libtool, gettext
-}:
-
-# TODO: Check whether unzip is actually needed.
-
-stdenv.mkDerivation {
-  name = "xbmc-11.0";
-
-  src = fetchurl {
-    url = http://mirrors.xbmc.org/releases/source/xbmc-11.0.tar.gz;
-    sha256 = "068bgg6h593xwwinyqy8wsn4hpz90ib59g0k5dpg4f31q48d7r8z";
-  };
-
-  buildInputs = [
-    boost mesa glew mysql libass libmpeg2 libmad libjpeg libsamplerate libogg
-    libvorbis libmodplug curl flac libgcrypt bzip2 libtiff lzo yajl pkgconfig
-    fontconfig fribidi sqlite libpng pcre libcdio freetype jasper SDL SDL_mixer
-    SDL_image alsaLib dbus libbluray libmicrohttpd libXmu samba udev libusb
-    python cmake hal gperf unzip avahi zip nasm pulseaudio ftgl
-
-    autoconf automake libtool gettext
-  ];
-
-  # TODO: Can we leave out some of these options?
-
-  dontFixCmake = true;
-  dontUseCmakeBuildDir = true;
-  dontUseCmakeConfigure = true;
-
-  # configure performs a SONAME check for some libraries by
-  #
-  # > $CC -nostdlib -o /dev/null $LDFLAGS -l$2 -Wl,-M 2>/dev/null
-  #
-  # The $2 is the library name under inspection, e.g. bluray. However, the
-  # option -o /dev/null raises an error.  Since this doesn't appear to be
-  # necessary, we can simply remove this option. Note that ./configure is
-  # generated by ./bootstrap.
-
-  patchPhase = ''
-    sed -i 's@CC -nostdlib -o /dev/null@CC -nostdlib@g' configure.in
-  '';
-
-  configurePhase = ''
-    ./bootstrap
-    ./configure --prefix="$out"
-  '';
-}
-

From 8ea5b1aeaa927dd2606555a0c402cc9fcf8aaeca Mon Sep 17 00:00:00 2001
From: Alexander Foremny <alexanderforemny@gmail.com>
Date: Wed, 1 Aug 2012 12:59:34 +0200
Subject: [PATCH 7/7] Fix naming convention for haskell-packages.nix

---
 .../comonad-transformers/{default.nix => 3.0.nix}    |  0
 .../haskell/comonad/{default.nix => 3.0.0.1.nix}     |  0
 .../haskell/semigroupoids/{default.nix => 3.0.nix}   |  0
 pkgs/top-level/haskell-packages.nix                  | 12 +++++++++---
 4 files changed, 9 insertions(+), 3 deletions(-)
 rename pkgs/development/libraries/haskell/comonad-transformers/{default.nix => 3.0.nix} (100%)
 rename pkgs/development/libraries/haskell/comonad/{default.nix => 3.0.0.1.nix} (100%)
 rename pkgs/development/libraries/haskell/semigroupoids/{default.nix => 3.0.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/comonad-transformers/default.nix b/pkgs/development/libraries/haskell/comonad-transformers/3.0.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/comonad-transformers/default.nix
rename to pkgs/development/libraries/haskell/comonad-transformers/3.0.nix
diff --git a/pkgs/development/libraries/haskell/comonad/default.nix b/pkgs/development/libraries/haskell/comonad/3.0.0.1.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/comonad/default.nix
rename to pkgs/development/libraries/haskell/comonad/3.0.0.1.nix
diff --git a/pkgs/development/libraries/haskell/semigroupoids/default.nix b/pkgs/development/libraries/haskell/semigroupoids/3.0.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/semigroupoids/default.nix
rename to pkgs/development/libraries/haskell/semigroupoids/3.0.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index c8ec5b2bad1..2660ff784e3 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -534,14 +534,18 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   comonad_1_1_1_6 = callPackage ../development/libraries/haskell/comonad/1.1.1.6.nix {};
 
-  comonad = callPackage ../development/libraries/haskell/comonad {};
+  comonad_3_0_0_1 = callPackage ../development/libraries/haskell/comonad/3.0.0.1.nix {};
+
+  comonad = self.comonad_3_0_0_1;
 
   comonadTransformers_2_1_2 = callPackage ../development/libraries/haskell/comonad-transformers/2.1.2.nix {
     comonad = self.comonad_1_1_1_6;
     semigroupoids = self.semigroupoids_1_3_4;
   };
 
-  comonadTransformers = callPackage ../development/libraries/haskell/comonad-transformers {};
+  comonadTransformers_3_0 = callPackage ../development/libraries/haskell/comonad-transformers/3.0.nix {};
+
+  comonadTransformers = self.comonadTransformers_3_0;
 
   compactStringFix = callPackage ../development/libraries/haskell/compact-string-fix {};
 
@@ -1321,7 +1325,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     comonad = self.comonad_1_1_1_6;
   };
 
-  semigroupoids = callPackage ../development/libraries/haskell/semigroupoids {};
+  semigroupoids_3_0 = callPackage ../development/libraries/haskell/semigroupoids/3.0.nix {};
+
+  semigroupoids = self.semigroupoids_3_0;
 
   shelly = callPackage ../development/libraries/haskell/shelly {};