From 6e9ecace5033b7ce8faf325a806d7f069eaa2fd2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Feb 2012 10:44:49 +0000
Subject: [PATCH 01/38] haskell-SDL: updated to version 0.6.3

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

diff --git a/pkgs/development/libraries/haskell/SDL/default.nix b/pkgs/development/libraries/haskell/SDL/default.nix
index 8adf60f938cd..da1e8df97154 100644
--- a/pkgs/development/libraries/haskell/SDL/default.nix
+++ b/pkgs/development/libraries/haskell/SDL/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "SDL";
-  version = "0.6.2";
-  sha256 = "1fqj3sw709q28rmjzcffa3k1mcp7r9cvdrrqmcppaz5yv63ychly";
+  version = "0.6.3";
+  sha256 = "0m3ick3rw8623ja42yfj4pa57naa6yb20ym8lv252gwb18ghp4sp";
   extraLibraries = [ SDL ];
   meta = {
     description = "Binding to libSDL";

From 037eafa2cfbb7b5ae73003ed8b8912917bc014e9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Feb 2012 10:44:53 +0000
Subject: [PATCH 02/38] haskell-fclabels: updated to version 1.1.1.0

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

diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix
index f93da3ee5495..c310637cacd0 100644
--- a/pkgs/development/libraries/haskell/fclabels/default.nix
+++ b/pkgs/development/libraries/haskell/fclabels/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "fclabels";
-  version = "1.1.0.2";
-  sha256 = "19p3ghjmc6jrgzifm5vrsd3cp5xmccw811zczcmsk1xjr4ady95r";
+  version = "1.1.1.0";
+  sha256 = "1xkgqib7ya3l6m9bz5ly6x9k0n71jiydk8ss38rvn9j5gryv3las";
   buildDepends = [ mtl transformers ];
   meta = {
     description = "First class accessor labels";

From 2fc61e10104d04265e22d7c36b25c68a770b443c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Feb 2012 10:44:57 +0000
Subject: [PATCH 03/38] haskell-smallcheck: updated to version 0.6.1

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

diff --git a/pkgs/development/libraries/haskell/smallcheck/default.nix b/pkgs/development/libraries/haskell/smallcheck/default.nix
index d8a9bf24f55a..2193b8188685 100644
--- a/pkgs/development/libraries/haskell/smallcheck/default.nix
+++ b/pkgs/development/libraries/haskell/smallcheck/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "smallcheck";
-  version = "0.6";
-  sha256 = "19b2dyjbryx2a5bq70pn2mbzlcvjjwhii78fwwx6q57r13zljb9v";
+  version = "0.6.1";
+  sha256 = "1p2bsc08lcyzmqdjc5qsr60dr03kvc8xw7kk4lbi9cnn9s9w90vb";
   buildDepends = [ dlist ];
   meta = {
     homepage = "https://github.com/feuerbach/smallcheck";

From d2ef3f937c939cad3636d28128a7a94d52b68d76 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Feb 2012 10:45:00 +0000
Subject: [PATCH 04/38] haskell-happstack-server: updated to version 6.6.3

svn path=/nixpkgs/trunk/; revision=32421
---
 .../haskell/happstack/happstack-server.nix      | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
index ec3f63d1eaac..77cf2cf00e54 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
@@ -1,18 +1,19 @@
-{ cabal, blazeHtml, extensibleExceptions, filepath, happstackData
-, happstackUtil, hslogger, html, MaybeT, mtl, network, parsec
-, sendfile, syb, text, time, utf8String, xhtml, zlib
+{ cabal, base64Bytestring, blazeHtml, extensibleExceptions
+, filepath, hslogger, html, monadControl, mtl, network, parsec
+, sendfile, syb, text, time, transformers, transformersBase
+, utf8String, xhtml, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "happstack-server";
-  version = "6.2.5";
-  sha256 = "196s8i3v55i10nkapkvzyw048flshw8mlm604548f0qjciynfjmg";
+  version = "6.6.3";
+  sha256 = "0l1cv1syx1j8xvy5sjl6cj7l4zyizkmv6z8g038n8fwgsw130hm9";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    blazeHtml extensibleExceptions filepath happstackData happstackUtil
-    hslogger html MaybeT mtl network parsec sendfile syb text time
-    utf8String xhtml zlib
+    base64Bytestring blazeHtml extensibleExceptions filepath hslogger
+    html monadControl mtl network parsec sendfile syb text time
+    transformers transformersBase utf8String xhtml zlib
   ];
   meta = {
     homepage = "http://happstack.com";

From 9cc0657c867137b7e04f2dbf6f7bf0f02d1054d0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Feb 2012 10:45:02 +0000
Subject: [PATCH 05/38] haskell-hlint: updated to version 1.8.24

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

diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix
index 76e102ff69cc..0e5b1ae7aa04 100644
--- a/pkgs/development/tools/haskell/hlint/default.nix
+++ b/pkgs/development/tools/haskell/hlint/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hlint";
-  version = "1.8.23";
-  sha256 = "0cbjnzs9ddk4z7kxh935x1kvr566afcvk98z3174f3xp5sbz79wr";
+  version = "1.8.24";
+  sha256 = "1crxhpgy49xg3j225cyfxflnc8zgck2xa8hb04chd0yh9n03h6kx";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 1488d45699a6bb0a90093d43e572e7db0c319f17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 20 Feb 2012 13:05:21 +0000
Subject: [PATCH 06/38] Updating vdrift to 2011-10-22. There are newer source
 code files, but that's the newsest src+data tarball I could find. We should
 write an expression that can use the latest src with the latest data apart.

svn path=/nixpkgs/trunk/; revision=32423
---
 pkgs/games/vdrift/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix
index 586bfc3e511d..0f9da8883827 100644
--- a/pkgs/games/vdrift/default.nix
+++ b/pkgs/games/vdrift/default.nix
@@ -1,16 +1,16 @@
 { fetchurl, stdenv, mesa, SDL, scons, freeglut, SDL_image, glew, libvorbis,
-  asio, boost, SDL_gfx }:
+  asio, boost, SDL_gfx, pkgconfig, bullet, curl, libarchive }:
 
 stdenv.mkDerivation rec {
-  name = "vdrift-2010-06-30";
+  name = "vdrift-2011-10-22";
 
   src = fetchurl {
     url = "mirror://sourceforge/vdrift/${name}.tar.bz2";
-    sha256 = "1zbh62363gx4ayyx4wcsp5di4f16qqfg2ajwkgw71kss6j7lk71j";
+    sha256 = "0vg1v1590jbln6k236kxn2sfgclvc6g34kykhh4nq9q3l1xgy38s";
   };
 
   buildInputs = [ scons mesa SDL freeglut SDL_image glew libvorbis asio boost
-    SDL_gfx ];
+    SDL_gfx pkgconfig bullet curl libarchive ];
 
   buildPhase = ''
     sed -i -e s,/usr/local,$out, SConstruct

From ccea8d08e98f3fdb0b948c4880e0eafab80341a1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Feb 2012 13:37:33 +0000
Subject: [PATCH 07/38] * Zabbix updated to 1.8.10.

svn path=/nixpkgs/trunk/; revision=32425
---
 pkgs/servers/monitoring/zabbix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix
index 41e617d80b6b..0e695c6c107a 100644
--- a/pkgs/servers/monitoring/zabbix/default.nix
+++ b/pkgs/servers/monitoring/zabbix/default.nix
@@ -2,11 +2,11 @@
 
 let
 
-  version = "1.8.7";
+  version = "1.8.10";
   
   src = fetchurl {
     url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz";
-    sha256 = "1727y9yphff7ad9n843yls7rp9lh86m83jmrj6xr0ah45f02ja9d";
+    sha256 = "0jx5i1ps1zr908g8gh1zisajiblg40x8cchmgbpdviz85hzx4rfr";
   };
 
   preConfigure =

From 9c33ae3f2b4cbd2f731d7035ab35f724af7ed627 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Feb 2012 14:26:01 +0000
Subject: [PATCH 08/38] * Fix ugly wpa_supplicant expression.

svn path=/nixpkgs/trunk/; revision=32427
---
 .../linux/wpa_supplicant/default.nix          | 84 +++++--------------
 .../linux/wpa_supplicant/gui-qt4.nix          | 15 ----
 pkgs/os-specific/linux/wpa_supplicant/gui.nix | 42 ++++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 4 files changed, 66 insertions(+), 77 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/wpa_supplicant/gui-qt4.nix
 create mode 100644 pkgs/os-specific/linux/wpa_supplicant/gui.nix

diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index 6ffc2c5a0597..b99f36c950a5 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -1,17 +1,15 @@
-{stdenv, fetchurl, openssl, qt4, inkscape, dbus_libs, pkgconfig, libnl1}:
+{ stdenv, fetchurl, openssl, dbus_libs, pkgconfig, libnl1 }:
 
-let
+stdenv.mkDerivation rec {
   version = "0.7.3";
+  
+  name = "wpa_supplicant-${version}";
+
   src = fetchurl {
     url = "http://hostap.epitest.fi/releases/wpa_supplicant-${version}.tar.gz";
     sha256 = "0hwlsn512q2ps8wxxjmkjfdg3vjqqb9mxnnwfv1wqijkm3551kfh";
   };
-in
-
-(stdenv.mkDerivation rec {
-  name = "wpa_supplicant-${version}";
-  inherit src;
-
+  
   preBuild = ''
     cd wpa_supplicant
     cp -v defconfig .config
@@ -23,24 +21,25 @@ in
     substituteInPlace Makefile --replace /usr/local $out
   '';
 
-  buildInputs = [openssl dbus_libs libnl1];
+  buildInputs = [ openssl dbus_libs libnl1 ];
 
   buildNativeInputs = [ pkgconfig ];
 
-  # Upstream patch required for NetworkManager-0.9
-  patches = [ (fetchurl {
-    url = "http://w1.fi/gitweb/gitweb.cgi?p=hostap-07.git;a=commitdiff_plain;h=b80b5639935d37b95d00f86b57f2844a9c775f57";
-    name = "wpa_supplicant-nm-0.9.patch";
-    sha256 = "1pqba0l4rfhba5qafvvbywi9x1qmphs944p704bh1flnx7cz6ya8";
-    })
-    # wpa_supplicant crashes when controlled through dbus (wicd/nm)
-    # see: https://bugzilla.redhat.com/show_bug.cgi?id=678625
-    (fetchurl {
-      url = "https://bugzilla.redhat.com/attachment.cgi?id=491018";
-      name = "dbus-assertion-fix.patch";
-      sha256 = "6206d79bcd800d56cae73e2a01a27ac2bee961512f77e5d62a59256a9919077a";
-    })
-  ];
+  patches =
+    [ # Upstream patch required for NetworkManager-0.9
+      (fetchurl {
+        url = "http://w1.fi/gitweb/gitweb.cgi?p=hostap-07.git;a=commitdiff_plain;h=b80b5639935d37b95d00f86b57f2844a9c775f57";
+        name = "wpa_supplicant-nm-0.9.patch";
+        sha256 = "1pqba0l4rfhba5qafvvbywi9x1qmphs944p704bh1flnx7cz6ya8";
+      })
+      # wpa_supplicant crashes when controlled through dbus (wicd/nm)
+      # see: https://bugzilla.redhat.com/show_bug.cgi?id=678625
+      (fetchurl {
+        url = "https://bugzilla.redhat.com/attachment.cgi?id=491018";
+        name = "dbus-assertion-fix.patch";
+        sha256 = "6206d79bcd800d56cae73e2a01a27ac2bee961512f77e5d62a59256a9919077a";
+      })
+    ];
 
   postInstall = ''
     ensureDir $out/share/man/man5 $out/share/man/man8
@@ -50,7 +49,7 @@ in
     cp -v dbus/*service $out/share/dbus-1/system-services
     sed -e "s@/sbin/wpa_supplicant@$out&@" -i $out/share/dbus-1/system-services/*
     cp -v dbus/dbus-wpa_supplicant.conf $out/etc/dbus-1/system.d
-  '';
+  ''; # */
 
   meta = {
     homepage = http://hostap.epitest.fi/wpa_supplicant/;
@@ -58,41 +57,4 @@ in
     maintainers = with stdenv.lib.maintainers; [marcweber urkud];
     platforms = stdenv.lib.platforms.linux;
   };
-}) // {
-gui = stdenv.mkDerivation {
-  name = "wpa_gui-${version}";
-
-  inherit src;
-
-  buildInputs = [ qt4 ];
-
-  buildNativeInputs = [ inkscape ];
-
-  prePatch = "cd wpa_supplicant/wpa_gui-qt4";
-
-  configurePhase = ''
-    lrelease wpa_gui.pro
-    qmake'';
-
-# We do not install .xpm icons. First of all, I don't know where they should
-# be install. Second, this allows us to drop imagemagick build-time dependency.
-  postBuild = ''
-    sed -e '/ICONS.*xpm/d' -i icons/Makefile
-    make -C icons
-  '';
-
-  installPhase = ''
-    mkdir -pv $out/bin
-    cp -v wpa_gui $out/bin
-    mkdir -pv $out/share/applications
-    cp -v wpa_gui.desktop $out/share/applications
-    mkdir -pv $out/share/icons
-    cp -av icons/hicolor $out/share/icons
-  '';
-
-  meta = {
-    description = "Qt4 wpa_supplicant client";
-    inherit (qt4.meta) platforms;
-  };
-};
 }
diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui-qt4.nix b/pkgs/os-specific/linux/wpa_supplicant/gui-qt4.nix
deleted file mode 100644
index 7b587cdd6230..000000000000
--- a/pkgs/os-specific/linux/wpa_supplicant/gui-qt4.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{stdenv, fetchurl, qt4, imagemagick, inkscape}:
-
-stdenv.mkDerivation rec {
-  pkgname = "wpa_supplicant";
-  version = "0.6.9";
-  name = "${pkgname}-gui-qt4-${version}";
-
-  src = fetchurl {
-    url = "http://hostap.epitest.fi/releases/${pkgname}-${version}.tar.gz";
-    sha256 = "0w7mf3nyilkjsn5v7p15v5fxnh0klgm8c979z80y0mkw7zx88lkf";
-  };
-
-  buildInputs = [qt4 imagemagick inkscape];
-  builder = ./builder-gui-qt4.sh;  
-}
diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/os-specific/linux/wpa_supplicant/gui.nix
new file mode 100644
index 000000000000..12ec08361a67
--- /dev/null
+++ b/pkgs/os-specific/linux/wpa_supplicant/gui.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, qt4, inkscape, wpa_supplicant }:
+
+stdenv.mkDerivation {
+  name = "wpa_gui-${wpa_supplicant.version}";
+
+  inherit (wpa_supplicant) src;
+
+  buildInputs = [ qt4 ];
+
+  buildNativeInputs = [ inkscape ];
+
+  prePatch = "cd wpa_supplicant/wpa_gui-qt4";
+
+  configurePhase =
+    ''
+      lrelease wpa_gui.pro
+      qmake
+    '';
+
+  # We do not install .xpm icons. First of all, I don't know where they should
+  # be install. Second, this allows us to drop imagemagick build-time dependency.
+  postBuild =
+    ''
+      sed -e '/ICONS.*xpm/d' -i icons/Makefile
+      make -C icons
+    '';
+
+  installPhase =
+    ''
+      mkdir -pv $out/bin
+      cp -v wpa_gui $out/bin
+      mkdir -pv $out/share/applications
+      cp -v wpa_gui.desktop $out/share/applications
+      mkdir -pv $out/share/icons
+      cp -av icons/hicolor $out/share/icons
+    '';
+
+  meta = {
+    description = "Qt-based GUI for wpa_supplicant";
+    inherit (qt4.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index da7b88385b68..b343872ca6c3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6270,7 +6270,7 @@ let
 
   wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { };
 
-  wpa_supplicant_gui = pkgs.wpa_supplicant.gui;
+  wpa_supplicant_gui = callPackage ../os-specific/linux/wpa_supplicant/gui.nix { };
 
   xf86_input_multitouch =
     callPackage ../os-specific/linux/xf86-input-multitouch { };

From fd41f11208e9e986446c502b2d49ee101e0f3fc2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Feb 2012 15:12:34 +0000
Subject: [PATCH 09/38] * dhcpcd: get the entry/exit hooks from /etc.

svn path=/nixpkgs/trunk/; revision=32429
---
 pkgs/tools/networking/dhcpcd/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index e71bd9f2a864..f23d0f41e114 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -8,11 +8,13 @@ stdenv.mkDerivation rec {
     sha256 = "1zhpm89s6bk29lx7hq5f6fqm7i6dq2wq9vv5m25rv5wv6747v0m6";
   };
 
+  configureFlags = "--sysconfdir=/etc";
+
   makeFlags = "PREFIX=\${out}";
 
   # Hack to make installation succeed.  dhcpcd will still use /var/db
   # at runtime.
-  installFlags = "DBDIR=\${TMPDIR}/db";
+  installFlags = "DBDIR=\${TMPDIR}/db SYSCONFDIR=$(out)/etc";
 
   meta = {
     description = "A client for the Dynamic Host Configuration Protocol (DHCP)";

From 9a6cf14ef11b3ff114d6f8411119e7c6ab35df0f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 20 Feb 2012 17:25:35 +0000
Subject: [PATCH 10/38] Fix tarball

svn path=/nixpkgs/trunk/; revision=32432
---
 pkgs/games/andyetitmoves/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/andyetitmoves/default.nix b/pkgs/games/andyetitmoves/default.nix
index 0b54e8286095..6234d3702f7c 100644
--- a/pkgs/games/andyetitmoves/default.nix
+++ b/pkgs/games/andyetitmoves/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
                           else "0mg41ya0b27blq3b5498kwl4rj46dj21rcd7qd0rw1kyvr7sx4v4";
              }
     else
-      abort "And Yet It Moves nix package only supports linux and intel cpu's.";
+      throw "And Yet It Moves nix package only supports linux and intel cpu's.";
 
   phases = "unpackPhase installPhase";
 

From 7f75de06325e00ba28dc93abbf3697bde9354d7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 20 Feb 2012 18:00:09 +0000
Subject: [PATCH 11/38] soqt, meshlab and paraview fail to build with qt 4.8. I
 set them for qt 4.7.

svn path=/nixpkgs/trunk/; revision=32433
---
 pkgs/top-level/all-packages.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b343872ca6c3..46ed9f5f5988 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4628,7 +4628,9 @@ let
 
   soprano = callPackage ../development/libraries/soprano { };
 
-  soqt = callPackage ../development/libraries/soqt { };
+  soqt = callPackage ../development/libraries/soqt {
+    qt4 = qt47;
+  };
 
   speechd = callPackage ../development/libraries/speechd { };
 
@@ -7192,7 +7194,7 @@ let
   merkaartor = callPackage ../applications/misc/merkaartor { };
 
   meshlab = callPackage ../applications/graphics/meshlab {
-    qt = qt4;
+    qt = qt47;
   };
 
   midori = builderDefsPackage (import ../applications/networking/browsers/midori) {
@@ -7350,6 +7352,7 @@ let
   };
 
   paraview = callPackage ../applications/graphics/paraview {
+    qt4 = qt47;
   };
 
   pdftk = callPackage ../tools/typesetting/pdftk { };

From 3a414e0292b834aec9be37d91a70a721f67463ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 20 Feb 2012 18:20:12 +0000
Subject: [PATCH 12/38] Adding python-xlib

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 77b10c10a071..302a1e284872 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2059,6 +2059,28 @@ let pythonPackages = python.modules // rec {
     wxGTK = pkgs.wxGTK28;
   };
 
+  xlib = buildPythonPackage (rec {
+    name = "xlib-0.15rc1";
+
+    src = fetchurl {
+      url = "mirror://sourceforge/python-xlib/python-${name}.tar.bz2";
+      sha256 = "0mvzz605pxzj7lfp2w6z4qglmr4rjza9xrb7sl8yn12cklzfky0m";
+    };
+
+    # Tests require `pyutil' so disable them to avoid circular references.
+    doCheck = false;
+
+    propagatedBuildInputs = [ pkgs.xlibs.libX11 ];
+
+    meta = {
+      description = "Fully functional X client library for Python programs";
+
+      homepage = http://python-xlib.sourceforge.net/;
+
+      license = "GPLv2+";
+    };
+  });
+
   zbase32 = buildPythonPackage (rec {
     name = "zbase32-1.1.2";
 

From 95cbf4ed555669bea9f0ea37678665db452c2cd8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Feb 2012 18:52:52 +0000
Subject: [PATCH 13/38] Modified the Python 2.7 expression so that the
 interpreter has unconditional OpenSSL support. Having OpenSSL available at
 the time the core interpreter is built enables all kinds of important crypto
 features (i.e. additional hashlib algorithms, etc.) that otherwise won't be
 available.

svn path=/nixpkgs/trunk/; revision=32435
---
 pkgs/applications/version-management/mercurial/default.nix | 6 +++---
 pkgs/development/interpreters/python/2.7/default.nix       | 7 +------
 pkgs/tools/networking/offlineimap/default.nix              | 4 +---
 pkgs/top-level/all-packages.nix                            | 6 ++----
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 976963e684bd..6118bee43908 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, python, makeWrapper, docutils, unzip
-, guiSupport ? false, tk ? null, ssl, curses }:
+, guiSupport ? false, tk ? null, curses }:
 
 let
   name = "mercurial-2.0.2";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   };
 
   inherit python; # pass it so that the same version can be used in hg2git
-  pythonPackages = [ ssl curses ];
+  pythonPackages = [ curses ];
 
   buildInputs = [ python makeWrapper docutils unzip ];
 
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
     ''
       for i in $(cd $out/bin && ls); do
         wrapProgram $out/bin/$i \
-          --prefix PYTHONPATH : "$(toPythonPath "$out ${ssl} ${curses}")" \
+          --prefix PYTHONPATH : "$(toPythonPath "$out ${curses}")" \
           $WRAP_TK
       done
 
diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index 1c8ae0cf171a..635d50dc5b3e 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -38,7 +38,7 @@ let
 
   buildInputs =
     optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
-    [ bzip2 ]
+    [ bzip2 openssl ]
     ++ optional zlibSupport zlib
     ++ optionals stdenv.isDarwin [ darwinArchUtility darwinSwVersUtility ];
 
@@ -172,11 +172,6 @@ let
       deps = [ sqlite ];
     };
 
-    ssl = buildInternalPythonModule {
-      moduleName = "ssl";
-      deps = [ openssl ];
-    };
-
     tkinter = buildInternalPythonModule {
       moduleName = "tkinter";
       deps = [ tcl tk x11 ];
diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index 8f0dd8e9a6cb..007c8f7c6e07 100644
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/pkgs/tools/networking/offlineimap/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, buildPythonPackage, ssl }:
+{ fetchurl, buildPythonPackage }:
 
 buildPythonPackage {
   name = "offlineimap-6.2.0.2";
@@ -8,8 +8,6 @@ buildPythonPackage {
     sha256 = "1w69qv1dm37m53k8cd068lk5z3qjlscnjxr397gs8kdsfds67v7c";
   };
 
-  propagatedBuildInputs = [ ssl ];
-
   doCheck = false;
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 46ed9f5f5988..310061a4049c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1110,9 +1110,7 @@ let
 
   odt2txt = callPackage ../tools/text/odt2txt { };
 
-  offlineimap = callPackage ../tools/networking/offlineimap {
-    ssl = pythonPackages.ssl;
-  };
+  offlineimap = callPackage ../tools/networking/offlineimap { };
 
   opendbx = callPackage ../development/libraries/opendbx { };
 
@@ -7185,7 +7183,7 @@ let
   };
 
   mercurial = callPackage ../applications/version-management/mercurial {
-    inherit (pythonPackages) ssl curses;
+    inherit (pythonPackages) curses;
     guiSupport = false;		# use mercurialFull to get hgk GUI
   };
 

From 45fed14272a77311b7ee7ab89d52629bfa084765 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Feb 2012 18:59:43 +0000
Subject: [PATCH 14/38] * Revert r32435.  We'll be doing a stdenv merge in a
 few days, so   let's put it in there rather than having the Nth near-complete
   rebuild of the trunk in a few days.

svn path=/nixpkgs/trunk/; revision=32436
---
 .../version-management/git-and-tools/svn2git/default.nix   | 6 +++---
 pkgs/applications/version-management/mercurial/default.nix | 6 +++---
 pkgs/development/interpreters/python/2.7/default.nix       | 7 ++++++-
 pkgs/tools/networking/offlineimap/default.nix              | 4 +++-
 pkgs/top-level/all-packages.nix                            | 6 ++++--
 5 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
index 534a00a357be..6f5d36f6aa74 100644
--- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, ruby, makeWrapper, git }:
 
 stdenv.mkDerivation rec {
-  name = "svn2git-2.2.0";
+  name = "svn2git-2.1.0-20111206";
 
   src = fetchgit {
     url = https://github.com/nirvdrum/svn2git;
-    rev = "db0769835e9d1d3ff324091a3bb7756200a09932";
-    sha256 = "6d2f2acb9900e2aa8e608d3239b42f890f2334b622adb5ea33b2b4815a52efa2";
+    rev = "5cd8d4b509affb66eb2dad50d7298c52b3b0d848";
+    sha256 = "26aa17f68f605e958b623d803b4bd405e12d6c5d51056635873a2c59e4c7b9ca";
   };
 
   buildInputs = [ ruby makeWrapper ];
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 6118bee43908..976963e684bd 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, python, makeWrapper, docutils, unzip
-, guiSupport ? false, tk ? null, curses }:
+, guiSupport ? false, tk ? null, ssl, curses }:
 
 let
   name = "mercurial-2.0.2";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   };
 
   inherit python; # pass it so that the same version can be used in hg2git
-  pythonPackages = [ curses ];
+  pythonPackages = [ ssl curses ];
 
   buildInputs = [ python makeWrapper docutils unzip ];
 
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
     ''
       for i in $(cd $out/bin && ls); do
         wrapProgram $out/bin/$i \
-          --prefix PYTHONPATH : "$(toPythonPath "$out ${curses}")" \
+          --prefix PYTHONPATH : "$(toPythonPath "$out ${ssl} ${curses}")" \
           $WRAP_TK
       done
 
diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index 635d50dc5b3e..1c8ae0cf171a 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -38,7 +38,7 @@ let
 
   buildInputs =
     optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
-    [ bzip2 openssl ]
+    [ bzip2 ]
     ++ optional zlibSupport zlib
     ++ optionals stdenv.isDarwin [ darwinArchUtility darwinSwVersUtility ];
 
@@ -172,6 +172,11 @@ let
       deps = [ sqlite ];
     };
 
+    ssl = buildInternalPythonModule {
+      moduleName = "ssl";
+      deps = [ openssl ];
+    };
+
     tkinter = buildInternalPythonModule {
       moduleName = "tkinter";
       deps = [ tcl tk x11 ];
diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index 007c8f7c6e07..8f0dd8e9a6cb 100644
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/pkgs/tools/networking/offlineimap/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, buildPythonPackage }:
+{ fetchurl, buildPythonPackage, ssl }:
 
 buildPythonPackage {
   name = "offlineimap-6.2.0.2";
@@ -8,6 +8,8 @@ buildPythonPackage {
     sha256 = "1w69qv1dm37m53k8cd068lk5z3qjlscnjxr397gs8kdsfds67v7c";
   };
 
+  propagatedBuildInputs = [ ssl ];
+
   doCheck = false;
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 310061a4049c..46ed9f5f5988 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1110,7 +1110,9 @@ let
 
   odt2txt = callPackage ../tools/text/odt2txt { };
 
-  offlineimap = callPackage ../tools/networking/offlineimap { };
+  offlineimap = callPackage ../tools/networking/offlineimap {
+    ssl = pythonPackages.ssl;
+  };
 
   opendbx = callPackage ../development/libraries/opendbx { };
 
@@ -7183,7 +7185,7 @@ let
   };
 
   mercurial = callPackage ../applications/version-management/mercurial {
-    inherit (pythonPackages) curses;
+    inherit (pythonPackages) ssl curses;
     guiSupport = false;		# use mercurialFull to get hgk GUI
   };
 

From 1dd8249087d7068c92b31ffcd007340b57ee442f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Feb 2012 19:03:12 +0000
Subject: [PATCH 15/38] haskell-hxt: updated to version 9.2.1

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

diff --git a/pkgs/development/libraries/haskell/hxt/default.nix b/pkgs/development/libraries/haskell/hxt/default.nix
index 3b7a197c49e4..cc1827ac3425 100644
--- a/pkgs/development/libraries/haskell/hxt/default.nix
+++ b/pkgs/development/libraries/haskell/hxt/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hxt";
-  version = "9.2.0";
-  sha256 = "182yl4ksh4hg332b0lnk4s9cfqxsnnan7p5vqas5lbxvibmg68zc";
+  version = "9.2.1";
+  sha256 = "0172icb36wx4fb6q3xq7pcs85d2hnn4bznq3wjwhval10mayri8y";
   buildDepends = [
     binary deepseq filepath HUnit hxtCharproperties hxtRegexXmlschema
     hxtUnicode mtl network parsec

From 19b43c8f425f5981e8aee71adda0bde287c944ac Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Feb 2012 19:03:15 +0000
Subject: [PATCH 16/38] haskell-yesod-core: updated to version 0.10.2

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

diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index 7699e4d291bb..da26265739e4 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "0.10.1";
-  sha256 = "011bxz0wjd349jhwxh0cs1lhqpjgwq57ia8wzxf21bcwy8c08nj0";
+  version = "0.10.2";
+  sha256 = "0ghfnpav5d0kzzl3vs4932kf0dgys3ad0658xcyf6i5k0izvkzfp";
   buildDepends = [
     aeson blazeBuilder blazeHtml caseInsensitive cereal clientsession
     conduit cookie failure fastLogger hamlet httpTypes liftedBase

From f2cece41e34bfe243cd2d83cf0326b3e3e46552f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 20 Feb 2012 21:35:05 +0000
Subject: [PATCH 17/38] Adding Skype4Py.

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 302a1e284872..96928ba41a57 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1822,6 +1822,35 @@ let pythonPackages = python.modules // rec {
     };
   });
 
+  skype4py = buildPythonPackage (rec {
+    name = "Skype4Py-1.0.32.0";
+
+    src = fetchurl {
+      url = mirror://sourceforge/skype4py/Skype4Py-1.0.32.0.tar.gz;
+      sha256 = "0cmkrv450wa8v50bng5dflpwkl5c1p9pzysjkb2956w5kvwh6f5b";
+    };
+
+    unpackPhase = ''
+      tar xf $src
+      find . -type d -exec chmod +rx {} \;
+      sourceRoot=`pwd`/`ls -d S*`
+    '';
+
+    doCheck = false;
+
+    propagatedBuildInputs = [ pkgs.xlibs.libX11 ];
+
+    meta = {
+      description = "High-level, platform independent Skype API wrapper for Python";
+
+      # The advertisement says https://developer.skype.com/wiki/Skype4Py
+      # but that url does not work. This following web page points to the
+      # download link and has some information about the package.
+      homepage = http://pypi.python.org/pypi/Skype4Py/1.0.32.0;
+
+      license = "BSD";
+    };
+  });
 
   sphinx = buildPythonPackage (rec {
     name = "Sphinx-1.0.7";

From b4f548ff413bf48ca2215f2f533232e1e72bf678 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 20 Feb 2012 21:49:05 +0000
Subject: [PATCH 18/38] Fixing Skype4Py (build inputs)

svn path=/nixpkgs/trunk/; revision=32443
---
 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 96928ba41a57..7f442e556983 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1838,7 +1838,7 @@ let pythonPackages = python.modules // rec {
 
     doCheck = false;
 
-    propagatedBuildInputs = [ pkgs.xlibs.libX11 ];
+    propagatedBuildInputs = [ pkgs.xlibs.libX11 pkgs.pythonDBus pkgs.pygobject ];
 
     meta = {
       description = "High-level, platform independent Skype API wrapper for Python";

From 869543fa05eb42f0d8da3fb8e8958263489fa823 Mon Sep 17 00:00:00 2001
From: Arie Middelkoop <amiddelk@gmail.com>
Date: Tue, 21 Feb 2012 09:01:56 +0000
Subject: [PATCH 19/38] Updated the hash of texlive's 'moderncv.zip'.

Apparently the file gets updated once in a while. It does not have a version number either. Not very nice.

svn path=/nixpkgs/trunk/; revision=32444
---
 pkgs/tools/typesetting/tex/texlive/moderncv.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/moderncv.nix b/pkgs/tools/typesetting/tex/texlive/moderncv.nix
index 9e3f68f36b10..b8e27bd93d3b 100644
--- a/pkgs/tools/typesetting/tex/texlive/moderncv.nix
+++ b/pkgs/tools/typesetting/tex/texlive/moderncv.nix
@@ -3,7 +3,7 @@ rec {
   name = "moderncv-2012.01.16";
   src = fetchurl {
     url = "http://mirror.ctan.org/macros/latex/contrib/moderncv.zip";
-    sha256 = "1sfpj76p0z128rvxw0svh7dfrvf3zhmi3v7bkzfkll4byij34ni0";
+    sha256 = "5cd2117cd2a3572dbc055033ca81ca744ee65918c42d23687e133bb1e6ddd644";
   };
 
   buildInputs = [texLive unzip];

From 9843a6f1006a75d7fc83a16663da6610ec6fdbaf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 21 Feb 2012 10:07:08 +0000
Subject: [PATCH 20/38] yesod-core: disable haddock phase in this version of
 the package to avoid build failures because of syntax errors in the
 documentation

The bug has been reported upstream.

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

diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index da26265739e4..1dac677e945c 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -17,6 +17,7 @@ cabal.mkDerivation (self: {
     shakespeareI18n shakespeareJs text time transformers
     transformersBase vector wai waiExtra waiLogger yesodRoutes
   ];
+  noHaddock = true;
   meta = {
     homepage = "http://www.yesodweb.com/";
     description = "Creation of type-safe, RESTful web applications";

From 80118756811fd61b4f9ac61987fbd9b137a75495 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 21 Feb 2012 10:07:10 +0000
Subject: [PATCH 21/38] haskell-conduit: updated to version 0.2.2

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

diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index d1a26389c7a1..e2963b2ad203 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "0.2.1";
-  sha256 = "1350n6nylvn62pdnm1cpm75yli9x3adf9m9jjz04z0gmzd3mvhd9";
+  version = "0.2.2";
+  sha256 = "1iwmf0zdrrxh8q3xja742j17nanj6va5zj9bs9a5m78whf8cc80j";
   buildDepends = [
     liftedBase monadControl text transformers transformersBase
   ];

From eac41535743652a4bb55468d2f1337fc4c80aa57 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 21 Feb 2012 10:07:12 +0000
Subject: [PATCH 22/38] haskell-yesod-form: updated to version 0.4.2

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

diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix
index 3b1d6e9170dd..981f5500f499 100644
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-form";
-  version = "0.4.1";
-  sha256 = "0l55n7zml3sf8f2qmmii5cq53awajc4vfr5msrm8kvi3ivzjld0s";
+  version = "0.4.2";
+  sha256 = "0vl938ngf8lbpylra9wmywgcdffi9prhbz45d6cl1hra9hlsavj6";
   buildDepends = [
     blazeBuilder blazeHtml dataDefault emailValidate hamlet network
     persistent shakespeareCss shakespeareJs text time transformers wai

From f8703e3b25bd6938a6b68e4bc662b5add10549a6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 21 Feb 2012 10:09:34 +0000
Subject: [PATCH 23/38] haskell-packages.nix: updated version of HUnit used by
 GHC 7.4.1

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 53d495eb4c57..85f76d427874 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -139,7 +139,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     GLUT         = self.GLUT_2_3_0_0;           # 7.4.1 ok
     haskellSrc   = self.haskellSrc_1_0_1_5;     # 7.4.1 ok
     html         = self.html_1_0_1_2;           # 7.4.1 ok
-    HUnit        = self.HUnit_1_2_2_3;          # 7.4.1 ok
+    HUnit        = self.HUnit_1_2_4_2;          # 7.4.1 ok
     network      = self.network_2_3_0_11;       # 7.4.1 ok
     OpenGL       = self.OpenGL_2_5_0_0;         # 7.4.1 ok
     parallel     = self.parallel_3_2_0_2;       # 7.4.1 ok
@@ -907,7 +907,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   HUnit_1_2_2_1 = callPackage ../development/libraries/haskell/HUnit/1.2.2.1.nix {};
   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 = self.HUnit_1_2_0_3;
+  HUnit = self.HUnit_1_2_4_2;
 
   hxt = callPackage ../development/libraries/haskell/hxt {};
 

From 4e76d21c848d19eb3f7074e87689ed120bd5c9fb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 21 Feb 2012 10:58:15 +0000
Subject: [PATCH 24/38] nbd: updated to version 3.0

svn path=/nixpkgs/trunk/; revision=32450
---
 ...or-HAVE_FALLOC_PH-in-both-occurrence.patch | 25 -------------------
 pkgs/tools/networking/nbd/default.nix         |  6 ++---
 2 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/tools/networking/nbd/0001-properly-check-for-HAVE_FALLOC_PH-in-both-occurrence.patch

diff --git a/pkgs/tools/networking/nbd/0001-properly-check-for-HAVE_FALLOC_PH-in-both-occurrence.patch b/pkgs/tools/networking/nbd/0001-properly-check-for-HAVE_FALLOC_PH-in-both-occurrence.patch
deleted file mode 100644
index e4bb0db3abf8..000000000000
--- a/pkgs/tools/networking/nbd/0001-properly-check-for-HAVE_FALLOC_PH-in-both-occurrence.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 42d3c4e7e95ea0e0dda9b502b2de2c4ed9ed9467 Mon Sep 17 00:00:00 2001
-From: "T.M. Abraham" <tabraham@novell.com>
-Date: Fri, 6 Jan 2012 21:58:55 -0500
-Subject: [PATCH] properly check for HAVE_FALLOC_PH in both occurrences
-
----
- nbd-server.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/nbd-server.c b/nbd-server.c
-index 0ecf0e8..2cd066d 100644
---- a/nbd-server.c
-+++ b/nbd-server.c
-@@ -1461,7 +1461,7 @@ int expflush(CLIENT *client) {
-  * file to resparsify stuff that isn't needed anymore (see NBD_CMD_TRIM)
-  */
- int exptrim(struct nbd_request* req, CLIENT* client) {
--#ifdef HAVE_FALLOC_PH
-+#if HAVE_FALLOC_PH
- 	FILE_INFO prev = g_array_index(client->export, FILE_INFO, 0);
- 	FILE_INFO cur = prev;
- 	int i = 1;
--- 
-1.7.8
-
diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix
index ea2fbe5bc574..cf3f41f7accb 100644
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/pkgs/tools/networking/nbd/default.nix
@@ -1,18 +1,16 @@
 { stdenv, fetchurl, pkgconfig, glib }:
 
 let
-  name = "nbd-2.9.25";
+  name = "nbd-3.0";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "mirror://sourceforge/nbd/${name}.tar.bz2";
-    sha256 = "179548406aa2bcb0c6bff3aa0484dbb04136ec055aa385c84fefbe3c9ea96ba4";
+    sha256 = "f7210edfa858f5ae69bdbf76f5467ac9dcaa97074d945e55e2a683e7aa228b93";
   };
 
-  patches = [ ./0001-properly-check-for-HAVE_FALLOC_PH-in-both-occurrence.patch ];
-
   buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.kernelHeaders;
 
   postInstall = ''install -D -m 444 README "$out/share/doc/nbd/README"'';

From a81366984eddd197fc41cbc5ec881ade59273c53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 21 Feb 2012 11:34:57 +0000
Subject: [PATCH 25/38] Updating octave to 3.6.0

svn path=/nixpkgs/trunk/; revision=32451
---
 .../interpreters/octave/default.nix           | 22 ++++++++++++-------
 .../development/libraries/clapack/default.nix | 11 +++++++---
 pkgs/top-level/all-packages.nix               |  7 +++---
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index f873f4e74754..1bb8cbe247bc 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -1,13 +1,19 @@
 {stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull,
-libX11, graphicsmagick}:
+libX11, graphicsmagick, pcre, blas, clapack, texLive }:
 
-stdenv.mkDerivation {
-  name = "octave-3.2.4";
+stdenv.mkDerivation rec {
+  name = "octave-3.6.0";
   src = fetchurl {
-    url = ftp://ftp.octave.org/pub/octave/octave-3.2.4.tar.bz2;
-    sha256 = "0iyivx7qz7cvwz7qczqrl4ysqivlhn5ax92z9md0m77dqw2isis8";
+    url = "mirror://gnu/octave/${name}.tar.bz2";
+    sha256 = "1mwj5pbbdzfbmcqyk0vx6si7mh8yhayppwnb1i63v871gxy775z5";
   };
-  buildInputs = [gfortran readline ncurses perl flex texinfo qhull libX11
-    graphicsmagick ];
-  configureFlags = "--enable-readline --enable-dl";
+
+  buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11
+    graphicsmagick pcre blas clapack texLive ];
+
+  NIX_LDFLAGS = "-lf2c"; # For clapack
+
+  enableParallelBuilding = true;
+
+  configureFlags = "--enable-readline --enable-dl --disable-docs";
 }
diff --git a/pkgs/development/libraries/clapack/default.nix b/pkgs/development/libraries/clapack/default.nix
index a40044ee3a34..6b10d31e111b 100644
--- a/pkgs/development/libraries/clapack/default.nix
+++ b/pkgs/development/libraries/clapack/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, cmake}:
+{stdenv, fetchurl, cmake, withPIC ? false }:
 
 stdenv.mkDerivation rec {
   name = "clapack-3.2.1";
@@ -16,8 +16,13 @@ stdenv.mkDerivation rec {
     cp ../INCLUDE/* $out/include
   '';
 
-  doCheck = true;
-  checkPhase = "ctest";
+  cmakeFlags = if withPIC then "-DCMAKE_C_FLAGS=-fPIC" else "";
+
+  # We disable the test phase, because some tests fail.
+  # Forums say it's normal for some to fail:
+  # http://icl.cs.utk.edu/lapack-forum/viewtopic.php?f=2&t=167
+  # doCheck = true;
+  # checkPhase = "ctest";
 
   meta = {
     homepage = http://www.netlib.org/clapack/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 46ed9f5f5988..8c2a7736a7d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2665,10 +2665,9 @@ let
   maude = callPackage ../development/interpreters/maude { };
 
   octave = callPackage ../development/interpreters/octave {
-    # Needed because later gm versions require an initialization the actual octave is not
-    # doing.
-    # http://www-old.cae.wisc.edu/pipermail/octave-maintainers/2010-February/015295.html
-    graphicsmagick = graphicsmagick137;
+    clapack = clapack.override {
+      withPIC = true;
+    };
   };
 
   # mercurial (hg) bleeding edge version

From 743c7e35391eafacf0a3ce2012101ea16fbc7727 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 21 Feb 2012 12:57:23 +0000
Subject: [PATCH 26/38] Let hydra build paraview with qt-4.7 and qt-4.8

svn path=/nixpkgs/trunk/; revision=32452
---
 pkgs/applications/graphics/paraview/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                 | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix
index 0c00553f2711..ba67a755de4b 100644
--- a/pkgs/applications/graphics/paraview/default.nix
+++ b/pkgs/applications/graphics/paraview/default.nix
@@ -3,7 +3,7 @@
 , mpich2
 , python
 , libxml2
-, mesa
+, mesa, libXt
 }:
 
 stdenv.mkDerivation rec {
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ cmake qt4 hdf5 mpich2 python libxml2 mesa ];
+  buildInputs = [ cmake qt4 hdf5 mpich2 python libxml2 mesa libXt ];
 
   meta = {
     homepage = "http://www.paraview.org/";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8c2a7736a7d2..8936f6fd7005 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7354,6 +7354,8 @@ let
     qt4 = qt47;
   };
 
+  paraviewQt48 = paraview.override { qt4 = qt48; };
+
   pdftk = callPackage ../tools/typesetting/pdftk { };
 
   pidgin = callPackage ../applications/networking/instant-messengers/pidgin {

From 6c796fa5393a6143fe0205192b753532377a3513 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 21 Feb 2012 13:39:29 +0000
Subject: [PATCH 27/38] haskell-yesod-core: updated to version 0.10.2.1

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

diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index 1dac677e945c..208f4e82b0e8 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "0.10.2";
-  sha256 = "0ghfnpav5d0kzzl3vs4932kf0dgys3ad0658xcyf6i5k0izvkzfp";
+  version = "0.10.2.1";
+  sha256 = "00cw31k6fkffryiqji33x56hqxivwg2c3rgaqmplph9zjpndvgb2";
   buildDepends = [
     aeson blazeBuilder blazeHtml caseInsensitive cereal clientsession
     conduit cookie failure fastLogger hamlet httpTypes liftedBase

From 8229dc4357f58cf8dc334d9394c22769480e5ced Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 21 Feb 2012 13:52:32 +0000
Subject: [PATCH 28/38] Trying to fix soqt for qt-4.8

svn path=/nixpkgs/trunk/; revision=32454
---
 pkgs/development/libraries/soqt/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix             | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix
index f5a7724c5065..60b148f870e5 100644
--- a/pkgs/development/libraries/soqt/default.nix
+++ b/pkgs/development/libraries/soqt/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, coin3d, qt4 }:
+{ fetchurl, stdenv, coin3d, qt4, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "soqt-${version}";
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ coin3d qt4 ];
 
+  buildNativeInputs = [ pkgconfig ];
+
   meta = {
     homepage = http://www.coin3d.org/;
     license = "GPLv2+";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8936f6fd7005..2d14d943567e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4631,6 +4631,8 @@ let
     qt4 = qt47;
   };
 
+  soqtQt48 = soqt.override { qt4 = qt48; };
+
   speechd = callPackage ../development/libraries/speechd { };
 
   speech_tools = callPackage ../development/libraries/speech-tools {};

From a2838873883425d5a83c68b5b06b52412a21248f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 21 Feb 2012 14:45:53 +0000
Subject: [PATCH 29/38] Xfig: Fix URL; add `meta.platforms'.

svn path=/nixpkgs/trunk/; revision=32457
---
 pkgs/applications/graphics/xfig/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/applications/graphics/xfig/default.nix
index 80c284619925..e4ab57989184 100644
--- a/pkgs/applications/graphics/xfig/default.nix
+++ b/pkgs/applications/graphics/xfig/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "xfig-${version}";
 
   src = fetchurl {
-    url = "http://sourceforge/mcj/xfig.${version}.full.tar.gz";
+    url = "mirror://sourceforge/mcj/xfig.${version}.full.tar.gz";
     sha256 = "1hl5x49sgc0vap411whhcq6qhvh4xbjg7jggv7ih9pplg5nwy0aw";
   };
 
@@ -40,5 +40,6 @@ stdenv.mkDerivation {
   meta = {
     description = "An interactive drawing tool for X11";
     homepage = http://xfig.org;
+    platforms = stdenv.lib.platforms.gnu;         # arbitrary choice
   };
 }

From 2847a37fa96885d76758c5ef8e807a7403fd1ad1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 21 Feb 2012 14:49:36 +0000
Subject: [PATCH 30/38] Updating atlas to 3.9.67, the latest development
 version

svn path=/nixpkgs/trunk/; revision=32458
---
 pkgs/development/libraries/science/math/atlas/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix
index e2d9083eda48..1c5e0d9068e8 100644
--- a/pkgs/development/libraries/science/math/atlas/default.nix
+++ b/pkgs/development/libraries/science/math/atlas/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gfortran }:
 
 stdenv.mkDerivation {
-  name = "atlas-3.9.11";
+  name = "atlas-3.9.67";
   
   src = fetchurl {
-    url = mirror://sf/math-atlas/atlas3.9.11.tar.bz2;
-    sha256 = "d91e593a772cf540ff693f7d8c43d10c3037eb334c5c77572ea1b6a64a0b9677";
+    url = mirror://sf/math-atlas/atlas3.9.67.tar.bz2;
+    sha256 = "06xxlv440z8a3qmfrh17p28girv71c6awvpw5vhpspr0pcsgk1pa";
   };
 
   # configure outside of the source directory

From da2159548a3973ea92dca2f28ef73ce4ec773061 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 21 Feb 2012 15:07:39 +0000
Subject: [PATCH 31/38] nbd: avoid use of "install -D", which doesn't seem to
 work on FreeBSD

svn path=/nixpkgs/trunk/; revision=32459
---
 pkgs/tools/networking/nbd/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix
index cf3f41f7accb..929db0171525 100644
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/pkgs/tools/networking/nbd/default.nix
@@ -13,7 +13,10 @@ stdenv.mkDerivation {
 
   buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.kernelHeaders;
 
-  postInstall = ''install -D -m 444 README "$out/share/doc/nbd/README"'';
+  postInstall = ''
+    mkdir -p "$out/share/doc/${name}"
+    cp README "$out/share/doc/${name}/README"
+  '';
 
   # The test suite doesn't succeed on Hydra.
   doCheck = false;

From 47e9932cd283c877c7e56e7a0af32ac247bbb6b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 21 Feb 2012 15:45:22 +0000
Subject: [PATCH 32/38] I attempted to get octave 3.4.3 working with atlas, but
 it also builds and crashes at plot(1), as 3.6.0 also did. I don't know what's
 wrong there.

Program received signal SIGSEGV, Segmentation fault.
0x00007ffff694e3ad in dtrtri_

Exact as 3.6.0. I'll revert to the old octave version that worked without any
blas or lapack implementation.

--This line, and those below, will be ignored-e-

M    pkgs/development/interpreters/octave/default.nix

svn path=/nixpkgs/trunk/; revision=32460
---
 pkgs/development/interpreters/octave/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 1bb8cbe247bc..84374e1e3d56 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -1,19 +1,21 @@
 {stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull,
-libX11, graphicsmagick, pcre, blas, clapack, texLive }:
+libX11, graphicsmagick, pcre, atlas, clapack, texLive }:
 
 stdenv.mkDerivation rec {
-  name = "octave-3.6.0";
+  name = "octave-3.4.3";
   src = fetchurl {
     url = "mirror://gnu/octave/${name}.tar.bz2";
-    sha256 = "1mwj5pbbdzfbmcqyk0vx6si7mh8yhayppwnb1i63v871gxy775z5";
+    sha256 = "0j61kpfbv8l8rw3r9cwcmskvvav3q2f6plqdq3lnb153jg61klcl";
   };
 
   buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11
-    graphicsmagick pcre blas clapack texLive ];
-
-  NIX_LDFLAGS = "-lf2c"; # For clapack
+    graphicsmagick pcre clapack atlas texLive ];
 
   enableParallelBuilding = true;
 
-  configureFlags = "--enable-readline --enable-dl --disable-docs";
+  preConfigure = ''
+    configureFlagsArray=('--with-blas=-L${atlas}/lib -lf77blas -latlas'
+      '--with-lapack=-L${clapack}/lib -llapack -lf2c')
+  '';
+  configureFlags = [ "--enable-readline" "--enable-dl" ];
 }

From bbc7b115729d79070a09ec192d9970877c62bfc5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 21 Feb 2012 16:41:30 +0000
Subject: [PATCH 33/38] haskell-dimensional: updated to version 0.10.2

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

diff --git a/pkgs/development/libraries/haskell/dimensional/default.nix b/pkgs/development/libraries/haskell/dimensional/default.nix
index 35b5a8d24403..d36f351fcf60 100644
--- a/pkgs/development/libraries/haskell/dimensional/default.nix
+++ b/pkgs/development/libraries/haskell/dimensional/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dimensional";
-  version = "0.10.1.2";
-  sha256 = "0hdiwyzr4zzwz5h8m7nrcdf85n00byjchr6ghbasnsg3vg9p17wn";
+  version = "0.10.2";
+  sha256 = "14idyacd38a2kc97hp773j8iiim2lxh9czr8gp12m66w4n603znn";
   buildDepends = [ numtype time ];
   meta = {
     homepage = "http://dimensional.googlecode.com/";

From fa990884eccc36db960379e23c87f8491948b3cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 21 Feb 2012 18:19:00 +0000
Subject: [PATCH 34/38] Adding TaskCoach.

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7f442e556983..6ed0c5ec8d73 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1917,6 +1917,32 @@ let pythonPackages = python.modules // rec {
     };
   };
 
+  taskcoach = buildPythonPackage rec {
+    name = "TaskCoach-1.3.7";
+
+    src = fetchurl {
+      url = "mirror://sourceforge/taskcoach/${name}.tar.gz";
+      sha256 = "069hyxc8ypn51a8imfkfqdalp1l4pv09swj2v3bi4hjscq9af6i8";
+    };
+
+    propagatedBuildInputs = [ wxPython ];
+
+    # I don't know why I need to add these libraries. Shouldn't they
+    # be part of wxPython?
+    postInstall = ''
+      libspaths=${pkgs.xlibs.libSM}/lib:${pkgs.xlibs.libXScrnSaver}/lib
+      wrapProgram $out/bin/taskcoach.py \
+        --prefix LD_LIBRARY_PATH : $libspaths
+    '';
+
+    doCheck = false;
+
+    meta = {
+      homepage = http://taskcoach.org/;
+      description = "A very small text templating language";
+      license = "GPLv3+";
+    };
+  };
 
   tempita = buildPythonPackage rec {
     version = "0.4";

From 8cb96ff7b221c309f8f69db839fb851b06af1207 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 21 Feb 2012 18:22:38 +0000
Subject: [PATCH 35/38] Fixing the description of TaskCoach. I committed too
 fast.

svn path=/nixpkgs/trunk/; revision=32463
---
 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 6ed0c5ec8d73..35de47cc5e52 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1939,7 +1939,7 @@ let pythonPackages = python.modules // rec {
 
     meta = {
       homepage = http://taskcoach.org/;
-      description = "A very small text templating language";
+      description = "Todo manager to keep track of personal tasks and todo lists";
       license = "GPLv3+";
     };
   };

From 5e2de19cc1ad78d942c82c2a8ee389482015a4f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 21 Feb 2012 21:43:44 +0000
Subject: [PATCH 36/38] Fixing octave, so plot(1) works.

Linking octave with clapack did not work.

I updated lapack, and additionally I build it with atlas, instead of blas. That should give
better performance. I don't know if atlas builds everywhere though.

On the other hand, maybe some programs linking with liblapack will fail. We'll have to check
the hydra reports.

I plan to remove clapack; liblapack provides a C interface too.


svn path=/nixpkgs/trunk/; revision=32464
---
 .../interpreters/octave/default.nix           |  8 +--
 .../science/math/liblapack/blas-link.patch    | 24 -------
 .../science/math/liblapack/default.nix        | 69 ++++---------------
 pkgs/top-level/all-packages.nix               |  6 +-
 4 files changed, 16 insertions(+), 91 deletions(-)
 delete mode 100644 pkgs/development/libraries/science/math/liblapack/blas-link.patch

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 84374e1e3d56..439b687dacef 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -1,5 +1,5 @@
 {stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull,
-libX11, graphicsmagick, pcre, atlas, clapack, texLive }:
+libX11, graphicsmagick, pcre, liblapack, texLive, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "octave-3.4.3";
@@ -9,13 +9,9 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11
-    graphicsmagick pcre clapack atlas texLive ];
+    graphicsmagick pcre liblapack texLive pkgconfig ];
 
   enableParallelBuilding = true;
 
-  preConfigure = ''
-    configureFlagsArray=('--with-blas=-L${atlas}/lib -lf77blas -latlas'
-      '--with-lapack=-L${clapack}/lib -llapack -lf2c')
-  '';
   configureFlags = [ "--enable-readline" "--enable-dl" ];
 }
diff --git a/pkgs/development/libraries/science/math/liblapack/blas-link.patch b/pkgs/development/libraries/science/math/liblapack/blas-link.patch
deleted file mode 100644
index e1ff853a291a..000000000000
--- a/pkgs/development/libraries/science/math/liblapack/blas-link.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur lapack-3.2.old/SRC/Makefile lapack-3.2/SRC/Makefile
---- lapack-3.2.old/SRC/Makefile	2009-02-04 11:33:35.006839507 +0100
-+++ lapack-3.2/SRC/Makefile	2009-02-04 11:33:51.987551506 +0100
-@@ -367,7 +367,7 @@
- 	$(ALLAUX)
- 
- ../$(LAPACKLIB): $(ALLOBJ) $(ALLXOBJ)
--	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) $(ALLXOBJ)
-+	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) $(ALLXOBJ) ${BLASLIB}
- 	$(RANLIB) $@
- 
- single: $(SLASRC) $(ALLAUX) $(SCLAUX) 
-diff -Naur lapack-3.2.old/TESTING/MATGEN/Makefile lapack-3.2/TESTING/MATGEN/Makefile
---- lapack-3.2.old/TESTING/MATGEN/Makefile	2009-02-04 11:35:10.426806473 +0100
-+++ lapack-3.2/TESTING/MATGEN/Makefile	2009-02-04 11:34:42.850565181 +0100
-@@ -60,7 +60,7 @@
- 
- ../../$(TMGLIB): $(SMATGEN) $(CMATGEN) $(SCATGEN) $(DMATGEN)	\
- 		$(ZMATGEN) $(DZATGEN)
--	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ)
-+	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) ${BLASLIB}
- 	$(RANLIB) $@
- 
- single: $(SMATGEN) $(SCATGEN)
diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix
index a731360be562..acede395c84d 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -1,66 +1,23 @@
-{ stdenv, fetchurl, gfortran, blas }:
+{ stdenv, fetchurl, gfortran, atlas, cmake }:
 
 stdenv.mkDerivation {
-  name = "liblapack-3.2.1";
+  name = "liblapack-3.4.0";
   src = fetchurl {
-    url = "http://www.netlib.org/lapack/lapack-3.2.1.tgz";
-    sha256 = "5825f83971157001fd4235514afe8ff5fc16e1c06b2e872e442c242efd6c166d";
+    url = "http://www.netlib.org/lapack/lapack-3.4.0.tgz";
+    sha256 = "1sf30v1ps5icg67dvw5sbx5yhypx13am470gqg2f7l04f3wrw4x7";
   };
 
-  buildInputs = [gfortran blas];
-  patches = [ ./blas-link.patch ];
+  propagatedBuildInputs = [ atlas ];
+  buildInputs = [ gfortran cmake ];
 
-  configurePhase = ''
-    echo >make.inc  "SHELL = ${stdenv.shell}"
-    echo >>make.inc "PLAT ="
-    echo >>make.inc "FORTRAN = gfortran"
-    echo >>make.inc "OPTS = -O2 -fPIC"
-    echo >>make.inc "DRVOPTS = \$(OPTS)"
-    echo >>make.inc "NOOPT = -O0 -fPIC"
-    echo >>make.inc "LOADER = gfortran"
-    echo >>make.inc "LOADOPTS ="
-    echo >>make.inc "TIMER = INT_ETIME"
-    echo >>make.inc "ARCH = gfortran"
-    echo >>make.inc "ARCHFLAGS = -shared -o"
-    echo >>make.inc "RANLIB = echo"
-    echo >>make.inc "BLASLIB = -lblas"
-    echo >>make.inc "LAPACKLIB = liblapack.so.3"
-    echo >>make.inc "TMGLIB = libtmglib.so.3"
-    echo >>make.inc "EIGSRCLIB = libeigsrc.so.3"
-    echo >>make.inc "LINSRCLIB = liblinsrc.so.3"
-  '';
+  cmakeFlags = [
+    "-DUSE_OPTIMIZED_BLAS=ON"
+    "-DBLAS_ATLAS_f77blas_LIBRARY=${atlas}/lib/libf77blas.a"
+    "-DBLAS_ATLAS_atlas_LIBRARY=${atlas}/lib/libatlas.a"
+    "-DCMAKE_Fortran_FLAGS=-fPIC"
+  ];
 
-  buildPhase = ''
-    make clean
-    make lib
-    echo >make.inc  "SHELL = ${stdenv.shell}"
-    echo >>make.inc "PLAT ="
-    echo >>make.inc "FORTRAN = gfortran"
-    echo >>make.inc "OPTS = -O2 -fPIC"
-    echo >>make.inc "DRVOPTS = \$(OPTS)"
-    echo >>make.inc "NOOPT = -O0 -fPIC"
-    echo >>make.inc "LOADER = gfortran"
-    echo >>make.inc "LOADOPTS = "
-    echo >>make.inc "TIMER = INT_ETIME"
-    echo >>make.inc "ARCH = ar rcs"
-    echo >>make.inc "RANLIB = ranlib"
-    echo >>make.inc "BLASLIB = "
-    echo >>make.inc "ARCHFLAGS ="
-    echo >>make.inc "LAPACKLIB    = liblapack.a"
-    echo >>make.inc "TMGLIB       = tmglib.a"
-    echo >>make.inc "EIGSRCLIB    = eigsrc.a"
-    echo >>make.inc "LINSRCLIB    = linsrc.a"
-    make clean
-    make lib
-  '';
-
-  installPhase = ''
-    ensureDir "$out/lib"
-    install -m755 *.a* "$out/lib"
-    install -m755 *.so* "$out/lib"
-    ln -sf liblapack.so.3 "$out/lib/liblapack.so"
-    ln -sf libtmglib.so.3 "$out/lib/libtmglib.so"
-  '';
+  enableParallelBuilding = true;
 
   meta = {
     description = "Linear Algebra PACKage";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2d14d943567e..c6952e7f54b7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2664,11 +2664,7 @@ let
 
   maude = callPackage ../development/interpreters/maude { };
 
-  octave = callPackage ../development/interpreters/octave {
-    clapack = clapack.override {
-      withPIC = true;
-    };
-  };
+  octave = callPackage ../development/interpreters/octave { };
 
   # mercurial (hg) bleeding edge version
   octaveHG = callPackage ../development/interpreters/octave/hg.nix { };

From b5a904153b45012c22e65298d2cc1b61eca9ebe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 21 Feb 2012 22:09:48 +0000
Subject: [PATCH 37/38] Building octave with mesa and fltk to have the new fltk
 graphics toolkit available. I also add more libs octave appreciates for some
 functions.

I've not tested the graphics toolkit, but it builds.


svn path=/nixpkgs/trunk/; revision=32465
---
 pkgs/development/interpreters/octave/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix                  | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 439b687dacef..6bb3431668f4 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -1,5 +1,6 @@
 {stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull,
-libX11, graphicsmagick, pcre, liblapack, texLive, pkgconfig }:
+libX11, graphicsmagick, pcre, liblapack, texLive, pkgconfig, mesa, fltk,
+fftw, fftwSinglePrec, zlib, curl }:
 
 stdenv.mkDerivation rec {
   name = "octave-3.4.3";
@@ -9,7 +10,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11
-    graphicsmagick pcre liblapack texLive pkgconfig ];
+    graphicsmagick pcre liblapack texLive pkgconfig mesa fltk zlib curl
+    fftw fftwSinglePrec ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c6952e7f54b7..36cffb34b889 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2664,7 +2664,9 @@ let
 
   maude = callPackage ../development/interpreters/maude { };
 
-  octave = callPackage ../development/interpreters/octave { };
+  octave = callPackage ../development/interpreters/octave {
+    fltk = fltk13;
+  };
 
   # mercurial (hg) bleeding edge version
   octaveHG = callPackage ../development/interpreters/octave/hg.nix { };

From fb12a6838f1fda1d6ace53d0d97a548a1e427ced Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 21 Feb 2012 22:16:33 +0000
Subject: [PATCH 38/38] I remove clapack, and an unused reference I found.

Now liblapack provides a c interface too.


svn path=/nixpkgs/trunk/; revision=32466
---
 .../applications/graphics/digikam/default.nix |  2 +-
 .../development/libraries/clapack/default.nix | 32 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 3 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 pkgs/development/libraries/clapack/default.nix

diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index 4467ae338e49..1c152195d68e 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen,
 lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, libjpeg, libtiff,
 liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost,
-shared_desktop_ontologies, marble, clapack, mysql }:
+shared_desktop_ontologies, marble, mysql }:
 
 stdenv.mkDerivation rec {
   name = "digikam-2.5.0";
diff --git a/pkgs/development/libraries/clapack/default.nix b/pkgs/development/libraries/clapack/default.nix
deleted file mode 100644
index 6b10d31e111b..000000000000
--- a/pkgs/development/libraries/clapack/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{stdenv, fetchurl, cmake, withPIC ? false }:
-
-stdenv.mkDerivation rec {
-  name = "clapack-3.2.1";
-
-  src = fetchurl {
-    url = http://www.netlib.org/clapack/clapack-3.2.1-CMAKE.tgz;
-    sha256 = "0nnap9q1mv14g57dl3vkvxrdr10k5w7zzyxs6rgxhia8q8mphgqb";
-  };
-
-  buildNativeInputs = [ cmake ];
-
-  installPhase = ''
-    ensureDir $out/include $out/lib
-    cp SRC/*.a F2CLIBS/libf2c/*.a BLAS/SRC/*.a $out/lib
-    cp ../INCLUDE/* $out/include
-  '';
-
-  cmakeFlags = if withPIC then "-DCMAKE_C_FLAGS=-fPIC" else "";
-
-  # We disable the test phase, because some tests fail.
-  # Forums say it's normal for some to fail:
-  # http://icl.cs.utk.edu/lapack-forum/viewtopic.php?f=2&t=167
-  # doCheck = true;
-  # checkPhase = "ctest";
-
-  meta = {
-    homepage = http://www.netlib.org/clapack/;
-    description = "f2c'ed version of LAPACK";
-    license = "BSD";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 36cffb34b889..84a34a751181 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3299,8 +3299,6 @@ let
 
   clanlib = callPackage ../development/libraries/clanlib { };
 
-  clapack = callPackage ../development/libraries/clapack { };
-
   classads = callPackage ../development/libraries/classads { };
 
   classpath = callPackage ../development/libraries/java/classpath {