From ef0c0089da7561203db104b0a02cfebd15aa69bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Thu, 6 Sep 2012 17:31:40 +0200
Subject: [PATCH 01/88] yafc: update to 1.2.3

---
 pkgs/applications/networking/yafc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/yafc/default.nix b/pkgs/applications/networking/yafc/default.nix
index 9b1c9892cbf..bdbb53d1675 100644
--- a/pkgs/applications/networking/yafc/default.nix
+++ b/pkgs/applications/networking/yafc/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, readline, libssh, intltool}:
 
 stdenv.mkDerivation rec {
-  name = "yafc-1.2.0";
+  name = "yafc-1.2.3";
   src = fetchurl {
     url = "https://github.com/downloads/sebastinas/yafc/${name}.tar.xz";
-    sha256 = "0h5cbvvfkigvzfqqzvgqpn8m0ilyng3rgyh85c0mi48klzv8kb58";
+    sha256 = "11h5r9ragfpil338kq981wxnifacflqfwgydhmy00b3fbdlnxzsi";
   };
 
   buildInputs = [ readline libssh intltool ];

From a9da133fdadf212b055c63e0b9f377f564775943 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 8 Sep 2012 14:35:05 +0200
Subject: [PATCH 02/88] boost: add version 1.51.0

---
 pkgs/development/libraries/boost/1.51.nix | 86 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  1 +
 2 files changed, 87 insertions(+)
 create mode 100644 pkgs/development/libraries/boost/1.51.nix

diff --git a/pkgs/development/libraries/boost/1.51.nix b/pkgs/development/libraries/boost/1.51.nix
new file mode 100644
index 00000000000..8b040dd8647
--- /dev/null
+++ b/pkgs/development/libraries/boost/1.51.nix
@@ -0,0 +1,86 @@
+{ stdenv, fetchurl, icu, expat, zlib, bzip2, python
+, enableRelease ? true
+, enableDebug ? false
+, enableSingleThreaded ? false
+, enableMultiThreaded ? true
+, enableShared ? true
+, enableStatic ? false
+, enablePIC ? false
+, enableExceptions ? false
+, taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic))
+}:
+
+let
+
+  variant = stdenv.lib.concatStringsSep ","
+    (stdenv.lib.optional enableRelease "release" ++
+     stdenv.lib.optional enableDebug "debug");
+
+  threading = stdenv.lib.concatStringsSep ","
+    (stdenv.lib.optional enableSingleThreaded "single" ++
+     stdenv.lib.optional enableMultiThreaded "multi");
+
+  link = stdenv.lib.concatStringsSep ","
+    (stdenv.lib.optional enableShared "shared" ++
+     stdenv.lib.optional enableStatic "static");
+
+  # To avoid library name collisions
+  layout = if taggedLayout then "tagged" else "system";
+
+  cflags = if (enablePIC && enableExceptions) then
+             "cflags=-fPIC -fexceptions cxxflags=-fPIC linkflags=-fPIC"
+           else if (enablePIC) then
+             "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC"
+           else if (enableExceptions) then
+             "cflags=-fexceptions"
+           else
+             "";
+in
+
+stdenv.mkDerivation {
+  name = "boost-1.51.0";
+
+  meta = {
+    homepage = "http://boost.org/";
+    description = "Boost C++ Library Collection";
+    license = "boost-license";
+
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.simons ];
+  };
+
+  src = fetchurl {
+    url = "mirror://sourceforge/boost/boost_1_51_0.tar.bz2";
+    sha256 = "fb2d2335a29ee7fe040a197292bfce982af84a645c81688a915c84c925b69696";
+  };
+
+  enableParallelBuilding = true;
+
+  buildInputs = [icu expat zlib bzip2 python];
+
+  configureScript = "./bootstrap.sh";
+  configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python";
+
+  buildPhase = "./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install";
+
+  installPhase = ":";
+
+  crossAttrs = rec {
+    buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ];
+    # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to
+    # override them.
+    propagatedBuildInputs = buildInputs;
+    # We want to substitute the contents of configureFlags, removing thus the
+    # usual --build and --host added on cross building.
+    preConfigure = ''
+      export configureFlags="--prefix=$out --without-icu"
+    '';
+    buildPhase = ''
+      set -x
+      cat << EOF > user-config.jam
+      using gcc : cross : $crossConfig-g++ ;
+      EOF
+      ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.hostDrv}/include -sEXPAT_LIBPATH=${expat.hostDrv}/lib --layout=${layout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install
+    '';
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 88cfccf24a3..4c6f65ff841 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3313,6 +3313,7 @@ let
   boost147 = callPackage ../development/libraries/boost/1.47.nix { };
   boost149 = callPackage ../development/libraries/boost/1.49.nix { };
   boost150 = callPackage ../development/libraries/boost/1.50.nix { };
+  boost151 = callPackage ../development/libraries/boost/1.51.nix { };
   boost = boost150;
 
   boostHeaders149 = callPackage ../development/libraries/boost/1.49-headers.nix { };

From 09c3613d4a3e97e957f08610c437707905b0a7c8 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Fri, 7 Sep 2012 13:27:20 +0200
Subject: [PATCH 03/88] libnl: upgrade to 3.2.13

---
 pkgs/os-specific/linux/libnl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix
index 35f05e9d009..6fe31c63178 100644
--- a/pkgs/os-specific/linux/libnl/default.nix
+++ b/pkgs/os-specific/linux/libnl/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, bison, flex}:
 
 stdenv.mkDerivation rec {
-  name = "libnl-3.0";
+  name = "libnl-3.2.13";
 
   src = fetchurl {
     url = "${meta.homepage}files/${name}.tar.gz";
-    sha256 = "1vac10m3w0m5lsypjcrhs2dzwng82nkbzqz8g8kyzkxb3qz5ql3s";
+    sha256 = "1ydw42lsd572qwrfgws97n76hyvjdpanwrxm03lysnhfxkna1ssd";
   };
 
   buildInputs = [ bison flex ];

From 3ab9e5a38af32ddfc6f793271e38e0550155be66 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Fri, 7 Sep 2012 13:27:32 +0200
Subject: [PATCH 04/88] powertop: upgrade to 2.1

---
 pkgs/os-specific/linux/powertop/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix
index d175c5f0478..68075d115a4 100644
--- a/pkgs/os-specific/linux/powertop/default.nix
+++ b/pkgs/os-specific/linux/powertop/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchurl, gettext, libnl1, ncurses, pciutils, pkgconfig, zlib }:
+{ stdenv, fetchurl, gettext, libnl, ncurses, pciutils, pkgconfig, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "powertop-2.0";
+  name = "powertop-2.1";
   src = fetchurl {
-    url = "https://01.org/powertop/sites/default/files/downloads/${name}.tar.bz2";
-    sha256 = "7af51d320856b3446bcc314c9414385f3b05b9360f650883b0210cd3b12c5c1c";
+    url = "https://01.org/powertop/sites/default/files/downloads/${name}.tar.gz";
+    sha256 = "16161nlah4i4hq8vyx7ds1vq7icdzwm7gmyjg0xhcrs1r9n83m1x";
   };
 
-  buildInputs = [ gettext libnl1 ncurses pciutils pkgconfig zlib ];
+  buildInputs = [ gettext libnl ncurses pciutils pkgconfig zlib ];
 
   meta = {
     description = "Analyze power consumption on Intel-based laptops";

From d9aac705bbb574888ea49c670495589d89702014 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Fri, 7 Sep 2012 13:54:20 +0200
Subject: [PATCH 05/88] wpa_supplicant: upgrade to 1.0

---
 .../linux/wpa_supplicant/default.nix          | 31 +++++++------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index 522478ed5b7..f947bc9a1e7 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, openssl, dbus_libs, pkgconfig, libnl1 }:
+{ stdenv, fetchurl, openssl, dbus_libs, pkgconfig, libnl }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.3";
-  
+  version = "1.0";
+
   name = "wpa_supplicant-${version}";
 
   src = fetchurl {
-    url = "http://hostap.epitest.fi/releases/wpa_supplicant-${version}.tar.gz";
-    sha256 = "0hwlsn512q2ps8wxxjmkjfdg3vjqqb9mxnnwfv1wqijkm3551kfh";
+    url = "http://hostap.epitest.fi/releases/${name}.tar.gz";
+    sha256 = "171b9027rbzy64zaal4832ix9i3mm6ypwmynbpia5bss793ivm4i";
   };
-  
+
   preBuild = ''
     cd wpa_supplicant
     cp -v defconfig .config
@@ -18,26 +18,19 @@ stdenv.mkDerivation rec {
     echo CONFIG_CTRL_IFACE_DBUS_NEW=y | tee -a .config
     echo CONFIG_CTRL_IFACE_DBUS_INTRO=y | tee -a .config
     echo CONFIG_DRIVER_NL80211=y | tee -a .config
+    echo CONFIG_LIBNL32=y | tee -a .config
     substituteInPlace Makefile --replace /usr/local $out
   '';
 
-  buildInputs = [ openssl dbus_libs libnl1 ];
+  buildInputs = [ openssl dbus_libs libnl ];
 
   buildNativeInputs = [ pkgconfig ];
 
   patches =
-    [ # Upstream patch required for NetworkManager-0.9
-      (fetchurl {
-        url = "http://w1.fi/gitweb/gitweb.cgi?p=hostap-07.git;a=commitdiff_plain;h=b80b5639935d37b95d00f86b57f2844a9c775f57";
-        name = "wpa_supplicant-nm-0.9.patch";
-        sha256 = "1pqba0l4rfhba5qafvvbywi9x1qmphs944p704bh1flnx7cz6ya8";
-      })
-      # wpa_supplicant crashes when controlled through dbus (wicd/nm)
-      # see: https://bugzilla.redhat.com/show_bug.cgi?id=678625
-      (fetchurl {
-        url = "https://bugzilla.redhat.com/attachment.cgi?id=491018";
-        name = "dbus-assertion-fix.patch";
-        sha256 = "6206d79bcd800d56cae73e2a01a27ac2bee961512f77e5d62a59256a9919077a";
+    [ (fetchurl {
+        url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/hostap_allow-linking-with-libnl-3.2.patch?h=packages/wpa_supplicant";
+        name = "hostap_allow-linking-with-libnl-3.2.patch";
+        sha256 = "0iwvjq0apc6mv1r03k5pnyjgda3q47yx36c4lqvv8i8q1vn7kbf2";
       })
     ];
 

From c1c9c9d2a127c76e6bdb8dc0c488f05247aa06e5 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Fri, 7 Sep 2012 14:21:24 +0200
Subject: [PATCH 06/88] network-manager: use libnl3, as libnl1 is no longer
 maintained

---
 pkgs/tools/networking/network-manager/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index f7aab9fb4f2..eec7361f6a2 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib, xz
-, udev, libnl1, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables
+, udev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables
 , libgcrypt, dnsmasq, avahi, bind, perl, substituteAll }:
 
 stdenv.mkDerivation rec {
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     "--with-dbus-sys-dir=\${out}/etc/dbus-1/system.d"
     "--with-crypto=gnutls" "--disable-more-warnings" ];
 
-  buildInputs = [ wirelesstools udev libnl1 libuuid polkit ppp xz ];
+  buildInputs = [ wirelesstools udev libnl libuuid polkit ppp xz ];
 
   propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ];
 

From 3de1a56a73467206c87e36c808b0b8ac22dc48a3 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Fri, 7 Sep 2012 15:04:47 +0200
Subject: [PATCH 07/88] hostapd: upgrade to 1.0

---
 pkgs/os-specific/linux/hostapd/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix
index 39f92d99b7f..f13a1033f8b 100644
--- a/pkgs/os-specific/linux/hostapd/default.nix
+++ b/pkgs/os-specific/linux/hostapd/default.nix
@@ -1,21 +1,22 @@
-{ stdenv, fetchurl, libnl1, openssl }:
+{ stdenv, fetchurl, libnl, openssl, pkgconfig }:
 stdenv.mkDerivation rec {
 
   name = "hostapd-${version}";
-  version = "0.7.3";
+  version = "1.0";
 
   src = fetchurl {
-    url = http://w1.fi/releases/hostapd-0.7.3.tar.gz;
-    sha256 = "0rqmjs4k50qjp2d0k71lg5vsh34w07w985cxjqklq6kyyf0jgsri";
+    url = "http://w1.fi/releases/${name}.tar.gz";
+    sha256 = "1k6z2g0g324593a7ybd76bywvj0gnf9cybqaj2sq5ks6gv5rsbh0";
   };
 
-  buildInputs = [ libnl1 openssl ];
+  buildInputs = [ libnl openssl pkgconfig ];
 
   configurePhase = ''
     cd hostapd
-    substituteInPlace defconfig --replace "#CONFIG_DRIVER_NL80211" "CONFIG_DRIVER_NL80211"
-    substituteInPlace Makefile --replace "/usr/local/bin/" "$out/bin/"
+    substituteInPlace Makefile --replace "/usr/local/bin" "$out/bin"
     mv defconfig .config
+    echo CONFIG_LIBNL32=y | tee -a .config
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags libnl-3.0)"
   '';
   preInstall = "mkdir -p $out/bin";
 

From d7f89b207584f4e8f4310787b16542040de52197 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Fri, 7 Sep 2012 15:07:07 +0200
Subject: [PATCH 08/88] libnl1, libnl2: remove now they are unused

---
 pkgs/top-level/all-packages.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4c6f65ff841..ffa151e98fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5680,10 +5680,6 @@ let
 
   libnl = callPackage ../os-specific/linux/libnl { };
 
-  libnl2 = callPackage ../os-specific/linux/libnl/v2.nix { };
-
-  libnl1 = callPackage ../os-specific/linux/libnl/v1.nix { };
-
   linuxHeaders = callPackage ../os-specific/linux/kernel-headers { };
 
   linuxHeaders33 = callPackage ../os-specific/linux/kernel-headers/3.3.5.nix { };

From 071d685dda26a31f43a3278c94ec13523995f0ac Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 8 Sep 2012 14:50:47 +0200
Subject: [PATCH 09/88] mongodb: upgrade to 2.2.0

---
 pkgs/servers/nosql/mongodb/default.nix | 32 +++++++++++---------------
 pkgs/top-level/all-packages.nix        |  1 -
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix
index 685aeb05ce7..48a33377e50 100644
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/pkgs/servers/nosql/mongodb/default.nix
@@ -1,39 +1,34 @@
-{ stdenv, fetchurl, scons, which, boost, gnutar, v8 ? null, useV8 ? false}:
-
-assert useV8 -> v8 != null;
+{ stdenv, fetchurl, scons, which, v8, useV8 ? false}:
 
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "mongodb-2.0.6";
+  name = "mongodb-2.2.0";
 
   src = fetchurl {
-    url = "http://downloads.mongodb.org/src/mongodb-src-r2.0.6.tar.gz";
-    sha256 = "0kiiz8crx318sdn0wd9d88pzx9s1c6ak2dhd0zw7kl63gmd74wm9";
+    url = http://downloads.mongodb.org/src/mongodb-src-r2.2.0.tar.gz;
+    sha256 = "12v0cpq9j2gmagr9pbw08karqwqgl4j9r223w7x7sx5cfvj2cih8";
   };
 
-  buildInputs = [scons which boost] ++ stdenv.lib.optional useV8 v8;
+  buildNativeInputs = [ scons which ];
 
   enableParallelBuilding = true;
 
   patchPhase = ''
-    substituteInPlace SConstruct --replace "Environment( MSVS_ARCH=msarch , tools = [\"default\", \"gch\"], toolpath = '.' )" "Environment( MSVS_ARCH=msarch , tools = [\"default\", \"gch\"], toolpath = '.', ENV = os.environ )"
-    substituteInPlace SConstruct --replace "../v8" "${v8}"
-    substituteInPlace SConstruct --replace "LIBPATH=[\"${v8}/\"]" "LIBPATH=[\"${v8}/lib\"]"
+    substituteInPlace SConstruct --replace "Environment( BUILD_DIR" "Environment( ENV = os.environ, BUILD_DIR"
+  '' + optionalString useV8 ''
+    substituteInPlace SConstruct --replace "#/../v8" "${v8}" \
+                                 --replace "[\"${v8}/\"]" "[\"${v8}/lib\"]"
   '';
 
   buildPhase = ''
-    export TERM=""
-    scons all --cc=`which gcc` --cxx=`which g++` --libpath=${boost}/lib --cpppath=${boost}/include \
-              ${optionalString useV8 "--usev8"}
+    echo $PATH
+    scons all --cc=`which gcc` --cxx=`which g++` ${optionalString useV8 "--usev8"}
   '';
 
   installPhase = ''
-    scons install --cc=`which gcc` --cxx=`which g++` --libpath=${boost}/lib --cpppath=${boost}/include \
-                  ${optionalString useV8 "--usev8"} --full --prefix=$out
-    if [ -d $out/lib64 ]; then
-      mv $out/lib64 $out/lib
-    fi
+    scons install --cc=`which gcc` --cxx=`which g++` ${optionalString useV8 "--usev8"} --full --prefix=$out
+    rm -rf $out/lib64 # exact same files as installed in $out/lib
   '';
 
   meta = {
@@ -45,4 +40,3 @@ stdenv.mkDerivation rec {
     platforms = stdenv.lib.platforms.all;
   };
 }
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ffa151e98fc..51b984e17f8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5348,7 +5348,6 @@ let
   #monetdb = callPackage ../servers/sql/monetdb { };
 
   mongodb = callPackage ../servers/nosql/mongodb {
-    boost = boost149;
     useV8 = (getConfig ["mongodb" "useV8"] false);
   };
 

From ad628ab557e87ce981566af5fe162f9aab2fe1b9 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 9 Sep 2012 17:25:59 +0200
Subject: [PATCH 10/88] mongodb: fix build on i686, restrict platforms to linux

mongodb is supposed to work on most unixes but its build system is
quite picky and fragile.
As it hasn't worked for non-linux platforms on NixOS yet, this change
won't affect anyone and will remove the illusion that other platforms
are currently supported.
---
 pkgs/servers/nosql/mongodb/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix
index 48a33377e50..ce664972037 100644
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/pkgs/servers/nosql/mongodb/default.nix
@@ -2,6 +2,12 @@
 
 with stdenv.lib;
 
+let installerPatch = fetchurl {
+      url = "https://jira.mongodb.org/secure/attachment/18160/SConscript.client.patch";
+      sha256 = "0n60fh2r8i7m6g113k0iw4adc8jv2by4ahrd780kxg47kzfgw06a";
+    };
+
+in
 stdenv.mkDerivation rec {
   name = "mongodb-2.2.0";
 
@@ -12,9 +18,11 @@ stdenv.mkDerivation rec {
 
   buildNativeInputs = [ scons which ];
 
+  patches = [ installerPatch ];
+
   enableParallelBuilding = true;
 
-  patchPhase = ''
+  postPatch = ''
     substituteInPlace SConstruct --replace "Environment( BUILD_DIR" "Environment( ENV = os.environ, BUILD_DIR"
   '' + optionalString useV8 ''
     substituteInPlace SConstruct --replace "#/../v8" "${v8}" \
@@ -37,6 +45,6 @@ stdenv.mkDerivation rec {
     license = "AGPLv3";
 
     maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From 338e78c7b6df25d523696f17fe4f1d141db50176 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 9 Sep 2012 19:31:54 +0200
Subject: [PATCH 11/88] emacs htmlize: upgrade to 1.40

---
 pkgs/applications/editors/emacs-modes/htmlize/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/htmlize/default.nix b/pkgs/applications/editors/emacs-modes/htmlize/default.nix
index 948beae82d4..d4de24d394c 100644
--- a/pkgs/applications/editors/emacs-modes/htmlize/default.nix
+++ b/pkgs/applications/editors/emacs-modes/htmlize/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "htmlize-1.37";
+  name = "htmlize-1.40";
 
   builder = ./builder.sh;
 
   src = fetchurl {
     url = http://fly.srk.fer.hr/~hniksic/emacs/htmlize.el.cgi;
-    sha256 = "70cf41a2ea6a478a45143a8cd672381c01ed894448200e602531acbf2b1fd160";
+    sha256 = "1v7pzif5b7dr6iyllqvzka8i6s23rsjdnmilnma054gv8d4shw6a";
   };
 
   meta = {

From 7bbda346ba6be74b3b1bb9440261074aadf6863d Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 9 Sep 2012 19:32:14 +0200
Subject: [PATCH 12/88] emacs: add package "xml-rpc"

---
 .../editors/emacs-modes/xml-rpc/default.nix   | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/applications/editors/emacs-modes/xml-rpc/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix b/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix
new file mode 100644
index 00000000000..87a732b5b4c
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix
@@ -0,0 +1,32 @@
+{stdenv, fetchurl, emacs}:
+
+stdenv.mkDerivation rec {
+  name = "xml-rpc-1.6.8";
+
+  src = fetchurl {
+    url = https://launchpadlibrarian.net/40270196/xml-rpc.el;
+    sha256 = "0i8hf90yhrjwqrv7q1f2g1cff6ld8apqkka42fh01wkdys1fbm7b";
+  };
+
+  phases = [ "buildPhase" "installPhase"];
+
+  buildInputs = [ emacs ];
+
+  buildPhase = ''
+    cp $src xml-rpc.el
+    emacs --batch -f batch-byte-compile xml-rpc.el
+  '';
+
+  installPhase = ''
+    install -d $out/share/emacs/site-lisp
+    install xml-rpc.el* $out/share/emacs/site-lisp
+  '';
+
+  meta = {
+    description = "An elisp implementation of clientside XML-RPC.";
+    homepage = https://launchpad.net/xml-rpc-el;
+    license = "GPLv3+";
+
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 51b984e17f8..5ab5cfb2375 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6807,6 +6807,8 @@ let
     scalaMode = callPackage ../applications/editors/emacs-modes/scala-mode { };
 
     sunriseCommander = callPackage ../applications/editors/emacs-modes/sunrise-commander { };
+
+    xmlRpc = callPackage ../applications/editors/emacs-modes/xml-rpc { };
   };
 
   emacs22Packages = emacsPackages emacs22 pkgs.emacs22Packages;

From da87b2c9bf9f5703e7d966849057ecd26c242f15 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 9 Sep 2012 19:32:27 +0200
Subject: [PATCH 13/88] emacs: add package "org2blog"

---
 .../editors/emacs-modes/org2blog/default.nix  | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/applications/editors/emacs-modes/org2blog/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/org2blog/default.nix b/pkgs/applications/editors/emacs-modes/org2blog/default.nix
new file mode 100644
index 00000000000..c8c538c5cb7
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/org2blog/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchgit, emacs, xmlRpc }:
+
+stdenv.mkDerivation rec {
+  name = "org2blog-0.5";
+
+  src = fetchgit {
+    url = https://github.com/punchagan/org2blog.git;
+    rev = "338abe30e9bc89684f8384f8deaf826b63844da6";
+    sha256 = "46ab31e90d0d54071c126b7d5599a3e82062baa79ddf26b988bcb88d306d6827";
+  };
+
+  buildInputs = [ emacs ];
+  propagatedUserEnvPkgs = [ xmlRpc ];
+
+  buildPhase = ''
+    emacs -L . -L ${xmlRpc}/share/emacs/site-lisp --batch -f batch-byte-compile *.el
+  '';
+
+  installPhase = ''
+    install -d $out/share/emacs/site-lisp
+    install *.el* $out/share/emacs/site-lisp
+  '';
+
+  meta = {
+    description = "A tool to publish directly from Emacs’ org-mode to WordPress blogs.";
+    homepage = https://github.com/punchagan/org2blog;
+    license = "GPLv3+";
+
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5ab5cfb2375..7d69d18ab8f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6784,6 +6784,8 @@ let
     # we want it to have higher precedence.
     org = hiPrio (callPackage ../applications/editors/emacs-modes/org { });
 
+    org2blog = callPackage ../applications/editors/emacs-modes/org2blog { };
+
     pcache = callPackage ../applications/editors/emacs-modes/pcache { };
 
     phpMode = callPackage ../applications/editors/emacs-modes/php { };

From 64c0d7a4908d3a0eb073b9e2cf9f4cbfb0728301 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 11:30:12 +0200
Subject: [PATCH 14/88] ghc: bump 7.6.1-rc1 to version 7.6.1

---
 pkgs/development/compilers/ghc/7.6.1.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/ghc/7.6.1.nix b/pkgs/development/compilers/ghc/7.6.1.nix
index 203a354c13c..77eeacb6a66 100644
--- a/pkgs/development/compilers/ghc/7.6.1.nix
+++ b/pkgs/development/compilers/ghc/7.6.1.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, ghc, perl, gmp, ncurses }:
 
 stdenv.mkDerivation rec {
-  version = "7.6.0.20120810";
+  version = "7.6.1";
 
   name = "ghc-${version}";
 
   src = fetchurl {
-    url = "http://haskell.org/ghc/dist/7.6.1-rc1/${name}-src.tar.bz2";
-    sha256 = "04m8ms3a58590s4p8x6qma25rdanz0iai8rcla78ka798612pvjd";
+    url = "http://haskell.org/ghc/dist/7.6.1/${name}-src.tar.bz2";
+    sha256 = "1q5rqp8z90mq6ysf7h28zkbhfaxlrpva2qy0wnkr43d7214dzp7i";
   };
 
   buildInputs = [ ghc perl gmp ncurses ];

From 1037089c55bd73a74cd21f71f99b03794b356515 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 11:31:36 +0200
Subject: [PATCH 15/88] Update default version of boost to 1.51.0.

Version 1.50.0 should be dropped from Nixpkgs, if possible, once we're
reasonably sure that the update doesn't break any packages in ways that
cannot be trivially fixed.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7d69d18ab8f..231c0cf7cc0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3314,7 +3314,7 @@ let
   boost149 = callPackage ../development/libraries/boost/1.49.nix { };
   boost150 = callPackage ../development/libraries/boost/1.50.nix { };
   boost151 = callPackage ../development/libraries/boost/1.51.nix { };
-  boost = boost150;
+  boost = boost151;
 
   boostHeaders149 = callPackage ../development/libraries/boost/1.49-headers.nix { };
   boostHeaders150 = callPackage ../development/libraries/boost/1.50-headers.nix { };

From 15df3d131accbbc926a0d64b419b28a5485480cd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 12:17:59 +0200
Subject: [PATCH 16/88] ghc-7.6.1: parallel builds of this package fail

I got the following error in 4 consecutive attempts:

  building rts/dist/build/AutoApply.debug_o
  building rts/dist/build/AutoApply.thr_o
    rts_dist_HC rts/dist/build/AutoApply.debug_o
  /nix/store/1iigiim5855m8j7pmwf5xrnpf705s4dh-binutils-2.21.1a/bin/ld: cannot find libraries/integer-gmp/dist-install/build/cbits/gmp-wrappers_o_split/gmp-wrappers__1.o
  collect2: ld returned 1 exit status
  make[1]: *** [libraries/integer-gmp/dist-install/build/cbits/gmp-wrappers.p_o] Error 1
---
 pkgs/development/compilers/ghc/7.6.1.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ghc/7.6.1.nix b/pkgs/development/compilers/ghc/7.6.1.nix
index 77eeacb6a66..335befb6c12 100644
--- a/pkgs/development/compilers/ghc/7.6.1.nix
+++ b/pkgs/development/compilers/ghc/7.6.1.nix
@@ -12,7 +12,16 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ ghc perl gmp ncurses ];
 
-  enableParallelBuilding = true;
+  # My attempts to compile GHC with parallel build support enabled, failed
+  # 4 consecutive times with the following error:
+  #
+  #    building rts/dist/build/AutoApply.debug_o
+  #    building rts/dist/build/AutoApply.thr_o
+  #      rts_dist_HC rts/dist/build/AutoApply.debug_o
+  #    /nix/store/1iigiim5855m8j7pmwf5xrnpf705s4dh-binutils-2.21.1a/bin/ld: cannot find libraries/integer-gmp/dist-install/build/cbits/gmp-wrappers_o_split/gmp-wrappers__1.o
+  #    collect2: ld returned 1 exit status
+  #    make[1]: *** [libraries/integer-gmp/dist-install/build/cbits/gmp-wrappers.p_o] Error 1
+  enableParallelBuilding = false;
 
   buildMK = ''
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"

From 11111c7d018f7297ed878b1b51584a404e1bda17 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 12:19:45 +0200
Subject: [PATCH 17/88] haskell-cabal2nix: update to version 1.39

---
 pkgs/development/tools/haskell/cabal2nix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index b5983dec6fb..72c032342d9 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal2nix";
-  version = "1.38";
-  sha256 = "1kybxrkddbzr1cqpqplbflhakf9njb9hvamhdwvlanlk8985h8jg";
+  version = "1.39";
+  sha256 = "0q2kgzjbcrqxml12hncsrkjdwjiq52dp00v6i3qdgiyj460iy60d";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];

From 2ccd0238cb578d5b3a142b1e784485e31cc7f0c4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 12:27:35 +0200
Subject: [PATCH 18/88] haskell-jailbreak-cabal: add version 1.0

---
 .../tools/haskell/jailbreak-cabal/default.nix   | 17 +++++++++++++++++
 pkgs/top-level/haskell-packages.nix             |  4 ++++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/tools/haskell/jailbreak-cabal/default.nix

diff --git a/pkgs/development/tools/haskell/jailbreak-cabal/default.nix b/pkgs/development/tools/haskell/jailbreak-cabal/default.nix
new file mode 100644
index 00000000000..303e7ceb2c3
--- /dev/null
+++ b/pkgs/development/tools/haskell/jailbreak-cabal/default.nix
@@ -0,0 +1,17 @@
+{ cabal, Cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "jailbreak-cabal";
+  version = "1.0";
+  sha256 = "10vq592fx1i3fdqiij7daf3dmqq5c8c29ihr2y1rn2pjhkyiy4kk";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [ Cabal ];
+  meta = {
+    homepage = "http://github.com/peti/jailbreak-cabal";
+    description = "Strip version restrictions from build dependencies in Cabal files";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index b45db385e59..30c7bfc58c1 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1788,6 +1788,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {};
   cabalInstall = self.cabalInstall_0_14_0;
 
+  jailbreakCabal = callPackage ../development/tools/haskell/jailbreak-cabal {
+    Cabal = self.Cabal_1_14_0;
+  };
+
   lhs2tex = callPackage ../tools/typesetting/lhs2tex {};
 
   myhasktags = callPackage ../tools/misc/myhasktags {};

From 470ade254e73e280b0ec9e1a1ef081926e0d1371 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 6 Sep 2012 14:59:07 +0200
Subject: [PATCH 19/88] Add support for jailbreak-cabal utility to the Cabal
 builder.

Jailbreaks-cabal allows Nixpkgs maintainers to quick-fix builds of packages
that over-specify their version requirements by removing the version
restrictions of all dependencies from the Cabal file. Set

  jailbreak = true

in the build expression to activate this feature.
---
 pkgs/build-support/cabal/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix
index 8ae8c06d513..42392aff60c 100644
--- a/pkgs/build-support/cabal/default.nix
+++ b/pkgs/build-support/cabal/default.nix
@@ -1,6 +1,6 @@
 # generic builder for Cabal packages
 
-{stdenv, fetchurl, lib, pkgconfig, ghc, Cabal, enableLibraryProfiling ? false} :
+{ stdenv, fetchurl, lib, pkgconfig, ghc, Cabal, jailbreakCabal, enableLibraryProfiling ? false }:
 {
   mkDerivation =
     args : # arguments for the individual package, can modify the defaults
@@ -86,7 +86,8 @@
             configurePhase = ''
               eval "$preConfigure"
 
-              for i in Setup.hs Setup.lhs; do
+              ${lib.optionalString (lib.attrByPath ["jailbreak"] false self) "${jailbreakCabal}/bin/jailbreak-cabal ${self.pname}.cabal && "
+              }for i in Setup.hs Setup.lhs; do
                 test -f $i && ghc --make $i
               done
 

From d7d1f995e6b1cb0feadc2436e254deb3d288441f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 6 Sep 2012 15:21:17 +0200
Subject: [PATCH 20/88] Use jailbreak to get rid of overspecified version
 restrictions to fix builds of Agda, accelerate-cuda, clientsession,
 filestore, ghc-events, gitit, happstack, happstack, happstack, hledger-lib,
 hledger, mime-mail, pandoc, snap, wai-app-static, yesod-static, and
 urlencoded.

---
 pkgs/development/libraries/haskell/Agda/default.nix         | 4 +---
 .../libraries/haskell/accelerate-cuda/default.nix           | 3 ---
 .../development/libraries/haskell/clientsession/default.nix | 4 +---
 pkgs/development/libraries/haskell/filestore/default.nix    | 4 +---
 pkgs/development/libraries/haskell/ghc-events/default.nix   | 4 +---
 pkgs/development/libraries/haskell/gitit/default.nix        | 4 +---
 .../libraries/haskell/happstack/happstack-hamlet.nix        | 4 +---
 .../libraries/haskell/happstack/happstack-server.nix        | 4 +---
 .../libraries/haskell/happstack/happstack-util.nix          | 4 +---
 pkgs/development/libraries/haskell/hledger-lib/default.nix  | 4 +---
 pkgs/development/libraries/haskell/hledger/default.nix      | 4 +---
 pkgs/development/libraries/haskell/mime-mail/default.nix    | 4 +---
 pkgs/development/libraries/haskell/pandoc/default.nix       | 4 +---
 pkgs/development/libraries/haskell/snap/snap.nix            | 4 +---
 pkgs/development/libraries/haskell/urlencoded/default.nix   | 4 +---
 .../libraries/haskell/wai-app-static/default.nix            | 6 ++----
 pkgs/development/libraries/haskell/yesod-static/default.nix | 4 +---
 17 files changed, 17 insertions(+), 52 deletions(-)

diff --git a/pkgs/development/libraries/haskell/Agda/default.nix b/pkgs/development/libraries/haskell/Agda/default.nix
index c72177e2108..b598accffc6 100644
--- a/pkgs/development/libraries/haskell/Agda/default.nix
+++ b/pkgs/development/libraries/haskell/Agda/default.nix
@@ -13,9 +13,7 @@ cabal.mkDerivation (self: {
     QuickCheck syb xhtml zlib
   ];
   buildTools = [ alex happy ];
-  patchPhase = ''
-    sed -i -e 's|mtl == 2.0.\*|mtl|' Agda.cabal
-  '';
+  jailbreak = true;
   meta = {
     homepage = "http://wiki.portal.chalmers.se/agda/";
     description = "A dependently typed functional programming language and proof assistant";
diff --git a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix
index ff9a98cbb59..3772320b0c2 100644
--- a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix
+++ b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     hashable hashtables languageCQuote mainlandPretty mtl srcloc
     transformers unorderedContainers
   ];
-  patchPhase = ''
-    sed -i -e 's|\<defaultMain\>|defaultMainWithHooks autoconfUserHooks|' Setup.hs
-  '';
   meta = {
     homepage = "http://www.cse.unsw.edu.au/~chak/project/accelerate/";
     description = "Accelerate backend for NVIDIA GPUs";
diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix
index 417e568092d..13513d02333 100644
--- a/pkgs/development/libraries/haskell/clientsession/default.nix
+++ b/pkgs/development/libraries/haskell/clientsession/default.nix
@@ -10,9 +10,7 @@ cabal.mkDerivation (self: {
     base64Bytestring cereal cprngAes cryptoApi cryptocipher entropy
     skein tagged
   ];
-  patchPhase = ''
-    sed -i -e 's|, base64-bytestring.*|, base64-bytestring|' clientsession.cabal
-  '';
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/yesodweb/clientsession/tree/master";
     description = "Securely store session data in a client-side cookie";
diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix
index b0cc40d3914..e265cf54e4e 100644
--- a/pkgs/development/libraries/haskell/filestore/default.nix
+++ b/pkgs/development/libraries/haskell/filestore/default.nix
@@ -11,9 +11,7 @@ cabal.mkDerivation (self: {
   buildDepends = [
     Diff filepath HUnit mtl parsec split time utf8String xml
   ];
-  patchPhase = ''
-    sed -i -e 's|split.*,|split,|' filestore.cabal
-  '';
+  jailbreak = true;
   noHaddock = true;
   meta = {
     description = "Interface for versioning file stores";
diff --git a/pkgs/development/libraries/haskell/ghc-events/default.nix b/pkgs/development/libraries/haskell/ghc-events/default.nix
index 4827b749484..149e88cd01d 100644
--- a/pkgs/development/libraries/haskell/ghc-events/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-events/default.nix
@@ -7,9 +7,7 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ binary mtl ];
-  patchPhase = ''
-    sed -i -e 's|mtl *>=.*$|mtl,|' ghc-events.cabal
-  '';
+  jailbreak = true;
   noHaddock = true;
   meta = {
     description = "Library and tool for parsing .eventlog files from GHC";
diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix
index 41d521805ce..7de302aee6d 100644
--- a/pkgs/development/libraries/haskell/gitit/default.nix
+++ b/pkgs/development/libraries/haskell/gitit/default.nix
@@ -18,9 +18,7 @@ cabal.mkDerivation (self: {
     safe SHA syb tagsoup text time url utf8String xhtml xml xssSanitize
     zlib
   ];
-  patchPhase = ''
-    sed -i -e 's|hslogger.*,|hslogger,|' -e 's|base64-bytestring.*,|base64-bytestring,|' gitit.cabal
-  '';
+  jailbreak = true;
   meta = {
     homepage = "http://gitit.net";
     description = "Wiki using happstack, git or darcs, and pandoc";
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
index 7b2c937bd06..cf71dde30c3 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
@@ -5,9 +5,7 @@ cabal.mkDerivation (self: {
   version = "7.0.1";
   sha256 = "13ayypl2x402h6a7yq7fvgd2mn21gl5gcw2hk7f5vr2bdlvwv53n";
   buildDepends = [ hamlet happstackServer text ];
-  patchPhase = ''
-    sed -i -e 's|hamlet .*,|hamlet,|' happstack-hamlet.cabal
-  '';
+  jailbreak = true;
   meta = {
     homepage = "http://www.happstack.com/";
     description = "Support for Hamlet HTML templates in Happstack";
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
index 410eb7e1d05..06b882c20bb 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
@@ -13,9 +13,7 @@ cabal.mkDerivation (self: {
     html monadControl mtl network parsec sendfile syb systemFilepath
     text time transformers transformersBase utf8String xhtml zlib
   ];
-  patchPhase = ''
-    sed -i -e 's|base64-bytestring.*,|base64-bytestring,|' happstack-server.cabal
-  '';
+  jailbreak = true;
   meta = {
     homepage = "http://happstack.com";
     description = "Web related tools and services";
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-util.nix b/pkgs/development/libraries/haskell/happstack/happstack-util.nix
index b457ec6dc32..8dfac311a9a 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-util.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-util.nix
@@ -12,9 +12,7 @@ cabal.mkDerivation (self: {
     extensibleExceptions filepath hslogger mtl network parsec random
     time unixCompat
   ];
-  patchPhase = ''
-    sed -i -e 's|mtl >= 1.1 && < 2.1|mtl|' happstack-util.cabal
-  '';
+  jailbreak = true;
   meta = {
     homepage = "http://happstack.com";
     description = "Web framework";
diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix
index de2e40a03d5..af230b2e644 100644
--- a/pkgs/development/libraries/haskell/hledger-lib/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix
@@ -10,9 +10,7 @@ cabal.mkDerivation (self: {
     cmdargs csv filepath HUnit mtl parsec regexpr safe shakespeareText
     split time transformers utf8String
   ];
-  patchPhase = ''
-    sed -i -e 's|,split.*|,split|' -e 's|,cmdargs.*|,cmdargs|' hledger-lib.cabal
-  '';
+  jailbreak = true;
   meta = {
     homepage = "http://hledger.org";
     description = "Core data types, parsers and utilities for the hledger accounting tool";
diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix
index a02697be7c2..46ae378d738 100644
--- a/pkgs/development/libraries/haskell/hledger/default.nix
+++ b/pkgs/development/libraries/haskell/hledger/default.nix
@@ -13,9 +13,7 @@ cabal.mkDerivation (self: {
     cabalFileTh cmdargs filepath haskeline hledgerLib HUnit mtl parsec
     regexpr safe shakespeareText split text time utf8String
   ];
-  patchPhase = ''
-    sed -i -e 's|,split.*|,split|' -e 's|,cmdargs.*|,cmdargs|' hledger.cabal
-  '';
+  jailbreak = true;
   meta = {
     homepage = "http://hledger.org";
     description = "The main command-line interface for the hledger accounting tool";
diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix
index 9abc588a0e7..6303cbb8f4e 100644
--- a/pkgs/development/libraries/haskell/mime-mail/default.nix
+++ b/pkgs/development/libraries/haskell/mime-mail/default.nix
@@ -7,9 +7,7 @@ cabal.mkDerivation (self: {
   buildDepends = [
     base64Bytestring blazeBuilder filepath random text
   ];
-  patchPhase = ''
-    sed -i -e 's|, base64-bytestring.*|, base64-bytestring|' mime-mail.cabal
-  '';
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/snoyberg/mime-mail";
     description = "Compose MIME email messages";
diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix
index 8f34d2d88a0..85a8338e431 100644
--- a/pkgs/development/libraries/haskell/pandoc/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc/default.nix
@@ -15,9 +15,7 @@ cabal.mkDerivation (self: {
     highlightingKate HTTP json mtl network pandocTypes parsec random
     syb tagsoup temporary texmath time utf8String xml zipArchive zlib
   ];
-  patchPhase = ''
-    sed -i -e 's|base64-bytestring.*,|base64-bytestring,|' pandoc.cabal
-  '';
+  jailbreak = true;
   meta = {
     homepage = "http://johnmacfarlane.net/pandoc";
     description = "Conversion between markup formats";
diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix
index 4121a657357..e40aee63bc1 100644
--- a/pkgs/development/libraries/haskell/snap/snap.nix
+++ b/pkgs/development/libraries/haskell/snap/snap.nix
@@ -19,9 +19,7 @@ cabal.mkDerivation (self: {
     snapServer stm syb text time transformers unorderedContainers
     utf8String vector vectorAlgorithms xmlhtml
   ];
-  patchPhase = ''
-    sed -i snap.cabal -e 's|clientsession.*,|clientsession,|'
-  '';
+  jailbreak = true;
   meta = {
     homepage = "http://snapframework.com/";
     description = "Snap: A Haskell Web Framework: project starter executable and glue code library";
diff --git a/pkgs/development/libraries/haskell/urlencoded/default.nix b/pkgs/development/libraries/haskell/urlencoded/default.nix
index 0e7a5413fa2..45891bb45b1 100644
--- a/pkgs/development/libraries/haskell/urlencoded/default.nix
+++ b/pkgs/development/libraries/haskell/urlencoded/default.nix
@@ -7,9 +7,7 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ mtl network split ];
-  patchPhase = ''
-    sed -i -e 's|split.*|split|' urlencoded.cabal
-  '';
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/pheaver/urlencoded";
     description = "Generate or process x-www-urlencoded data";
diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix
index e1f2cb9116d..b6f80e49c5b 100644
--- a/pkgs/development/libraries/haskell/wai-app-static/default.nix
+++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix
@@ -13,10 +13,8 @@ cabal.mkDerivation (self: {
     cryptoConduit cryptohash fileEmbed httpDate httpTypes mimeTypes
     systemFileio systemFilepath text time transformers unixCompat wai
   ];
-  patchPhase = ''
-    sed -i -e 's|, base64-bytestring.*|, base64-bytestring|' wai-app-static.cabal
-  '';
-    meta = {
+  jailbreak = true;
+  meta = {
     homepage = "http://www.yesodweb.com/book/wai";
     description = "WAI application for static serving";
     license = self.stdenv.lib.licenses.mit;
diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix
index 8fffccd649a..4a7d8c1a726 100644
--- a/pkgs/development/libraries/haskell/yesod-static/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-static/default.nix
@@ -12,9 +12,7 @@ cabal.mkDerivation (self: {
     httpTypes systemFilepath text transformers unixCompat wai
     waiAppStatic yesodCore
   ];
-  patchPhase = ''
-    sed -i yesod-static.cabal -e 's|, base64-bytestring.*|, base64-bytestring|'
-  '';
+  jailbreak = true;
   meta = {
     homepage = "http://www.yesodweb.com/";
     description = "Static file serving subsite for Yesod Web Framework";

From 9a19904d32c9f5bc912f0922c6d4fdbf6f9448e2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 14:11:19 +0200
Subject: [PATCH 21/88] cosmetic

---
 pkgs/development/libraries/haskell/filestore/default.nix  | 2 +-
 pkgs/development/libraries/haskell/ghc-events/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix
index e265cf54e4e..752037698ca 100644
--- a/pkgs/development/libraries/haskell/filestore/default.nix
+++ b/pkgs/development/libraries/haskell/filestore/default.nix
@@ -11,8 +11,8 @@ cabal.mkDerivation (self: {
   buildDepends = [
     Diff filepath HUnit mtl parsec split time utf8String xml
   ];
-  jailbreak = true;
   noHaddock = true;
+  jailbreak = true;
   meta = {
     description = "Interface for versioning file stores";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/ghc-events/default.nix b/pkgs/development/libraries/haskell/ghc-events/default.nix
index 149e88cd01d..0b5fc5c107a 100644
--- a/pkgs/development/libraries/haskell/ghc-events/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-events/default.nix
@@ -7,8 +7,8 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ binary mtl ];
-  jailbreak = true;
   noHaddock = true;
+  jailbreak = true;
   meta = {
     description = "Library and tool for parsing .eventlog files from GHC";
     license = self.stdenv.lib.licenses.bsd3;

From b9f0b44b1ad6aa383447b08500312716b3f8510f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 14:14:33 +0200
Subject: [PATCH 22/88] haskell-haskeline: update to version 0.7.0.3

---
 .../libraries/haskell/haskeline/{0.7.0.2.nix => 0.7.0.3.nix}  | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/libraries/haskell/haskeline/{0.7.0.2.nix => 0.7.0.3.nix} (84%)

diff --git a/pkgs/development/libraries/haskell/haskeline/0.7.0.2.nix b/pkgs/development/libraries/haskell/haskeline/0.7.0.3.nix
similarity index 84%
rename from pkgs/development/libraries/haskell/haskeline/0.7.0.2.nix
rename to pkgs/development/libraries/haskell/haskeline/0.7.0.3.nix
index b58152f7c24..3d51d396c7f 100644
--- a/pkgs/development/libraries/haskell/haskeline/0.7.0.2.nix
+++ b/pkgs/development/libraries/haskell/haskeline/0.7.0.3.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "haskeline";
-  version = "0.7.0.2";
-  sha256 = "0mmflw8mslvif8w1app4zwrlpynpfvzqdb9srs6bgicawwgkb2r0";
+  version = "0.7.0.3";
+  sha256 = "10xc229ddk4g87i78vgjbfr7sii28fx00qwnggb5x7sfigfca8sg";
   buildDepends = [ filepath terminfo transformers ];
   configureFlags = "-fterminfo";
   meta = {
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 30c7bfc58c1..fd200172e38 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -815,8 +815,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   hashtables = callPackage ../development/libraries/haskell/hashtables {};
 
   haskeline_0_6_4_7 = callPackage ../development/libraries/haskell/haskeline/0.6.4.7.nix {};
-  haskeline_0_7_0_2 = callPackage ../development/libraries/haskell/haskeline/0.7.0.2.nix {};
-  haskeline = self.haskeline_0_7_0_2;
+  haskeline_0_7_0_3 = callPackage ../development/libraries/haskell/haskeline/0.7.0.3.nix {};
+  haskeline = self.haskeline_0_7_0_3;
 
   haskelineClass = callPackage ../development/libraries/haskell/haskeline-class {};
 

From 18e9e6832bbaae2a6431c53f295bd0578595aea4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 14:18:40 +0200
Subject: [PATCH 23/88] haddock: add version 2.11.0 and 2.12.0

---
 .../tools/documentation/haddock/2.11.0.nix     | 18 ++++++++++++++++++
 .../tools/documentation/haddock/2.12.0.nix     | 18 ++++++++++++++++++
 pkgs/top-level/haskell-packages.nix            |  6 ++++--
 3 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/tools/documentation/haddock/2.11.0.nix
 create mode 100644 pkgs/development/tools/documentation/haddock/2.12.0.nix

diff --git a/pkgs/development/tools/documentation/haddock/2.11.0.nix b/pkgs/development/tools/documentation/haddock/2.11.0.nix
new file mode 100644
index 00000000000..92dccbf05a6
--- /dev/null
+++ b/pkgs/development/tools/documentation/haddock/2.11.0.nix
@@ -0,0 +1,18 @@
+{ cabal, alex, Cabal, filepath, ghcPaths, happy, xhtml }:
+
+cabal.mkDerivation (self: {
+  pname = "haddock";
+  version = "2.11.0";
+  sha256 = "0a29n6y9lmk5w78f6j8s7pg0m0k3wm7bx5r2lhk7bnzkr5f7rkcd";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ Cabal filepath ghcPaths xhtml ];
+  buildTools = [ alex happy ];
+  meta = {
+    homepage = "http://www.haskell.org/haddock/";
+    description = "A documentation-generation tool for Haskell libraries";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/development/tools/documentation/haddock/2.12.0.nix b/pkgs/development/tools/documentation/haddock/2.12.0.nix
new file mode 100644
index 00000000000..39610f9a08c
--- /dev/null
+++ b/pkgs/development/tools/documentation/haddock/2.12.0.nix
@@ -0,0 +1,18 @@
+{ cabal, alex, Cabal, deepseq, filepath, ghcPaths, happy, xhtml }:
+
+cabal.mkDerivation (self: {
+  pname = "haddock";
+  version = "2.12.0";
+  sha256 = "00kdmpa6vhn6x790641ln40v3pn7aj4ws6pq854n1iyg5ly3ridn";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ];
+  buildTools = [ alex happy ];
+  meta = {
+    homepage = "http://www.haskell.org/haddock/";
+    description = "A documentation-generation tool for Haskell libraries";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index fd200172e38..c0f3ea890da 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -145,7 +145,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     zlib         = self.zlib_0_5_3_3;           # 7.5 fail
     cabalInstall = self.cabalInstall_0_14_0;    # 7.5 ok
     alex         = self.alex_3_0_1;             # 7.5 ok
-    haddock      = self.haddock_2_10_0;         # 7.5 ok
+    haddock      = self.haddock_2_12_0;         # 7.5 ok
     happy        = self.happy_1_18_9;           # 7.5 ok
   };
 
@@ -1712,7 +1712,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   haddock_2_9_2 = callPackage ../development/tools/documentation/haddock/2.9.2.nix {};
   haddock_2_9_4 = callPackage ../development/tools/documentation/haddock/2.9.4.nix {};
   haddock_2_10_0 = callPackage ../development/tools/documentation/haddock/2.10.0.nix {};
-  haddock = self.haddock_2_10_0;
+  haddock_2_11_0 = callPackage ../development/tools/documentation/haddock/2.11.0.nix {};
+  haddock_2_12_0 = callPackage ../development/tools/documentation/haddock/2.12.0.nix {};
+  haddock = self.haddock_2_12_0;
 
   happy_1_18_4 = callPackage ../development/tools/parsing/happy/1.18.4.nix {};
   happy_1_18_5 = callPackage ../development/tools/parsing/happy/1.18.5.nix {};

From c03160831bb4c1881cc2ab63cadc47c97efc93f0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 14:19:47 +0200
Subject: [PATCH 24/88] haskell-th-orphans: add version 0.6

---
 .../libraries/haskell/th-orphans/default.nix       | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/th-orphans/default.nix

diff --git a/pkgs/development/libraries/haskell/th-orphans/default.nix b/pkgs/development/libraries/haskell/th-orphans/default.nix
new file mode 100644
index 00000000000..da14adfe339
--- /dev/null
+++ b/pkgs/development/libraries/haskell/th-orphans/default.nix
@@ -0,0 +1,14 @@
+{ cabal, thLift }:
+
+cabal.mkDerivation (self: {
+  pname = "th-orphans";
+  version = "0.6";
+  sha256 = "1ablf4c8vp9kzvr75ngl5yz3ip5klk6zmq7bcqcvks758b9c6qgj";
+  buildDepends = [ thLift ];
+  noHaddock = true;
+  meta = {
+    description = "Orphan instances for TH datatypes";
+    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 c0f3ea890da..71cd638ea7d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1483,6 +1483,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   thLift = callPackage ../development/libraries/haskell/th-lift {};
 
+  thOrphans = callPackage ../development/libraries/haskell/th-orphans {};
+
   threadmanager = callPackage ../development/libraries/haskell/threadmanager {};
 
   time_1_1_2_4 = callPackage ../development/libraries/haskell/time/1.1.2.4.nix {};

From 062678654574cfc96831b2e4bf09594bcfb7485c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 14:21:42 +0200
Subject: [PATCH 25/88] haskell-deepseq: update to version 1.3.0.1

---
 .../libraries/haskell/deepseq/{1.3.0.0.nix => 1.3.0.1.nix}    | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename pkgs/development/libraries/haskell/deepseq/{1.3.0.0.nix => 1.3.0.1.nix} (76%)

diff --git a/pkgs/development/libraries/haskell/deepseq/1.3.0.0.nix b/pkgs/development/libraries/haskell/deepseq/1.3.0.1.nix
similarity index 76%
rename from pkgs/development/libraries/haskell/deepseq/1.3.0.0.nix
rename to pkgs/development/libraries/haskell/deepseq/1.3.0.1.nix
index 2470dcdf89f..78f9273e46a 100644
--- a/pkgs/development/libraries/haskell/deepseq/1.3.0.0.nix
+++ b/pkgs/development/libraries/haskell/deepseq/1.3.0.1.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "deepseq";
-  version = "1.3.0.0";
-  sha256 = "0z2k1rda67nmhv62irjfd642iarj1i9m55l6p47j4cysrszhvqgy";
+  version = "1.3.0.1";
+  sha256 = "068zka6rwprbzpx7yisi1ajsxdly23zaf2vjklx1wp66yypx54lp";
   meta = {
     description = "Deep evaluation of data structures";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 71cd638ea7d..1f75e397846 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -614,7 +614,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   deepseq_1_1_0_0 = callPackage ../development/libraries/haskell/deepseq/1.1.0.0.nix {};
   deepseq_1_1_0_2 = callPackage ../development/libraries/haskell/deepseq/1.1.0.2.nix {};
   deepseq_1_2_0_1 = callPackage ../development/libraries/haskell/deepseq/1.2.0.1.nix {};
-  deepseq_1_3_0_0 = callPackage ../development/libraries/haskell/deepseq/1.3.0.0.nix {};
+  deepseq_1_3_0_1 = callPackage ../development/libraries/haskell/deepseq/1.3.0.1.nix {};
   deepseq = null; # a core package in recent GHCs
 
   deepseqTh = callPackage ../development/libraries/haskell/deepseq-th {};

From 4517928069fed81eae1ecc31ef41604f8947f99a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 14:26:15 +0200
Subject: [PATCH 26/88] haskell-X11: update to version 1.6.0.1

---
 .../libraries/haskell/X11/{1.6.0.nix => 1.6.0.1.nix}      | 8 +++-----
 pkgs/top-level/haskell-packages.nix                       | 4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)
 rename pkgs/development/libraries/haskell/X11/{1.6.0.nix => 1.6.0.1.nix} (69%)

diff --git a/pkgs/development/libraries/haskell/X11/1.6.0.nix b/pkgs/development/libraries/haskell/X11/1.6.0.1.nix
similarity index 69%
rename from pkgs/development/libraries/haskell/X11/1.6.0.nix
rename to pkgs/development/libraries/haskell/X11/1.6.0.1.nix
index 6292f7eab5c..4a558d483a3 100644
--- a/pkgs/development/libraries/haskell/X11/1.6.0.nix
+++ b/pkgs/development/libraries/haskell/X11/1.6.0.1.nix
@@ -1,11 +1,9 @@
-{ cabal, libX11, libXext, libXinerama, libXrandr, libXrender, syb
-}:
+{ cabal, libX11, libXext, libXinerama, libXrandr, libXrender }:
 
 cabal.mkDerivation (self: {
   pname = "X11";
-  version = "1.6.0";
-  sha256 = "0jjnr4490mkdrmq3lvv7hha7rc9vbwsxlwsvcv56q6zgjx4zwf8j";
-  buildDepends = [ syb ];
+  version = "1.6.0.1";
+  sha256 = "0crbprh4m48l4yvbamgvvzrmm1d94lgbyqv1xsd37r4a3xh7qakz";
   extraLibraries = [
     libX11 libXext libXinerama libXrandr libXrender
   ];
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 1f75e397846..cacd2d3a66c 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1602,8 +1602,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   };
 
   X11_1_5_0_1 = callPackage ../development/libraries/haskell/X11/1.5.0.1.nix {};
-  X11_1_6_0 = callPackage ../development/libraries/haskell/X11/1.6.0.nix {};
-  X11 = self.X11_1_6_0;
+  X11_1_6_0_1 = callPackage ../development/libraries/haskell/X11/1.6.0.1.nix {};
+  X11 = self.X11_1_6_0_1;
 
   X11Xft = callPackage ../development/libraries/haskell/X11-xft {};
 

From 44f8ce0fe15d377da861f4e75d85f2cb3990eb48 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 14:29:38 +0200
Subject: [PATCH 27/88] haskell-src-exts: update to version 1.13.5

---
 .../haskell/haskell-src-exts/{1.13.3.nix => 1.13.5.nix}       | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/libraries/haskell/haskell-src-exts/{1.13.3.nix => 1.13.5.nix} (84%)

diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/1.13.3.nix b/pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix
similarity index 84%
rename from pkgs/development/libraries/haskell/haskell-src-exts/1.13.3.nix
rename to pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix
index d4cb1d97bb7..16f6d6362a1 100644
--- a/pkgs/development/libraries/haskell/haskell-src-exts/1.13.3.nix
+++ b/pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "haskell-src-exts";
-  version = "1.13.3";
-  sha256 = "0z2vs6ji0dgm3c11jwcq5jcnjr8a6pawrkn3c8a3a5p612v8d495";
+  version = "1.13.5";
+  sha256 = "03bzhfp7l9f5hh61qdrr83331nbfgj3jfsfylwmnmcknpisdqnkw";
   buildDepends = [ cpphs ];
   buildTools = [ happy ];
   meta = {
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index cacd2d3a66c..e8d1b468e6c 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -832,8 +832,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   haskellSrc = self.haskellSrc_1_0_1_5;
 
   haskellSrcExts_1_11_1 = callPackage ../development/libraries/haskell/haskell-src-exts/1.11.1.nix {};
-  haskellSrcExts_1_13_3 = callPackage ../development/libraries/haskell/haskell-src-exts/1.13.3.nix {};
-  haskellSrcExts = self.haskellSrcExts_1_13_3;
+  haskellSrcExts_1_13_5 = callPackage ../development/libraries/haskell/haskell-src-exts/1.13.5.nix {};
+  haskellSrcExts = self.haskellSrcExts_1_13_5;
 
   haskellSrcMeta = callPackage ../development/libraries/haskell/haskell-src-meta {};
 

From 69f66a11b62df04ee5d8c0580c27bc4875d7b5ef Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 15:05:13 +0200
Subject: [PATCH 28/88] haskell-language-c-quote: jailbreak to support recent
 versions of haskell-src-meta

---
 pkgs/development/libraries/haskell/language-c-quote/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix
index a765b015a31..7cf0aae9596 100644
--- a/pkgs/development/libraries/haskell/language-c-quote/default.nix
+++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix
@@ -11,6 +11,7 @@ cabal.mkDerivation (self: {
     mainlandPretty mtl srcloc syb symbol
   ];
   buildTools = [ alex happy ];
+  jailbreak = true;
   meta = {
     homepage = "http://www.eecs.harvard.edu/~mainland/";
     description = "C/CUDA/OpenCL quasiquoting library";

From ac751dc753d1acb4ba53825d4ebec525f079a40b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 15:08:21 +0200
Subject: [PATCH 29/88] haskell-darcs: update to version 2.8.2

---
 pkgs/applications/version-management/darcs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/darcs/default.nix b/pkgs/applications/version-management/darcs/default.nix
index 53cb4b360a0..3fb667b9461 100644
--- a/pkgs/applications/version-management/darcs/default.nix
+++ b/pkgs/applications/version-management/darcs/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "darcs";
-  version = "2.8.1";
-  sha256 = "1fz9k9zihb0fz0w2y55iqa1fd604nxzz48r62sx3ixxn8qqsvrd1";
+  version = "2.8.2";
+  sha256 = "1gd8028k91hjsd9hvx3pw4h5zsn2ckc7pfp7f1f566dpp1g422v5";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From e2c9238fae92072cec4e084a6bd366bef68d968b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 15:08:21 +0200
Subject: [PATCH 30/88] haskell-arrows: update to version 0.4.4.1

---
 pkgs/development/libraries/haskell/arrows/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/arrows/default.nix b/pkgs/development/libraries/haskell/arrows/default.nix
index baebfbce0f6..149f5f951e5 100644
--- a/pkgs/development/libraries/haskell/arrows/default.nix
+++ b/pkgs/development/libraries/haskell/arrows/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "arrows";
-  version = "0.4.4.0";
-  sha256 = "1dcvv1vscyggwqmlm6j2sc29zy0wmhn6w4g617gbxxb1j28bm6a9";
+  version = "0.4.4.1";
+  sha256 = "1qpbpwsc3frjdngwjv3r58nfa0ik88cqh24ls47svigsz3c4n42v";
   buildDepends = [ Stream ];
   meta = {
     homepage = "http://www.haskell.org/arrows/";

From 5d84d2e17694732eee659c7f8dbad935f8938c80 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 15:08:21 +0200
Subject: [PATCH 31/88] haskell-attoparsec-conduit: update to version 0.5.0.1

---
 .../libraries/haskell/attoparsec-conduit/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
index db4ebc6799d..e887b2d539c 100644
--- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "attoparsec-conduit";
-  version = "0.5.0";
-  sha256 = "17l98kbv2pxcchacy7r4ja0czdklc7r4j8vzv3pi0pjb2s9ih6sq";
+  version = "0.5.0.1";
+  sha256 = "1qrg524gr9ajdxaqd9gmxpj45d7ga21q27ykr76kjdwxfpqaq6n8";
   buildDepends = [ attoparsec conduit text transformers ];
   meta = {
     homepage = "http://github.com/snoyberg/conduit";

From 639926af26989bb1519f8982d996ef72363cf859 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 15:08:21 +0200
Subject: [PATCH 32/88] haskell-blaze-builder-conduit: update to version
 0.5.0.1

---
 .../libraries/haskell/blaze-builder-conduit/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
index db3e1e8a71f..14d4498f585 100644
--- a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-builder-conduit";
-  version = "0.5.0";
-  sha256 = "1saviq46670khz3pcw2ldvbhhgqs522lvbpm62mxjfvrynjw1gwg";
+  version = "0.5.0.1";
+  sha256 = "1avbgrgqzryqv717714s0418lknm0lqzkis3hia00qhy762amlcn";
   buildDepends = [ blazeBuilder conduit text transformers ];
   meta = {
     homepage = "http://github.com/snoyberg/conduit";

From d35889b374d8389c5954aac898992cbdb905342a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 15:08:22 +0200
Subject: [PATCH 33/88] haskell-blaze-html: update to version 0.5.1.0

---
 pkgs/development/libraries/haskell/blaze-html/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix
index c8b2eb06a32..c2505aeb72f 100644
--- a/pkgs/development/libraries/haskell/blaze-html/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-html/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-html";
-  version = "0.5.0.0";
-  sha256 = "0cfvdf50jbm6w277jf69ac57nbkgkn2ifcp6r2amd3qdbmdgqkwj";
+  version = "0.5.1.0";
+  sha256 = "1f256z68pbm1h6wsk33p94byxwfp01i4pbdrch32jdi1q35cmqxh";
   buildDepends = [ blazeBuilder blazeMarkup text ];
   meta = {
     homepage = "http://jaspervdj.be/blaze";

From 19c8861568e227048e7f1a660e2a6a153c75dad4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 15:08:22 +0200
Subject: [PATCH 34/88] haskell-cookie: update to version 0.4.0.1

---
 pkgs/development/libraries/haskell/cookie/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/cookie/default.nix b/pkgs/development/libraries/haskell/cookie/default.nix
index 1b958b3240e..b7dae5d4a9b 100644
--- a/pkgs/development/libraries/haskell/cookie/default.nix
+++ b/pkgs/development/libraries/haskell/cookie/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cookie";
-  version = "0.4.0";
-  sha256 = "1vkz6nys26i0yprb8jkv8iyq9xqnxb0wv07f7s7c448vx4gfln98";
+  version = "0.4.0.1";
+  sha256 = "01k5gq9kwbrivkhr1sj8aw4cgf2c1xgwwajqvd435r0g99fpx5kk";
   buildDepends = [ blazeBuilder dataDefault text time ];
   meta = {
     homepage = "http://github.com/snoyberg/cookie";

From bd4ae8058439ff9688221de87432f8c0c899af2b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 15:08:22 +0200
Subject: [PATCH 35/88] haskell-crypto-conduit: update to version 0.4.0.1

---
 pkgs/development/libraries/haskell/crypto-conduit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix
index e76d5967836..539fa3b192f 100644
--- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "crypto-conduit";
-  version = "0.4.0";
-  sha256 = "15x7v6vmmd90mrb60wllvdai8fk8cvm5bkxzzqyjikshldvlhmas";
+  version = "0.4.0.1";
+  sha256 = "1afkn9kp5y1qsgd2l2q85d2bh0wbvn07x0ddi72sr8g7daw8zrs8";
   buildDepends = [ cereal conduit cryptoApi transformers ];
   meta = {
     homepage = "https://github.com/meteficha/crypto-conduit";

From ead567b8905da27259158df7ed00743fb9535d15 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 15:08:22 +0200
Subject: [PATCH 36/88] haskell-cuda: update to version 0.4.1.1

---
 pkgs/development/libraries/haskell/cuda/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/cuda/default.nix b/pkgs/development/libraries/haskell/cuda/default.nix
index 296d639918e..3baa02d2674 100644
--- a/pkgs/development/libraries/haskell/cuda/default.nix
+++ b/pkgs/development/libraries/haskell/cuda/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cuda";
-  version = "0.4.1.0";
-  sha256 = "1drr95d4v3khidxr6na5vyq28bv5rqk2n676q0bydc4rqwhb1z6w";
+  version = "0.4.1.1";
+  sha256 = "05hhlnfyr30r1frsc15px38ijd1qvs125yjxvsi6q1kmmkq1w6y9";
   buildDepends = [ extensibleExceptions ];
   buildTools = [ c2hs ];
   extraLibraries = [ cudatoolkit nvidia_x11 self.stdenv.gcc ];

From 6c78b5f919f51eed6a7862b5d594c320bfb132e6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 15:08:22 +0200
Subject: [PATCH 37/88] haskell-fclabels: update to version 1.1.4.3

---
 pkgs/development/libraries/haskell/fclabels/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix
index 85fe25f7d18..79ea3160df2 100644
--- a/pkgs/development/libraries/haskell/fclabels/default.nix
+++ b/pkgs/development/libraries/haskell/fclabels/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "fclabels";
-  version = "1.1.4.2";
-  sha256 = "0abw6vfl5ff8d4cv5s3mfvzhylba5ajnvd5pgmx540i38lcq9wi6";
+  version = "1.1.4.3";
+  sha256 = "10qr0ncsqxg0dg2f73ip873gr342saxhidaf3c6g5vr03cvmmkap";
   buildDepends = [ mtl transformers ];
   meta = {
     description = "First class accessor labels";

From 603be88be125b7910be1ce6f18b28f37aeb5606d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 15:08:22 +0200
Subject: [PATCH 38/88] haskell-filepath: update to version 1.3.0.1

---
 pkgs/development/libraries/haskell/filepath/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/filepath/default.nix b/pkgs/development/libraries/haskell/filepath/default.nix
index ae28bdc2e41..0cd65bb1905 100644
--- a/pkgs/development/libraries/haskell/filepath/default.nix
+++ b/pkgs/development/libraries/haskell/filepath/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "filepath";
-  version = "1.3.0.0";
-  sha256 = "1v5affq82b4fypm49d5sradcx4ymgmkac563vfx483pmyl73i5jl";
+  version = "1.3.0.1";
+  sha256 = "1ny8dz8rv883vg6hkzg3zank771cr2z9sfhii7aw4rfb71k29g5p";
   meta = {
     homepage = "http://www-users.cs.york.ac.uk/~ndm/filepath/";
     description = "Library for manipulating FilePaths in a cross platform way";

From 6a34dabe17783041e4aadbbbad349fcdba709c8e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 15:08:22 +0200
Subject: [PATCH 39/88] haskell-flexible-defaults: update to version 0.0.1.0

---
 .../libraries/haskell/flexible-defaults/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/flexible-defaults/default.nix b/pkgs/development/libraries/haskell/flexible-defaults/default.nix
index 40ac59d1c9e..9cba8f2c13f 100644
--- a/pkgs/development/libraries/haskell/flexible-defaults/default.nix
+++ b/pkgs/development/libraries/haskell/flexible-defaults/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "flexible-defaults";
-  version = "0.0.0.3";
-  sha256 = "1s0dz61bqzzbxqvn9i8zwaccsha15als45zzjs2yc11r3m151dla";
+  version = "0.0.1.0";
+  sha256 = "0vq8ci3zbzmw8abjd12dhjiqzz4ckr99c1fqk32qsp5bvm81bdma";
   buildDepends = [ thExtras transformers ];
   meta = {
     homepage = "https://github.com/mokus0/flexible-defaults";

From 8b4ee13aad188cdc40a385a40ffb68c91e08e8b1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 15:08:22 +0200
Subject: [PATCH 40/88] haskell-gloss: update to version 1.7.5.2

---
 pkgs/development/libraries/haskell/gloss/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix
index 08e08e29ec0..a4b613dd756 100644
--- a/pkgs/development/libraries/haskell/gloss/default.nix
+++ b/pkgs/development/libraries/haskell/gloss/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gloss";
-  version = "1.7.4.1";
-  sha256 = "01mxazdgmz3k8y4s2k2mj11g1m788dykx60i7bqbdwzbzc65hcfw";
+  version = "1.7.5.2";
+  sha256 = "1lasq106slq57k832pqhaq5wh7hwxn5bzg7rjk95rf3rrq5xb9f5";
   buildDepends = [ bmp GLUT OpenGL ];
   meta = {
     homepage = "http://gloss.ouroborus.net";

From 26a7363aad26d762a091e2be44c8c60ce043ec13 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 15:08:22 +0200
Subject: [PATCH 41/88] haskell-haskell-src-meta: update to version 0.6.0.1

---
 .../libraries/haskell/haskell-src-meta/default.nix        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
index 2300d6e80ca..1d9bba47b4b 100644
--- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
@@ -1,10 +1,10 @@
-{ cabal, haskellSrcExts, syb, thLift, uniplate }:
+{ cabal, haskellSrcExts, syb, thOrphans, uniplate }:
 
 cabal.mkDerivation (self: {
   pname = "haskell-src-meta";
-  version = "0.5.1.2";
-  sha256 = "09if8423dwf4jcr6p7d8j4r9i2n8jc7xxvjn1p1mwjp0ajzk8g9s";
-  buildDepends = [ haskellSrcExts syb thLift uniplate ];
+  version = "0.6.0.1";
+  sha256 = "181xjajvppipzgknmbhbb1i2r8rimbr5vzn6gf1ksddgw12sargd";
+  buildDepends = [ haskellSrcExts syb thOrphans uniplate ];
   meta = {
     description = "Parse source to template-haskell abstract syntax";
     license = self.stdenv.lib.licenses.bsd3;

From 51384cc51900289cecaacebfdd66e3881ca09bc3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 15:08:22 +0200
Subject: [PATCH 42/88] haskell-highlighting-kate: update to version 0.5.3.2

---
 .../libraries/haskell/highlighting-kate/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
index 55051901206..21497f3252a 100644
--- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix
+++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "highlighting-kate";
-  version = "0.5.2";
-  sha256 = "1a3aifknbxm3v0lvqisdc6zqgki9x9z12jdrmijxmxq1riwwalr2";
+  version = "0.5.3.2";
+  sha256 = "09yvqxvjzahz0y6yhsfgkx5xm39a74arv294w14sgmhay1wnlwvj";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ blazeHtml filepath mtl parsec regexPcreBuiltin ];

From 4127150fcfda5d36d6fb5a6cfec783c37dcd7a74 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 15:08:22 +0200
Subject: [PATCH 43/88] haskell-hscolour: update to version 1.20.3

---
 pkgs/development/libraries/haskell/hscolour/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hscolour/default.nix b/pkgs/development/libraries/haskell/hscolour/default.nix
index 2c2aa5be7e6..d8bc08b4b33 100644
--- a/pkgs/development/libraries/haskell/hscolour/default.nix
+++ b/pkgs/development/libraries/haskell/hscolour/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hscolour";
-  version = "1.20.2";
-  sha256 = "0jl2m2bpsqg2hnf9mmwwrpa7af8wqwaajfp2h3nnnmy5qks10ad5";
+  version = "1.20.3";
+  sha256 = "15ix93sw4p7g5ln2halcgqppdc0i0vmkzcjzxvqzkk9yp9pq3nrs";
   isLibrary = true;
   isExecutable = true;
   meta = {

From b422578f1d35c2730eefe29d8a37eac2f6ff1d1e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 15:08:22 +0200
Subject: [PATCH 44/88] haskell-iteratee: update to version 0.8.9.4

---
 pkgs/development/libraries/haskell/iteratee/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/iteratee/default.nix b/pkgs/development/libraries/haskell/iteratee/default.nix
index bc99a88895b..ee9026bae49 100644
--- a/pkgs/development/libraries/haskell/iteratee/default.nix
+++ b/pkgs/development/libraries/haskell/iteratee/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "iteratee";
-  version = "0.8.9.3";
-  sha256 = "1abm7f7ymzw9sa625f40sj4510sbpyplybpgb5a229sq8118dbh0";
+  version = "0.8.9.4";
+  sha256 = "0j8q5i3kf1ld7630z65hj55p2jlhl23f6qjag4zwrhrh38bfr531";
   buildDepends = [
     ListLike MonadCatchIOTransformers monadControl parallel
     transformers transformersBase

From 0a5b6548e79c5c4cdd204cb0a4ed89abbbc16dac Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 15:08:22 +0200
Subject: [PATCH 45/88] haskell-logict: update to version 0.5.0.2

---
 pkgs/development/libraries/haskell/logict/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/logict/default.nix b/pkgs/development/libraries/haskell/logict/default.nix
index 4e67e4ffb4c..a603b4fe644 100644
--- a/pkgs/development/libraries/haskell/logict/default.nix
+++ b/pkgs/development/libraries/haskell/logict/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "logict";
-  version = "0.5.0.1";
-  sha256 = "0k3acw6fwhqz4qaz7k85fx5b43hwc926il0mljc69gjrgw0c8nzv";
+  version = "0.5.0.2";
+  sha256 = "0m0a55l061vbxdqw9h1780g893amdxs7glza4jd5jncjsv823s1z";
   buildDepends = [ mtl ];
   meta = {
     homepage = "http://code.haskell.org/~dolio/logict";

From e421db3284ee688808dcbf0247e1270fe695afb5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 15:08:23 +0200
Subject: [PATCH 46/88] haskell-math-functions: update to version 0.1.1.2

---
 pkgs/development/libraries/haskell/math-functions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/math-functions/default.nix b/pkgs/development/libraries/haskell/math-functions/default.nix
index fda06d718ed..127e888d110 100644
--- a/pkgs/development/libraries/haskell/math-functions/default.nix
+++ b/pkgs/development/libraries/haskell/math-functions/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "math-functions";
-  version = "0.1.1.1";
-  sha256 = "1256fyd80z6yf61a5a90b3lad7hj0n59cyn741nkdh8p6hqrsi7z";
+  version = "0.1.1.2";
+  sha256 = "09q9647zxvvg7wi81r14qhhy64d1mwgy8kg0zkhdvg4rzw9j669v";
   buildDepends = [ erf vector ];
   meta = {
     homepage = "https://github.com/bos/math-functions";

From b3eb13c229c210baf6f415687f4997c8d223d882 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 15:08:23 +0200
Subject: [PATCH 47/88] haskell-mime-mail: update to version 0.4.1.2

---
 pkgs/development/libraries/haskell/mime-mail/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix
index 6303cbb8f4e..d24bf5719bd 100644
--- a/pkgs/development/libraries/haskell/mime-mail/default.nix
+++ b/pkgs/development/libraries/haskell/mime-mail/default.nix
@@ -2,12 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "mime-mail";
-  version = "0.4.1.1";
-  sha256 = "01dshc6ysjkab9hl851948l6k0lwgm1fqmyk97zy7wckb252w6y4";
+  version = "0.4.1.2";
+  sha256 = "01dw9zvgxmwg0jslw14a9kjrmyjvwla8bw40w2426ifdwwxb3ywy";
   buildDepends = [
     base64Bytestring blazeBuilder filepath random text
   ];
-  jailbreak = true;
   meta = {
     homepage = "http://github.com/snoyberg/mime-mail";
     description = "Compose MIME email messages";

From efe11de735217ae119ff6bbe41aa94a49085125f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 15:08:23 +0200
Subject: [PATCH 48/88] haskell-multirec: update to version 0.7.3

---
 pkgs/development/libraries/haskell/multirec/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/multirec/default.nix b/pkgs/development/libraries/haskell/multirec/default.nix
index 4f73ffa98ae..a7d7459b455 100644
--- a/pkgs/development/libraries/haskell/multirec/default.nix
+++ b/pkgs/development/libraries/haskell/multirec/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "multirec";
-  version = "0.7.2";
-  sha256 = "1f715h27x8gz73d2irgl1gw74zd5lyda80nzk9xxwihqqkzvbhsm";
+  version = "0.7.3";
+  sha256 = "0k1wbjsvkl08nwjikflc8yyalk654mf8bvi1rhm28i4na52myi5y";
   noHaddock = true;
   meta = {
     homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec";

From bf6b450d70a18d5368495f24d1953f477b76fa9f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 15:08:23 +0200
Subject: [PATCH 49/88] haskell-network-conduit: update to version 0.5.0.1

---
 .../development/libraries/haskell/network-conduit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix
index f05d191ed17..4c989e17698 100644
--- a/pkgs/development/libraries/haskell/network-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/network-conduit/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "network-conduit";
-  version = "0.5.0";
-  sha256 = "0q7smsrv3gp5kvzqfgw2mw9w70gjr5pkx2bmk58dvbnz6al85abn";
+  version = "0.5.0.1";
+  sha256 = "1rk8a8n1yily20y3jr51zbd00m2c6ic8gxw9rnmkr2cfs963l2v5";
   buildDepends = [
     conduit liftedBase monadControl network transformers
   ];

From 2d5e95a09c1bb9f82fb147bd84f7b8d7e2aa845f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 15:08:23 +0200
Subject: [PATCH 50/88] haskell-persistent: update to version 1.0.1

---
 pkgs/development/libraries/haskell/persistent/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
index 6820e92f7eb..732c04d8de7 100644
--- a/pkgs/development/libraries/haskell/persistent/default.nix
+++ b/pkgs/development/libraries/haskell/persistent/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent";
-  version = "1.0.0";
-  sha256 = "1rrvq3girsjxfvdvvr9zxgc3252hrwcy84zj2mj0a5w057jahhhg";
+  version = "1.0.1";
+  sha256 = "0k9p3icwz3mygdhmhay8lsc12qgak4ysiyfbap9a68azqrk7045p";
   buildDepends = [
     aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
     liftedBase monadControl monadLogger pathPieces poolConduit

From 76ae366292ca69d771e849115a0fee8817d9ec42 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 15:08:23 +0200
Subject: [PATCH 51/88] haskell-pureMD5: update to version 2.1.2.1

---
 pkgs/development/libraries/haskell/pureMD5/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/pureMD5/default.nix b/pkgs/development/libraries/haskell/pureMD5/default.nix
index 9501c7ffff1..8e66b2c3c03 100644
--- a/pkgs/development/libraries/haskell/pureMD5/default.nix
+++ b/pkgs/development/libraries/haskell/pureMD5/default.nix
@@ -2,10 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pureMD5";
-  version = "2.1.0.3";
-  sha256 = "0whlsb6zq4zcp3wq0bd6pgcsl0namr8b2s6i4l5aykq8v7fx40ii";
-  isLibrary = true;
-  isExecutable = true;
+  version = "2.1.2.1";
+  sha256 = "1zsn949qk95bwx1fbyv84q0lhb4k18bgixl7nivfzsnmhr31fs37";
   buildDepends = [ binary cereal cryptoApi tagged ];
   meta = {
     description = "A Haskell-only implementation of the MD5 digest (hash) algorithm";

From 2040c25c3d53dcb56b936e6a20a80e5ffd48d026 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 15:08:23 +0200
Subject: [PATCH 52/88] haskell-semigroups: update to version 0.8.4.1

---
 pkgs/development/libraries/haskell/semigroups/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix
index 795c690d7a2..240062493e3 100644
--- a/pkgs/development/libraries/haskell/semigroups/default.nix
+++ b/pkgs/development/libraries/haskell/semigroups/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "semigroups";
-  version = "0.8.4";
-  sha256 = "0xphwxxzddgcw2hr4h60l3y27f1x032w049wkjs71f5hdypwapv4";
+  version = "0.8.4.1";
+  sha256 = "05wv5amgg3nqr1if936zl330sv1k4i9p8xzdmgxsmchp4lshyr6n";
   meta = {
     homepage = "http://github.com/ekmett/semigroups/";
     description = "Haskell 98 semigroups";

From 6ab66d48fe142c5bdb9708a4a3dce83eb63825ae Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 15:08:23 +0200
Subject: [PATCH 53/88] haskell-simple-sendfile: update to version 0.2.7

---
 .../development/libraries/haskell/simple-sendfile/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix
index 20bdca91bb3..d99762df2b2 100644
--- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix
+++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "simple-sendfile";
-  version = "0.2.6";
-  sha256 = "1bv8lmpp1h89kx614ijyi5kyqsf4nj75zdarjwxm7is6ixp3rnha";
+  version = "0.2.7";
+  sha256 = "0chjcn6j5irzjqid3nhh2ya395aqavcar3ygzd01z96ha1nl4dbw";
   buildDepends = [ network ];
   meta = {
     description = "Cross platform library for the sendfile system call";

From 0acfb5994f0b6b321e955cf5de95e03be3f371f1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 15:08:23 +0200
Subject: [PATCH 54/88] haskell-syb-with-class: update to version 0.6.1.4

---
 pkgs/development/libraries/haskell/syb/syb-with-class.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/syb/syb-with-class.nix b/pkgs/development/libraries/haskell/syb/syb-with-class.nix
index 10f9f226f69..c6a85e27df1 100644
--- a/pkgs/development/libraries/haskell/syb/syb-with-class.nix
+++ b/pkgs/development/libraries/haskell/syb/syb-with-class.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "syb-with-class";
-  version = "0.6.1.3";
-  sha256 = "0dmj9ah7az5lckamvm46pff0595p6v4pvzdv0lqq97gjs5i59y9d";
+  version = "0.6.1.4";
+  sha256 = "0fi6m1a4017422kdmj1vvvzbks79jkcldp20h2nb7jsf8zvimfkc";
   meta = {
     description = "Scrap Your Boilerplate With Class";
     license = self.stdenv.lib.licenses.bsd3;

From 0dd27329466804233bda5f198da60a942440d83f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 15:08:24 +0200
Subject: [PATCH 55/88] haskell-system-filepath: update to version 0.4.7

---
 .../development/libraries/haskell/system-filepath/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/system-filepath/default.nix b/pkgs/development/libraries/haskell/system-filepath/default.nix
index d4ffbf82d2a..851b28baafe 100644
--- a/pkgs/development/libraries/haskell/system-filepath/default.nix
+++ b/pkgs/development/libraries/haskell/system-filepath/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "system-filepath";
-  version = "0.4.6";
-  sha256 = "0p8lf10b5zn2gw5klpjc397q892cydvnl677srj9rk3lhmsm5jjl";
+  version = "0.4.7";
+  sha256 = "108bmgz6rynkyabr4pws07smdh31syqvzry9cshrw3zd07c3mn89";
   buildDepends = [ deepseq text ];
   meta = {
     homepage = "https://john-millikin.com/software/haskell-filesystem/";

From d1990fed5d21e2b74c144160be570015feb61020 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 15:08:24 +0200
Subject: [PATCH 56/88] haskell-texmath: update to version 0.6.1.1

---
 pkgs/development/libraries/haskell/texmath/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix
index 6820b2ed247..65d9da1548f 100644
--- a/pkgs/development/libraries/haskell/texmath/default.nix
+++ b/pkgs/development/libraries/haskell/texmath/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "texmath";
-  version = "0.6.0.6";
-  sha256 = "0wxpz9vsgi4lfgjz5w96pn2r2jdflkvb4yd06nxshimxdr51974k";
+  version = "0.6.1.1";
+  sha256 = "06yk19jvpj7di1njybk1hdc7hp6c9h3yb4gvi7ljna6wqrh6zqaz";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ parsec syb xml ];

From 69074bf98b2e4a7f1bfabcd5af4fac0396dc9d39 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 15:08:24 +0200
Subject: [PATCH 57/88] haskell-unordered-containers: update to version 0.2.2.1

---
 .../libraries/haskell/unordered-containers/default.nix       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/unordered-containers/default.nix b/pkgs/development/libraries/haskell/unordered-containers/default.nix
index e6ff0dd64b9..8ac2372d1c0 100644
--- a/pkgs/development/libraries/haskell/unordered-containers/default.nix
+++ b/pkgs/development/libraries/haskell/unordered-containers/default.nix
@@ -2,10 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "unordered-containers";
-  version = "0.2.2.0";
-  sha256 = "1418vr7swk2p1xjxyj86arln6niwgpfjfqdknnkh31m4h83f0q5r";
+  version = "0.2.2.1";
+  sha256 = "0ny8w7xw0ch3yp0fnskzygz61b72ln5s5ccsdlcqpp29cvfar6zy";
   buildDepends = [ deepseq hashable ];
   meta = {
+    homepage = "https://github.com/tibbe/unordered-containers";
     description = "Efficient hashing-based container types";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;

From 2c4011974d8ba2b5ff40f09494b5b04e0ce12535 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 15:08:24 +0200
Subject: [PATCH 58/88] haskell-warp: update to version 1.3.1

---
 pkgs/development/libraries/haskell/warp/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
index e066196cd4d..30bbbef9a0b 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -1,16 +1,16 @@
 { cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive
 , conduit, httpTypes, liftedBase, network, networkConduit
-, simpleSendfile, transformers, unixCompat, wai
+, simpleSendfile, transformers, unixCompat, void, wai
 }:
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "1.3.0.1";
-  sha256 = "0bgmz2kd2z9agpid0w2whfz1cyrmiaiyap20za1l56d88m0p1z45";
+  version = "1.3.1";
+  sha256 = "12f4v080v8jgm02swqbbgq9yvbajmbr8ja2p6ljc7bhf3rkpwplr";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit httpTypes
     liftedBase network networkConduit simpleSendfile transformers
-    unixCompat wai
+    unixCompat void wai
   ];
   meta = {
     homepage = "http://github.com/yesodweb/wai";

From 07a2ac1634854d242f8a5efc856c2de9675b437d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 15:08:24 +0200
Subject: [PATCH 59/88] haskell-zipper: update to version 0.4.2

---
 pkgs/development/libraries/haskell/zipper/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/zipper/default.nix b/pkgs/development/libraries/haskell/zipper/default.nix
index bf27fa78162..5ff1da422ef 100644
--- a/pkgs/development/libraries/haskell/zipper/default.nix
+++ b/pkgs/development/libraries/haskell/zipper/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "zipper";
-  version = "0.4.1";
-  sha256 = "19xgvqznf200akzf19mp40fg75c0gzpp38wq3n671nm90r08lgvi";
+  version = "0.4.2";
+  sha256 = "1r8092amq5w9gl5szycl1r7wx87xnmkcapdzcwfa4c3pvxrhjy44";
   buildDepends = [ multirec ];
   meta = {
     homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec";

From 09f1fbfa1ccaf1fa17f5dcb28cdd1c6d0b0569e6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 15:08:24 +0200
Subject: [PATCH 60/88] haskell-zlib-bindings: update to version 0.1.1.1

---
 pkgs/development/libraries/haskell/zlib-bindings/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/zlib-bindings/default.nix b/pkgs/development/libraries/haskell/zlib-bindings/default.nix
index 3bb9d314957..c78ca3f68ee 100644
--- a/pkgs/development/libraries/haskell/zlib-bindings/default.nix
+++ b/pkgs/development/libraries/haskell/zlib-bindings/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "zlib-bindings";
-  version = "0.1.1";
-  sha256 = "0hgqr7sh3pri482191gd9qrz2nbgxw1aqdx1x6lc9s0bbw68isai";
+  version = "0.1.1.1";
+  sha256 = "1r502gskbm36smd5nj0f53ildv9rkm3k79zmwdmrskg6z1n7jmfh";
   buildDepends = [ zlib ];
   meta = {
     homepage = "http://github.com/snoyberg/zlib-bindings";

From 4fc17179f9cb5795f099f5df385e874408f3718c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 15:08:24 +0200
Subject: [PATCH 61/88] haskell-zlib-conduit: update to version 0.5.0.1

---
 pkgs/development/libraries/haskell/zlib-conduit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/zlib-conduit/default.nix b/pkgs/development/libraries/haskell/zlib-conduit/default.nix
index 0f6a3656126..728d2d202f1 100644
--- a/pkgs/development/libraries/haskell/zlib-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/zlib-conduit/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "zlib-conduit";
-  version = "0.5.0";
-  sha256 = "0mba63wx11vb9xir4fbp031ay71xv8b3rnj8gnihsxf3yqq09b99";
+  version = "0.5.0.1";
+  sha256 = "138wag9fjq3hx48nzr0nvvclcyjwcd0ykjbbgms2h9msmz9vflk5";
   buildDepends = [ conduit transformers void zlibBindings ];
   meta = {
     homepage = "http://github.com/snoyberg/conduit";

From 010c282cb292e128e66dc6b9b3b3fec206ec2363 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 15:08:24 +0200
Subject: [PATCH 62/88] haskell-lhs2tex: update to version 1.18.1

---
 pkgs/tools/typesetting/lhs2tex/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/typesetting/lhs2tex/default.nix b/pkgs/tools/typesetting/lhs2tex/default.nix
index 5ac339e92ec..2b96ae526c4 100644
--- a/pkgs/tools/typesetting/lhs2tex/default.nix
+++ b/pkgs/tools/typesetting/lhs2tex/default.nix
@@ -2,9 +2,9 @@
 
 cabal.mkDerivation (self: {
   pname = "lhs2tex";
-  version = "1.17";
+  version = "1.18.1";
   name = self.fname;
-  sha256 = "1x49316m5xm4f6hw5q7kia9rpfpygxhk5gnifd54ai0zjmdlkxrc";
+  sha256 = "0j4n7vkabsggn94gbwixy1vmckdck2nggdiqvk6n9nx164if5jnw";
   extraBuildInputs = [regexCompat texLive];
 
   postInstall = ''

From 5bde8b0985010cb8abd13f814c142dbd09fb88c3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 15:39:44 +0200
Subject: [PATCH 63/88] Override 'Cabal' attribute in 'jailbreakCabal' only
 when building with a GHC version older than 7.2.x. Newer compilers can use
 their native version of Cabal to build this tool.

---
 pkgs/top-level/haskell-defaults.nix | 6 ++++++
 pkgs/top-level/haskell-packages.nix | 4 +---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index e076a92350d..f747c3669ad 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -42,6 +42,7 @@
       repaExamples = null;      # don't pick this version of 'repa-examples' during nix-env -u
       cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; };
       monadPar = self.monadPar_0_1_0_3;
+      jailbreakCabal = self.jailbreakCabal.override { Cabal = self.Cabal_1_14_0; };
     };
 
   ghc703Prefs =
@@ -50,6 +51,7 @@
       repaExamples = null;      # don't pick this version of 'repa-examples' during nix-env -u
       cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; };
       monadPar = self.monadPar_0_1_0_3;
+      jailbreakCabal = self.jailbreakCabal.override { Cabal = self.Cabal_1_14_0; };
     };
 
   ghc702Prefs = ghc701Prefs;
@@ -60,6 +62,7 @@
       repaExamples = null;      # don't pick this version of 'repa-examples' during nix-env -u
       cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; };
       monadPar = self.monadPar_0_1_0_3;
+      jailbreakCabal = self.jailbreakCabal.override { Cabal = self.Cabal_1_14_0; };
     };
 
   ghc6123Prefs = ghc6122Prefs;
@@ -73,6 +76,7 @@
       monadPar = self.monadPar_0_1_0_3;
       deepseq = self.deepseq_1_1_0_2;
       # deviating from Haskell platform here, to make some packages (notably statistics) compile
+      jailbreakCabal = self.jailbreakCabal.override { Cabal = self.Cabal_1_14_0; };
     };
 
   ghc6121Prefs =
@@ -83,6 +87,7 @@
       repaExamples = null;      # don't pick this version of 'repa-examples' during nix-env -u
       deepseq = self.deepseq_1_1_0_2;
       monadPar = self.monadPar_0_1_0_3;
+      jailbreakCabal = self.jailbreakCabal.override { Cabal = self.Cabal_1_14_0; };
       # deviating from Haskell platform here, to make some packages (notably statistics) compile
     };
 
@@ -97,6 +102,7 @@
       cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; };
       deepseq = self.deepseq_1_1_0_2;
       monadPar = self.monadPar_0_1_0_3;
+      jailbreakCabal = self.jailbreakCabal.override { Cabal = self.Cabal_1_14_0; };
       # deviating from Haskell platform here, to make some packages (notably statistics) compile
     };
 
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index e8d1b468e6c..775ae03c083 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1792,9 +1792,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {};
   cabalInstall = self.cabalInstall_0_14_0;
 
-  jailbreakCabal = callPackage ../development/tools/haskell/jailbreak-cabal {
-    Cabal = self.Cabal_1_14_0;
-  };
+  jailbreakCabal = callPackage ../development/tools/haskell/jailbreak-cabal {};
 
   lhs2tex = callPackage ../tools/typesetting/lhs2tex {};
 

From 249ff424a9caf4e0c9d593879292a7054f04572b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 15:56:51 +0200
Subject: [PATCH 64/88] haskell-zlib: jailbreak version 0.5.3.3 to fix build
 with GHC 7.6.1

---
 pkgs/development/libraries/haskell/zlib/0.5.3.3.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix b/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix
index a151a45c0e7..bba9e1a13fe 100644
--- a/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix
+++ b/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "0.5.3.3";
   sha256 = "1hrq34w9y8m7nahvrdpnkh9rdb4jycpcpv9ix6qrxijvbz2vdbg2";
   extraLibraries = [ zlib ];
+  jailbreak = true;
   meta = {
     description = "Compression and decompression in the gzip and zlib formats";
     license = self.stdenv.lib.licenses.bsd3;

From bbf098baa88f7e3d79cb2c6d7055cb64314283dc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 15:59:20 +0200
Subject: [PATCH 65/88] haskell-defaults.nix: extensible-exceptions is not a
 part of GHC 7.6.1

---
 pkgs/top-level/haskell-defaults.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index f747c3669ad..f33defcb809 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -19,6 +19,7 @@
     self : self.haskellPlatformArgs_future self // {
       haskellPlatform = null;
       binary = null; # now a core package
+      extensibleExceptions = self.extensibleExceptions_0_1_1_4;
     };
 
   ghc741Prefs =

From 741a7ef530e47fb2a2c6a1ccf22b87b7072659bf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 16:30:58 +0200
Subject: [PATCH 66/88] haskell-packages.nix: update
 'haskellPlatformArgs_future' for GHC 7.6.1

---
 pkgs/top-level/haskell-packages.nix | 54 ++++++++++++++---------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 775ae03c083..d61ee5f28a0 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -120,33 +120,33 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   haskellPlatformArgs_future = self : {
     inherit (self) cabal ghc;
-    cgi          = self.cgi_3001_1_7_4;         # 7.5 fail
-    fgl          = self.fgl_5_4_2_4;            # 7.5 ok
-    GLUT         = self.GLUT_2_1_2_1;           # 7.5 fail
-    haskellSrc   = self.haskellSrc_1_0_1_5;     # 7.5 ok
-    html         = self.html_1_0_1_2;           # 7.5 ok
-    HTTP         = self.HTTP_4000_2_4;          # 7.5 ok
-    HUnit        = self.HUnit_1_2_5_1;          # 7.5 ok
-    mtl          = self.mtl_2_1_2;              # 7.5 ok
-    network      = self.network_2_3_1_0;        # 7.5 ok
-    OpenGL       = self.OpenGL_2_2_3_1;         # 7.5 fail
-    parallel     = self.parallel_3_2_0_3;       # 7.5 ok
-    parsec       = self.parsec_3_1_3;           # 7.5 ok
-    QuickCheck   = self.QuickCheck_2_5;         # 7.5 fail
-    random       = self.random_1_0_1_1;         # 7.5 ok
-    regexBase    = self.regexBase_0_93_2;       # 7.5 ok
-    regexCompat  = self.regexCompat_0_95_1;     # 7.5 fail
-    regexPosix   = self.regexPosix_0_95_1;      # 7.5 fail
-    stm          = self.stm_2_4;                # 7.5 ok
-    syb          = self.syb_0_3_7;              # 7.5 ok
-    text         = self.text_0_11_2_3;          # 7.5 ok
-    transformers = self.transformers_0_3_0_0;   # 7.5 ok
-    xhtml        = self.xhtml_3000_2_1;         # 7.5 ok
-    zlib         = self.zlib_0_5_3_3;           # 7.5 fail
-    cabalInstall = self.cabalInstall_0_14_0;    # 7.5 ok
-    alex         = self.alex_3_0_1;             # 7.5 ok
-    haddock      = self.haddock_2_12_0;         # 7.5 ok
-    happy        = self.happy_1_18_9;           # 7.5 ok
+    cgi          = self.cgi_3001_1_8_2;         # 7.6 fail
+    fgl          = self.fgl_5_4_2_4;            # 7.6 ok
+    GLUT         = self.GLUT_2_3_0_0;           # 7.6 fail
+    haskellSrc   = self.haskellSrc_1_0_1_5;     # 7.6 fail
+    html         = self.html_1_0_1_2;           # 7.6 ok
+    HTTP         = self.HTTP_4000_2_4;          # 7.6 ok
+    HUnit        = self.HUnit_1_2_5_1;          # 7.6 ok
+    mtl          = self.mtl_2_1_2;              # 7.6 ok
+    network      = self.network_2_3_1_0;        # 7.6 ok
+    OpenGL       = self.OpenGL_2_5_0_0;         # 7.6 ok
+    parallel     = self.parallel_3_2_0_3;       # 7.6 ok
+    parsec       = self.parsec_3_1_3;           # 7.6 ok
+    QuickCheck   = self.QuickCheck_2_5;         # 7.6 ok
+    random       = self.random_1_0_1_1;         # 7.6 ok
+    regexBase    = self.regexBase_0_93_2;       # 7.6 ok
+    regexCompat  = self.regexCompat_0_95_1;     # 7.6 fail
+    regexPosix   = self.regexPosix_0_95_1;      # 7.6 fail
+    stm          = self.stm_2_4;                # 7.6 ok
+    syb          = self.syb_0_3_7;              # 7.6 ok
+    text         = self.text_0_11_2_3;          # 7.6 ok
+    transformers = self.transformers_0_3_0_0;   # 7.6 ok
+    xhtml        = self.xhtml_3000_2_1;         # 7.6 ok
+    zlib         = self.zlib_0_5_3_3;           # 7.6 ok
+    cabalInstall = self.cabalInstall_0_14_0;    # 7.6 ok
+    alex         = self.alex_3_0_1;             # 7.6 ok
+    haddock      = self.haddock_2_12_0;         # 7.6 ok
+    happy        = self.happy_1_18_9;           # 7.6 fail
   };
 
   haskellPlatformArgs_2012_2_0_0 = self : {

From 9f7f71aeaa21a100df8f476d1fed12e0d162633e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 16:31:41 +0200
Subject: [PATCH 67/88] Add myself as maintainer to those packages Haskell
 packages I, well, maintain.

---
 pkgs/development/libraries/haskell/funcmp/default.nix     | 2 +-
 pkgs/development/libraries/haskell/hackage-db/default.nix | 2 +-
 pkgs/development/libraries/haskell/hsdns/default.nix      | 2 +-
 pkgs/development/libraries/haskell/hsemail/default.nix    | 2 +-
 pkgs/development/libraries/haskell/streamproc/default.nix | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/funcmp/default.nix b/pkgs/development/libraries/haskell/funcmp/default.nix
index f6893cc3797..ed68f0cc1fe 100644
--- a/pkgs/development/libraries/haskell/funcmp/default.nix
+++ b/pkgs/development/libraries/haskell/funcmp/default.nix
@@ -10,6 +10,6 @@ cabal.mkDerivation (self: {
     description = "Functional MetaPost";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [ self.stdenv.lib.maintainers.andres self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hackage-db/default.nix b/pkgs/development/libraries/haskell/hackage-db/default.nix
index b27ff78d8f9..3d873dc2073 100644
--- a/pkgs/development/libraries/haskell/hackage-db/default.nix
+++ b/pkgs/development/libraries/haskell/hackage-db/default.nix
@@ -10,6 +10,6 @@ cabal.mkDerivation (self: {
     description = "provide access to the Hackage database via Data.Map";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [ self.stdenv.lib.maintainers.andres self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hsdns/default.nix b/pkgs/development/libraries/haskell/hsdns/default.nix
index aab6530fcc9..af5fddda1c0 100644
--- a/pkgs/development/libraries/haskell/hsdns/default.nix
+++ b/pkgs/development/libraries/haskell/hsdns/default.nix
@@ -12,6 +12,6 @@ cabal.mkDerivation (self: {
     description = "Asynchronous DNS Resolver";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [ self.stdenv.lib.maintainers.andres self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hsemail/default.nix b/pkgs/development/libraries/haskell/hsemail/default.nix
index 36a320dbe68..c6dd1c6a568 100644
--- a/pkgs/development/libraries/haskell/hsemail/default.nix
+++ b/pkgs/development/libraries/haskell/hsemail/default.nix
@@ -10,6 +10,6 @@ cabal.mkDerivation (self: {
     description = "Internet Message Parsers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [ self.stdenv.lib.maintainers.andres self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/streamproc/default.nix b/pkgs/development/libraries/haskell/streamproc/default.nix
index 36080e9044e..88799c9318a 100644
--- a/pkgs/development/libraries/haskell/streamproc/default.nix
+++ b/pkgs/development/libraries/haskell/streamproc/default.nix
@@ -9,6 +9,6 @@ cabal.mkDerivation (self: {
     description = "Stream Processer Arrow";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [ self.stdenv.lib.maintainers.andres self.stdenv.lib.maintainers.simons ];
   };
 })

From 7b587a5ad87b17f34ec13ea839e046f653e3e45c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 18:27:35 +0200
Subject: [PATCH 68/88] haskell-funcmp: update to version 1.7

---
 pkgs/development/libraries/haskell/funcmp/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/funcmp/default.nix b/pkgs/development/libraries/haskell/funcmp/default.nix
index ed68f0cc1fe..d17ca718f0a 100644
--- a/pkgs/development/libraries/haskell/funcmp/default.nix
+++ b/pkgs/development/libraries/haskell/funcmp/default.nix
@@ -2,14 +2,17 @@
 
 cabal.mkDerivation (self: {
   pname = "funcmp";
-  version = "1.6";
-  sha256 = "1l317gnav6adbdi849zdcgcvrlcs4mz4p0s67wg323prq713fkz0";
+  version = "1.7";
+  sha256 = "1rna7x7lw36fv5pyq0zn4b472mh11r0bszzji13wm3byhhmzs04k";
   buildDepends = [ filepath ];
   meta = {
     homepage = "http://savannah.nongnu.org/projects/funcmp/";
     description = "Functional MetaPost";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres self.stdenv.lib.maintainers.simons ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

From bb7daf767b7835c20c3fca4d369754f6e7b42d72 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Sep 2012 18:28:02 +0200
Subject: [PATCH 69/88] cosmetic

---
 pkgs/development/libraries/haskell/hackage-db/default.nix | 5 ++++-
 pkgs/development/libraries/haskell/hsdns/default.nix      | 5 ++++-
 pkgs/development/libraries/haskell/hsemail/default.nix    | 5 ++++-
 pkgs/development/libraries/haskell/streamproc/default.nix | 5 ++++-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hackage-db/default.nix b/pkgs/development/libraries/haskell/hackage-db/default.nix
index 3d873dc2073..37698cebb38 100644
--- a/pkgs/development/libraries/haskell/hackage-db/default.nix
+++ b/pkgs/development/libraries/haskell/hackage-db/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "provide access to the Hackage database via Data.Map";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres self.stdenv.lib.maintainers.simons ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hsdns/default.nix b/pkgs/development/libraries/haskell/hsdns/default.nix
index af5fddda1c0..2a83df47f09 100644
--- a/pkgs/development/libraries/haskell/hsdns/default.nix
+++ b/pkgs/development/libraries/haskell/hsdns/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Asynchronous DNS Resolver";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres self.stdenv.lib.maintainers.simons ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hsemail/default.nix b/pkgs/development/libraries/haskell/hsemail/default.nix
index c6dd1c6a568..f69789772ac 100644
--- a/pkgs/development/libraries/haskell/hsemail/default.nix
+++ b/pkgs/development/libraries/haskell/hsemail/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Internet Message Parsers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres self.stdenv.lib.maintainers.simons ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/streamproc/default.nix b/pkgs/development/libraries/haskell/streamproc/default.nix
index 88799c9318a..fef81d92212 100644
--- a/pkgs/development/libraries/haskell/streamproc/default.nix
+++ b/pkgs/development/libraries/haskell/streamproc/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Stream Processer Arrow";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres self.stdenv.lib.maintainers.simons ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

From 6e0924ca84ffe4c7ea0a51e85b23edf9baa93ddd Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 5 Sep 2012 13:08:29 +0200
Subject: [PATCH 70/88] haskell-active: New package in version 0.1.0.2.

This package is required by diagrams-lib.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Acked-by: Peter Simons <simons@cryp.to>
---
 .../libraries/haskell/active/default.nix            | 13 +++++++++++++
 pkgs/top-level/haskell-packages.nix                 |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/active/default.nix

diff --git a/pkgs/development/libraries/haskell/active/default.nix b/pkgs/development/libraries/haskell/active/default.nix
new file mode 100644
index 00000000000..5c563ad9cd7
--- /dev/null
+++ b/pkgs/development/libraries/haskell/active/default.nix
@@ -0,0 +1,13 @@
+{ cabal, newtype, semigroupoids, semigroups, vectorSpace }:
+
+cabal.mkDerivation (self: {
+  pname = "active";
+  version = "0.1.0.2";
+  sha256 = "1iymh3sd21ba7ijwv5afphn5vhmwchk6725hbcsdwk2d2x2gd674";
+  buildDepends = [ newtype semigroupoids semigroups vectorSpace ];
+  meta = {
+    description = "Abstractions for animation";
+    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 d61ee5f28a0..44554b49592 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -397,6 +397,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   accelerateIo = callPackage ../development/libraries/haskell/accelerate-io {};
 
+  active = callPackage ../development/libraries/haskell/active {};
+
   ACVector = callPackage ../development/libraries/haskell/AC-Vector {};
 
   abstractDeque = callPackage ../development/libraries/haskell/abstract-deque {};

From d12f707f6c471bb04332a4a6e2df4b5fde018109 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 5 Sep 2012 13:09:44 +0200
Subject: [PATCH 71/88] haskell-newtype: New package in version 0.2.

This package is required by diagrams-lib.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Acked-by: Peter Simons <simons@cryp.to>
---
 .../libraries/haskell/newtype/default.nix            | 12 ++++++++++++
 pkgs/top-level/haskell-packages.nix                  |  2 ++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/newtype/default.nix

diff --git a/pkgs/development/libraries/haskell/newtype/default.nix b/pkgs/development/libraries/haskell/newtype/default.nix
new file mode 100644
index 00000000000..40354c9472c
--- /dev/null
+++ b/pkgs/development/libraries/haskell/newtype/default.nix
@@ -0,0 +1,12 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "newtype";
+  version = "0.2";
+  sha256 = "0ng4i5r73256gzwl6bw57h0abqixj783c3ggph1hk2wsplx0655p";
+  meta = {
+    description = "A typeclass and set of functions for working with newtypes";
+    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 44554b49592..edd21f50a97 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1119,6 +1119,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   networkConduit = callPackage ../development/libraries/haskell/network-conduit {};
 
+  newtype = callPackage ../development/libraries/haskell/newtype {};
+
   nonNegative = callPackage ../development/libraries/haskell/non-negative {};
 
   numericPrelude = callPackage ../development/libraries/haskell/numeric-prelude {};

From cad8a942e1fbe79e42c6897a8012526c89e69fc9 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 5 Sep 2012 13:28:00 +0200
Subject: [PATCH 72/88] haskel-vector-space-points: New package.

Starting with version 0.1.1.1, required by diagrams-core.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Acked-by: Peter Simons <simons@cryp.to>
---
 .../haskell/vector-space-points/default.nix         | 13 +++++++++++++
 pkgs/top-level/haskell-packages.nix                 |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/vector-space-points/default.nix

diff --git a/pkgs/development/libraries/haskell/vector-space-points/default.nix b/pkgs/development/libraries/haskell/vector-space-points/default.nix
new file mode 100644
index 00000000000..7497ed59c4f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/vector-space-points/default.nix
@@ -0,0 +1,13 @@
+{ cabal, newtype, vectorSpace }:
+
+cabal.mkDerivation (self: {
+  pname = "vector-space-points";
+  version = "0.1.1.1";
+  sha256 = "08lar9ydni87w79y86xk2blddsgx5n6gwz3262w8z32dgy9lrmwx";
+  buildDepends = [ newtype vectorSpace ];
+  meta = {
+    description = "A type for points, as distinct from vectors";
+    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 edd21f50a97..b148cb782d5 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1556,6 +1556,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   vectorSpace = callPackage ../development/libraries/haskell/vector-space {};
 
+  vectorSpacePoints = callPackage ../development/libraries/haskell/vector-space-points {};
+
   void = callPackage ../development/libraries/haskell/void {};
 
   vty = callPackage ../development/libraries/haskell/vty {};

From a7ca54494548fe30612b8cabba4885391bec2077 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 5 Sep 2012 13:30:28 +0200
Subject: [PATCH 73/88] haskell-diagrams-lib: New package, v0.5.0.1.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Acked-by: Peter Simons <simons@cryp.to>
---
 .../haskell/diagrams-lib/default.nix          | 19 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/diagrams-lib/default.nix

diff --git a/pkgs/development/libraries/haskell/diagrams-lib/default.nix b/pkgs/development/libraries/haskell/diagrams-lib/default.nix
new file mode 100644
index 00000000000..d5c386c1e1f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/diagrams-lib/default.nix
@@ -0,0 +1,19 @@
+{ cabal, active, colour, dataDefault, diagramsCore, newtype
+, NumInstances, semigroups, vectorSpace
+}:
+
+cabal.mkDerivation (self: {
+  pname = "diagrams-lib";
+  version = "0.5.0.1";
+  sha256 = "0spfsllr2z064cxkdqcij02f0ikxxmll2dqj7rfikp4738wj21dy";
+  buildDepends = [
+    active colour dataDefault diagramsCore newtype NumInstances
+    semigroups vectorSpace
+  ];
+  meta = {
+    homepage = "http://projects.haskell.org/diagrams";
+    description = "Embedded domain-specific language for declarative graphics";
+    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 b148cb782d5..b49531d5d72 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -625,6 +625,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   derp = callPackage ../development/libraries/haskell/derp {};
 
+  diagramsLib = callPackage ../development/libraries/haskell/diagrams-lib {};
+
   Diff = callPackage ../development/libraries/haskell/Diff {};
 
   digest = callPackage ../development/libraries/haskell/digest {

From e3826e5e9cc63a948cd75c50a3ec61be3d4a9f75 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 5 Sep 2012 13:31:48 +0200
Subject: [PATCH 74/88] haskell-diagrams-core: New package, v0.5.0.1.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Acked-by: Peter Simons <simons@cryp.to>
---
 .../haskell/diagrams-core/default.nix          | 18 ++++++++++++++++++
 pkgs/top-level/haskell-packages.nix            |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/diagrams-core/default.nix

diff --git a/pkgs/development/libraries/haskell/diagrams-core/default.nix b/pkgs/development/libraries/haskell/diagrams-core/default.nix
new file mode 100644
index 00000000000..365e2737131
--- /dev/null
+++ b/pkgs/development/libraries/haskell/diagrams-core/default.nix
@@ -0,0 +1,18 @@
+{ cabal, MemoTrie, newtype, semigroups, vectorSpace
+, vectorSpacePoints
+}:
+
+cabal.mkDerivation (self: {
+  pname = "diagrams-core";
+  version = "0.5.0.1";
+  sha256 = "073fk9cxm1kh92alr51dgwps9wxc5w3470axc6q7w91sk5cskpxy";
+  buildDepends = [
+    MemoTrie newtype semigroups vectorSpace vectorSpacePoints
+  ];
+  meta = {
+    homepage = "http://projects.haskell.org/diagrams";
+    description = "Core libraries for diagrams EDSL";
+    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 b49531d5d72..5c2f99c1a7b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -625,6 +625,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   derp = callPackage ../development/libraries/haskell/derp {};
 
+  diagramsCore = callPackage ../development/libraries/haskell/diagrams-core {};
+
   diagramsLib = callPackage ../development/libraries/haskell/diagrams-lib {};
 
   Diff = callPackage ../development/libraries/haskell/Diff {};

From 1763eb518b4b57dd47be792b44fcc830bba35c71 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 5 Sep 2012 13:32:40 +0200
Subject: [PATCH 75/88] haskell-diagrams-cairo: New package, v0.5.0.2.

We use the jailbreak attribute here to avoid splitting off cmdargs and split
into directly versioned packages.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../haskell/diagrams-cairo/default.nix        | 19 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/diagrams-cairo/default.nix

diff --git a/pkgs/development/libraries/haskell/diagrams-cairo/default.nix b/pkgs/development/libraries/haskell/diagrams-cairo/default.nix
new file mode 100644
index 00000000000..294a266fef4
--- /dev/null
+++ b/pkgs/development/libraries/haskell/diagrams-cairo/default.nix
@@ -0,0 +1,19 @@
+{ cabal, cairo, cmdargs, diagramsCore, diagramsLib, filepath, gtk
+, mtl, split
+}:
+
+cabal.mkDerivation (self: {
+  pname = "diagrams-cairo";
+  version = "0.5.0.2";
+  sha256 = "1wwk65c2cx7rkhmai5spms791fjhl3snwhj0w9399q8pgj6g4lj8";
+  jailbreak = true;
+  buildDepends = [
+    cairo cmdargs diagramsCore diagramsLib filepath gtk mtl split
+  ];
+  meta = {
+    homepage = "http://projects.haskell.org/diagrams";
+    description = "Cairo backend for diagrams drawing EDSL";
+    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 5c2f99c1a7b..fd56c927371 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -625,6 +625,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   derp = callPackage ../development/libraries/haskell/derp {};
 
+  diagramsCairo = callPackage ../development/libraries/haskell/diagrams-cairo {};
+
   diagramsCore = callPackage ../development/libraries/haskell/diagrams-core {};
 
   diagramsLib = callPackage ../development/libraries/haskell/diagrams-lib {};

From 4c418cd3aa4a8a690f1e939ad09509efa831c8e4 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 5 Sep 2012 13:33:36 +0200
Subject: [PATCH 76/88] haskell-diagrams: New package, v0.5.

This is just a metapackage, so the build is going to fail and we need to fix
things up next.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Acked-by: Peter Simons <simons@cryp.to>
---
 .../libraries/haskell/diagrams/default.nix         | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/diagrams/default.nix

diff --git a/pkgs/development/libraries/haskell/diagrams/default.nix b/pkgs/development/libraries/haskell/diagrams/default.nix
new file mode 100644
index 00000000000..11feea574f0
--- /dev/null
+++ b/pkgs/development/libraries/haskell/diagrams/default.nix
@@ -0,0 +1,14 @@
+{ cabal, diagramsCairo, diagramsCore, diagramsLib }:
+
+cabal.mkDerivation (self: {
+  pname = "diagrams";
+  version = "0.5";
+  sha256 = "163h2fg3gpmsfm57gjyja2rxh9pl6s3xnzlidfdy201zbk1mzdg5";
+  buildDepends = [ diagramsCairo diagramsCore diagramsLib ];
+  meta = {
+    homepage = "http://projects.haskell.org/diagrams";
+    description = "Embedded domain-specific language for declarative vector graphics";
+    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 fd56c927371..9f8808ccb22 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -625,6 +625,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   derp = callPackage ../development/libraries/haskell/derp {};
 
+  diagrams = callPackage ../development/libraries/haskell/diagrams {};
+
   diagramsCairo = callPackage ../development/libraries/haskell/diagrams-cairo {};
 
   diagramsCore = callPackage ../development/libraries/haskell/diagrams-core {};

From 3e1c9217c4a1f1592d897bbf6903f77d713bce18 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 5 Sep 2012 14:43:12 +0200
Subject: [PATCH 77/88] haskell-diagrams: Don't invoke haddock.

This package is only a metapackage and doesn't contain any source files, so we
don't need to generate source code documentation at all.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Acked-by: Peter Simons <simons@cryp.to>
---
 pkgs/development/libraries/haskell/diagrams/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/diagrams/default.nix b/pkgs/development/libraries/haskell/diagrams/default.nix
index 11feea574f0..21c3a7a28f6 100644
--- a/pkgs/development/libraries/haskell/diagrams/default.nix
+++ b/pkgs/development/libraries/haskell/diagrams/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "0.5";
   sha256 = "163h2fg3gpmsfm57gjyja2rxh9pl6s3xnzlidfdy201zbk1mzdg5";
   buildDepends = [ diagramsCairo diagramsCore diagramsLib ];
+  noHaddock = true;
   meta = {
     homepage = "http://projects.haskell.org/diagrams";
     description = "Embedded domain-specific language for declarative vector graphics";

From 5320792ed70da5e07d5b04afb06c9d929d1764fe Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 5 Sep 2012 14:45:19 +0200
Subject: [PATCH 78/88] haskell-diagrams: Move main libs into single dir.

That way we have all diagrams specific stuff in one directory, which coulde make
it easier for code-reuse in the future.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Acked-by: Peter Simons <simons@cryp.to>
---
 .../{diagrams-cairo/default.nix => diagrams/cairo.nix}    | 0
 .../{diagrams-core/default.nix => diagrams/core.nix}      | 0
 .../haskell/diagrams/{default.nix => diagrams.nix}        | 0
 .../{diagrams-lib/default.nix => diagrams/lib.nix}        | 0
 pkgs/top-level/haskell-packages.nix                       | 8 ++++----
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/libraries/haskell/{diagrams-cairo/default.nix => diagrams/cairo.nix} (100%)
 rename pkgs/development/libraries/haskell/{diagrams-core/default.nix => diagrams/core.nix} (100%)
 rename pkgs/development/libraries/haskell/diagrams/{default.nix => diagrams.nix} (100%)
 rename pkgs/development/libraries/haskell/{diagrams-lib/default.nix => diagrams/lib.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/diagrams-cairo/default.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/diagrams-cairo/default.nix
rename to pkgs/development/libraries/haskell/diagrams/cairo.nix
diff --git a/pkgs/development/libraries/haskell/diagrams-core/default.nix b/pkgs/development/libraries/haskell/diagrams/core.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/diagrams-core/default.nix
rename to pkgs/development/libraries/haskell/diagrams/core.nix
diff --git a/pkgs/development/libraries/haskell/diagrams/default.nix b/pkgs/development/libraries/haskell/diagrams/diagrams.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/diagrams/default.nix
rename to pkgs/development/libraries/haskell/diagrams/diagrams.nix
diff --git a/pkgs/development/libraries/haskell/diagrams-lib/default.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/diagrams-lib/default.nix
rename to pkgs/development/libraries/haskell/diagrams/lib.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 9f8808ccb22..30edecc335d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -625,13 +625,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   derp = callPackage ../development/libraries/haskell/derp {};
 
-  diagrams = callPackage ../development/libraries/haskell/diagrams {};
+  diagrams = callPackage ../development/libraries/haskell/diagrams/diagrams.nix {};
 
-  diagramsCairo = callPackage ../development/libraries/haskell/diagrams-cairo {};
+  diagramsCairo = callPackage ../development/libraries/haskell/diagrams/cairo.nix {};
 
-  diagramsCore = callPackage ../development/libraries/haskell/diagrams-core {};
+  diagramsCore = callPackage ../development/libraries/haskell/diagrams/core.nix {};
 
-  diagramsLib = callPackage ../development/libraries/haskell/diagrams-lib {};
+  diagramsLib = callPackage ../development/libraries/haskell/diagrams/lib.nix {};
 
   Diff = callPackage ../development/libraries/haskell/Diff {};
 

From 96ab1aa9df4a0fc8b7f89afeda6b6b915ee70e98 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 31 Aug 2012 14:47:47 +0200
Subject: [PATCH 79/88] pylast: New package, version 0.5.11.

pylast is an interface for the last.fm API version 2.0.
It also supports services such as Libre.fm, which has a similar API.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d76215961f2..9cdbae68564 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -974,6 +974,25 @@ let pythonPackages = python.modules // rec {
   };
 
 
+  pylast = buildPythonPackage rec {
+    name = "pylast-${version}";
+    version = "0.5.11";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/pylast/${name}.tar.gz";
+      md5 = "506cf1b13020b3ed2f3c845ea0c9830e";
+    };
+
+    doCheck = false;
+
+    meta = {
+      homepage = http://code.google.com/p/pylast/;
+      description = "A python interface to last.fm (and compatibles)";
+      license = pkgs.lib.licenses.asl20;
+    };
+  };
+
+
   libcloud = buildPythonPackage (rec {
     name = "libcloud-0.3.1";
 

From e94d50f3590982b3cf7841bdf63aaec5c525a7aa Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 31 Aug 2012 15:03:27 +0200
Subject: [PATCH 80/88] pep8: New package, version 1.3.3.

This is a style checker/linter to check whether a source files is correctly
formatted according to PEP8: http://www.python.org/dev/peps/pep-0008/

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/python-packages.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9cdbae68564..c809aa54441 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1551,6 +1551,23 @@ let pythonPackages = python.modules // rec {
   };
 
 
+  pep8 = buildPythonPackage rec {
+    name = "pep8-${version}";
+    version = "1.3.3";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/pep8/${name}.tar.gz";
+      md5 = "093a99ced0cc3b58c01549d7350f5a73";
+    };
+
+    meta = {
+      homepage = http://pypi.python.org/pypi/pep8/;
+      description = "Python style guide checker";
+      license = pkgs.lib.licenses.mit;
+    };
+  };
+
+
   pexpect = buildPythonPackage {
     name = "pexpect-2.3";
 

From 03a8eea607e05c743addce66b3b44ebd46067c95 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 2 Sep 2012 13:13:18 +0200
Subject: [PATCH 81/88] pyinotify: New package, version 0.9.3.

Provides Python bindings for the inotify syscalls. For more information on
inotify, see: http://en.wikipedia.org/wiki/Inotify

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/python-packages.nix | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c809aa54441..1ac77919531 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1796,6 +1796,30 @@ let pythonPackages = python.modules // rec {
   };
 
 
+  pyinotify = pkgs.stdenv.mkDerivation rec {
+    name = "python-pyinotify-${version}";
+    version = "0.9.3";
+
+    src = fetchgit {
+      url = "git://github.com/seb-m/pyinotify.git";
+      rev = "refs/tags/${version}";
+      sha256 = "d38ce95e4af00391e58246a8d7fe42bdb51d63054b09809600b2faef2a803472";
+    };
+
+    buildInputs = [ python ];
+
+    installPhase = ''
+      python setup.py install --prefix=$out
+    '';
+
+    meta = {
+      homepage = https://github.com/seb-m/pyinotify/wiki;
+      description = "Monitor filesystems events on Linux platforms with inotify";
+      license = pkgs.lib.licenses.mit;
+    };
+  };
+
+
   pyparsing = buildPythonPackage rec {
     name = "pyparsing-1.5.6";
 

From 930d13e12ccb4924b534333bfcc6861961fbe46f Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 5 Sep 2012 01:15:23 +0200
Subject: [PATCH 82/88] picard: New package, version 1.1.

Picard is the official MusicBrainz audio tagger which is able to use audio
fingerprinting to tag your files.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/audio/picard/default.nix | 46 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 +
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/applications/audio/picard/default.nix

diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix
new file mode 100644
index 00000000000..dccb6571f4d
--- /dev/null
+++ b/pkgs/applications/audio/picard/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchurl, pythonPackages, gettext, pyqt4
+, pkgconfig, libdiscid, libofa, ffmpeg }:
+
+pythonPackages.buildPythonPackage rec {
+  name = "picard-${version}";
+  namePrefix = "";
+  version = "1.1";
+
+  src = fetchurl {
+    url = "http://ftp.musicbrainz.org/pub/musicbrainz/picard/${name}.tar.gz";
+    md5 = "57abb76632a423760f336ac11da5c149";
+  };
+
+  buildInputs = [
+    pkgconfig
+    ffmpeg
+    libofa
+    gettext
+  ];
+
+  propagatedBuildInputs = [
+    pythonPackages.mutagen
+    pyqt4
+    libdiscid
+  ];
+
+  configurePhase = ''
+    python setup.py config
+  '';
+
+  buildPhase = ''
+    python setup.py build
+  '';
+
+  installPhase = ''
+    python setup.py install --prefix="$out"
+  '';
+
+  doCheck = false;
+
+  meta = {
+    homepage = "http://musicbrainz.org/doc/MusicBrainz_Picard";
+    description = "The official MusicBrainz tagger";
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 231c0cf7cc0..73ee8d25f04 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7471,6 +7471,8 @@ let
 
   pianobooster = callPackage ../applications/audio/pianobooster { };
 
+  picard = callPackage ../applications/audio/picard { };
+
   pidgin = callPackage ../applications/networking/instant-messengers/pidgin {
     openssl = if (getConfig ["pidgin" "openssl"] true) then openssl else null;
     gnutls = if (getConfig ["pidgin" "gnutls"] false) then gnutls else null;

From de5c5467a682e9cc678fe8f8f6b22c850607ecda Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 5 Sep 2012 01:44:21 +0200
Subject: [PATCH 83/88] mmv: New package, version 1.01b from Debian.

This package as well as the patches are used from Debian, as the upstream
version is no longer maintained, plus other distributions seem to use the Debian
patched version aswell. And by looking at the patch from Debian, it seems
reasonable, because it contains a _lot_ of fixes that accrued over time.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/tools/misc/mmv/default.nix | 46 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/tools/misc/mmv/default.nix

diff --git a/pkgs/tools/misc/mmv/default.nix b/pkgs/tools/misc/mmv/default.nix
new file mode 100644
index 00000000000..e6e7eb505bf
--- /dev/null
+++ b/pkgs/tools/misc/mmv/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "mmv-${version}";
+  version = "1.01b";
+
+  src = fetchurl {
+    url = "http://ftp.debian.org/debian/pool/main/m/mmv/mmv_${version}.orig.tar.gz";
+    sha256 = "0399c027ea1e51fd607266c1e33573866d4db89f64a74be8b4a1d2d1ff1fdeef";
+  };
+
+  patches = [
+    # Use Debian patched version, as upstream is no longer maintained and it
+    # contains a _lot_ of fixes.
+    (fetchurl {
+      url = "http://ftp.debian.org/debian/pool/main/m/mmv/mmv_${version}-15.diff.gz";
+      sha256 = "9ad3e3d47510f816b4a18bae04ea75913588eec92248182f85dd09bc5ad2df13";
+    })
+  ];
+
+  postPatch = ''
+    sed -i \
+      -e 's/^\s*LDFLAGS\s*=\s*-s\s*-N/LDFLAGS = -s/' \
+      -e "s|/usr/bin|$out/bin|" \
+      -e "s|/usr/man|$out/share/man|" \
+      Makefile
+  '';
+
+  preInstall = ''
+    mkdir -p "$out/bin" "$out/share/man/man1"
+  '';
+
+  postInstall = ''
+    for variant in mcp mad mln
+    do
+      ln -s mmv "$out/bin/$variant"
+      ln -s mmv.1 "$out/share/man/man1/$variant.1"
+    done
+  '';
+
+  meta = {
+    homepage = "http://linux.maruhn.com/sec/mmv.html";
+    description = "Utility for wildcard renaming, copying, etc";
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 73ee8d25f04..79c7da88a54 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -978,6 +978,8 @@ let
 
   minidlna = callPackage ../tools/networking/minidlna { };
 
+  mmv = callPackage ../tools/misc/mmv { };
+
   most = callPackage ../tools/misc/most { };
 
   netperf = callPackage ../applications/networking/netperf { };

From 194e9d929c2b2f2c7a05843664bceca575b7cbd4 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 5 Sep 2012 02:55:35 +0200
Subject: [PATCH 84/88] w3m: Add support for fbcon image display.

This builds the w3m image helper with fbcon support if the derivation is called
with graphicsSupport set to true. This change shouldn't break anything as
graphicsSupport is disabled by default, so in any case it could only break
things for users explicitly passing the attribute.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/networking/browsers/w3m/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix
index 2a05e920d5f..9dc7116234e 100644
--- a/pkgs/applications/networking/browsers/w3m/default.nix
+++ b/pkgs/applications/networking/browsers/w3m/default.nix
@@ -2,11 +2,11 @@
 , sslSupport ? true
 , graphicsSupport ? false
 , ncurses, openssl ? null, boehmgc, gettext, zlib
-, imlib2 ? null, x11 ? null
+, imlib2 ? null, x11 ? null, fbcon ? null
 }:
 
 assert sslSupport -> openssl != null;
-assert graphicsSupport -> x11 != null;
+assert graphicsSupport -> imlib2 != null && (x11 != null || fbcon != null);
 
 stdenv.mkDerivation rec {
   name = "w3m-0.5.3";
@@ -22,9 +22,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ncurses boehmgc gettext zlib]
     ++ stdenv.lib.optional sslSupport openssl
-    ++ stdenv.lib.optionals graphicsSupport [imlib2 x11];
+    ++ stdenv.lib.optionals graphicsSupport [imlib2 x11 fbcon];
 
-  configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc}";
+  configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc}"
+    + stdenv.lib.optionalString graphicsSupport " --enable-image=x11,fb";
 
   preConfigure = ''
     substituteInPlace ./configure --replace "/lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib /lib64 /usr/lib64" /no-such-path

From 9d71bb96c0d2a7f1640dd05c3dcc06c2d1501057 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 5 Sep 2012 02:59:01 +0200
Subject: [PATCH 85/88] w3m: Add mouse support for completeness.

I'm personally not using mouse/gpm support for w3m, because I find it somewhat
too awkward when copy/pasting text. But maybe there are users out there who want
to have it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/networking/browsers/w3m/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix
index 9dc7116234e..38ef20ec969 100644
--- a/pkgs/applications/networking/browsers/w3m/default.nix
+++ b/pkgs/applications/networking/browsers/w3m/default.nix
@@ -1,12 +1,15 @@
 { stdenv, fetchurl
 , sslSupport ? true
 , graphicsSupport ? false
+, mouseSupport ? false
 , ncurses, openssl ? null, boehmgc, gettext, zlib
 , imlib2 ? null, x11 ? null, fbcon ? null
+, gpm ? null
 }:
 
 assert sslSupport -> openssl != null;
 assert graphicsSupport -> imlib2 != null && (x11 != null || fbcon != null);
+assert mouseSupport -> gpm != null;
 
 stdenv.mkDerivation rec {
   name = "w3m-0.5.3";
@@ -22,6 +25,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ncurses boehmgc gettext zlib]
     ++ stdenv.lib.optional sslSupport openssl
+    ++ stdenv.lib.optional mouseSupport gpm
     ++ stdenv.lib.optionals graphicsSupport [imlib2 x11 fbcon];
 
   configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc}"

From 3ed91754e27683abf611d5089612f57366335207 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 5 Sep 2012 03:56:24 +0200
Subject: [PATCH 86/88] lastwatch: New package, version 0.4.1.

This is actually one of my own programs I've written some years ago, but as I'm
still using it on several systems, I'm adding it to nixpkgs. As it is an (at the
moment, fanotify looks like it's more suitable) inotify based scrobbler, it of
course requires the inotify feature to be enabled in the kernel.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/audio/lastwatch/default.nix | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/applications/audio/lastwatch/default.nix

diff --git a/pkgs/applications/audio/lastwatch/default.nix b/pkgs/applications/audio/lastwatch/default.nix
new file mode 100644
index 00000000000..324a0b0bebc
--- /dev/null
+++ b/pkgs/applications/audio/lastwatch/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchgit, pythonPackages }:
+
+pythonPackages.buildPythonPackage rec {
+  name = "lastwatch-${version}";
+  namePrefix = "";
+  version = "0.4.1";
+
+  src = fetchgit {
+    url = "git://github.com/aszlig/LastWatch.git";
+    rev = "refs/tags/v${version}";
+    sha256 = "c43f0fd87e9f3daafc7e8676daf2e89c8e21fbabc278eb1455e28d2997587a92";
+  };
+
+  pythonPath = [
+    pythonPackages.pyinotify
+    pythonPackages.pylast
+    pythonPackages.mutagen
+  ];
+
+  propagatedBuildInputs = pythonPath;
+
+  installCommand = "python setup.py install --prefix=$out";
+
+  meta = {
+    homepage = "https://github.com/aszlig/LastWatch";
+    description = "An inotify-based last.fm audio scrobbler";
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 79c7da88a54..49a608d273c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7224,6 +7224,8 @@ let
     fftw = fftwSinglePrec;
   };
 
+  lastwatch = callPackage ../applications/audio/lastwatch { };
+
   lci = callPackage ../applications/science/logic/lci {};
 
   ldcpp = callPackage ../applications/networking/p2p/ldcpp {

From d891fc6f3bf5dd08f249cdf8a452b6d97b43903e Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 10 Sep 2012 20:34:10 +0200
Subject: [PATCH 87/88] virtualbox: Update to version 4.1.22.

Upstream changes are:

 * VMM: fixed a potential host crash triggered by shutting down a VM when
        another VM was running (only affected 32-bit hosts and 64-bit OS X
        hosts, 4.1 regression)
 * VMM: fixed a potential host crash under a high guest memory pressure (seen
        with Windows 8 guests)
 * VMM: respect RAM preallocation while restoring saved state.
 * VMM: fixed handling of task gates if VT-x/AMD-V is disabled
 * Storage: fixed audio CD passthrough for certain media players
 * USB: don't crash if a USB device is plugged or unplugged when saving or
        loading the VM state (SMP guests only)
 * RTC: fixed a potential corruption of CMOS bank 1
 * Mac OS X hosts: installer fixes for Leopard (4.1.20 regression)
 * Windows Additions: fixed memory leak in VBoxTray

Full changelogs with bug ids and links to it can be found at:

https://www.virtualbox.org/wiki/Changelog

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/virtualization/virtualbox/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 1067300a2ef..56387f9e5c4 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -10,7 +10,7 @@ with stdenv.lib;
 
 let
 
-  version = "4.1.20";
+  version = "4.1.22";
 
   forEachModule = action: ''
     for mod in \
@@ -34,7 +34,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
-    sha256 = "b132dbc5c6e9ed77aba737ec35b488ac152aa362c3ad49d466897bc410324aeb";
+    sha256 = "7abb506203dd0d69b4b408fd999b5b9a479a9adce5f80e9b5569641c053dd153";
   };
 
   buildInputs =

From fc872096917968411a24667528a3060118008cc6 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 10 Sep 2012 21:36:36 +0200
Subject: [PATCH 88/88] virtualbox/guest-additions: Update to 4.1.22.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../virtualization/virtualbox/guest-additions/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 5b207e2e799..d903c44866c 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper
 , libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor}:
 
-let version = "4.1.18"; in
+let version = "4.1.22"; in
 
 stdenv.mkDerivation {
   name = "VirtualBox-GuestAdditions-${version}";
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "1zsjh4q71ny10s2zaxnaw4w3bs961c21xv6dd6zpwhnbimlhlrqb";
+    sha256 = "5c7d9a4a31c8a926ba6dbae2b9704a561638e94ea0fc4f805a9231dd4f932d46";
   };
   KERN_DIR = "${kernel}/lib/modules/*/build";
   buildInputs = [ patchelf cdrkit makeWrapper ];