From 97e815a9af9d71903d1bee3349c907039d3336eb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 15 Jan 2012 11:43:57 +0000
Subject: [PATCH 001/114] git-annex: bumped to version 3.20120113

svn path=/nixpkgs/trunk/; revision=31569
---
 .../version-management/git-and-tools/git-annex/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index 32b30bc3242..dfcf52d3ae2 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@@ -4,14 +4,14 @@
 }:
 
 let
-  version = "3.20120106";
+  version = "3.20120113";
 in
 stdenv.mkDerivation {
   name = "git-annex-${version}";
 
   src = fetchurl {
     url = "http://ftp.de.debian.org/debian/pool/main/g/git-annex/git-annex_${version}.tar.gz";
-    sha256 = "60735d8b036aa8ac44e1838724d9b4da1fceb2f1547ce7f39b2069a8c3605438";
+    sha256 = "060s96d5a6vx5alwkfgzsvwx1k9m81l6hbx4rnak9iy5iy28zd0z";
   };
 
   buildInputs = [

From 3c8a798411b6929f27517832356bfa316913b589 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 15 Jan 2012 11:44:02 +0000
Subject: [PATCH 002/114] gource: added meta information and moved the package
 into version-management category

svn path=/nixpkgs/trunk/; revision=31570
---
 .../version-management/gource/default.nix     | 35 +++++++++++++++++++
 pkgs/tools/misc/gource/default.nix            | 13 -------
 pkgs/top-level/all-packages.nix               |  2 +-
 3 files changed, 36 insertions(+), 14 deletions(-)
 create mode 100644 pkgs/applications/version-management/gource/default.nix
 delete mode 100644 pkgs/tools/misc/gource/default.nix

diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix
new file mode 100644
index 00000000000..a8c6cb91af5
--- /dev/null
+++ b/pkgs/applications/version-management/gource/default.nix
@@ -0,0 +1,35 @@
+{stdenv, fetchurl, SDL, ftgl, pkgconfig, libpng, libjpeg, pcre, SDL_image, glew, mesa}:
+
+let
+  name = "gource-0.37";
+in
+stdenv.mkDerivation {
+  inherit name;
+
+  src = fetchurl {
+    url = "http://gource.googlecode.com/files/${name}.tar.gz";
+    sha256 = "03kd9nn65cl1p2jgn6pvpxmvnfscz3c8jqds90fsc0z37ij2iiyn";
+  };
+
+  buildInputs = [glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa];
+
+  meta = {
+    homepage = "http://code.google.com/p/gource/";
+    description = "software version control visualization tool";
+    license = stdenv.lib.licenses.gpl3Plus;
+
+    longDescription = ''
+      Software projects are displayed by Gource as an animated tree with
+      the root directory of the project at its centre. Directories
+      appear as branches with files as leaves. Developers can be seen
+      working on the tree at the times they contributed to the project.
+
+      Currently Gource includes built-in log generation support for Git,
+      Mercurial and Bazaar and SVN. Gource can also parse logs produced
+      by several third party tools for CVS repositories.
+    '';
+
+    platforms = stdenv.lib.platforms.gnu;
+    maintainers = [ stdenv.lib.maintainers.simons ];
+  };
+}
diff --git a/pkgs/tools/misc/gource/default.nix b/pkgs/tools/misc/gource/default.nix
deleted file mode 100644
index 9ec8961f268..00000000000
--- a/pkgs/tools/misc/gource/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, fetchurl, SDL, ftgl, pkgconfig, libpng, libjpeg, pcre, SDL_image, glew, mesa}:
- 
-stdenv.mkDerivation {
-  name = "gource-0.37";
-  
-  src = fetchurl {
-    url = http://gource.googlecode.com/files/gource-0.37.tar.gz;
-    sha256 = "03kd9nn65cl1p2jgn6pvpxmvnfscz3c8jqds90fsc0z37ij2iiyn";
-  };
-  
-  buildInputs = [glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa];
-
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d6aaaa7edf8..73861997654 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -760,7 +760,7 @@ let
 
   gnuvd = callPackage ../tools/misc/gnuvd { };
 
-  gource = callPackage ../tools/misc/gource { };
+  gource = callPackage ../applications/version-management/gource {};
 
   gptfdisk = callPackage ../tools/system/gptfdisk { };
 

From 116a7c4ac2bf2930c8294262d84a40f4cbaf17d6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 15 Jan 2012 11:44:05 +0000
Subject: [PATCH 003/114] ftgl: fixed download URL

svn path=/nixpkgs/trunk/; revision=31571
---
 pkgs/development/libraries/ftgl/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix
index 7d10298ad3e..e9b6ba61ffd 100644
--- a/pkgs/development/libraries/ftgl/default.nix
+++ b/pkgs/development/libraries/ftgl/default.nix
@@ -1,13 +1,16 @@
 {stdenv, fetchurl, freetype, mesa}:
- 
-stdenv.mkDerivation {
+
+let
   name = "ftgl-2.1.3-rc5";
-  
+in
+stdenv.mkDerivation {
+  inherit name;
+
   src = fetchurl {
-    url = mirror://sourceforge/ftgl/files/FTGL%20Source/2.1.3%7Erc5/ftgl-2.1.3-rc5.tar.gz ;
+    url = "mirror://sourceforge/ftgl/${name}.tar.gz";
     sha256 = "0nsn4s6vnv5xcgxcw6q031amvh2zfj2smy1r5mbnjj2548hxcn2l";
   };
-  
+
   buildInputs = [freetype mesa];
 
 }

From 7ccde0527181db73fee140bfab8949d3bfa62cae Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 15 Jan 2012 11:44:08 +0000
Subject: [PATCH 004/114] git-annex: cosmetic change for the meta.license
 attribute

svn path=/nixpkgs/trunk/; revision=31572
---
 .../version-management/git-and-tools/git-annex/default.nix      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index dfcf52d3ae2..870c80f6020 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://git-annex.branchable.com/";
     description = "Manage files with git without checking them into git";
-    license = "GPLv3+";
+    license = stdenv.lib.licenses.gpl3Plus;
 
     longDescription = ''
       Git-annex allows managing files with git, without checking the

From b7c53fcc4cb4210a6e718e2a5a0c7edc3a0e952b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 15 Jan 2012 11:44:11 +0000
Subject: [PATCH 005/114] ftgl: added meta information

svn path=/nixpkgs/trunk/; revision=31573
---
 pkgs/development/libraries/ftgl/default.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix
index e9b6ba61ffd..ce750fc1696 100644
--- a/pkgs/development/libraries/ftgl/default.nix
+++ b/pkgs/development/libraries/ftgl/default.nix
@@ -13,4 +13,19 @@ stdenv.mkDerivation {
 
   buildInputs = [freetype mesa];
 
+  meta = {
+    homepage = "http://sourceforge.net/apps/mediawiki/ftgl/";
+    description = "font rendering library for OpenGL applications";
+    license = stdenv.lib.licenses.gpl3Plus;
+
+    longDescription = ''
+      FTGL is a free cross-platform Open Source C++ library that uses
+      Freetype2 to simplify rendering fonts in OpenGL applications. FTGL
+      supports bitmaps, pixmaps, texture maps, outlines, polygon mesh,
+      and extruded polygon rendering modes.
+    '';
+
+    platforms = stdenv.lib.platforms.gnu;
+    maintainers = [];
+  };
 }

From 5c64d683447685760439b581dbcd7b3505d8d1ca Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 16 Jan 2012 02:05:41 +0000
Subject: [PATCH 006/114] Update ruby gems

svn path=/nixpkgs/trunk/; revision=31576
---
 .../interpreters/ruby/generated.nix           | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix
index f2c32cda877..e46de5d231d 100644
--- a/pkgs/development/interpreters/ruby/generated.nix
+++ b/pkgs/development/interpreters/ruby/generated.nix
@@ -20,14 +20,14 @@ g: # Get dependencies from patched gems
     hike = g.hike_1_2_1;
     hoe = g.hoe_2_3_3;
     i18n = g.i18n_0_6_0;
-    json = g.json_1_6_4;
-    json_pure = g.json_pure_1_6_4;
+    json = g.json_1_6_5;
+    json_pure = g.json_pure_1_6_5;
     mail = g.mail_2_3_0;
     mime_types = g.mime_types_1_17_2;
     minitar = g.minitar_0_5_3;
     multi_json = g.multi_json_1_0_4;
     net_sftp = g.net_sftp_2_0_4;
-    net_ssh = g.net_ssh_2_2_2;
+    net_ssh = g.net_ssh_2_3_0;
     nix = g.nix_0_1_1;
     polyglot = g.polyglot_0_3_3;
     rack = g.rack_1_4_0;
@@ -339,16 +339,16 @@ See class rdoc for help. Hint: ri Hoe'';
       requiredGems = [  ];
       sha256 = ''1pgmfhmh2wv409g7kla30mkp8jpslvp25vcmmim1figl87wpn3j0'';
     };
-    json_1_6_4 = {
+    json_1_6_5 = {
       basename = ''json'';
       meta = {
         description = ''JSON Implementation for Ruby'';
         homepage = ''http://flori.github.com/json'';
         longDescription = ''This is a JSON implementation as a Ruby extension in C.'';
       };
-      name = ''json-1.6.4'';
+      name = ''json-1.6.5'';
       requiredGems = [  ];
-      sha256 = ''1adka4y7z9v4lmd2zqyap21ghqdnjaivr1ghnqcnw3dmsdrgf39l'';
+      sha256 = ''0zmdzxbczpciyra7zskn7ayfi0z43p2f3n060gsjgjiqcb5bvz75'';
     };
     json_pure_1_4_3 = {
       basename = ''json_pure'';
@@ -361,16 +361,16 @@ See class rdoc for help. Hint: ri Hoe'';
       requiredGems = [  ];
       sha256 = ''1xw357gkmk6712c94lhpsrq8j9v91mgc2nxlr1m6n20yl6sz2g9r'';
     };
-    json_pure_1_6_4 = {
+    json_pure_1_6_5 = {
       basename = ''json_pure'';
       meta = {
         description = ''JSON Implementation for Ruby'';
         homepage = ''http://flori.github.com/json'';
         longDescription = ''This is a JSON implementation in pure Ruby.'';
       };
-      name = ''json_pure-1.6.4'';
+      name = ''json_pure-1.6.5'';
       requiredGems = [  ];
-      sha256 = ''12i95k265gx4vy2cpxrb3z4slc4czsh3srgky2a6d5h3q6c1kvbf'';
+      sha256 = ''09s5qymc4y9q0376zjiwf5bjm69fcivr75ar8ji0kmhjkk2rwc55'';
     };
     mail_2_3_0 = {
       basename = ''mail'';
@@ -438,7 +438,7 @@ Copyright:: 2002 - 2011, Austin Ziegler
         longDescription = ''A pure Ruby implementation of the SFTP client protocol'';
       };
       name = ''net-sftp-2.0.4'';
-      requiredGems = [ g.net_ssh_2_2_2 ];
+      requiredGems = [ g.net_ssh_2_3_0 ];
       sha256 = ''1f0ml1z7kjnd79avn42fmys8j0w2995j5lk30ak5n40bq805yvky'';
     };
     net_ssh_2_0_23 = {
@@ -452,16 +452,16 @@ Copyright:: 2002 - 2011, Austin Ziegler
       requiredGems = [  ];
       sha256 = ''1fllf6mgwc213m5mn266qwhl65zc84wl8rq9m3lvbggw9mh5ynrr'';
     };
-    net_ssh_2_2_2 = {
+    net_ssh_2_3_0 = {
       basename = ''net_ssh'';
       meta = {
         description = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.'';
         homepage = ''http://github.com/net-ssh/net-ssh'';
         longDescription = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.'';
       };
-      name = ''net-ssh-2.2.2'';
+      name = ''net-ssh-2.3.0'';
       requiredGems = [  ];
-      sha256 = ''11rlcb6w534g21x1g1jz1v1lvyj3zv6s621pf9cwl1aqbl6zh711'';
+      sha256 = ''1q1fznl4nk2963czpzfby4m9jw9rs37k1rzgbjad5r1n7r6dv0sv'';
     };
     nix_0_1_1 = {
       basename = ''nix'';
@@ -640,7 +640,7 @@ documentation.
 See RDoc for a description of RDoc's markup and basic use.'';
       };
       name = ''rdoc-3.12'';
-      requiredGems = [ g.json_1_6_4 ];
+      requiredGems = [ g.json_1_6_5 ];
       sha256 = ''0cd4hrkba7zr675m62yb87l7hpf0sp2qw8ccc2s0y2fa2fxdxdkp'';
     };
     rjb_1_3_3 = {
@@ -726,7 +726,7 @@ See RDoc for a description of RDoc's markup and basic use.'';
 * For all rubyforge upgrades, run 'rubyforge config' to ensure you have latest.'';
       };
       name = ''rubyforge-2.0.3'';
-      requiredGems = [ g.json_pure_1_6_4 ];
+      requiredGems = [ g.json_pure_1_6_5 ];
       sha256 = ''1ck9hkad55dy25819v4gd1nmnpvcrb3i4np3hc03h1j6q8qpxg5p'';
     };
     rubyforge_2_0_4 = {

From 57d26cdd8ef6115281866545a2837cff0312c32f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Mon, 16 Jan 2012 09:55:03 +0000
Subject: [PATCH 007/114] Adding recurseIntoAttrs for ghc-HEAD (for the
 ghc-7.4.1 rc phase).

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 73861997654..be5414c7c0f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2244,10 +2244,11 @@ let
 
   # Reasonably current HEAD snapshot. Should *always* be lowPrio.
   haskellPackages_ghcHEAD =
-    haskellPackagesFun ../development/compilers/ghc/head.nix
-      # (haskellPackages_ghc704.ghcWithPackages (self : [ self.alex self.happy ]))
-      (if stdenv.isDarwin then ghc704Binary else ghc6121Binary)
-      (x : x.ghcHEADPrefs) false false lowPrio;
+    recurseIntoAttrs
+      (haskellPackagesFun ../development/compilers/ghc/head.nix
+        # (haskellPackages_ghc704.ghcWithPackages (self : [ self.alex self.happy ]))
+        (if stdenv.isDarwin then ghc704Binary else ghc6121Binary)
+        (x : x.ghcHEADPrefs) false false lowPrio);
 
   haxeDist = import ../development/compilers/haxe {
     inherit fetchurl sourceFromHead stdenv lib ocaml zlib makeWrapper neko;

From 3b833cc93b71dfb0186200ec27c46025b2b6b0d3 Mon Sep 17 00:00:00 2001
From: Arie Middelkoop <amiddelk@gmail.com>
Date: Mon, 16 Jan 2012 10:17:02 +0000
Subject: [PATCH 008/114] Minor-version bump of ocaml-batteries.

The previous version did not compile with ocaml>=3.12, and this version is also backwards compatible with 3.11.

svn path=/nixpkgs/trunk/; revision=31578
---
 pkgs/development/ocaml-modules/batteries/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix
index 876b87408e8..a7c96f1d2ea 100644
--- a/pkgs/development/ocaml-modules/batteries/default.nix
+++ b/pkgs/development/ocaml-modules/batteries/default.nix
@@ -5,11 +5,11 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "ocaml-batteries-1.4.0";
+  name = "ocaml-batteries-1.4.1";
 
   src = fetchurl {
-    url = https://forge.ocamlcore.org/frs/download.php/643/batteries-1.4.0.tar.gz;
-    sha256 = "1qyhiyanlhpbj0dv0vyqak87qfadjzg2pb8q93iybmg59akaxl15";
+    url = http://forge.ocamlcore.org/frs/download.php/684/batteries-1.4.1.tar.gz;
+    sha256 = "bdca7deba290d83c66c0a5001da52b2d7f2af58b7b7e7d9303d4363aaafe9c30";
   };
 
   buildInputs = [ocaml findlib camomile ounit];

From c87285c2552fb5717a4d5ef0add40502761d8352 Mon Sep 17 00:00:00 2001
From: Arie Middelkoop <amiddelk@gmail.com>
Date: Mon, 16 Jan 2012 10:20:13 +0000
Subject: [PATCH 009/114] Updated the coccinelle package to the latest release
 (1.0.0-RC9).

Added additional ocaml modules which are needed for coccinelle.

svn path=/nixpkgs/trunk/; revision=31579
---
 .../ocaml-modules/extlib/default.nix          | 23 +++++++++
 .../ocaml-modules/ocamlmake/default.nix       | 20 ++++++++
 .../ocaml-modules/pcre/default.nix            |  9 ++--
 .../ocaml-modules/pycaml/default.nix          | 51 +++++++++++++++++++
 .../ocaml-modules/sexplib/default.nix         | 26 ++++++++++
 .../ocaml-modules/typeconv/default.nix        | 25 +++++++++
 .../tools/misc/coccinelle/default.nix         | 20 ++++++--
 pkgs/top-level/all-packages.nix               | 15 +++++-
 8 files changed, 178 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/development/ocaml-modules/extlib/default.nix
 create mode 100644 pkgs/development/ocaml-modules/ocamlmake/default.nix
 create mode 100644 pkgs/development/ocaml-modules/pycaml/default.nix
 create mode 100644 pkgs/development/ocaml-modules/sexplib/default.nix
 create mode 100644 pkgs/development/ocaml-modules/typeconv/default.nix

diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix
new file mode 100644
index 00000000000..40808222622
--- /dev/null
+++ b/pkgs/development/ocaml-modules/extlib/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, ocaml, findlib}:
+
+stdenv.mkDerivation {
+  name = "ocaml-extlib-1.5.2";
+
+  src = fetchurl {
+    url = "http://ocaml-extlib.googlecode.com/files/extlib-1.5.2.tar.gz";
+    sha256 = "ca6d69adeba4242ce41c02a23746ba1e464c0bbec66e2d16b02c3c6e85dc10aa";
+  };
+
+  buildInputs = [ocaml findlib];
+
+  createFindlibDestdir = true;
+
+  configurePhase = "true";
+
+  meta = {
+    homepage = "http://code.google.com/p/ocaml-extlib/";
+    description = "Enhancements to the OCaml Standard Library modules";
+    license = "LGPL";
+    platforms = ocaml.meta.platforms;
+  };
+}
diff --git a/pkgs/development/ocaml-modules/ocamlmake/default.nix b/pkgs/development/ocaml-modules/ocamlmake/default.nix
new file mode 100644
index 00000000000..69386bd7578
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocamlmake/default.nix
@@ -0,0 +1,20 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "ocaml-make-6.33.0";
+
+  src = fetchurl {
+    url = "http://www.ocaml.info/ocaml_sources/ocaml-make-6.33.0.tar.gz";
+    sha256 = "3054303ba04e4bbbe038e08310fabc3e5a0e3899bbba33d9ac5ed7a1b9d1e05a";
+  };
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = "cp OCamlMakefile $out";
+
+  meta = {
+    homepage = "http://www.ocaml.info/home/ocaml_sources.html";
+    description = "Generic OCaml Makefile for GNU Make";
+    license = "LGPL";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix
index fdc527791c0..112242e24d6 100644
--- a/pkgs/development/ocaml-modules/pcre/default.nix
+++ b/pkgs/development/ocaml-modules/pcre/default.nix
@@ -2,16 +2,15 @@
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
-  version = "6.1.0";
+  version = "6.2.5";
 in
 
 stdenv.mkDerivation {
   name = "ocaml-pcre-${version}";
 
   src = fetchurl {
-    url = "http://hg.ocaml.info/release/pcre-ocaml/archive/" +
-          "release-${version}.tar.bz2";
-    sha256 = "1lj9mzabi1crxwvb2ly1l10h4hlx0fw20nbnq76bbzzkzabjs4ll";
+    url = "http://www.ocaml.info/ocaml_sources/pcre-ocaml-${version}.tar.gz";
+    sha256 = "f1774028a4525d22d1f4cf4ce0121c99d85a75aed7a498c3e8ab0f5e39888e47";
   };
 
   buildInputs = [pcre ocaml findlib];
@@ -21,7 +20,7 @@ stdenv.mkDerivation {
   configurePhase = "true";	# Skip configure phase
 
   meta = {
-    homepage = "http://www.ocaml.info/home/ocaml_sources.html#pcre-ocaml";
+    homepage = "http://www.ocaml.info/home/ocaml_sources.html";
     description = "An efficient C-library for pattern matching with Perl-style regular expressions in OCaml";
     license = "LGPL";
     platforms = ocaml.meta.platforms;
diff --git a/pkgs/development/ocaml-modules/pycaml/default.nix b/pkgs/development/ocaml-modules/pycaml/default.nix
new file mode 100644
index 00000000000..af7207064ba
--- /dev/null
+++ b/pkgs/development/ocaml-modules/pycaml/default.nix
@@ -0,0 +1,51 @@
+{stdenv, fetchurl, ocaml, findlib, python, ocaml_make}:
+
+# The actual version of pycaml is unclear, as it is the original
+# 0.82 version with some patches applied in order to use it for
+# the kompostilo type setter (see README). Apparently, some of
+# the patches provide Python 3.1 support.
+# This version also differs from the Debian version, which
+# is also a heavily patched 0.82.
+# Therefore, we may at some point try to find out what is
+# actually the "real" version (if the library is still alive).
+
+stdenv.mkDerivation {
+  name = "pycaml-0.82";
+
+  src = fetchurl {
+    name = "pycaml.tar.gz";
+    url = "http://github.com/chemoelectric/pycaml/tarball/master";
+    sha256 = "ff6d863c42b4ef798f50ff5eff77b47b77b5c0d28b6f65364e8a436a216dc591";
+  };
+
+  buildInputs = [ocaml findlib python]; 
+
+  createFindlibDestdir = true;
+
+  phases = [ "unpackPhase" "patchPhase" "buildPhase" "installPhase" ];
+
+  # fix some paths to the appropriate store paths.
+  patchPhase = ''
+    sed -i "Makefile" -e's|/usr/include/OCamlMakefile|${ocaml_make}|g'
+    sed -i "Makefile" -e's|/usr|${python}|g'
+    '';
+
+  buildPhase = ''
+    make -f Makefile -j1 PYVER=`python -c 'import sys; print("{0}.{1}".format(sys.version_info.major, sys.version_info.minor));'`
+    '';
+
+  # the Makefile is not shipped with an install target, hence we do it ourselves.
+  installPhase = ''
+    ocamlfind install pycaml \
+      dllpycaml_stubs.so* libpycaml_stubs.a pycaml.a pycaml.cma \
+      pycaml.cmi pycaml.cmo pycaml.cmx pycaml.cmxa pycaml.ml pycaml.mli \
+      pycaml.o pycaml_stubs.c pycaml_stubs.h pycaml_stubs.o META
+    '';
+
+  meta = {
+    homepage = "http://github.com/chemoelectric/pycaml";
+    description = "Bindings for python and ocaml";
+    license = "LGPL";
+    platforms = ocaml.meta.platforms;
+  };
+}
diff --git a/pkgs/development/ocaml-modules/sexplib/default.nix b/pkgs/development/ocaml-modules/sexplib/default.nix
new file mode 100644
index 00000000000..d2df36ec38d
--- /dev/null
+++ b/pkgs/development/ocaml-modules/sexplib/default.nix
@@ -0,0 +1,26 @@
+{stdenv, fetchurl, ocaml, findlib, ocaml_typeconv}:
+
+# note: only works with ocaml>3.12
+# use version 5.2.0 if you still want an 3.11 version...
+
+stdenv.mkDerivation {
+  name = "ocaml-sexplib-7.0.4";
+
+  src = fetchurl {
+    url = "http://forge.ocamlcore.org/frs/download.php/699/sexplib-7.0.4.tar.gz";
+    sha256 = "83c6c771f423d91bebc4f57202066358adf3775fb000dd780079f51436045a43";
+  };
+
+  buildInputs = [ocaml findlib ocaml_typeconv];
+
+  createFindlibDestdir = true;
+
+  configurePhase = "true";
+
+  meta = {
+    homepage = "http://forge.ocamlcore.org/projects/sexplib/";
+    description = "Library for serializing OCaml values to and from S-expressions.";
+    license = "LGPL";
+    platforms = ocaml.meta.platforms;
+  };
+}
diff --git a/pkgs/development/ocaml-modules/typeconv/default.nix b/pkgs/development/ocaml-modules/typeconv/default.nix
new file mode 100644
index 00000000000..c3ef8dd9856
--- /dev/null
+++ b/pkgs/development/ocaml-modules/typeconv/default.nix
@@ -0,0 +1,25 @@
+{stdenv, fetchurl, ocaml, findlib}:
+
+# note: works only with ocaml >3.12
+
+stdenv.mkDerivation {
+  name = "ocaml-typeconv-3.0.4";
+
+  src = fetchurl {
+    url = "http://forge.ocamlcore.org/frs/download.php/697/ocaml-type-conv-3.0.4.tar.gz";
+    sha256 = "63b6f2872d29fb4c0b1448343bb5ec0649365126756128049d45a81238b59f12";
+  };
+
+  buildInputs = [ocaml findlib ]; 
+
+  createFindlibDestdir = true;
+
+  configurePhase = "true";
+
+  meta = {
+    homepage = "http://forge.ocamlcore.org/projects/type-conv/";
+    description = "Support library for OCaml preprocessor type conversions";
+    license = "LGPL";
+    platforms = ocaml.meta.platforms;
+  };
+}
diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix
index d8b077a20f5..7a247b0b2e3 100644
--- a/pkgs/development/tools/misc/coccinelle/default.nix
+++ b/pkgs/development/tools/misc/coccinelle/default.nix
@@ -1,14 +1,21 @@
-{ fetchurl, stdenv, ocaml, perl, python, ncurses, makeWrapper }:
+{ fetchurl, stdenv, perl, python, ncurses, makeWrapper
+, ocaml, ocamlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "coccinelle-0.2.2";
+  name = "coccinelle-1.0.0-rc9";
 
   src = fetchurl {
     url = "http://coccinelle.lip6.fr/distrib/${name}.tgz";
-    sha256 = "1rnhxlqwcps67nyn61xj8mf6wdja29q8m16r4jwdwxvfpnsdhwfy";
+    sha256 = "75d5354e76500b627ccc33b8a929305e5a815ebf08027a8dc094f75ece241697";
   };
 
-  buildInputs = [ ocaml perl python ncurses makeWrapper ];
+  buildInputs = [
+      ocaml ocamlPackages.findlib
+      ocamlPackages.menhir ocamlPackages.ocaml_batteries
+      ocamlPackages.ocaml_pcre ocamlPackages.ocaml_sexplib
+      ocamlPackages.ocaml_extlib ocamlPackages.pycaml
+      python ncurses makeWrapper perl
+    ];
 
   preConfigure =
     '' sed -i "configure" -e's|/usr/bin/perl|${perl}/bin/perl|g'
@@ -16,10 +23,13 @@ stdenv.mkDerivation rec {
            -e"s|/usr/local/share|$out/share|g"
     '';
 
-  buildPhase = "make depend && make all";
+  buildPhase = "make depend && make all && make all.opt";
 
   # Note: The tests want $out/share/coccinelle/standard.h so they must be run
   # after "make install".
+  # (I'm not sure if this is still needed.)
+  # Note: The check phase is now disabled completely, because the expected
+  # testing score is not always updated.
   doCheck = false;
 
   postInstall =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index be5414c7c0f..729cee894fa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2431,6 +2431,14 @@ let
     ulex08 = callPackage ../development/ocaml-modules/ulex/0.8 {
       camlp5 = camlp5_5_transitional;
     };
+
+    ocaml_typeconv = callPackage ../development/ocaml-modules/typeconv { };
+
+    ocaml_sexplib = callPackage ../development/ocaml-modules/sexplib { };
+
+    ocaml_extlib = callPackage ../development/ocaml-modules/extlib { };
+
+    pycaml = callPackage ../development/ocaml-modules/pycaml { };
   };
 
   ocamlPackages = recurseIntoAttrs ocamlPackages_3_11_1;
@@ -2438,6 +2446,8 @@ let
   ocamlPackages_3_11_1 = mkOcamlPackages ocaml_3_11_1 pkgs.ocamlPackages_3_11_1;
   ocamlPackages_3_12_1 = mkOcamlPackages ocaml_3_12_1 pkgs.ocamlPackages_3_12_1;
 
+  ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { };
+
   opa = let callPackage = newScope pkgs.ocamlPackages_3_12_1; in callPackage ../development/compilers/opa { };
 
   ocamlnat = let callPackage = newScope pkgs.ocamlPackages_3_12_1; in callPackage ../development/ocaml-modules/ocamlnat { };
@@ -2886,7 +2896,10 @@ let
 
   cmakeWithGui = cmakeCurses.override { useQt4 = true; };
 
-  coccinelle = callPackage ../development/tools/misc/coccinelle { };
+  coccinelle = callPackage ../development/tools/misc/coccinelle {
+    ocamlPackages = ocamlPackages_3_12_1;
+    ocaml = ocaml_3_12_1;
+  };
 
   cppi = callPackage ../development/tools/misc/cppi { };
 

From 4907bb6cf5e9545d658e57221206118d21b81381 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Jan 2012 11:33:34 +0000
Subject: [PATCH 010/114] haskell-math-functions: added version 0.1.1.0

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

diff --git a/pkgs/development/libraries/haskell/math-functions/default.nix b/pkgs/development/libraries/haskell/math-functions/default.nix
new file mode 100644
index 00000000000..266ffcd30f7
--- /dev/null
+++ b/pkgs/development/libraries/haskell/math-functions/default.nix
@@ -0,0 +1,18 @@
+{ cabal, erf, vector }:
+
+cabal.mkDerivation (self: {
+  pname = "math-functions";
+  version = "0.1.1.0";
+  sha256 = "0qb0hbfzd1g8cz3dkm8cs2wknz08b63vn7nljmynk794y64b1klp";
+  buildDepends = [ erf vector ];
+  meta = {
+    homepage = "https://github.com/bos/math-functions";
+    description = "Special functions and Chebyshev polynomials";
+    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 f123b119340..236f8f9a5a9 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -915,6 +915,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   logfloat = callPackage ../development/libraries/haskell/logfloat {};
 
+  mathFunctions = callPackage ../development/libraries/haskell/math-functions {};
+
   maude = callPackage ../development/libraries/haskell/maude {
     parsec = self.parsec3;
   };

From 4b229a72911b73a5e63051fc4f18f5bbc364c057 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Jan 2012 11:33:38 +0000
Subject: [PATCH 011/114] haskell-base64-bytestring: updated to version 0.1.1.0

svn path=/nixpkgs/trunk/; revision=31581
---
 .../libraries/haskell/base64-bytestring/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/base64-bytestring/default.nix b/pkgs/development/libraries/haskell/base64-bytestring/default.nix
index f974a72347f..304889991f0 100644
--- a/pkgs/development/libraries/haskell/base64-bytestring/default.nix
+++ b/pkgs/development/libraries/haskell/base64-bytestring/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "base64-bytestring";
-  version = "0.1.0.3";
-  sha256 = "0d4j8b1d8z9qr1y446bfkj764xgilk8gw2frj0wn0717y8knvmx3";
+  version = "0.1.1.0";
+  sha256 = "0vdmwajxg6w924pcsls45bz4bn29xgl3sgvdp2g1jb8f7qb58r7i";
   meta = {
     homepage = "https://github.com/bos/base64-bytestring";
     description = "Fast base64 encoding and deconding for ByteStrings";

From 89f9d84c5fc7645c14c1a95ea12690bfd3103425 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Jan 2012 11:33:40 +0000
Subject: [PATCH 012/114] haskell-cereal: updated to version 0.3.5.1

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

diff --git a/pkgs/development/libraries/haskell/cereal/default.nix b/pkgs/development/libraries/haskell/cereal/default.nix
index eedf4936833..53c974dd56a 100644
--- a/pkgs/development/libraries/haskell/cereal/default.nix
+++ b/pkgs/development/libraries/haskell/cereal/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cereal";
-  version = "0.3.5.0";
-  sha256 = "0bqkb9al8mr0dzik17bcrjdsk414x78wfc919jb17ihcg7gnvrg8";
+  version = "0.3.5.1";
+  sha256 = "1a9ri0fs0vh75c9llpjyvqp6qkjciqri6adpyn7hbqrn2z1h0l5n";
   meta = {
     description = "A binary serialization library";
     license = self.stdenv.lib.licenses.bsd3;

From a9f5e79a1b35a75f09d7ebc5c72f79795288130e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Jan 2012 11:33:42 +0000
Subject: [PATCH 013/114] haskell-conduit: updated to version 0.0.4

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

diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index 40bef100607..38285492dd4 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -4,14 +4,14 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "0.0.3";
-  sha256 = "149xj6i2whpjf6jqsgfgvpbwni5r0v3qrg7g42i78bd6n40xma72";
+  version = "0.0.4";
+  sha256 = "1sc14nh21ba85azm4my5qnllnlbmsq5j6h1yd1mdsk2z3fb0x5zz";
   buildDepends = [
     liftedBase monadControl text transformers transformersBase
   ];
   meta = {
     homepage = "http://github.com/snoyberg/conduit";
-    description = "A pull-based approach to streaming data";
+    description = "Streaming data processing library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [

From c74f588e8d8ac63497c25cd0d3186f2ce35bed62 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Jan 2012 11:33:45 +0000
Subject: [PATCH 014/114] haskell-enumerator: updated to version 0.4.18

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

diff --git a/pkgs/development/libraries/haskell/enumerator/default.nix b/pkgs/development/libraries/haskell/enumerator/default.nix
index 58e5ab4b62d..b0e9f03a31b 100644
--- a/pkgs/development/libraries/haskell/enumerator/default.nix
+++ b/pkgs/development/libraries/haskell/enumerator/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "enumerator";
-  version = "0.4.17";
-  sha256 = "009h9phdgnkbvz5fri81b895y2hbmw5x7z67rnn31j87khbhnfz9";
+  version = "0.4.18";
+  sha256 = "0xqgcn3xs0i7kdy73lizfhs4dzj8crf2x9pmb9d37kqrhdgznl9d";
   buildDepends = [ text transformers ];
   meta = {
     homepage = "https://john-millikin.com/software/enumerator/";

From bfb2f12099e0a5e19d9f6cc850fe54fc4959a0de Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Jan 2012 11:33:48 +0000
Subject: [PATCH 015/114] haskell-http-conduit: updated to version 1.1.1

svn path=/nixpkgs/trunk/; revision=31585
---
 .../libraries/haskell/http-conduit/default.nix           | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
index 105c7803c44..0b2f4fb8f33 100644
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@@ -1,19 +1,20 @@
 { cabal, asn1Data, attoparsec, attoparsecConduit, base64Bytestring
 , blazeBuilder, blazeBuilderConduit, caseInsensitive, certificate
 , conduit, cprngAes, dataDefault, failure, httpTypes, liftedBase
-, monadControl, network, text, tls, tlsExtra, transformers
+, monadControl, network, text, time, tls, tlsExtra, transformers
 , transformersBase, utf8String, zlibConduit
 }:
 
 cabal.mkDerivation (self: {
   pname = "http-conduit";
-  version = "1.1.0.1";
-  sha256 = "0jlj727rs8f1yxy6ms2gi3ryj4di5la0pgn2hw5flglflacj8wb6";
+  version = "1.1.1";
+  sha256 = "0gqx871d86m00aqmldqnd9nxf5zvlqpsaprsgx9zvipb270rrwsi";
   buildDepends = [
     asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
     blazeBuilderConduit caseInsensitive certificate conduit cprngAes
     dataDefault failure httpTypes liftedBase monadControl network text
-    tls tlsExtra transformers transformersBase utf8String zlibConduit
+    time tls tlsExtra transformers transformersBase utf8String
+    zlibConduit
   ];
   meta = {
     homepage = "http://www.yesodweb.com/book/http-conduit";

From bae87bb7143370fbdecb540a3f6775e2f56e5bf0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Jan 2012 11:33:50 +0000
Subject: [PATCH 016/114] haskell-random-shuffle: updated to version 0.0.3

svn path=/nixpkgs/trunk/; revision=31586
---
 .../libraries/haskell/random-shuffle/default.nix          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/random-shuffle/default.nix b/pkgs/development/libraries/haskell/random-shuffle/default.nix
index aade5d27965..174bc9ef842 100644
--- a/pkgs/development/libraries/haskell/random-shuffle/default.nix
+++ b/pkgs/development/libraries/haskell/random-shuffle/default.nix
@@ -1,10 +1,10 @@
-{ cabal, random }:
+{ cabal, MonadRandom, random }:
 
 cabal.mkDerivation (self: {
   pname = "random-shuffle";
-  version = "0.0.2";
-  sha256 = "1csq0ffsqbbv6ymf707nzfb7c9bmykwk9bcgj21mxmh6khlqn9jp";
-  buildDepends = [ random ];
+  version = "0.0.3";
+  sha256 = "120yh2k1n57vc9mi4dlnvv9dr79qaz4dsbvl3qp3y82mdz8maifw";
+  buildDepends = [ MonadRandom random ];
   meta = {
     description = "Random shuffle implementation";
     license = self.stdenv.lib.licenses.bsd3;

From a4d0d699eae28d38be573158e57b84be94345453 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Jan 2012 11:33:52 +0000
Subject: [PATCH 017/114] haskell-xml-conduit: updated to version 0.5.1

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

diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix
index f406dcbb105..675042c629a 100644
--- a/pkgs/development/libraries/haskell/xml-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xml-conduit";
-  version = "0.5.0.1";
-  sha256 = "0n30mk3dmdwxjw4vgfmlj7dzbiah9vj4hlg258qkvy5likzz1j5n";
+  version = "0.5.1";
+  sha256 = "1b7jnbsfb3p3p6bpwq3847kfszdyzijfcarvxwzcdragkr0dpc48";
   buildDepends = [
     attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
     conduit dataDefault failure systemFilepath text transformers

From 4cc9c4624041c8dcdffaf544df3c34f01cd1384d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Jan 2012 11:33:55 +0000
Subject: [PATCH 018/114] haskell-xml-types: updated to version 0.3.1

svn path=/nixpkgs/trunk/; revision=31588
---
 pkgs/development/libraries/haskell/xml-types/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/xml-types/default.nix b/pkgs/development/libraries/haskell/xml-types/default.nix
index 5b2d518402c..721d49dc588 100644
--- a/pkgs/development/libraries/haskell/xml-types/default.nix
+++ b/pkgs/development/libraries/haskell/xml-types/default.nix
@@ -2,10 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "xml-types";
-  version = "0.3";
-  sha256 = "0d0x7s865ca7bscskp6s7zyzpzd22nkd61wzwg11v6h0q5dilly7";
+  version = "0.3.1";
+  sha256 = "0ffmmidb9a1hqfbmvjxjvij2wfrqqlyjc7m7n81czrcrrsmyc1kc";
   buildDepends = [ text ];
   meta = {
+    homepage = "https://john-millikin.com/software/haskell-xml/";
     description = "Basic types for representing XML";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;

From 01bea39bad740bf97bcf663c68a0078005201dbe Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Jan 2012 11:33:57 +0000
Subject: [PATCH 019/114] gource: cosmetic, no functional change

svn path=/nixpkgs/trunk/; revision=31589
---
 pkgs/applications/version-management/gource/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix
index a8c6cb91af5..886ed9a7199 100644
--- a/pkgs/applications/version-management/gource/default.nix
+++ b/pkgs/applications/version-management/gource/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, SDL, ftgl, pkgconfig, libpng, libjpeg, pcre, SDL_image, glew, mesa}:
+{ stdenv, fetchurl, SDL, ftgl, pkgconfig, libpng, libjpeg, pcre, SDL_image, glew, mesa }:
 
 let
   name = "gource-0.37";

From 0e224241bf08eb7915e6800d9c7d92220f911be3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Jan 2012 11:34:00 +0000
Subject: [PATCH 020/114] logstalgica: added version 1.0.3

svn path=/nixpkgs/trunk/; revision=31590
---
 pkgs/tools/graphics/logstalgica/default.nix | 43 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/tools/graphics/logstalgica/default.nix

diff --git a/pkgs/tools/graphics/logstalgica/default.nix b/pkgs/tools/graphics/logstalgica/default.nix
new file mode 100644
index 00000000000..bdde9daea9f
--- /dev/null
+++ b/pkgs/tools/graphics/logstalgica/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchurl, SDL, ftgl, pkgconfig, libpng, libjpeg, pcre, SDL_image, glew, mesa }:
+
+let
+  name = "logstalgia-1.0.3";
+in
+stdenv.mkDerivation {
+  inherit name;
+
+  src = fetchurl {
+    url = "http://logstalgia.googlecode.com/files/logstalgia-1.0.3.tar.gz";
+    sha256 = "1sv1cizyw3y7g558hnvvcal8z889gbr82v4qj35hxdmrzygqlcyk";
+  };
+
+  buildInputs = [glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa];
+
+  meta = {
+    homepage = "http://code.google.com/p/logstalgia/";
+    description = "website traffic visualization tool";
+    license = stdenv.lib.licenses.gpl3Plus;
+
+    longDescription = ''
+      Logstalgia is a website traffic visualization that replays or
+      streams web-server access logs as a pong-like battle between the
+      web server and an never ending torrent of requests.
+
+      Requests appear as colored balls (the same color as the host)
+      which travel across the screen to arrive at the requested
+      location. Successful requests are hit by the paddle while
+      unsuccessful ones (eg 404 - File Not Found) are missed and pass
+      through.
+
+      The paths of requests are summarized within the available space by
+      identifying common path prefixes. Related paths are grouped
+      together under headings. For instance, by default paths ending in
+      png, gif or jpg are grouped under the heading Images. Paths that
+      don’t match any of the specified groups are lumped together under
+      a Miscellaneous section.
+    '';
+
+    platforms = stdenv.lib.platforms.gnu;
+    maintainers = [];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 729cee894fa..f8807b00e14 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -932,6 +932,8 @@ let
 
   logrotate = callPackage ../tools/system/logrotate { };
 
+  logstalgica = callPackage ../tools/graphics/logstalgica {};
+
   lout = callPackage ../tools/typesetting/lout { };
 
   lrzip = callPackage ../tools/compression/lrzip { };

From 5d03943ec74e65cac233e0df770162020e595549 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Jan 2012 11:47:57 +0000
Subject: [PATCH 021/114] haskell-ghc-events: updated to version 0.4.0.0

svn path=/nixpkgs/trunk/; revision=31591
---
 pkgs/development/libraries/haskell/ghc-events/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/ghc-events/default.nix b/pkgs/development/libraries/haskell/ghc-events/default.nix
index 9ebe3e94041..31b6c32d304 100644
--- a/pkgs/development/libraries/haskell/ghc-events/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-events/default.nix
@@ -2,11 +2,12 @@
 
 cabal.mkDerivation (self: {
   pname = "ghc-events";
-  version = "0.3.0.1";
-  sha256 = "08jnri6cwybg8b2f53rn8y1xzcpz32r0svahcw01g837p07mcpla";
+  version = "0.4.0.0";
+  sha256 = "0q1r5jxk8ma8rg65n4iixl5zyk4nxpzi4ywf0jz8y1nbbhbas7g2";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ binary mtl ];
+  noHaddock = true;
   meta = {
     description = "Library and tool for parsing .eventlog files from GHC";
     license = self.stdenv.lib.licenses.bsd3;

From 5bcd4dd4dda1e87c050bf8460a95e37918e6e645 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Jan 2012 11:47:59 +0000
Subject: [PATCH 022/114] haskell-threadscope: updated to version 0.2.1

svn path=/nixpkgs/trunk/; revision=31592
---
 .../tools/haskell/threadscope/default.nix           | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/haskell/threadscope/default.nix b/pkgs/development/tools/haskell/threadscope/default.nix
index 35b3dec9c86..0b05713e7b8 100644
--- a/pkgs/development/tools/haskell/threadscope/default.nix
+++ b/pkgs/development/tools/haskell/threadscope/default.nix
@@ -1,14 +1,19 @@
-{ cabal, binary, cairo, ghcEvents, glib, gtk, mtl, pango }:
+{ cabal, binary, cairo, deepseq, ghcEvents, glib, gtk, mtl, pango
+, time
+}:
 
 cabal.mkDerivation (self: {
   pname = "threadscope";
-  version = "0.2.0";
-  sha256 = "0b8lc8han4d90wgzliy80l1gbkm09gg6qxsn37blj41wzl6yzr9k";
+  version = "0.2.1";
+  sha256 = "08s9fbwg33rgbqjdx7n90q83livfay9khr2ddjwj8brw8k1wkmxg";
   isLibrary = false;
   isExecutable = true;
-  buildDepends = [ binary cairo ghcEvents glib gtk mtl pango ];
+  buildDepends = [
+    binary cairo deepseq ghcEvents glib gtk mtl pango time
+  ];
   configureFlags = "--ghc-options=-rtsopts";
   meta = {
+    homepage = "http://www.haskell.org/haskellwiki/ThreadScope";
     description = "A graphical tool for profiling parallel Haskell programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;

From fd6238d2c838a5a0066f515d55ccfffd62d3653b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 16 Jan 2012 16:34:13 +0000
Subject: [PATCH 023/114] * NodeJS updated to 0.6.7.

svn path=/nixpkgs/trunk/; revision=31593
---
 pkgs/development/web/nodejs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index 75776416cfc..b6f9ce739f3 100644
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, openssl, python, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "0.6.5";
+  version = "0.6.7";
   name = "nodejs-${version}";
 
   src = fetchurl {
     url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
-    sha256 = "72364d240fb61e678897c099df6f2913857c5931aa9b1f44e73e432d4629ca2f";
+    sha256 = "0m3d4j0gjidckj2dgb7pll47j94c6p0xhlbsbcpjsd93jx28fhxk";
   };
 
   configureFlags = [
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i tools/{*.py,waf-light,node-waf}
   '';
 
-  buildInputs = [ python openssl zlib];
+  buildInputs = [ python openssl zlib ];
 
   meta = with stdenv.lib; {
     description = "Event-driven I/O framework for the V8 JavaScript engine";

From 67f921896e44c0dc3e19d0367c8f4041412118f2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 16 Jan 2012 16:56:57 +0000
Subject: [PATCH 024/114] * nodejs 0.6.7 breaks npm, so go back to 0.6.6.

svn path=/nixpkgs/trunk/; revision=31594
---
 pkgs/development/web/nodejs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index b6f9ce739f3..88f9c32ba92 100644
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, openssl, python, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "0.6.7";
+  version = "0.6.6";
   name = "nodejs-${version}";
 
   src = fetchurl {
     url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
-    sha256 = "0m3d4j0gjidckj2dgb7pll47j94c6p0xhlbsbcpjsd93jx28fhxk";
+    sha256 = "00i14bjhyadxrh0df1ig4ndv1c0b7prnnhyar5lxcgxnn4cabgks";
   };
 
   configureFlags = [

From 81b4eef864edabd9ea3f470ced3d090703dd7e5e Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 16 Jan 2012 17:36:59 +0000
Subject: [PATCH 025/114] jasper: propagate libjpeg, kopete: remove 'fix'

svn path=/nixpkgs/trunk/; revision=31595
---
 .../kde-4.8/kdenetwork/FindJasper.cmake       | 35 -------------------
 pkgs/desktops/kde-4.8/kdenetwork/kopete.nix   |  1 -
 pkgs/development/libraries/jasper/default.nix |  3 +-
 3 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644 pkgs/desktops/kde-4.8/kdenetwork/FindJasper.cmake

diff --git a/pkgs/desktops/kde-4.8/kdenetwork/FindJasper.cmake b/pkgs/desktops/kde-4.8/kdenetwork/FindJasper.cmake
deleted file mode 100644
index bb06a7bd8d3..00000000000
--- a/pkgs/desktops/kde-4.8/kdenetwork/FindJasper.cmake
+++ /dev/null
@@ -1,35 +0,0 @@
-# - Try to find the Jasper JPEG2000 library
-# Once done this will define
-#
-#  JASPER_FOUND - system has Jasper
-#  JASPER_INCLUDE_DIR - the Jasper include directory
-#  JASPER_LIBRARIES - The libraries needed to use Jasper
-
-#=============================================================================
-# Copyright 2006-2009 Kitware, Inc.
-# Copyright 2006 Alexander Neundorf <neundorf@kde.org>
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-FIND_PACKAGE(JPEG)
-
-FIND_PATH(JASPER_INCLUDE_DIR jasper/jasper.h)
-
-FIND_LIBRARY(JASPER_LIBRARY NAMES jasper libjasper)
-
-SET(JASPER_LIBRARIES ${JASPER_LIBRARY})
-
-# handle the QUIETLY and REQUIRED arguments and set JASPER_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Jasper DEFAULT_MSG JASPER_LIBRARIES JASPER_INCLUDE_DIR)
-
-MARK_AS_ADVANCED(JASPER_INCLUDE_DIR JASPER_LIBRARY)
diff --git a/pkgs/desktops/kde-4.8/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.8/kdenetwork/kopete.nix
index 27b36ba6d1b..ec48b96fe19 100644
--- a/pkgs/desktops/kde-4.8/kdenetwork/kopete.nix
+++ b/pkgs/desktops/kde-4.8/kdenetwork/kopete.nix
@@ -14,7 +14,6 @@ kde {
   patchPhase =
     ''
       cp -v ${./FindmsiLBC.cmake} kopete/cmake/modules/FindmsiLBC.cmake
-      cp -v ${./FindJasper.cmake} kopete/cmake/modules/FindJasper.cmake
     '';
 
   cmakeFlags = [ "-DBUILD_skypebuttons=TRUE" ];
diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix
index bca8aedfd4b..8cf4cc7991f 100644
--- a/pkgs/development/libraries/jasper/default.nix
+++ b/pkgs/development/libraries/jasper/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "154l7zk7yh3v8l2l6zm5s2alvd2fzkp6c9i18iajfbna5af5m43b";
   };
 
-  buildInputs = [unzip libjpeg];
+  buildNativeInputs = [unzip];
+  propagatedBuildInputs = [ libjpeg ];
 
   configureFlags = "--enable-shared";
   

From ee0822153a33dc87269b4e41661d7b3b9e199800 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 16 Jan 2012 17:48:33 +0000
Subject: [PATCH 026/114] Upgrade libdrm and mesa to the latest versions

svn path=/nixpkgs/trunk/; revision=31598
---
 pkgs/development/libraries/libdrm/default.nix | 29 ++++++++++--------
 .../libraries/libdrm/libdrm-apple.patch       |  2 +-
 pkgs/development/libraries/mesa/default.nix   | 30 ++++++++++---------
 3 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index d37b7dd0b7f..7c0127bf710 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,28 +1,31 @@
-{stdenv, fetchurl, pkgconfig, libpthreadstubs}:
+{stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, cairo, udev}:
 
-stdenv.mkDerivation (rec {
-  name = "libdrm-2.4.24";
+stdenv.mkDerivation rec {
+  name = "libdrm-2.4.29";
   
   src = fetchurl {
     url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
-    sha256 = "19dnzy7g6jqfjz38dp187b97vb4a8h4k748x56gsyn24ys0j60f7";
+    sha256 = "0bj5ihmnzpbbgdrvp5f8bgsk0k19haixr893449pjd4k7v4jshz2";
   };
 
-  buildInputs = [ pkgconfig libpthreadstubs ];
+  buildNativeInputs = [ pkgconfig ];
+  buildInputs = [ libpthreadstubs libpciaccess cairo udev ];
 
-  patches = [ ./libdrm-apple.patch ];
+  patches = stdenv.lib.optional stdenv.isDarwin ./libdrm-apple.patch;
 
-  preConfigure = ''
-    # General case: non intel.
-    if test -n "$crossConfig"; then
-      configureFlags="$configureFlags --disable-intel";
-    fi
-  '' + stdenv.lib.optionalString stdenv.isDarwin
+  preConfigure = stdenv.lib.optionalString stdenv.isDarwin
   "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache";
 
+  configureFlags = [ "--enable-nouveau-experimental-api" "--enable-udev" ]
+    ++ stdenv.lib.optional stdenv.isDarwin "-C";
+
+  crossAttrs.configureFlags = configureFlags ++ [ "--disable-intel" ];
+
   meta = {
     homepage = http://dri.freedesktop.org/libdrm/;
     description = "Library for accessing the kernel's Direct Rendering Manager";
     license = "bsd";
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+    platforms = stdenv.lib.platforms.linux;
   };
-} // (stdenv.lib.optionalAttrs stdenv.isDarwin { configureFlags = [ "-C" ]; }))
+}
diff --git a/pkgs/development/libraries/libdrm/libdrm-apple.patch b/pkgs/development/libraries/libdrm/libdrm-apple.patch
index e9fd63c5fae..17b447789c2 100644
--- a/pkgs/development/libraries/libdrm/libdrm-apple.patch
+++ b/pkgs/development/libraries/libdrm/libdrm-apple.patch
@@ -2,9 +2,9 @@ diff -Naur libdrm-2.4.26-orig/intel/intel_bufmgr_gem.c libdrm-2.4.26/intel/intel
 --- libdrm-2.4.26-orig/intel/intel_bufmgr_gem.c	2011-04-01 10:30:51.000000000 -0400
 +++ libdrm-2.4.26/intel/intel_bufmgr_gem.c	2011-08-29 02:17:20.000000000 -0400
 @@ -51,6 +51,7 @@
- #include <sys/mman.h>
  #include <sys/stat.h>
  #include <sys/types.h>
+ #include <stdbool.h>
 +#include <sys/time.h>
  
  #include "errno.h"
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 6a1de4d95e4..0419615c6c0 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -1,37 +1,39 @@
-{ stdenv, fetchurl, flex, bison, pkgconfig, x11, xlibs, libdrm, file, expat
+{ stdenv, fetchurl, flex, bison, pkgconfig, libdrm, file, expat, makedepend
+, libXxf86vm, libXfixes, libXdamage, glproto, dri2proto, libX11, libxcb, libXext
+, libXt, udev, enableTextureFloats ? false,
 , python, libxml2Python, lipo ? null }:
 
 if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then
   throw "unsupported platform for Mesa"
 else
 
-let version = "7.10.3"; in
+let version = "7.11.2"; in
 
 stdenv.mkDerivation {
   name = "mesa-${version}";
 
   src = fetchurl {
     url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
-    sha256 = "1h451vgsfsp0h0wig66spqgxmjalsy28gvd9viynfwmq7741yw0y";
+    sha256 = "0msk1fh4yw4yi7z37v75vhpa23z49lkwgin6drczbihbqsl6lx2p";
   };
 
   patches = [ ./swrast-settexbuffer.patch ];
 
-  postPatch = ''
-    find . -name "*.py" -exec sed -i -e "s|#! */usr/bin/env python|#! ${python}/bin/python|" {} +
-  '';
+  prePatch = "patchShebangs .";
 
+# r300
   configureFlags =
       " --with-driver=dri --enable-gl-osmesa --enable-gles1"
-    + " --enable-gallium --enable-gallium-r600 --enable-gles2"
-    + " --enable-gallium-swrast --enable-gallium-egl --disable-glx-tls"
-    + " --enable-xcb --enable-egl --disable-glut";
+    + " --with-gallium-drivers=i915,i965,nouveau,r600,svga,swrast"
+    + " --enable-gles2 --enable-gallium-egl --disable-glx-tls"
+    + " --enable-xcb --enable-egl --disable-glut"
+    # Texture floats are patented, see docs/patents.txt
+    + stdenv.lib.optionalString enableTextureFloats " --enable-texture-float";
 
-  buildInputs =
-    [ pkgconfig expat x11 libdrm xlibs.makedepend xlibs.glproto
-      xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage xlibs.dri2proto
-      lipo file python libxml2Python flex bison
-    ];
+  buildInputs = [ expat libdrm libXxf86vm libXfixes libXdamage glproto dri2proto
+    libxml2Python libX11 libXext libxcb lipo libXt udev ];
+
+  buildNativeInputs = [ pkgconfig python makedepend file flex bison ];
 
   enableParallelBuilding = true;
 

From 69572400789890a7b6aa384e2287205fb1a00538 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 16 Jan 2012 17:50:54 +0000
Subject: [PATCH 027/114] Fix typo

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

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 0419615c6c0..edbde5a9b49 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, flex, bison, pkgconfig, libdrm, file, expat, makedepend
 , libXxf86vm, libXfixes, libXdamage, glproto, dri2proto, libX11, libxcb, libXext
-, libXt, udev, enableTextureFloats ? false,
+, libXt, udev, enableTextureFloats ? false
 , python, libxml2Python, lipo ? null }:
 
 if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then

From 92703a6d9ed5ab3057085153a48a7a08df9c52b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 16 Jan 2012 21:59:33 +0000
Subject: [PATCH 028/114] libffi 3.0.10.

svn path=/nixpkgs/trunk/; revision=31600
---
 pkgs/development/libraries/libffi/default.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix
index 83f88e1819f..b31c83406b1 100644
--- a/pkgs/development/libraries/libffi/default.nix
+++ b/pkgs/development/libraries/libffi/default.nix
@@ -1,20 +1,15 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation (rec {
-  name = "libffi-3.0.9";
+  name = "libffi-3.0.10";
 
   src = fetchurl {
     url = "ftp://sourceware.org/pub/libffi/${name}.tar.gz";
-    sha256 = "0ln4jbpb6clcsdpb9niqk0frgx4k0xki96wiv067ig0q4cajb7aq";
+    sha256 = "0bs97dgvqrbzc9zv9y2ff5flfvbmfyc68dpnxvm6mdcygq1bj7ph";
   };
 
   doCheck = true;
 
-  postInstall =
-    # Install headers in the right place.
-    '' ln -sv "$out/lib/"libffi*/include "$out/include"
-    '';
-
   meta = {
     description = "libffi, a foreign function call interface library";
 

From 4cbd319ce3ca39d04864aee32c9af07971f36d77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 16 Jan 2012 23:36:05 +0000
Subject: [PATCH 029/114] libffi: Revert to 3.0.9.

Version 3.0.10 fails to build on x86_64-freebsd8.2.  Reported on
libffi-discuss@sourceware.org.

svn path=/nixpkgs/trunk/; revision=31601
---
 pkgs/development/libraries/libffi/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix
index b31c83406b1..83f88e1819f 100644
--- a/pkgs/development/libraries/libffi/default.nix
+++ b/pkgs/development/libraries/libffi/default.nix
@@ -1,15 +1,20 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation (rec {
-  name = "libffi-3.0.10";
+  name = "libffi-3.0.9";
 
   src = fetchurl {
     url = "ftp://sourceware.org/pub/libffi/${name}.tar.gz";
-    sha256 = "0bs97dgvqrbzc9zv9y2ff5flfvbmfyc68dpnxvm6mdcygq1bj7ph";
+    sha256 = "0ln4jbpb6clcsdpb9niqk0frgx4k0xki96wiv067ig0q4cajb7aq";
   };
 
   doCheck = true;
 
+  postInstall =
+    # Install headers in the right place.
+    '' ln -sv "$out/lib/"libffi*/include "$out/include"
+    '';
+
   meta = {
     description = "libffi, a foreign function call interface library";
 

From 683d60e41919e49e5128786ebff298e28f4d5c44 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 17 Jan 2012 10:24:47 +0000
Subject: [PATCH 030/114] haskell-iteratee: updated to version 0.8.8.1

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

diff --git a/pkgs/development/libraries/haskell/iteratee/default.nix b/pkgs/development/libraries/haskell/iteratee/default.nix
index 07b2d52e17c..670055a7dec 100644
--- a/pkgs/development/libraries/haskell/iteratee/default.nix
+++ b/pkgs/development/libraries/haskell/iteratee/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "iteratee";
-  version = "0.8.7.6";
-  sha256 = "05zhw44zycwllvyrkxz1mkn5mkylrdz9ynh27k17gsm9mjml3cab";
+  version = "0.8.8.1";
+  sha256 = "1d6b83j3k2idpa9xcii8h9wa6mvxngp7rymb4xy6w8lvrmi7rmwz";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 729aea56b53697f7d90ad073932534d66c581179 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 17 Jan 2012 10:24:53 +0000
Subject: [PATCH 031/114] haskell-xml: updated to version 1.3.11

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

diff --git a/pkgs/development/libraries/haskell/xml/default.nix b/pkgs/development/libraries/haskell/xml/default.nix
index b5a56e3a1fa..43e6b741724 100644
--- a/pkgs/development/libraries/haskell/xml/default.nix
+++ b/pkgs/development/libraries/haskell/xml/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xml";
-  version = "1.3.10";
-  sha256 = "0mmibqzbbqmw4a8gc4f2yy144nx48gpfwj3iqq6dydvcikajxav2";
+  version = "1.3.11";
+  sha256 = "1av8cn62aaz0pl0fqqlp8wsyg36a1068qawzci8fxzasrfyyc8ca";
   buildDepends = [ text ];
   meta = {
     homepage = "http://code.galois.com";

From dc9830111b0bb250475f7eac3b8f14d3d9207c63 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 17 Jan 2012 11:04:14 +0000
Subject: [PATCH 032/114] * Added wkhtmltopdf.

svn path=/nixpkgs/trunk/; revision=31604
---
 pkgs/tools/graphics/wkhtmltopdf/default.nix | 22 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  3 ++-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/graphics/wkhtmltopdf/default.nix

diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix
new file mode 100644
index 00000000000..84b271acf2b
--- /dev/null
+++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, qt4 }:
+
+stdenv.mkDerivation rec {
+  name = "wkhtmltopdf-0.11.0_rc1";
+
+  src = fetchurl {
+    url = "http://wkhtmltopdf.googlecode.com/files/${name}.tar.bz2";
+    sha1 = "db03922d281856e503b3d562614e3936285728c7";
+  };
+
+  buildInputs = [ qt4 ];
+
+  configurePhase = "qmake wkhtmltopdf.pro INSTALLBASE=$out";
+  
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = http://code.google.com/p/wkhtmltopdf/;
+    description = "Tools for rendering web pages to PDF or images";
+    license = stdenv.lib.licenses.gpl3Plus;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f8807b00e14..5e8089473a8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1287,7 +1287,6 @@ let
   ripmime = callPackage ../tools/networking/ripmime {};
 
   rsnapshot = callPackage ../tools/backup/rsnapshot {
-
     # For the `logger' command, we can use either `utillinux' or
     # GNU Inetutils.  The latter is more portable.
     logger = inetutils;
@@ -1557,6 +1556,8 @@ let
 
   wicd = callPackage ../tools/networking/wicd { };
 
+  wkhtmltopdf = callPackage ../tools/graphics/wkhtmltopdf { };
+
   wv = callPackage ../tools/misc/wv { };
 
   wv2 = callPackage ../tools/misc/wv2 { };

From 3aa99d803ee66dda1f515d24b008c38317ede0ed Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 17 Jan 2012 16:27:57 +0000
Subject: [PATCH 033/114] Remove PATHS from find-svn.patch

svn path=/nixpkgs/trunk/; revision=31605
---
 pkgs/desktops/kde-4.8/kdesdk/find-svn.patch | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/kde-4.8/kdesdk/find-svn.patch b/pkgs/desktops/kde-4.8/kdesdk/find-svn.patch
index 61cb49b308f..f6f4df942dd 100644
--- a/pkgs/desktops/kde-4.8/kdesdk/find-svn.patch
+++ b/pkgs/desktops/kde-4.8/kdesdk/find-svn.patch
@@ -12,7 +12,7 @@ index 59bcb96..2eac05d 100644
  
  if(SVNCONFIG_EXECUTABLE)
  
-@@ -56,15 +59,9 @@ else(SVNCONFIG_EXECUTABLE)
+@@ -56,15 +59,8 @@ else(SVNCONFIG_EXECUTABLE)
        set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
     else(APRCONFIG_EXECUTABLE)
        FIND_PATH(_INCLUDES apr_pools.h
@@ -26,12 +26,11 @@ index 59bcb96..2eac05d 100644
 -         /usr/local/include/apr-1/
 -         /usr/local/include/apr-1.0/
 +         HINTS ${SVN_INCLUDES}
-+         PATHS /usr /usr/local
 +         SUFFIXES apr-0 apr-1 apr-1.0
        )
        if(_INCLUDES)
           set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
-@@ -72,6 +69,25 @@ else(SVNCONFIG_EXECUTABLE)
+@@ -72,6 +69,24 @@ else(SVNCONFIG_EXECUTABLE)
           set(SVN_FOUND FALSE) # no apr == can't compile!
        endif(_INCLUDES)
     endif(APRCONFIG_EXECUTABLE)
@@ -45,7 +44,6 @@ index 59bcb96..2eac05d 100644
 +   else(APUCONFIG_EXECUTABLE)
 +      FIND_PATH(_INCLUDES apu.h
 +         HINTS ${SVN_INCLUDES}
-+         PATHS /usr /usr/local
 +         SUFFIXES apr-0 apr-1 apr-1.0
 +      )
 +      if(_INCLUDES)

From eb1360bd663b1c9d2cbf7f2a124c8c2c359e49ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 17 Jan 2012 16:34:10 +0000
Subject: [PATCH 034/114] hwloc: Make it easy to disable optional dependencies;
 fix cross-builds.

svn path=/nixpkgs/trunk/; revision=31606
---
 pkgs/development/libraries/hwloc/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix
index 303f2750d82..09de2e702e1 100644
--- a/pkgs/development/libraries/hwloc/default.nix
+++ b/pkgs/development/libraries/hwloc/default.nix
@@ -9,7 +9,12 @@ stdenv.mkDerivation rec {
   };
 
   # XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo.
-  buildInputs = [ pkgconfig cairo expat ncurses libX11 ];
+  buildNativeInputs = [ pkgconfig ];
+
+  # Filter out `null' inputs.  This allows users to `.override' the
+  # derivation and set optional dependencies to `null'.
+  buildInputs = stdenv.lib.filter (x: x != null)
+   [ cairo expat ncurses libX11 ];
 
   doCheck = true;
 

From 24431bd0f67bb3497161f4048c6ab7e50ebe764e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 17 Jan 2012 17:43:48 +0000
Subject: [PATCH 035/114] * Update various Xfce packages.

svn path=/nixpkgs/trunk/; revision=31607
---
 pkgs/desktops/xfce-4.8/applications/ristretto.nix | 12 +++++-------
 pkgs/desktops/xfce-4.8/core/garcon.nix            |  8 ++++----
 pkgs/desktops/xfce-4.8/core/libxfce4ui.nix        |  4 ++--
 pkgs/desktops/xfce-4.8/core/libxfce4util.nix      |  4 ++--
 pkgs/desktops/xfce-4.8/core/thunar.nix            |  7 ++++---
 pkgs/desktops/xfce-4.8/core/xfce-utils.nix        |  4 ++--
 pkgs/desktops/xfce-4.8/core/xfce4-panel.nix       |  4 ++--
 pkgs/desktops/xfce-4.8/core/xfce4-session.nix     |  4 ++--
 pkgs/desktops/xfce-4.8/core/xfce4-settings.nix    |  4 ++--
 pkgs/desktops/xfce-4.8/core/xfconf.nix            |  4 ++--
 pkgs/desktops/xfce-4.8/core/xfdesktop.nix         |  4 ++--
 pkgs/desktops/xfce-4.8/core/xfwm4.nix             |  4 ++--
 pkgs/desktops/xfce-4.8/default.nix                |  1 +
 13 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/pkgs/desktops/xfce-4.8/applications/ristretto.nix b/pkgs/desktops/xfce-4.8/applications/ristretto.nix
index cbb22e12ea7..ce90891bb0b 100644
--- a/pkgs/desktops/xfce-4.8/applications/ristretto.nix
+++ b/pkgs/desktops/xfce-4.8/applications/ristretto.nix
@@ -2,20 +2,18 @@
 , exo, dbus_glib, libxfce4util, libxfce4ui, xfconf }:
 
 stdenv.mkDerivation rec {
-  name = "ristretto-0.0.93";
+  name = "ristretto-0.2.3";
   
   src = fetchurl {
-    url = "http://archive.xfce.org/src/apps/ristretto/0.0/${name}.tar.bz2";
-    sha1 = "c71acaad169633faffe26609f9cc671b04ff52d3";
+    url = "http://archive.xfce.org/src/apps/ristretto/0.2/${name}.tar.bz2";
+    sha1 = "5a34b865cb9013b67467b0e8d51970f0a1e977d1";
   };
 
   buildInputs =
-    [ pkgconfig intltool libexif gtk thunar exo dbus_glib
-      libxfce4util libxfce4ui xfconf
+    [ pkgconfig intltool libexif gtk dbus_glib libxfce4util
+      libxfce4ui xfconf
     ];
 
-  NIX_LDFLAGS = "-lX11";
-
   meta = {
     homepage = http://goodies.xfce.org/projects/applications/ristretto;
     description = "A fast and lightweight picture-viewer for the Xfce desktop environment";
diff --git a/pkgs/desktops/xfce-4.8/core/garcon.nix b/pkgs/desktops/xfce-4.8/core/garcon.nix
index 40b40541bf1..7f5f18173b2 100644
--- a/pkgs/desktops/xfce-4.8/core/garcon.nix
+++ b/pkgs/desktops/xfce-4.8/core/garcon.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib }:
+{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util }:
 
 stdenv.mkDerivation rec {
-  name = "garcon-0.1.8";
+  name = "garcon-0.1.9";
   
   src = fetchurl {
     url = "http://archive.xfce.org/src/xfce/garcon/0.1/${name}.tar.bz2";
-    sha1 = "e5eac6a13208c81ccad0941656c01e7a69530f03";
+    sha1 = "2eeab19bc10747a40b44afd4598a2f555eb69952";
   };
 
-  buildInputs = [ pkgconfig intltool glib ];
+  buildInputs = [ pkgconfig intltool glib libxfce4util ];
 
   meta = {
     homepage = http://www.xfce.org/;
diff --git a/pkgs/desktops/xfce-4.8/core/libxfce4ui.nix b/pkgs/desktops/xfce-4.8/core/libxfce4ui.nix
index c3551d565e1..76c285ae599 100644
--- a/pkgs/desktops/xfce-4.8/core/libxfce4ui.nix
+++ b/pkgs/desktops/xfce-4.8/core/libxfce4ui.nix
@@ -2,11 +2,11 @@
 , libstartup_notification }:
 
 stdenv.mkDerivation rec {
-  name = "libxfce4ui-4.8.0";
+  name = "libxfce4ui-4.8.1";
   
   src = fetchurl {
     url = "http://archive.xfce.org/src/xfce/libxfce4ui/4.8/${name}.tar.bz2";
-    sha1 = "107f9d8e3e583f3cf5330074e89ea72eb2a82888";
+    sha1 = "408645581e589135aa03d2e9b84f4eede68596b2";
   };
 
   buildInputs =
diff --git a/pkgs/desktops/xfce-4.8/core/libxfce4util.nix b/pkgs/desktops/xfce-4.8/core/libxfce4util.nix
index 1a2b64bc8fa..7a567d62935 100644
--- a/pkgs/desktops/xfce-4.8/core/libxfce4util.nix
+++ b/pkgs/desktops/xfce-4.8/core/libxfce4util.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib, intltool }:
 
 stdenv.mkDerivation rec {
-  name = "libxfce4util-4.8.1";
+  name = "libxfce4util-4.8.2";
   
   src = fetchurl {
     url = "http://archive.xfce.org/src/xfce/libxfce4util/4.8/${name}.tar.bz2";
-    sha1 = "4d26aea58413603e2c163ff0374a6e32fc47bc4c";
+    sha1 = "e7498c2e5fca2c89dfef89e0788f10eebbd020c3";
   };
 
   buildInputs = [ pkgconfig glib intltool ];
diff --git a/pkgs/desktops/xfce-4.8/core/thunar.nix b/pkgs/desktops/xfce-4.8/core/thunar.nix
index 0e8f72e22d6..07fd734a1f2 100644
--- a/pkgs/desktops/xfce-4.8/core/thunar.nix
+++ b/pkgs/desktops/xfce-4.8/core/thunar.nix
@@ -2,11 +2,12 @@
 , dbus_glib, libstartup_notification, xfconf, xfce4panel, udev, libnotify }:
 
 stdenv.mkDerivation rec {
-  name = "thunar-1.2.2";
+  version = "1.2.3";
+  name = "thunar-${version}";
   
   src = fetchurl {
-    url = "http://archive.xfce.org/src/xfce/thunar/1.2/Thunar-1.2.2.tar.bz2";
-    sha1 = "314e3d53ec7be1ea578da4d842ecc8dc5958b1bd";
+    url = "http://archive.xfce.org/src/xfce/thunar/1.2/Thunar-${version}.tar.bz2";
+    sha1 = "a05d0e14515d70c5ad94cca881822a707d366863";
   };
 
   buildInputs =
diff --git a/pkgs/desktops/xfce-4.8/core/xfce-utils.nix b/pkgs/desktops/xfce-4.8/core/xfce-utils.nix
index eb998c2759f..fde8a2c3953 100644
--- a/pkgs/desktops/xfce-4.8/core/xfce-utils.nix
+++ b/pkgs/desktops/xfce-4.8/core/xfce-utils.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui }:
 
 stdenv.mkDerivation rec {
-  name = "xfce-utils-4.8.2";
+  name = "xfce-utils-4.8.3";
   
   src = fetchurl {
     url = "http://archive.xfce.org/src/xfce/xfce-utils/4.8/${name}.tar.bz2";
-    sha1 = "c9358f47f57b961fc51008cf6752d2761b4c4f25";
+    sha1 = "159d445b689ebbf73462a4b4baf5cce4e04afaab";
   };
 
   configureFlags = "--with-xsession-prefix=$(out)/share/xsessions --with-vendor-info=NixOS.org";
diff --git a/pkgs/desktops/xfce-4.8/core/xfce4-panel.nix b/pkgs/desktops/xfce-4.8/core/xfce4-panel.nix
index fc297df9cbf..bb263712962 100644
--- a/pkgs/desktops/xfce-4.8/core/xfce4-panel.nix
+++ b/pkgs/desktops/xfce-4.8/core/xfce4-panel.nix
@@ -2,11 +2,11 @@
 , libxfce4ui, xfconf, libwnck, exo }:
 
 stdenv.mkDerivation rec {
-  name = "xfce4-panel-4.8.5";
+  name = "xfce4-panel-4.8.6";
   
   src = fetchurl {
     url = "http://archive.xfce.org/src/xfce/xfce4-panel/4.8/${name}.tar.bz2";
-    sha1 = "67b9d5bc422663f60f5a05e7cfd7ca67b4542813";
+    sha1 = "332fc968332e6271e1bb65d6de8de2524b0440ec";
   };
 
   buildInputs =
diff --git a/pkgs/desktops/xfce-4.8/core/xfce4-session.nix b/pkgs/desktops/xfce-4.8/core/xfce4-session.nix
index 7aeaedb1e2a..0e0f1a86939 100644
--- a/pkgs/desktops/xfce-4.8/core/xfce4-session.nix
+++ b/pkgs/desktops/xfce-4.8/core/xfce4-session.nix
@@ -2,11 +2,11 @@
 , libwnck, dbus_glib, xfconf, xorg, xfce4panel }:
 
 stdenv.mkDerivation rec {
-  name = "xfce4-session-4.8.1";
+  name = "xfce4-session-4.8.2";
   
   src = fetchurl {
     url = "http://archive.xfce.org/src/xfce/xfce4-session/4.8/${name}.tar.bz2";
-    sha1 = "a33534e53fa36a38a1f9bd164469a9fb62c765a7";
+    sha1 = "636c2983552861a959225e554898675152a4d812";
   };
 
   buildInputs =
diff --git a/pkgs/desktops/xfce-4.8/core/xfce4-settings.nix b/pkgs/desktops/xfce-4.8/core/xfce4-settings.nix
index 03d2ac67a39..dc6e8e555b2 100644
--- a/pkgs/desktops/xfce-4.8/core/xfce4-settings.nix
+++ b/pkgs/desktops/xfce-4.8/core/xfce4-settings.nix
@@ -2,11 +2,11 @@
 , xfconf, xorg, libnotify, libxklavier }:
 
 stdenv.mkDerivation rec {
-  name = "xfce4-settings-4.8.2";
+  name = "xfce4-settings-4.8.3";
   
   src = fetchurl {
     url = "http://archive.xfce.org/src/xfce/xfce4-settings/4.8/${name}.tar.bz2";
-    sha1 = "402afe308944a315c385d2b1ed567f997d016b61";
+    sha1 = "98431633ba3ec2a4a10182bc7266904d9256949b";
   };
 
   buildInputs =
diff --git a/pkgs/desktops/xfce-4.8/core/xfconf.nix b/pkgs/desktops/xfce-4.8/core/xfconf.nix
index bb351c68d28..e0c61d3a1f5 100644
--- a/pkgs/desktops/xfce-4.8/core/xfconf.nix
+++ b/pkgs/desktops/xfce-4.8/core/xfconf.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, dbus_glib }:
 
 stdenv.mkDerivation rec {
-  name = "xfconf-4.8.0";
+  name = "xfconf-4.8.1";
   
   src = fetchurl {
     url = "http://archive.xfce.org/src/xfce/xfconf/4.8/${name}.tar.bz2";
-    sha1 = "3f560b11d618171805bfb9e6a8290185c7ee5dcd";
+    sha1 = "aeab124f7c548e387b37a5476e594ef559515533";
   };
 
   buildInputs = [ pkgconfig intltool glib libxfce4util ];
diff --git a/pkgs/desktops/xfce-4.8/core/xfdesktop.nix b/pkgs/desktops/xfce-4.8/core/xfdesktop.nix
index 5f64fff3b4d..45c82f1ec02 100644
--- a/pkgs/desktops/xfce-4.8/core/xfdesktop.nix
+++ b/pkgs/desktops/xfce-4.8/core/xfdesktop.nix
@@ -2,11 +2,11 @@
 , libxfce4ui, libwnck, xfconf, garcon, libnotify, exo }:
 
 stdenv.mkDerivation rec {
-  name = "xfdesktop-4.8.2";
+  name = "xfdesktop-4.8.3";
   
   src = fetchurl {
     url = "http://archive.xfce.org/src/xfce/xfdesktop/4.8/${name}.tar.bz2";
-    sha1 = "fe7d71bb502197b0353b952947826a5a50ab13bc";
+    sha1 = "b3af72a69627f860f22b37d021efd81e4e37eb55";
   };
 
   buildInputs =
diff --git a/pkgs/desktops/xfce-4.8/core/xfwm4.nix b/pkgs/desktops/xfce-4.8/core/xfwm4.nix
index aefae75a3c3..c0f89784bfb 100644
--- a/pkgs/desktops/xfce-4.8/core/xfwm4.nix
+++ b/pkgs/desktops/xfce-4.8/core/xfwm4.nix
@@ -2,11 +2,11 @@
 , libxfce4ui, xfconf, libwnck, libstartup_notification, xorg }:
 
 stdenv.mkDerivation rec {
-  name = "xfwm4-4.8.1";
+  name = "xfwm4-4.8.3";
   
   src = fetchurl {
     url = "http://archive.xfce.org/src/xfce/xfwm4/4.8/${name}.tar.bz2";
-    sha1 = "4075a689f572ae157ed80ab3ce5be85f09dac766";
+    sha1 = "6d27deca383e0c2fba0cede0bbe0e9aee18e9257";
   };
 
   buildInputs =
diff --git a/pkgs/desktops/xfce-4.8/default.nix b/pkgs/desktops/xfce-4.8/default.nix
index 056bc4368c6..4b82ff04307 100644
--- a/pkgs/desktops/xfce-4.8/default.nix
+++ b/pkgs/desktops/xfce-4.8/default.nix
@@ -5,6 +5,7 @@ rec {
 
   #### SUPPORT
 
+  # The useful bits from ‘gnome-disk-utility’.
   libgdu = callPackage ./support/libgdu.nix { };  
 
   # Gvfs is required by Thunar for the trash feature and for volume

From 7b6b4212b99bbf1e01edf9ee7758aeb96d720596 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 17 Jan 2012 17:44:35 +0000
Subject: [PATCH 036/114] haskell-colour: updated to version 2.3.3

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

diff --git a/pkgs/development/libraries/haskell/colour/default.nix b/pkgs/development/libraries/haskell/colour/default.nix
index d31f8546d4c..7f4fde5ef97 100644
--- a/pkgs/development/libraries/haskell/colour/default.nix
+++ b/pkgs/development/libraries/haskell/colour/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "colour";
-  version = "2.3.2";
-  sha256 = "1j0y8cfdzhzjid1hg50qvh5nsa6kfnxcwxaizxyk73z60dn8g9b6";
+  version = "2.3.3";
+  sha256 = "1qmn1778xzg07jg9nx4k1spdz2llivpblf6wwrps1qpqjhsac5cd";
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Colour";
     description = "A model for human colour/color perception";

From 47aaa3a4c057f1bd7d4c62cd23ba9bbc44b28e20 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 17 Jan 2012 17:44:39 +0000
Subject: [PATCH 037/114] haskell-http-conduit: updated to version 1.1.2.2

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

diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
index 0b2f4fb8f33..bf411f89221 100644
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-conduit";
-  version = "1.1.1";
-  sha256 = "0gqx871d86m00aqmldqnd9nxf5zvlqpsaprsgx9zvipb270rrwsi";
+  version = "1.1.2.2";
+  sha256 = "049gidxmrw4zri2zkibl2298glhapzzh1kg001dn563594bbiccz";
   buildDepends = [
     asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
     blazeBuilderConduit caseInsensitive certificate conduit cprngAes

From 39204c864959d2d0240d9d45a7414f9237167a88 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 17 Jan 2012 17:44:42 +0000
Subject: [PATCH 038/114] haskell-http-enumerator: updated to version 0.7.2.4

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

diff --git a/pkgs/development/libraries/haskell/http-enumerator/default.nix b/pkgs/development/libraries/haskell/http-enumerator/default.nix
index 4e60042dc30..7804b0d077a 100644
--- a/pkgs/development/libraries/haskell/http-enumerator/default.nix
+++ b/pkgs/development/libraries/haskell/http-enumerator/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-enumerator";
-  version = "0.7.2.3";
-  sha256 = "1f66dnqm67qzg76w47kqvpv7ssandmf8md838mdzrsg88x54dar7";
+  version = "0.7.2.4";
+  sha256 = "0gnbyhjs28rwdaypa9zhyja3bakr74if68cgivn1s56wbhrhc70s";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 2f1edcc1eb60dd82efa6e42bd270307cc5b56a6d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 17 Jan 2012 18:08:09 +0000
Subject: [PATCH 039/114] * Added Xfce's appfinder application.

svn path=/nixpkgs/trunk/; revision=31611
---
 .../xfce-4.8/core/xfce4-appfinder.nix         | 24 +++++++++++++++++++
 pkgs/desktops/xfce-4.8/default.nix            |  4 ++--
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/desktops/xfce-4.8/core/xfce4-appfinder.nix

diff --git a/pkgs/desktops/xfce-4.8/core/xfce4-appfinder.nix b/pkgs/desktops/xfce-4.8/core/xfce4-appfinder.nix
new file mode 100644
index 00000000000..b8165ebb178
--- /dev/null
+++ b/pkgs/desktops/xfce-4.8/core/xfce4-appfinder.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, intltool, glib, gtk, libxfce4util
+, libxfce4ui, garcon, xfconf }:
+
+stdenv.mkDerivation rec {
+  name = "xfce4-appfinder-4.8.0";
+  
+  src = fetchurl {
+    url = "http://archive.xfce.org/src/xfce/xfce4-appfinder/4.8/${name}.tar.bz2";
+    sha1 = "444bbcbded8d2346f9b9beb57ec7adaf556811c9";
+  };
+
+  buildInputs =
+    [ pkgconfig intltool glib gtk libxfce4util libxfce4ui garcon xfconf ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = http://www.xfce.org/;
+    description = "Xfce application finder, a tool to locate and launch programs on your system";
+    license = "GPLv2+";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
+  };
+}
diff --git a/pkgs/desktops/xfce-4.8/default.nix b/pkgs/desktops/xfce-4.8/default.nix
index 4b82ff04307..971071c3acc 100644
--- a/pkgs/desktops/xfce-4.8/default.nix
+++ b/pkgs/desktops/xfce-4.8/default.nix
@@ -58,9 +58,9 @@ rec {
 
   gtk_xfce_engine = callPackage ./core/gtk-xfce-engine.nix { };
 
-  # !!! Add xfce4-appfinder
+  xfce4_appfinder = callPackage ./core/xfce4-appfinder.nix { };
+
 
-  
   #### APPLICATIONS
   
   terminal = callPackage ./applications/terminal.nix {

From be1805b4fb5e2af7b00f28d8c2129cd9347e894b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 17 Jan 2012 19:15:50 +0000
Subject: [PATCH 040/114] * Make Xfce 4.8 the default.  Will remove 4.6 later.

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5e8089473a8..95a75a8db1e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8190,7 +8190,7 @@ let
     inherit (gtkLibs) glib gtk;
   };
 
-  xfce = xfce46;
+  xfce = xfce48;
 
   xfce46 = recurseIntoAttrs
     (let callPackage = newScope pkgs.xfce46; in

From b02bc1ef59f4d3728509150ea5a04cfb323f31a9 Mon Sep 17 00:00:00 2001
From: Arie Middelkoop <amiddelk@gmail.com>
Date: Tue, 17 Jan 2012 22:40:05 +0000
Subject: [PATCH 041/114] Update of the 'jedit' package.

svn path=/nixpkgs/trunk/; revision=31614
---
 pkgs/applications/editors/jedit/default.nix | 53 +++++++++++++++------
 1 file changed, 39 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/applications/editors/jedit/default.nix
index f49919b70bb..5349f10c0c3 100644
--- a/pkgs/applications/editors/jedit/default.nix
+++ b/pkgs/applications/editors/jedit/default.nix
@@ -1,28 +1,53 @@
-{ stdenv, fetchurl, ant }:
+{ stdenv, fetchurl, ant, jre }:
 
 stdenv.mkDerivation {
-  name = "jedit-4.2";
+  name = "jedit-4.4.2";
 
   src = fetchurl {
-    url = mirror://sf/jedit/jedit42source.tar.gz;
-    sha256 = "1ckqghsw2r30kfkqfgjl4k47gdwpz8c1h85haw0y0ymq4rqh798j";
+    url = mirror://sf/jedit/jedit4.4.2source.tar.bz2;
+    sha256 = "5e9ad9c32871b77ef0b9fe46dcfcea57ec52558d36113b7280194a33430b8ceb";
   };
 
-  phases = "unpackPhase buildPhase";
+  setSourceRoot = ''
+    sourceRoot=jEdit
+  '';
 
-  buildPhase = "
-     sed -i 's/\\<SplashScreen\\>/org.gjt.sp.jedit.gui.SplashScreen/g' org/gjt/sp/jedit/GUIUtilities.java
-    ant dist
-    ensureDir $out/lib
-    cp jedit.jar $out/lib
-    ensureDir \$out/lib/modes
-    cp modes/catalog \$out/lib/modes
-  ";
+  buildPhase = ''
+     ant build
+  '';
+
+  installPhase = ''
+    ensureDir $out/share/jEdit
+    cp build/jedit.jar $out/share/jEdit
+    ensureDir $out/share/jEdit/modes
+    cp -r modes/* $out/share/jEdit/modes
+    ensureDir $out/share/jEdit/icons
+    cp -r icons/* $out/share/jEdit/icons
+    ensureDir $out/share/jEdit/macros
+    cp -r macros/* $out/share/jEdit/macros
+    ensureDir $out/share/jEdit/doc
+    cp -r doc/* $out/share/jEdit/doc
+    
+    sed -i "s|Icon=.*|Icon=$out/share/jEdit/icons/jedit-icon48.png|g" package-files/linux/deb/jedit.desktop
+    ensureDir $out/share/applications
+    mv package-files/linux/deb/jedit.desktop $out/share/applications/jedit.desktop
+
+    patch package-files/linux/jedit << EOF
+    5a6,8
+    > # specify the correct JAVA_HOME
+    > JAVA_HOME=${jre}
+    > 
+    EOF
+    sed -i "s|/usr/share/jEdit/@jar.filename@|$out/share/jEdit/jedit.jar|g" package-files/linux/jedit
+    ensureDir $out/bin
+    cp package-files/linux/jedit $out/bin/jedit
+    chmod +x $out/bin/jedit
+  '';
 
   buildInputs = [ ant ];
 
   meta = { 
-    description = "really nice programmers editor written in Java. Give it a try";
+    description = "Mature programmer's text editor (Java based)";
     homepage = http://www.jedit.org;
     license = "GPL";
   };

From ef07990836488d7c9d8a4ff3ffebf20545c83acc Mon Sep 17 00:00:00 2001
From: Arie Middelkoop <amiddelk@gmail.com>
Date: Tue, 17 Jan 2012 22:43:26 +0000
Subject: [PATCH 042/114] Update of the 'thunderbird' package to 9.0.1.

Note: this update simplified the nix expression, as some of the problems mentioned in
the original expression do not seem present anymore.

Also note: the original expression did not compile in combination with the 3.1 kernel.

svn path=/nixpkgs/trunk/; revision=31615
---
 .../mailreaders/thunderbird/9.x.nix           | 115 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +-
 2 files changed, 116 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/networking/mailreaders/thunderbird/9.x.nix

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/9.x.nix b/pkgs/applications/networking/mailreaders/thunderbird/9.x.nix
new file mode 100644
index 00000000000..62b4d91de58
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/thunderbird/9.x.nix
@@ -0,0 +1,115 @@
+{ stdenv, fetchurl, pkgconfig, gtk, perl, python, zip, unzip
+, libIDL, dbus_glib, bzip2, alsaLib, nspr, yasm, mesa, nss
+, libnotify, cairo, pixman, fontconfig
+, libjpeg
+
+, # If you want the resulting program to call itself "Thunderbird"
+  # instead of "Shredder", enable this option.  However, those
+  # binaries may not be distributed without permission from the
+  # Mozilla Foundation, see
+  # http://www.mozilla.org/foundation/trademarks/.
+  enableOfficialBranding ? false
+
+}:
+
+let version = "9.0.1";
+
+    # This patch may become necessary when we use a more recent version of libpng
+    # for now, it's actually not needed
+    # pngPatch = fetchurl {
+    #   url = http://www.linuxfromscratch.org/patches/blfs/svn/thunderbird-9.0.1-libpng-1.5-1.patch;
+    #   sha256 = "8454bdde3be8dc37c9f5e6f597914f0a585ff4b357d3fc86c6c9f80208b6068d";
+    # };
+in
+
+stdenv.mkDerivation {
+  name = "thunderbird-${version}";
+
+  src = fetchurl {
+    url = "http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2";
+    sha256 = "4fc392915e22b81ef0bd08e6e2d8d0348e66f0930f35bf8ac47eb49f64453e2d";
+  };
+
+  enableParallelBuilding = true;
+
+  buildInputs =
+    [ pkgconfig perl python zip unzip bzip2 gtk dbus_glib alsaLib libIDL nspr
+      libnotify cairo pixman fontconfig yasm mesa /* nss */
+      libjpeg
+    ];
+
+  # fix some paths in pngPatch
+  # prePatch = ''
+  #   substitute ${pngPatch} png.patch --replace "mozilla-release/modules/" "comm-release/mozilla/modules/"
+  #   '';
+
+  patches = [
+    # "png.patch" # produced by postUnpack
+
+    # Fix weird dependencies such as a so file which depends on "-lpthread".
+    # ./thunderbird-build-deps.patch
+  ];
+
+  configureFlags =
+    [ "--enable-application=mail"
+      "--enable-optimize"
+      "--with-pthreads"
+      "--disable-debug"
+      "--enable-strip"
+      "--with-pthreads"
+      "--with-system-jpeg"
+      # "--with-system-png"  # png 1.5.x not merged in nixpkgs yet
+      "--with-system-zlib"
+      "--with-system-bz2"
+      "--with-system-nspr"
+      "--enable-system-cairo"
+      "--disable-crashreporter"
+      "--disable-necko-wifi"
+      "--disable-webm"
+      "--disable-tests"
+      "--enable-calendar"
+    ]
+    ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
+
+  # The Thunderbird Makefiles refer to the variables LIBXUL_DIST,
+  # prefix, and PREFIX in some places where they are not set.  In
+  # particular, there are some linker flags like
+  # `-rpath-link=$(LIBXUL_DIST)/bin'.  Since this expands to
+  # `-rpath-link=/bin', the build fails due to the purity checks in
+  # the ld wrapper.  So disable the purity check for now.
+  preBuild = "NIX_ENFORCE_PURITY=0";
+
+  # This doesn't work:
+  #makeFlags = "LIBXUL_DIST=$(out) prefix=$(out) PREFIX=$(out)";
+
+  postInstall =
+    ''
+      # Fix some references to /bin paths in the Xulrunner shell script.
+      substituteInPlace $out/lib/thunderbird-*/thunderbird \
+          --replace /bin/pwd "$(type -tP pwd)" \
+          --replace /bin/ls "$(type -tP ls)"
+
+      # Create a desktop item.
+      ensureDir $out/share/applications
+      cat > $out/share/applications/thunderbird.desktop <<EOF
+      [Desktop Entry]
+      Type=Application
+      Exec=$out/bin/thunderbird
+      Icon=$out/lib/thunderbird-${version}/chrome/icons/default/default256.png
+      Name=Thunderbird
+      GenericName=Mail Reader
+      Categories=Application;Network;
+      EOF
+    '';
+
+  meta = with stdenv.lib; {
+    description = "Mozilla Thunderbird, a full-featured email client";
+    homepage = http://www.mozilla.org/thunderbird/;
+    license =
+      # Official branding implies thunderbird name and logo cannot be reuse,
+      # see http://www.mozilla.org/foundation/licensing.html
+      if enableOfficialBranding then licenses.proprietary else licenses.mpl11;
+    maintainers = with maintainers; [ pierron ];
+    platforms = with platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 95a75a8db1e..425d02886a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7492,7 +7492,7 @@ let
 
   thinkingRock = callPackage ../applications/misc/thinking-rock { };
 
-  thunderbird = callPackage ../applications/networking/mailreaders/thunderbird/7.x.nix {
+  thunderbird = callPackage ../applications/networking/mailreaders/thunderbird/9.x.nix {
     inherit (gnome) libIDL;
   };
 

From a975a3525440b34707d5259207511aef257c9371 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 18 Jan 2012 10:26:38 +0000
Subject: [PATCH 043/114] Update Vacuum-IM

svn path=/nixpkgs/trunk/; revision=31617
---
 .../networking/instant-messengers/vacuum/default.nix  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
index 6b8b7a9419d..5e582cb09d1 100644
--- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix
+++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
@@ -12,11 +12,11 @@ let
   buildInputs = map (n: builtins.getAttr n x)
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
-    version="1.1.1";
+    version="1.1.2";
     baseName="vacuum-im";
     name="${baseName}-${version}";
-    url="http://vacuum-im.googlecode.com/files/${name}.tar.xz";
-    hash="b4b3472bf83173f6be1bbe69520bf6cab97e24cf9fd8a7b60e4ffdc1cb43b1dc";
+    url="http://vacuum-im.googlecode.com/files/vacuum-${version}.tar.xz";
+    hash="451dde9b3587503b035fa1ddd2c99f2052a0b17a603491c59e8c47a8bcd4746d";
   };
 in
 rec {
@@ -29,7 +29,7 @@ rec {
   inherit buildInputs;
 
   /* doConfigure should be removed if not needed */
-  phaseNames = ["addInputs" "preBuild" "doQMake" "doMakeInstall"];
+  phaseNames = ["addInputs" "doQMake" "doMakeInstall"];
 
   preBuild = a.fullDepEntry (''
     echo "Fixing a name collision with a function added in Qt 4.7"
@@ -48,6 +48,9 @@ rec {
     ];
     platforms = with a.lib.platforms;
       linux;
+    license = with a.lib.licenses;
+      gpl3;
+    homepage = "http://code.google.com/p/vacuum-im/";
   };
   passthru = {
     updateInfo = {

From 6fd326a636d816b48386b11e01f542e2b739ae5f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 18 Jan 2012 10:27:48 +0000
Subject: [PATCH 044/114] Remove obsolete phase

svn path=/nixpkgs/trunk/; revision=31618
---
 .../networking/instant-messengers/vacuum/default.nix         | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
index 5e582cb09d1..bddedce7183 100644
--- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix
+++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
@@ -31,11 +31,6 @@ rec {
   /* doConfigure should be removed if not needed */
   phaseNames = ["addInputs" "doQMake" "doMakeInstall"];
 
-  preBuild = a.fullDepEntry (''
-    echo "Fixing a name collision with a function added in Qt 4.7"
-    sed -re 's/qHash[(][a-z ]*QUrl/vacuum_obsolete_&/' -i src/plugins/dataforms/dataforms.cpp
-  '') ["minInit" "doUnpack"];
-
   doQMake = a.fullDepEntry (''
     qmake INSTALL_PREFIX=$out -recursive vacuum.pro
   '') ["doUnpack" "addInputs"];

From bbe40d00f440663fd42469ed34377c87316e0d5c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 18 Jan 2012 12:23:42 +0000
Subject: [PATCH 045/114] * Bump nixUnstable.

svn path=/nixpkgs/trunk/; revision=31619
---
 pkgs/tools/package-management/nix/unstable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index 708951814bc..e5475e7fd06 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.0pre31028";
+  name = "nix-1.0pre31616";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/1648301/download/4/${name}.tar.bz2";
-    sha256 = "5a74cff532e0615b23a3937003ee67d257b4371d89fc60ae2be9f342efd979d2";
+    url = "http://hydra.nixos.org/build/1823251/download/4/${name}.tar.bz2";
+    sha256 = "34d95cee3a931666f358f18557f884b6bc7fade83092eef021e52db7ba5e2af1";
   };
 
   buildNativeInputs = [ perl pkgconfig ];

From 6b174cfb8279f4302315ac834a0b52ad320a88ef Mon Sep 17 00:00:00 2001
From: Alexander Tsamutali <astsmtl@yandex.ru>
Date: Wed, 18 Jan 2012 13:45:46 +0000
Subject: [PATCH 046/114] applications/networking/remote/freerdp: Updated to
 1.0.0.

svn path=/nixpkgs/trunk/; revision=31620
---
 .../networking/remote/freerdp/default.nix          | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix
index 8d80630f316..3aeeb8dd0ee 100644
--- a/pkgs/applications/networking/remote/freerdp/default.nix
+++ b/pkgs/applications/networking/remote/freerdp/default.nix
@@ -1,29 +1,36 @@
 { stdenv
 , fetchurl
+, cmake
 , openssl
 , printerSupport ? true, cups
 , pkgconfig
 , zlib
 , libX11
 , libXcursor
+, libXdamage
+, libXext
 , alsaLib
 }:
 
 assert printerSupport -> cups != null;
 stdenv.mkDerivation rec {
-  name = "freerdp-0.8.2";
+  name = "freerdp-${version}";
+  version = "1.0.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/freerdp/${name}.tar.gz";
-    sha256 = "1q9hhwyc4hk49hsmd2kghrfsawxcc7gy7vcmhdf91l8v95xp16iq";
+    url = "https://github.com/downloads/FreeRDP/FreeRDP/FreeRDP-${version}.tar.gz";
+    sha256 = "1h7b2ykgsp1b04p67syb3p2xgpsb45i6zl1jvm09h0dr5an85awd";
   };
 
   buildInputs = [
+    cmake
     openssl
     pkgconfig
     zlib
     libX11
     libXcursor
+    libXdamage
+    libXext
     alsaLib
   ] ++ stdenv.lib.optional printerSupport cups;
 
@@ -46,4 +53,3 @@ stdenv.mkDerivation rec {
     maintainers = [ stdenv.lib.maintainers.shlevy ];
   };
 }
-

From 09dee8994ff6b391f0bd7bb81bf418f946004c67 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jan 2012 15:04:09 +0000
Subject: [PATCH 047/114] haskell-idris: updated to version 0.9.0

svn path=/nixpkgs/trunk/; revision=31622
---
 pkgs/development/compilers/idris/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix
index 48346e99107..56d5060662b 100644
--- a/pkgs/development/compilers/idris/default.nix
+++ b/pkgs/development/compilers/idris/default.nix
@@ -1,16 +1,17 @@
-{ cabal, binary, epic, happy, ivor, mtl, parsec, readline }:
+{ cabal, binary, epic, happy, haskeline, mtl, parsec, transformers
+}:
 
 cabal.mkDerivation (self: {
   pname = "idris";
-  version = "0.1.7.1";
-  sha256 = "1449fy7ld2p6ksn43bvhpa5z7j8vx4wc2szwq85wzpwfaw10d8wb";
-  isLibrary = true;
+  version = "0.9.0";
+  sha256 = "03zbdcl3v90zv0ibzq9fa8z2qrrdsilh5m509mczwrcmlzbzsmrl";
+  isLibrary = false;
   isExecutable = true;
-  buildDepends = [ binary epic ivor mtl parsec readline ];
+  buildDepends = [ binary epic haskeline mtl parsec transformers ];
   buildTools = [ happy ];
   noHaddock = true;
   meta = {
-    homepage = "http://www.cs.st-andrews.ac.uk/~eb/Idris/";
+    homepage = "http://www.idris-lang.org/";
     description = "Dependently Typed Functional Programming Language";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;

From 494083fbf66708bb03ee5c8483fddb2591f70125 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jan 2012 15:04:11 +0000
Subject: [PATCH 048/114] haskell-attoparsec-conduit: updated to version 0.0.1

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

diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
index 48f9ce492c2..0ce16db4466 100644
--- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "attoparsec-conduit";
-  version = "0.0.0.1";
-  sha256 = "1z6v2j08j3fl329npiz9klbz5gbcl0q8vgz3drmrmyhn31a6cvsf";
+  version = "0.0.1";
+  sha256 = "04r3ywzjm39rmd0pka8537c8n6d4l6scgzkqzplmi6nb0kikgb6i";
   buildDepends = [ attoparsec conduit text transformers ];
   meta = {
     homepage = "http://github.com/snoyberg/conduit";

From 8cc90001d95843d4260ca7b9c3a995da4ef700b1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jan 2012 15:04:14 +0000
Subject: [PATCH 049/114] haskell-blaze-builder-conduit: updated to version
 0.0.1

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

diff --git a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
index 40e4ec9a121..f48243a027a 100644
--- a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-builder-conduit";
-  version = "0.0.0";
-  sha256 = "022j78sj9cs4xcbvxz0f2lga0rhxcwaj1mkxn0019rbx3lix1nh3";
+  version = "0.0.1";
+  sha256 = "1k9is6dknfqjnkqrvxs9z8cx0ffnnz4q02is9plndyg8pccgjfa9";
   buildDepends = [ blazeBuilder conduit text transformers ];
   meta = {
     homepage = "http://github.com/snoyberg/conduit";

From 2448541afc0a8d319aecb31054c352ae5b0f7686 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jan 2012 15:04:16 +0000
Subject: [PATCH 050/114] haskell-data-accessor-template: updated to version
 0.2.1.9

svn path=/nixpkgs/trunk/; revision=31625
---
 .../haskell/data-accessor/data-accessor-template.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix
index 0238f2d311b..a160aa3f708 100644
--- a/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix
+++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "data-accessor-template";
-  version = "0.2.1.8";
-  sha256 = "0bx0w4vkigq20pa31sdygj4idi3iywkpclbllrw38ma1j19033zk";
+  version = "0.2.1.9";
+  sha256 = "14zp2zjxlkdi33cjif9lc1kl8m0x4brh0pk3d34wk1g1bfzynijc";
   buildDepends = [ dataAccessor utilityHt ];
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Record_access";

From 4401790252b974abd624c4012d1f9a547effbda8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jan 2012 15:04:19 +0000
Subject: [PATCH 051/114] haskell-tls: updated to version 0.8.5

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

diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix
index c5e56ec6b80..326e40198f7 100644
--- a/pkgs/development/libraries/haskell/tls/default.nix
+++ b/pkgs/development/libraries/haskell/tls/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tls";
-  version = "0.8.4";
-  sha256 = "1xd6cax4ldvahjjs5kdhcjmy4rx1ywp6r3alaifxbk2397zi7p1v";
+  version = "0.8.5";
+  sha256 = "07xz81ny9a1rcflqiqxkmx5kj62rssxw1gr6vnlg76xr21j8mam9";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 45bd1f2365f00357a56b9602f171fd596c525587 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jan 2012 15:04:21 +0000
Subject: [PATCH 052/114] haskell-xml: updated to version 1.3.12

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

diff --git a/pkgs/development/libraries/haskell/xml/default.nix b/pkgs/development/libraries/haskell/xml/default.nix
index 43e6b741724..8a8e6e3e2ad 100644
--- a/pkgs/development/libraries/haskell/xml/default.nix
+++ b/pkgs/development/libraries/haskell/xml/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xml";
-  version = "1.3.11";
-  sha256 = "1av8cn62aaz0pl0fqqlp8wsyg36a1068qawzci8fxzasrfyyc8ca";
+  version = "1.3.12";
+  sha256 = "1lmqnzna0zy297y4q6qviv7a4966zz9mhfhk6anrp66cz890whai";
   buildDepends = [ text ];
   meta = {
     homepage = "http://code.galois.com";

From 60940535395cad32eae2f95cb8f455494acc1632 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jan 2012 15:04:24 +0000
Subject: [PATCH 053/114] haskell-zlib-conduit: updated to version 0.0.1

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

diff --git a/pkgs/development/libraries/haskell/zlib-conduit/default.nix b/pkgs/development/libraries/haskell/zlib-conduit/default.nix
index 306475a81b4..d19157382a8 100644
--- a/pkgs/development/libraries/haskell/zlib-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/zlib-conduit/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "zlib-conduit";
-  version = "0.0.0";
-  sha256 = "1nqcw809xqlycggn4nqys205gv3kjwws16910xlx2b8b9f8ayxjg";
+  version = "0.0.1";
+  sha256 = "19bxw5maiff213jsbw889pwhmkwh1qnxrv377icwsqa619dx4k1y";
   buildDepends = [ conduit transformers zlibBindings ];
   meta = {
     homepage = "http://github.com/snoyberg/conduit";

From a0e44836a425bf1cd3e3a3456bcdec76fd65ac90 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jan 2012 15:09:45 +0000
Subject: [PATCH 054/114] haskell-xml-conduit: updated to version 0.5.1.1

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

diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix
index 675042c629a..8d696bae4dc 100644
--- a/pkgs/development/libraries/haskell/xml-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xml-conduit";
-  version = "0.5.1";
-  sha256 = "1b7jnbsfb3p3p6bpwq3847kfszdyzijfcarvxwzcdragkr0dpc48";
+  version = "0.5.1.1";
+  sha256 = "0md6fkjn8j1dsbhlwh64x2990kvsmks6plppa63v9nwc9142ajim";
   buildDepends = [
     attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
     conduit dataDefault failure systemFilepath text transformers

From a0672a86dcf0ed8d7c96b43e86ebb82f189df136 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jan 2012 15:09:47 +0000
Subject: [PATCH 055/114] haskell-yaml: updated to version 0.5.1.2

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

diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix
index 2b25768aa69..e65737a94b9 100644
--- a/pkgs/development/libraries/haskell/yaml/default.nix
+++ b/pkgs/development/libraries/haskell/yaml/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yaml";
-  version = "0.5.1.1";
-  sha256 = "1l3f1rbdajdf9944kwbf90a1wxv00g2jcgjkg54k6c3iqbx956w2";
+  version = "0.5.1.2";
+  sha256 = "0xmx58h47prpmgbf63bsy7ar74h0d968wyd2yg3bgvwmnd83iz7d";
   buildDepends = [
     aeson attoparsec conduit text transformers unorderedContainers
     vector

From 87441a72be54bb21a4319d44bfd7543f900a3e0e Mon Sep 17 00:00:00 2001
From: Alexander Tsamutali <astsmtl@yandex.ru>
Date: Wed, 18 Jan 2012 15:14:42 +0000
Subject: [PATCH 056/114] perl-packages.nix: Added Sort-Versions.

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 421c03ea0af..8565d4b8abc 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2987,6 +2987,14 @@ rec {
     };
   };
 
+  SortVersions = buildPerlPackage rec {
+    name = "Sort-Versions-1.5";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/E/ED/EDAVIS/${name}.tar.gz";
+      sha256 = "1yhyxaakyhcffgr9lwd314badhlc2gh9f6n47013ljshbnkgzhh9";
+    };
+  };
+
   SpreadsheetParseExcel = buildPerlPackage rec {
     name = "Spreadsheet-ParseExcel-0.58";
     src = fetchurl {

From 45add982aefe419584080cf6fb2e5cf8e696324f Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 18 Jan 2012 16:19:25 +0000
Subject: [PATCH 057/114] Bumped JSON to 2.53 and JSON-XS to 2.32. The older
 versions doesn't seem to be located on these sites anymore

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8565d4b8abc..ee4f3fa4771 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2021,10 +2021,10 @@ rec {
   };
 
   JSON = buildPerlPackage rec {
-    name = "JSON-2.21";
+    name = "JSON-2.53";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MA/MAKAMAKA/${name}.tar.gz";
-      sha256 = "1dz00922yq7pz8hb9bbk8pqkwh0brf595lklsind62lf5f247vj7";
+      sha256 = "0rfms17d0pkai26kqyzaylbr5wxcrrhyjkyshq85l41xb0g1iplh";
     };
     propagatedBuildInputs = [JSONXS];
   };
@@ -2047,10 +2047,10 @@ rec {
   };
 
   JSONXS = buildPerlPackage rec {
-    name = "JSON-XS-2.29";
+    name = "JSON-XS-2.32";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz";
-      sha256 = "1gl8x2rc3krpj6cs1dg0g28iqqfbn9zyq4nz9mbngv0lccc0y5vy";
+      sha256 = "012bf324pf5lnrf6ck2y167i1q1zzzc0w43b381qfnk7v5fcvaik";
     };
     buildInputs = [CommonSense];
   };

From faedda84ef5867230cb4103f23eb361c5f6b0042 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 18 Jan 2012 17:23:41 +0000
Subject: [PATCH 058/114] A more correct condition for adding scripts to
 install

svn path=/nixpkgs/trunk/; revision=31638
---
 pkgs/tools/package-management/nix/custom.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/nix/custom.nix b/pkgs/tools/package-management/nix/custom.nix
index 6a73c0e9528..5b1569291e1 100644
--- a/pkgs/tools/package-management/nix/custom.nix
+++ b/pkgs/tools/package-management/nix/custom.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
   preConfigure = 
     (lib.concatMapStrings (script:
       ''
-        sed -e '/bin_SCRIPTS/a${script} \\' -i scripts/Makefile.am
+        sed -e '/bin_SCRIPTS = /a${script} \\' -i scripts/Makefile.am
       ''
     ) enableScripts)
     + preConfigure

From f6db0ed1e00d10658226f68d29ebd5299788d492 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 18 Jan 2012 18:45:00 +0000
Subject: [PATCH 059/114] * Mesa only builds on Linux.

svn path=/nixpkgs/trunk/; revision=31640
---
 pkgs/lib/platforms.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/lib/platforms.nix b/pkgs/lib/platforms.nix
index e9ed1e226e7..19ceb16fcff 100644
--- a/pkgs/lib/platforms.nix
+++ b/pkgs/lib/platforms.nix
@@ -12,5 +12,5 @@ rec {
   unix = linux ++ darwin ++ freebsd ++ openbsd;
   all = linux ++ darwin ++ cygwin ++ freebsd ++ openbsd;
   allBut = platform: lists.filter (x: platform != x) all;
-  mesaPlatforms = linux ++ darwin ++ freebsd;
+  mesaPlatforms = linux;
 }

From db009e0eb8f4b3447c587d5958d8716531d39885 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jan 2012 20:32:10 +0000
Subject: [PATCH 060/114] emacs org-mode: upgraded to latest version

svn path=/nixpkgs/trunk/; revision=31645
---
 pkgs/applications/editors/emacs-modes/org/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix
index 18ea2797bec..0059ee6821d 100644
--- a/pkgs/applications/editors/emacs-modes/org/default.nix
+++ b/pkgs/applications/editors/emacs-modes/org/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, emacs, texinfo, which }:
 
 stdenv.mkDerivation rec {
-  name = "org-7.5";
+  name = "org-7.8";
 
   src = fetchurl {
     url = "http://orgmode.org/${name}.tar.gz";
-    sha256 = "978822bc4c5f9f67450fbaa8572f1d4217406b7e28551278c9f23f7e9515cd4b";
+    sha256 = "0idxsxdr5p0bvnjmhvpdkfwhlpkxmihnaljf43k0311g9z3k22qz";
   };
 
   buildInputs = [ emacs texinfo ];

From 3ea9f68e758afff3aa51195500752c0a89ece201 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jan 2012 20:32:14 +0000
Subject: [PATCH 061/114] uhc: upgraded to latest version

svn path=/nixpkgs/trunk/; revision=31646
---
 pkgs/development/compilers/uhc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix
index 390fa28f6f7..75ca05f8569 100644
--- a/pkgs/development/compilers/uhc/default.nix
+++ b/pkgs/development/compilers/uhc/default.nix
@@ -3,7 +3,7 @@
 }:
 
 let
-  revision = "2381";
+  revision = "2399";
 in
 stdenv.mkDerivation {
   name = "uhc-svn-${revision}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   src = fetchsvn {
      url = "https://subversion.cs.uu.nl/repos/project.UHC.pub/trunk/EHC";
      rev = revision;
-     sha256 = "37598f49cda8ff67b0b4d1c75b0bf50bfcd29a92b08ea427c5071080e368c4bc";
+     sha256 = "f4e87dbf95f90b021994b0840f27e042dd4e785df7efedcf567f3e2c7ce32621";
   };
 
   propagatedBuildInputs = [mtl network binary fgl syb];

From 3dd02a75ef976a93ea47507e6d58f8d73f3d2d65 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jan 2012 20:32:17 +0000
Subject: [PATCH 062/114] openvpn: upgraded to latest version

svn path=/nixpkgs/trunk/; revision=31647
---
 pkgs/tools/networking/openvpn/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index bfcc1c16dab..e88b9b4ee1a 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, iproute, lzo, openssl, nettools}:
 
 stdenv.mkDerivation rec {
-  name = "openvpn-2.2.0";
+  name = "openvpn-2.2.2";
 
   src = fetchurl {
     url = "http://swupdate.openvpn.net/community/releases/${name}.tar.gz";
-    sha256 = "0rr59b3ybqr2j5jxl2fdzmm5qbh0hvwi03xfaha6s7k4l6mymsvi";
+    sha256 = "005cpvdvh8pvsn3bc96lrznlkcccbz5jqa62hipb58rf1qk8pjjl";
   };
 
   buildInputs = [ iproute lzo openssl ];

From 3eca1b395f15224d898bd4234490d9200514a531 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jan 2012 20:32:20 +0000
Subject: [PATCH 063/114] jruby: upgraded to latest version, fixed java
 dependency

svn path=/nixpkgs/trunk/; revision=31648
---
 .../interpreters/jruby/default.nix            | 24 ++++++++++++++-----
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix
index d26ab694934..da2e0b65f00 100644
--- a/pkgs/development/interpreters/jruby/default.nix
+++ b/pkgs/development/interpreters/jruby/default.nix
@@ -1,18 +1,30 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation {
-  name = "jruby-1.1.6";
+  name = "jruby-1.6.5.1";
 
   src = fetchurl {
-    url = http://dist.codehaus.org/jruby/1.1.6RC1/jruby-bin-1.1.6RC1.tar.gz;
-    sha256 = "1q3cjshxk484i8gqxm682bxcrps7205nl9vlim4s6z827bjlmc4a";
+    url = http://jruby.org.s3.amazonaws.com/downloads/1.6.5.1/jruby-bin-1.6.5.1.tar.gz;
+    sha256 = "1j0iv1q950lyir9vqfgg2533f1q28jaz7vnxqswsaix1mjhm29qd";
   };
 
-  installPhase = '' ensureDir $out; cp -r * $out '';
+  buildInputs = [ makeWrapper ];
+
+  installPhase = ''
+     ensureDir $out
+     mv * $out
+     rm $out/bin/*.{bat,dll,exe,sh}
+     mv $out/README $out/docs
+
+     for i in $out/bin/*; do
+       wrapProgram $i \
+         --set JAVA_HOME ${jre}
+     done
+  '';
 
   meta = { 
     description = "Ruby interpreter written in Java";
-    homepage = http://jruby.codehaus.org/;
+    homepage = http://jruby.org/;
     license = "CPL-1.0 GPL-2 LGPL-2.1"; # one of those
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 425d02886a7..fb2dd3dcf67 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2777,7 +2777,7 @@ let
 
   jdtsdk = callPackage ../development/eclipse/jdt-sdk { };
 
-  jruby116 = callPackage ../development/interpreters/jruby { };
+  jruby165 = callPackage ../development/interpreters/jruby { };
 
   guileCairo = callPackage ../development/guile-modules/guile-cairo { };
 

From 7abb4986a20ea0d7367e760540b0314ae8dfb926 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jan 2012 20:32:23 +0000
Subject: [PATCH 064/114] v8: upgraded to latest stable 3.6 version (which
 node.js uses)

svn path=/nixpkgs/trunk/; revision=31649
---
 pkgs/development/libraries/v8/default.nix | 35 ++++++++++++-----------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix
index 9e60f1ce8ba..3dbdea9c96b 100644
--- a/pkgs/development/libraries/v8/default.nix
+++ b/pkgs/development/libraries/v8/default.nix
@@ -1,35 +1,36 @@
-{ stdenv, fetchsvn, python, scons, makeWrapper }:
+{ stdenv, fetchsvn, python, scons, readline, makeWrapper }:
+
+assert readline != null;
 
 let
   system = stdenv.system;
-  arch = if system == "i686-linux" then "ia32" else if system == "x86_64-linux" then "x64" else ""; 
+  arch = if system == "i686-linux" then "ia32" else if system == "x86_64-linux" then "x64" else "";
+  version = "3.6.6.17";
 in
 assert system == "i686-linux" || system == "x86_64-linux";
 stdenv.mkDerivation rec {
-    name = "v8-r${toString src.rev}";
+    name = "v8-${version}";
     src = fetchsvn {
-      url = http://v8.googlecode.com/svn/trunk ;
-      sha256 = "1p51zh1l9c2gq3g4qk713n6qki9by3llx4p46inncvqfrimgshxb";
-      rev = 5865;
+      url = "http://v8.googlecode.com/svn/tags/${version}";
+      sha256 = "7080d53b9d3aefc591c2e181dcf97d538ce36177284fc658eca6420ea36a926f";
     };
-    
-    buildInputs = [python scons makeWrapper];
-    
+
+    buildInputs = [python scons readline makeWrapper];
+
     buildPhase = ''
       export CXX=`type -p g++`
-      scons snapshot=on importenv=PATH arch=${arch}
-      scons snapshot=on library=shared importenv=PATH arch=${arch}
-      scons sample=shell snapshot=on importenv=PATH arch=${arch} 
+      export CPPPATH=${readline}/include
+      export LIBPATH=${readline}/lib
+      scons snapshot=on console=readline library=shared importenv=PATH arch=${arch} library d8
     '';
-    
+
     installPhase = ''
       ensureDir $out/bin
       ensureDir $out/lib
-      
+
       cp -v libv8.* $out/lib
-      cp -v shell $out/bin/v8-shell
+      cp -v d8 $out/bin/d8
       cp -vR include $out/
-      wrapProgram $out/bin/v8-shell --set LD_LIBRARY_PATH $out/lib  
-     
+      wrapProgram $out/bin/d8 --set LD_LIBRARY_PATH $out/lib
     '';
 }

From f94f871b67063998c15007ab66b8de2d91731ce4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jan 2012 20:32:26 +0000
Subject: [PATCH 065/114] node.js: use shared v8 instead of bundled one

svn path=/nixpkgs/trunk/; revision=31650
---
 pkgs/development/web/nodejs/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index 88f9c32ba92..c7fe9158ffe 100644
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, python, zlib }:
+{ stdenv, fetchurl, openssl, python, zlib, v8 }:
 
 stdenv.mkDerivation rec {
   version = "0.6.6";
@@ -12,13 +12,16 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--openssl-includes=${openssl}/include"
     "--openssl-libpath=${openssl}/lib"
+    "--shared-v8"
+    "--shared-v8-includes=${v8}/includes"
+    "--shared-v8-libpath=${v8}/lib"
   ];
 
   patchPhase = ''
     sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i tools/{*.py,waf-light,node-waf}
   '';
 
-  buildInputs = [ python openssl zlib ];
+  buildInputs = [ python openssl v8 zlib];
 
   meta = with stdenv.lib; {
     description = "Event-driven I/O framework for the V8 JavaScript engine";

From 1646bc36da84728cba2c5b7441dbafc908591e36 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jan 2012 20:32:29 +0000
Subject: [PATCH 066/114] wpa_supplicant: fixed crashing bug

on some hardware, wpa_supplicant would crash when controlled via dbus
(wicd/networkmanager), this patch fixes it.

svn path=/nixpkgs/trunk/; revision=31651
---
 pkgs/os-specific/linux/wpa_supplicant/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index fcb6641dfd9..8d216f7899d 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -32,7 +32,15 @@ in
     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

From cd22d76a8ea83664ac5f10b8cee6ecf04f8781af Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jan 2012 20:32:31 +0000
Subject: [PATCH 067/114] maintainers: added myself for upcoming packages

svn path=/nixpkgs/trunk/; revision=31652
---
 pkgs/lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix
index d377dd2e1c5..d4c08515545 100644
--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@@ -8,6 +8,7 @@
   andres = "Andres Loeh <ksnixos@andres-loeh.de>";
   astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>";
   bjg = "Brian Gough <bjg@gnu.org>";
+  bluescreen303 = "Mathijs Kwik <mathijs@bluescreen303.nl>";
   chaoflow = "Florian Friesdorf <flo@chaoflow.net>";
   eelco = "Eelco Dolstra <e.dolstra@tudelft.nl>";
   goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";

From 02392785c5480f104dd9a58e0d57080b0da96f99 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jan 2012 20:32:34 +0000
Subject: [PATCH 068/114] ghc-mod: new package (emacs haskell-mode extension)

svn path=/nixpkgs/trunk/; revision=31653
---
 .../libraries/haskell/ghc-mod/default.nix     | 30 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/ghc-mod/default.nix

diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
new file mode 100644
index 00000000000..3d4d8927a83
--- /dev/null
+++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix
@@ -0,0 +1,30 @@
+{ cabal, attoparsec, attoparsecEnumerator, ghcPaths, hlint, regexPosix, emacs, emacs23Packages }:
+
+cabal.mkDerivation (self: {
+  pname = "ghc-mod";
+  version = "1.0.6";
+  sha256 = "c075314de03209827a0e59ee3e63a4d21bc8edb024a1e36721eea248805b38ba";
+  buildDepends = [
+    attoparsec attoparsecEnumerator ghcPaths hlint regexPosix
+  ];
+#  buildTools = [emacs emacs23];
+  propagatedBuildInputs = [emacs emacs23Packages.haskellMode];
+  isExecutable = true;
+  postInstall = ''
+    cd $out/share/$pname-$version
+    make
+    rm Makefile
+    cd ..
+    ensureDir "$out/share/emacs"
+    mv $pname-$version emacs/site-lisp
+  '';
+
+  meta = {
+    description = "Happy Haskell programming on Emacs";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.bluescreen303
+    ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 236f8f9a5a9..79b89349dfa 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -672,6 +672,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   ghcEvents = callPackage ../development/libraries/haskell/ghc-events {};
 
+  ghcMod = callPackage ../development/libraries/haskell/ghc-mod {};
+
   ghcMtl = callPackage ../development/libraries/haskell/ghc-mtl {};
 
   ghcPaths = callPackage ../development/libraries/haskell/ghc-paths {};

From e58052514b3c61aa1fd26d4d3f94fe7af281d375 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jan 2012 20:32:37 +0000
Subject: [PATCH 069/114] youtube-dl: new package (download clips from youtube)

svn path=/nixpkgs/trunk/; revision=31654
---
 pkgs/tools/misc/youtube-dl/default.nix | 31 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/misc/youtube-dl/default.nix

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
new file mode 100644
index 00000000000..0422383ed3b
--- /dev/null
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -0,0 +1,31 @@
+{stdenv, fetchgit, python}:
+
+let pkgname = "youtube-dl";
+    pkgver  = "2011.12.08";
+    
+in
+stdenv.mkDerivation {
+  name = "${pkgname}-${pkgver}";
+
+  src = fetchgit {
+    url = "git://github.com/rg3/${pkgname}";
+    rev = "661a807c65a154eccdddb875b45e4782ca86132c";
+    sha256 = "32fd193b867b122400e9d5d32f6dfaf15704f837a9dc2ff809e1ce06712857ba";
+  };
+
+  buildInputs = [python];
+  buildPhase = "sed -i 's|#!/usr/bin/env python|#!#{python}/bin/python|' youtube-dl";
+
+  installPhase = ''
+    ensureDir $out/bin
+    cp youtube-dl $out/bin
+  '';
+
+  meta = {
+    description = "A small command-line program to download videos from YouTube.com and a few more sites";
+    homepage = http://rg3.github.com/youtube-dl/;
+    maintainers = [
+      stdenv.lib.maintainers.bluescreen303
+    ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fb2dd3dcf67..62f2e49df4d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1628,6 +1628,8 @@ let
 
   xtreemfs = callPackage ../tools/filesystems/xtreemfs {};
 
+  youtubeDL = callPackage ../tools/misc/youtube-dl { };
+
   zbar = callPackage ../tools/graphics/zbar {};
 
   zdelta = callPackage ../tools/compression/zdelta { };

From 89857081311a65d0714aa84c897f8285479adc71 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jan 2012 20:32:41 +0000
Subject: [PATCH 070/114] mongodb: new package (nosql database) - nixos
 integration available

svn path=/nixpkgs/trunk/; revision=31655
---
 pkgs/servers/nosql/mongodb/default.nix | 44 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/servers/nosql/mongodb/default.nix

diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix
new file mode 100644
index 00000000000..29261455c8d
--- /dev/null
+++ b/pkgs/servers/nosql/mongodb/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchurl, scons, which, boost, gnutar, v8 ? null, useV8 ? false}:
+
+assert useV8 -> v8 != null;
+
+stdenv.mkDerivation rec {
+  name = "mongodb-2.0.2";
+
+  src = fetchurl {
+    url = "http://downloads.mongodb.org/src/mongodb-src-r2.0.2.tar.gz";
+    sha256 = "13xcwaz9rqn0xgh5jijpqxhz1q2qjl8x18bymbl7092k6p29i974";
+  };
+
+  buildInputs = [scons which boost] ++ stdenv.lib.optional useV8 v8;
+
+  enableParallelBuilding = true;
+
+  patchPhase = ''
+    substituteInPlace SConstruct --replace "Environment( MSVS_ARCH=msarch , tools = [\"default\", \"gch\"], toolpath = '.' )" "Environment( MSVS_ARCH=msarch , tools = [\"default\", \"gch\"], toolpath = '.', ENV = os.environ )"
+    substituteInPlace SConstruct --replace "../v8" "${v8}"
+    substituteInPlace SConstruct --replace "LIBPATH=[\"${v8}/\"]" "LIBPATH=[\"${v8}/lib\"]"
+  '';
+
+  buildPhase = ''
+    export TERM=""
+    scons all --cc=`which gcc` --cxx=`which g++` --libpath=${boost}/lib --cpppath=${boost}/include ${if useV8 then "--usev8" else ""}
+  '';
+
+  installPhase = ''
+    scons install --cc=`which gcc` --cxx=`which g++` --libpath=${boost}/lib --cpppath=${boost}/include --full --prefix=$out
+    if [ -d $out/lib64 ]; then
+      mv $out/lib64 $out/lib
+    fi
+  '';
+
+  meta = {
+    description = "a scalable, high-performance, open source NoSQL database";
+    homepage = http://www.mongodb.org;
+    license = "AGPLv3";
+
+    maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 62f2e49df4d..66e852ee2c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5061,6 +5061,8 @@ let
 
   monetdb = callPackage ../servers/sql/monetdb { };
 
+  mongodb = callPackage ../servers/nosql/mongodb { useV8 = (getConfig ["mongodb" "useV8"] false); };
+
   mysql4 = import ../servers/sql/mysql {
     inherit fetchurl stdenv ncurses zlib perl;
     ps = procps; /* !!! Linux only */

From 7b1be8e27dde294413d4d178e76d21ba8db8412e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jan 2012 20:32:45 +0000
Subject: [PATCH 071/114] btrfs-progs: small fix for Makefile

line was split so we cannot append anymore because that appends after \

svn path=/nixpkgs/trunk/; revision=31656
---
 pkgs/tools/filesystems/btrfsprogs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix
index 76d185f82d9..68139f416eb 100644
--- a/pkgs/tools/filesystems/btrfsprogs/default.nix
+++ b/pkgs/tools/filesystems/btrfsprogs/default.nix
@@ -33,7 +33,7 @@ rec {
 
   doEnsureBtrfsImage = a.fullDepEntry (''
     if ! grep 'progs = ' Makefile | grep btrfs-image; then
-      sed -e 's/progs = .*/& btrfs-image/' -i Makefile
+      sed -e 's/progs = \(.*\)\\/progs = \1btrfs-image \\/' -i Makefile
     fi
   '') ["minInit" "doUnpack"];
 

From 1e4a7842d24866ae767d8fe1b700ed4537807d17 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jan 2012 20:38:24 +0000
Subject: [PATCH 072/114] rsync: optional feature (disabled by default) to sync
 devices

I use this feature for doing snapshot backups, which is way faster
than copying a huge files tree.

The patch is semi-official, rsync-patches is maintained by rsync
upstream itself.
The patch doesn't affect any behaviour, it only adds 1 option
so it shouldn't affect you if you don't use it.

svn path=/nixpkgs/trunk/; revision=31659
---
 pkgs/applications/networking/sync/rsync/default.nix | 13 +++++++++++--
 pkgs/top-level/all-packages.nix                     |  1 +
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index 343895e0877..09f85b9edfc 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -1,17 +1,26 @@
 { stdenv, fetchurl, perl
 , enableACLs ? true, acl ? null
+, enableCopyDevicesPatch ? false
 }:
 
 assert enableACLs -> acl != null;
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "rsync-3.0.9";
 
-  src = fetchurl {
+  mainSrc = fetchurl {
     url = http://rsync.samba.org/ftp/rsync/src/rsync-3.0.9.tar.gz;
     sha256 = "01bw4klqsrlhh3i9lazd485sd9qx5djvnwa21lj2h3a9sn6hzw9h";
   };
 
+  patchesSrc = fetchurl {
+    url = http://rsync.samba.org/ftp/rsync/rsync-patches-3.0.9.tar.gz;
+    sha256 = "0c1e9b56e99667dfc47641124460bac61a04c5d2ee89f575c6bc78c7a69005a9";
+  };
+
+  srcs = [mainSrc] ++ stdenv.lib.optional enableCopyDevicesPatch patchesSrc;
+  patches = [] ++ stdenv.lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff";
+
   buildInputs = stdenv.lib.optional enableACLs acl;
   buildNativeInputs = [perl];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 66e852ee2c5..937a79e73b7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7359,6 +7359,7 @@ let
 
   rsync = callPackage ../applications/networking/sync/rsync {
     enableACLs = !(stdenv.isDarwin || stdenv.isSunOS);
+    enableCopyDevicesPatch = (getConfig ["rsync" "enableCopyDevicesPatch"] false);
   };
 
   rxvt = callPackage ../applications/misc/rxvt { };

From 8b3dd705532dfb64952d3e708eb1f3fb14d18f4c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jan 2012 20:38:27 +0000
Subject: [PATCH 073/114] openvpn: use iproute2 instead of net-tools

for setting up tunnel/routes.
I had some issues with ipv6, iproute2 fixed those.

Both are equally well supported by upstream.

svn path=/nixpkgs/trunk/; revision=31660
---
 pkgs/tools/networking/openvpn/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index e88b9b4ee1a..98c3dd484dc 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, iproute, lzo, openssl, nettools}:
+{stdenv, fetchurl, iproute, lzo, openssl}:
 
 stdenv.mkDerivation rec {
   name = "openvpn-2.2.2";
@@ -12,9 +12,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = ''
     --enable-password-save
-    --with-ifconfig-path=${nettools}/sbin/ifconfig
+    --enable-iproute2
     --with-iproute-path=${iproute}/sbin/ip
-    --with-route-path=${nettools}/sbin/route
   '';
 
   meta = { 

From 5ebdf058cc5f8fbbcd680cbecbc06a04435555b3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jan 2012 20:38:30 +0000
Subject: [PATCH 074/114] intel X driver: upgraded to fix display glitches on
 newer chips

at least 2 nixos users were affected by a graphics bug that got fixed
in 2.15.
Officially 2.15 was meant for a newer xorg server, libdrm, mesa and all, but
I've been running with this for over a month with no issues (used
compositing desktop, opengl and hd video).

I know 2.17 is in the repo, but it doesn't builde (missing deps I
think).

svn path=/nixpkgs/trunk/; revision=31661
---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/tarballs-7.6.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 8342c4f7d22..42e89d43649 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1568,11 +1568,11 @@ let
   })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
     
   xf86videointel = (stdenv.mkDerivation ((if overrides ? xf86videointel then overrides.xf86videointel else x: x) {
-    name = "xf86-video-intel-2.14.0";
+    name = "xf86-video-intel-2.15.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-intel-2.14.0.tar.bz2;
-      sha256 = "1pq7nm6whc2nmrizf774q042580cfms6yp6yd5p52q59g6jkg371";
+      url = mirror://xorg/individual/driver/xf86-video-intel-2.15.0.tar.bz2;
+      sha256 = "080pkhjp910wy36crpgi0dmcwpcx8w2r3k4s0dz6v14bmgly2xy3";
     };
     buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ];
   })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.6.list b/pkgs/servers/x11/xorg/tarballs-7.6.list
index 250faabfa17..c2fe1c77b65 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.6.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.6.list
@@ -137,7 +137,7 @@ mirror://xorg/X11R7.6/src/everything/xf86-video-glide-1.1.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-glint-1.2.5.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-i128-1.3.4.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-i740-1.3.2.tar.bz2
-mirror://xorg/individual/driver/xf86-video-intel-2.14.0.tar.bz2
+mirror://xorg/individual/driver/xf86-video-intel-2.15.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-mach64-6.8.2.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-mga-1.4.13.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-neomagic-1.2.5.tar.bz2

From 0f3fa64430095bcaedfa091d7a27b1d2dc728f9d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jan 2012 20:38:34 +0000
Subject: [PATCH 075/114] wicd: integrate with upstart events

quite some services need to be started/restarted when a connection is
established/teared down. Also, some services are optional depending on
the connected access point. For example: use a vpn on an untrusted
network.

these small trigger scripts don't change any behaviour by themselves,
but allow you to hook in to them if you need.

example use:

  jobs.gw6c.startOn = pkgs.lib.mkForce "started  openvpn-dcsOffice";
  jobs.gw6c.stopOn  = pkgs.lib.mkForce "stopping openvpn-dcsOffice";
  jobs."openvpn-dcsOffice".startOn        = pkgs.lib.mkForce "wicd-postconnect";
  jobs."openvpn-dcsOffice".stopOn         = pkgs.lib.mkForce "stopping network-interfaces or wicd-predisconnect";

In the example, I use 3 layers. When a physical connection is
available (wifi connect), I setup a vpn connection, and setup an ipv6
tunnel on top of that. When disconnecting, they are automatically shut
down in the right order as well.

svn path=/nixpkgs/trunk/; revision=31662
---
 pkgs/tools/networking/wicd/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix
index 19f30713a9f..72d41519c7c 100644
--- a/pkgs/tools/networking/wicd/default.nix
+++ b/pkgs/tools/networking/wicd/default.nix
@@ -85,6 +85,17 @@ stdenv.mkDerivation rec {
     # <http://wicd.net/punbb/viewtopic.php?id=87>.
     cp -v "${./wpa2-ttls}" "$out/etc/encryption/templates/wpa2-ttls"
     echo "wpa2-ttls" >> "$out/etc/encryption/templates/active"
+
+    # have wicd generate upstart events
+    echo '#!/bin/sh
+initctl emit -n wicd-preconnect ITYPE="$1" ESSID="$2" BSSID="$3"' > $out/etc/scripts/preconnect/upstart-emit
+    echo '#!/bin/sh
+initctl emit -n wicd-postconnect ITYPE="$1" ESSID="$2" BSSID="$3"' > $out/etc/scripts/postconnect/upstart-emit
+    echo '#!/bin/sh
+initctl emit -n wicd-predisconnect ITYPE="$1" ESSID="$2" BSSID="$3"' > $out/etc/scripts/predisconnect/upstart-emit
+    echo '#!/bin/sh
+initctl emit -n wicd-postdisconnect ITYPE="$1" ESSID="$2" BSSID="$3"' > $out/etc/scripts/postdisconnect/upstart-emit
+    chmod a+x $out/etc/scripts/*/upstart-emit
   '';
 
   meta = {

From 2a6f139c5dc4f54cc3334c4f9b60f932810b60ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 18 Jan 2012 20:51:52 +0000
Subject: [PATCH 076/114] expect: Remove unneeded dependency on Autoconf.

svn path=/nixpkgs/trunk/; revision=31663
---
 pkgs/tools/misc/expect/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix
index 9f0892bb0aa..f72452f6079 100644
--- a/pkgs/tools/misc/expect/default.nix
+++ b/pkgs/tools/misc/expect/default.nix
@@ -1,14 +1,14 @@
-{stdenv, fetchurl, tcl, tk, autoconf, xproto, libX11}:
+{stdenv, fetchurl, tcl, tk, xproto, libX11}:
 
 stdenv.mkDerivation {
   name = "expect-5.44.1";
-  
+
   src = fetchurl {
     url = http://expect.nist.gov/old/expect-5.44.1.tar.gz;
     sha256 = "13zxqiclzk1paxc0mr2vwp9nhfyr2mkwk9gs73fg0l3iss16n6p4";
   };
 
-  buildInputs = [tcl tk autoconf xproto libX11];
+  buildInputs = [tcl tk xproto libX11];
 
   #NIX_CFLAGS_COMPILE = "-DHAVE_UNISTD_H";
 
@@ -22,9 +22,9 @@ stdenv.mkDerivation {
     sed -e '1i\#include <tclInt.h>' -i exp_inter.c
     export NIX_LDFLAGS="-rpath $out/lib $NIX_LDFLAGS"
   '';
-  
-  configureFlags = ["--with-tcl=${tcl}/lib" 
-    "--with-tclinclude=${tcl}/include" 
+
+  configureFlags = ["--with-tcl=${tcl}/lib"
+    "--with-tclinclude=${tcl}/include"
     "--with-tk=${tk}/lib"
     "--exec-prefix=$out"];
 

From 449c5b537d499db0f345a402a07df59ef004ab2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 18 Jan 2012 20:51:58 +0000
Subject: [PATCH 077/114] GNU Zile 2.4.3.

svn path=/nixpkgs/trunk/; revision=31664
---
 pkgs/applications/editors/zile/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix
index 0d588e537bb..47d5aab04ee 100644
--- a/pkgs/applications/editors/zile/default.nix
+++ b/pkgs/applications/editors/zile/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, ncurses, boehmgc, perl, help2man }:
 
 stdenv.mkDerivation rec {
-  name = "zile-2.4.2";
+  name = "zile-2.4.3";
 
   src = fetchurl {
     url = "mirror://gnu/zile/${name}.tar.gz";
-    sha256 = "0ia91c18fyssnhabfb22npmidjkx32rqfkjgxxjibvdwfja25d3k";
+    sha256 = "0rygkc3i9bngzn49kq9fnrbz80d8pa2yjy8iz7vjlc4ayc2akvc3";
   };
 
   buildInputs = [ ncurses boehmgc ];

From 9d5df9699b90342861bef4df2ee851c72b31791b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 18 Jan 2012 20:52:02 +0000
Subject: [PATCH 078/114] GnuTLS 3.0.11.

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

diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix
index 3cd8e718021..4c0dbb02983 100644
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@@ -5,11 +5,11 @@ assert guileBindings -> guile != null;
 
 stdenv.mkDerivation rec {
 
-  name = "gnutls-3.0.8";
+  name = "gnutls-3.0.11";
 
   src = fetchurl {
     url = "mirror://gnu/gnutls/${name}.tar.xz";
-    sha256 = "0qcp7jm8c2fyk5kdb4fgyrv9hb745mcf066vwmlb8dchx15ijkms";
+    sha256 = "1l8k96hms7891zl43qjd7lngjh23kxdq22l6ahm1ham7fyhhrh9r";
   };
 
   configurePhase = ''

From 3d7597fdb9343c5b0241abf4ee0bde6f9344939e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 18 Jan 2012 20:52:07 +0000
Subject: [PATCH 079/114] GNU recutils 1.5.

svn path=/nixpkgs/trunk/; revision=31666
---
 pkgs/tools/misc/recutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix
index 95ced6784ae..8e159f48b63 100644
--- a/pkgs/tools/misc/recutils/default.nix
+++ b/pkgs/tools/misc/recutils/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, gettext, emacs, curl, check, bc }:
 
 stdenv.mkDerivation rec {
-  name = "recutils-1.4";
+  name = "recutils-1.5";
 
   src = fetchurl {
     url = "mirror://gnu/recutils/${name}.tar.gz";
-    sha256 = "1kakmzmkdkgqmvqfzrpkwjjkg492rk3k7xfgnwcjacap9l79z9pv";
+    sha256 = "1v2xzwwwhc5j5kmvg4sv6baxjpsfqh8ln7ilv4mgb1408rs7xmky";
   };
 
   doCheck = true;

From 300372af20f806ef9bbcab094e5985eba6f4e64e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 18 Jan 2012 20:52:12 +0000
Subject: [PATCH 080/114] GNU Automake 1.11.2.

svn path=/nixpkgs/trunk/; revision=31667
---
 .../tools/misc/automake/automake-1.11.x.nix   |  6 +--
 .../automake/more-robust-silent-tests.patch   | 45 -------------------
 2 files changed, 2 insertions(+), 49 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/automake/more-robust-silent-tests.patch

diff --git a/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/pkgs/development/tools/misc/automake/automake-1.11.x.nix
index 148d0a600eb..65ef3a9a146 100644
--- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? true}:
 
 stdenv.mkDerivation rec {
-  name = "automake-1.11.1";
+  name = "automake-1.11.2";
 
   # TODO: Remove the `aclocal' wrapper when $ACLOCAL_PATH support is
   # available upstream; see
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnu/automake/${name}.tar.bz2";
-    sha256 = "1bn7jl11wbkyy4ivgja92zkyjj8w3agwp2xnf7g8f7qa1qy9s5av";
+    sha256 = "06476qbd16dlasz29drmljqmr4gwx4qgcl075033b2hc73wx2ijg";
   };
 
   buildInputs = [perl autoconf makeWrapper];
@@ -27,8 +27,6 @@ stdenv.mkDerivation rec {
   # "fixed" path in generated files!
   dontPatchShebangs = true;
 
-  patches = [ ./more-robust-silent-tests.patch ];
-
   meta = {
     homepage = http://www.gnu.org/software/automake/;
     description = "GNU Automake, a GNU standard-compliant makefile generator";
diff --git a/pkgs/development/tools/misc/automake/more-robust-silent-tests.patch b/pkgs/development/tools/misc/automake/more-robust-silent-tests.patch
deleted file mode 100644
index ca37c412ca2..00000000000
--- a/pkgs/development/tools/misc/automake/more-robust-silent-tests.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Make these tests more robust.  Previously, they would fail if the name
-of the build directory contains `mv', which can very well happen with Nix.
-
---- automake-1.11.1/tests/silent.test	2009-12-08 19:02:32.000000000 +0100
-+++ automake-1.11.1/tests/silent.test	2010-07-05 13:15:20.000000000 +0200
-@@ -1,9 +1,9 @@
- #!/bin/sh
--# Copyright (C) 2009  Free Software Foundation, Inc.
-+# Copyright (C) 2009, 2010  Free Software Foundation, Inc.
- #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
- # the Free Software Foundation; either version 2, or (at your option)
- # any later version.
- #
- # This program is distributed in the hope that it will be useful,
-@@ -65,7 +65,7 @@ $MAKE >stdout || { cat stdout; Exit 1; }
- cat stdout
- grep ' -c' stdout && Exit 1
- grep ' -o foo' stdout && Exit 1
--grep mv stdout && Exit 1
-+grep '\<mv\>' stdout && Exit 1
- grep 'CC    .*foo\.' stdout
- grep 'CC .*bar\.' stdout
- grep 'CC .*baz\.' stdout
-
---- automake-1.11.1/tests/silent2.test	2009-12-08 19:02:32.000000000 +0100
-+++ automake-1.11.1/tests/silent2.test	2010-07-05 15:42:08.000000000 +0200
-@@ -1,5 +1,5 @@
- #!/bin/sh
--# Copyright (C) 2009  Free Software Foundation, Inc.
-+# Copyright (C) 2009, 2010  Free Software Foundation, Inc.
- #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -67,7 +67,7 @@ $MAKE >stdout || { cat stdout; Exit 1; }
- cat stdout
- grep ' -c' stdout && Exit 1
- grep ' -o foo' stdout && Exit 1
--grep mv stdout && Exit 1
-+grep '\<mv\>' stdout && Exit 1
- grep 'CC .*foo\.' stdout
- grep 'CC .*bar\.' stdout
- grep 'CC .*baz\.' stdout
-

From 649168b84631a3429b35f1dfc98fcd7685be7fe9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 18 Jan 2012 20:52:17 +0000
Subject: [PATCH 081/114] GNU FreeIPMI 1.1.1.

svn path=/nixpkgs/trunk/; revision=31668
---
 pkgs/tools/system/freeipmi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix
index 2330de1d11e..fe0bf0384db 100644
--- a/pkgs/tools/system/freeipmi/default.nix
+++ b/pkgs/tools/system/freeipmi/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, libgcrypt, readline }:
 
 stdenv.mkDerivation rec {
-  name = "freeipmi-1.0.9";
+  name = "freeipmi-1.1.1";
 
   src = fetchurl {
     url = "mirror://gnu/freeipmi/${name}.tar.gz";
-    sha256 = "00ix8cigf6nl5kg95hla43kf27jkb3lljhcihbfriwq0wrghcfx4";
+    sha256 = "03q6wg1wdmr94dxh81lxllb53nmab0d637wgh2s1xn6rfmxf7ypf";
   };
 
   buildInputs = [ libgcrypt readline ];

From 8aaa52d5321b2658210d50fc0a1846dd8f0aa852 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 18 Jan 2012 20:52:22 +0000
Subject: [PATCH 082/114] GNU Common C++ 5.1.2.

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

diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix
index cca5c5aaa9f..68d5eefa453 100644
--- a/pkgs/development/libraries/ucommon/default.nix
+++ b/pkgs/development/libraries/ucommon/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, gnutls, pkgconfig, zlib, libgcrypt }:
 
 stdenv.mkDerivation rec {
-  name = "ucommon-5.0.7";
+  name = "ucommon-5.1.2";
 
   src = fetchurl {
-    url = mirror://gnu/commoncpp/ucommon-5.0.7.tar.gz;
-    sha256 = "0zr4zjwb62dpq7aa88vclhv2y8j7glkq693kwmb8agfx0fv8nkny";
+    url = mirror://gnu/commoncpp/ucommon-5.1.2.tar.gz;
+    sha256 = "1a6wfvrqpkk4w3l33jx5bdj38ljlyr92041aakvwmajpkczjf2q3";
   };
 
   buildInputs = [ pkgconfig gnutls zlib ];

From c295b6638ed7f0fefa413cab5dfcc5db68443b91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 18 Jan 2012 20:52:26 +0000
Subject: [PATCH 083/114] GNU SIP Witch 1.2.1.

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

diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix
index 57b4a5ca17c..51a7fe61cf6 100644
--- a/pkgs/servers/sip/sipwitch/default.nix
+++ b/pkgs/servers/sip/sipwitch/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, pkgconfig, ucommon, libosip, libexosip, gnutls, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "sipwitch-1.1.3";
+  name = "sipwitch-1.2.1";
 
   src = fetchurl {
     url = "mirror://gnu/sipwitch/${name}.tar.gz";
-    sha256 = "0g1vx8xsmna0c7sqck8pv44312r4qrk82ky3j99p82ckbqj1sqjv";
+    sha256 = "01364q67gyxpxx5fxrmf9kns3qgivnp41kzhi81jdq8sa48c7qbq";
   };
 
   buildInputs = [ pkgconfig ucommon libosip libexosip gnutls zlib ];

From 16753086a3421343e501d429e3589d679012a070 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 18 Jan 2012 20:52:31 +0000
Subject: [PATCH 084/114] GNU Libidn 1.24.

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

diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix
index 3c72382dea4..6da91d98d13 100644
--- a/pkgs/development/libraries/libidn/default.nix
+++ b/pkgs/development/libraries/libidn/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "libidn-1.23";
+  name = "libidn-1.24";
 
   src = fetchurl {
     url = "mirror://gnu/libidn/${name}.tar.gz";
-    sha256 = "0sjy1k35x3r5vfkd5j21gy0xdlzg9svm74wn3hpfbfhyhmsjvd15";
+    sha256 = "1zrmbwxvgmv7d37sdnlfn4lf3pxc7vgng3lhl18pkjry0v30h5ys";
   };
 
   doCheck = ! stdenv.isDarwin;

From ffdd332cf703327e01277a589ae506cf495428ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 18 Jan 2012 20:52:36 +0000
Subject: [PATCH 085/114] libassuan 2.0.3.

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

diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix
index c9b02d1cef2..362ecd403d2 100644
--- a/pkgs/development/libraries/libassuan/default.nix
+++ b/pkgs/development/libraries/libassuan/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, pth, libgpgerror }:
 
 stdenv.mkDerivation rec {
-  name = "libassuan-2.0.2";
+  name = "libassuan-2.0.3";
 
   src = fetchurl {
     url = "mirror://gnupg/libassuan/${name}.tar.bz2";
-    sha256 = "1n5lfpafq9sjb3r06lw7vrrjmbs3p035zfakx7ff5bfb7niwpq31";
+    sha256 = "06xckkvxxlx7cj77803m8x58gxksap4k8yhspc5cqsy7fhinimds";
   };
 
   propagatedBuildInputs = [ pth libgpgerror ];

From d9433c2167c549c4d9652bcbcac48164009235a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 18 Jan 2012 20:52:40 +0000
Subject: [PATCH 086/114] GNU ddrescue 1.15.

svn path=/nixpkgs/trunk/; revision=31673
---
 pkgs/tools/system/ddrescue/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix
index 0cc3fb36994..0ca5d6af2d7 100644
--- a/pkgs/tools/system/ddrescue/default.nix
+++ b/pkgs/tools/system/ddrescue/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ddrescue-1.14";
+  name = "ddrescue-1.15";
 
   src = fetchurl {
     url = "mirror://gnu/ddrescue/${name}.tar.gz";
-    sha256 = "01m9m8lisf7ly7xl97plqnl5dj253ms1gbk1bbpwv3nnchnvj5yd";
+    sha256 = "0y1dxkbl82nli6xjlg2kaq5kxd19480rvpay4ydbb9av01i17q3m";
   };
 
   doCheck = true;

From 7ce8cc9f2cb803dc8c672193acce63d2fa00d837 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 18 Jan 2012 20:52:45 +0000
Subject: [PATCH 087/114] GNU Parallel 20111222.

svn path=/nixpkgs/trunk/; revision=31674
---
 pkgs/tools/misc/parallel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 621bc79a277..2c46b116450 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20111122";
+  name = "parallel-20111222";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "1czcflprhbhyj3mj7dc986gll0kfc6n8qiqazclph172rbq3acpd";
+    sha256 = "0rip8hnby1c2kcz7w7h6c2kf0y63hyw8bwprsd8fnqw96lgypf1b";
   };
 
   patchPhase =

From 9975a56711e9000eaba396b321264ad0ffd58146 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 18 Jan 2012 20:52:50 +0000
Subject: [PATCH 088/114] GNU xnee 3.11.

svn path=/nixpkgs/trunk/; revision=31675
---
 pkgs/tools/X11/xnee/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix
index 4ea21acac4c..3344bdfce49 100644
--- a/pkgs/tools/X11/xnee/default.nix
+++ b/pkgs/tools/X11/xnee/default.nix
@@ -2,11 +2,11 @@
 , gtk, libXi, inputproto, pkgconfig, recordproto, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "xnee-3.10";
+  name = "xnee-3.11";
 
   src = fetchurl {
     url = "mirror://gnu/xnee/${name}.tar.gz";
-    sha256 = "0mkbp0gikm1mv9g2v0vs7krinkz392p1crvaira8ml9q94py0q32";
+    sha256 = "1x4frrf5ayslbkmr5cwll7psssxk11r4acnadp4qdvd218x50xrq";
   };
 
   patchPhase =

From 94a0bbcef32fc0063dbb537492398c902d358609 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 18 Jan 2012 20:52:55 +0000
Subject: [PATCH 089/114] GNU Source-Highlight 3.1.6.

svn path=/nixpkgs/trunk/; revision=31676
---
 pkgs/tools/text/source-highlight/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix
index 7eda7bc7c69..061f7651f9a 100644
--- a/pkgs/tools/text/source-highlight/default.nix
+++ b/pkgs/tools/text/source-highlight/default.nix
@@ -2,14 +2,14 @@
 
 let
   name = "source-highlight";
-  version = "3.1.5";
+  version = "3.1.6";
 in
 stdenv.mkDerivation {
   name = "${name}-${version}";
 
   src = fetchurl {
       url = "mirror://gnu/src-highlite/${name}-${version}.tar.gz";
-      sha256 = "16a2ybd0i7gk926ipp7c63mxcfwklbb20fw65npyrjzr94z1agwx";
+      sha256 = "0a5zh876nc1gig8z586b953r8ahh9zbs1lmi8vxjrkwp6zqzf4xm";
     };
 
   configureFlags = [ "--with-boost=${boost}" ];

From ed221cf4cc874cf558384d6a09c2ec322eae6414 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 18 Jan 2012 20:53:00 +0000
Subject: [PATCH 090/114] GNUnet 0.9.1.

svn path=/nixpkgs/trunk/; revision=31677
---
 .../networking/p2p/gnunet/default.nix             | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix
index 1219c176354..5d5d6128bb4 100644
--- a/pkgs/applications/networking/p2p/gnunet/default.nix
+++ b/pkgs/applications/networking/p2p/gnunet/default.nix
@@ -7,11 +7,11 @@
 assert gtkSupport -> (gtk != null) && (libglade != null);
 
 stdenv.mkDerivation rec {
-  name = "gnunet-0.9.0";
+  name = "gnunet-0.9.1";
 
   src = fetchurl {
     url = "mirror://gnu/gnunet/${name}.tar.gz";
-    sha256 = "1a0faq2j20dxhpdq0lpi8mjhddwmscbaa1bsxk460p5mj8n55i3p";
+    sha256 = "0ipx027lzcgdv70adfk8f4h0zrzm9mlhy3vj9cgc0ck8x52llfpq";
   };
 
   buildInputs = [
@@ -41,9 +41,18 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  # XXX: There are several test failures, forwarded to bug-gnunet@gnu.org.
   doCheck = false;
 
+  /* FIXME: Tests must be run this way, but there are still a couple of
+     failures.
+
+  postInstall =
+    '' export GNUNET_PREFIX="$out"
+       export PATH="$out/bin:$PATH"
+       make -k check
+    '';
+  */
+
   meta = {
     description = "GNUnet, GNU's decentralized anonymous and censorship-resistant P2P framework";
 

From 652712b77ae16096e335bcfbbcb847cab052385a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 19 Jan 2012 09:23:24 +0000
Subject: [PATCH 091/114] udisks: Autoreconf properly.

svn path=/nixpkgs/trunk/; revision=31679
---
 pkgs/os-specific/linux/udisks/default.nix | 9 ++++++---
 pkgs/top-level/all-packages.nix           | 4 +++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/udisks/default.nix b/pkgs/os-specific/linux/udisks/default.nix
index 191f34489a7..30353be390c 100644
--- a/pkgs/os-specific/linux/udisks/default.nix
+++ b/pkgs/os-specific/linux/udisks/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, pkgconfig, sg3_utils, udev, glib, dbus, dbus_glib
 , polkit, parted, lvm2, libatasmart, intltool, libuuid, mdadm
-, libxslt, docbook_xsl, utillinux, automake, autoconf }:
+, libxslt, docbook_xsl, utillinux
+, automake, autoconf, libtool, gtkdoc }:
 
 stdenv.mkDerivation rec {
   name = "udisks-1.0.4";
@@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
       lvm2 libatasmart intltool libuuid libxslt docbook_xsl
     ];
 
-  buildNativeInputs = [ automake autoconf pkgconfig ];
+  buildNativeInputs = [ automake autoconf libtool gtkdoc pkgconfig ];
 
   configureFlags = "--localstatedir=/var --enable-lvm2";
 
@@ -34,7 +35,9 @@ stdenv.mkDerivation rec {
         "/sbin:/bin:/usr/sbin:/usr/bin" \
         "${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin"
 
-      automake
+      # The patch above modifies Makefile.am, so redo the whole thing.
+      # FIXME: Remove that ASAP---e.g., by writing the patch differently.
+      autoreconf -vfi
     '';
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 937a79e73b7..51b5fcc8144 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6127,7 +6127,9 @@ let
   udev173 = callPackage ../os-specific/linux/udev/173.nix { };
   udev = pkgs.udev173;
 
-  udisks = callPackage ../os-specific/linux/udisks { };
+  udisks = callPackage ../os-specific/linux/udisks {
+    inherit (gnome) gtkdoc;
+  };
 
   uml = import ../os-specific/linux/kernel/linux-2.6.29.nix {
     inherit fetchurl stdenv perl mktemp module_init_tools;

From 13e5cf2efbf84ce5f519c6095be3c967f36d8897 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 19 Jan 2012 14:44:33 +0000
Subject: [PATCH 092/114] haskell-vault: added version 0.1.0.0

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

diff --git a/pkgs/development/libraries/haskell/vault/default.nix b/pkgs/development/libraries/haskell/vault/default.nix
new file mode 100644
index 00000000000..592f75cdfb4
--- /dev/null
+++ b/pkgs/development/libraries/haskell/vault/default.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "vault";
+  version = "0.1.0.0";
+  sha256 = "02gki0g9mwmvvizxhk6myfg3dmlqpcjjiz5c8693a060hkr0grqq";
+  meta = {
+    homepage = "https://github.com/HeinrichApfelmus/vault";
+    description = "a typed, persistent store for values of arbitrary types";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 79b89349dfa..2aba0b4afd3 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1341,6 +1341,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   vacuumCairo = callPackage ../development/libraries/haskell/vacuum-cairo {};
 
+  vault = callPackage ../development/libraries/haskell/vault {};
+
   Vec = callPackage ../development/libraries/haskell/Vec {};
 
   vector = callPackage ../development/libraries/haskell/vector {};

From 62e31a562f39718558ff066d5faeb240ea7d41f3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 19 Jan 2012 14:44:55 +0000
Subject: [PATCH 093/114] haskell-aeson-native: updated to version 0.3.3.2

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

diff --git a/pkgs/development/libraries/haskell/aeson-native/default.nix b/pkgs/development/libraries/haskell/aeson-native/default.nix
index 4b3d8da7bf5..9f662984509 100644
--- a/pkgs/development/libraries/haskell/aeson-native/default.nix
+++ b/pkgs/development/libraries/haskell/aeson-native/default.nix
@@ -4,15 +4,15 @@
 
 cabal.mkDerivation (self: {
   pname = "aeson-native";
-  version = "0.3.3.1";
-  sha256 = "15733f5ivymkbwvqgbd8scynl9adva3fnid4bzlr9l4sb3yvcz9p";
+  version = "0.3.3.2";
+  sha256 = "1s5i88r8sdd7ayrpjw6f18273k6r0igk0sswb503hzvjagzmzffh";
   buildDepends = [
     attoparsec blazeBuilder blazeTextualNative deepseq hashable mtl syb
     text time unorderedContainers vector
   ];
   meta = {
     homepage = "http://github.com/mailrank/aeson";
-    description = "Fast JSON parsing and encoding";
+    description = "Fast JSON parsing and encoding (deprecated)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [

From 40a684701affafa17cfabe7cb9a29db1f51a1e15 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 19 Jan 2012 14:45:10 +0000
Subject: [PATCH 094/114] haskell-blaze-textual-native: updated to version
 0.2.1.1

svn path=/nixpkgs/trunk/; revision=31685
---
 .../libraries/haskell/blaze-textual-native/default.nix      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/blaze-textual-native/default.nix b/pkgs/development/libraries/haskell/blaze-textual-native/default.nix
index 3f41a176905..602c5be9357 100644
--- a/pkgs/development/libraries/haskell/blaze-textual-native/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-textual-native/default.nix
@@ -2,12 +2,12 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-textual-native";
-  version = "0.2.1";
-  sha256 = "12cnl76qld19x6zlhxcsx2b27mfr9v7sc2xq6af9h77wqb98fkvn";
+  version = "0.2.1.1";
+  sha256 = "1q3gdf4ljc5xhw8f72qkvi6insk2nwdfk28a00y1b58jmk8003sd";
   buildDepends = [ blazeBuilder text time vector ];
   meta = {
     homepage = "http://github.com/mailrank/blaze-textual";
-    description = "Fast rendering of common datatypes";
+    description = "Fast rendering of common datatypes (deprecated)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [

From 5856dbaa537eab2adcfe903d149756430a388db0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 19 Jan 2012 14:45:14 +0000
Subject: [PATCH 095/114] haskell-control-monad-attempt: updated to version
 0.3.0.1

svn path=/nixpkgs/trunk/; revision=31686
---
 .../libraries/haskell/control-monad-attempt/default.nix     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/control-monad-attempt/default.nix b/pkgs/development/libraries/haskell/control-monad-attempt/default.nix
index 06571080b7b..0450373e8c6 100644
--- a/pkgs/development/libraries/haskell/control-monad-attempt/default.nix
+++ b/pkgs/development/libraries/haskell/control-monad-attempt/default.nix
@@ -2,12 +2,12 @@
 
 cabal.mkDerivation (self: {
   pname = "control-monad-attempt";
-  version = "0.3.0";
-  sha256 = "1l0bqb5h2fs7vx2r8nd6kscyyrrqc0gshnxwdz9p6clfnknyqbqw";
+  version = "0.3.0.1";
+  sha256 = "140n27vdbyjz5qycrwlrmyd7s48fxcl6msl16g7czg40k5y23j5s";
   buildDepends = [ attempt transformers ];
   meta = {
     homepage = "http://github.com/snoyberg/control-monad-attempt";
-    description = "Monad transformer for attempt";
+    description = "Monad transformer for attempt. (deprecated)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [

From 4bf2f17323f47056a0a54d20fea25cc3a787d39d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 19 Jan 2012 14:45:29 +0000
Subject: [PATCH 096/114] haskell-convertible-text: updated to version 0.4.0.2

svn path=/nixpkgs/trunk/; revision=31687
---
 .../libraries/haskell/convertible-text/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/convertible-text/default.nix b/pkgs/development/libraries/haskell/convertible-text/default.nix
index b987c9e21e5..7444583bd9f 100644
--- a/pkgs/development/libraries/haskell/convertible-text/default.nix
+++ b/pkgs/development/libraries/haskell/convertible-text/default.nix
@@ -2,14 +2,14 @@
 
 cabal.mkDerivation (self: {
   pname = "convertible-text";
-  version = "0.4.0.1";
-  sha256 = "0m252ml2zgw0jxfs678m1wp9ivy6gvi9w50qw7zi9ycxnzj9j6r2";
+  version = "0.4.0.2";
+  sha256 = "1wqpl9dms1rsd24d00f18l9sm601nm6kr7h4ig8y70jdzy8w73fz";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ attempt text time ];
   meta = {
     homepage = "http://github.com/snoyberg/convertible/tree/text";
-    description = "Typeclasses and instances for converting between types";
+    description = "Typeclasses and instances for converting between types (deprecated)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [

From 007bb142bd421d9244cffe009e9ff570ac1554b1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 19 Jan 2012 14:45:38 +0000
Subject: [PATCH 097/114] haskell-data-object: updated to version 0.3.1.9

svn path=/nixpkgs/trunk/; revision=31688
---
 pkgs/development/libraries/haskell/data-object/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/data-object/default.nix b/pkgs/development/libraries/haskell/data-object/default.nix
index fb2c013da8d..c1b12ab038f 100644
--- a/pkgs/development/libraries/haskell/data-object/default.nix
+++ b/pkgs/development/libraries/haskell/data-object/default.nix
@@ -2,12 +2,12 @@
 
 cabal.mkDerivation (self: {
   pname = "data-object";
-  version = "0.3.1.8";
-  sha256 = "0v7kn6rv71fhf2l7ll7plzr90irm2fyp25lskv2zwazp4swhw52x";
+  version = "0.3.1.9";
+  sha256 = "0z8m23kw8mj6hhy1r8y1vvlxxpwl273dhanszig2673a1sw0l98l";
   buildDepends = [ failure text time ];
   meta = {
     homepage = "http://github.com/snoyberg/data-object/tree/master";
-    description = "Represent hierachichal structures, called objects in JSON";
+    description = "Represent hierachichal structures, called objects in JSON. (deprecated)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [

From ac0ab1b200f643e4d59ccb2d85aca5bbc13d66de Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 19 Jan 2012 14:45:41 +0000
Subject: [PATCH 098/114] haskell-hamlet: updated to version 0.10.7.1

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

diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix
index 98132edfdb2..d0dc0afb35f 100644
--- a/pkgs/development/libraries/haskell/hamlet/default.nix
+++ b/pkgs/development/libraries/haskell/hamlet/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hamlet";
-  version = "0.10.6";
-  sha256 = "0ai00jwbq5nnrgcfhz3sxm2jm2jvz7qbj56lr0wlc3z818a22ams";
+  version = "0.10.7.1";
+  sha256 = "0ll9pp0qnvw903ncpfgrc67jg385jzla3j9l0yfm9qqnn38sqhqv";
   buildDepends = [
     blazeBuilder blazeHtml failure parsec shakespeare text
   ];

From 5e9d807f5f03505874ebe0ef9c7ebe952ebdb1a1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 19 Jan 2012 14:45:44 +0000
Subject: [PATCH 099/114] haskell-http-enumerator: updated to version 0.7.2.5

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

diff --git a/pkgs/development/libraries/haskell/http-enumerator/default.nix b/pkgs/development/libraries/haskell/http-enumerator/default.nix
index 7804b0d077a..39e23b3253d 100644
--- a/pkgs/development/libraries/haskell/http-enumerator/default.nix
+++ b/pkgs/development/libraries/haskell/http-enumerator/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-enumerator";
-  version = "0.7.2.4";
-  sha256 = "0gnbyhjs28rwdaypa9zhyja3bakr74if68cgivn1s56wbhrhc70s";
+  version = "0.7.2.5";
+  sha256 = "1sck3z1x73qbak6p11745bywxwz91nk635jvv4wmgq4ifyfkbabb";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From d1645c819d4e389a768b8502a37a628a3ebc1fc5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 19 Jan 2012 14:45:47 +0000
Subject: [PATCH 100/114] haskell-json-enumerator: updated to version 0.0.1.2

svn path=/nixpkgs/trunk/; revision=31691
---
 .../libraries/haskell/jsonEnumerator/default.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/jsonEnumerator/default.nix b/pkgs/development/libraries/haskell/jsonEnumerator/default.nix
index a4003821285..1e4629166fa 100644
--- a/pkgs/development/libraries/haskell/jsonEnumerator/default.nix
+++ b/pkgs/development/libraries/haskell/jsonEnumerator/default.nix
@@ -4,15 +4,15 @@
 
 cabal.mkDerivation (self: {
   pname = "json-enumerator";
-  version = "0.0.1.1";
-  sha256 = "0k94x9vwwaprqbc8gay5l0vg6hjmjpjp852yncncb8kr0r344z7l";
+  version = "0.0.1.2";
+  sha256 = "08gwrm15pvvhhrkrncy6wr4fi5v55fdhc8byfrw5zd62hmx8xm9d";
   buildDepends = [
     blazeBuilder blazeBuilderEnumerator enumerator jsonTypes text
     transformers
   ];
   meta = {
     homepage = "http://github.com/snoyberg/json-enumerator";
-    description = "Pure-Haskell utilities for dealing with JSON with the enumerator package";
+    description = "Pure-Haskell utilities for dealing with JSON with the enumerator package. (deprecated)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [

From c037e74e611d6089d9597f24f0988e0d9b60264c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 19 Jan 2012 14:45:51 +0000
Subject: [PATCH 101/114] haskell-neither: updated to version 0.3.0.1

svn path=/nixpkgs/trunk/; revision=31692
---
 pkgs/development/libraries/haskell/neither/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/neither/default.nix b/pkgs/development/libraries/haskell/neither/default.nix
index 7d119b49e44..d8a737019fc 100644
--- a/pkgs/development/libraries/haskell/neither/default.nix
+++ b/pkgs/development/libraries/haskell/neither/default.nix
@@ -2,12 +2,12 @@
 
 cabal.mkDerivation (self: {
   pname = "neither";
-  version = "0.3.0";
-  sha256 = "0lak4y0k4cisr27vw2bnpd0pa1kkgv8r96z7vf19wg7brzarx71l";
+  version = "0.3.0.1";
+  sha256 = "1vr8zap3vp28dr48s510lfrbfhw5yz25vng6wyk20582lv4j2mz8";
   buildDepends = [ failure transformers ];
   meta = {
     homepage = "http://github.com/snoyberg/neither";
-    description = "Provide versions of Either with good monad and applicative instances";
+    description = "Provide versions of Either with good monad and applicative instances. (deprecated)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [

From 9af6a32767d438439e68011f32cb7f364b1b2fca Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 19 Jan 2012 14:45:56 +0000
Subject: [PATCH 102/114] haskell-shakespeare-css: updated to version 0.10.6

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

diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
index b0d70a8fbfd..fb23dbce0ef 100644
--- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-css";
-  version = "0.10.5";
-  sha256 = "1cnv9qgp1llrrvcqp64mq207wdsxpqza9yq5nzlsgrh6qlzvm4hs";
+  version = "0.10.6";
+  sha256 = "18hcrsmw7xg2cdzyb413rc1bg507y4kr6q1l3mbxgnzqnffik6d7";
   buildDepends = [ parsec shakespeare text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/templates";

From 42105ddc82b8cfbd236cc6cf59fba5e037c36208 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 19 Jan 2012 14:45:59 +0000
Subject: [PATCH 103/114] haskell-vault: updated to version 0.1.0.0

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

diff --git a/pkgs/development/libraries/haskell/vault/default.nix b/pkgs/development/libraries/haskell/vault/default.nix
index 592f75cdfb4..2781de9ebe6 100644
--- a/pkgs/development/libraries/haskell/vault/default.nix
+++ b/pkgs/development/libraries/haskell/vault/default.nix
@@ -9,5 +9,9 @@ cabal.mkDerivation (self: {
     description = "a typed, persistent store for values of arbitrary types";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

From af2e5746afef8eab812d3237fab3649c7f56d096 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 19 Jan 2012 14:46:01 +0000
Subject: [PATCH 104/114] haskell-web-routes-quasi: updated to version 0.7.1.1

svn path=/nixpkgs/trunk/; revision=31695
---
 .../libraries/haskell/web-routes-quasi/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/web-routes-quasi/default.nix b/pkgs/development/libraries/haskell/web-routes-quasi/default.nix
index 1660809df1a..7ecc85742e1 100644
--- a/pkgs/development/libraries/haskell/web-routes-quasi/default.nix
+++ b/pkgs/development/libraries/haskell/web-routes-quasi/default.nix
@@ -2,14 +2,14 @@
 
 cabal.mkDerivation (self: {
   pname = "web-routes-quasi";
-  version = "0.7.1";
-  sha256 = "0m5p21kbiawjpcs5c83aaypmpmx4avjcj0kzkn95zgdkqcz5kr12";
+  version = "0.7.1.1";
+  sha256 = "1rqbymi0n7kdhl272qfjhx9s3gspd5k0bjrhclj9l8mjf033vdmf";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ pathPieces text ];
   meta = {
     homepage = "http://docs.yesodweb.com/web-routes-quasi/";
-    description = "Define data types and parse/build functions for web-routes via a quasi-quoted DSL";
+    description = "Define data types and parse/build functions for web-routes via a quasi-quoted DSL (deprecated)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [

From f52d0d163435dff8abe84a1c5c7ae3cc82b9f983 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 19 Jan 2012 14:46:04 +0000
Subject: [PATCH 105/114] haskell-web-routes: updated to version 0.26.2

svn path=/nixpkgs/trunk/; revision=31696
---
 .../libraries/haskell/web-routes/default.nix         | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/web-routes/default.nix b/pkgs/development/libraries/haskell/web-routes/default.nix
index 84ba6ed7fc6..a6ac919ba71 100644
--- a/pkgs/development/libraries/haskell/web-routes/default.nix
+++ b/pkgs/development/libraries/haskell/web-routes/default.nix
@@ -1,10 +1,14 @@
-{ cabal, mtl, network, parsec, utf8String }:
+{ cabal, blazeBuilder, httpTypes, mtl, network, parsec, text
+, utf8String
+}:
 
 cabal.mkDerivation (self: {
   pname = "web-routes";
-  version = "0.25.3";
-  sha256 = "09bqz7vn2050jr67m3rrqi0krfxa9n1fxm9rgi3c837g522nb4kk";
-  buildDepends = [ mtl network parsec utf8String ];
+  version = "0.26.2";
+  sha256 = "0v7vkd53jf9zf2m0lbiq10qp39ghlnxwafs1hixbz2qfcgsns10j";
+  buildDepends = [
+    blazeBuilder httpTypes mtl network parsec text utf8String
+  ];
   meta = {
     description = "Library for maintaining correctness and composability of URLs within an application";
     license = self.stdenv.lib.licenses.bsd3;

From f84e15f11ce1e10ff7720fcfd265201cec54c1d3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 19 Jan 2012 14:46:06 +0000
Subject: [PATCH 106/114] haskell-xml-conduit: updated to version 0.5.1.2

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

diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix
index 8d696bae4dc..bf20012aef2 100644
--- a/pkgs/development/libraries/haskell/xml-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xml-conduit";
-  version = "0.5.1.1";
-  sha256 = "0md6fkjn8j1dsbhlwh64x2990kvsmks6plppa63v9nwc9142ajim";
+  version = "0.5.1.2";
+  sha256 = "0ww018aj4fy0hngjsj1lc5m7sw36kdc1z2p8nxp4pgsmhj0ccm36";
   buildDepends = [
     attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
     conduit dataDefault failure systemFilepath text transformers

From 08439eb00ac05635c8cf792e924cf3adc148f462 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 19 Jan 2012 16:44:17 +0000
Subject: [PATCH 107/114] overrideDerivation: Override `hostDrv' and `buildDrv'
 too.

svn path=/nixpkgs/trunk/; revision=31706
---
 pkgs/lib/customisation.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/lib/customisation.nix b/pkgs/lib/customisation.nix
index b914d4ca603..49ae440a729 100644
--- a/pkgs/lib/customisation.nix
+++ b/pkgs/lib/customisation.nix
@@ -42,6 +42,8 @@ rec {
     in newDrv //
       { meta = if drv ? meta then drv.meta else {};
         passthru = if drv ? passthru then drv.passthru else {};
+        hostDrv = overrideDerivation drv.hostDrv f;
+        buildDrv = overrideDerivation drv.buildDrv f;
       };
 
 

From 087af1bfe70759ffc2188b2649410b00aad46dc3 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 19 Jan 2012 19:31:25 +0000
Subject: [PATCH 108/114] add gwt 2.4.0, patch provided by TermNL

svn path=/nixpkgs/trunk/; revision=31711
---
 pkgs/development/compilers/gwt/2.4.0.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  1 +
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/compilers/gwt/2.4.0.nix

diff --git a/pkgs/development/compilers/gwt/2.4.0.nix b/pkgs/development/compilers/gwt/2.4.0.nix
new file mode 100644
index 00000000000..000b57946f6
--- /dev/null
+++ b/pkgs/development/compilers/gwt/2.4.0.nix
@@ -0,0 +1,21 @@
+{stdenv, fetchurl, unzip}:
+
+stdenv.mkDerivation {
+  name = "gwt-java-2.4.0";
+  src = fetchurl { 
+    url=http://google-web-toolkit.googlecode.com/files/gwt-2.4.0.zip; 
+    sha1 = "a91ac20db0ddd5994ac3cbfb0e8061d5bbf66f88"; 
+  };
+  buildInputs = [unzip]; 
+
+  installPhase = ''
+    ensureDir $out
+    unzip $src
+    mv gwt-2.4.0 $out/bin
+  '';
+
+  meta = {
+    homepage = http://code.google.com/webtoolkit/;
+    description = "Google Web Toolkit (GWT) is a development toolkit for building and optimizing complex browser-based applications.";
+  };
+ }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 51b5fcc8144..a5f50e65c5b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2273,6 +2273,7 @@ let
     inherit (gtkLibs) glib gtk pango atk;
     libstdcpp5 = gcc33.gcc;
   };
+  gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { };
 
   ikarus = callPackage ../development/compilers/ikarus { };
 

From 8899e606931e92741161a77de9f112459a00fbd6 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 19 Jan 2012 20:27:59 +0000
Subject: [PATCH 109/114] Remove unused patches, fix pykde4 patch

svn path=/nixpkgs/trunk/; revision=31712
---
 .../kde-4.8/kdebindings/pykde-purity.patch    | 40 -------------
 .../pykde4-hardcode-lib-python.patch          | 18 ++++++
 pkgs/desktops/kde-4.8/kdebindings/pykde4.nix  |  7 +--
 .../kde-4.8/kdenetwork/log-feature.diff       | 60 -------------------
 .../kde-4.8/kdesdk/optional-docs.diff         | 39 ------------
 5 files changed, 21 insertions(+), 143 deletions(-)
 delete mode 100644 pkgs/desktops/kde-4.8/kdebindings/pykde-purity.patch
 create mode 100644 pkgs/desktops/kde-4.8/kdebindings/pykde4-hardcode-lib-python.patch
 delete mode 100644 pkgs/desktops/kde-4.8/kdenetwork/log-feature.diff
 delete mode 100644 pkgs/desktops/kde-4.8/kdesdk/optional-docs.diff

diff --git a/pkgs/desktops/kde-4.8/kdebindings/pykde-purity.patch b/pkgs/desktops/kde-4.8/kdebindings/pykde-purity.patch
deleted file mode 100644
index 2f6e078f256..00000000000
--- a/pkgs/desktops/kde-4.8/kdebindings/pykde-purity.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c853e38..5df3253 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -232,7 +232,7 @@ _pkg_config = {
-     'pykde_kde_sip_flags':  '${_SIP_TAGS} ${_SIP_X} ${SIP_EXTRA_OPTIONS}',
-     'pykde_mod_dir':        '${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyKDE4',
-     'pykde_modules':        '${PYKDE_MODULES}',
--    'pykde_sip_dir':        '${SIP_DEFAULT_SIP_DIR}/PyKDE4',
-+    'pykde_sip_dir':        '${CMAKE_INSTALL_PREFIX}/share/sip/PyKDE4',
-     'pykde_version':        kde_version_hex,
-     'pykde_version_str':    '${KDE_VERSION}'
- }
-@@ -244,7 +244,7 @@ PYTHON_INSTALL(${CMAKE_CURRENT_BINARY_DIR}/pykdeconfig.py ${PYTHON_SITE_PACKAGES
- 
- # Install the .sip files for anyone that wants to build bindings on top of PyKDE4.
- # (Don't forget the / at the end of sip/.)
--INSTALL(DIRECTORY sip/ DESTINATION ${SIP_DEFAULT_SIP_DIR}/PyKDE4
-+INSTALL(DIRECTORY sip/ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/sip/PyKDE4
-     PATTERN "*~" EXCLUDE    # This sucks, why can't I just whitelist what I _do_ want?
-     PATTERN ".svn" EXCLUDE
-     PATTERN "*.in" EXCLUDE)
-diff --git a/kpythonpluginfactory/CMakeLists.txt b/kpythonpluginfactory/CMakeLists.txt
-index 41fa0fe..642d867 100644
---- a/kpythonpluginfactory/CMakeLists.txt
-+++ b/kpythonpluginfactory/CMakeLists.txt
-@@ -3,7 +3,12 @@
- set(kpythonpluginfactory_SRCS
-     kpythonpluginfactory.cpp)
- 
--GET_FILENAME_COMPONENT(LIB_PYTHON ${PYTHON_LIBRARY} NAME)
-+option(HARDCODE_LIB_PYTHON_PATH "Whether the path to libpython.so should be hardcoded" OFF)
-+if(HARDCODE_LIB_PYTHON_PATH)
-+	get_filename_component(LIB_PYTHON ${PYTHON_LIBRARY} REALPATH)
-+else(HARDCODE_LIB_PYTHON_PATH)
-+    get_filename_component(LIB_PYTHON ${PYTHON_LIBRARY} NAME)
-+endif(HARDCODE_LIB_PYTHON_PATH)
- ADD_DEFINITIONS(-DLIB_PYTHON=\\"${LIB_PYTHON}\\")
- ADD_DEFINITIONS(-DKDE_DEFAULT_DEBUG_AREA=15000)
- 
diff --git a/pkgs/desktops/kde-4.8/kdebindings/pykde4-hardcode-lib-python.patch b/pkgs/desktops/kde-4.8/kdebindings/pykde4-hardcode-lib-python.patch
new file mode 100644
index 00000000000..e7a7cb4c661
--- /dev/null
+++ b/pkgs/desktops/kde-4.8/kdebindings/pykde4-hardcode-lib-python.patch
@@ -0,0 +1,18 @@
+diff --git a/kpythonpluginfactory/CMakeLists.txt b/kpythonpluginfactory/CMakeLists.txt
+index 41fa0fe..642d867 100644
+--- a/kpythonpluginfactory/CMakeLists.txt
++++ b/kpythonpluginfactory/CMakeLists.txt
+@@ -3,7 +3,12 @@
+ set(kpythonpluginfactory_SRCS
+     kpythonpluginfactory.cpp)
+ 
+-GET_FILENAME_COMPONENT(LIB_PYTHON ${PYTHON_LIBRARY} NAME)
++option(HARDCODE_LIB_PYTHON_PATH "Whether the path to libpython.so should be hardcoded" OFF)
++if(HARDCODE_LIB_PYTHON_PATH)
++	get_filename_component(LIB_PYTHON ${PYTHON_LIBRARY} REALPATH)
++else(HARDCODE_LIB_PYTHON_PATH)
++    get_filename_component(LIB_PYTHON ${PYTHON_LIBRARY} NAME)
++endif(HARDCODE_LIB_PYTHON_PATH)
+ ADD_DEFINITIONS(-DLIB_PYTHON=\\"${LIB_PYTHON}\\")
+ ADD_DEFINITIONS(-DKDE_DEFAULT_DEBUG_AREA=15000)
+ 
diff --git a/pkgs/desktops/kde-4.8/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.8/kdebindings/pykde4.nix
index 1ca6efe3b92..e32b7447aea 100644
--- a/pkgs/desktops/kde-4.8/kdebindings/pykde4.nix
+++ b/pkgs/desktops/kde-4.8/kdebindings/pykde4.nix
@@ -8,11 +8,9 @@ kde {
 
   propagatedBuildInputs = [ pyqt4 sip ];
 
-#NIX_CFLAGS_COMPILE = "-I${phonon}/include/phonon";
+  patches = [ ./pykde4-hardcode-lib-python.patch ];
 
-  patches = [ ./pykde-purity.patch ];
-
-  cmakeFlags = "-DHARDCODE_LIB_PYTHON_PATH=ON";
+  cmakeFlags = "-DHARDCODE_LIB_PYTHON_PATH=ON ";
 
   preConfigure =
     ''
@@ -21,6 +19,7 @@ kde {
       # needs to install a plugin.
       mkdir -pv $out/${pydir}
       ${lndir}/bin/lndir ${pyqt4}/${pydir} $out/${pydir}
+      cmakeFlagsArray=( "-DSIP_DEFAULT_SIP_DIR=$prefix/share/sip" )
     '';
 
   meta = {
diff --git a/pkgs/desktops/kde-4.8/kdenetwork/log-feature.diff b/pkgs/desktops/kde-4.8/kdenetwork/log-feature.diff
deleted file mode 100644
index 6770dd399e3..00000000000
--- a/pkgs/desktops/kde-4.8/kdenetwork/log-feature.diff
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/kget/CMakeLists.txt	2010-08-16 19:08:36.000000000 +0400
-+++ b/kget/CMakeLists.txt	2010-08-16 22:04:24.000000000 +0400
-@@ -53,21 +53,20 @@
- add_subdirectory(desktop)
- add_subdirectory(plasma)
- 
--# find kworkspace library to allow the shutdown after downloads completed option
--find_library(KDE4_KWORKSPACE_LIBRARY NAMES kworkspace PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
--if(KDE4_KWORKSPACE_LIBRARY)
--    set(KDE4_KWORKSPACE_LIBS ${kworkspace_LIB_DEPENDS} ${KDE4_KWORKSPACE_LIBRARY})
-+macro_optional_find_package(KDE4Workspace)
-+macro_log_feature(KDE4WORKSPACE_FOUND "KDE4Workspace" "KDE4 workspace libraries, part of kdebase-workspace" "http://www.kde.org" FALSE "" "Allows 'shutdown after downloads completed' in kget")
-+if(KDE4WORKSPACE_FOUND)
-     add_definitions(-DHAVE_KWORKSPACE)
--    set(KWORKSPACE_FOUND true)
--endif(KDE4_KWORKSPACE_LIBRARY)
-+	include_directories(${KDE4WORKSPACE_INCLUDE_DIR})
-+endif(KDE4WORKSPACE_FOUND)
- 
- # find libkonq to allow actions and open with options in the context menu of a transfer
--find_library(KDE4_KONQUEROR_LIBRARY NAMES konq PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
--if(KDE4_KONQUEROR_LIBRARY)
--    set(KDE4_KONQUEROR_LIBS ${konq_LIB_DEPENDS} ${KDE4_KONQUEROR_LIBRARY})
-+macro_optional_find_package(LibKonq)
-+macro_log_feature(LIBKONQ_FOUND "libkonq" "KDE4 Konqueror library" "http://www.kde.org" FALSE "" "Needed to build actions and open with options in the context menu of a transfer")
-+if(LIBKONQ_FOUND)
-     add_definitions(-DHAVE_KONQUEROR)
--    set(KONQUEROR_FOUND true)
--endif(KDE4_KONQUEROR_LIBRARY)
-+	include_directories(${LIBKONQ_INCLUDE_DIR})
-+endif(LIBKONQ_FOUND)
- 
- 
- include_directories(
-@@ -142,9 +141,9 @@
- 
- target_link_libraries(kgetcore ${KDE4_KIO_LIBS})
- 
--if (KWORKSPACE_FOUND)
--    target_link_libraries(kgetcore ${KDE4_KWORKSPACE_LIBS})
--endif (KWORKSPACE_FOUND)
-+if (KDE4WORKSPACE_FOUND)
-+    target_link_libraries(kgetcore ${KDE4WORKSPACE_KWORKSPACE_LIBS})
-+endif (KDE4WORKSPACE_FOUND)
- 
- if (HAVE_NEPOMUK)
-   target_link_libraries(kgetcore ${SOPRANO_LIBRARIES} ${NEPOMUK_LIBRARIES})
-@@ -294,9 +293,9 @@
-   target_link_libraries(kget ${SOPRANO_LIBRARIES} ${NEPOMUK_LIBRARIES})
- endif (HAVE_NEPOMUK)
- 
--if (KONQUEROR_FOUND)
--  target_link_libraries(kget ${KDE4_KONQUEROR_LIBS})
--endif (KONQUEROR_FOUND)
-+if (LIBKONQ_FOUND)
-+  target_link_libraries(kget ${LIBKONQ_LIBRARY})
-+endif (LIBKONQ_FOUND)
- 
- if (QGPGME_FOUND)
-   target_link_libraries(kget ${QGPGME_LIBRARIES})
diff --git a/pkgs/desktops/kde-4.8/kdesdk/optional-docs.diff b/pkgs/desktops/kde-4.8/kdesdk/optional-docs.diff
deleted file mode 100644
index f67e1f4cdd8..00000000000
--- a/pkgs/desktops/kde-4.8/kdesdk/optional-docs.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
-index 63cdef8..0c5b50a 100644
---- a/doc/CMakeLists.txt
-+++ b/doc/CMakeLists.txt
-@@ -3,22 +3,30 @@ if( UNIX )
-     add_subdirectory(cervisia)
-   endif()
- endif( UNIX )
--add_subdirectory(kapptemplate)
-+if(BUILD_kapptemplate)
-+  add_subdirectory(kapptemplate)
-+endif()
- if(BUILD_kbugbuster)
-   add_subdirectory(kbugbuster)
- endif()
- if(BUILD_kcachegrind)
-   add_subdirectory(kcachegrind)
- endif()
--add_subdirectory(kmtrace)
-+if(BUILD_kmtrace)
-+  add_subdirectory(kmtrace)
-+endif()
- if(BUILD_kompare)
-   add_subdirectory(kompare)
- endif()
- if(BUILD_lokalize)
-   add_subdirectory(lokalize)
- endif()
--add_subdirectory(poxml)
--add_subdirectory(scripts)
-+if(BUILD_poxml)
-+  add_subdirectory(poxml)
-+endif()
-+if(BUILD_scripts)
-+  add_subdirectory(scripts)
-+endif()
- 
- if(LIBXSLT_FOUND AND LIBXML2_FOUND)
-   if(BUILD_umbrello)

From d38c5e7ee4c024f247430aa2086dbe5b25c9943b Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 19 Jan 2012 20:28:05 +0000
Subject: [PATCH 110/114] KTorrent 4.1.3, fix build with KDE 4.8

svn path=/nixpkgs/trunk/; revision=31713
---
 .../applications/graphics/digikam/default.nix |  24 ++-
 .../networking/p2p/ktorrent/default.nix       |   6 +-
 .../drop-taskmanager-dependency.patch         | 175 ++++++++++++++++++
 .../p2p/ktorrent/find-workspace.diff          |  17 +-
 .../libraries/libktorrent/default.nix         |  14 +-
 5 files changed, 199 insertions(+), 37 deletions(-)
 create mode 100644 pkgs/applications/networking/p2p/ktorrent/drop-taskmanager-dependency.patch

diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index 895453aae44..4467ae338e4 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -1,28 +1,26 @@
 { stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen,
-kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, kdeedu,
+lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, libjpeg, libtiff,
 liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost,
-shared_desktop_ontologies, marble }:
+shared_desktop_ontologies, marble, clapack, mysql }:
 
 stdenv.mkDerivation rec {
-  name = "digikam-2.4.1";
+  name = "digikam-2.5.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/digikam/${name}.tar.bz2";
-    sha256 = "0fyyhc26syd1d1m8jqyg2i66hwd523mh419ln8y944jkrjj6gadc";
+    sha256 = "06l52j8i45vyfj3b81ivifqsqdjlcj4g68d8w06c5lhzniwjqaam";
   };
 
-  buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen
-    lcms jasper libgphoto2 kdepimlibs gettext soprano kdeedu liblqr1 lensfun
-    pkgconfig qjson libkdcraw opencv libkexiv2 libkipi boost shared_desktop_ontologies
-    marble ];
+  buildNativeInputs = [ cmake automoc4 pkgconfig ];
 
-  KDEDIRS=kdeedu;
+  buildInputs = [ qt4 kdelibs phonon qimageblitz qca2 eigen lcms libjpeg libtiff
+    jasper libgphoto2 kdepimlibs gettext soprano liblqr1 lensfun qjson libkdcraw
+    opencv libkexiv2 libkipi boost shared_desktop_ontologies marble mysql ];
 
   # Make digikam find some FindXXXX.cmake
-  preConfigure = ''
-    cp ${qjson}/share/apps/cmake/modules/FindQJSON.cmake cmake/modules;
-    cp ${marble}/share/apps/cmake/modules/FindMarble.cmake cmake/modules;
-  '';
+  KDEDIRS="${marble}:${qjson}";
+
+  patches = [ ./libkvkontakte-not-topdir.patch ./ftbfs-libkipi.patch ];
 
   meta = {
     description = "Photo Management Program";
diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix
index e4cb4e9089a..5f15cbc495f 100644
--- a/pkgs/applications/networking/p2p/ktorrent/default.nix
+++ b/pkgs/applications/networking/p2p/ktorrent/default.nix
@@ -5,14 +5,14 @@ stdenv.mkDerivation rec {
   name = pname + "-" + version;
 
   pname = "ktorrent";
-  version = "4.1.1";
+  version = "4.1.3";
 
   src = fetchurl {
     url = "${meta.homepage}/downloads/${version}/${name}.tar.bz2";
-    sha256 = "1h0fqh344sfwfbvnwhn00k8czb14568flapjf4754zss6bxpw4g4";
+    sha256 = "0ih68bml6ic3mxk5l4ypgmxwyg9mglp57gw5igrnm5yszm7jz19g";
   };
 
-  patches = [ ./find-workspace.diff ];
+  patches = [ ./find-workspace.diff ./drop-taskmanager-dependency.patch ];
 
   KDEDIRS = libktorrent;
 
diff --git a/pkgs/applications/networking/p2p/ktorrent/drop-taskmanager-dependency.patch b/pkgs/applications/networking/p2p/ktorrent/drop-taskmanager-dependency.patch
new file mode 100644
index 00000000000..2998b392679
--- /dev/null
+++ b/pkgs/applications/networking/p2p/ktorrent/drop-taskmanager-dependency.patch
@@ -0,0 +1,175 @@
+commit 6d4a6ae51692966862ccb20d17cb217717519d40
+Author: Joris Guisson <joris.guisson@gmail.com>
+Date:   Wed Nov 23 20:17:08 2011 +0100
+
+    Use dbus to show ktorrent window from plasma applet. This removes the dependency on libtaskmanager.
+    
+    BUG: 287309
+Changelog removed by Yury G. Kudryashov
+
+diff --git a/plasma/applet/CMakeLists.txt b/plasma/applet/CMakeLists.txt
+index 3a72241..4307cf2 100644
+--- a/plasma/applet/CMakeLists.txt
++++ b/plasma/applet/CMakeLists.txt
+@@ -5,25 +5,15 @@ if(NOT QT_VERSION_OK)
+ 
+ else(NOT QT_VERSION_OK)
+ 	
+-	set(TASKMANAGER_FOUND FALSE)
+-	FIND_PATH(TASKMANAGER_INCLUDE_DIR NAMES taskmanager.h  PATHS ${KDE4_INCLUDE_DIR}/taskmanager ${INCLUDE_INSTALL_DIR}/taskmanager.h)
+-	FIND_LIBRARY(TASKMANAGER_LIBRARY NAMES taskmanager PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
+-
+-	if(TASKMANAGER_INCLUDE_DIR AND TASKMANAGER_LIBRARY)
+-		set(TASKMANAGER_FOUND TRUE)
+-		message(STATUS "Found libtaskmanager: ${TASKMANAGER_LIBRARY} ")
+-		include_directories(${TASKMANAGER_INCLUDE_DIR})
+-		set(ktapplet_SRCS applet.cpp chunkbar.cpp fadingitem.cpp fadingnavigationwidget.cpp)
+-		
+-		kde4_add_ui_files(ktapplet_SRCS appletconfig.ui)
+-		
+-		kde4_add_plugin(plasma_applet_ktorrent ${ktapplet_SRCS})
+-		target_link_libraries(plasma_applet_ktorrent  ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${TASKMANAGER_LIBRARY} ${LIBKTORRENT_LIBRARIES} ktcore)
+-		
+-		install(TARGETS plasma_applet_ktorrent DESTINATION ${PLUGIN_INSTALL_DIR})
+-		install(FILES plasma-applet-ktorrent.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+-	endif(TASKMANAGER_INCLUDE_DIR AND TASKMANAGER_LIBRARY)
+-
+-	macro_log_feature(TASKMANAGER_FOUND "libtaskmanager" "libtaskmanager library and header files" "http://www.kde.org/" FALSE "" "libtaskmanager is needed for KTorrent Plasmoid")
++	
++	set(ktapplet_SRCS applet.cpp chunkbar.cpp fadingitem.cpp fadingnavigationwidget.cpp)
++	
++	kde4_add_ui_files(ktapplet_SRCS appletconfig.ui)
++	
++	kde4_add_plugin(plasma_applet_ktorrent ${ktapplet_SRCS})
++	target_link_libraries(plasma_applet_ktorrent  ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${LIBKTORRENT_LIBRARIES} ktcore)
++	
++	install(TARGETS plasma_applet_ktorrent DESTINATION ${PLUGIN_INSTALL_DIR})
++	install(FILES plasma-applet-ktorrent.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+ 
+ endif(NOT QT_VERSION_OK)
+diff --git a/plasma/applet/applet.cpp b/plasma/applet/applet.cpp
+index 59e7191..bf09479 100644
+--- a/plasma/applet/applet.cpp
++++ b/plasma/applet/applet.cpp
+@@ -21,6 +21,9 @@
+ #include "applet.h"
+ #include <QFile>
+ #include <QGraphicsLinearLayout>
++#include <QDBusConnection>
++#include <QDBusConnectionInterface>
++#include <QDBusMessage>
+ #include <KConfigDialog>
+ #include <KLocale>
+ #include <KRun>
+@@ -31,12 +34,11 @@
+ #include <Plasma/IconWidget>
+ #endif
+ #include <Plasma/Label>
+-#include <taskmanager/taskmanager.h>
+-#include <taskmanager/task.h>
+ #include <util/functions.h>
+ #include "chunkbar.h"
+ #include "fadingnavigationwidget.h"
+ 
++
+ using namespace bt;
+ 
+ namespace ktplasma
+@@ -174,7 +176,8 @@ namespace ktplasma
+ 		}
+ 	}
+ 
+-	void Applet::updateNavigation() {
++	void Applet::updateNavigation() 
++	{
+ 		navigation->setEnabled(connected_to_app && !sources.empty()
+ 			&& (sources.count() > 1 || !sources.contains(current_source)));
+ 	}
+@@ -193,12 +196,14 @@ namespace ktplasma
+ 		}
+ 	}
+ 	
+-	void Applet::updateSources() {
++	void Applet::updateSources() 
++	{
+ 		sources = engine->sources();
+ 		sources.removeOne("core");
+ 	}
+ 
+-	void Applet::setSource(QString source) {
++	void Applet::setSource(QString source) 
++	{
+ 		if (!current_source.isEmpty())
+ 			engine->disconnectSource(current_source,this);
+ 		clearData();
+@@ -340,20 +345,39 @@ namespace ktplasma
+ 
+ 	void Applet::iconClicked()
+ 	{
+-		TaskManager::TaskDict tasks = TaskManager::TaskManager::self()->tasks();
+-		for (TaskManager::TaskDict::iterator i = tasks.begin();i != tasks.end();i ++)
++		QDBusConnection session_bus = QDBusConnection::sessionBus();
++		QDBusConnectionInterface* dbus_service = session_bus.interface();
++		if (!session_bus.isConnected() || !dbus_service || !dbus_service->isServiceRegistered("org.ktorrent.ktorrent"))
+ 		{
+-			if (i.value()->className() == "ktorrent")
+-			{
+-				KWindowSystem::activateWindow(i.key());
+-				return;
+-			}
++			// can't find the window, try launching it
++			KUrl::List empty;
++			KRun::run("ktorrent", empty, 0);
++		}
++		else
++		{
++			QDBusMessage msg = QDBusMessage::createMethodCall("org.ktorrent.ktorrent", "/ktorrent/MainWindow_1", "org.kde.KMainWindow", "winId");
++			QDBusPendingCall call = session_bus.asyncCall(msg, 5000);
++			QDBusPendingCallWatcher* watcher = new QDBusPendingCallWatcher(call ,this);
++			connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)), this, SLOT(dbusCallFinished(QDBusPendingCallWatcher*)));
+ 		}
+-
+-		// can't find the window, try launching it
+-		KUrl::List empty;
+-		KRun::run("ktorrent", empty, 0);
+ 	}
++	
++	void Applet::dbusCallFinished(QDBusPendingCallWatcher* self)
++	{
++		if (self->isError())
++		{
++			// call failed, try launching it
++			KUrl::List empty;
++			KRun::run("ktorrent", empty, 0);
++		}
++		else
++		{
++			QDBusPendingReply<qlonglong> reply = *self;
++			KWindowSystem::activateWindow(reply.value());		
++		}
++		self->deleteLater();
++	}
++
+ 
+ 	void Applet::clearData()
+ 	{		
+diff --git a/plasma/applet/applet.h b/plasma/applet/applet.h
+index 29b3265..d396118 100644
+--- a/plasma/applet/applet.h
++++ b/plasma/applet/applet.h
+@@ -27,6 +27,7 @@
+ #include "fadingnavigationwidget.h"
+ 
+ class QGraphicsLinearLayout;
++class QDBusPendingCallWatcher;
+ 
+ namespace Plasma
+ {
+@@ -68,6 +69,7 @@ namespace ktplasma
+ 		void iconClicked();
+ 		void selectPrev();
+ 		void selectNext();
++		void dbusCallFinished(QDBusPendingCallWatcher* self);
+ 		
+ 	private:
+ 		void updateTorrentCombo();
diff --git a/pkgs/applications/networking/p2p/ktorrent/find-workspace.diff b/pkgs/applications/networking/p2p/ktorrent/find-workspace.diff
index 472ceff490e..b07c1ca1b83 100644
--- a/pkgs/applications/networking/p2p/ktorrent/find-workspace.diff
+++ b/pkgs/applications/networking/p2p/ktorrent/find-workspace.diff
@@ -1,19 +1,4 @@
-Fix finding taskmanager.h and kworkspace.h
-diff --git a/plasma/applet/CMakeLists.txt b/plasma/applet/CMakeLists.txt
-index 3a72241..69b1205 100644
---- a/plasma/applet/CMakeLists.txt
-+++ b/plasma/applet/CMakeLists.txt
-@@ -6,7 +6,9 @@ if(NOT QT_VERSION_OK)
- else(NOT QT_VERSION_OK)
- 	
- 	set(TASKMANAGER_FOUND FALSE)
--	FIND_PATH(TASKMANAGER_INCLUDE_DIR NAMES taskmanager.h  PATHS ${KDE4_INCLUDE_DIR}/taskmanager ${INCLUDE_INSTALL_DIR}/taskmanager.h)
-+	FIND_PATH(TASKMANAGER_INCLUDE_DIR
-+		NAMES taskmanager/taskmanager.h
-+		HINTS ${KDE4_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR})
- 	FIND_LIBRARY(TASKMANAGER_LIBRARY NAMES taskmanager PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
- 
- 	if(TASKMANAGER_INCLUDE_DIR AND TASKMANAGER_LIBRARY)
+Fix finding kworkspace.h
 diff --git a/plugins/shutdown/CMakeLists.txt b/plugins/shutdown/CMakeLists.txt
 index 59e5470..5b932ff 100644
 --- a/plugins/shutdown/CMakeLists.txt
diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix
index e452097e50d..1f50f1b976b 100644
--- a/pkgs/development/libraries/libktorrent/default.nix
+++ b/pkgs/development/libraries/libktorrent/default.nix
@@ -1,18 +1,22 @@
 { stdenv, fetchurl, kdelibs, cmake, gmp, qca2, boost, gettext, qt4, automoc4
 , phonon, libgcrypt }:
 
+let
+  mp_ = "1.3";
+  version = "1.${mp_}";
+  version4 = "4.${mp_}";
+in
 stdenv.mkDerivation rec {
   name = pname + "-" + version;
   pname = "libktorrent";
-  version = "1.1.1";
 
   src = fetchurl {
-    url = "http://ktorrent.org/downloads/4.1.1/${name}.tar.bz2";
-    sha256 = "06d93xpshxawz49hqh6pvypir4ygm1f781hs7yim5k6b7shivfs1";
+    url = "http://ktorrent.org/downloads/${version4}/${name}.tar.bz2";
+    sha256 = "0mvvx6mdfy0pyhk6lwwmmbd3pd2ai6n2rf5kdjqhpkm9wbrck85n";
   };
 
-  buildInputs =
-    [ cmake kdelibs qt4 automoc4 phonon gmp qca2 boost libgcrypt gettext ];
+  buildNativeInputs = [ cmake automoc4 gettext ];
+  buildInputs = [ kdelibs phonon gmp qca2 boost libgcrypt ];
 
   enableParallelBuilding = true;
 

From 8deba0e4f80bb28448a39de10c4a5aa9b7a3c189 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 19 Jan 2012 20:28:09 +0000
Subject: [PATCH 111/114] Revert digikam change

svn path=/nixpkgs/trunk/; revision=31714
---
 .../applications/graphics/digikam/default.nix | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index 4467ae338e4..895453aae44 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -1,26 +1,28 @@
 { stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen,
-lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, libjpeg, libtiff,
+kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, kdeedu,
 liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost,
-shared_desktop_ontologies, marble, clapack, mysql }:
+shared_desktop_ontologies, marble }:
 
 stdenv.mkDerivation rec {
-  name = "digikam-2.5.0";
+  name = "digikam-2.4.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/digikam/${name}.tar.bz2";
-    sha256 = "06l52j8i45vyfj3b81ivifqsqdjlcj4g68d8w06c5lhzniwjqaam";
+    sha256 = "0fyyhc26syd1d1m8jqyg2i66hwd523mh419ln8y944jkrjj6gadc";
   };
 
-  buildNativeInputs = [ cmake automoc4 pkgconfig ];
+  buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen
+    lcms jasper libgphoto2 kdepimlibs gettext soprano kdeedu liblqr1 lensfun
+    pkgconfig qjson libkdcraw opencv libkexiv2 libkipi boost shared_desktop_ontologies
+    marble ];
 
-  buildInputs = [ qt4 kdelibs phonon qimageblitz qca2 eigen lcms libjpeg libtiff
-    jasper libgphoto2 kdepimlibs gettext soprano liblqr1 lensfun qjson libkdcraw
-    opencv libkexiv2 libkipi boost shared_desktop_ontologies marble mysql ];
+  KDEDIRS=kdeedu;
 
   # Make digikam find some FindXXXX.cmake
-  KDEDIRS="${marble}:${qjson}";
-
-  patches = [ ./libkvkontakte-not-topdir.patch ./ftbfs-libkipi.patch ];
+  preConfigure = ''
+    cp ${qjson}/share/apps/cmake/modules/FindQJSON.cmake cmake/modules;
+    cp ${marble}/share/apps/cmake/modules/FindMarble.cmake cmake/modules;
+  '';
 
   meta = {
     description = "Photo Management Program";

From 185a3d13aa3a865703cf56a26ec463d7f4c838bd Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 19 Jan 2012 20:28:13 +0000
Subject: [PATCH 112/114] digikam-2.5.0

svn path=/nixpkgs/trunk/; revision=31715
---
 .../applications/graphics/digikam/default.nix | 24 +++----
 .../graphics/digikam/ftbfs-libkipi.patch      | 68 +++++++++++++++++++
 .../digikam/libkvkontakte-not-topdir.patch    | 33 +++++++++
 3 files changed, 112 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/applications/graphics/digikam/ftbfs-libkipi.patch
 create mode 100644 pkgs/applications/graphics/digikam/libkvkontakte-not-topdir.patch

diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index 895453aae44..4467ae338e4 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -1,28 +1,26 @@
 { stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen,
-kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, kdeedu,
+lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, libjpeg, libtiff,
 liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost,
-shared_desktop_ontologies, marble }:
+shared_desktop_ontologies, marble, clapack, mysql }:
 
 stdenv.mkDerivation rec {
-  name = "digikam-2.4.1";
+  name = "digikam-2.5.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/digikam/${name}.tar.bz2";
-    sha256 = "0fyyhc26syd1d1m8jqyg2i66hwd523mh419ln8y944jkrjj6gadc";
+    sha256 = "06l52j8i45vyfj3b81ivifqsqdjlcj4g68d8w06c5lhzniwjqaam";
   };
 
-  buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen
-    lcms jasper libgphoto2 kdepimlibs gettext soprano kdeedu liblqr1 lensfun
-    pkgconfig qjson libkdcraw opencv libkexiv2 libkipi boost shared_desktop_ontologies
-    marble ];
+  buildNativeInputs = [ cmake automoc4 pkgconfig ];
 
-  KDEDIRS=kdeedu;
+  buildInputs = [ qt4 kdelibs phonon qimageblitz qca2 eigen lcms libjpeg libtiff
+    jasper libgphoto2 kdepimlibs gettext soprano liblqr1 lensfun qjson libkdcraw
+    opencv libkexiv2 libkipi boost shared_desktop_ontologies marble mysql ];
 
   # Make digikam find some FindXXXX.cmake
-  preConfigure = ''
-    cp ${qjson}/share/apps/cmake/modules/FindQJSON.cmake cmake/modules;
-    cp ${marble}/share/apps/cmake/modules/FindMarble.cmake cmake/modules;
-  '';
+  KDEDIRS="${marble}:${qjson}";
+
+  patches = [ ./libkvkontakte-not-topdir.patch ./ftbfs-libkipi.patch ];
 
   meta = {
     description = "Photo Management Program";
diff --git a/pkgs/applications/graphics/digikam/ftbfs-libkipi.patch b/pkgs/applications/graphics/digikam/ftbfs-libkipi.patch
new file mode 100644
index 00000000000..cf7e77f7ef8
--- /dev/null
+++ b/pkgs/applications/graphics/digikam/ftbfs-libkipi.patch
@@ -0,0 +1,68 @@
+commit 25cc9c9876a5233bd630105d0110319892d4e18c
+Author: Gilles Caulier <caulier.gilles@gmail.com>
+Date:   Tue Jan 3 15:16:37 2012 +0100
+
+    enable checkall and clearall buttons only with libkipi version 1.4.0
+    BUGS: 290496
+
+diff --git a/core/utilities/setup/setupplugins.cpp b/utilities/setup/setupplugins.cpp
+index 0f4030a..b8efb35 100644
+--- a/core/utilities/setup/setupplugins.cpp
++++ b/core/utilities/setup/setupplugins.cpp
+@@ -6,8 +6,8 @@
+  * Date        : 2004-01-02
+  * Description : setup Kipi plugins tab.
+  *
+- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
+- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com>
++ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
++ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
+  *
+  * This program is free software; you can redistribute it
+  * and/or modify it under the terms of the GNU General
+@@ -100,6 +100,11 @@ SetupPlugins::SetupPlugins(QWidget* parent)
+ 
+     panel->setLayout(mainLayout);
+ 
++#if KIPI_VERSION < 0x010400
++    d->checkAllBtn->setVisible(false);
++    d->clearBtn->setVisible(false);
++#endif
++
+     initPlugins();
+ 
+     // --------------------------------------------------------
+@@ -158,14 +163,18 @@ void SetupPlugins::applyPlugins()
+ void SetupPlugins::slotCheckAll()
+ {
+     QApplication::setOverrideCursor(Qt::WaitCursor);
++#if KIPI_VERSION >= 0x010400
+     d->kipiConfig->slotCheckAll();
++#endif
+     QApplication::restoreOverrideCursor();
+ }
+ 
+ void SetupPlugins::slotClear()
+ {
+     QApplication::setOverrideCursor(Qt::WaitCursor);
++#if KIPI_VERSION >= 0x010400
+     d->kipiConfig->slotClear();
++#endif
+     QApplication::restoreOverrideCursor();
+ }
+ 
+diff --git a/core/utilities/setup/setupplugins.h b/utilities/setup/setupplugins.h
+index 271a569..114e0fa 100644
+--- a/core/utilities/setup/setupplugins.h
++++ b/core/utilities/setup/setupplugins.h
+@@ -6,8 +6,8 @@
+  * Date        : 2004-01-02
+  * Description : setup Kipi plugins tab.
+  *
+- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
+- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com>
++ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
++ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
+  *
+  * This program is free software; you can redistribute it
+  * and/or modify it under the terms of the GNU General
diff --git a/pkgs/applications/graphics/digikam/libkvkontakte-not-topdir.patch b/pkgs/applications/graphics/digikam/libkvkontakte-not-topdir.patch
new file mode 100644
index 00000000000..ee92a886c79
--- /dev/null
+++ b/pkgs/applications/graphics/digikam/libkvkontakte-not-topdir.patch
@@ -0,0 +1,33 @@
+commit 0f0cfa14805519cfd9e0b97ee9668dc4f86379de
+Author: Yury G. Kudryashov <urkud.urkud@gmail.com>
+Date:   Wed Jan 18 05:07:13 2012 +0400
+
+    Use CMAKE_CURRENT_{SOURCE,BINARY}_DIR
+    
+    Some projects (e.g., digikam) include snapshots of this library into their
+    release tarballs, so the libkvkontakte_SOURCE_DIR != CMAKE_SOURCE_DIR.
+
+diff --git a/extra/libkvkontakte/CMakeLists.txt b/extra/libkvkontakte/CMakeLists.txt
+index f19b28b..4310a74 100644
+--- a/extra/libkvkontakte/CMakeLists.txt
++++ b/extra/libkvkontakte/CMakeLists.txt
+@@ -21,7 +21,7 @@ set(INCLUDE_INSTALL_DIR include )
+ 
+ 
+ # === Closer to the code, close to the body ===
+-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
++set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
+ find_package(KDE4 REQUIRED)
+ include(KDE4Defaults)
+ include(MacroLibrary)
+@@ -35,8 +35,8 @@ macro_log_feature(QJSON_FOUND "QJSON" "Qt library for handling JSON data" "http:
+ add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+ 
+ include_directories(
+-  ${CMAKE_SOURCE_DIR}
+-  ${CMAKE_BINARY_DIR}
++  ${CMAKE_CURRENT_SOURCE_DIR}
++  ${CMAKE_CURRENT_BINARY_DIR}
+   ${KDE4_INCLUDES}
+   ${QJSON_INCLUDE_DIR}
+ )

From d0c8b530e91f7f4e990f117d84b4f32dd0e987da Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 19 Jan 2012 20:34:59 +0000
Subject: [PATCH 113/114] leiningen: added package version 1.6.2

svn path=/nixpkgs/trunk/; revision=31716
---
 .../tools/build-managers/leiningen/builder.sh | 20 +++++++++++
 .../build-managers/leiningen/default.nix      | 36 +++++++++++++++++++
 .../tools/build-managers/leiningen/lein.patch | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 4 files changed, 94 insertions(+)
 create mode 100644 pkgs/development/tools/build-managers/leiningen/builder.sh
 create mode 100644 pkgs/development/tools/build-managers/leiningen/default.nix
 create mode 100644 pkgs/development/tools/build-managers/leiningen/lein.patch

diff --git a/pkgs/development/tools/build-managers/leiningen/builder.sh b/pkgs/development/tools/build-managers/leiningen/builder.sh
new file mode 100644
index 00000000000..65d318c8f1e
--- /dev/null
+++ b/pkgs/development/tools/build-managers/leiningen/builder.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -e
+
+source $stdenv/setup
+
+mkdir -pv $out/bin $out/lib
+
+out_bin=$out/bin/lein
+
+cp -v $src $out_bin
+cp -v $jarsrc $out/lib
+cp -v $clojuresrc $out/lib
+
+patch --verbose $out_bin -p0 < $patches
+chmod -v 755 $out_bin
+
+echo "Testing out \"lein version\"..."
+$out_bin version
+echo "Success."
diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix
new file mode 100644
index 00000000000..61a0374bdad
--- /dev/null
+++ b/pkgs/development/tools/build-managers/leiningen/default.nix
@@ -0,0 +1,36 @@
+{stdenv, fetchurl, openjdk}:
+
+stdenv.mkDerivation rec {
+  pname = "leiningen";
+  version = "1.6.2";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://raw.github.com/technomancy/leiningen/stable/bin/lein-pkg";
+    sha256 = "e177a493ed0c4a7874f1391d5cc72cc1e541e55ed3d6e075feec87b5da6f8277";
+  };
+
+  jarsrc = fetchurl {
+    url = "https://github.com/downloads/technomancy/leiningen/leiningen-1.6.2-standalone.jar";
+    sha256 = "e35272556ece82d9a6a54b86266626da1b5f990ff556639dd7dd1025d6ed4226";
+  };
+
+  clojuresrc = fetchurl {
+    url = "http://build.clojure.org/releases/org/clojure/clojure/1.2.1/clojure-1.2.1.jar";
+    sha256 = "b38853254a2df9138b2e2c12be0dca3600fa7e2a951fed05fc3ba2d9141a3fb0";
+  };
+
+  patches = [ ./lein.patch ];
+
+  builder = ./builder.sh;
+
+  propagatedBuildInputs = [ openjdk ];
+
+  meta = {
+    homepage = https://github.com/technomancy/leiningen;
+    description = "Project automation for Clojure";
+    license = "EPL";
+
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/development/tools/build-managers/leiningen/lein.patch b/pkgs/development/tools/build-managers/leiningen/lein.patch
new file mode 100644
index 00000000000..1a7157568e4
--- /dev/null
+++ b/pkgs/development/tools/build-managers/leiningen/lein.patch
@@ -0,0 +1,36 @@
+--- lein-pkg	2012-01-09 20:47:44.000000000 -0800
++++ lein-pkg-nix	2012-01-09 20:45:01.000000000 -0800
+@@ -70,7 +70,7 @@
+ LEIN_PLUGIN_PATH="$(echo "$DEV_PLUGINS" | tr \\n :)"
+ LEIN_USER_PLUGIN_PATH="$(echo "$(unique_user_plugins)" | tr \\n :)"
+ CLASSPATH="$CLASSPATH:$LEIN_PLUGIN_PATH:$LEIN_USER_PLUGIN_PATH:test/:src/:resources/"
+-CLOJURE_JAR="/usr/share/java/clojure-1.2.jar:/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar"
++CLOJURE_JAR="$(dirname $0)/../lib/*clojure-1.2.1.jar"
+ NULL_DEVICE=/dev/null
+ 
+ # apply context specific CLASSPATH entries
+@@ -78,23 +78,7 @@
+     CLASSPATH="`cat .lein-classpath`:$CLASSPATH"
+ fi
+ 
+-SHARE_JARS="ant ant-launcher classworlds clojure-1.2 clojure-contrib \
+-lucene-memory maven-ant-tasks maven-artifact maven-artifact-manager \
+-maven-error-diagnostics maven-model maven-settings maven-project maven-profile \
+-maven-repository-metadata plexus-container-default-alpha plexus-interpolation \
+-plexus-utils wagon-file wagon-http-lightweight wagon-http-shared wagon-provider-api \
+-xml-apis lucene-core lucene-highlighter clucy robert-hooke lancet \
+-backport-util-concurrent" # NFI why that last one is necessary
+-for JAR in $SHARE_JARS; do
+-    CLASSPATH="$CLASSPATH":"/usr/share/java/$JAR.jar"
+-done
+-
+-# Do not use installed leiningen jar during self-compilation
+-if ! { [ "$1" = "compile" ] &&
+-       grep -qsE 'defproject leiningen[[:space:]]+"[[:digit:].]+"' \
+-         project.clj ;}; then
+-    CLASSPATH="$CLASSPATH":/usr/share/java/leiningen-$LEIN_VERSION.jar
+-fi
++CLASSPATH="$CLASSPATH:$(dirname $0)/../lib/*"
+ 
+ if [ $DEBUG ]; then
+     echo $CLASSPATH
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a5f50e65c5b..0e57f554c43 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3008,6 +3008,8 @@ let
 
   lcov = callPackage ../development/tools/analysis/lcov { };
 
+  leiningen = callPackage ../development/tools/build-managers/leiningen { };
+
   libtool = libtool_2;
 
   libtool_1_5 = callPackage ../development/tools/misc/libtool { };

From b94fef3cbad6b3b830f8f7c4a987c65c81c9e93d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 19 Jan 2012 20:45:17 +0000
Subject: [PATCH 114/114] all-packages.nix: added texLiveFull attribute, which
 is a working TexLive installation with all supported packages enabled

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0e57f554c43..bf504d9fbff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8611,6 +8611,12 @@ let
     ruby = ruby18;
   };
 
+  texLiveFull = lib.setName "texlive-full" (texLiveAggregationFun {
+    paths = [ texLive texLiveExtra lmodern texLiveCMSuper texLiveLatexXColor
+              texLivePGF texLiveBeamer texLiveModerncv ];
+
+  });
+
   /* Look in configurations/misc/raskin.nix for usage example (around revisions
   where TeXLive was added)