From 8e28c8fcfa6398f85d450d951374f2f074ecfcb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 20 Sep 2011 09:53:19 +0000
Subject: [PATCH 01/28] Making 'nix-env -qa *' work

svn path=/nixpkgs/trunk/; revision=29394
---
 pkgs/top-level/all-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d5ebc8238f4..ba91b42d67b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8357,9 +8357,7 @@ let
 
   splix = callPackage ../misc/cups/drivers/splix { };
 
-  tetex = callPackage ../misc/tex/tetex { 
-    libpng = libpng12;
-  };
+  tetex = callPackage ../misc/tex/tetex { };
 
   tex4ht = callPackage ../misc/tex/tex4ht { };
 

From a3a15545f6fc3ed41f24a6a58ff13dc6b031276a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Sep 2011 11:19:55 +0000
Subject: [PATCH 02/28] * wxPython updated to 2.8.12.0.

svn path=/nixpkgs/trunk/; revision=29395
---
 pkgs/development/python-modules/wxPython/2.8.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/wxPython/2.8.nix b/pkgs/development/python-modules/wxPython/2.8.nix
index d574909d4e2..8819605528d 100644
--- a/pkgs/development/python-modules/wxPython/2.8.nix
+++ b/pkgs/development/python-modules/wxPython/2.8.nix
@@ -2,14 +2,16 @@
 
 assert wxGTK.unicode;
 
+let version = "2.8.12.1"; in
+
 stdenv.mkDerivation {
-  name = "wxPython-2.8.12.0";
+  name = "wxPython-${version}";
   
   builder = ./builder.sh;
   
   src = fetchurl {
-    url = mirror://sourceforge/wxpython/wxPython-src-2.8.12.0.tar.bz2;
-    sha256 = "1gdsk1p8ds4jd00habxy4y8m56247a5s1mvq1lm1r6475dvq4pkd";
+    url = "mirror://sourceforge/wxpython/wxPython-src-${version}.tar.bz2";
+    sha256 = "1l1w4i113csv3bd5r8ybyj0qpxdq83lj6jrc5p7cc10mkwyiagqz";
   };
   
   buildInputs = [ pkgconfig wxGTK (wxGTK.gtk) pythonPackages.python pythonPackages.wrapPython ];

From 267e1235083bf956831cbd971b97e4615af80e83 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Sep 2011 11:20:15 +0000
Subject: [PATCH 03/28] * Latest Tribler.

svn path=/nixpkgs/trunk/; revision=29396
---
 pkgs/applications/networking/p2p/tribler/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix
index dc08d6ca3eb..afd16dbb2a8 100644
--- a/pkgs/applications/networking/p2p/tribler/default.nix
+++ b/pkgs/applications/networking/p2p/tribler/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchsvn, pythonPackages, makeWrapper, nettools }:
 
-let rev = "22245"; in
+let rev = "22523"; in
 
 stdenv.mkDerivation {
-  name = "tribler-5.4.2-pre${rev}";
+  name = "tribler-5.4.3-pre${rev}";
 
   src = fetchsvn {
     url = http://svn.tribler.org/abc/branches/release-5.4.x;
     inherit rev;
-    sha256 = "09b3iz3yy1dpl30cd2iningzhm1grz6qjgv0qb3wk0v1vxkacddz";
+    sha256 = "09hscrnl50s9qncklnqqzwxwvidl3hj7hr7qsysmv6sw7b9rbx0g";
   };
 
   buildInputs = [ pythonPackages.python pythonPackages.wrapPython makeWrapper ];

From 03e747c41ab9057f8203a3f77b4e52b5d3c868c6 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 20 Sep 2011 16:18:04 +0000
Subject: [PATCH 04/28] Add a script to generate fetchurl_gnome args

svn path=/nixpkgs/trunk/; revision=29397
---
 maintainers/scripts/gnome-latest.sh | 105 ++++++++++++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100755 maintainers/scripts/gnome-latest.sh

diff --git a/maintainers/scripts/gnome-latest.sh b/maintainers/scripts/gnome-latest.sh
new file mode 100755
index 00000000000..00ec1a105da
--- /dev/null
+++ b/maintainers/scripts/gnome-latest.sh
@@ -0,0 +1,105 @@
+#!/bin/sh
+
+GNOME_FTP="ftp.gnome.org/pub/GNOME/sources"
+
+project=$1
+
+if [ "$project" == "--help" ]; then
+  echo "Usage: $0 project [major.minor]"
+  exit 0
+fi
+
+baseVersion=$2
+
+if [ -z "$project" ]; then
+  echo "No project specified, exiting"
+  exit 1
+fi
+
+# curl -l ftp://... doesn't work from my office in HSE, and I don't want to have
+# any conversations with sysadmin. Somehow lftp works.
+if [ "$FTP_CLIENT" = "lftp" ]; then
+  ls_ftp() {
+    lftp -c "open $1; cls"
+  }
+else
+  ls_ftp() {
+    curl -l "$1"/
+  }
+fi
+
+if [ -z "$baseVersion" ]; then
+  echo "Looking for available versions..." >&2
+  available_baseversions=( `ls_ftp ftp://${GNOME_FTP}/${project} | grep '[0-9]\.[0-9]' | sort -t. -k1,1n -k 2,2n` )
+  echo -e "The following versions are available:\n ${available_baseversions[@]}" >&2
+  echo -en "Choose one of them: " >&2
+  read baseVersion
+fi
+
+FTPDIR="${GNOME_FTP}/${project}/${baseVersion}"
+
+#version=`curl -l ${FTPDIR}/ 2>/dev/null | grep LATEST-IS | sed -e s/LATEST-IS-//`
+# gnome's LATEST-IS is broken. Do not trust it.
+
+files=$(ls_ftp "${FTPDIR}")
+declare -A versions
+
+for f in $files; do
+  case $f in
+    (LATEST-IS-*|*.news|*.changes|*.sha256sum|*.diff*):
+      ;;
+    ($project-*.*.9*.tar.*):
+      tmp=${f#$project-}
+      tmp=${tmp%.tar*}
+      echo "Ignored unstable version ${tmp}" >&2
+      ;;
+    ($project-*.tar.*):
+      tmp=${f#$project-}
+      tmp=${tmp%.tar*}
+      versions[${tmp}]=1
+      ;;
+    (*):
+      echo "UNKNOWN FILE $f"
+      ;;
+  esac
+done
+echo "Found versions ${!versions[@]}" >&2
+version=`echo ${!versions[@]} | sed -e 's/ /\n/g' | sort -t. -k1,1n -k 2,2n -k 3,3n | tail -n1`
+echo "Latest version is: ${version}" >&2
+
+name=${project}-${version}
+echo "Fetching .sha256 file" >&2
+curl -O http://${FTPDIR}/${name}.sha256sum
+
+extensions=( "xz" "bz2" "gz" )
+echo "Choosing archive extension (known are ${extensions[@]})..." >&2
+for ext in ${extensions[@]}; do
+  if grep "\\.tar\\.${ext}$" ${name}.sha256sum >& /dev/null; then
+    ext_pref=$ext
+    sha256=$(grep "\\.tar\\.${ext}$" ${name}.sha256sum | cut -f1 -d\ )
+    break
+  fi
+done
+sha256=`nix-hash --to-base32 --type sha256 $sha256`
+echo "Chosen ${ext_pref}, hash is ${sha256}" >&2
+
+cat <<EOF
+  src = fetchurl_gnome {
+    project = "${project}";
+EOF
+echo -n "    major = \"`echo ${version} | cut -d. -f1`\";"
+echo -n " minor = \"`echo ${version} | cut -d. -f2`\";"
+patchlevel=`echo ${version} | cut -d. -f3`
+if [ -n "$patchlevel" ]; then
+  echo -n " patchlevel = \"${patchlevel}\";"
+fi
+if [ "$ext_pref" != "bz2" ]; then
+  echo -n " extension = \"${ext_pref}\";"
+fi
+echo
+cat <<EOF
+    sha256 = "${sha256}";
+  };
+EOF
+
+rm -v ${name}.sha256sum >&2

From de8958223842edb17527f1a2427be72929f0a64a Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 20 Sep 2011 16:18:12 +0000
Subject: [PATCH 05/28] Add gtk-3.x libraries

Let hydra build it but do not show in nix-env -qa

svn path=/nixpkgs/trunk/; revision=29398
---
 pkgs/development/libraries/atk/2.1.x.nix    | 37 ++++++++++++++
 pkgs/development/libraries/glib/2.29.x.nix  | 49 ++++++++++++++++++
 pkgs/development/libraries/gtk+/3.1.x.nix   | 55 +++++++++++++++++++++
 pkgs/development/libraries/pango/1.29.x.nix | 37 ++++++++++++++
 pkgs/top-level/all-packages.nix             | 17 +++++++
 5 files changed, 195 insertions(+)
 create mode 100644 pkgs/development/libraries/atk/2.1.x.nix
 create mode 100644 pkgs/development/libraries/glib/2.29.x.nix
 create mode 100644 pkgs/development/libraries/gtk+/3.1.x.nix
 create mode 100644 pkgs/development/libraries/pango/1.29.x.nix

diff --git a/pkgs/development/libraries/atk/2.1.x.nix b/pkgs/development/libraries/atk/2.1.x.nix
new file mode 100644
index 00000000000..28619a85c03
--- /dev/null
+++ b/pkgs/development/libraries/atk/2.1.x.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl_gnome, pkgconfig, perl, glib, xz }:
+
+stdenv.mkDerivation rec {
+  name = src.pkgname;
+
+  src = fetchurl_gnome {
+    project = "atk";
+    major = "2"; minor = "1"; patchlevel = "5"; extension = "xz";
+    sha256 = "005b9sq8p9ykp4f35b59si3mcbw4p9hyxps1ij4x73p07rrbf0z9";
+  };
+
+  buildNativeInputs = [ pkgconfig perl xz ];
+
+  propagatedBuildInputs = [ glib ];
+
+  postInstall = "rm -rf $out/share/gtk-doc";
+
+  meta = {
+    description = "ATK, the accessibility toolkit";
+
+    longDescription = ''
+      ATK is the Accessibility Toolkit.  It provides a set of generic
+      interfaces allowing accessibility technologies such as screen
+      readers to interact with a graphical user interface.  Using the
+      ATK interfaces, accessibility tools have full access to view and
+      control running applications.
+    '';
+
+    homepage = http://library.gnome.org/devel/atk/;
+
+    license = "LGPLv2+";
+
+    maintainers = with stdenv.lib.maintainers; [ raskin urkud ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+
+}
diff --git a/pkgs/development/libraries/glib/2.29.x.nix b/pkgs/development/libraries/glib/2.29.x.nix
new file mode 100644
index 00000000000..589ec625dcc
--- /dev/null
+++ b/pkgs/development/libraries/glib/2.29.x.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchurl_gnome, pkgconfig, gettext, perl, libiconv, zlib, xz, libffi
+, python }:
+
+# TODO:
+# * Add gio-module-fam
+#     Problem: cyclic dependency on gamin
+#     Possible solution: build as a standalone module, set env. vars
+# * Make it build without python
+#     Problem: an example (test?) program needs it.
+#     Possible solution: disable compilation of this example somehow
+#     Reminder: add 'sed -e 's@python2\.[0-9]@python@' -i
+#       $out/bin/gtester-report' to postInstall if this is solved
+
+stdenv.mkDerivation rec {
+  name = src.pkgname;
+
+  src = fetchurl_gnome {
+    project = "glib";
+    major = "2"; minor = "29"; patchlevel = "18"; extension = "xz";
+    sha256 = "1hc198x625w1w8if1xlvqyjs9aazc27s0l374kqc4sr51wcpbxpy";
+  };
+
+  # configure script looks for d-bus but it is only needed for tests
+  buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv;
+  buildNativeInputs = [ perl pkgconfig gettext xz python ];
+
+  propagatedBuildInputs = [ zlib libffi ];
+
+  # glib buildsystem fails to find python, thus hardcodes python2.4 in #!
+  postInstall = ''rm -rvf $out/share/gtk-doc'';
+
+  meta = {
+    description = "GLib, a C library of programming buildings blocks";
+
+    longDescription = ''
+      GLib provides the core application building blocks for libraries
+      and applications written in C.  It provides the core object
+      system used in GNOME, the main loop implementation, and a large
+      set of utility functions for strings and common data structures.
+    '';
+
+    homepage = http://www.gtk.org/;
+
+    license = "LGPLv2+";
+
+    maintainers = with stdenv.lib.maintainers; [raskin urkud];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/gtk+/3.1.x.nix b/pkgs/development/libraries/gtk+/3.1.x.nix
new file mode 100644
index 00000000000..5b473d44e7e
--- /dev/null
+++ b/pkgs/development/libraries/gtk+/3.1.x.nix
@@ -0,0 +1,55 @@
+{ stdenv, fetchurl_gnome, pkgconfig, glib, atk, pango, cairo, perl, xlibs
+, gdk_pixbuf, xz
+, xineramaSupport ? true
+, cupsSupport ? true, cups ? null
+}:
+
+assert xineramaSupport -> xlibs.libXinerama != null;
+assert cupsSupport -> cups != null;
+
+stdenv.mkDerivation rec {
+  name = src.pkgname;
+
+  src = fetchurl_gnome {
+    project = "gtk+";
+    major = "3"; minor = "1"; patchlevel = "16"; extension = "xz";
+    sha256 = "15arbf75qpchr9wrawb3zkn52rzf5wm2qv4dq10zfzlflimrq2rg";
+  };
+
+  enableParallelBuilding = true;
+
+  buildNativeInputs = [ perl pkgconfig xz ];
+
+  propagatedBuildInputs =
+    [ xlibs.xlibs glib atk pango gdk_pixbuf cairo
+      xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi
+    ]
+    ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama
+    ++ stdenv.lib.optionals cupsSupport [ cups ];
+
+  configureFlags = "--with-xinput=yes";
+
+  postInstall = "rm -rf $out/share/gtk-doc";
+
+  meta = {
+    description = "A multi-platform toolkit for creating graphical user interfaces";
+
+    longDescription = ''
+      GTK+ is a highly usable, feature rich toolkit for creating
+      graphical user interfaces which boasts cross platform
+      compatibility and an easy to use API.  GTK+ it is written in C,
+      but has bindings to many other popular programming languages
+      such as C++, Python and C# among others.  GTK+ is licensed
+      under the GNU LGPL 2.1 allowing development of both free and
+      proprietary software with GTK+ without any license fees or
+      royalties.
+    '';
+
+    homepage = http://www.gtk.org/;
+
+    license = "LGPLv2+";
+
+    maintainers = with stdenv.lib.maintainers; [urkud raskin];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/pango/1.29.x.nix b/pkgs/development/libraries/pango/1.29.x.nix
new file mode 100644
index 00000000000..14dd3d8c5a5
--- /dev/null
+++ b/pkgs/development/libraries/pango/1.29.x.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl_gnome, pkgconfig, gettext, x11, glib, cairo, libpng, xz }:
+
+stdenv.mkDerivation rec {
+  name = src.pkgname;
+
+  src = fetchurl_gnome {
+    project = "pango";
+    major = "1"; minor = "29"; patchlevel = "3"; extension = "xz";
+    sha256 = "0vp88j3ghngkkc4dpya443qng0bb1g86g54bcwf4lf3zmk6r1nmh";
+  };
+
+  buildInputs = stdenv.lib.optional stdenv.isDarwin gettext;
+
+  buildNativeInputs = [ pkgconfig xz ];
+
+  propagatedBuildInputs = [ x11 glib cairo libpng ];
+
+  postInstall = "rm -rf $out/share/gtk-doc";
+
+  meta = {
+    description = "A library for laying out and rendering of text, with an emphasis on internationalization";
+
+    longDescription = ''
+      Pango is a library for laying out and rendering of text, with an
+      emphasis on internationalization.  Pango can be used anywhere
+      that text layout is needed, though most of the work on Pango so
+      far has been done in the context of the GTK+ widget toolkit.
+      Pango forms the core of text and font handling for GTK+-2.x.
+    '';
+
+    homepage = http://www.pango.org/;
+    license = "LGPLv2+";
+
+    maintainers = with stdenv.lib.maintainers; [ raskin urkud ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ba91b42d67b..0547f5c1216 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3564,6 +3564,23 @@ let
 
   });
 
+  gtkLibs3x = let callPackage = newScope pkgs.gtkLibs3x; in {
+    glib = callPackage ../development/libraries/glib/2.29.x.nix { };
+
+    gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.24.x.nix { };
+
+    atk = callPackage ../development/libraries/atk/2.1.x.nix { };
+
+    cairo = callPackage ../development/libraries/cairo { };
+
+    pango = callPackage ../development/libraries/pango/1.29.x.nix { };
+
+    gtk = callPackage ../development/libraries/gtk+/3.1.x.nix { };
+
+    # Let hydra build gtk-3.x but do not show this to users yet
+    recurseForRelease = true;
+  };
+
   gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp {
     inherit (gnome) gtk;
     gtksharp = gtksharp2;

From a26835c2bc8803ddc557ad8dde12668b239f7f47 Mon Sep 17 00:00:00 2001
From: Alexander Tsamutali <astsmtl@yandex.ru>
Date: Tue, 20 Sep 2011 19:46:40 +0000
Subject: [PATCH 06/28] development/libraries/nss: Fix building on Linux 3.x.

svn path=/nixpkgs/trunk/; revision=29399
---
 pkgs/development/libraries/nss/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index f4ed2381010..ef5cfee5930 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -27,6 +27,7 @@ stdenv.mkDerivation {
   postPatch = ''
     sed -i -e "/^PREFIX =/s:= /usr:= $out:" \
                 "mozilla/security/nss/config/Makefile"
+    ln -s Linux2.6.mk mozilla/security/coreconf/Linux3.0.mk
   '';
 
   preConfigure = "cd mozilla/security/nss";

From 0be69080e8c985e4f7bd86ed0bc6b28cd440f050 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 20 Sep 2011 20:25:26 +0000
Subject: [PATCH 07/28] pkgs/misc/cups/drivers/splix: added myself as a
 maintainer

svn path=/nixpkgs/trunk/; revision=29400
---
 pkgs/misc/cups/drivers/splix/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix
index b832e928bef..532ef2a45d5 100644
--- a/pkgs/misc/cups/drivers/splix/default.nix
+++ b/pkgs/misc/cups/drivers/splix/default.nix
@@ -18,5 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://splix.sourceforge.net;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

From df1a47bda2374445f5d8509e2ee1670f3ca72d90 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 20 Sep 2011 20:25:31 +0000
Subject: [PATCH 08/28] haskell-hakyll: updated to version 3.2.0.7

svn path=/nixpkgs/trunk/; revision=29401
---
 pkgs/development/libraries/haskell/hakyll/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index f25d1069a58..d9a8b38730a 100644
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hakyll";
-  version = "3.2.0.6";
-  sha256 = "11jdajciswswv9ciyd6hk7qc39l09y9s528vazxq0k6z5mwvwrbp";
+  version = "3.2.0.7";
+  sha256 = "1p06596yfsa0lk5ipdxm1b8j81aph2k30pm2g6ghw6k7fglklyl5";
   buildDepends = [
     binary blazeHtml cryptohash hamlet mtl pandoc parsec regexBase
     regexPcre snapCore snapServer tagsoup time

From f844c8730ea3103b574a911a3f6d325102bd5184 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 20 Sep 2011 20:30:20 +0000
Subject: [PATCH 09/28] haskell-json: added version 0.5

svn path=/nixpkgs/trunk/; revision=29402
---
 .../haskell/json/{default.nix => 0.4.4.nix}     |  0
 pkgs/development/libraries/haskell/json/0.5.nix | 17 +++++++++++++++++
 pkgs/top-level/haskell-packages.nix             |  4 +++-
 3 files changed, 20 insertions(+), 1 deletion(-)
 rename pkgs/development/libraries/haskell/json/{default.nix => 0.4.4.nix} (100%)
 create mode 100644 pkgs/development/libraries/haskell/json/0.5.nix

diff --git a/pkgs/development/libraries/haskell/json/default.nix b/pkgs/development/libraries/haskell/json/0.4.4.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/json/default.nix
rename to pkgs/development/libraries/haskell/json/0.4.4.nix
diff --git a/pkgs/development/libraries/haskell/json/0.5.nix b/pkgs/development/libraries/haskell/json/0.5.nix
new file mode 100644
index 00000000000..a748c2b4f58
--- /dev/null
+++ b/pkgs/development/libraries/haskell/json/0.5.nix
@@ -0,0 +1,17 @@
+{ cabal, mtl, parsec, syb }:
+
+cabal.mkDerivation (self: {
+  pname = "json";
+  version = "0.5";
+  sha256 = "12jbvq0lp7z5q6g94pv8s5455yydfyh9h2xlr76wqzfh3myvy6fl";
+  buildDepends = [ mtl parsec syb ];
+  meta = {
+    description = "Support for serialising Haskell to and from JSON";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 0b5547db958..7c7cc98a4ed 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -793,7 +793,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     WebBitsHtml = self.WebBitsHtml_1_0_1;
   };
 
-  json = callPackage ../development/libraries/haskell/json/default.nix {};
+  json_0_4_4 = callPackage ../development/libraries/haskell/json/0.4.4.nix {};
+  json_0_5 = callPackage ../development/libraries/haskell/json/0.5.nix {};
+  json = self.json_0_4_4;
 
   jsonEnumerator = callPackage ../development/libraries/haskell/jsonEnumerator {};
 

From d9ad31c468771d94636464c15b431b2526aa2f86 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 20 Sep 2011 22:49:07 +0000
Subject: [PATCH 10/28] pfstools-1.8.3; builds against qt4

svn path=/nixpkgs/trunk/; revision=29403
---
 pkgs/tools/graphics/pfstools/default.nix | 18 +++++++++++-------
 pkgs/top-level/all-packages.nix          |  4 +---
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix
index 2d9ab632f1c..0c829eab130 100644
--- a/pkgs/tools/graphics/pfstools/default.nix
+++ b/pkgs/tools/graphics/pfstools/default.nix
@@ -1,17 +1,21 @@
-{stdenv, fetchurl, libtiff, openexr, imagemagick, libjpeg, qt, mesa,
-freeglut, bzip2, libX11, libpng, expat }:
+{stdenv, fetchurl, libtiff, openexr, imagemagick, libjpeg, qt4, mesa,
+freeglut, bzip2, libX11, libpng, expat, pkgconfig }:
 
-stdenv.mkDerivation {
-  name = "pfstools-1.8.0";
+stdenv.mkDerivation rec {
+  name = "pfstools-1.8.3";
 
   src = fetchurl {
-    url = mirror://sourceforge/pfstools/pfstools-1.8.0.tar.gz;
-    sha256 = "19gncsfhypiaarsyhmca52yjx8cv86n31b6hxmdac8z4pczhg3gv";
+    url = "mirror://sourceforge/pfstools/${name}.tar.gz";
+    sha256 = "1j3pzwpxvsx9220176bfjallc73jyda61xqkvnmlxqfd3n7ycgx1";
   };
 
-  buildInputs = [ libtiff openexr imagemagick libjpeg qt mesa freeglut
+  configureFlags = "--with-moc=${qt4}/bin/moc";
+
+  buildInputs = [ libtiff openexr imagemagick libjpeg qt4 mesa freeglut
     bzip2 libX11 libpng expat ];
 
+  buildNativeInputs = [ pkgconfig ];
+
   meta = {
     homepage = http://pfstools.sourceforge.net/;
     description = "Toolkit for manipulation of HDR images";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0547f5c1216..31256e5e8fe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1147,9 +1147,7 @@ let
     ssh = openssh;
   };
 
-  pfstools = callPackage ../tools/graphics/pfstools {
-    qt = qt3;
-  };
+  pfstools = callPackage ../tools/graphics/pfstools { };
 
   philter = callPackage ../tools/networking/philter { };
 

From 9ee523053704b30274f4817d1c7f63771e29e1b2 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 20 Sep 2011 22:49:13 +0000
Subject: [PATCH 11/28] Move qt3/qt4 choice to .nix expressions

svn path=/nixpkgs/trunk/; revision=29404
---
 pkgs/applications/science/electronics/qucs/default.nix | 4 ++--
 pkgs/tools/text/qshowdiff/default.nix                  | 6 +++---
 pkgs/top-level/all-packages.nix                        | 8 ++------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/science/electronics/qucs/default.nix b/pkgs/applications/science/electronics/qucs/default.nix
index 1218ad71180..979faa2e597 100644
--- a/pkgs/applications/science/electronics/qucs/default.nix
+++ b/pkgs/applications/science/electronics/qucs/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, qt, libX11}:
+{stdenv, fetchurl, qt3, libX11}:
 
 stdenv.mkDerivation rec {
   name = "qucs-0.0.15";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0ggs2nicj8q270l0rbmzg4jc0d0zdxvfsjh4wgww670ma5855xsp";
   };
 
-  buildInputs = [ qt libX11 ];
+  buildInputs = [ qt3 libX11 ];
 
   meta = {
     description = "Integrated circuit simulator";
diff --git a/pkgs/tools/text/qshowdiff/default.nix b/pkgs/tools/text/qshowdiff/default.nix
index ee87bffc672..d033cf4ba6f 100644
--- a/pkgs/tools/text/qshowdiff/default.nix
+++ b/pkgs/tools/text/qshowdiff/default.nix
@@ -1,14 +1,14 @@
-{stdenv, fetchurl, qt, perl}:
+{stdenv, fetchurl, qt4, perl}:
 
 stdenv.mkDerivation rec {
   name = "qshowdiff-1.2";
   
   src = fetchurl {
-    url = http://qshowdiff.danfis.cz/files/qshowdiff-1.2.tar.gz;
+    url = "http://qshowdiff.danfis.cz/files/${name}.tar.gz";
     sha256 = "0i3ssvax4xync9c53jaxribazvh8d8v148l3yiqsfjmqsggw9rh3";
   };
 
-  buildInputs = [ qt perl ];
+  buildInputs = [ qt4 perl ];
 
   configurePhase = ''
     ensureDir $out/{bin,man/man1}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 31256e5e8fe..1074e52ac86 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1216,9 +1216,7 @@ let
 
   qhull = callPackage ../development/libraries/qhull { };
 
-  qshowdiff = callPackage ../tools/text/qshowdiff {
-    qt = qt4;
-  };
+  qshowdiff = callPackage ../tools/text/qshowdiff { };
 
   radvd = callPackage ../tools/networking/radvd { };
 
@@ -8130,9 +8128,7 @@ let
 
   ngspice = callPackage ../applications/science/electronics/ngspice { };
 
-  qucs = callPackage ../applications/science/electronics/qucs {
-    qt = qt3;
-  };
+  qucs = callPackage ../applications/science/electronics/qucs { };
 
   xoscope = callPackage ../applications/science/electronics/xoscope { };
 

From 03892b3e01ab2ae43c76ae588b6068365eef2fb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 21 Sep 2011 06:15:15 +0000
Subject: [PATCH 12/28] Making bison 2.5 cross build.

svn path=/nixpkgs/trunk/; revision=29405
---
 pkgs/development/tools/parsing/bison/bison-2.5.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/parsing/bison/bison-2.5.nix b/pkgs/development/tools/parsing/bison/bison-2.5.nix
index e373a80e46d..24fc0d1bbb3 100644
--- a/pkgs/development/tools/parsing/bison/bison-2.5.nix
+++ b/pkgs/development/tools/parsing/bison/bison-2.5.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1f1rai3v6k6xjii94964iq0alhc2hxwapqa363nfj8rbxvv0sdqa";
   };
 
-  buildInputs = [ m4 ]
+  buildNativeInputs = [ m4 ]
     ++ stdenv.lib.optional doCheck perl;
 
   doCheck = true;

From 53cecc13b45b84cc6500f46b63d938ba59a74050 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 21 Sep 2011 06:59:09 +0000
Subject: [PATCH 13/28] Fixing strace build inputs for cross building.

svn path=/nixpkgs/trunk/; revision=29407
---
 pkgs/development/tools/misc/strace/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index a370757b37c..6bd2619e4d3 100644
--- a/pkgs/development/tools/misc/strace/default.nix
+++ b/pkgs/development/tools/misc/strace/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "12n2faqq7whmszpjhv2lcb06r7900j53p0zl7vipi18inr0smycy";
   };
 
-  buildInputs = [ xz perl ];
+  buildNativeInputs = [ xz perl ];
 
   meta = {
     homepage = http://strace.sourceforge.net/;

From c289ea7c4f936198a6334f59336b7451dddb2ab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 21 Sep 2011 07:04:22 +0000
Subject: [PATCH 14/28] Making rsync cross build.

svn path=/nixpkgs/trunk/; revision=29408
---
 pkgs/applications/networking/sync/rsync/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index 3c84ee56a68..cf770213ef9 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation {
     sha256 = "1j77vwz6q3dvgr8w6wvigd5v4m5952czaqdvihr8di13q0b0vq4y";
   };
 
-  buildInputs = [perl] ++ stdenv.lib.optional enableACLs acl;
+  buildInputs = stdenv.lib.optional enableACLs acl;
+  buildNativeInputs = [perl];
 
   meta = {
     homepage = http://samba.anu.edu.au/rsync/;

From 1cf90e9d3513e9a4a02a9d853dd8a9e60289ac96 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 21 Sep 2011 07:22:19 +0000
Subject: [PATCH 15/28] * Added Catalyst::Plugin::Unicode::Encoding.

svn path=/nixpkgs/trunk/; revision=29409
---
 pkgs/top-level/perl-packages.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f16c45551a3..4caa1a10b5e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -448,6 +448,17 @@ rec {
     propagatedBuildInputs = [CatalystRuntime DataVisitor ConfigAny MROCompat];
   };
 
+  CatalystPluginUnicodeEncoding = buildPerlPackage rec {
+    name = "Catalyst-Plugin-Unicode-Encoding-1.2";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz";
+      sha256 = "0bz33xnh0wa6py6jz31wr38krad9hcv4gxdsy0lyhqn0k4v6b6dx";
+    };
+    propagatedBuildInputs = [ CatalystRuntime LWP ];
+    #propagatedBuildInputs =
+    #  [ CatalystRuntime CatalystPluginSession ClassInspector ];
+  };
+
   CatalystPluginHTMLWidget = buildPerlPackage {
     name = "Catalyst-Plugin-HTML-Widget-1.1";
     src = fetchurl {

From 77c5f8754c4f6196df0c81cb57af86d066fc53bd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 21 Sep 2011 07:30:04 +0000
Subject: [PATCH 16/28] * Remove comment.

svn path=/nixpkgs/trunk/; revision=29410
---
 pkgs/top-level/perl-packages.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4caa1a10b5e..207ecce4e96 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -455,8 +455,6 @@ rec {
       sha256 = "0bz33xnh0wa6py6jz31wr38krad9hcv4gxdsy0lyhqn0k4v6b6dx";
     };
     propagatedBuildInputs = [ CatalystRuntime LWP ];
-    #propagatedBuildInputs =
-    #  [ CatalystRuntime CatalystPluginSession ClassInspector ];
   };
 
   CatalystPluginHTMLWidget = buildPerlPackage {

From ed9d78b75f2c408cb884f0ef8157ed0d4a642414 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 21 Sep 2011 07:33:38 +0000
Subject: [PATCH 17/28] Adding pngcrush

svn path=/nixpkgs/trunk/; revision=29411
---
 pkgs/tools/graphics/pngcrush/default.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/tools/graphics/pngcrush/default.nix

diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix
new file mode 100644
index 00000000000..caa99d2c4e2
--- /dev/null
+++ b/pkgs/tools/graphics/pngcrush/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, libpng, xz }:
+
+stdenv.mkDerivation rec {
+  name = "pngcrush-1.7.17";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz";
+    sha256 = "0lh6wl0ci2y9b690n2zggc1mk21xj6iv378gvxk6gksgjkdw2rj2";
+  };
+
+  configurePhase = ''
+    sed -i s,/usr,$out, Makefile
+  '';
+
+  buildInputs = [ xz libpng ];
+
+  meta = {
+    homepage = http://pmt.sourceforge.net/pngcrush;
+    description = "A PNG optimizer";
+    license = "free";
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1074e52ac86..c38c117e9d0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1165,6 +1165,8 @@ let
 
   plotutils = callPackage ../tools/graphics/plotutils { };
 
+  pngcrush = callPackage ../tools/graphics/pngcrush { };
+
   pngnq = callPackage ../tools/graphics/pngnq { };
 
   polipo = callPackage ../servers/polipo { };

From b4a6893b85e2a793bfd734a45f07d8b838451930 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 21 Sep 2011 09:13:18 +0000
Subject: [PATCH 18/28] * Fix Compress::Zlib.

svn path=/nixpkgs/trunk/; revision=29412
---
 pkgs/top-level/perl-packages.nix | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 207ecce4e96..8c8665842a3 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -771,14 +771,7 @@ rec {
     inherit (pkgs) zlib;
   };
 
-  CompressZlib = buildPerlPackage rec {
-    name = "Compress-Zlib-2.015";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
-      sha256 = "1k1i539fszhxay8yllh687sw06i68g8ikw51pvy1c84p3kg6yk4v";
-    };
-    propagatedBuildInputs = [ CompressRawZlib IOCompress ];
-  };
+  CompressZlib = IOCompress;
 
   CompressUnLZMA = buildPerlPackage rec {
     name = "Compress-unLZMA-0.04";

From 6bc5b0f21525f451f57276d37fdd536ee826e8ca Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 Sep 2011 16:46:39 +0000
Subject: [PATCH 19/28] haskell-maude: added version 0.2.1

svn path=/nixpkgs/trunk/; revision=29414
---
 .../libraries/haskell/maude/default.nix        | 18 ++++++++++++++++++
 pkgs/top-level/haskell-packages.nix            |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/maude/default.nix

diff --git a/pkgs/development/libraries/haskell/maude/default.nix b/pkgs/development/libraries/haskell/maude/default.nix
new file mode 100644
index 00000000000..f9d7f68eaf6
--- /dev/null
+++ b/pkgs/development/libraries/haskell/maude/default.nix
@@ -0,0 +1,18 @@
+{ cabal, text }:
+
+cabal.mkDerivation (self: {
+  pname = "maude";
+  version = "0.2.1";
+  sha256 = "10igixljxfrpns2ffvk4g5dsv2pr8p1f7hc65z5x91n6x8zd01vi";
+  buildDepends = [ text ];
+  meta = {
+    homepage = "https://code.google.com/p/maude-hs/";
+    description = "An interface to the Maude rewriting system";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7c7cc98a4ed..0d4937e0e02 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -815,6 +815,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   logfloat = callPackage ../development/libraries/haskell/logfloat {};
 
+  maude = callPackage ../development/libraries/haskell/maude {};
+
   MaybeT = callPackage ../development/libraries/haskell/MaybeT {};
 
   MemoTrie = callPackage ../development/libraries/haskell/MemoTrie {};

From 3a44af3accbbff26ed9224d167dc9827675fd7b5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 Sep 2011 16:46:44 +0000
Subject: [PATCH 20/28] Updated 'fgl' attribute to point to the latest version
 of the library.

This has no practical effect, because we override that attributed based
on the compiler version that's being used, but it still feels like the
right thing to do.

svn path=/nixpkgs/trunk/; revision=29415
---
 pkgs/top-level/haskell-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 0d4937e0e02..b7bc9ff9397 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -567,7 +567,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   fgl_5_4_2_2 = callPackage ../development/libraries/haskell/fgl/5.4.2.2.nix {};
   fgl_5_4_2_3 = callPackage ../development/libraries/haskell/fgl/5.4.2.3.nix {};
   fgl_5_4_2_4 = callPackage ../development/libraries/haskell/fgl/5.4.2.4.nix {};
-  fgl = self.fgl_5_4_2_2;
+  fgl = self.fgl_5_4_2_4;
 
   fingertree = callPackage ../development/libraries/haskell/fingertree {};
 

From d10badf202ef054b6ac676af53456f3bb2a2f56b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 Sep 2011 16:46:48 +0000
Subject: [PATCH 21/28] haskell-graphviz: build with the latest fgl version

This change is required for building the Haskell prolog interpreter.

svn path=/nixpkgs/trunk/; revision=29416
---
 pkgs/top-level/haskell-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index b7bc9ff9397..864aac89745 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -634,7 +634,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   Graphalyze = callPackage ../development/libraries/haskell/Graphalyze {};
 
-  graphviz = callPackage ../development/libraries/haskell/graphviz {};
+  graphviz = callPackage ../development/libraries/haskell/graphviz {
+    fgl = self.fgl_5_4_2_4;
+  };
 
   hakyll = callPackage ../development/libraries/haskell/hakyll {
     hamlet = self.hamlet_0_8_2_1;

From 54acb664731f856eebcf2536c8cf4c8a80387816 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 Sep 2011 16:46:54 +0000
Subject: [PATCH 22/28] haskell-prolog: added version 0.1 haskell-prolog-graph:
 added version 0.1.0.2 haskell-prolog-graph-lib: added version 0.1

svn path=/nixpkgs/trunk/; revision=29417
---
 .../haskell/prolog-graph-lib/default.nix      | 18 +++++++++++++++
 .../haskell/prolog-graph/default.nix          | 23 +++++++++++++++++++
 .../libraries/haskell/prolog/default.nix      | 18 +++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  8 +++++++
 4 files changed, 67 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/prolog-graph-lib/default.nix
 create mode 100644 pkgs/development/libraries/haskell/prolog-graph/default.nix
 create mode 100644 pkgs/development/libraries/haskell/prolog/default.nix

diff --git a/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix b/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix
new file mode 100644
index 00000000000..5459b8fa6dc
--- /dev/null
+++ b/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix
@@ -0,0 +1,18 @@
+{ cabal, fgl, graphviz, mtl, prolog, text }:
+
+cabal.mkDerivation (self: {
+  pname = "prolog-graph-lib";
+  version = "0.1";
+  sha256 = "1gryhk0jd8bvmjbjkz6n7sfnsa6iwzkckpgi51xsj5f2nwdxbl6g";
+  buildDepends = [ fgl graphviz mtl prolog text ];
+  meta = {
+    homepage = "https://github.com/Erdwolf/prolog";
+    description = "Generating images of resolution trees for Prolog queries";
+    license = self.stdenv.lib.licenses.publicDomain;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/prolog-graph/default.nix b/pkgs/development/libraries/haskell/prolog-graph/default.nix
new file mode 100644
index 00000000000..446a430ed7c
--- /dev/null
+++ b/pkgs/development/libraries/haskell/prolog-graph/default.nix
@@ -0,0 +1,23 @@
+{ cabal, cmdargs, fgl, graphviz, mtl, prolog, prologGraphLib, text
+}:
+
+cabal.mkDerivation (self: {
+  pname = "prolog-graph";
+  version = "0.1.0.2";
+  sha256 = "1w3wz0sn1qhw286g3arin30jvlldadw976xr7hp0afdvqicl3892";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    cmdargs fgl graphviz mtl prolog prologGraphLib text
+  ];
+  meta = {
+    homepage = "https://github.com/Erdwolf/prolog";
+    description = "A command line tool to visualize query resolution in Prolog";
+    license = self.stdenv.lib.licenses.publicDomain;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/prolog/default.nix b/pkgs/development/libraries/haskell/prolog/default.nix
new file mode 100644
index 00000000000..6702e2e3887
--- /dev/null
+++ b/pkgs/development/libraries/haskell/prolog/default.nix
@@ -0,0 +1,18 @@
+{ cabal, mtl, parsec, syb, thLift, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "prolog";
+  version = "0.1";
+  sha256 = "00791fb1f84wq42wvacnjl290fbn28x9hknxsic3ksi3f7psladm";
+  buildDepends = [ mtl parsec syb thLift transformers ];
+  meta = {
+    homepage = "https://github.com/Erdwolf/prolog";
+    description = "A Prolog interpreter written in Haskell";
+    license = self.stdenv.lib.licenses.publicDomain;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 864aac89745..ecf9f71dcce 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -948,6 +948,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   processLeksah = callPackage ../development/libraries/haskell/leksah/process-leksah.nix {};
 
+  prolog = callPackage ../development/libraries/haskell/prolog {};
+  prologGraphLib = callPackage ../development/libraries/haskell/prolog-graph-lib {
+    fgl = self.fgl_5_4_2_4;
+  };
+  prologGraph = callPackage ../development/libraries/haskell/prolog-graph {
+    fgl = self.fgl_5_4_2_4;
+  };
+
   PSQueue = callPackage ../development/libraries/haskell/PSQueue {};
 
   pureMD5 = callPackage ../development/libraries/haskell/pureMD5 {};

From 4821046eb39f962c29304e5374829156b732d9cd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 Sep 2011 16:46:59 +0000
Subject: [PATCH 23/28] haskell-skein: added version 0.1

svn path=/nixpkgs/trunk/; revision=29418
---
 .../development/libraries/haskell/skein/default.nix | 13 +++++++++++++
 pkgs/top-level/haskell-packages.nix                 |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/skein/default.nix

diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix
new file mode 100644
index 00000000000..b438e9a7cce
--- /dev/null
+++ b/pkgs/development/libraries/haskell/skein/default.nix
@@ -0,0 +1,13 @@
+{ cabal, cereal, cryptoApi, tagged }:
+
+cabal.mkDerivation (self: {
+  pname = "skein";
+  version = "0.1";
+  sha256 = "10fnhbjdq4vrpl17b27pmxg943wsxv27js6p5nrgyzx9ybmdrmdi";
+  buildDepends = [ cereal cryptoApi tagged ];
+  meta = {
+    description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
+    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 ecf9f71dcce..777a24e0cbd 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1054,6 +1054,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   simpleSendfile = callPackage ../development/libraries/haskell/simple-sendfile {};
 
+  skein = callPackage ../development/libraries/haskell/skein {};
+
   smallcheck = callPackage ../development/libraries/haskell/smallcheck {};
 
   snapCore = callPackage ../development/libraries/haskell/snap/core.nix {};

From ac569c9b63970be0201005e46be479baa221fa16 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 Sep 2011 16:47:07 +0000
Subject: [PATCH 24/28] haskell-RSA: updated to version 1.0.6.2

svn path=/nixpkgs/trunk/; revision=29419
---
 pkgs/development/libraries/haskell/RSA/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/RSA/default.nix b/pkgs/development/libraries/haskell/RSA/default.nix
index 7476896337c..c5b8efc67f6 100644
--- a/pkgs/development/libraries/haskell/RSA/default.nix
+++ b/pkgs/development/libraries/haskell/RSA/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "RSA";
-  version = "1.0.6.1";
-  sha256 = "1d0birzvapcsgay0wwh5v9mcd77sghj1bps9ws04ww9ga97gyp0l";
+  version = "1.0.6.2";
+  sha256 = "0sabvwzgjg6nv5m3x9cjpk5q62r8vhi3kn858ask15frsi7lzhwk";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ binary pureMD5 random SHA ];

From b40cab3fab3d106248c8923407721a10feba228a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 Sep 2011 16:47:14 +0000
Subject: [PATCH 25/28] haskell-aeson-native: updated to version 0.3.3.1

svn path=/nixpkgs/trunk/; revision=29420
---
 pkgs/development/libraries/haskell/aeson-native/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/aeson-native/default.nix b/pkgs/development/libraries/haskell/aeson-native/default.nix
index 3ec90bab76d..4b3d8da7bf5 100644
--- a/pkgs/development/libraries/haskell/aeson-native/default.nix
+++ b/pkgs/development/libraries/haskell/aeson-native/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "aeson-native";
-  version = "0.3.3";
-  sha256 = "1ckf0fqx0mdw7467kjk3q48fb4q5w6336i8fxk6j0wfk17xjfs8l";
+  version = "0.3.3.1";
+  sha256 = "15733f5ivymkbwvqgbd8scynl9adva3fnid4bzlr9l4sb3yvcz9p";
   buildDepends = [
     attoparsec blazeBuilder blazeTextualNative deepseq hashable mtl syb
     text time unorderedContainers vector

From 353d1e7882f04c3f45cbbcdbb4c7bf95101cf5f5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 Sep 2011 16:47:19 +0000
Subject: [PATCH 26/28] haskell-clientsession: updated to version 0.7.3

svn path=/nixpkgs/trunk/; revision=29421
---
 .../libraries/haskell/clientsession/default.nix       | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix
index 166e261836f..2c577fbc2ef 100644
--- a/pkgs/development/libraries/haskell/clientsession/default.nix
+++ b/pkgs/development/libraries/haskell/clientsession/default.nix
@@ -1,17 +1,16 @@
-{ cabal, base64Bytestring, cereal, cryptoApi, cryptocipher
-, cryptohash
+{ cabal, base64Bytestring, cereal, cryptoApi, cryptocipher, skein
 }:
 
 cabal.mkDerivation (self: {
   pname = "clientsession";
-  version = "0.7.2";
-  sha256 = "0jfpgzfgcmc80qrzxj6dsg6cbd97pscg5yp99c9f58m4igr3fb2q";
+  version = "0.7.3";
+  sha256 = "1f5ri7h8l3v60bj6ywhn2v3kih5lclk76qx7y6jc7nyf9499aja5";
   buildDepends = [
-    base64Bytestring cereal cryptoApi cryptocipher cryptohash
+    base64Bytestring cereal cryptoApi cryptocipher skein
   ];
   meta = {
     homepage = "http://github.com/snoyberg/clientsession/tree/master";
-    description = "Store session data in a cookie";
+    description = "Securely store session data in a client-side cookie";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [

From 981ad994f5be4ae060c8c43160546232de0ab1e7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 Sep 2011 16:47:23 +0000
Subject: [PATCH 27/28] haskell-hmatrix: updated to version 0.12.0.1

svn path=/nixpkgs/trunk/; revision=29422
---
 pkgs/development/libraries/haskell/hmatrix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix
index e82aff91854..43c66c3d894 100644
--- a/pkgs/development/libraries/haskell/hmatrix/default.nix
+++ b/pkgs/development/libraries/haskell/hmatrix/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hmatrix";
-  version = "0.12.0.0";
-  sha256 = "1j4c3my6i3xz6b4pyy98722zmgky27ls7a7w13ilwmnhb7pvq9al";
+  version = "0.12.0.1";
+  sha256 = "1lnq1892vzx094d84jfs2477m3w47xgmqvnvzignwgfi470d9lw5";
   buildDepends = [
     binary HUnit QuickCheck random storableComplex vector
   ];

From 865b08c151bfce5de7336dfc2d75b4687962104f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 Sep 2011 16:47:27 +0000
Subject: [PATCH 28/28] haskell-system-fileio: updated to version 0.3.2.1

svn path=/nixpkgs/trunk/; revision=29423
---
 pkgs/development/libraries/haskell/system-fileio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/system-fileio/default.nix b/pkgs/development/libraries/haskell/system-fileio/default.nix
index 0f29a5f23bd..172489f6b52 100644
--- a/pkgs/development/libraries/haskell/system-fileio/default.nix
+++ b/pkgs/development/libraries/haskell/system-fileio/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "system-fileio";
-  version = "0.3.2";
-  sha256 = "10s0mih3mhpm0mh424kk330680qplwaddffr4rm4cf1bi7gbzrcq";
+  version = "0.3.2.1";
+  sha256 = "0a0vkbj9z5i74g6kkz3n4ffmvinavmnak0zxsx0fck18ppdgv394";
   buildDepends = [ systemFilepath text time ];
   meta = {
     homepage = "https://john-millikin.com/software/hs-fileio/";