From 55876bd4e6cb799ccb7c6f93f811397095c551e2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Jul 2012 17:20:09 +0200
Subject: [PATCH 01/76] Add configuration to build a XEN-enabled variant of the
 Linux 3.2 kernel.

---
 pkgs/top-level/all-packages.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2dad382086b..17d91c8dd97 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5632,6 +5632,12 @@ let
       ];
   };
 
+  linux_3_2_xen = linux_3_2.override {
+    extraConfig = ''
+      XEN_DOM0 y
+    '';
+  };
+
   linux_3_3 = makeOverridable (import ../os-specific/linux/kernel/linux-3.3.nix) {
     inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
     kernelPatches =
@@ -5770,6 +5776,7 @@ let
   linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 pkgs.linuxPackages_3_0);
   linuxPackages_3_1 = recurseIntoAttrs (linuxPackagesFor linux_3_1 pkgs.linuxPackages_3_1);
   linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 pkgs.linuxPackages_3_2);
+  linuxPackages_3_2_xen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2_xen pkgs.linuxPackages_3_2_xen);
   linuxPackages_3_3 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_3 pkgs.linuxPackages_3_3);
   linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 pkgs.linuxPackages_3_4);
 

From af32fd6ce3ce2ae138c2fc2bc5c6067216f8b828 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Jul 2012 17:20:41 +0200
Subject: [PATCH 02/76] xen: update to version 4.1.2

Patch submitted by Jan Malakhovski <oxij@oxij.org>.
---
 .../virtualization/xen/default.nix            | 19 ++++++---
 .../virtualization/xen/gcc-4.5.patch          | 39 -------------------
 2 files changed, 13 insertions(+), 45 deletions(-)
 delete mode 100644 pkgs/applications/virtualization/xen/gcc-4.5.patch

diff --git a/pkgs/applications/virtualization/xen/default.nix b/pkgs/applications/virtualization/xen/default.nix
index ce799242e12..d898daad2a7 100644
--- a/pkgs/applications/virtualization/xen/default.nix
+++ b/pkgs/applications/virtualization/xen/default.nix
@@ -6,7 +6,7 @@ with stdenv.lib;
 
 let
 
-  version = "4.0.3";
+  version = "4.1.2";
 
   libDir = if stdenv.is64bit then "lib64" else "lib";
 
@@ -30,23 +30,24 @@ let
       }
     ];
 
-in 
+  ipxeSrc =
+      { url = http://xenbits.xensource.com/xen-extfiles/ipxe-git-v1.0.0.tar.gz;
+        sha256 = "d3128bfda9a1542049c278755f85bbcbb8441da7bfd702d511ce237fcf86a723";
+      };
+in
 
 stdenv.mkDerivation {
   name = "xen-${version}";
 
   src = fetchurl {
     url = "http://bits.xensource.com/oss-xen/release/${version}/xen-${version}.tar.gz";
-    sha256 = "0p4i7mm8cdsr8i9z3dij6nriyvz6la2rhm7jkyk2n8h62nnxi1b5";
+    sha256 = "7d9c93057cf480d3f1efa792b19285a84fa3c06060ea5c5c453be00887389b0d";
   };
 
   patches =
     [ # Xen looks for headers in /usr/include and for libraries using
       # ldconfig.  Don't do that.
       ./has-header.patch
-
-      # GCC 4.5 compatibility.
-      ./gcc-4.5.patch
     ];
 
   buildInputs =
@@ -102,12 +103,18 @@ stdenv.mkDerivation {
         --replace 'XENDOM_CONFIG=/etc/sysconfig/xendomains' "" \
         --replace /bin/ls ls
 
+      grep -rl /etc/xen * | xargs sed -i 's|/etc/xen|$out/etc/xen|g'
+
       # Xen's stubdoms need various sources that it usually fetches at
       # build time using wget.  We can't have that.
       ${flip concatMapStrings stubdomSrcs (x: let src = fetchurl x; in ''
         cp ${src} stubdom/${src.name}
       '')}
 
+      ${let src = fetchurl ipxeSrc; in ''
+        cp ${src} tools/firmware/etherboot/ipxe.tar.gz
+      ''}
+
       # Hack to get `gcc -m32' to work without having 32-bit Glibc headers.
       mkdir -p tools/include/gnu
       touch tools/include/gnu/stubs-32.h
diff --git a/pkgs/applications/virtualization/xen/gcc-4.5.patch b/pkgs/applications/virtualization/xen/gcc-4.5.patch
deleted file mode 100644
index a8412d69fd3..00000000000
--- a/pkgs/applications/virtualization/xen/gcc-4.5.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-http://lists.xensource.com/archives/html/xen-devel/2010-07/msg01276.html
-
-diff -ru -x '*~' xen-4.0.1-orig//extras/mini-os/arch/x86/mm.c xen-4.0.1//extras/mini-os/arch/x86/mm.c
---- xen-4.0.1-orig//extras/mini-os/arch/x86/mm.c	2010-08-25 12:22:07.000000000 +0200
-+++ xen-4.0.1//extras/mini-os/arch/x86/mm.c	2010-12-22 20:10:05.000000000 +0100
-@@ -281,7 +281,7 @@
- /*
-  * Mark portion of the address space read only.
-  */
--extern void shared_info;
-+extern char shared_info[PAGE_SIZE]; 
- static void set_readonly(void *text, void *etext)
- {
-     unsigned long start_address =
-diff -ru -x '*~' xen-4.0.1-orig//extras/mini-os/minios.mk xen-4.0.1//extras/mini-os/minios.mk
---- xen-4.0.1-orig//extras/mini-os/minios.mk	2010-08-25 12:22:07.000000000 +0200
-+++ xen-4.0.1//extras/mini-os/minios.mk	2010-12-22 20:03:11.000000000 +0100
-@@ -10,6 +10,7 @@
- DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,)
- DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline)
- DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline
-+DEF_CFLAGS += -Wno-uninitialized
- DEF_CPPFLAGS += -D__XEN_INTERFACE_VERSION__=$(XEN_INTERFACE_VERSION)
- 
- DEF_ASFLAGS += -D__ASSEMBLY__
-diff -ru -x '*~' xen-4.0.1-orig//extras/mini-os/netfront.c xen-4.0.1//extras/mini-os/netfront.c
---- xen-4.0.1-orig//extras/mini-os/netfront.c	2010-08-25 12:22:07.000000000 +0200
-+++ xen-4.0.1//extras/mini-os/netfront.c	2010-12-22 19:56:59.000000000 +0100
-@@ -25,8 +25,8 @@
- 
- 
- 
--#define NET_TX_RING_SIZE __RING_SIZE((struct netif_tx_sring *)0, PAGE_SIZE)
--#define NET_RX_RING_SIZE __RING_SIZE((struct netif_rx_sring *)0, PAGE_SIZE)
-+#define NET_TX_RING_SIZE __CONST_RING_SIZE(netif_tx, PAGE_SIZE)
-+#define NET_RX_RING_SIZE __CONST_RING_SIZE(netif_rx, PAGE_SIZE)
- #define GRANT_INVALID_REF 0
- 
- 

From af9924b92904a8ce6bcef44fa44fbdfe63ea5d5d Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 5 Jun 2012 15:18:34 +0200
Subject: [PATCH 03/76] Add Cython, because it's needed to build xpra.

---
 .../interpreters/cython/default.nix           | 20 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/interpreters/cython/default.nix

diff --git a/pkgs/development/interpreters/cython/default.nix b/pkgs/development/interpreters/cython/default.nix
new file mode 100644
index 00000000000..42dafcb7f2e
--- /dev/null
+++ b/pkgs/development/interpreters/cython/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, python, pkgconfig }:
+
+stdenv.mkDerivation {
+  name = "cython-0.16";
+
+  src = fetchurl {
+    url = http://www.cython.org/release/Cython-0.16.tar.gz;
+    sha256 = "1yz6jwv25xx5mbr2nm4l7mi65gvpm63dzi3vrw73p51wbpy525lp";
+  };
+
+  buildPhase = "python setup.py build --build-base $out";
+
+  installPhase = "python setup.py install --prefix=$out";
+
+  buildInputs = [ python pkgconfig ];
+
+  meta = {
+    description = "An interpreter to help writing C extensions for Python";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e21558ac511..8777ebc0b3b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1777,6 +1777,8 @@ let
 
   cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { };
 
+  cython = callPackage ../development/interpreters/cython { };
+
   dylan = callPackage ../development/compilers/gwydion-dylan {
     dylan = callPackage ../development/compilers/gwydion-dylan/binary.nix {  };
   };

From d802bacdd93adf52797e3066b66da62c35a9693d Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 5 Jun 2012 15:19:49 +0200
Subject: [PATCH 04/76] xpra: New version from the fork.

This is because the original version is no longer in development, as stated on
the website at http://code.google.com/p/partiwm/wiki/xpra:

"This project is in deep hibernation; I haven't had time to devote for several
years now. If you are looking for xpra, you may prefer Antoine Martin's fork,
which receives more support. It is available at: http://xpra.org/"

So I guess its safe to switch over to that fork.
---
 pkgs/tools/X11/xpra/default.nix | 14 ++++++--------
 pkgs/top-level/all-packages.nix |  4 +---
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index cf7692cc58a..9fc34a2cf3f 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -1,17 +1,15 @@
-{stdenv, fetchurl, pkgconfig, python, pyrex, pygtk, xlibs, gtk, makeWrapper}:
+{stdenv, fetchurl, pkgconfig, python, cython, pygtk, xlibs, gtk, ffmpeg, x264, libvpx, makeWrapper}:
 
 stdenv.mkDerivation {
-  name = "xpra-0.0.3";
+  name = "xpra-0.3.2";
   
   src = fetchurl {
-    url = http://partiwm.org/static/downloads/parti-all-0.0.3.tar.gz;
-    sha256 = "17inksd4cc7mba2vfs17gz1yk3h6x6wf06pm3hcbs5scq8rr5bkp";
+    url = http://xpra.org/src/xpra-0.3.2.tar.bz2;
+    sha256 = "1s1z6r0r78qvf59ci3vxammjz7lj5m64jyk0bfn7yxd5jl3sy41y";
   };
 
-  #src = /home/eelco/Dev/nixpkgs/parti-all-0.0.3;
-
   buildInputs = [
-    pkgconfig python pyrex pygtk gtk makeWrapper
+    pkgconfig python cython pygtk gtk ffmpeg x264 libvpx makeWrapper
     xlibs.inputproto xlibs.libXcomposite xlibs.libXdamage xlibs.libXtst
   ];
 
@@ -33,7 +31,7 @@ stdenv.mkDerivation {
   '';
   
   meta = {
-    homepage = http://partiwm.org/wiki/xpra;
+    homepage = http://xpra.org/;
     description = "Persistent remote applications for X";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8777ebc0b3b..fc26ed174d6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7683,9 +7683,7 @@ let
   libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix {
   };
 
-  xpra = callPackage ../tools/X11/xpra {
-    pyrex = pyrex095;
-  };
+  xpra = callPackage ../tools/X11/xpra { };
 
   xscreensaver = callPackage ../misc/screensavers/xscreensaver {
     inherit (gnome) libglade;

From 5cf889967374a49f0af8eb974c1d14b255e4fa14 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 6 Jul 2012 03:33:52 +0200
Subject: [PATCH 05/76] xpra: Don't include cython into store requisites.

Cython is not required in order to run XPRA, so we now explicitly specify what
should be put into PYTHONPATH instead of using the PYTHONPATH which is set
during build time.

That way we don't get unnecessary stuff in /nix/store, like the mentioned
cython compiler/interpreter.
---
 pkgs/tools/X11/xpra/default.nix | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index 9fc34a2cf3f..a6d0065e8cc 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -1,6 +1,8 @@
-{stdenv, fetchurl, pkgconfig, python, cython, pygtk, xlibs, gtk, ffmpeg, x264, libvpx, makeWrapper}:
+{ stdenv, fetchurl, pkgconfig, python, cython
+, pygtk, pygobject, pycairo, xlibs, gtk
+, ffmpeg, x264, libvpx, makeWrapper}:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "xpra-0.3.2";
   
   src = fetchurl {
@@ -8,8 +10,10 @@ stdenv.mkDerivation {
     sha256 = "1s1z6r0r78qvf59ci3vxammjz7lj5m64jyk0bfn7yxd5jl3sy41y";
   };
 
+  buildNativeInputs = [ cython ];
+
   buildInputs = [
-    pkgconfig python cython pygtk gtk ffmpeg x264 libvpx makeWrapper
+    pkgconfig python pygtk gtk ffmpeg x264 libvpx makeWrapper
     xlibs.inputproto xlibs.libXcomposite xlibs.libXdamage xlibs.libXtst
   ];
 
@@ -19,13 +23,20 @@ stdenv.mkDerivation {
     ./do-build
   '';
 
+  pythonPaths = [
+    "$out/lib/python"
+    "$(toPythonPath ${pygtk})/gtk-2.0"
+  ] ++ map (i: "$(toPythonPath ${i})") [
+    pygobject pycairo notify
+  ];
+
   installPhase = ''
     mkdir -p $out
     cp -r install/* $out
 
     for i in $(cd $out/bin && ls); do
         wrapProgram $out/bin/$i \
-            --set PYTHONPATH "$out/lib/python:$(toPythonPath ${pygtk})/gtk-2.0:$PYTHONPATH" \
+            --set PYTHONPATH "${stdenv.lib.concatStringsSep ":" pythonPaths}" \
             --prefix PATH : "${xlibs.xauth}/bin:${xlibs.xorgserver}/bin:${xlibs.xmodmap}/bin"
     done
   '';

From ceff799efcf1380b765c20a8a35d3cdaa26bafcb Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 6 Jul 2012 03:36:15 +0200
Subject: [PATCH 06/76] xpra: Add python notify module.

This is not needed to run XPRA, but gets rid of a few nasty errors.

XPRA is using the notify library to display nice desktop notifications, so there
might be users who actually like to have those funny things.
---
 pkgs/tools/X11/xpra/default.nix | 2 +-
 pkgs/top-level/all-packages.nix | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index a6d0065e8cc..3fbb350e0ab 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, python, cython
-, pygtk, pygobject, pycairo, xlibs, gtk
+, pygtk, pygobject, pycairo, notify, xlibs, gtk
 , ffmpeg, x264, libvpx, makeWrapper}:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fc26ed174d6..3c9a0b51bbe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7683,7 +7683,9 @@ let
   libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix {
   };
 
-  xpra = callPackage ../tools/X11/xpra { };
+  xpra = callPackage ../tools/X11/xpra {
+    inherit (pythonPackages) notify;
+  };
 
   xscreensaver = callPackage ../misc/screensavers/xscreensaver {
     inherit (gnome) libglade;

From f2a77f5d9d395084adce2c8e3d2e40dacf447df5 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 13 Jul 2012 18:18:52 +0400
Subject: [PATCH 07/76] TeXLive: update to 2012 snapshot from Debian

---
 pkgs/data/fonts/tipa/default.nix              | 24 +++++++++++
 .../libraries/silgraphite/default.nix         | 20 +++++++++
 .../typesetting/tex/texlive/aggregate.nix     | 11 ++---
 .../tools/typesetting/tex/texlive/default.nix | 42 ++++++++++++-------
 pkgs/tools/typesetting/tex/texlive/extra.nix  |  8 ++--
 pkgs/top-level/all-packages.nix               | 14 ++++---
 6 files changed, 90 insertions(+), 29 deletions(-)
 create mode 100644 pkgs/data/fonts/tipa/default.nix
 create mode 100644 pkgs/development/libraries/silgraphite/default.nix

diff --git a/pkgs/data/fonts/tipa/default.nix b/pkgs/data/fonts/tipa/default.nix
new file mode 100644
index 00000000000..47e98f7c53a
--- /dev/null
+++ b/pkgs/data/fonts/tipa/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "tipa-1.3";
+  
+  src = fetchurl {
+    url = "mirror://debian/pool/main/t/tipa/tipa_1.3.orig.tar.gz";
+    sha256 = "1q1sisxdcd2zd9b7mnagr2mxf9v3n1r4s5892zx5ly4r0niyya9m";
+  };
+
+  installPhase = ''
+    export PREFIX="$out/texmf"
+    mkdir -p "$PREFIX" "$out/share"
+    make install PREFIX="$PREFIX"
+
+    ln -s $out/texmf* $out/share/
+  '';
+
+  meta = {
+    description = "Phonetic font for TeX";
+  };
+}
+
+
diff --git a/pkgs/development/libraries/silgraphite/default.nix b/pkgs/development/libraries/silgraphite/default.nix
new file mode 100644
index 00000000000..2bb38b3781f
--- /dev/null
+++ b/pkgs/development/libraries/silgraphite/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, freetype, libXft, pango, fontconfig }:
+stdenv.mkDerivation rec {
+  version = "2.3.1";
+  name = "silgraphite-2.3.1";
+  
+  src = fetchurl {
+    url = "mirror://sourceforge/silgraphite/silgraphite/${version}/${name}.tar.gz";
+    sha256 = "9b07c6e91108b1fa87411af4a57e25522784cfea0deb79b34ced608444f2ed65";
+  };
+
+  buildInputs = [pkgconfig freetype libXft pango fontconfig];
+
+  NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2";
+
+  meta = {
+    description = ''An advanced font engine'';
+    maintainers = with stdenv.lib.maintainers; [raskin];
+    platforms = with stdenv.lib.maintainers; linux;
+  };
+}
diff --git a/pkgs/tools/typesetting/tex/texlive/aggregate.nix b/pkgs/tools/typesetting/tex/texlive/aggregate.nix
index c018d2da0d3..c2ccecab089 100644
--- a/pkgs/tools/typesetting/tex/texlive/aggregate.nix
+++ b/pkgs/tools/typesetting/tex/texlive/aggregate.nix
@@ -46,13 +46,14 @@ rec {
 
     rm $out/texmf*/ls-R
     for i in web2c texconfig fonts/map; do
-        cp -r $out/texmf/$i/* $out/texmf-config/$i || true
+        cp -Lr $out/texmf/$i/* $out/texmf-config/$i || true
     done
+    chmod -R u+w $out/texmf-config
 
-    TEXMFCONFIG=$out/texmf-config HOME=$PWD PATH=$PATH:$out/bin updmap --syncwithtrees
-    PATH=$PATH:$out/bin mktexlsr $out/texmf*
-    TEXMFCONFIG=$out/texmf-config HOME=$PWD PATH=$PATH:$out/bin updmap --syncwithtrees
-    PATH=$PATH:$out/bin mktexlsr $out/texmf*
+    yes | TEXMFCONFIG=$out/texmf-config HOME=$PWD PATH=$PATH:$out/bin updmap --syncwithtrees
+    yes | PATH=$PATH:$out/bin mktexlsr $out/texmf*
+    yes | TEXMFCONFIG=$out/texmf-config HOME=$PWD PATH=$PATH:$out/bin updmap --syncwithtrees
+    yes | PATH=$PATH:$out/bin mktexlsr $out/texmf*
   '') ["minInit" "defEnsureDir" "addInputs"];
 
   meta = {
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index 30e59849d32..aac8da784b3 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -1,18 +1,18 @@
 args : with args;
 rec {
   src = fetchurl {
-    url = mirror://debian/pool/main/t/texlive-bin/texlive-bin_2009.orig.tar.gz;
-    sha256 = "0ywc8h4jnig53fs0bji2ivw5f9j6zlgdy477jqw7xvpc7migjpw7";
+    url = mirror://debian/pool/main/t/texlive-bin/texlive-bin_2012.20120628.orig.tar.xz;
+    sha256 = "0k94df3lfvghngzdzi2d4fz2z0gs8iglz7h3w2lxvlhiwwpmx601";
   };
 
   texmfSrc = fetchurl {
-    url = mirror://debian/pool/main/t/texlive-base/texlive-base_2009.orig.tar.gz;
-    sha256 = "130z907xcxr10yrzbbmp9l8a00dabvi4bi702s5jxamjzav17cmf";
+    url = mirror://debian/pool/main/t/texlive-base/texlive-base_2012.20120611.orig.tar.xz;
+    sha256 = "116zm0qdq9rd4vakhd2py9q7lq3ihspc7hy33bh8wy5v1rgiqsm6";
   };
 
   langTexmfSrc = fetchurl {
-    url = mirror://debian/pool/main/t/texlive-lang/texlive-lang_2009.orig.tar.gz;
-    sha256 = "10shnsc71n95zy9ys938pljdid9ampmc50k4lji9wv53hm14laic";
+    url = mirror://debian/pool/main/t/texlive-lang/texlive-lang_2012.20120611.orig.tar.xz;
+    sha256 = "0zh9svszfkbjx72i7sa9gg0gak93wf05845mxpjv56h8qwk4bffv";
   };
 
   setupHook = ./setup-hook.sh;
@@ -44,15 +44,23 @@ rec {
   '') ["minInit" "doUnpack" "addInputs" "defEnsureDir"];
 
   doPostInstall = fullDepEntry(''
-    mv $out/bin $out/libexec
+    mkdir -p $out/libexec/
+    mv $out/bin $out/libexec/$(uname -m)
     mkdir -p $out/bin
-    for i in "$out/libexec/"*"/"*; do
-        test \( \! -d "$i" \) -a -x "$i" || continue
-        echo -ne "#! $SHELL\\nexec $i \"\$@\"" >$out/bin/$(basename $i)
-        chmod a+x $out/bin/$(basename $i)
+    for i in "$out/libexec/"* "$out/libexec/"*/* ; do
+        test \( \! -d "$i" \) -a \( -x "$i" -o -L "$i" \) || continue
+	if [ -x "$i" ]; then
+	    echo -ne "#! $SHELL\\nexec $i \"\$@\"" >$out/bin/$(basename $i)
+            chmod a+x $out/bin/$(basename $i)
+	else
+	    mv "$i" "$out/libexec"
+	    ln -s "$(readlink -f "$out/libexec/$(basename "$i")")" "$out/bin/$(basename "$i")";
+	    ln -sf "$(readlink -f "$out/libexec/$(basename "$i")")" "$out/libexec/$(uname -m)/$(basename "$i")";
+            rm "$out/libexec/$(basename "$i")"
+	fi;
     done
     [ -d $out/texmf-config ] || ln -s $out/texmf $out/texmf-config
-    ln -s "$out/"*texmf* "$out/share/"
+    ln -s -v "$out/"*texmf* "$out/share/" || true
 
     sed -e 's/.*pyhyph.*/=&/' -i $out/texmf-config/tex/generic/config/language.dat
 
@@ -79,16 +87,20 @@ rec {
     zlib bzip2 ncurses libpng flex bison libX11 libICE
     xproto freetype t1lib gd libXaw icu ghostscript ed
     libXt libXpm libXmu libXext xextproto perl libSM
-    ruby expat curl libjpeg python fontconfig
+    ruby expat curl libjpeg python fontconfig xz
+    pkgconfig poppler silgraphite lesstif zziplib
   ];
 
   configureFlags = [ "--with-x11"
-    "--enable-ipc" "--with-mktexfmt"
+    "--enable-ipc" "--with-mktexfmt" "--enable-shared"
+    "--disable-native-texlive-build" "--with-system-zziplib"
+    "--with-system-icu" "--with-system-libgs" "--with-system-t1lib"
+    "--with-system-freetype2"
   ];
 
   phaseNames = ["addInputs" "doMainBuild" "doMakeInstall" "doPostInstall"];
 
-  name = "texlive-core-2009";
+  name = "texlive-core-2012";
   meta = {
     description = "A TeX distribution";
     maintainers = [ args.lib.maintainers.raskin ];
diff --git a/pkgs/tools/typesetting/tex/texlive/extra.nix b/pkgs/tools/typesetting/tex/texlive/extra.nix
index 1ecec91a685..180019bb205 100644
--- a/pkgs/tools/typesetting/tex/texlive/extra.nix
+++ b/pkgs/tools/typesetting/tex/texlive/extra.nix
@@ -1,12 +1,12 @@
 args: with args;
 rec {
-  name = "texlive-extra-2009";
+  name = "texlive-extra-2012";
   src = fetchurl {
-    url = mirror://debian/pool/main/t/texlive-extra/texlive-extra_2009.orig.tar.gz;
-    sha256 = "04k48lxy76bad1270gb9k4aza2q13can2dbcf2hj0a3byls099kp";
+    url = mirror://debian/pool/main/t/texlive-extra/texlive-extra_2012.20120611.orig.tar.xz;
+    sha256 = "1wn2gwifb5ww6nb15zdbkk5yz5spynvwqscvrgxzb84p0z3hy8dq";
   };
 
-  buildInputs = [texLive];
+  buildInputs = [texLive xz];
   phaseNames = ["doCopy"];
   doCopy = fullDepEntry (''
     mkdir -p $out/share
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a2ee56d44ef..b9134fcf9fb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4673,6 +4673,8 @@ let
 
   serd = callPackage ../development/libraries/serd {};
 
+  silgraphite = callPackage ../development/libraries/silgraphite {};
+
   simgear = callPackage ../development/libraries/simgear {};
 
   sfml_git = callPackage ../development/libraries/sfml { };
@@ -6266,6 +6268,8 @@ let
 
   terminus_font = callPackage ../data/fonts/terminus-font { };
 
+  tipa = callPackage ../data/fonts/tipa { };
+
   ttf_bitstream_vera = callPackage ../data/fonts/ttf-bitstream-vera { };
 
   ubuntu_font_family = callPackage ../data/fonts/ubuntu-font-family { };
@@ -8610,9 +8614,9 @@ let
   texFunctions = import ../tools/typesetting/tex/nix pkgs;
 
   texLive = builderDefsPackage (import ../tools/typesetting/tex/texlive) {
-    inherit builderDefs zlib bzip2 ncurses libpng ed
-      gd t1lib freetype icu perl expat curl
-      libjpeg bison python fontconfig flex;
+    inherit builderDefs zlib bzip2 ncurses libpng ed lesstif
+      gd t1lib freetype icu perl expat curl xz pkgconfig zziplib
+      libjpeg bison python fontconfig flex poppler silgraphite;
     inherit (xlibs) libXaw libX11 xproto libXt libXpm
       libXmu libXext xextproto libSM libICE;
     ghostscript = ghostscriptX;
@@ -8621,7 +8625,7 @@ let
 
   texLiveFull = lib.setName "texlive-full" (texLiveAggregationFun {
     paths = [ texLive texLiveExtra lmodern texLiveCMSuper texLiveLatexXColor
-              texLivePGF texLiveBeamer texLiveModerncv ];
+              texLivePGF texLiveBeamer texLiveModerncv tipa ];
   });
 
   /* Look in configurations/misc/raskin.nix for usage example (around revisions
@@ -8646,7 +8650,7 @@ let
   };
 
   texLiveExtra = builderDefsPackage (import ../tools/typesetting/tex/texlive/extra.nix) {
-    inherit texLive;
+    inherit texLive xz;
   };
 
   texLiveCMSuper = builderDefsPackage (import ../tools/typesetting/tex/texlive/cm-super.nix) {

From dc5ba23ab46878e46ca6858ea313645f5782e19a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 14 Jul 2012 17:41:52 -0400
Subject: [PATCH 08/76] linux: Update to 3.2.23

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
index 70b9d9dcf38..ab1ec38ba52 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix
@@ -237,7 +237,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.2.22";
+    version = "3.2.23";
     testing = false;
 
     modDirVersion = version;
@@ -248,7 +248,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.xz";
-      sha256 = "1nf3ph06p743jjxfgwwcy8156mx4fi1cy7zi7hc1gz5bq4c0k8mw";
+      sha256 = "1fmxr9qdz239aqf63j1648rvfngysqqk8qzwb1wjsn5hzrahsxmw";
     };
 
     config = configWithPlatform stdenv.platform;

From 039b70904193091cc894e47491010343f5cefebb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Sun, 15 Jul 2012 11:51:49 +0200
Subject: [PATCH 09/76] Fix the hardcoded /usr/local path in the debug
 ffado-diag, diagnostic script

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

diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix
index 3755bbe80bb..a78599c6a20 100644
--- a/pkgs/os-specific/linux/ffado/default.nix
+++ b/pkgs/os-specific/linux/ffado/default.nix
@@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
     scons PREFIX=$out LIBDIR=$out/lib SHAREDIR=$out/share/libffado \
       PYPKGDIR=$out/$PYLIBSUFFIX install
 
+    sed -e "s#/usr/local#$out#g" -i $out/bin/ffado-diag
+
     PYDIR=$out/$PYLIBSUFFIX
     wrapProgram $out/bin/ffado-mixer --prefix PYTHONPATH : \
       $PYTHONPATH:$PYDIR:${pyqt4}/$LIBSUFFIX:${pythonDBus}/$LIBSUFFIX:

From 0d64ae833542a1d17e87cd4c5aca46fd35fd3c8a Mon Sep 17 00:00:00 2001
From: Daniel Santa Cruz <dstcruz@gmail.com>
Date: Sun, 15 Jul 2012 14:40:58 -0400
Subject: [PATCH 10/76] Packages needed for Yesod + Postgresql development

---
 .../haskell/persistent-postgresql/default.nix | 19 +++++++++++++++++++
 .../haskell/postgresql-libpq/default.nix      | 14 ++++++++++++++
 .../haskell/postgresql-simple/default.nix     | 18 ++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  8 ++++++++
 4 files changed, 59 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/persistent-postgresql/default.nix
 create mode 100644 pkgs/development/libraries/haskell/postgresql-libpq/default.nix
 create mode 100644 pkgs/development/libraries/haskell/postgresql-simple/default.nix

diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
new file mode 100644
index 00000000000..15b1c426aea
--- /dev/null
+++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
@@ -0,0 +1,19 @@
+{ cabal, aeson, conduit, monadControl, persistent, postgresqlLibpq
+, postgresqlSimple, text, time, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "persistent-postgresql";
+  version = "0.9.1";
+  sha256 = "0kzw4lq4i6lj149aws4ca4z43jmwvcbjr5gf5lk0pwcmzp6chr32";
+  buildDepends = [
+    aeson conduit monadControl persistent postgresqlLibpq
+    postgresqlSimple text time transformers
+  ];
+  meta = {
+    homepage = "http://www.yesodweb.com/book/persistent";
+    description = "Backend for the persistent library using postgresql";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix
new file mode 100644
index 00000000000..abe2e83a018
--- /dev/null
+++ b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix
@@ -0,0 +1,14 @@
+{ cabal, postgresql }:
+
+cabal.mkDerivation (self: {
+  pname = "postgresql-libpq";
+  version = "0.8.2";
+  sha256 = "10i3yc5fxlmnrb8j9p2a9w7h49p3ain36qpshlb34chdk9xh3l7g";
+  extraLibraries = [ postgresql ];
+  meta = {
+    homepage = "http://github.com/lpsmith/postgresql-libpq";
+    description = "low-level binding to libpq";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
new file mode 100644
index 00000000000..03263c9ff97
--- /dev/null
+++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
@@ -0,0 +1,18 @@
+{ cabal, attoparsec, blazeBuilder, blazeTextual, postgresqlLibpq
+, text, time, transformers, vector
+}:
+
+cabal.mkDerivation (self: {
+  pname = "postgresql-simple";
+  version = "0.1.4.3";
+  sha256 = "0q0mkkd22hji7ns25i86shy1504d0d4mc3fqljpfffm6m36855kc";
+  buildDepends = [
+    attoparsec blazeBuilder blazeTextual postgresqlLibpq text time
+    transformers vector
+  ];
+  meta = {
+    description = "Mid-Level PostgreSQL client library";
+    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 5515990baaa..6baf2785169 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1129,6 +1129,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   persistent = callPackage ../development/libraries/haskell/persistent {};
 
+  persistentPostgresql = callPackage ../development/libraries/haskell/persistent-postgresql {};
+
   persistentSqlite = callPackage ../development/libraries/haskell/persistent-sqlite {};
 
   persistentTemplate = callPackage ../development/libraries/haskell/persistent-template {};
@@ -1141,6 +1143,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   poolConduit = callPackage ../development/libraries/haskell/pool-conduit {};
 
+  postgresqlLibpq = callPackage ../development/libraries/haskell/postgresql-libpq {
+    postgresql = pkgs.postgresql91;
+  };
+
+  postgresqlSimple = callPackage ../development/libraries/haskell/postgresql-simple {};
+
   ppm = callPackage ../development/libraries/haskell/ppm {};
 
   prettyShow = callPackage ../development/libraries/haskell/pretty-show {};

From 3c090b3f297549092bfaae85f4d4892571dc69fc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Jul 2012 11:20:59 +0200
Subject: [PATCH 11/76] haskell-gitit: patch to support current version of
 hslogger

---
 pkgs/development/libraries/haskell/gitit/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix
index 7f15c201999..148750e9ddc 100644
--- a/pkgs/development/libraries/haskell/gitit/default.nix
+++ b/pkgs/development/libraries/haskell/gitit/default.nix
@@ -18,6 +18,9 @@ cabal.mkDerivation (self: {
     safe SHA syb tagsoup text time url utf8String xhtml xml xssSanitize
     zlib
   ];
+  patchPhase = ''
+    sed -i -e 's|hslogger.*,|hslogger,|' gitit.cabal
+  '';
   meta = {
     homepage = "http://gitit.net";
     description = "Wiki using happstack, git or darcs, and pandoc";

From 666a1aa7276f3ff68b90b469673f760be33d33f4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Jul 2012 11:21:11 +0200
Subject: [PATCH 12/76] haskell-hoogle: update to version 4.2.12

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

diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix
index 9db10b33b1d..db5dc38e38f 100644
--- a/pkgs/development/libraries/haskell/hoogle/default.nix
+++ b/pkgs/development/libraries/haskell/hoogle/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hoogle";
-  version = "4.2.11";
-  sha256 = "0m708qlj3q8s9vywg51gj7bwwasz5nxqxqhqh8f0k96iawqd9gid";
+  version = "4.2.12";
+  sha256 = "1j726bm8sx4qamaib6l14s4a4jz4z6szhj1vk8n5b6f3g38s7hwy";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 3be2d8d9cd3fc765c98d4a517e082d40aee07134 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Jul 2012 11:21:11 +0200
Subject: [PATCH 13/76] haskell-language-c-quote: update to version 0.4.0

---
 .../libraries/haskell/language-c-quote/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix
index a765b015a31..503fa8f561f 100644
--- a/pkgs/development/libraries/haskell/language-c-quote/default.nix
+++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "language-c-quote";
-  version = "0.3.2";
-  sha256 = "1pxrag9ws93rsqrsxcyxg07pvp2qw0f19yj2b40ynwzk112nkd16";
+  version = "0.4.0";
+  sha256 = "1qbl81c8fw2gz96n8505yxhw1d3zhxq436ikv173x1zz0b4z26g1";
   buildDepends = [
     exceptionMtl exceptionTransformers filepath haskellSrcMeta
     mainlandPretty mtl srcloc syb symbol

From 8e85516e045149a6bbd9e09020df9ceb255a75a5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Jul 2012 11:21:11 +0200
Subject: [PATCH 14/76] haskell-mainland-pretty: update to version 0.2.1

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

diff --git a/pkgs/development/libraries/haskell/mainland-pretty/default.nix b/pkgs/development/libraries/haskell/mainland-pretty/default.nix
index d64a6c76180..221a69fa7da 100644
--- a/pkgs/development/libraries/haskell/mainland-pretty/default.nix
+++ b/pkgs/development/libraries/haskell/mainland-pretty/default.nix
@@ -1,10 +1,10 @@
-{ cabal, srcloc, symbol }:
+{ cabal, srcloc, text }:
 
 cabal.mkDerivation (self: {
   pname = "mainland-pretty";
-  version = "0.1.3.0";
-  sha256 = "1grfsn066z11737dxdk1bdhyvz9vjxxn6krfgx9bc8jin6n9h6aq";
-  buildDepends = [ srcloc symbol ];
+  version = "0.2.1";
+  sha256 = "1pl96m92bsrghkp5ixaqlhi2hybc4hafy64zlmsgjlmdvslxhs3h";
+  buildDepends = [ srcloc text ];
   meta = {
     homepage = "http://www.eecs.harvard.edu/~mainland/";
     description = "Pretty printing designed for printing source code";

From 932ee764a4e2d2410ccc2cef9bdfd24e94da4e50 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Jul 2012 11:21:11 +0200
Subject: [PATCH 15/76] haskell-simple-sendfile: update to version 0.2.5

---
 .../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 313f2aa4869..766e1ef9617 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.4";
-  sha256 = "1c7imvkb5aq5mlg6a1r36fp9klniicbj56n32yvzj4qqf1zy2pbx";
+  version = "0.2.5";
+  sha256 = "1g9plryh86lc03rf1s8m36wyc2yqp4y6f02viq9c4g1k85rkbs53";
   buildDepends = [ network ];
   meta = {
     description = "Cross platform library for the sendfile system call";

From ffbdd377f15b2af032285345c1b4ed013e6ed953 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Jul 2012 11:21:12 +0200
Subject: [PATCH 16/76] haskell-srcloc: update to version 0.2.0

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

diff --git a/pkgs/development/libraries/haskell/srcloc/default.nix b/pkgs/development/libraries/haskell/srcloc/default.nix
index d76309bc795..007ce644be0 100644
--- a/pkgs/development/libraries/haskell/srcloc/default.nix
+++ b/pkgs/development/libraries/haskell/srcloc/default.nix
@@ -1,10 +1,10 @@
-{ cabal, syb, symbol }:
+{ cabal, syb }:
 
 cabal.mkDerivation (self: {
   pname = "srcloc";
-  version = "0.1.2";
-  sha256 = "08awipz6al7jk7d974am5v9fkp87i5dy6d457mx1rv7lczlyhws9";
-  buildDepends = [ syb symbol ];
+  version = "0.2.0";
+  sha256 = "1p63gachz8ccv61ih3jb995kcg72g7vkihryb2ak7d8bxxxx3irs";
+  buildDepends = [ syb ];
   meta = {
     homepage = "http://www.eecs.harvard.edu/~mainland/";
     description = "Data types for managing source code locations";

From abad8b8873a587220a2ff949b41d8e179b5bbd92 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Jul 2012 11:21:12 +0200
Subject: [PATCH 17/76] haskell-hslogger: update to version 1.2.0

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

diff --git a/pkgs/development/tools/haskell/hslogger/default.nix b/pkgs/development/tools/haskell/hslogger/default.nix
index b181f164ed9..4128f6b7d09 100644
--- a/pkgs/development/tools/haskell/hslogger/default.nix
+++ b/pkgs/development/tools/haskell/hslogger/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hslogger";
-  version = "1.1.5";
-  sha256 = "0lk966csxxyjjdg5jg4pzzl5118zj8ms78vn1n9imb7f4vcs8vk7";
+  version = "1.2.0";
+  sha256 = "17ipnz7zd403x2gi2086chrgcnk76304hdxr5mv4phg4rm8w226y";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ mtl network time ];

From 76c096e4ea3694fc2ca89cb2097881cc2af3be6f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Jul 2012 11:22:51 +0200
Subject: [PATCH 18/76] haskell-hoogle: revert update to version 4.2.12

We need a current version of http-types for this update.
---
 pkgs/development/libraries/haskell/hoogle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix
index db5dc38e38f..9db10b33b1d 100644
--- a/pkgs/development/libraries/haskell/hoogle/default.nix
+++ b/pkgs/development/libraries/haskell/hoogle/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hoogle";
-  version = "4.2.12";
-  sha256 = "1j726bm8sx4qamaib6l14s4a4jz4z6szhj1vk8n5b6f3g38s7hwy";
+  version = "4.2.11";
+  sha256 = "0m708qlj3q8s9vywg51gj7bwwasz5nxqxqhqh8f0k96iawqd9gid";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 0b0babffc5f5256b8e1f1e258f36faaf94329274 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Jul 2012 11:36:35 +0200
Subject: [PATCH 19/76] Add meta.maintainer attribute to Haskell packages.

---
 .../libraries/haskell/persistent-postgresql/default.nix          | 1 +
 pkgs/development/libraries/haskell/postgresql-libpq/default.nix  | 1 +
 pkgs/development/libraries/haskell/postgresql-simple/default.nix | 1 +
 3 files changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
index 15b1c426aea..c1022e13749 100644
--- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
@@ -15,5 +15,6 @@ cabal.mkDerivation (self: {
     description = "Backend for the persistent library using postgresql";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix
index abe2e83a018..19f729a5641 100644
--- a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix
+++ b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "low-level binding to libpq";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
index 03263c9ff97..a142abdbceb 100644
--- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix
+++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
@@ -14,5 +14,6 @@ cabal.mkDerivation (self: {
     description = "Mid-Level PostgreSQL client library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })

From 09f6874aadce28bd085f3df5704ca08b3a51cb9a Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 16 Jul 2012 12:06:31 +0200
Subject: [PATCH 20/76] Add trickle 1.07

---
 pkgs/tools/networking/trickle/default.nix | 31 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/networking/trickle/default.nix

diff --git a/pkgs/tools/networking/trickle/default.nix b/pkgs/tools/networking/trickle/default.nix
new file mode 100644
index 00000000000..646108525d3
--- /dev/null
+++ b/pkgs/tools/networking/trickle/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, libevent }:
+
+stdenv.mkDerivation rec {
+  name = "trickle-1.07";
+
+  src = fetchurl {
+    url = "http://monkey.org/~marius/trickle/${name}.tar.gz";
+    sha256 = "0s1qq3k5mpcs9i7ng0l9fvr1f75abpbzfi1jaf3zpzbs1dz50dlx";
+  };
+
+  buildInputs = [libevent];
+
+  preConfigure = ''
+    sed -i 's|libevent.a|libevent.so|' configure
+  '';
+
+  preBuild = ''
+    sed -i '/#define in_addr_t/ s:^://:' config.h
+  '';
+
+  LDFLAGS = "-levent";
+
+  configureFlags = "--with-libevent";
+
+  meta = {
+    description = "Trickle, a portable lightweight userspace bandwidth shaper.";
+    license = "BSD";
+    homepage = http://monkey.org/~marius/pages/?page=trickle;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2444e920bed..64d2b986cc1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1508,6 +1508,8 @@ let
 
   torsocks = callPackage ../tools/security/tor/torsocks.nix { };
 
+  trickle = callPackage ../tools/networking/trickle {};
+
   ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { };
   ttf2pt1_cl_pdf = callPackage ../tools/misc/ttf2pt1 { };
 

From a677ded47fd2fc9abf35d89ff2fbf8d343749c5a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 16 Jul 2012 07:16:34 -0400
Subject: [PATCH 21/76] Add werkzeug python package

---
 pkgs/top-level/python-packages.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fb265337b39..c4977cfe0c1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2590,6 +2590,22 @@ let pythonPackages = python.modules // rec {
   };
 
 
+  werkzeug = buildPythonPackage {
+    name = "werkzeug-0.8.3";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/W/Werkzeug/Werkzeug-0.8.3.tar.gz";
+      md5 = "12aa03e302ce49da98703938f257347a";
+    };
+
+    meta = {
+      homepage = http://werkzeug.pocoo.org/;
+      description = "A WSGI utility library for Python";
+      license = "BSD";
+    };
+  };
+
+
   wxPython = wxPython28;
 
 

From 00b8c7701291399d3421e3b883c796c11ce9e4c7 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 16 Jul 2012 07:20:24 -0400
Subject: [PATCH 22/76] Add flask python package

---
 pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c4977cfe0c1..ba8292fabb4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -686,6 +686,24 @@ let pythonPackages = python.modules // rec {
   };
 
 
+  flask = buildPythonPackage {
+    name = "flask-0.9";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/F/Flask/Flask-0.9.tar.gz";
+      md5 = "4a89ef2b3ab0f151f781182bd0cc8933";
+    };
+
+    buildInputs = [ werkzeug jinja2 ];
+
+    meta = {
+      homepage = http://flask.pocoo.org/;
+      description = "A microframework based on Werkzeug, Jinja 2, and good intentions";
+      license = "BSD";
+    };
+  };
+
+
   flup = buildPythonPackage (rec {
     name = "flup-1.0.2";
 

From be4a92ad331a63b7d105510d4c7d700ab7e6ebff Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 16 Jul 2012 11:21:56 -0400
Subject: [PATCH 23/76] nix: Update to 1.1pre2742_a7a43ad

---
 pkgs/tools/package-management/nix/unstable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index 8b6ccb787be..3025f0450b8 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.1pre2723_1aba0bf";
+  name = "nix-1.1pre2742_a7a43ad";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/2746466/download/4/${name}.tar.bz2";
-    sha256 = "06224ecbde09124eea25bfcafcb06637457bc6ac9a9e332d84e9eaf561599160";
+    url = "http://hydra.nixos.org/build/2799663/download/4/${name}.tar.bz2";
+    sha256 = "bad6b3b6177d47cef0be3c81a5e1e876f656e99afeea673613e00656ebf07d3e";
   };
 
   buildNativeInputs = [ perl pkgconfig ];

From 94e2616c1ab1b183ffbba22b41626bb0026b7548 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 16 Jul 2012 11:54:45 -0400
Subject: [PATCH 24/76] flask: Dependencies need to be propagated

---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ba8292fabb4..35c12903b2c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -694,7 +694,7 @@ let pythonPackages = python.modules // rec {
       md5 = "4a89ef2b3ab0f151f781182bd0cc8933";
     };
 
-    buildInputs = [ werkzeug jinja2 ];
+    propagatedBuildInputs = [ werkzeug jinja2 ];
 
     meta = {
       homepage = http://flask.pocoo.org/;

From d04cbc85cf2d3754a9f6cfcc924f77ff4d2642e6 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 16 Jul 2012 20:26:27 -0400
Subject: [PATCH 25/76] linux-3.4: Update to 3.4.5

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix
index e1df11ba4f4..5cbde565153 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix
@@ -239,7 +239,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.4.4";
+    version = "3.4.5";
     testing = false;
 
     preConfigure = ''
@@ -248,7 +248,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
-      sha256 = "0l4h7amhsmgpnii8rgwi32nd7ajsifk2xckjd39pfzwdifacw5yw";
+      sha256 = "17m58d2mc2mgr49hlwhic03s0z1mjyp7lhfvfmpqi3qszrz3xij3";
     };
 
     config = configWithPlatform stdenv.platform;

From c5ad1e22a185df0a4a65d7002dac0a54a1b0a2a8 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 16 Jul 2012 21:26:04 -0400
Subject: [PATCH 26/76] gnupg: Try to build on all platforms

---
 pkgs/tools/security/gnupg/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/default.nix
index d3c9e3c13b6..0667a7f9885 100644
--- a/pkgs/tools/security/gnupg/default.nix
+++ b/pkgs/tools/security/gnupg/default.nix
@@ -54,5 +54,7 @@ stdenv.mkDerivation rec {
     license = "GPLv3+";
 
     maintainers = with stdenv.lib.maintainers; [ ludo urkud ];
+
+    platforms = stdenv.lib.platforms.all;
   };
 }

From 96b5e9795a7a793b46946e0a75f6d64c8e884558 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 17 Jul 2012 12:03:13 +0200
Subject: [PATCH 27/76] chromium: Update to the latest release channels.

---
 .../networking/browsers/chromium/sources.nix  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix
index db07bc460c7..93cc3a993b1 100644
--- a/pkgs/applications/networking/browsers/chromium/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/sources.nix
@@ -1,19 +1,19 @@
 # This file is autogenerated from update.sh in the same directory.
-# VHASH: 5e5af2017fa2e05f11aa741c6f87fff0549b93e3bc2aa40e6cc0a0aff84ba010
+# VHASH: 545cfbcd1fc31d037d1e6b5382995075d2a875a51d181cc26851e49dbd2227d8
 {
   dev = {
-    version = "21.0.1180.15";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1180.15.tar.bz2";
-    sha256 = "0ahsrsyw4928vg1kl3dv44q77ksp85crw6m7fy20nq46qihb0mxa";
+    version = "22.0.1207.1";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1207.1.tar.bz2";
+    sha256 = "1kzzaaczz1mwsfw7fn8la6h4yls2wy537ypabqgwyim01jhfmilp";
   };
   beta = {
-    version = "20.0.1132.47";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-20.0.1132.47.tar.bz2";
-    sha256 = "1rd1lfn9xchf4nrgi46van5aigqxj2n303890sslc4bcj6p8fkm3";
+    version = "21.0.1180.41";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1180.41.tar.bz2";
+    sha256 = "1225ny7y5msyk44lb5dspd4aq0yiaawsb5xi9g8iimiv80j4h34a";
   };
   stable = {
-    version = "20.0.1132.47";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-20.0.1132.47.tar.bz2";
-    sha256 = "1rd1lfn9xchf4nrgi46van5aigqxj2n303890sslc4bcj6p8fkm3";
+    version = "20.0.1132.57";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-20.0.1132.57.tar.bz2";
+    sha256 = "06v4ybvaj3gx1v4visfyfzbq2q3xasa8xlf05f4wi2bf62vcc98j";
   };
 }

From 83d63ea910321fdf271d102f37cf34f3da57bd05 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 17 Jul 2012 12:46:39 +0200
Subject: [PATCH 28/76] opera: Update to 12.0

---
 .../networking/browsers/opera/default.nix            | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index c53a5f34525..8c3cd9f11cd 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -9,22 +9,22 @@
 assert stdenv.isLinux && stdenv.gcc.gcc != null && stdenv.gcc.libc != null;
 
 let
-  mirror = ftp://ftp.ussg.iu.edu/pub/opera;
+  mirror = http://get.geo.opera.com/pub/opera;
 in
 
 stdenv.mkDerivation rec {
-  name = "opera-11.64-1403";
+  name = "opera-12.00-1467";
 
   src =
     if stdenv.system == "i686-linux" then
       fetchurl {
-        url = "${mirror}/linux/1164/${name}.i386.linux.tar.xz";
-        sha256 = "8b7998586b1b3f8f5722beef7ebb621c0f15915c260b096249e9db5973e30d82";
+        url = "${mirror}/linux/1200/${name}.i386.linux.tar.xz";
+        sha256 = "d5683f5a4cf0cfd9ce715359b77909c7923c85bcec98513907c1844285356fdc";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
-        url = "${mirror}/linux/1164/${name}.x86_64.linux.tar.xz";
-        sha256 = "3b2012cbab826a04417deb56b85d8d31f9c17130071304736bcfa572f78b4c69";
+        url = "${mirror}/linux/1200/${name}.x86_64.linux.tar.xz";
+        sha256 = "7c3dbe122b1fd20123f1b48a420dea080cc24ede4183d47d66b383c2b7ca5051";
       }
     else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)";
 

From 0a7e280587bb8669f9c2a6ac15c913be43a978fb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 17 Jul 2012 12:14:41 +0200
Subject: [PATCH 29/76] xscreensaver: update to version 5.18

---
 .../screensavers/xscreensaver/default.nix     | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix
index 2cd915c498e..cf4f81ea407 100644
--- a/pkgs/misc/screensavers/xscreensaver/default.nix
+++ b/pkgs/misc/screensavers/xscreensaver/default.nix
@@ -1,16 +1,15 @@
-{ stdenv, fetchurl, pkgconfig, bc, perl, pam
-, libXext, libXScrnSaver, libX11, libXrandr, libXmu, libXxf86vm, libXrender
-, libXxf86misc
-, libjpeg, mesa, gtk, libxml2, libglade
+{ stdenv, fetchurl, pkgconfig, bc, perl, pam, libXext, libXScrnSaver, libX11
+, libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, mesa, gtk
+, libxml2, libglade
 }:
 
 stdenv.mkDerivation rec {
-  version = "5.15";
+  version = "5.18";
   name = "xscreensaver-${version}";
 
   src = fetchurl {
     url = "http://www.jwz.org/xscreensaver/${name}.tar.gz";
-    sha256 = "4f6d1f1e4c15dbb74e2296f8fe57a73d47d602515178c248bbc838f779d5082d";
+    sha256 = "3d70edb8f46511f5427f21b4ba4d8323f336888f60268d16731f5231c6883db9";
   };
 
   buildInputs =
@@ -19,6 +18,16 @@ stdenv.mkDerivation rec {
       libXxf86misc
     ];
 
+  patchPhase =
+    ''
+      # Fix build error in version 5.18. Remove this patch when updating
+      # to a later version.
+      sed -i -e '/AF_LINK/d' hacks/glx/sonar-icmp.c
+      # Fix path to GTK.
+      sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' \
+	  -i driver/Makefile.in po/Makefile.in.in
+    '';
+
   configureFlags =
     [ "--with-gl" "--with-pam" "--with-pixbuf" "--with-proc-interrupts"
       "--with-dpms-ext" "--with-randr-ext" "--with-xinerama-ext"
@@ -27,12 +36,6 @@ stdenv.mkDerivation rec {
       "--with-x-app-defaults=\${out}/share/xscreensaver/app-defaults"
     ];
 
-  preConfigure =
-    ''
-      sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' \
-        -i driver/Makefile.in po/Makefile.in.in
-    '';
-
   meta = {
     homepage = "http://www.jwz.org/xscreensaver/";
     description = "A set of screensavers";

From 7e2979b56f30e1b52563cc749530400b6e4e9878 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 17 Jul 2012 14:44:23 +0200
Subject: [PATCH 30/76] i3: fix build some more

The build process depends on a script that relies on /usr/bin/env to find Perl.
Running 'patchShebangs' early fixes that script.
---
 pkgs/applications/window-managers/i3/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index 3a3a3626fb9..14fd6ce4193 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil bison xcbutilwm
     libstartup_notification libX11 pcre libev yajl flex libXcursor perl ];
 
+  patchPhase = "patchShebangs .";
+
   configurePhase = "makeFlags=PREFIX=$out";
 
   meta = {

From bae6ad5914cd6bd4414bb9811333219cb55f9051 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Tue, 17 Jul 2012 22:17:01 +0200
Subject: [PATCH 31/76] yafc: update to 1.2.0

The project has been retaken and this is the latest tarball available.
---
 pkgs/applications/networking/yafc/default.nix | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/yafc/default.nix b/pkgs/applications/networking/yafc/default.nix
index a6c3c43417e..0ea77701211 100644
--- a/pkgs/applications/networking/yafc/default.nix
+++ b/pkgs/applications/networking/yafc/default.nix
@@ -1,21 +1,19 @@
-{stdenv, fetchurl, readline, openssh}:
+{stdenv, fetchurl, readline, libssh, intltool}:
 
-stdenv.mkDerivation {
-  name = "yafc-1.1.1";
+stdenv.mkDerivation rec {
+  name = "yafc";
+  version = "1.2.0";
   src = fetchurl {
-    url = mirror://sourceforge/yafc/yafc-1.1.1.tar.bz2;
-    sha256 = "ab72b2ed89fb75dbe8ebd119458cf513392225f367cccfad881e9780aefcd7e6";
+    url = "https://github.com/downloads/sebastinas/yafc/${name}-${version}.tar.xz";
+    sha256 = "0h5cbvvfkigvzfqqzvgqpn8m0ilyng3rgyh85c0mi48klzv8kb58";
   };
 
-  buildInputs = [readline openssh];
-
-  patchPhase = "
-    sed -e 's@/usr/bin/ssh@${openssh}/bin/ssh@' -i src/main.c
-  ";
+  buildInputs = [ readline libssh intltool ];
 
   meta = {
     description = "ftp/sftp client with readline, autocompletion and bookmarks";
-    homepage = http://yafc.sourceforge.net;
+    homepage = http://www.yafc-ftp.com;
+    maintainers = [ "Carles Pagès <page@cubata.homelinux.net>" ];
     license = "GPLv2+";
   };
 }

From be22305ace29948275b9ec506b97fcf5f5141c2d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 17 Jul 2012 22:50:29 +0200
Subject: [PATCH 32/76] haskell-BNFC: update to version 2.4.2.1

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

diff --git a/pkgs/development/tools/haskell/BNFC/default.nix b/pkgs/development/tools/haskell/BNFC/default.nix
index c06b5eacc24..e737a02a4ac 100644
--- a/pkgs/development/tools/haskell/BNFC/default.nix
+++ b/pkgs/development/tools/haskell/BNFC/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "BNFC";
-  version = "2.4.2.0";
-  sha256 = "0nnalzsql1k5y3s93g5y2hy2gcdsrbi8r7cwzmdcy4vyy589pin0";
+  version = "2.4.2.1";
+  sha256 = "0a6ic9mqkxk2gql7dzik2bhm5iikgx035wxlz8iafxf45159dl14";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ mtl ];

From c93ecad6e205cbd665f2ec7fc1ecb8d814d2da4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Tue, 17 Jul 2012 23:31:19 +0200
Subject: [PATCH 33/76] Adding myself (page) to maintainers.

---
 pkgs/lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix
index aab4d685361..127295a2feb 100644
--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@@ -23,6 +23,7 @@
   marcweber = "Marc Weber <marco-oweber@gmx.de>";
   mornfall = "Petr Ročkai <me@mornfall.net>";
   neznalek = "Vladimír Čunát <vcunat@gmail.com>";
+  page = "Carles Pagès <page@cubata.homelinux.net>";
   phreedom = "Evgeny Egorochkin <phreedom.stdin@gmail.com>";
   pierron = "Nicolas B. Pierron <nixos@nbp.name>";
   piotr = "Piotr Pietraszkiewicz <ppietrasa@gmail.com>";

From 03179bd37e34b8141d7dccfd192e328409e735aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Tue, 17 Jul 2012 23:31:39 +0200
Subject: [PATCH 34/76] yafc: update expression to refer to maintainers list.

---
 pkgs/applications/networking/yafc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/yafc/default.nix b/pkgs/applications/networking/yafc/default.nix
index 0ea77701211..7089c7507db 100644
--- a/pkgs/applications/networking/yafc/default.nix
+++ b/pkgs/applications/networking/yafc/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "ftp/sftp client with readline, autocompletion and bookmarks";
     homepage = http://www.yafc-ftp.com;
-    maintainers = [ "Carles Pagès <page@cubata.homelinux.net>" ];
+    maintainers = [ stdenv.lib.maintainers.page ];
     license = "GPLv2+";
   };
 }

From 5c12df46cf97f30b9e640f2a31fe964d1fbe40c1 Mon Sep 17 00:00:00 2001
From: Dmitry Malikov <color404051h@gmail.com>
Date: Sun, 15 Jul 2012 01:21:01 +0200
Subject: [PATCH 35/76] Add haskell-lambdabot

---
 .../libraries/haskell/lambdabot/default.nix   | 26 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/lambdabot/default.nix

diff --git a/pkgs/development/libraries/haskell/lambdabot/default.nix b/pkgs/development/libraries/haskell/lambdabot/default.nix
new file mode 100644
index 00000000000..49fdf743e2a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/lambdabot/default.nix
@@ -0,0 +1,26 @@
+{ cabal, arrows, binary, brainfuck, dataMemocombinators, filepath
+, haskellSrc, haskellSrcExts, HTTP, IOSpec, lambdabotUtils, logict
+, MonadRandom, mtl, network, numbers, oeis, parsec, random
+, readline, regexCompat, show, syb, tagsoup, unlambda, utf8String
+, vectorSpace
+}:
+
+cabal.mkDerivation (self: {
+  pname = "lambdabot";
+  version = "4.2.3.2";
+  sha256 = "0jy48s4z1yn0wiaxzi3pws7j9j4ih2vqr8gr8md2i35g4bwxmxp2";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    arrows binary brainfuck dataMemocombinators filepath haskellSrc
+    haskellSrcExts HTTP IOSpec lambdabotUtils logict MonadRandom mtl
+    network numbers oeis parsec random readline regexCompat show syb
+    tagsoup unlambda utf8String vectorSpace
+  ];
+  meta = {
+    homepage = "http://haskell.org/haskellwiki/Lambdabot";
+    description = "Lambdabot is a development tool and advanced IRC bot";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index ddfbdac9469..7824b4ab188 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -961,6 +961,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   languageHaskellExtract = callPackage ../development/libraries/haskell/language-haskell-extract {};
 
+  lambdabot = callPackage ../development/libraries/haskell/lambdabot/default.nix {};
+
   largeword = callPackage ../development/libraries/haskell/largeword {};
 
   lazysmallcheck = callPackage ../development/libraries/haskell/lazysmallcheck {};

From cac9051fbff2753f385bc31e10a852550cb91d80 Mon Sep 17 00:00:00 2001
From: Dmitry Malikov <color404051h@gmail.com>
Date: Mon, 16 Jul 2012 21:34:53 +0200
Subject: [PATCH 36/76] Add brainfuck

---
 .../libraries/haskell/brainfuck/default.nix         | 13 +++++++++++++
 pkgs/top-level/haskell-packages.nix                 |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/brainfuck/default.nix

diff --git a/pkgs/development/libraries/haskell/brainfuck/default.nix b/pkgs/development/libraries/haskell/brainfuck/default.nix
new file mode 100644
index 00000000000..86a90f5d1b0
--- /dev/null
+++ b/pkgs/development/libraries/haskell/brainfuck/default.nix
@@ -0,0 +1,13 @@
+cabal.mkDerivation (self: {
+  pname = "brainfuck";
+  version = "0.1";
+  sha256 = "0lsw62g4ir8idjjadsdf46p8mqd88mysn0b499bk3x5l5js858z3";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ mtl ];
+  meta = {
+    description = "Brainfuck interpreter";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7824b4ab188..7a0cdcd2153 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -473,6 +473,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   Boolean = callPackage ../development/libraries/haskell/Boolean {};
 
+  brainfuck = callPackage ../development/libraries/haskell/brainfuck/default.nix {};
+
   bson = callPackage ../development/libraries/haskell/bson {};
 
   byteorder = callPackage ../development/libraries/haskell/byteorder {};

From 4c50696a1bcd9dc5b546c9c4dc974c38c620f639 Mon Sep 17 00:00:00 2001
From: Dmitry Malikov <color404051h@gmail.com>
Date: Mon, 16 Jul 2012 21:45:10 +0200
Subject: [PATCH 37/76] Add haskell/data-memocombinators

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

diff --git a/pkgs/development/libraries/haskell/default.nix b/pkgs/development/libraries/haskell/default.nix
new file mode 100644
index 00000000000..1fb2118c363
--- /dev/null
+++ b/pkgs/development/libraries/haskell/default.nix
@@ -0,0 +1,12 @@
+cabal.mkDerivation (self: {
+  pname = "data-memocombinators";
+  version = "0.4.3";
+  sha256 = "0mzvjgccm23y7mfaz9iwdy64amf69d7i8yq9fc9mjx1nyzxdrgsc";
+  buildDepends = [ dataInttrie ];
+  meta = {
+    homepage = "http://github.com/luqui/data-memocombinators";
+    description = "Combinators for building memo tables";
+    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 7a0cdcd2153..8823445bbc5 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -586,6 +586,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   dataenc = callPackage ../development/libraries/haskell/dataenc {};
 
+  dataMemocombinators = callPackage ../development/libraries/haskell/data-memocombinators {};
+
   dataReify = callPackage ../development/libraries/haskell/data-reify {};
 
   datetime = callPackage ../development/libraries/haskell/datetime {};

From 269f013d90924a2054a40e8e570e2a5d1fd90103 Mon Sep 17 00:00:00 2001
From: Dmitry Malikov <color404051h@gmail.com>
Date: Mon, 16 Jul 2012 21:53:30 +0200
Subject: [PATCH 38/76] Add haskell-IOSpec

---
 .../libraries/haskell/IOSpec/default.nix            | 13 +++++++++++++
 pkgs/top-level/haskell-packages.nix                 |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/IOSpec/default.nix

diff --git a/pkgs/development/libraries/haskell/IOSpec/default.nix b/pkgs/development/libraries/haskell/IOSpec/default.nix
new file mode 100644
index 00000000000..46211614c4c
--- /dev/null
+++ b/pkgs/development/libraries/haskell/IOSpec/default.nix
@@ -0,0 +1,13 @@
+{ cabal, mtl, QuickCheck, Stream }:
+
+cabal.mkDerivation (self: {
+  pname = "IOSpec";
+  version = "0.2.5";
+  sha256 = "0r6vqg39h6vzwlb33cvk72k4mh6jd8rpdcnkqsfxdqmsk7h8x84j";
+  buildDepends = [ mtl QuickCheck Stream ];
+  meta = {
+    description = "A pure specification of the IO monad";
+    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 8823445bbc5..e748d4400a0 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -932,6 +932,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   IORefCAS = callPackage ../development/libraries/haskell/IORefCAS {};
 
+  IOSpec = callPackage ../development/libraries/haskell/IOSpec {};
+
   ioStorage = callPackage ../development/libraries/haskell/io-storage {};
 
   irc = callPackage ../development/libraries/haskell/irc {

From 0a5a20d365ac70c0fda708e7083032500bc014e4 Mon Sep 17 00:00:00 2001
From: Dmitry Malikov <color404051h@gmail.com>
Date: Mon, 16 Jul 2012 21:56:38 +0200
Subject: [PATCH 39/76] Add haskell/lambdabot-utils

---
 .../haskell/lambdabot-utils/default.nix       | 19 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/lambdabot-utils/default.nix

diff --git a/pkgs/development/libraries/haskell/lambdabot-utils/default.nix b/pkgs/development/libraries/haskell/lambdabot-utils/default.nix
new file mode 100644
index 00000000000..9d2aa186264
--- /dev/null
+++ b/pkgs/development/libraries/haskell/lambdabot-utils/default.nix
@@ -0,0 +1,19 @@
+{ cabal, binary, haskellSrc, mtl, network, random, regexCompat
+, regexPosix, syb, tagsoup, utf8String, zlib
+}:
+
+cabal.mkDerivation (self: {
+  pname = "lambdabot-utils";
+  version = "4.2.1";
+  sha256 = "1a5rj8zjvfhziwldikgki92lg9bwv6h9ysp6yqip6lja18h4lilx";
+  buildDepends = [
+    binary haskellSrc mtl network random regexCompat regexPosix syb
+    tagsoup utf8String zlib
+  ];
+  meta = {
+    homepage = "http://haskell.org/haskellwiki/Lambdabot";
+    description = "Utility libraries for the advanced IRC bot, Lambdabot";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index e748d4400a0..faeb631834f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -969,6 +969,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   lambdabot = callPackage ../development/libraries/haskell/lambdabot/default.nix {};
 
+  lambdabotUtils = callPackage ../development/libraries/haskell/lambdabot-utils {};
+
   largeword = callPackage ../development/libraries/haskell/largeword {};
 
   lazysmallcheck = callPackage ../development/libraries/haskell/lazysmallcheck {};

From d972bae84fe5463b119e6408a0c8ec6dbe665a3e Mon Sep 17 00:00:00 2001
From: Dmitry Malikov <color404051h@gmail.com>
Date: Mon, 16 Jul 2012 21:59:10 +0200
Subject: [PATCH 40/76] Add haskell/logict

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

diff --git a/pkgs/development/libraries/haskell/logict/default.nix b/pkgs/development/libraries/haskell/logict/default.nix
new file mode 100644
index 00000000000..f67e82fbfa2
--- /dev/null
+++ b/pkgs/development/libraries/haskell/logict/default.nix
@@ -0,0 +1,14 @@
+{ cabal, mtl }:
+
+cabal.mkDerivation (self: {
+  pname = "logict";
+  version = "0.5.0.1";
+  sha256 = "0k3acw6fwhqz4qaz7k85fx5b43hwc926il0mljc69gjrgw0c8nzv";
+  buildDepends = [ mtl ];
+  meta = {
+    homepage = "http://code.haskell.org/~dolio/logict";
+    description = "A backtracking logic-programming monad";
+    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 faeb631834f..e13a98cbbd2 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -987,6 +987,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   logfloat = callPackage ../development/libraries/haskell/logfloat {};
 
+  logict = callPackage ../development/libraries/haskell/logict {};
+
   mathFunctions = callPackage ../development/libraries/haskell/math-functions {};
 
   mainlandPretty = callPackage ../development/libraries/haskell/mainland-pretty {};

From 67e105efd013f8ca5e980158e2b3d56cd3d138e0 Mon Sep 17 00:00:00 2001
From: Dmitry Malikov <color404051h@gmail.com>
Date: Mon, 16 Jul 2012 22:04:06 +0200
Subject: [PATCH 41/76] Add haskell/numbers

---
 .../libraries/haskell/numbers/default.nix           | 13 +++++++++++++
 pkgs/top-level/haskell-packages.nix                 |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/numbers/default.nix

diff --git a/pkgs/development/libraries/haskell/numbers/default.nix b/pkgs/development/libraries/haskell/numbers/default.nix
new file mode 100644
index 00000000000..6c9056e140f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/numbers/default.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "numbers";
+  version = "3000.0.0.0";
+  sha256 = "073xjrnbv6z16va2h3arlxq3z8kywb961dwh4jcm8g7w5m84b2xb";
+  meta = {
+    homepage = "https://github.com/DanBurton/numbers";
+    description = "Various number types";
+    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 e13a98cbbd2..fbdbbe6b251 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1080,6 +1080,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   NumInstances = callPackage ../development/libraries/haskell/NumInstances {};
 
+  numbers = callPackage ../development/libraries/haskell/numbers {};
+
   numtype = callPackage ../development/libraries/haskell/numtype {};
 
   OneTuple = callPackage ../development/libraries/haskell/OneTuple {};

From f3319f0cf6f7a306a11a5812c50f8636325f2b3c Mon Sep 17 00:00:00 2001
From: Dmitry Malikov <color404051h@gmail.com>
Date: Mon, 16 Jul 2012 22:06:53 +0200
Subject: [PATCH 42/76] Add haskell/oeis

---
 pkgs/development/libraries/haskell/oeis/default.nix | 13 +++++++++++++
 pkgs/top-level/haskell-packages.nix                 |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/oeis/default.nix

diff --git a/pkgs/development/libraries/haskell/oeis/default.nix b/pkgs/development/libraries/haskell/oeis/default.nix
new file mode 100644
index 00000000000..48692cd7edf
--- /dev/null
+++ b/pkgs/development/libraries/haskell/oeis/default.nix
@@ -0,0 +1,13 @@
+{ cabal, HTTP, network }:
+
+cabal.mkDerivation (self: {
+  pname = "oeis";
+  version = "0.3.1";
+  sha256 = "0kxs25b1z0b807vhrn8v7chsdsw8civqiym8767fy2rk5si0i4w2";
+  buildDepends = [ HTTP network ];
+  meta = {
+    description = "Interface to the Online Encyclopedia of Integer Sequences";
+    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 fbdbbe6b251..b1fef22aff5 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1088,6 +1088,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   ObjectName = callPackage ../development/libraries/haskell/ObjectName {};
 
+  oeis = callPackage ../development/libraries/haskell/oeis {};
+
   OpenAL = callPackage ../development/libraries/haskell/OpenAL {};
 
   OpenGL_2_2_1_1 = callPackage ../development/libraries/haskell/OpenGL/2.2.1.1.nix {};

From 0e8b4cd7addcb54325e4401a9d560084f5b7c1eb Mon Sep 17 00:00:00 2001
From: Dmitry Malikov <color404051h@gmail.com>
Date: Mon, 16 Jul 2012 22:09:27 +0200
Subject: [PATCH 43/76] Add haskell/show

---
 pkgs/development/libraries/haskell/show/default.nix | 13 +++++++++++++
 pkgs/top-level/haskell-packages.nix                 |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/show/default.nix

diff --git a/pkgs/development/libraries/haskell/show/default.nix b/pkgs/development/libraries/haskell/show/default.nix
new file mode 100644
index 00000000000..4700a8c17c8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/show/default.nix
@@ -0,0 +1,13 @@
+{ cabal, QuickCheck, random, smallcheck, syb }:
+
+cabal.mkDerivation (self: {
+  pname = "show";
+  version = "0.4.1.2";
+  sha256 = "1qaphxjaxng7d0kcn3vvxbvqljzzs1hvmsrdsm3pbi19qlsavd5w";
+  buildDepends = [ QuickCheck random smallcheck syb ];
+  meta = {
+    description = "'Show' instances for Lambdabot";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index b1fef22aff5..975871ec412 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1357,6 +1357,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   ShellacReadline = callPackage ../development/libraries/haskell/Shellac/Shellac-readline.nix {};
 
+  show = callPackage ../development/libraries/haskell/show {};
+
   SMTPClient = callPackage ../development/libraries/haskell/SMTPClient {};
 
   split = callPackage ../development/libraries/haskell/split {};

From d16ef6d18221e22392236d31eea1c495ac7d1e53 Mon Sep 17 00:00:00 2001
From: Dmitry Malikov <color404051h@gmail.com>
Date: Mon, 16 Jul 2012 22:12:01 +0200
Subject: [PATCH 44/76] Add haskell/unlambda

---
 .../libraries/haskell/unlambda/default.nix        | 15 +++++++++++++++
 pkgs/top-level/haskell-packages.nix               |  2 ++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/unlambda/default.nix

diff --git a/pkgs/development/libraries/haskell/unlambda/default.nix b/pkgs/development/libraries/haskell/unlambda/default.nix
new file mode 100644
index 00000000000..4bdc1183586
--- /dev/null
+++ b/pkgs/development/libraries/haskell/unlambda/default.nix
@@ -0,0 +1,15 @@
+{ cabal, mtl }:
+
+cabal.mkDerivation (self: {
+  pname = "unlambda";
+  version = "0.1";
+  sha256 = "0xmn5w5vza6z2i3fs2hv2jgmb1lyk918viknsx3lk36i1dbyivgi";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ mtl ];
+  meta = {
+    description = "Unlambda interpreter";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 975871ec412..e6c01fa40f9 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1471,6 +1471,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   unixCompat = callPackage ../development/libraries/haskell/unix-compat {};
 
+  unlambda = callPackage ../development/libraries/haskell/unlambda {};
+
   unorderedContainers = callPackage ../development/libraries/haskell/unordered-containers {};
 
   url = callPackage ../development/libraries/haskell/url {};

From 71be80e8e98d53788740fedfd50fa9fe5566979c Mon Sep 17 00:00:00 2001
From: Dmitry Malikov <color404051h@gmail.com>
Date: Mon, 16 Jul 2012 22:17:49 +0200
Subject: [PATCH 45/76] Some correctness

---
 pkgs/development/libraries/haskell/brainfuck/default.nix      | 3 +++
 .../libraries/haskell/{ => data-memocombinators}/default.nix  | 3 +++
 pkgs/top-level/haskell-packages.nix                           | 4 ++--
 3 files changed, 8 insertions(+), 2 deletions(-)
 rename pkgs/development/libraries/haskell/{ => data-memocombinators}/default.nix (94%)

diff --git a/pkgs/development/libraries/haskell/brainfuck/default.nix b/pkgs/development/libraries/haskell/brainfuck/default.nix
index 86a90f5d1b0..6501df58481 100644
--- a/pkgs/development/libraries/haskell/brainfuck/default.nix
+++ b/pkgs/development/libraries/haskell/brainfuck/default.nix
@@ -1,3 +1,5 @@
+{ cabal, mtl }:
+
 cabal.mkDerivation (self: {
   pname = "brainfuck";
   version = "0.1";
@@ -11,3 +13,4 @@ cabal.mkDerivation (self: {
     platforms = self.ghc.meta.platforms;
   };
 })
+
diff --git a/pkgs/development/libraries/haskell/default.nix b/pkgs/development/libraries/haskell/data-memocombinators/default.nix
similarity index 94%
rename from pkgs/development/libraries/haskell/default.nix
rename to pkgs/development/libraries/haskell/data-memocombinators/default.nix
index 1fb2118c363..d02cdab7110 100644
--- a/pkgs/development/libraries/haskell/default.nix
+++ b/pkgs/development/libraries/haskell/data-memocombinators/default.nix
@@ -1,3 +1,5 @@
+{ cabal, dataInttrie }:
+
 cabal.mkDerivation (self: {
   pname = "data-memocombinators";
   version = "0.4.3";
@@ -10,3 +12,4 @@ cabal.mkDerivation (self: {
     platforms = self.ghc.meta.platforms;
   };
 })
+
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index e6c01fa40f9..03eb341b699 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -473,7 +473,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   Boolean = callPackage ../development/libraries/haskell/Boolean {};
 
-  brainfuck = callPackage ../development/libraries/haskell/brainfuck/default.nix {};
+  brainfuck = callPackage ../development/libraries/haskell/brainfuck {};
 
   bson = callPackage ../development/libraries/haskell/bson {};
 
@@ -967,7 +967,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   languageHaskellExtract = callPackage ../development/libraries/haskell/language-haskell-extract {};
 
-  lambdabot = callPackage ../development/libraries/haskell/lambdabot/default.nix {};
+  lambdabot = callPackage ../development/libraries/haskell/lambdabot {};
 
   lambdabotUtils = callPackage ../development/libraries/haskell/lambdabot-utils {};
 

From c145369e3c20c04b576fa2c653c927f319b40e87 Mon Sep 17 00:00:00 2001
From: Dmitry Malikov <color404051h@gmail.com>
Date: Mon, 16 Jul 2012 22:20:06 +0200
Subject: [PATCH 46/76] Add haskell/dataInttrie

---
 .../libraries/haskell/data-inttrie/default.nix      | 13 +++++++++++++
 pkgs/top-level/haskell-packages.nix                 |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/data-inttrie/default.nix

diff --git a/pkgs/development/libraries/haskell/data-inttrie/default.nix b/pkgs/development/libraries/haskell/data-inttrie/default.nix
new file mode 100644
index 00000000000..6b5f013a709
--- /dev/null
+++ b/pkgs/development/libraries/haskell/data-inttrie/default.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "data-inttrie";
+  version = "0.0.7";
+  sha256 = "19d586p2pj38pirrkip9z6yxrdbpiqsbnczmnyvd8slndilqz0ip";
+  meta = {
+    homepage = "http://github.com/luqui/data-inttrie";
+    description = "A lazy, infinite trie of integers";
+    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 03eb341b699..50ad0496bbf 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -586,6 +586,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   dataenc = callPackage ../development/libraries/haskell/dataenc {};
 
+  dataInttrie = callPackage ../development/libraries/haskell/data-inttrie {};
+
   dataMemocombinators = callPackage ../development/libraries/haskell/data-memocombinators {};
 
   dataReify = callPackage ../development/libraries/haskell/data-reify {};

From 18c6e6c9d6290eb8ec4110eaddfa4b4af6fd9010 Mon Sep 17 00:00:00 2001
From: Dmitry Malikov <color404051h@gmail.com>
Date: Wed, 18 Jul 2012 08:56:41 +0200
Subject: [PATCH 47/76] Bump lambdabot version

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

diff --git a/pkgs/development/libraries/haskell/lambdabot/default.nix b/pkgs/development/libraries/haskell/lambdabot/default.nix
index 49fdf743e2a..2af512ef3ea 100644
--- a/pkgs/development/libraries/haskell/lambdabot/default.nix
+++ b/pkgs/development/libraries/haskell/lambdabot/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lambdabot";
-  version = "4.2.3.2";
-  sha256 = "0jy48s4z1yn0wiaxzi3pws7j9j4ih2vqr8gr8md2i35g4bwxmxp2";
+  version = "4.2.3.3";
+  sha256 = "1fxxmrm390pnqpf7v4kap2asaqh02sphl8r6inq4sdy1zs2rxrvk";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From a6bf9b8bdf9afc611eb85af4df7c8005101630c7 Mon Sep 17 00:00:00 2001
From: Andres Loeh <mail@andres-loeh.de>
Date: Wed, 18 Jul 2012 10:07:22 +0200
Subject: [PATCH 48/76] Add haskell-glpk-hs.

---
 .../libraries/haskell/glpk-hs/default.nix         | 15 +++++++++++++++
 pkgs/top-level/haskell-packages.nix               |  2 ++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/glpk-hs/default.nix

diff --git a/pkgs/development/libraries/haskell/glpk-hs/default.nix b/pkgs/development/libraries/haskell/glpk-hs/default.nix
new file mode 100644
index 00000000000..621a7e9c4c5
--- /dev/null
+++ b/pkgs/development/libraries/haskell/glpk-hs/default.nix
@@ -0,0 +1,15 @@
+{ cabal, deepseq, glpk, mtl }:
+
+cabal.mkDerivation (self: {
+  pname = "glpk-hs";
+  version = "0.3.2";
+  sha256 = "0y7imgzcnh6x36m5f6mns5ay1xhxy5p6i5nh16p2ywzjj0padcg8";
+  buildDepends = [ deepseq mtl ];
+  extraLibraries = [ glpk ];
+  meta = {
+    description = "Comprehensive GLPK linear programming bindings";
+    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 ddfbdac9469..141f02a27e5 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -730,6 +730,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     OpenGL = self.OpenGL25;
   };
 
+  glpkHs = callPackage ../development/libraries/haskell/glpk-hs {};
+
   GLURaw = callPackage ../development/libraries/haskell/GLURaw {};
 
   GLUT_2_1_1_2 = callPackage ../development/libraries/haskell/GLUT/2.1.1.2.nix {};

From 001fb53524b030427c0c0c5460910f667bd85e0a Mon Sep 17 00:00:00 2001
From: Andres Loeh <mail@andres-loeh.de>
Date: Wed, 18 Jul 2012 10:13:57 +0200
Subject: [PATCH 49/76] Revert "haskell-srcloc: update to version 0.2.0"

This reverts commit ffbdd377f15b2af032285345c1b4ed013e6ed953.

Version 0.2.0 breaks accelerate-cuda, and doesn't seem to be required
or used in many other places, so I'll just revert.
---
 pkgs/development/libraries/haskell/srcloc/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/srcloc/default.nix b/pkgs/development/libraries/haskell/srcloc/default.nix
index 007ce644be0..d76309bc795 100644
--- a/pkgs/development/libraries/haskell/srcloc/default.nix
+++ b/pkgs/development/libraries/haskell/srcloc/default.nix
@@ -1,10 +1,10 @@
-{ cabal, syb }:
+{ cabal, syb, symbol }:
 
 cabal.mkDerivation (self: {
   pname = "srcloc";
-  version = "0.2.0";
-  sha256 = "1p63gachz8ccv61ih3jb995kcg72g7vkihryb2ak7d8bxxxx3irs";
-  buildDepends = [ syb ];
+  version = "0.1.2";
+  sha256 = "08awipz6al7jk7d974am5v9fkp87i5dy6d457mx1rv7lczlyhws9";
+  buildDepends = [ syb symbol ];
   meta = {
     homepage = "http://www.eecs.harvard.edu/~mainland/";
     description = "Data types for managing source code locations";

From fe4677de2f87af7b9617488b4846cc36639b4907 Mon Sep 17 00:00:00 2001
From: Andres Loeh <mail@andres-loeh.de>
Date: Wed, 18 Jul 2012 10:15:55 +0200
Subject: [PATCH 50/76] Revert "haskell-mainland-pretty: update to version
 0.2.1"

This reverts commit 8e85516e045149a6bbd9e09020df9ceb255a75a5.

This depends on srcloc-2, and srcloc-2 breaks accelerate-cuda.
---
 .../libraries/haskell/mainland-pretty/default.nix         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/mainland-pretty/default.nix b/pkgs/development/libraries/haskell/mainland-pretty/default.nix
index 221a69fa7da..d64a6c76180 100644
--- a/pkgs/development/libraries/haskell/mainland-pretty/default.nix
+++ b/pkgs/development/libraries/haskell/mainland-pretty/default.nix
@@ -1,10 +1,10 @@
-{ cabal, srcloc, text }:
+{ cabal, srcloc, symbol }:
 
 cabal.mkDerivation (self: {
   pname = "mainland-pretty";
-  version = "0.2.1";
-  sha256 = "1pl96m92bsrghkp5ixaqlhi2hybc4hafy64zlmsgjlmdvslxhs3h";
-  buildDepends = [ srcloc text ];
+  version = "0.1.3.0";
+  sha256 = "1grfsn066z11737dxdk1bdhyvz9vjxxn6krfgx9bc8jin6n9h6aq";
+  buildDepends = [ srcloc symbol ];
   meta = {
     homepage = "http://www.eecs.harvard.edu/~mainland/";
     description = "Pretty printing designed for printing source code";

From c432af3932624d0e9b616262d9aa75c577ce0ec0 Mon Sep 17 00:00:00 2001
From: Andres Loeh <mail@andres-loeh.de>
Date: Wed, 18 Jul 2012 10:17:57 +0200
Subject: [PATCH 51/76] Revert "haskell-language-c-quote: update to version
 0.4.0"

This reverts commit 3be2d8d9cd3fc765c98d4a517e082d40aee07134.

Depends on recent version of mainland-pretty, which in turn depends on
srcloc-2 which in turns breaks accelerate-cuda.
---
 .../libraries/haskell/language-c-quote/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix
index 503fa8f561f..a765b015a31 100644
--- a/pkgs/development/libraries/haskell/language-c-quote/default.nix
+++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "language-c-quote";
-  version = "0.4.0";
-  sha256 = "1qbl81c8fw2gz96n8505yxhw1d3zhxq436ikv173x1zz0b4z26g1";
+  version = "0.3.2";
+  sha256 = "1pxrag9ws93rsqrsxcyxg07pvp2qw0f19yj2b40ynwzk112nkd16";
   buildDepends = [
     exceptionMtl exceptionTransformers filepath haskellSrcMeta
     mainlandPretty mtl srcloc syb symbol

From 83505f15b21e953cd8f863d9209d83c2a15d9af0 Mon Sep 17 00:00:00 2001
From: Andres Loeh <mail@andres-loeh.de>
Date: Wed, 18 Jul 2012 11:02:00 +0200
Subject: [PATCH 52/76] ghc-head: bump snapshot version

---
 pkgs/development/compilers/ghc/head.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 3db488737c3..566e7d80f86 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, ghc, perl, gmp, ncurses }:
 
 stdenv.mkDerivation rec {
-  version = "7.5.20120706";
+  version = "7.5.20120714";
 
   name = "ghc-${version}";
 
   src = fetchurl {
     url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2";
-    sha256 = "196aghpgzf5k47l603fynxxjjkkk5f6y2cylxv3skavvd1g16bs2";
+    sha256 = "02jicyqqr18yixf970f1rfrn64bm528aig6s9566galji063p6ah";
   };
 
   buildInputs = [ ghc perl gmp ncurses ];

From 3fbd694d7df69747afbffbfcd6ccbd21544eae3d Mon Sep 17 00:00:00 2001
From: Andres Loeh <mail@andres-loeh.de>
Date: Wed, 18 Jul 2012 11:18:15 +0200
Subject: [PATCH 53/76] Try to cut recursion depth in uniqList and
 closePropagation.

---
 pkgs/lib/misc.nix | 43 +++++++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/pkgs/lib/misc.nix b/pkgs/lib/misc.nix
index d3b236f73e5..17771e1ca7b 100644
--- a/pkgs/lib/misc.nix
+++ b/pkgs/lib/misc.nix
@@ -158,14 +158,15 @@ rec {
         (tail x))))) condList)) ;
         
 
-  # !!! This function has O(n^2) performance, so you probably don't want to use it!
-  uniqList = {inputList, outputList ? []}:
-        if (inputList == []) then outputList else
-        let x=head inputList; 
-        newOutputList = outputList ++
-         (if elem x outputList then [] else [x]);
-        in uniqList {outputList=newOutputList; 
-                inputList = (tail inputList);};
+  # This function has O(n^2) performance.
+  uniqList = {inputList, acc ? []} :
+    let go = xs : acc :
+             if xs == []
+             then []
+             else let x = head xs;
+                      y = if elem x acc then [] else [x];
+                  in go (y ++ tail xs) (y ++ acc);
+    in go inputList acc;
 
   uniqListExt = {inputList, outputList ? [],
     getter ? (x : x), compare ? (x: y: x==y)}:
@@ -214,16 +215,22 @@ rec {
   modifySumArgs = f: x: innerModifySumArgs f x {};
 
 
-  innerClosePropagation = ready: list: if list == [] then ready else
-    if ! isAttrs (head list) then
-      /* builtins.trace ("not an attrSet: ${lib.showVal (head list)}") */
-        innerClosePropagation ready (tail list)
-    else
-      innerClosePropagation 
-        (ready ++ [(head list)])
-        ((tail list) 
-           ++ (maybeAttrNullable "propagatedBuildInputs" [] (head list))
-           ++ (maybeAttrNullable "propagatedBuildNativeInputs" [] (head list)));
+  innerClosePropagation = acc : xs :
+    if xs == []
+    then acc
+    else let y  = head xs;
+             ys = tail xs;
+         in if ! isAttrs y
+            then innerClosePropagation acc ys
+            else let acc' = [y] ++ acc;
+                 in innerClosePropagation
+                      acc'
+                      (uniqList { inputList = (maybeAttrNullable "propagatedBuildInputs" [] y)
+                                           ++ (maybeAttrNullable "propagatedBuildNativeInputs" [] y)
+                                           ++ ys;
+                                  acc = acc';
+                                }
+                      );
 
   closePropagation = list: (uniqList {inputList = (innerClosePropagation [] list);});
 

From 3c167d03400a17a67641004d993972337ab6a011 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jul 2012 11:35:08 +0200
Subject: [PATCH 54/76] Add meta.maintainer to Haskell packages.

---
 pkgs/development/libraries/haskell/IOSpec/default.nix           | 1 +
 pkgs/development/libraries/haskell/brainfuck/default.nix        | 2 +-
 pkgs/development/libraries/haskell/data-inttrie/default.nix     | 1 +
 .../libraries/haskell/data-memocombinators/default.nix          | 2 +-
 pkgs/development/libraries/haskell/lambdabot-utils/default.nix  | 1 +
 pkgs/development/libraries/haskell/lambdabot/default.nix        | 1 +
 pkgs/development/libraries/haskell/logict/default.nix           | 1 +
 pkgs/development/libraries/haskell/numbers/default.nix          | 1 +
 pkgs/development/libraries/haskell/oeis/default.nix             | 1 +
 pkgs/development/libraries/haskell/show/default.nix             | 1 +
 pkgs/development/libraries/haskell/unlambda/default.nix         | 1 +
 11 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/IOSpec/default.nix b/pkgs/development/libraries/haskell/IOSpec/default.nix
index 46211614c4c..84b5f6fe610 100644
--- a/pkgs/development/libraries/haskell/IOSpec/default.nix
+++ b/pkgs/development/libraries/haskell/IOSpec/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "A pure specification of the IO monad";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/brainfuck/default.nix b/pkgs/development/libraries/haskell/brainfuck/default.nix
index 6501df58481..a406d1fa500 100644
--- a/pkgs/development/libraries/haskell/brainfuck/default.nix
+++ b/pkgs/development/libraries/haskell/brainfuck/default.nix
@@ -11,6 +11,6 @@ cabal.mkDerivation (self: {
     description = "Brainfuck interpreter";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
-
diff --git a/pkgs/development/libraries/haskell/data-inttrie/default.nix b/pkgs/development/libraries/haskell/data-inttrie/default.nix
index 6b5f013a709..926d465065d 100644
--- a/pkgs/development/libraries/haskell/data-inttrie/default.nix
+++ b/pkgs/development/libraries/haskell/data-inttrie/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "A lazy, infinite trie of integers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/data-memocombinators/default.nix b/pkgs/development/libraries/haskell/data-memocombinators/default.nix
index d02cdab7110..25f063c20ac 100644
--- a/pkgs/development/libraries/haskell/data-memocombinators/default.nix
+++ b/pkgs/development/libraries/haskell/data-memocombinators/default.nix
@@ -10,6 +10,6 @@ cabal.mkDerivation (self: {
     description = "Combinators for building memo tables";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
-
diff --git a/pkgs/development/libraries/haskell/lambdabot-utils/default.nix b/pkgs/development/libraries/haskell/lambdabot-utils/default.nix
index 9d2aa186264..3339e7aa96d 100644
--- a/pkgs/development/libraries/haskell/lambdabot-utils/default.nix
+++ b/pkgs/development/libraries/haskell/lambdabot-utils/default.nix
@@ -15,5 +15,6 @@ cabal.mkDerivation (self: {
     description = "Utility libraries for the advanced IRC bot, Lambdabot";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/lambdabot/default.nix b/pkgs/development/libraries/haskell/lambdabot/default.nix
index 2af512ef3ea..926c5acafba 100644
--- a/pkgs/development/libraries/haskell/lambdabot/default.nix
+++ b/pkgs/development/libraries/haskell/lambdabot/default.nix
@@ -22,5 +22,6 @@ cabal.mkDerivation (self: {
     description = "Lambdabot is a development tool and advanced IRC bot";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/logict/default.nix b/pkgs/development/libraries/haskell/logict/default.nix
index f67e82fbfa2..4e67e4ffb4c 100644
--- a/pkgs/development/libraries/haskell/logict/default.nix
+++ b/pkgs/development/libraries/haskell/logict/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "A backtracking logic-programming monad";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/numbers/default.nix b/pkgs/development/libraries/haskell/numbers/default.nix
index 6c9056e140f..8b57b3d7e96 100644
--- a/pkgs/development/libraries/haskell/numbers/default.nix
+++ b/pkgs/development/libraries/haskell/numbers/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Various number types";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/oeis/default.nix b/pkgs/development/libraries/haskell/oeis/default.nix
index 48692cd7edf..c8b9e984eb1 100644
--- a/pkgs/development/libraries/haskell/oeis/default.nix
+++ b/pkgs/development/libraries/haskell/oeis/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Interface to the Online Encyclopedia of Integer Sequences";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/show/default.nix b/pkgs/development/libraries/haskell/show/default.nix
index 4700a8c17c8..7fe0013d0d2 100644
--- a/pkgs/development/libraries/haskell/show/default.nix
+++ b/pkgs/development/libraries/haskell/show/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "'Show' instances for Lambdabot";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/unlambda/default.nix b/pkgs/development/libraries/haskell/unlambda/default.nix
index 4bdc1183586..c0cfc72bd9e 100644
--- a/pkgs/development/libraries/haskell/unlambda/default.nix
+++ b/pkgs/development/libraries/haskell/unlambda/default.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "Unlambda interpreter";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })

From f3aa34893691cc518d0d8a80a7fb5834d94eef5c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jul 2012 11:43:33 +0200
Subject: [PATCH 55/76] haskell-benchpress: fix build with modern versions of
 GHC

---
 pkgs/development/libraries/haskell/benchpress/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/haskell/benchpress/default.nix b/pkgs/development/libraries/haskell/benchpress/default.nix
index 8be4478ce63..9d1720541bf 100644
--- a/pkgs/development/libraries/haskell/benchpress/default.nix
+++ b/pkgs/development/libraries/haskell/benchpress/default.nix
@@ -5,6 +5,9 @@ cabal.mkDerivation (self: {
   version = "0.2.2.4";
   sha256 = "0cabjx0gkbk5blqkm9pmnz8kmi3573367365gny4r3m431iwxgnf";
   buildDepends = [ mtl time ];
+  patchPhase = ''
+    sed -i -e 's|base .*,|base,|' -e 's|mtl .*,|mtl,|' benchpress.cabal
+  '';
   meta = {
     homepage = "http://github.com/tibbe/benchpress";
     description = "Micro-benchmarking with detailed statistics";

From 11e260ec74edd60e90354748cc2c1868b3ab4ff2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jul 2012 11:43:43 +0200
Subject: [PATCH 56/76] haskell-language-c-quote: update to version 0.4.0

---
 .../libraries/haskell/language-c-quote/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix
index a765b015a31..503fa8f561f 100644
--- a/pkgs/development/libraries/haskell/language-c-quote/default.nix
+++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "language-c-quote";
-  version = "0.3.2";
-  sha256 = "1pxrag9ws93rsqrsxcyxg07pvp2qw0f19yj2b40ynwzk112nkd16";
+  version = "0.4.0";
+  sha256 = "1qbl81c8fw2gz96n8505yxhw1d3zhxq436ikv173x1zz0b4z26g1";
   buildDepends = [
     exceptionMtl exceptionTransformers filepath haskellSrcMeta
     mainlandPretty mtl srcloc syb symbol

From 0ed4ac39b6a6c3f031eb00762bf181abb4fbfb8c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jul 2012 11:43:43 +0200
Subject: [PATCH 57/76] haskell-mainland-pretty: update to version 0.2.1

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

diff --git a/pkgs/development/libraries/haskell/mainland-pretty/default.nix b/pkgs/development/libraries/haskell/mainland-pretty/default.nix
index d64a6c76180..221a69fa7da 100644
--- a/pkgs/development/libraries/haskell/mainland-pretty/default.nix
+++ b/pkgs/development/libraries/haskell/mainland-pretty/default.nix
@@ -1,10 +1,10 @@
-{ cabal, srcloc, symbol }:
+{ cabal, srcloc, text }:
 
 cabal.mkDerivation (self: {
   pname = "mainland-pretty";
-  version = "0.1.3.0";
-  sha256 = "1grfsn066z11737dxdk1bdhyvz9vjxxn6krfgx9bc8jin6n9h6aq";
-  buildDepends = [ srcloc symbol ];
+  version = "0.2.1";
+  sha256 = "1pl96m92bsrghkp5ixaqlhi2hybc4hafy64zlmsgjlmdvslxhs3h";
+  buildDepends = [ srcloc text ];
   meta = {
     homepage = "http://www.eecs.harvard.edu/~mainland/";
     description = "Pretty printing designed for printing source code";

From bf195b742e4a3acbd3119c9b80c2707a3054ad9b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jul 2012 11:43:44 +0200
Subject: [PATCH 58/76] haskell-srcloc: update to version 0.2.0

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

diff --git a/pkgs/development/libraries/haskell/srcloc/default.nix b/pkgs/development/libraries/haskell/srcloc/default.nix
index d76309bc795..b4e212f89b2 100644
--- a/pkgs/development/libraries/haskell/srcloc/default.nix
+++ b/pkgs/development/libraries/haskell/srcloc/default.nix
@@ -1,10 +1,11 @@
-{ cabal, syb, symbol }:
+{ cabal, syb }:
 
 cabal.mkDerivation (self: {
   pname = "srcloc";
-  version = "0.1.2";
-  sha256 = "08awipz6al7jk7d974am5v9fkp87i5dy6d457mx1rv7lczlyhws9";
-  buildDepends = [ syb symbol ];
+  version = "0.2.0";
+  sha256 = "1p63gachz8ccv61ih3jb995kcg72g7vkihryb2ak7d8bxxxx3irs";
+  buildDepends = [ syb ];
+  noHaddock = true;
   meta = {
     homepage = "http://www.eecs.harvard.edu/~mainland/";
     description = "Data types for managing source code locations";

From 597da0864656fcc116341ed7179b255a01550bd3 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 18 Jul 2012 12:42:33 +0200
Subject: [PATCH 59/76] Pass docutils from pythonPackages to mercurial

---
 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 16dea4ceb66..1bafd16fbc0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7100,7 +7100,7 @@ let
   mcomix = callPackage ../applications/graphics/mcomix { };
 
   mercurial = callPackage ../applications/version-management/mercurial {
-    inherit (pythonPackages) curses;
+    inherit (pythonPackages) curses docutils;
     guiSupport = false;		# use mercurialFull to get hgk GUI
   };
 

From b6325a72135b875de86e25b7f1e6069349d6e3aa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jul 2012 12:44:34 +0200
Subject: [PATCH 60/76] tbb: add version 4.0-u5

---
 pkgs/development/libraries/tbb/default.nix | 41 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/libraries/tbb/default.nix

diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix
new file mode 100644
index 00000000000..13ec42f1ba2
--- /dev/null
+++ b/pkgs/development/libraries/tbb/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "tbb-4.0-u5";
+
+  src = fetchurl {
+    url = "http://threadingbuildingblocks.org/uploads/77/187/4.0%20update%205/tbb40_20120613oss_src.tgz";
+    sha256 = "aaa98146049e55f6ac969298340eeb49df61395403fcc1480824a4ecd0d46192";
+  };
+
+  checkTarget = "test";
+  doCheck = false;
+
+  installPhase = ''
+    mkdir -p $out/{lib,share/doc}
+    cp "build/"*release*"/"*so* $out/lib/
+    mv include $out/
+    rm $out/include/index.html
+    mv doc/html $out/share/doc/tbb
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = "http://threadingbuildingblocks.org/";
+    description = "Intel Thread Building Blocks C++ Library";
+    license = "LGPLv3+";
+
+    longDescription = ''
+      Intel Threading Building Blocks offers a rich and complete approach to
+      expressing parallelism in a C++ program. It is a library that helps you
+      take advantage of multi-core processor performance without having to be a
+      threading expert. Intel TBB is not just a threads-replacement library. It
+      represents a higher-level, task-based parallelism that abstracts platform
+      details and threading mechanisms for scalability and performance.
+    '';
+
+    maintainers = [ stdenv.lib.maintainers.simons ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1bafd16fbc0..a17b51d39c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2522,6 +2522,8 @@ let
 
   swiProlog = callPackage ../development/compilers/swi-prolog { };
 
+  tbb = callPackage ../development/libraries/tbb { };
+
   tinycc = callPackage ../development/compilers/tinycc { };
 
   urweb = callPackage ../development/compilers/urweb { };

From 5b0edeb003404f3cd208c1c65ba9b74ad182551b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jul 2012 14:37:01 +0200
Subject: [PATCH 61/76] haskell-HUnit: add version 1.2.5.0

---
 .../libraries/haskell/HUnit/1.2.5.0.nix           | 15 +++++++++++++++
 pkgs/top-level/haskell-packages.nix               |  5 +++--
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/HUnit/1.2.5.0.nix

diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.5.0.nix b/pkgs/development/libraries/haskell/HUnit/1.2.5.0.nix
new file mode 100644
index 00000000000..cf5a68b803c
--- /dev/null
+++ b/pkgs/development/libraries/haskell/HUnit/1.2.5.0.nix
@@ -0,0 +1,15 @@
+{ cabal, deepseq }:
+
+cabal.mkDerivation (self: {
+  pname = "HUnit";
+  version = "1.2.5.0";
+  sha256 = "0yxa3clrrjwg9faa3vsqb44xdzhdgwji56lrh7sa7dgq8bv1h6nr";
+  buildDepends = [ deepseq ];
+  meta = {
+    homepage = "http://hunit.sourceforge.net/";
+    description = "A unit testing framework for Haskell";
+    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 c5fed94209a..34144c3237d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -126,7 +126,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     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_3;          # 7.5 ok
-    HUnit        = self.HUnit_1_2_4_3;          # 7.5 ok
+    HUnit        = self.HUnit_1_2_5_0;          # 7.5 ok
     mtl          = self.mtl_2_1_2;              # 7.5 ok
     network      = self.network_2_3_0_14;       # 7.5 ok
     OpenGL       = self.OpenGL_2_2_3_1;         # 7.5 fail
@@ -916,7 +916,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   HUnit_1_2_2_3 = callPackage ../development/libraries/haskell/HUnit/1.2.2.3.nix {};
   HUnit_1_2_4_2 = callPackage ../development/libraries/haskell/HUnit/1.2.4.2.nix {};
   HUnit_1_2_4_3 = callPackage ../development/libraries/haskell/HUnit/1.2.4.3.nix {};
-  HUnit = self.HUnit_1_2_4_3;
+  HUnit_1_2_5_0 = callPackage ../development/libraries/haskell/HUnit/1.2.5.0.nix {};
+  HUnit = self.HUnit_1_2_5_0;
 
   hxt = callPackage ../development/libraries/haskell/hxt {};
 

From 05952b2e37911b272f16ce5e9d1fcf278f312919 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jul 2012 14:37:07 +0200
Subject: [PATCH 62/76] haskell-Hipmunk: update to version 5.2.0.10

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

diff --git a/pkgs/development/libraries/haskell/Hipmunk/default.nix b/pkgs/development/libraries/haskell/Hipmunk/default.nix
index 770bfa27515..fee71449142 100644
--- a/pkgs/development/libraries/haskell/Hipmunk/default.nix
+++ b/pkgs/development/libraries/haskell/Hipmunk/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Hipmunk";
-  version = "5.2.0.9";
-  sha256 = "0c0s5spsyp67ajfzck8f29px2xid8aiws12l3dswvp50d74a9mlq";
+  version = "5.2.0.10";
+  sha256 = "0kq6dlx1g7dra7nsfmrc13yvnl7wh00fadmgln9v2vyf0ww82x95";
   buildDepends = [ StateVar transformers ];
   meta = {
     homepage = "http://patch-tag.com/r/felipe/hipmunk/home";

From 24f7a2b72bb6484690180def975e051e701a25b1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jul 2012 14:37:08 +0200
Subject: [PATCH 63/76] haskell-hslogger-template: update to version 2.0.1

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

diff --git a/pkgs/development/libraries/haskell/hslogger-template/default.nix b/pkgs/development/libraries/haskell/hslogger-template/default.nix
index 5351bbb1777..a7b1a51b705 100644
--- a/pkgs/development/libraries/haskell/hslogger-template/default.nix
+++ b/pkgs/development/libraries/haskell/hslogger-template/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hslogger-template";
-  version = "2.0.0";
-  sha256 = "1x8c132ckxjhnhlrnm92h0hkalkrgcc91cn73kv9kvcwy9b2fqcr";
+  version = "2.0.1";
+  sha256 = "1m8h4i8cxxw83vhbw61njvv86qdcff6zi3bf0nyhc4cq7pfrzqvj";
   buildDepends = [ hslogger mtl ];
   meta = {
     description = "Automatic generation of hslogger functions";

From b9b5a8d7c1a6d841e5012f106e1b5f798bba9ce7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 18 Jul 2012 09:21:33 -0400
Subject: [PATCH 64/76] Fix btrfs-progs build

http://hydra.nixos.org/build/2842473
---
 pkgs/tools/filesystems/btrfsprogs/default.nix | 49 ++++++-------------
 pkgs/top-level/all-packages.nix               |  4 +-
 2 files changed, 15 insertions(+), 38 deletions(-)

diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix
index 75f155fd0dd..861bacd46c2 100644
--- a/pkgs/tools/filesystems/btrfsprogs/default.nix
+++ b/pkgs/tools/filesystems/btrfsprogs/default.nix
@@ -1,45 +1,24 @@
-a :
-let
-  fetchurl = a.fetchurl;
-  fetchgit = a.fetchgit;
+{ stdenv, fetchgit, zlib, libuuid, acl, attr, e2fsprogs }:
 
-  version = a.lib.attrByPath ["version"] "0.19-20120328" a;
-  buildInputs = with a; [
-    zlib libuuid acl attr e2fsprogs
-  ];
-in
+let version = "0.19-20120328"; in
 
-assert a.libuuid != null;
+stdenv.mkDerivation {
+  name = "btrfs-progs-${version}";
 
-rec {
-  srcDrv = fetchgit {
-    url="git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git" ;
-    rev="1957076ab4fefa47b6efed3da541bc974c83eed7";
-    sha256="566d863c5500652e999d0d6b823365fb06f2f8f9523e65e69eaa3e993e9b26e1";
+  src = fetchgit {
+    url = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git";
+    rev = "1957076ab4fefa47b6efed3da541bc974c83eed7";
+    sha256 = "566d863c5500652e999d0d6b823365fb06f2f8f9523e65e69eaa3e993e9b26e1";
   };
 
-  src = srcDrv + "/";
+  buildInputs = [ zlib libuuid acl attr e2fsprogs ];
 
-  inherit buildInputs;
-  configureFlags = [];
-  makeFlags = ["prefix=$out CFLAGS=-Os"];
+  makeFlags = "prefix=$(out)";
 
-  patches = [];
-  phaseNames = ["fixMakefile" "doEnsureBtrfsImage" "doMakeInstall"];
-
-  fixMakefile = a.fullDepEntry ''
-    sed -e 's@^progs = @progs=@g' -i Makefile
-  '' ["minInit" "doUnpack"];
-
-  doEnsureBtrfsImage = a.fullDepEntry (''
-    if ! grep 'progs = ' Makefile | grep btrfs-image; then
-      sed -e 's/progs = \(.*\)\\/progs = \1btrfs-image \\/' -i Makefile
-    fi
-  '') ["minInit" "doUnpack"];
-
-  name = "btrfs-progs-" + version;
   meta = {
-    description = "BTRFS utilities";
-    maintainers = [a.lib.maintainers.raskin];
+    description = "Utilities for the btrfs filesystem";
+    homepage = https://btrfs.wiki.kernel.org/;
+    maintainers = [ stdenv.lib.maintainers.raskin ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a17b51d39c5..f90e19ac50a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -441,9 +441,7 @@ let
 
   bsod = callPackage ../misc/emulators/bsod { };
 
-  btrfsProgs = builderDefsPackage (import ../tools/filesystems/btrfsprogs) {
-    inherit (pkgs) libuuid zlib acl attr fetchgit e2fsprogs;
-  };
+  btrfsProgs = callPackage ../tools/filesystems/btrfsprogs { };
 
   catdoc = callPackage ../tools/text/catdoc { };
 

From 26fa2425c622ea33606ce52c9d466adca23b3363 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 18 Jul 2012 09:25:58 -0400
Subject: [PATCH 65/76] Fix dmraid build

http://hydra.nixos.org/build/2842473
---
 pkgs/os-specific/linux/dmraid/default.nix     | 37 ++++++++-----------
 .../linux/dmraid/src-for-default.nix          |  9 -----
 .../linux/dmraid/src-info-for-default.nix     |  6 ---
 pkgs/top-level/all-packages.nix               |  4 +-
 4 files changed, 16 insertions(+), 40 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/dmraid/src-for-default.nix
 delete mode 100644 pkgs/os-specific/linux/dmraid/src-info-for-default.nix

diff --git a/pkgs/os-specific/linux/dmraid/default.nix b/pkgs/os-specific/linux/dmraid/default.nix
index aa78a517196..35efa8533ab 100644
--- a/pkgs/os-specific/linux/dmraid/default.nix
+++ b/pkgs/os-specific/linux/dmraid/default.nix
@@ -1,33 +1,26 @@
-a :  
-let 
-  s = import ./src-for-default.nix;
-  buildInputs = with a; [
-    devicemapper
-  ];
-in
-rec {
-  src = a.fetchUrlFromSrcInfo s;
+{ stdenv, fetchurl, devicemapper }:
 
-  inherit (s) name;
-  inherit buildInputs;
-  configureFlags = [];
+stdenv.mkDerivation rec {
+  name = "dmraid-1.0.0.rc15";
+
+  src = fetchurl {
+    url = "http://people.redhat.com/~heinzm/sw/dmraid/src/old/${name}.tar.bz2";
+    sha256 = "01bcaq0sc329ghgj7f182xws7jgjpdc41bvris8fsiprnxc7511h";
+  };
+
+  preConfigure = "cd */";
+
+  buildInputs = [ devicemapper ];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-  goSrcDir = "cd */";
-      
   meta = {
-    description = "Old-style RAID configuration utility.";
+    description = "Old-style RAID configuration utility";
     longDescritipn = ''
       Old RAID configuration utility (still under development, though).
       It is fully compatible with modern kernels and mdadm recognizes
       its volumes. May be needed for rescuing an older system or nuking
       the metadata when reformatting.
     '';
-    maintainers = [
-      a.lib.maintainers.raskin
-    ];
-    platforms = with a.lib.platforms; 
-      linux;
+    maintainers = [ stdenv.lib.maintainers.raskin ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/dmraid/src-for-default.nix b/pkgs/os-specific/linux/dmraid/src-for-default.nix
deleted file mode 100644
index b8f29ce4b5c..00000000000
--- a/pkgs/os-specific/linux/dmraid/src-for-default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-rec {
-   version="1.0.0.rc15";
-   name="dmraid-1.0.0.rc15";
-   hash="01bcaq0sc329ghgj7f182xws7jgjpdc41bvris8fsiprnxc7511h";
-   url="http://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-${version}.tar.bz2";
-   advertisedUrl="http://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-1.0.0.rc15.tar.bz2";
-  
-  
-}
diff --git a/pkgs/os-specific/linux/dmraid/src-info-for-default.nix b/pkgs/os-specific/linux/dmraid/src-info-for-default.nix
deleted file mode 100644
index 12c4ab1e9a7..00000000000
--- a/pkgs/os-specific/linux/dmraid/src-info-for-default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  downloadPage = "http://people.redhat.com/~heinzm/sw/dmraid/src/old/?C=M;O=D";
-  baseName = "dmraid";
-  sourceRegexp = "^.*[.]tar[.]bz2\$";
-  versionExtractorSedScript = ''s/.*-(.*)[.]tar[.]bz2/\1/'';
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f90e19ac50a..1be0f1c38f5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5445,9 +5445,7 @@ let
     inherit (xlibs) xproto;
   };
 
-  dmraid = builderDefsPackage ../os-specific/linux/dmraid {
-    inherit devicemapper;
-  };
+  dmraid = callPackage ../os-specific/linux/dmraid { };
 
   drbd = callPackage ../os-specific/linux/drbd { };
 

From cca94ee05e5c3bc765bf838782a52ad0af4c030e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jul 2012 15:37:06 +0200
Subject: [PATCH 66/76] lhs2tex: remove myself as maintainer

---
 pkgs/tools/typesetting/lhs2tex/default.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/tools/typesetting/lhs2tex/default.nix b/pkgs/tools/typesetting/lhs2tex/default.nix
index a78feaadb18..5ac339e92ec 100644
--- a/pkgs/tools/typesetting/lhs2tex/default.nix
+++ b/pkgs/tools/typesetting/lhs2tex/default.nix
@@ -18,10 +18,6 @@ cabal.mkDerivation (self: {
     description = "Preprocessor for typesetting Haskell sources with LaTeX";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
-

From 5750566c2af11d31a705fb687cf6a0ce300b5252 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 18 Jul 2012 09:49:27 -0400
Subject: [PATCH 67/76] Fix Pyrex build

---
 pkgs/development/interpreters/pyrex/0.9.5.nix | 29 +++++++------------
 pkgs/development/interpreters/pyrex/0.9.6.nix | 29 +++++++------------
 2 files changed, 22 insertions(+), 36 deletions(-)

diff --git a/pkgs/development/interpreters/pyrex/0.9.5.nix b/pkgs/development/interpreters/pyrex/0.9.5.nix
index 5ba57dbc1ea..3f6a3c1bfcb 100644
--- a/pkgs/development/interpreters/pyrex/0.9.5.nix
+++ b/pkgs/development/interpreters/pyrex/0.9.5.nix
@@ -1,26 +1,19 @@
-{ stdenv, fetchurl, builderDefs, python }:
+{ stdenv, fetchurl, pythonPackages }:
 
-let
+let version = "0.9.5.1.1"; in
 
-  localDefs = builderDefs.passthru.function {
+pythonPackages.buildPythonPackage rec {
+  name = "pyrex-${version}";
 
-    src = fetchurl {
-      url = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-0.9.5.1.1.tar.gz;
-      sha256 = "0lxxvn4mjfb83swcbqb5908q4iy53w4ip5i0f9angm2va1jyhd3z";
-    };
+  src = fetchurl {
+    url = "http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz";
+    sha256 = "0lxxvn4mjfb83swcbqb5908q4iy53w4ip5i0f9angm2va1jyhd3z";
+  };
 
-    buildInputs = [python];
+  doCheck = false;
 
-  }; 
-
-in with localDefs;
-        
-stdenv.mkDerivation rec {
-  name = "pyrex-0.9.5.1.1";
-  builder = writeScript (name + "-builder")
-    (textClosure localDefs [installPythonPackage doForceShare]);
   meta = {
-    description = "Python package compiler or something like that";
-    inherit src;
+    homepage = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/;
+    description = "A language for writing Python extension modules";
   };
 }
diff --git a/pkgs/development/interpreters/pyrex/0.9.6.nix b/pkgs/development/interpreters/pyrex/0.9.6.nix
index cd233415615..44e014322ff 100644
--- a/pkgs/development/interpreters/pyrex/0.9.6.nix
+++ b/pkgs/development/interpreters/pyrex/0.9.6.nix
@@ -1,26 +1,19 @@
-{ stdenv, fetchurl, builderDefs, python }:
+{ stdenv, fetchurl, pythonPackages }:
 
-let
+let version = "0.9.6.4"; in
 
-  localDefs = builderDefs.passthru.function {
-
-    src = fetchurl {
-      url = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-0.9.6.4.tar.gz;
-      sha256 = "18pd9f8al3l6i27cc0ddhgg7hxf28lnfs75x4a8jzscydxgiq5a8";
-    };
-
-    buildInputs = [python];
+pythonPackages.buildPythonPackage rec {
+  name = "pyrex-${version}";
 
+  src = fetchurl {
+    url = "http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz";
+    sha256 = "18pd9f8al3l6i27cc0ddhgg7hxf28lnfs75x4a8jzscydxgiq5a8";
   };
 
-in with localDefs;
-        
-stdenv.mkDerivation rec {
-  name = "pyrex-0.9.6.4";
-  builder = writeScript (name + "-builder")
-    (textClosure localDefs [installPythonPackage doForceShare]);
+  doCheck = false;
+
   meta = {
-    description = "Python package compiler or something like that";
-    inherit src;
+    homepage = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/;
+    description = "A language for writing Python extension modules";
   };
 }

From bdc0530f93b757a1e22eb73a567665d1b08cd583 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jul 2012 16:04:55 +0200
Subject: [PATCH 68/76] Revert updates to srcloc, mainland-pretty, and
 language-c-quote to un-break accelerate-cuda.

---
 .../libraries/haskell/language-c-quote/default.nix       | 4 ++--
 .../libraries/haskell/mainland-pretty/default.nix        | 8 ++++----
 pkgs/development/libraries/haskell/srcloc/default.nix    | 9 ++++-----
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix
index 503fa8f561f..a765b015a31 100644
--- a/pkgs/development/libraries/haskell/language-c-quote/default.nix
+++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "language-c-quote";
-  version = "0.4.0";
-  sha256 = "1qbl81c8fw2gz96n8505yxhw1d3zhxq436ikv173x1zz0b4z26g1";
+  version = "0.3.2";
+  sha256 = "1pxrag9ws93rsqrsxcyxg07pvp2qw0f19yj2b40ynwzk112nkd16";
   buildDepends = [
     exceptionMtl exceptionTransformers filepath haskellSrcMeta
     mainlandPretty mtl srcloc syb symbol
diff --git a/pkgs/development/libraries/haskell/mainland-pretty/default.nix b/pkgs/development/libraries/haskell/mainland-pretty/default.nix
index 221a69fa7da..d64a6c76180 100644
--- a/pkgs/development/libraries/haskell/mainland-pretty/default.nix
+++ b/pkgs/development/libraries/haskell/mainland-pretty/default.nix
@@ -1,10 +1,10 @@
-{ cabal, srcloc, text }:
+{ cabal, srcloc, symbol }:
 
 cabal.mkDerivation (self: {
   pname = "mainland-pretty";
-  version = "0.2.1";
-  sha256 = "1pl96m92bsrghkp5ixaqlhi2hybc4hafy64zlmsgjlmdvslxhs3h";
-  buildDepends = [ srcloc text ];
+  version = "0.1.3.0";
+  sha256 = "1grfsn066z11737dxdk1bdhyvz9vjxxn6krfgx9bc8jin6n9h6aq";
+  buildDepends = [ srcloc symbol ];
   meta = {
     homepage = "http://www.eecs.harvard.edu/~mainland/";
     description = "Pretty printing designed for printing source code";
diff --git a/pkgs/development/libraries/haskell/srcloc/default.nix b/pkgs/development/libraries/haskell/srcloc/default.nix
index b4e212f89b2..d76309bc795 100644
--- a/pkgs/development/libraries/haskell/srcloc/default.nix
+++ b/pkgs/development/libraries/haskell/srcloc/default.nix
@@ -1,11 +1,10 @@
-{ cabal, syb }:
+{ cabal, syb, symbol }:
 
 cabal.mkDerivation (self: {
   pname = "srcloc";
-  version = "0.2.0";
-  sha256 = "1p63gachz8ccv61ih3jb995kcg72g7vkihryb2ak7d8bxxxx3irs";
-  buildDepends = [ syb ];
-  noHaddock = true;
+  version = "0.1.2";
+  sha256 = "08awipz6al7jk7d974am5v9fkp87i5dy6d457mx1rv7lczlyhws9";
+  buildDepends = [ syb symbol ];
   meta = {
     homepage = "http://www.eecs.harvard.edu/~mainland/";
     description = "Data types for managing source code locations";

From 8984139215d5f9c768ba0b092ed8149ac096dc1e Mon Sep 17 00:00:00 2001
From: Andres Loeh <mail@andres-loeh.de>
Date: Wed, 18 Jul 2012 16:30:57 +0200
Subject: [PATCH 69/76] Fix bug in uniqList.

---
 pkgs/lib/misc.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/lib/misc.nix b/pkgs/lib/misc.nix
index 17771e1ca7b..dbf3381f0f4 100644
--- a/pkgs/lib/misc.nix
+++ b/pkgs/lib/misc.nix
@@ -165,7 +165,7 @@ rec {
              then []
              else let x = head xs;
                       y = if elem x acc then [] else [x];
-                  in go (y ++ tail xs) (y ++ acc);
+                  in y ++ go (tail xs) (y ++ acc);
     in go inputList acc;
 
   uniqListExt = {inputList, outputList ? [],

From eeb09aa1bc2956716883ba5610b722e1cead0ce2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 18 Jul 2012 17:03:55 +0200
Subject: [PATCH 70/76] nix: Update to 1.1pre2749_ccc52ad

---
 pkgs/tools/package-management/nix/unstable.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index 3025f0450b8..1ed19bb9b25 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.1pre2742_a7a43ad";
+  name = "nix-1.1pre2749_ccc52ad";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/2799663/download/4/${name}.tar.bz2";
-    sha256 = "bad6b3b6177d47cef0be3c81a5e1e876f656e99afeea673613e00656ebf07d3e";
+    url = "http://hydra.nixos.org/build/2841643/download/4/${name}.tar.bz2";
+    sha256 = "eae2135dd70d2734080ee644a597e131f60e71991dbabdabf67ab0818ff1f6fc";
   };
 
   buildNativeInputs = [ perl pkgconfig ];
@@ -53,6 +53,7 @@ stdenv.mkDerivation rec {
       '' + stdenv.lib.optionalString (
           stdenv.cross ? nix && stdenv.cross.nix ? system
       ) ''--with-system=${stdenv.cross.nix.system}'';
+      
     doInstallCheck = false;
   };
 

From c101d6fd63e7ee678a3a1c7fcc3a6b54eb6cd522 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 18 Jul 2012 11:16:02 -0400
Subject: [PATCH 71/76] Fix Nixpkgs evaluation

http://hydra.nixos.org/build/2842914
---
 pkgs/development/libraries/silgraphite/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/silgraphite/default.nix b/pkgs/development/libraries/silgraphite/default.nix
index 2bb38b3781f..db018cca465 100644
--- a/pkgs/development/libraries/silgraphite/default.nix
+++ b/pkgs/development/libraries/silgraphite/default.nix
@@ -1,4 +1,5 @@
 { stdenv, fetchurl, pkgconfig, freetype, libXft, pango, fontconfig }:
+
 stdenv.mkDerivation rec {
   version = "2.3.1";
   name = "silgraphite-2.3.1";
@@ -13,8 +14,8 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2";
 
   meta = {
-    description = ''An advanced font engine'';
-    maintainers = with stdenv.lib.maintainers; [raskin];
-    platforms = with stdenv.lib.maintainers; linux;
+    description = "An advanced font engine";
+    maintainers = [ stdenv.lib.maintainers.raskin ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From 6efd9b24d37d81c947490fe0dba1fc26edebb4e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Mon, 16 Jul 2012 21:15:54 +0200
Subject: [PATCH 72/76] Add xf86-video-nested

This does not yet compile. I had a working version from an obsolete github repo, but then found the upstream repo. Perhaps it needs a newer Xorg.
---
 .../linux/xf86-video-nested/default.nix       | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/os-specific/linux/xf86-video-nested/default.nix

diff --git a/pkgs/os-specific/linux/xf86-video-nested/default.nix b/pkgs/os-specific/linux/xf86-video-nested/default.nix
new file mode 100644
index 00000000000..b663a3b3232
--- /dev/null
+++ b/pkgs/os-specific/linux/xf86-video-nested/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchgit, autoconf, automake, fontsproto, libX11, libXext
+, libtool, pkgconfig, renderproto, utilmacros, xorgserver
+}:
+
+stdenv.mkDerivation {
+  name = "xf86-video-nested-2012-06-15";
+
+  src = fetchgit {
+    url = git://anongit.freedesktop.org/xorg/driver/xf86-video-nested;
+    rev = "ad48dc6eb98776a8a886f26f31c0110352fa1da4";
+    sha256 = "43a102405acdcdb346ab197b33c8fa724d2140f33754f8ee3941a0eea152735c"; 
+  };
+
+  buildInputs = 
+    [ autoconf automake fontsproto libX11 libXext libtool pkgconfig
+      renderproto utilmacros xorgserver
+    ];
+
+  configureScript = "./autogen.sh";
+
+  meta = {
+    homepage = git://anongit.freedesktop.org/xorg/driver/xf86-video-nested;
+    description = "driver to run Xorg on top of Xorg or something else";
+    maintainers = [ stdenv.lib.maintainers.goibhniu ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1be0f1c38f5..1ad69e0290d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6150,6 +6150,10 @@ let
 
   xf86_input_wacom = callPackage ../os-specific/linux/xf86-input-wacom { };
 
+  xf86_video_nested = callPackage ../os-specific/linux/xf86-video-nested {
+    inherit (xorg) fontsproto renderproto utilmacros xorgserver xproto;
+  };
+
   xf86_video_nouveau = callPackage ../os-specific/linux/xf86-video-nouveau {
     inherit (xorg) xorgserver xproto fontsproto xf86driproto renderproto
       videoproto utilmacros;

From 8ebb3093202c7f7482356d6fb072ea17b5313326 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Tue, 17 Jul 2012 02:11:59 +0200
Subject: [PATCH 73/76] Pin xf86-video-nested to a revision that works with
 Xorg 7.6

---
 pkgs/os-specific/linux/xf86-video-nested/default.nix | 10 +++++++---
 pkgs/top-level/all-packages.nix                      |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/xf86-video-nested/default.nix b/pkgs/os-specific/linux/xf86-video-nested/default.nix
index b663a3b3232..27522269ea3 100644
--- a/pkgs/os-specific/linux/xf86-video-nested/default.nix
+++ b/pkgs/os-specific/linux/xf86-video-nested/default.nix
@@ -3,14 +3,18 @@
 }:
 
 stdenv.mkDerivation {
-  name = "xf86-video-nested-2012-06-15";
+  name = "xf86-video-nested-2011-09-12";
 
+  # Breaks at 8d80f2e415e9e58ca481fe52ae8f2290e25de898 for Xorg 7.6
   src = fetchgit {
     url = git://anongit.freedesktop.org/xorg/driver/xf86-video-nested;
-    rev = "ad48dc6eb98776a8a886f26f31c0110352fa1da4";
-    sha256 = "43a102405acdcdb346ab197b33c8fa724d2140f33754f8ee3941a0eea152735c"; 
+    rev = "fceee1716625badf698ca27dd5788a4deb8533bc";
+    sha256 = ""; 
   };
 
+  # Fixed in e123277d10337a1c3b853118df0d1becdddf3b77
+  patchPhase = "sed -e 's/Werror/Werror -Wno-extra-portability/g' -i configure.ac";
+
   buildInputs = 
     [ autoconf automake fontsproto libX11 libXext libtool pkgconfig
       renderproto utilmacros xorgserver
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ad69e0290d..2470be7eff7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6151,7 +6151,7 @@ let
   xf86_input_wacom = callPackage ../os-specific/linux/xf86-input-wacom { };
 
   xf86_video_nested = callPackage ../os-specific/linux/xf86-video-nested {
-    inherit (xorg) fontsproto renderproto utilmacros xorgserver xproto;
+    inherit (xorg) fontsproto renderproto utilmacros xorgserver;
   };
 
   xf86_video_nouveau = callPackage ../os-specific/linux/xf86-video-nouveau {

From 933205acaf820393fc0ae8b20f4d24363f89a9d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Wed, 18 Jul 2012 23:04:00 +0200
Subject: [PATCH 74/76] Add the sha256 for xf86-video-nested

---
 pkgs/os-specific/linux/xf86-video-nested/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/xf86-video-nested/default.nix b/pkgs/os-specific/linux/xf86-video-nested/default.nix
index 27522269ea3..95a9a4589f9 100644
--- a/pkgs/os-specific/linux/xf86-video-nested/default.nix
+++ b/pkgs/os-specific/linux/xf86-video-nested/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   src = fetchgit {
     url = git://anongit.freedesktop.org/xorg/driver/xf86-video-nested;
     rev = "fceee1716625badf698ca27dd5788a4deb8533bc";
-    sha256 = ""; 
+    sha256 = "6b3544ddcf40602364fd0e528f6e677c37ef8d08f6c4e756caea7e29abf200f7"; 
   };
 
   # Fixed in e123277d10337a1c3b853118df0d1becdddf3b77

From 70298ba42c5071cd6118645069eb0efbe1f79404 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Wed, 18 Jul 2012 23:35:20 +0200
Subject: [PATCH 75/76] Fix style: The meta.description field should be
 capitalised (niksnut)

---
 pkgs/os-specific/linux/xf86-video-nested/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/xf86-video-nested/default.nix b/pkgs/os-specific/linux/xf86-video-nested/default.nix
index 95a9a4589f9..6ed04f490c0 100644
--- a/pkgs/os-specific/linux/xf86-video-nested/default.nix
+++ b/pkgs/os-specific/linux/xf86-video-nested/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = git://anongit.freedesktop.org/xorg/driver/xf86-video-nested;
-    description = "driver to run Xorg on top of Xorg or something else";
+    description = "Driver to run Xorg on top of Xorg or something else";
     maintainers = [ stdenv.lib.maintainers.goibhniu ];
   };
 }

From d077a98e77479659c27af926c3c6dc18dbcf0fe8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 18 Jul 2012 21:50:41 -0400
Subject: [PATCH 76/76] nix: Update to 1.1

---
 pkgs/tools/package-management/nix/default.nix | 7 ++++---
 pkgs/top-level/all-packages.nix               | 4 ++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 79f73ebb8c3..e433aa60579 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.0";
+  name = "nix-1.1";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/2609700/download/4/${name}.tar.bz2";
-    sha256 = "27f1d4d2a5fb1951bfc9e706c0894a961aed1afe0d095e16eb8fbef94ee7ec17";
+    url = "http://hydra.nixos.org/build/2860022/download/4/${name}.tar.bz2";
+    sha256 = "edb2fc444eda49be144ca2901f1fc9472cd24896775ba02556ded5705863d324";
   };
 
   buildNativeInputs = [ perl pkgconfig ];
@@ -53,6 +53,7 @@ stdenv.mkDerivation rec {
       '' + stdenv.lib.optionalString (
           stdenv.cross ? nix && stdenv.cross.nix ? system
       ) ''--with-system=${stdenv.cross.nix.system}'';
+      
     doInstallCheck = false;
   };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2470be7eff7..be57d1b6ce1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8529,10 +8529,14 @@ let
     stateDir = getConfig [ "nix" "stateDir" ] "/nix/var";
   };
 
+  nixUnstable = nix;
+
+  /*
   nixUnstable = callPackage ../tools/package-management/nix/unstable.nix {
     storeDir = getConfig [ "nix" "storeDir" ] "/nix/store";
     stateDir = getConfig [ "nix" "stateDir" ] "/nix/var";
   };
+  */
 
   nixCustomFun = src: preConfigure: enableScripts: configureFlags:
     import ../tools/package-management/nix/custom.nix {