From 8af094c99f8d2178cf5d0f03960815607b07d50c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Sun, 25 Dec 2011 00:12:52 +0000
Subject: [PATCH 01/96] Updated ghc HEAD snapshot to ghc-7.4.1-rc1.

svn path=/nixpkgs/trunk/; revision=31066
---
 pkgs/development/compilers/ghc/head.nix | 6 +++---
 pkgs/top-level/all-packages.nix         | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 330165437d5..0d3301df60a 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
 
 stdenv.mkDerivation rec {
-  version = "7.3.20111212";
+  version = "7.4.0.20111219";
 
   name = "ghc-${version}";
 
   src = fetchurl {
-    url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2";
-    sha256 = "1i8zw3qaihzbgygdlip9d5g5321wv1yhashf8nrinwgy5649rsyf";
+    url = "http://haskell.org/ghc/dist/7.4.1-rc1/${name}-src.tar.bz2";
+    sha256 = "11imfag07wr9s5vf12yh6bz4hjfbw20i1c7n8py9fa4vx7va676n";
   };
 
   buildInputs = [ghc perl gmp ncurses] ++
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f9243b7e05f..0c9e92e7c9a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2233,7 +2233,8 @@ 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 ]))
+      # (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 {

From 658f4ae7e2b3f06c43a8ed7bd69c1757d5446d12 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 25 Dec 2011 16:06:00 +0000
Subject: [PATCH 02/96] haskell-dstring: added version 0.4.0.3

svn path=/nixpkgs/trunk/; revision=31068
---
 .../libraries/haskell/dstring/default.nix          | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/dstring/default.nix

diff --git a/pkgs/development/libraries/haskell/dstring/default.nix b/pkgs/development/libraries/haskell/dstring/default.nix
new file mode 100644
index 00000000000..44997847cfb
--- /dev/null
+++ b/pkgs/development/libraries/haskell/dstring/default.nix
@@ -0,0 +1,14 @@
+{ cabal, baseUnicodeSymbols, dlist }:
+
+cabal.mkDerivation (self: {
+  pname = "dstring";
+  version = "0.4.0.3";
+  sha256 = "0wzj1wzls7w79ac84sc5msblh2dmfmcxm77drpdqdirl1pwdlq9c";
+  buildDepends = [ baseUnicodeSymbols dlist ];
+  meta = {
+    homepage = "https://github.com/basvandijk/dstring";
+    description = "Difference strings";
+    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 8fe6bb15f2c..e7c621f4947 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -612,6 +612,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   downloadCurl = callPackage ../development/libraries/haskell/download-curl { tagsoup = self.tagsoup_0_10_1; };
 
+  dstring = callPackage ../development/libraries/haskell/dstring {};
+
   editline = callPackage ../development/libraries/haskell/editline {};
 
   emailValidate = callPackage ../development/libraries/haskell/email-validate {};

From 6a9bbeac0f4d87529979f5df9d6da0f9c4177e1f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 25 Dec 2011 16:06:11 +0000
Subject: [PATCH 03/96] haskell-string-combinators: added version 0.6.0.2

svn path=/nixpkgs/trunk/; revision=31069
---
 .../haskell/string-combinators/default.nix         | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/string-combinators/default.nix

diff --git a/pkgs/development/libraries/haskell/string-combinators/default.nix b/pkgs/development/libraries/haskell/string-combinators/default.nix
new file mode 100644
index 00000000000..62fadb1462a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/string-combinators/default.nix
@@ -0,0 +1,14 @@
+{ cabal, baseUnicodeSymbols }:
+
+cabal.mkDerivation (self: {
+  pname = "string-combinators";
+  version = "0.6.0.2";
+  sha256 = "1bsnli6376nq5dmcx8da2fakj7h73plqz6v1myzhkz1f6r3qcjfi";
+  buildDepends = [ baseUnicodeSymbols ];
+  meta = {
+    homepage = "https://github.com/basvandijk/string-combinators";
+    description = "Polymorphic functions to build and combine stringlike values";
+    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 e7c621f4947..e15c7fecf75 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1160,6 +1160,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   strict = callPackage ../development/libraries/haskell/strict {};
 
+  stringCombinators = callPackage ../development/libraries/haskell/string-combinators {};
+
   syb_0_2_2 = callPackage ../development/libraries/haskell/syb/0.2.2.nix {};
   syb_0_3   = callPackage ../development/libraries/haskell/syb/0.3.nix {};
   syb_0_3_3 = callPackage ../development/libraries/haskell/syb/0.3.3.nix {};

From 46084dbc3c6f7db88fe6d0aad7ae28cb37c2f23e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 25 Dec 2011 16:06:17 +0000
Subject: [PATCH 04/96] haskell-repr: added version 0.4.1.2

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

diff --git a/pkgs/development/libraries/haskell/repr/default.nix b/pkgs/development/libraries/haskell/repr/default.nix
new file mode 100644
index 00000000000..ab953e46da6
--- /dev/null
+++ b/pkgs/development/libraries/haskell/repr/default.nix
@@ -0,0 +1,16 @@
+{ cabal, baseUnicodeSymbols, dstring, random, stringCombinators }:
+
+cabal.mkDerivation (self: {
+  pname = "repr";
+  version = "0.4.1.2";
+  sha256 = "09rv23p1hvvfw5wnhiawgrpqgqa4i0d00skyj9z1jj6bfxk5avjs";
+  buildDepends = [
+    baseUnicodeSymbols dstring random stringCombinators
+  ];
+  meta = {
+    homepage = "https://github.com/basvandijk/repr";
+    description = "Render overloaded expressions to their textual representation";
+    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 e15c7fecf75..462d9ca594e 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1132,6 +1132,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   RepLib = callPackage ../development/libraries/haskell/RepLib {};
 
+  repr = callPackage ../development/libraries/haskell/repr {};
+
   RSA = callPackage ../development/libraries/haskell/RSA {};
 
   safe = callPackage ../development/libraries/haskell/safe {};

From bbd45bcdc6d37d84d1f64f97925a7a65c6f66647 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 25 Dec 2011 16:06:20 +0000
Subject: [PATCH 05/96] haskell-aeson: updated to version 0.5.0.0

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

diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/default.nix
index 04a94c222c6..b8ead39671e 100644
--- a/pkgs/development/libraries/haskell/aeson/default.nix
+++ b/pkgs/development/libraries/haskell/aeson/default.nix
@@ -1,14 +1,14 @@
-{ cabal, attoparsec, blazeBuilder, blazeTextual, deepseq, dlist
-, hashable, mtl, syb, text, time, unorderedContainers, vector
+{ cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, mtl
+, syb, text, time, unorderedContainers, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "aeson";
-  version = "0.4.0.1";
-  sha256 = "15aq3r36vda8v1fn3pn0k638w32kzy15kbrf97krvg3xdwrvybky";
+  version = "0.5.0.0";
+  sha256 = "1n7c0kf6rdf5p76mjcxlqrzhnfz4b1zkkbxk9w94hibb0s4kwxv6";
   buildDepends = [
-    attoparsec blazeBuilder blazeTextual deepseq dlist hashable mtl syb
-    text time unorderedContainers vector
+    attoparsec blazeBuilder deepseq dlist hashable mtl syb text time
+    unorderedContainers vector
   ];
   meta = {
     homepage = "https://github.com/bos/aeson";

From 27fa436674f761e3f0a5097550c26d28dd72e902 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 25 Dec 2011 16:06:23 +0000
Subject: [PATCH 06/96] haskell-dstring: updated to version 0.4.0.3

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

diff --git a/pkgs/development/libraries/haskell/dstring/default.nix b/pkgs/development/libraries/haskell/dstring/default.nix
index 44997847cfb..0b979e179f4 100644
--- a/pkgs/development/libraries/haskell/dstring/default.nix
+++ b/pkgs/development/libraries/haskell/dstring/default.nix
@@ -10,5 +10,9 @@ cabal.mkDerivation (self: {
     description = "Difference strings";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

From 1b722dcc80d121953be1e453cc5eaeb1256857eb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 25 Dec 2011 16:06:28 +0000
Subject: [PATCH 07/96] haskell-repr: updated to version 0.4.1.2

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

diff --git a/pkgs/development/libraries/haskell/repr/default.nix b/pkgs/development/libraries/haskell/repr/default.nix
index ab953e46da6..bad1e93d6b9 100644
--- a/pkgs/development/libraries/haskell/repr/default.nix
+++ b/pkgs/development/libraries/haskell/repr/default.nix
@@ -12,5 +12,9 @@ cabal.mkDerivation (self: {
     description = "Render overloaded expressions to their textual representation";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

From 8d7110cb668f964d306ee74fbd0f071a39a4b625 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 25 Dec 2011 16:06:35 +0000
Subject: [PATCH 08/96] haskell-string-combinators: updated to version 0.6.0.2

svn path=/nixpkgs/trunk/; revision=31074
---
 .../libraries/haskell/string-combinators/default.nix          | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/haskell/string-combinators/default.nix b/pkgs/development/libraries/haskell/string-combinators/default.nix
index 62fadb1462a..3371c56ceb2 100644
--- a/pkgs/development/libraries/haskell/string-combinators/default.nix
+++ b/pkgs/development/libraries/haskell/string-combinators/default.nix
@@ -10,5 +10,9 @@ cabal.mkDerivation (self: {
     description = "Polymorphic functions to build and combine stringlike values";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

From 5968d4645bcc1f24d59ec4b4548a0ff54a8248bc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 25 Dec 2011 16:06:41 +0000
Subject: [PATCH 09/96] haskell-yesod-auth: updated to version 0.7.9

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

diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix
index ce9c3c29808..2ed7486eff4 100644
--- a/pkgs/development/libraries/haskell/yesod-auth/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-auth";
-  version = "0.7.8";
-  sha256 = "1v3mvb22g56frvwb82l73k7cqrl926hg133x5idl5q66fp8h94q0";
+  version = "0.7.9";
+  sha256 = "08vlj61y3czv0v8dnfdkyfww5sccia6j0fxnn1hxk44zghwhy214";
   buildDepends = [
     aeson authenticate blazeHtml controlMonadAttempt hamlet
     httpEnumerator mimeMail persistent persistentTemplate pureMD5

From 6dbd367227c1eaf8796242263e1120e59f3b4831 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 25 Dec 2011 16:06:47 +0000
Subject: [PATCH 10/96] haskell-yesod-json: updated to version 0.2.2.2

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

diff --git a/pkgs/development/libraries/haskell/yesod-json/default.nix b/pkgs/development/libraries/haskell/yesod-json/default.nix
index 167ead39dd5..cf65dc8993e 100644
--- a/pkgs/development/libraries/haskell/yesod-json/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-json/default.nix
@@ -1,13 +1,14 @@
-{ cabal, aeson, shakespeareJs, text, unorderedContainers, vector
-, yesodCore
+{ cabal, aeson, blazeBuilder, shakespeareJs, text
+, unorderedContainers, vector, yesodCore
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-json";
-  version = "0.2.2.1";
-  sha256 = "16l5ygj9xsg2lzw3mkn1kmq543n9w5z1g6lyl8nw5bblp66lfxq3";
+  version = "0.2.2.2";
+  sha256 = "0mhajy0hal9icwys63vcmlipl3gwm8bvv7xywwjydd86drqhz9ni";
   buildDepends = [
-    aeson shakespeareJs text unorderedContainers vector yesodCore
+    aeson blazeBuilder shakespeareJs text unorderedContainers vector
+    yesodCore
   ];
   meta = {
     homepage = "http://www.yesodweb.com/";

From 8755735a06639cf34d7cb3b12ccbac6fd444608f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 25 Dec 2011 16:18:34 +0000
Subject: [PATCH 11/96] haskell-cabal2nix: updated to version 1.23

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

diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index c8753ea367b..1b98d7821e5 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal2nix";
-  version = "1.21";
-  sha256 = "00gsayb7axxm8z9jrngckb7c666x1kibvln67g2rpchi6djg6wn7";
+  version = "1.23";
+  sha256 = "1rnvnzwb4n89hq4wpyq1h6x773r7y23clqj5slsfnas7j3alzz8c";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ hackageDb HTTP mtl nixosTypes regexPosix ];

From 50fb545705890faa4dc3d03eaa69332dc77c2759 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sun, 25 Dec 2011 16:22:36 +0000
Subject: [PATCH 12/96] qt48: make "gtkStyle = true" work

svn path=/nixpkgs/trunk/; revision=31078
---
 pkgs/development/libraries/qt-4.x/4.8/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index 8ef50777522..dfaf63e6725 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -85,7 +85,8 @@ stdenv.mkDerivation rec {
 
   # The following libraries are only used in plugins
   buildInputs = [ cups # Qt dlopen's libcups instead of linking to it
-    mysql postgresql sqlite libjpeg libmng libtiff icu ];
+    mysql postgresql sqlite libjpeg libmng libtiff icu ]
+    ++ stdenv.lib.optionals gtkStyle [ gtk gdk_pixbuf ];
 
   buildNativeInputs = [ perl pkgconfig which ];
 

From 94a638d1197b5bb4338b194f00986fb9e51d0137 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 25 Dec 2011 22:54:32 +0000
Subject: [PATCH 13/96] Updating digikam.

Now at least digikam now passes the configure stage. I've still not finished building it though.


svn path=/nixpkgs/trunk/; revision=31080
---
 pkgs/applications/graphics/digikam/default.nix  | 16 +++++++++++-----
 pkgs/applications/graphics/digikam/include.diff | 12 ------------
 2 files changed, 11 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/applications/graphics/digikam/include.diff

diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index 6d4431516f8..895453aae44 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -1,22 +1,28 @@
 { stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen,
 kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, kdeedu,
-liblqr1, lensfun, pkgconfig }:
+liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost,
+shared_desktop_ontologies, marble }:
 
 stdenv.mkDerivation rec {
-  name = "digikam-1.5.0";
+  name = "digikam-2.4.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/digikam/${name}.tar.bz2";
-    sha256 = "1vvzw132aw2c1z2v1zc3aqa99kvg501krr2law35ri12zkqjsvaz";
+    sha256 = "0fyyhc26syd1d1m8jqyg2i66hwd523mh419ln8y944jkrjj6gadc";
   };
 
   buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen
     lcms jasper libgphoto2 kdepimlibs gettext soprano kdeedu liblqr1 lensfun
-    pkgconfig ];
+    pkgconfig qjson libkdcraw opencv libkexiv2 libkipi boost shared_desktop_ontologies
+    marble ];
 
   KDEDIRS=kdeedu;
 
-  patches = [ ./include.diff ];
+  # 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;
+  '';
 
   meta = {
     description = "Photo Management Program";
diff --git a/pkgs/applications/graphics/digikam/include.diff b/pkgs/applications/graphics/digikam/include.diff
deleted file mode 100644
index 0762ce04d26..00000000000
--- a/pkgs/applications/graphics/digikam/include.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt b/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt
-index 9ee36cc..c6e5c00 100644
---- a/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt
-+++ b/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt
-@@ -18,6 +18,7 @@ IF(MARBLEWIDGET_SUPPORTS_PLUGINS)
- 
-     INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/libs/imageproperties/markerclusterholderplugin/
-                          ${CMAKE_BINARY_DIR}/libs/imageproperties/markerclusterholderplugin/
-+						 ${LIBMARBLEWIDGET_INCLUDE_DIR}/..
-                          ${QT_INCLUDE_DIR}
-                        )
- 

From 0efe938292e657efdd335f9ff09f6e35e85ff409 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 26 Dec 2011 04:20:15 +0000
Subject: [PATCH 14/96] A newer rc

svn path=/nixpkgs/trunk/; revision=31081
---
 pkgs/os-specific/linux/kernel/linux-3.2.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
index 576ef0941f7..8a4fa9648b1 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix
@@ -214,9 +214,9 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.2-rc6";
+    version = "3.2-rc7";
 
-    modDirVersion = "3.2.0-rc6";
+    modDirVersion = "3.2.0-rc7";
 
     preConfigure = ''
       substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
@@ -225,7 +225,7 @@ import ./generic.nix (
     src = fetchurl {
       #url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2";
       url = "mirror://kernel/linux/kernel/v3.0/testing/linux-${version}.tar.bz2";
-      sha256 = "18wdp3r3xvq12ddv7c7z0h0i8zsm3wrahl83s6jqbixrw4aq5zbd";
+      sha256 = "0phakj1c97n2fdz9lh5gmpg6c5g45z2xpgrz3q2z2y9w9dgk3mqd";
     };
 
     config = configWithPlatform stdenv.platform;

From 331d4d13da215ed4063141d9d3b11fd1db3def69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 26 Dec 2011 10:13:55 +0000
Subject: [PATCH 15/96] Trying to make digikam build with boost 1.47
 (http://trac.macports.org/ticket/32524), as it fails with 1.48.

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0c9e92e7c9a..428dd041588 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8040,7 +8040,9 @@ let
 
       bluedevil = callPackage ../tools/bluetooth/bluedevil { };
 
-      digikam = callPackage ../applications/graphics/digikam { };
+      digikam = callPackage ../applications/graphics/digikam {
+        boost = boost147;
+      };
 
       k3b = callPackage ../applications/misc/k3b { };
 

From 70b696e83e36d08b7a88ca5fd968b160a507e3f8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Dec 2011 15:35:30 +0000
Subject: [PATCH 16/96] haskell-HTTP: added version 4000.2.2

svn path=/nixpkgs/trunk/; revision=31083
---
 .../libraries/haskell/HTTP/4000.2.2.nix        | 18 ++++++++++++++++++
 pkgs/top-level/haskell-packages.nix            |  5 +++--
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/HTTP/4000.2.2.nix

diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix
new file mode 100644
index 00000000000..082c3ddc3ac
--- /dev/null
+++ b/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix
@@ -0,0 +1,18 @@
+{ cabal, mtl, network, parsec }:
+
+cabal.mkDerivation (self: {
+  pname = "HTTP";
+  version = "4000.2.2";
+  sha256 = "0qrr9wdj25sdfxifppmw0w14g8skpgf42ic4iqcqylxxzfa8v7vh";
+  buildDepends = [ mtl network parsec ];
+  meta = {
+    homepage = "https://github.com/haskell/HTTP";
+    description = "A library for client-side HTTP";
+    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 462d9ca594e..0a844a5a167 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -152,7 +152,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     syb          = self.syb_0_3_6; # 7.2 ok, 7.3 ok
     xhtml        = self.xhtml_3000_2_0_1; # 7.2 ok, 7.3 ok
     zlib         = self.zlib_0_5_3_1; # 7.2 ok, 7.3 ok
-    HTTP         = self.HTTP_4000_2_1; # 7.2 ok, 7.3 ok
+    HTTP         = self.HTTP_4000_2_2; # 7.2 ok, 7.3 ok
     deepseq      = self.deepseq_1_1_0_2; # 7.2 ok, 7.3 ok
     text         = self.text_0_11_1_12; # 7.2 ok, 7.3 ok
     transformers = self.transformers_0_2_2_0; # 7.2 ok, 7.3 ok
@@ -759,7 +759,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   HTTP_4000_1_1 = callPackage ../development/libraries/haskell/HTTP/4000.1.1.nix {};
   HTTP_4000_1_2 = callPackage ../development/libraries/haskell/HTTP/4000.1.2.nix {};
   HTTP_4000_2_1 = callPackage ../development/libraries/haskell/HTTP/4000.2.1.nix {};
-  HTTP = self.HTTP_4000_2_1;
+  HTTP_4000_2_2 = callPackage ../development/libraries/haskell/HTTP/4000.2.2.nix {};
+  HTTP = self.HTTP_4000_2_2;
 
   hackageDb = callPackage ../development/libraries/haskell/hackage-db {};
 

From e4f3dcda83f82e5713c9a144afa059bfa6912d99 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Dec 2011 15:35:33 +0000
Subject: [PATCH 17/96] haskell-byteorder: added version 1.0.3

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

diff --git a/pkgs/development/libraries/haskell/byteorder/default.nix b/pkgs/development/libraries/haskell/byteorder/default.nix
new file mode 100644
index 00000000000..e709a12ce8b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/byteorder/default.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "byteorder";
+  version = "1.0.3";
+  sha256 = "056jb47r4pkimi6z2z49prnsmjnhnijk57zm0divl1k55igi5way";
+  meta = {
+    homepage = "http://community.haskell.org/~aslatter/code/byteorder";
+    description = "Exposes the native endianness or byte ordering of the system";
+    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 0a844a5a167..24b76428f8d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -481,6 +481,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   bson = callPackage ../development/libraries/haskell/bson {};
 
+  byteorder = callPackage ../development/libraries/haskell/byteorder {};
+
   bytestringNums = callPackage ../development/libraries/haskell/bytestring-nums {};
 
   bytestringLexing = callPackage ../development/libraries/haskell/bytestring-lexing {};

From 2d972e96ad225842bddf36bfea5d7a66119e0c48 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Dec 2011 15:35:37 +0000
Subject: [PATCH 18/96] haskell-fast-logger: added version 0.0.1

svn path=/nixpkgs/trunk/; revision=31085
---
 .../libraries/haskell/fast-logger/default.nix   | 17 +++++++++++++++++
 pkgs/top-level/haskell-packages.nix             |  2 ++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/fast-logger/default.nix

diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix
new file mode 100644
index 00000000000..68bc8ca6005
--- /dev/null
+++ b/pkgs/development/libraries/haskell/fast-logger/default.nix
@@ -0,0 +1,17 @@
+{ cabal, blazeBuilder }:
+
+cabal.mkDerivation (self: {
+  pname = "fast-logger";
+  version = "0.0.1";
+  sha256 = "19ff2dhkh62i1ljsl90wnsblzk30dz0yx4kw5gk1hb22md7hakim";
+  buildDepends = [ blazeBuilder ];
+  meta = {
+    description = "A fast logging system";
+    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 24b76428f8d..8647faeedfa 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -635,6 +635,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   failure = callPackage ../development/libraries/haskell/failure {};
 
+  fastLogger = callPackage ../development/libraries/haskell/fast-logger {};
+
   fclabels = callPackage ../development/libraries/haskell/fclabels {};
 
   funcmp = callPackage ../development/libraries/haskell/funcmp {};

From 5aacd74bf82d970ac3c9740062865e646ddaa6d7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Dec 2011 15:35:42 +0000
Subject: [PATCH 19/96] haskell-wai-logger: added version 0.1.1

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

diff --git a/pkgs/development/libraries/haskell/wai-logger/default.nix b/pkgs/development/libraries/haskell/wai-logger/default.nix
new file mode 100644
index 00000000000..d992ff424da
--- /dev/null
+++ b/pkgs/development/libraries/haskell/wai-logger/default.nix
@@ -0,0 +1,18 @@
+{ cabal, blazeBuilder, byteorder, caseInsensitive, fastLogger
+, httpTypes, network, time, wai
+}:
+
+cabal.mkDerivation (self: {
+  pname = "wai-logger";
+  version = "0.1.1";
+  sha256 = "02354n4j1wj2n2vn4hza7ng2gqbf6ibvr4gfnv7maisivgqjy694";
+  buildDepends = [
+    blazeBuilder byteorder caseInsensitive fastLogger httpTypes network
+    time wai
+  ];
+  meta = {
+    description = "A logging system for WAI";
+    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 8647faeedfa..b81b933d6bd 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1347,6 +1347,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   waiExtra = callPackage ../development/libraries/haskell/wai-extra {};
 
+  waiLogger = callPackage ../development/libraries/haskell/wai-logger {};
+
   warp = callPackage ../development/libraries/haskell/warp {};
 
   WebBits_1_0 = callPackage ../development/libraries/haskell/WebBits/1.0.nix {

From 481a96b2ed6a7c98cda599f44ee688632e8b4e05 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Dec 2011 15:35:48 +0000
Subject: [PATCH 20/96] haskell-shakespeare-i18n: added version 0.0.0

svn path=/nixpkgs/trunk/; revision=31087
---
 .../libraries/haskell/shakespeare-i18n/default.nix | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/shakespeare-i18n/default.nix

diff --git a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
new file mode 100644
index 00000000000..39558319ea5
--- /dev/null
+++ b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
@@ -0,0 +1,14 @@
+{ cabal, parsec, shakespeare, text }:
+
+cabal.mkDerivation (self: {
+  pname = "shakespeare-i18n";
+  version = "0.0.0";
+  sha256 = "1zyr63ncd92c30afh0sf4lq7p253jd3gjvcv65f7i0njqpc1lg9y";
+  buildDepends = [ parsec shakespeare text ];
+  meta = {
+    homepage = "http://www.yesodweb.com/book/i18n";
+    description = "A type-based approach to internationalization";
+    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 b81b933d6bd..8cc83cf4853 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1196,6 +1196,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   shakespeareCss = callPackage ../development/libraries/haskell/shakespeare-css {};
 
+  shakespeareI18n = callPackage ../development/libraries/haskell/shakespeare-i18n {};
+
   shakespeareJs = callPackage ../development/libraries/haskell/shakespeare-js {};
 
   shakespeareText = callPackage ../development/libraries/haskell/shakespeare-text {};

From 8cc81a726da54caabbbc95c2ce3ae94a8d337cdc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Dec 2011 15:35:53 +0000
Subject: [PATCH 21/96] haskell-hamlet: updated to version 0.10.6

svn path=/nixpkgs/trunk/; revision=31088
---
 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 15d219830a4..98132edfdb2 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.5";
-  sha256 = "0kizy0qij6zbayrbb3gr4iqys1551ax5c8w5lvh6chg3ypl1i1m3";
+  version = "0.10.6";
+  sha256 = "0ai00jwbq5nnrgcfhz3sxm2jm2jvz7qbj56lr0wlc3z818a22ams";
   buildDepends = [
     blazeBuilder blazeHtml failure parsec shakespeare text
   ];

From c551acaec60ac97626884f2a91228a9525f2e2cc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Dec 2011 15:35:57 +0000
Subject: [PATCH 22/96] haskell-hmatrix: updated to version 0.13.0.0

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

diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix
index 84866e026fd..c60c7dc1591 100644
--- a/pkgs/development/libraries/haskell/hmatrix/default.nix
+++ b/pkgs/development/libraries/haskell/hmatrix/default.nix
@@ -1,14 +1,10 @@
-{ cabal, binary, blas, gsl, HUnit, liblapack, QuickCheck, random
-, storableComplex, vector
-}:
+{ cabal, binary, blas, gsl, liblapack, storableComplex, vector }:
 
 cabal.mkDerivation (self: {
   pname = "hmatrix";
-  version = "0.12.0.2";
-  sha256 = "08i3vi0vs6wpyvjsjpqrxp8lw0f89cgzwv1j27y7i2yfp4xmrw8d";
-  buildDepends = [
-    binary HUnit QuickCheck random storableComplex vector
-  ];
+  version = "0.13.0.0";
+  sha256 = "1jlibgg2nrgajw2ny0dq88f5mhrffi7kda9bb8sp9szf4a0kd4wd";
+  buildDepends = [ binary storableComplex vector ];
   extraLibraries = [ blas gsl liblapack ];
   configureFlags = "-fvector";
   meta = {

From 7c5c365003867f45fcc1817caef169a6a0382a92 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Dec 2011 15:36:02 +0000
Subject: [PATCH 23/96] haskell-http-enumerator: updated to version 0.7.2.1

svn path=/nixpkgs/trunk/; revision=31090
---
 .../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 14109cd1c11..2a285965f9c 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";
-  sha256 = "096rwnfm8bqn0pq9cs4i2kr1ljmawk2l17afw301zqfg79q97crc";
+  version = "0.7.2.1";
+  sha256 = "1qbarxi9268yzb3phnfgvnszbkzs6r63gqzy63h69kpi0k0wl84i";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 4a0e29f53cb6f43a8b2fe2162a6c3e836004356b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Dec 2011 15:36:07 +0000
Subject: [PATCH 24/96] haskell-multirec: updated to version 0.7.1

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

diff --git a/pkgs/development/libraries/haskell/multirec/default.nix b/pkgs/development/libraries/haskell/multirec/default.nix
index e5a1b2a85a9..c001783a13b 100644
--- a/pkgs/development/libraries/haskell/multirec/default.nix
+++ b/pkgs/development/libraries/haskell/multirec/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "multirec";
-  version = "0.7";
-  sha256 = "1n196qqggfnk8fa1x296rdbyb77a6ykhy01z8x2glgdimzpxsiay";
+  version = "0.7.1";
+  sha256 = "1a3snlv6lr9mi4nrl4cyc5ilk6flbdn0ck2sqla6dyb2zdlgf5ph";
   noHaddock = true;
   meta = {
     homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec";

From 9ccf9b3674a7c12480190c5bd71e15e32ed17157 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Dec 2011 15:36:12 +0000
Subject: [PATCH 25/96] haskell-regular: updated to version 0.3.4

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

diff --git a/pkgs/development/libraries/haskell/regular/default.nix b/pkgs/development/libraries/haskell/regular/default.nix
index 4b4e5458df2..0085d866567 100644
--- a/pkgs/development/libraries/haskell/regular/default.nix
+++ b/pkgs/development/libraries/haskell/regular/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "regular";
-  version = "0.3.3";
-  sha256 = "1xlpp60nvdiqkcn66dnpww72hcawyc1w7cd9zk9kk88x574kqzf7";
+  version = "0.3.4";
+  sha256 = "10gfid99xcqv3i9rp4x8hykk91qq3h7b7lxzsl7ii58vmifa4kgq";
   meta = {
     description = "Generic programming library for regular datatypes";
     license = self.stdenv.lib.licenses.bsd3;

From ba991ec10078783874f94522a680a57da43bbbac Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Dec 2011 15:36:18 +0000
Subject: [PATCH 26/96] haskell-shakespeare-css: updated to version 0.10.5

svn path=/nixpkgs/trunk/; revision=31093
---
 .../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 1cef979c01e..b0d70a8fbfd 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.4";
-  sha256 = "006ndbhzxkr2zw6gs13bm5pfq7i301bbg6nhagm3h9nnzp155snz";
+  version = "0.10.5";
+  sha256 = "1cnv9qgp1llrrvcqp64mq207wdsxpqza9yq5nzlsgrh6qlzvm4hs";
   buildDepends = [ parsec shakespeare text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/templates";

From 381ebfe9944f62a05ce1f3206cdc3f18f10610fa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Dec 2011 15:36:23 +0000
Subject: [PATCH 27/96] haskell-shakespeare-js: updated to version 0.10.4

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

diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
index a4a20c98b19..d127725a73e 100644
--- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-js";
-  version = "0.10.3";
-  sha256 = "1xz4jf91dfz60dji31d3hyy1k01hk0v41pb8qmi598jylk9iz1r2";
+  version = "0.10.4";
+  sha256 = "15mh93d38qpqnrgxvaq659zwl2mks9xhkynhlpjrf8zb234knxjw";
   buildDepends = [ shakespeare text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/templates";

From d9c27a43871b3ff887715dafad6832272fc98db5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Dec 2011 15:36:27 +0000
Subject: [PATCH 28/96] haskell-simple-sendfile: updated to version 0.2.0

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

diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix
index f66eb3bb591..d4f814b2111 100644
--- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix
+++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "simple-sendfile";
-  version = "0.1.3";
-  sha256 = "0n78d6bn2hsm3p6r2kc2cr5nf9v1vqs6v5i9x71f910r3kk2grm8";
+  version = "0.2.0";
+  sha256 = "1rsbmlnks4q8gsfzwqwcj901b8hzcrfb85z7wy3szj4h0axw4264";
   buildDepends = [ network ];
   meta = {
     description = "Cross platform library for the sendfile system call";

From 51254f668a0183fe73b80952bc3cf056589c8ae8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Dec 2011 15:36:32 +0000
Subject: [PATCH 29/96] haskell-wai-extra: updated to version 0.4.6

svn path=/nixpkgs/trunk/; revision=31096
---
 .../libraries/haskell/wai-extra/default.nix            | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix
index a0a736deeef..a2840ad66ce 100644
--- a/pkgs/development/libraries/haskell/wai-extra/default.nix
+++ b/pkgs/development/libraries/haskell/wai-extra/default.nix
@@ -1,15 +1,15 @@
 { cabal, blazeBuilder, blazeBuilderEnumerator, caseInsensitive
-, dataDefault, enumerator, httpTypes, network, text, time
-, transformers, wai, zlibBindings, zlibEnum
+, dataDefault, enumerator, fastLogger, httpTypes, network, text
+, time, transformers, wai, zlibBindings, zlibEnum
 }:
 
 cabal.mkDerivation (self: {
   pname = "wai-extra";
-  version = "0.4.5.2";
-  sha256 = "05gq22il1jnvw5rcqr6gassxj29f8l4536zm6bpgk1kff8cxa3g1";
+  version = "0.4.6";
+  sha256 = "1wpdfzw5qzbd33iypgppp4822vn7vhja6y26dnkb17n08r83vvhv";
   buildDepends = [
     blazeBuilder blazeBuilderEnumerator caseInsensitive dataDefault
-    enumerator httpTypes network text time transformers wai
+    enumerator fastLogger httpTypes network text time transformers wai
     zlibBindings zlibEnum
   ];
   meta = {

From d0dc6f0ba8a1ef1c99413eb563e99cff46ce81a1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Dec 2011 15:36:37 +0000
Subject: [PATCH 30/96] haskell-warp: updated to version 0.4.6.3

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

diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
index 5ff96051307..95caf840ad0 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "0.4.6.2";
-  sha256 = "1ja9w3440j69w7638wrjd6067svqcsaqdl1zklr6jx20zyadww94";
+  version = "0.4.6.3";
+  sha256 = "1gfjhp1s42ynpi3kh8fr6fp5nwirxz0gasr7zs7q2qwwvlq9pzm6";
   buildDepends = [
     blazeBuilder blazeBuilderEnumerator caseInsensitive enumerator
     httpTypes network simpleSendfile transformers unixCompat wai

From 8923112c1d9d0b327b29150486d4a9560d3ade5f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Dec 2011 15:36:42 +0000
Subject: [PATCH 31/96] haskell-yesod-core: updated to version 0.9.4

svn path=/nixpkgs/trunk/; revision=31098
---
 .../libraries/haskell/yesod-core/default.nix  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index c894a5138e6..4e81d54979b 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -1,21 +1,21 @@
 { cabal, aeson, blazeBuilder, blazeHtml, caseInsensitive, cereal
 , clientsession, cookie, dataObject, dataObjectYaml, enumerator
-, failure, hamlet, httpTypes, monadControl, parsec, pathPieces
-, random, shakespeare, shakespeareCss, shakespeareJs
-, strictConcurrency, text, time, transformers, transformersBase
-, vector, wai, waiExtra
+, failure, fastLogger, hamlet, httpTypes, monadControl, parsec
+, pathPieces, random, shakespeare, shakespeareCss, shakespeareI18n
+, shakespeareJs, text, time, transformers, transformersBase, vector
+, wai, waiExtra, waiLogger
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "0.9.3.6";
-  sha256 = "00h1ylrr5wrid9vn3jhspibprx0175j9rcwdb1hd7ya5gwmzlhjs";
+  version = "0.9.4";
+  sha256 = "1m9cxm3pngg4pq7j3p1sh7lrjp5gslnn6zcimc5ln8yldxx01c6g";
   buildDepends = [
     aeson blazeBuilder blazeHtml caseInsensitive cereal clientsession
-    cookie dataObject dataObjectYaml enumerator failure hamlet
-    httpTypes monadControl parsec pathPieces random shakespeare
-    shakespeareCss shakespeareJs strictConcurrency text time
-    transformers transformersBase vector wai waiExtra
+    cookie dataObject dataObjectYaml enumerator failure fastLogger
+    hamlet httpTypes monadControl parsec pathPieces random shakespeare
+    shakespeareCss shakespeareI18n shakespeareJs text time transformers
+    transformersBase vector wai waiExtra waiLogger
   ];
   meta = {
     homepage = "http://www.yesodweb.com/";

From aa1be5c36f1e2336b55eccca80f9ff4cb2a0d821 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Dec 2011 15:36:46 +0000
Subject: [PATCH 32/96] haskell-yesod-form: updated to version 0.3.4.2

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

diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix
index c6ce1d024c1..2f384e2e878 100644
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-form";
-  version = "0.3.4.1";
-  sha256 = "0khkc4bpqfgfs0zl753x4l5qpkfr8hv0kwzz6qpry5skxa326q6i";
+  version = "0.3.4.2";
+  sha256 = "1ahkbycxvjh1yvxfbf8wg6mlklmwm8hmy15x0b07g2xq7h1jmc5i";
   buildDepends = [
     blazeBuilder blazeHtml dataDefault emailValidate hamlet network
     persistent shakespeareCss shakespeareJs text time transformers wai

From 1592e39ced5a3735708705201308a43d45ca0919 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Dec 2011 15:36:52 +0000
Subject: [PATCH 33/96] haskell-yesod-json: updated to version 0.2.3

svn path=/nixpkgs/trunk/; revision=31100
---
 .../libraries/haskell/yesod-json/default.nix         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-json/default.nix b/pkgs/development/libraries/haskell/yesod-json/default.nix
index cf65dc8993e..379d7319b12 100644
--- a/pkgs/development/libraries/haskell/yesod-json/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-json/default.nix
@@ -1,14 +1,14 @@
-{ cabal, aeson, blazeBuilder, shakespeareJs, text
-, unorderedContainers, vector, yesodCore
+{ cabal, aeson, attoparsecEnumerator, blazeBuilder, shakespeareJs
+, text, transformers, unorderedContainers, vector, yesodCore
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-json";
-  version = "0.2.2.2";
-  sha256 = "0mhajy0hal9icwys63vcmlipl3gwm8bvv7xywwjydd86drqhz9ni";
+  version = "0.2.3";
+  sha256 = "0bd75zzxqrarqk8b2v515jv0zbi5x27fmb9cbj3g57l9ig57lqy5";
   buildDepends = [
-    aeson blazeBuilder shakespeareJs text unorderedContainers vector
-    yesodCore
+    aeson attoparsecEnumerator blazeBuilder shakespeareJs text
+    transformers unorderedContainers vector yesodCore
   ];
   meta = {
     homepage = "http://www.yesodweb.com/";

From 3553c0f867823014b365968ede736d9c6778f761 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Dec 2011 15:36:58 +0000
Subject: [PATCH 34/96] haskell-yesod-static: updated to version 0.3.2.1

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

diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix
index 65cb5493181..46f989c53a5 100644
--- a/pkgs/development/libraries/haskell/yesod-static/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-static/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-static";
-  version = "0.3.2";
-  sha256 = "0m0fws0bwhf1cyw1a3cg85mhdjr9pv35a39671jsqkkvmmxiixlf";
+  version = "0.3.2.1";
+  sha256 = "0gggavj5bxb12axlfl8kmqizgg55nmcrr6z5za60n3bp70sq4vn4";
   buildDepends = [
     base64Bytestring cereal enumerator fileEmbed httpTypes pureMD5 text
     transformers unixCompat wai waiAppStatic yesodCore

From 42a4cda59df33c8ffc70f937adb26200deddd7f3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Dec 2011 15:37:02 +0000
Subject: [PATCH 35/96] haskell-yesod: updated to version 0.9.4

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

diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix
index ecd7dc012aa..7af910a903a 100644
--- a/pkgs/development/libraries/haskell/yesod/default.nix
+++ b/pkgs/development/libraries/haskell/yesod/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod";
-  version = "0.9.3.4";
-  sha256 = "1iw6qf1dywss8w4ig3dr04cyi01jq9frvmkbqgj5jq8v11y55x6v";
+  version = "0.9.4";
+  sha256 = "0kb25ilx0hf51x8i6kr94lhald4bfy08c1wrx3k9gnqgv2dk6vlp";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 0def824532c8e4a2ea894a4de95b37d1acd5fc12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 26 Dec 2011 17:27:30 +0000
Subject: [PATCH 36/96] Updating webalizer.

svn path=/nixpkgs/trunk/; revision=31105
---
 pkgs/tools/networking/webalizer/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/webalizer/default.nix b/pkgs/tools/networking/webalizer/default.nix
index 7645bff9e55..efa29e81407 100644
--- a/pkgs/tools/networking/webalizer/default.nix
+++ b/pkgs/tools/networking/webalizer/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, zlib, libpng, gd, geoip, db4}:
 
 stdenv.mkDerivation {
-  name = "webalizer-2.21-02";
+  name = "webalizer-2.23-05";
 
   src = fetchurl {
-    url = ftp://ftp.mrunix.net/pub/webalizer/webalizer-2.21-02-src.tgz;
-    sha256 = "0spfsqxhgfnmd2yyhrmrj8chjilr8qbx1g2n3kn44k9gd4y3jfc7";
+    url = ftp://ftp.mrunix.net/pub/webalizer/webalizer-2.23-05-src.tar.bz2;
+    sha256 = "0nl88y57a7gawfragj3viiigfkh5sgivfb4n0k89wzcjw278pj5g";
   };
 
   preConfigure =

From 1d7bc50e9ac5ed00db44e4f3387fdcd8de892e5e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Dec 2011 20:24:59 +0000
Subject: [PATCH 37/96] emacs-modes/magit: updated to 1.1.0.0

svn path=/nixpkgs/trunk/; revision=31106
---
 .../editors/emacs-modes/magit/default.nix             | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/magit/default.nix b/pkgs/applications/editors/emacs-modes/magit/default.nix
index 0746dd5b3be..1af31c2ba5c 100644
--- a/pkgs/applications/editors/emacs-modes/magit/default.nix
+++ b/pkgs/applications/editors/emacs-modes/magit/default.nix
@@ -1,22 +1,19 @@
 { stdenv, fetchurl, emacs, texinfo }:
 
 let
-  version = "1.0.0";
+  version = "1.1.0";
 in
 stdenv.mkDerivation {
   name = "magit-${version}";
 
   src = fetchurl {
     url = "http://github.com/downloads/magit/magit/magit-${version}.tar.gz";
-    sha256 = "1hfdl90d96zin31v8x4p8zx5f0x0i5i9hccysx6q3prdgw9r6wzq";
+    sha256 = "8e147e1f2e69938232f859daf712515b46aa367d7b7d90b42538e083f52a72b4";
   };
 
   buildInputs = [emacs texinfo];
 
-  configurePhase =
-    '' sed -i Makefile \
-           -e "s|^PREFIX=.*$|PREFIX=$out|g ; s|/etc/emacs/|$out/etc/emacs/|"
-    '';
+  configurePhase = "makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc )";
 
   meta = {
     description = "Magit, an Emacs interface to Git";
@@ -34,7 +31,7 @@ stdenv.mkDerivation {
     '';
 
     license = "GPLv3+";
-    homepage = "http://github.com/philjackson/magit";
+    homepage = "https://github.com/magit/magit";
     platforms = stdenv.lib.platforms.all;
     maintainers = with stdenv.lib.maintainers; [ simons ludo ];
   };

From 2ae07a853fbd2664b260f9353621983140a40886 Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@gmail.com>
Date: Tue, 27 Dec 2011 01:48:57 +0000
Subject: [PATCH 38/96] Clean version 2.4

svn path=/nixpkgs/trunk/; revision=31107
---
 pkgs/development/compilers/clean/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/clean/default.nix b/pkgs/development/compilers/clean/default.nix
index fa61f8bfc75..bd051a95699 100644
--- a/pkgs/development/compilers/clean/default.nix
+++ b/pkgs/development/compilers/clean/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "clean-2.3";
+  name = "clean-2.4";
 
   src =
     if stdenv.system == "i686-linux" then (fetchurl {
-      url = "http://clean.cs.ru.nl/download/Clean23/linux/clean2.3_boot.tar.gz";
-      sha256 = "0rrjpqdbqwbx7n8v35wi3wpm6lpv9zd1n5q50byb2h0ljqw31j9h";
+      url = "http://clean.cs.ru.nl/download/Clean24/linux/clean2.4_boot.tar.gz";
+      sha256 = "1w8vvmkwzq8g51639r62apcy75sj69nm08082a34xvqm9ymfgkq5";
     })
     else if stdenv.system == "x86_64-linux" then (fetchurl {
-        url = "http://clean.cs.ru.nl/download/Clean23/linux/clean2.3_64_boot.tar.gz";
-        sha256 = "0bvkaiwcaa1p6h1bl4bgnia1yd0j8nq6sb1yiwar74y2m1wwmjqj";
+        url = "http://clean.cs.ru.nl/download/Clean24/linux/clean2.4_64_boot.tar.gz";
+        sha256 = "08gsa1pjl5wyzh4ah8ccfx8a7mdcn6ycsn1lzkrr9adygv1gmm7r";
     })
     else throw "Architecture not supported";
 

From a8785e7b7237c8a9789f40c21ae262622d56d075 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 27 Dec 2011 12:56:07 +0000
Subject: [PATCH 39/96] use simple version compare in stead of timestamps to
 determine newer package

svn path=/nixpkgs/trunk/; revision=31108
---
 pkgs/build-support/vm/rpm/rpm-closure.pl | 42 +++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/vm/rpm/rpm-closure.pl b/pkgs/build-support/vm/rpm/rpm-closure.pl
index 5efc162784a..2ef59dcbdef 100644
--- a/pkgs/build-support/vm/rpm/rpm-closure.pl
+++ b/pkgs/build-support/vm/rpm/rpm-closure.pl
@@ -1,5 +1,6 @@
 use strict;
 use XML::Simple;
+use List::Util qw(min);
 
 my @packagesFiles = ();
 my @urlPrefixes = ();
@@ -13,6 +14,44 @@ while(-f $ARGV[0]) {
     push(@urlPrefixes, $urlPrefix);
 }
 
+
+sub rpmvercmp {
+    my ($version1, $version2) = @_;
+    my @vercmps1 = split /\./, $version1;
+    my @vercmps2 = split /\./, $version2;
+    my $l1 = scalar(@vercmps1);
+    my $l2 = scalar(@vercmps2);
+    my $l = min($l1, $l2);
+
+    for(my $i=0; $i<$l; $i++) {
+        my $v1 = $vercmps1[$i];
+        my $v2 = $vercmps2[$i];
+
+        if($v1 =~ /^[0-9]*$/ && $v2 =~ /^[0-9]*$/) {
+	    if ( int($v1) > int($v2) ) {
+		return 1;
+	    }
+	    elsif ( int($v1) < int($v2) ) {
+		return -1;
+	    }
+	} else {
+	    if ( $v1 gt $v2 ) {
+		return 1;
+	    }
+	    elsif ( $v1 lt $v2 ) {
+		return -1;
+	    }
+	}
+    }
+    if($l1 == $l2) {
+        return 0;
+    } elsif ($l1 > $l2) {
+        return 1;
+    } elsif ($l1 < $l2) {
+        return -1;
+    }
+}
+
 my @toplevelPkgs = @ARGV;
 
 my @archs = split ' ', ($ENV{'archs'} or "");
@@ -36,7 +75,8 @@ for (my $i = 0; $i < scalar(@packagesFiles); $i++) {
         if (defined $pkgs{$pkg->{name}}) {
             my $earlierPkg = $pkgs{$pkg->{name}};
             print STDERR "WARNING: duplicate occurrence of package $pkg->{name}\n";
-            if ($earlierPkg->{'time'}->{file} <= $pkg->{'time'}->{file}) {
+            #   <version epoch="0" ver="1.28.0" rel="2.el6"/>
+            if (rpmvercmp($pkg->{'version'}->{ver}, $earlierPkg->{'version'}->{ver}) >= 0) {
                 print STDERR "WARNING: replaced package $pkg->{name} with newer one\n";
                 $pkg->{urlPrefix} = $urlPrefixes[$i];
                 $pkgs{$pkg->{name}} = $pkg;

From d0543a8af1eeab6f3e897550c43df4800af75e8a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 27 Dec 2011 17:49:31 +0000
Subject: [PATCH 40/96] Added missing meta.maintainers section.

svn path=/nixpkgs/trunk/; revision=31110
---
 pkgs/development/libraries/haskell/byteorder/default.nix      | 4 ++++
 .../libraries/haskell/shakespeare-i18n/default.nix            | 4 ++++
 pkgs/development/libraries/haskell/wai-logger/default.nix     | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/pkgs/development/libraries/haskell/byteorder/default.nix b/pkgs/development/libraries/haskell/byteorder/default.nix
index e709a12ce8b..d3af223418b 100644
--- a/pkgs/development/libraries/haskell/byteorder/default.nix
+++ b/pkgs/development/libraries/haskell/byteorder/default.nix
@@ -9,5 +9,9 @@ cabal.mkDerivation (self: {
     description = "Exposes the native endianness or byte ordering of the system";
     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/development/libraries/haskell/shakespeare-i18n/default.nix b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
index 39558319ea5..1a1e4f1d20b 100644
--- a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
@@ -10,5 +10,9 @@ cabal.mkDerivation (self: {
     description = "A type-based approach to internationalization";
     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/development/libraries/haskell/wai-logger/default.nix b/pkgs/development/libraries/haskell/wai-logger/default.nix
index d992ff424da..e38f4c853f1 100644
--- a/pkgs/development/libraries/haskell/wai-logger/default.nix
+++ b/pkgs/development/libraries/haskell/wai-logger/default.nix
@@ -14,5 +14,9 @@ cabal.mkDerivation (self: {
     description = "A logging system for WAI";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

From 577b55a0dee3e4d8cf40731f0ae7fb2760f87c2b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 27 Dec 2011 17:49:35 +0000
Subject: [PATCH 41/96] haskell-yesod: updated to version 0.9.4.1

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

diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix
index 7af910a903a..ab0bc9f89dd 100644
--- a/pkgs/development/libraries/haskell/yesod/default.nix
+++ b/pkgs/development/libraries/haskell/yesod/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod";
-  version = "0.9.4";
-  sha256 = "0kb25ilx0hf51x8i6kr94lhald4bfy08c1wrx3k9gnqgv2dk6vlp";
+  version = "0.9.4.1";
+  sha256 = "0dcd4m91liash046i0qaq51s447sl4fn55gsg7mi807lffik436q";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From c6814a8951317c1ec9e14ce4c257e89e70b0379c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 27 Dec 2011 17:49:40 +0000
Subject: [PATCH 42/96] haskell-zipper: updated to version 0.4.1

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

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

From 9c87cccee95916db5c88f22cc02ccd58b0cbcad3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 27 Dec 2011 19:33:36 +0000
Subject: [PATCH 43/96] Adding cgroups to the sheevaplug kernel.

svn path=/nixpkgs/trunk/; revision=31114
---
 pkgs/top-level/platforms.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix
index 911dff97d0c..730629731f3 100644
--- a/pkgs/top-level/platforms.nix
+++ b/pkgs/top-level/platforms.nix
@@ -83,6 +83,9 @@ rec {
         BLK_DEV_CMD640_ENHANCED n
 
         FUSE_FS m
+
+        # nixos mounts some cgroup
+        CGROUPS y
       '';
     kernelTarget = "uImage";
     uboot = "sheevaplug";

From 58af7eb6bf286cf508198ce6864c5e5eaff1e20c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 27 Dec 2011 21:35:50 +0000
Subject: [PATCH 44/96] Adding smbldap-tools. And some CPAN packages as bonus.

svn path=/nixpkgs/trunk/; revision=31118
---
 .../tools/networking/smbldaptools/default.nix | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 pkgs/top-level/perl-packages.nix              | 25 +++++++++++++++
 3 files changed, 60 insertions(+)
 create mode 100644 pkgs/tools/networking/smbldaptools/default.nix

diff --git a/pkgs/tools/networking/smbldaptools/default.nix b/pkgs/tools/networking/smbldaptools/default.nix
new file mode 100644
index 00000000000..962799117a0
--- /dev/null
+++ b/pkgs/tools/networking/smbldaptools/default.nix
@@ -0,0 +1,31 @@
+{stdenv, fetchurl, perl, NetLDAP, makeWrapper, CryptSmbHash, DigestSHA1}:
+
+let
+  version = "0.9.7";
+in
+stdenv.mkDerivation {
+  name = "smbldap-tools-${version}";
+  src = fetchurl {
+    url = "http://download.gna.org/smbldap-tools/sources/${version}/smbldap-tools-${version}.tar.gz";
+    sha256 = "0y1k2j5qjxy66yvl36adbp9m1brapiz9ycaisdyy6093xvw1nh7j";
+  };
+
+  buildInputs = [ perl NetLDAP makeWrapper CryptSmbHash DigestSHA1 ];
+
+  preConfigure = ''
+    export configureFlags="$configureFlags --with-perl-libdir=$out/lib/perl5/site_perl"
+  '';
+
+  postInstall = ''
+    for i in $out/sbin/*; do
+      wrapProgram $i \
+        --prefix PERL5LIB : $PERL5LIB:$out/lib/perl5/site_perl
+    done
+  '';
+
+  meta = {
+    homepage = http://gna.org/projects/smbldap-tools/;
+    description = "SAMBA LDAP tools";
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 428dd041588..44d44f080e0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1345,6 +1345,10 @@ let
 
   smartmontools = callPackage ../tools/system/smartmontools { };
 
+  smbldaptools = callPackage ../tools/networking/smbldaptools {
+    inherit (perlPackages) NetLDAP CryptSmbHash DigestSHA1;
+  };
+
   smbnetfs = callPackage ../tools/filesystems/smbnetfs {};
 
   fusesmb = callPackage ../tools/filesystems/fusesmb { };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index a73e8193817..8b591231820 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -836,6 +836,14 @@ rec {
     };
   };
 
+  ConvertASN1 = buildPerlPackage rec {
+    name = "Convert-ASN1-0.22";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/G/GB/GBARR/Convert-ASN1-0.22.tar.gz";
+      sha256 = "1vpny8smwl23rai1kxngi5i31jhp6s6cdls19gjhcwsxf76daqxy";
+    };
+  };
+
   constant = buildPerlPackage {
     name = "constant-1.15";
     src = fetchurl {
@@ -922,6 +930,14 @@ rec {
     };
   };
 
+  CryptSmbHash = buildPerlPackage rec {
+    name = "Crypt-SmbHash-0.12";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/B/BJ/BJKUIT/Crypt-SmbHash-0.12.tar.gz";
+      sha256 = "0dxivcqmabkhpz5xzph6rzl8fvq9xjy26b2ci77pv5gsmdzari38";
+    };
+  };
+
   CryptSSLeay = buildPerlPackage rec {
     name = "Crypt-SSLeay-0.57";
     src = fetchurl {
@@ -2537,6 +2553,15 @@ rec {
     };
   };
 
+  NetLDAP = buildPerlPackage {
+    name = "Net-LDAP-0.43";
+    propagatedBuildInputs = [ ConvertASN1 ];
+    src = fetchurl {
+      url = mirror://cpan/authors/id/G/GB/GBARR/perl-ldap-0.43.tar.gz;
+      sha256 = "0ak7393zs8ps6r6in5ilr9l1mzxxh529jr768sjzx4273p7li3m0";
+    };
+  };
+
   NetServer = buildPerlPackage rec {
     name = "Net-Server-0.99";
     src = fetchurl {

From d74fd84210b311c52fe9cb50fb310014063d5ca8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 28 Dec 2011 10:31:27 +0000
Subject: [PATCH 45/96] haskell-blaze-html: updated to version 0.4.3.1

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

diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix
index dbeb4721f33..0231b9e8e00 100644
--- a/pkgs/development/libraries/haskell/blaze-html/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-html/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-html";
-  version = "0.4.3.0";
-  sha256 = "1018mfsc1cqbyxlil136171n9qi9sypchlmmfqawf3aa1sjskmfg";
+  version = "0.4.3.1";
+  sha256 = "0yhwlwmjy3jagxscz2i0yjfy6akqpamn9c35ffxcgpr0kj6qlpfp";
   buildDepends = [ blazeBuilder text ];
   meta = {
     homepage = "http://jaspervdj.be/blaze";

From 2cc6165e7e7b92fcc5a9bf66d62dc0fcb11850be Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 28 Dec 2011 10:31:30 +0000
Subject: [PATCH 46/96] haskell-gloss: updated to version 1.6.0.1

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

diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix
index 1b9fbb03da4..47425ae2536 100644
--- a/pkgs/development/libraries/haskell/gloss/default.nix
+++ b/pkgs/development/libraries/haskell/gloss/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gloss";
-  version = "1.5.2.1";
-  sha256 = "1mwk9gnkbjr76f9g79ixxlwzpsvmhflp5c8a0584fyypjg2r33n3";
+  version = "1.6.0.1";
+  sha256 = "0yy8yl2s3n0kyr14bcxp1hjzh3wlrhc0xp2ngl3wbz1hbzyrsdlf";
   buildDepends = [ bmp GLUT OpenGL ];
   meta = {
     homepage = "http://gloss.ouroborus.net";

From 4528363ead58ee3e21a442df8a79a5055ad85228 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 28 Dec 2011 10:31:34 +0000
Subject: [PATCH 47/96] haskell-persistent: updated to version 0.6.4.4

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

diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
index 527bbf9f2ae..59fe42ff65e 100644
--- a/pkgs/development/libraries/haskell/persistent/default.nix
+++ b/pkgs/development/libraries/haskell/persistent/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent";
-  version = "0.6.4.3";
-  sha256 = "0j4agwm8hcphrmzmc7d7al57cwp3i5iy7d8yhqw9m8pcx61sqkg4";
+  version = "0.6.4.4";
+  sha256 = "0n4zl0r8nmp3pwsgc0kiy7fgk2dfvdvagv1gvjxrs8545c5ycggv";
   buildDepends = [
     blazeHtml dataObject enumerator monadControl mtl pathPieces pool
     text time transformers transformersBase

From 2afb111ad5bcc5f7431d7e292989f74359f89d8b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 28 Dec 2011 10:31:37 +0000
Subject: [PATCH 48/96] haskell-wai-logger: updated to version 0.1.2

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

diff --git a/pkgs/development/libraries/haskell/wai-logger/default.nix b/pkgs/development/libraries/haskell/wai-logger/default.nix
index e38f4c853f1..d99bd1a0442 100644
--- a/pkgs/development/libraries/haskell/wai-logger/default.nix
+++ b/pkgs/development/libraries/haskell/wai-logger/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-logger";
-  version = "0.1.1";
-  sha256 = "02354n4j1wj2n2vn4hza7ng2gqbf6ibvr4gfnv7maisivgqjy694";
+  version = "0.1.2";
+  sha256 = "0pzbdjy0xkjqkzc5w1v0hh18jgbxlkllsjwxabswkh8gl73mp7d9";
   buildDepends = [
     blazeBuilder byteorder caseInsensitive fastLogger httpTypes network
     time wai

From ff3b0ed420b8e59bd5699b8edf887e3d40b52968 Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Wed, 28 Dec 2011 12:45:59 +0000
Subject: [PATCH 49/96] Update HOL Light to r116

svn path=/nixpkgs/trunk/; revision=31125
---
 pkgs/applications/science/logic/hol_light/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix
index 209ba934b9e..416d6bb75dd 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -9,10 +9,10 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "hol_light-20111204";
+  name = "hol_light-20111224";
   src = fetchsvn {
     url = http://hol-light.googlecode.com/svn/trunk;
-    rev = "114";
+    rev = "116";
     sha256 = "a9203a0118caf5d0ca7621abafab4af6245e1c1ae6ba628ead7c6f69aa86d9d3";
   };
 

From fd64bc52891d030b637abc640540d511921332f9 Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Wed, 28 Dec 2011 12:49:29 +0000
Subject: [PATCH 50/96] Oops!

svn path=/nixpkgs/trunk/; revision=31126
---
 pkgs/applications/science/logic/hol_light/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix
index 416d6bb75dd..793d5c9452a 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   src = fetchsvn {
     url = http://hol-light.googlecode.com/svn/trunk;
     rev = "116";
-    sha256 = "a9203a0118caf5d0ca7621abafab4af6245e1c1ae6ba628ead7c6f69aa86d9d3";
+    sha256 = "c840cc2dfeb2088484692cb0073e6a7bb85e3e44e95aee1e0f5a8e223f7ccae6";
   };
 
   buildInputs = [ ocaml findlib camlp5 ];

From daa459cc8ab5037674039b7235f9f2d7769c1cae Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Wed, 28 Dec 2011 21:48:55 +0000
Subject: [PATCH 51/96] popt-0.16

Thanks to Peter Simons for preparing this. Make sure you have nixos 31132.

svn path=/nixpkgs/trunk/; revision=31133
---
 pkgs/development/libraries/popt/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix
index 82fa564fa01..03f917daa23 100644
--- a/pkgs/development/libraries/popt/default.nix
+++ b/pkgs/development/libraries/popt/default.nix
@@ -1,10 +1,14 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "popt-1.15";
+stdenv.mkDerivation rec {
+  name = "popt-1.16";
   
   src = fetchurl {
-    url = http://rpm5.org/files/popt/popt-1.15.tar.gz;
-    sha256 = "1wqbcimg4zlfp7261i89s1918a46fjfbvq1a4ij4a6prk27576q6";
+    url = "http://rpm5.org/files/popt/${name}.tar.gz";
+    sha256 = "1j2c61nn2n351nhj4d25mnf3vpiddcykq005w2h6kw79dwlysa77";
+  };
+
+  meta = {
+    description = "command line option parsing library";
   };
 }

From d5709cfb64c177f6274567dc8eb612244de691e7 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Wed, 28 Dec 2011 21:48:58 +0000
Subject: [PATCH 52/96] cryptsetup-1.4.1

Thanks to Mathijs Kwik and Peter Simons for preparing this.
Make sure you have nixos r31132.

svn path=/nixpkgs/trunk/; revision=31134
---
 pkgs/os-specific/linux/cryptsetup/default.nix | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix
index 765a49c6446..2b23dbe904f 100644
--- a/pkgs/os-specific/linux/cryptsetup/default.nix
+++ b/pkgs/os-specific/linux/cryptsetup/default.nix
@@ -1,25 +1,19 @@
-{stdenv, fetchurl, libuuid, popt, devicemapper, udev }:
+{stdenv, fetchurl, devicemapper, libgcrypt, libuuid, pkgconfig, popt, udev }:
 
-stdenv.mkDerivation {
-  name = "cryptsetup-1.0.6";
+stdenv.mkDerivation rec {
+  name = "cryptsetup-1.4.1";
   src = fetchurl {
-    url = http://cryptsetup.googlecode.com/files/cryptsetup-1.0.6.tar.bz2;
-    sha256 = "df7fda80cfa01f063caf39140287a47d018dfe056fc71a3ba605e690ff0183fd";
+    url = "http://cryptsetup.googlecode.com/files/${name}.tar.bz2";
+    sha256 = "82b143328c2b427ef2b89fb76c701d311c95b54093c21bbf22342f7b393bddcb";
   };
 
-  configureFlags = [ "--enable-libdevmapper" ];
-
-  patchPhase = ''
-    sed -i -e 's@/sbin/udevsettle@${udev}/sbin/udevadm settle@' lib/libdevmapper.c
-  '';
-
-  buildInputs = [ libuuid popt devicemapper ];
+  buildInputs = [ devicemapper libgcrypt libuuid pkgconfig popt ];
 
   meta = {
     homepage = http://code.google.com/p/cryptsetup/;
     description = "LUKS for dm-crypt";
     license = "GPLv2";
-    maintainers = with stdenv.lib.maintainers; [viric];
+    maintainers = with stdenv.lib.maintainers; [ viric chaoflow ];
     platforms = with stdenv.lib.platforms; linux;
   };
 }

From bf55fb9192b300186b3544b66cd7edf14032aafb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 29 Dec 2011 16:22:46 +0000
Subject: [PATCH 53/96] * Fixed Calibre (it was referring to "python2", which
 doesn't exist)   and updated it to 0.8.32.

svn path=/nixpkgs/trunk/; revision=31140
---
 pkgs/applications/misc/calibre/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index b38a6cb5644..1685ef50b8d 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-0.8.30";
+  name = "calibre-0.8.32";
 
   src = fetchurl {
     url = "http://calibre-ebook.googlecode.com/files/${name}.tar.xz";
-    sha256 = "1w94kaynxiksjfi6wqlvwnryl08f8m0ylqwgzwkz1hjznqiji282";
+    sha256 = "0d0zq4sr0qm8jarg0ps24lfizb4hyb57pjsp81y1sb5nzjki7jml";
   };
 
   inherit python;
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
       $out/lib/calibre/calibre/ebooks/metadata/*.py
       $out/lib/calibre/calibre/ebooks/rtf2xml/*.py"
 
-    sed -i "s/env python/python/" $PYFILES
+    sed -i "s/env python[0-9.]*/python/" $PYFILES
     for a in $out/bin/*; do
       wrapProgram $a --prefix PYTHONPATH : $PYTHONPATH --prefix LD_LIBRARY_PATH : ${unrar}/lib
     done

From de1a6e09d7bbf1cf4adbabbae00de56d943dae12 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 29 Dec 2011 16:42:08 +0000
Subject: [PATCH 54/96] haskell-path-pieces: added version 0.1.0
 haskell-attoparsec-conduit: added version 0.0.0
 haskell-blaze-builder-conduit: added version 0.0.0 haskell-conduit: added
 version 0.0.0.1 haskell-http-conduit: added version 1.0.0
 haskell-lifted-base: added version 0.1.0.2 haskell-xml-conduit: added version
 0.5.0 haskell-zlib-conduit: added version 0.0.0

svn path=/nixpkgs/trunk/; revision=31141
---
 .../haskell/attoparsec-conduit/default.nix    | 18 +++++++++++
 .../haskell/blaze-builder-conduit/default.nix | 18 +++++++++++
 .../libraries/haskell/conduit/default.nix     | 22 +++++++++++++
 .../haskell/http-conduit/default.nix          | 31 +++++++++++++++++++
 .../libraries/haskell/lifted-base/default.nix | 20 ++++++++++++
 .../path-pieces/{default.nix => 0.0.0.nix}    |  0
 .../libraries/haskell/path-pieces/0.1.0.nix   | 18 +++++++++++
 .../libraries/haskell/xml-conduit/default.nix | 25 +++++++++++++++
 .../haskell/zlib-conduit/default.nix          | 18 +++++++++++
 pkgs/top-level/haskell-packages.nix           | 30 +++++++++++++++---
 10 files changed, 196 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
 create mode 100644 pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
 create mode 100644 pkgs/development/libraries/haskell/conduit/default.nix
 create mode 100644 pkgs/development/libraries/haskell/http-conduit/default.nix
 create mode 100644 pkgs/development/libraries/haskell/lifted-base/default.nix
 rename pkgs/development/libraries/haskell/path-pieces/{default.nix => 0.0.0.nix} (100%)
 create mode 100755 pkgs/development/libraries/haskell/path-pieces/0.1.0.nix
 create mode 100644 pkgs/development/libraries/haskell/xml-conduit/default.nix
 create mode 100644 pkgs/development/libraries/haskell/zlib-conduit/default.nix

diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
new file mode 100644
index 00000000000..fd11df19905
--- /dev/null
+++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
@@ -0,0 +1,18 @@
+{ cabal, attoparsec, conduit, text, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "attoparsec-conduit";
+  version = "0.0.0";
+  sha256 = "1cwmi86faisg10l15w8mz3619phvrn2hl10blr6pziv1k8c3ncj7";
+  buildDepends = [ attoparsec conduit text transformers ];
+  meta = {
+    homepage = "http://github.com/snoyberg/conduit";
+    description = "Turn attoparsec parsers into sinks";
+    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/development/libraries/haskell/blaze-builder-conduit/default.nix b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
new file mode 100644
index 00000000000..40e4ec9a121
--- /dev/null
+++ b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
@@ -0,0 +1,18 @@
+{ cabal, blazeBuilder, conduit, text, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "blaze-builder-conduit";
+  version = "0.0.0";
+  sha256 = "022j78sj9cs4xcbvxz0f2lga0rhxcwaj1mkxn0019rbx3lix1nh3";
+  buildDepends = [ blazeBuilder conduit text transformers ];
+  meta = {
+    homepage = "http://github.com/snoyberg/conduit";
+    description = "Convert streams of builders to streams of bytestrings";
+    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/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
new file mode 100644
index 00000000000..76a7130ecb1
--- /dev/null
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -0,0 +1,22 @@
+{ cabal, liftedBase, monadControl, text, transformers
+, transformersBase
+}:
+
+cabal.mkDerivation (self: {
+  pname = "conduit";
+  version = "0.0.0.1";
+  sha256 = "0l3q9jj0dpbn2ixjx6d9m6ss92dmfgd5xc7wgfpb9d0kfk2li0sv";
+  buildDepends = [
+    liftedBase monadControl text transformers transformersBase
+  ];
+  meta = {
+    homepage = "http://github.com/snoyberg/conduit";
+    description = "A pull-based approach to streaming data";
+    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/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
new file mode 100644
index 00000000000..ab011d5c87b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@@ -0,0 +1,31 @@
+{ cabal, asn1Data, attoparsec, attoparsecConduit, base64Bytestring
+, blazeBuilder, blazeBuilderConduit, caseInsensitive, certificate
+, conduit, cprngAes, dataDefault, failure, httpTypes, liftedBase
+, monadControl, network, text, tls, tlsExtra, transformers
+, transformersBase, utf8String, zlibConduit, zlibEnum
+}:
+
+cabal.mkDerivation (self: {
+  pname = "http-conduit";
+  version = "1.0.0";
+  sha256 = "1ix2qx6zqp8g7hjg2ygwivzg4hhz2ac22rbybh9adzvzw0q2yvgk";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
+    blazeBuilderConduit caseInsensitive certificate conduit cprngAes
+    dataDefault failure httpTypes liftedBase monadControl network text
+    tls tlsExtra transformers transformersBase utf8String zlibConduit
+    zlibEnum
+  ];
+  meta = {
+    homepage = "http://github.com/snoyberg/http-enumerator";
+    description = "HTTP client package with conduit interface and HTTPS support";
+    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/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix
new file mode 100644
index 00000000000..48822d777bc
--- /dev/null
+++ b/pkgs/development/libraries/haskell/lifted-base/default.nix
@@ -0,0 +1,20 @@
+{ cabal, baseUnicodeSymbols, monadControl, transformersBase }:
+
+cabal.mkDerivation (self: {
+  pname = "lifted-base";
+  version = "0.1.0.2";
+  sha256 = "1j810pdkhl6kpc368081ar1k9342k3bl4cmx294zdyd0j00n23zx";
+  buildDepends = [
+    baseUnicodeSymbols monadControl transformersBase
+  ];
+  meta = {
+    homepage = "https://github.com/basvandijk/lifted-base";
+    description = "lifted IO operations from the base library";
+    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/development/libraries/haskell/path-pieces/default.nix b/pkgs/development/libraries/haskell/path-pieces/0.0.0.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/path-pieces/default.nix
rename to pkgs/development/libraries/haskell/path-pieces/0.0.0.nix
diff --git a/pkgs/development/libraries/haskell/path-pieces/0.1.0.nix b/pkgs/development/libraries/haskell/path-pieces/0.1.0.nix
new file mode 100755
index 00000000000..9c3c8dbc79a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/path-pieces/0.1.0.nix
@@ -0,0 +1,18 @@
+{ cabal, text }:
+
+cabal.mkDerivation (self: {
+  pname = "path-pieces";
+  version = "0.1.0";
+  sha256 = "12dgiq2pz94pwa5v5wv96ps0nl5w23r44nnp4lm4cdhl063c9w8d";
+  buildDepends = [ text ];
+  meta = {
+    homepage = "http://github.com/snoyberg/path-pieces";
+    description = "Components of paths";
+    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/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix
new file mode 100644
index 00000000000..79f10512b46
--- /dev/null
+++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix
@@ -0,0 +1,25 @@
+{ cabal, attoparsec, attoparsecConduit, blazeBuilder
+, blazeBuilderConduit, conduit, dataDefault, failure
+, systemFilepath, text, transformers, xmlTypes
+}:
+
+cabal.mkDerivation (self: {
+  pname = "xml-conduit";
+  version = "0.5.0";
+  sha256 = "008rrqglxajihcf3yp9cwif67dnabyjjiymxvssznrl8ljz4yn8y";
+  buildDepends = [
+    attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
+    conduit dataDefault failure systemFilepath text transformers
+    xmlTypes
+  ];
+  meta = {
+    homepage = "http://github.com/snoyberg/xml";
+    description = "Pure-Haskell utilities for dealing with XML with the conduit package";
+    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/development/libraries/haskell/zlib-conduit/default.nix b/pkgs/development/libraries/haskell/zlib-conduit/default.nix
new file mode 100644
index 00000000000..306475a81b4
--- /dev/null
+++ b/pkgs/development/libraries/haskell/zlib-conduit/default.nix
@@ -0,0 +1,18 @@
+{ cabal, conduit, transformers, zlibBindings }:
+
+cabal.mkDerivation (self: {
+  pname = "zlib-conduit";
+  version = "0.0.0";
+  sha256 = "1nqcw809xqlycggn4nqys205gv3kjwws16910xlx2b8b9f8ayxjg";
+  buildDepends = [ conduit transformers zlibBindings ];
+  meta = {
+    homepage = "http://github.com/snoyberg/conduit";
+    description = "Streaming compression/decompression via conduits";
+    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 8cc83cf4853..5e1fef0215f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -439,6 +439,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   attoparsec = callPackage ../development/libraries/haskell/attoparsec {};
 
+  attoparsecConduit = callPackage ../development/libraries/haskell/attoparsec-conduit {};
+
   attoparsecEnumerator = callPackage ../development/libraries/haskell/attoparsec/enumerator.nix {};
 
   authenticate = callPackage ../development/libraries/haskell/authenticate {};
@@ -467,6 +469,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   blazeBuilder = callPackage ../development/libraries/haskell/blaze-builder {};
 
+  blazeBuilderConduit = callPackage ../development/libraries/haskell/blaze-builder-conduit {};
+
   blazeBuilderEnumerator = callPackage ../development/libraries/haskell/blaze-builder-enumerator {};
 
   blazeHtml = callPackage ../development/libraries/haskell/blaze-html {};
@@ -529,6 +533,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   compactStringFix = callPackage ../development/libraries/haskell/compact-string-fix {};
 
+  conduit = callPackage ../development/libraries/haskell/conduit {};
+
   ConfigFile = callPackage ../development/libraries/haskell/ConfigFile {};
 
   controlMonadAttempt = callPackage ../development/libraries/haskell/control-monad-attempt {};
@@ -840,6 +846,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   html_1_0_1_2 = callPackage ../development/libraries/haskell/html/1.0.1.2.nix {};
   html = self.html_1_0_1_2;
 
+  httpConduit = callPackage ../development/libraries/haskell/http-conduit {};
+
   httpdShed = callPackage ../development/libraries/haskell/httpd-shed {};
 
   httpDate = callPackage ../development/libraries/haskell/http-date {};
@@ -899,6 +907,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   libmpd = callPackage ../development/libraries/haskell/libmpd {};
 
+  liftedBase = callPackage ../development/libraries/haskell/lifted-base {};
+
   ListLike = callPackage ../development/libraries/haskell/ListLike {};
 
   ltk = callPackage ../development/libraries/haskell/ltk {};
@@ -997,7 +1007,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   OpenGLRaw = callPackage ../development/libraries/haskell/OpenGLRaw {};
 
-  pathPieces = callPackage ../development/libraries/haskell/path-pieces {};
+  pathPieces_0_0_0 = callPackage ../development/libraries/haskell/path-pieces/0.0.0.nix {};
+  pathPieces_0_1_0 = callPackage ../development/libraries/haskell/path-pieces/0.1.0.nix {};
+  pathPieces = self.pathPieces_0_1_0;
 
   pandoc = callPackage ../development/libraries/haskell/pandoc/default.nix {};
 
@@ -1029,7 +1041,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   pcreLight = callPackage ../development/libraries/haskell/pcre-light {};
 
-  persistent = callPackage ../development/libraries/haskell/persistent {};
+  persistent = callPackage ../development/libraries/haskell/persistent {
+    pathPieces = self.pathPieces_0_0_0;
+  };
 
   persistentTemplate = callPackage ../development/libraries/haskell/persistent-template {};
 
@@ -1372,7 +1386,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   webRoutes = callPackage ../development/libraries/haskell/web-routes {};
 
-  webRoutesQuasi = callPackage ../development/libraries/haskell/web-routes-quasi {};
+  webRoutesQuasi = callPackage ../development/libraries/haskell/web-routes-quasi {
+    pathPieces = self.pathPieces_0_0_0;
+  };
 
   CouchDB = callPackage ../development/libraries/haskell/CouchDB {};
 
@@ -1396,6 +1412,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   xml = callPackage ../development/libraries/haskell/xml {};
 
+  xmlConduit = callPackage ../development/libraries/haskell/xml-conduit {};
+
   xmlEnumerator = callPackage ../development/libraries/haskell/xml-enumerator {};
 
   xmlTypes = callPackage ../development/libraries/haskell/xml-types {};
@@ -1410,7 +1428,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   yesodAuth = callPackage ../development/libraries/haskell/yesod-auth {};
 
-  yesodCore = callPackage ../development/libraries/haskell/yesod-core {};
+  yesodCore = callPackage ../development/libraries/haskell/yesod-core {
+    pathPieces = self.pathPieces_0_0_0;
+  };
 
   yesodForm = callPackage ../development/libraries/haskell/yesod-form {};
 
@@ -1441,6 +1461,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   zlibBindings = callPackage ../development/libraries/haskell/zlib-bindings {};
 
+  zlibConduit = callPackage ../development/libraries/haskell/zlib-conduit {};
+
   zlibEnum = callPackage ../development/libraries/haskell/zlib-enum {};
 
   Zwaluw = callPackage ../development/libraries/haskell/Zwaluw {};

From 633a19499459667568eaa80ffa5484cb31705176 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 29 Dec 2011 16:53:14 +0000
Subject: [PATCH 55/96] * PIL updated to 1.1.7.

svn path=/nixpkgs/trunk/; revision=31142
---
 .../python-modules/pil/default.nix            | 70 +++++++++----------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/pkgs/development/python-modules/pil/default.nix b/pkgs/development/python-modules/pil/default.nix
index e4586762527..4cf4576c0ce 100644
--- a/pkgs/development/python-modules/pil/default.nix
+++ b/pkgs/development/python-modules/pil/default.nix
@@ -1,41 +1,41 @@
-{ fetchurl, stdenv, python
-, libjpeg, zlib, freetype }:
+{ fetchurl, stdenv, python, libjpeg, zlib, freetype }:
 
-let version = "1.1.6";
-in
-  stdenv.mkDerivation {
-    name = "python-imaging-${version}";
-    src = fetchurl {
-      url = "http://effbot.org/downloads/Imaging-${version}.tar.gz";
-      sha256 = "141zidl3s9v4vfi3nsbg42iq1lc2a932gprqr1kij5hrnn53bmvx";
-    };
+let version = "1.1.7"; in
 
-    buildInputs = [ python libjpeg zlib freetype ];
+stdenv.mkDerivation {
+  name = "python-imaging-${version}";
+  
+  src = fetchurl {
+    url = "http://effbot.org/downloads/Imaging-${version}.tar.gz";
+    sha256 = "04aj80jhfbmxqzvmq40zfi4z3cw6vi01m3wkk6diz3lc971cfnw9";
+  };
 
-    doCheck = true;
+  buildInputs = [ python libjpeg zlib freetype ];
 
-    configurePhase = ''
-      sed -i "setup.py" \
-          -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = libinclude("${freetype}")|g ;
-              s|^JPEG_ROOT =.*$|JPEG_ROOT = libinclude("${libjpeg}")|g ;
-              s|^ZLIB_ROOT =.*$|ZLIB_ROOT = libinclude("${zlib}")|g ;'
+  doCheck = true;
+
+  configurePhase = ''
+    sed -i "setup.py" \
+        -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = libinclude("${freetype}")|g ;
+            s|^JPEG_ROOT =.*$|JPEG_ROOT = libinclude("${libjpeg}")|g ;
+            s|^ZLIB_ROOT =.*$|ZLIB_ROOT = libinclude("${zlib}")|g ;'
+  '';
+
+  buildPhase   = "python setup.py build_ext -i";
+  checkPhase   = "python selftest.py";
+  installPhase = "python setup.py install --prefix=$out";
+
+  meta = {
+    homepage = http://www.pythonware.com/products/pil/;
+    description = "The Python Imaging Library (PIL)";
+
+    longDescription = ''
+      The Python Imaging Library (PIL) adds image processing
+      capabilities to your Python interpreter.  This library
+      supports many file formats, and provides powerful image
+      processing and graphics capabilities.
     '';
 
-    buildPhase   = "python setup.py build_ext -i";
-    checkPhase   = "python selftest.py";
-    installPhase = "python setup.py install --prefix=$out";
-
-    meta = {
-      homepage = http://www.pythonware.com/products/pil/;
-      description = "The Python Imaging Library (PIL)";
-
-      longDescription = ''
-        The Python Imaging Library (PIL) adds image processing
-        capabilities to your Python interpreter.  This library
-        supports many file formats, and provides powerful image
-        processing and graphics capabilities.
-      '';
-
-      license = "http://www.pythonware.com/products/pil/license.htm";
-    };
-  }
+    license = "http://www.pythonware.com/products/pil/license.htm";
+  };
+}

From c6ad751a8c94936533041843f3676088460fad45 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Thu, 29 Dec 2011 19:46:37 +0000
Subject: [PATCH 56/96] zsh-4.3.15

svn path=/nixpkgs/trunk/; revision=31146
---
 pkgs/shells/zsh/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index 037ceddfd01..ae1801c5463 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -2,11 +2,11 @@
 
 let
 
-  version = "4.3.10";
+  version = "4.3.15";
 
   documentation = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.bz2";
-    sha256 = "f53d5c434fdb26fc79755279175514507eb1d11cf793ac57270d053ee61f37f9";
+    sha256 = "73b7ee1a737fbaf9be77cf6b55b27cca96bac39bc5ef25efa9ceb427cd1b5ad4";
   };
   
 in
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${version}.tar.bz2";
-    sha256 = "63fdc0273eadbb42d164f38b0b79922c0b3df0e97084e746a318276d935a4f7c";
+    sha256 = "8708f485823fb7e51aa696776d0dfac7d3558485182672cf9311c12a50a95486";
   };
   
   configureFlags = "--with-tcsetpgrp --enable-maildir-support --enable-multibyte";

From ecba799e780734eaf9087fc7444ae554d7f59e46 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Thu, 29 Dec 2011 19:46:43 +0000
Subject: [PATCH 57/96] zsh meta

svn path=/nixpkgs/trunk/; revision=31147
---
 pkgs/shells/zsh/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index ae1801c5463..db0e1d107b5 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -26,5 +26,14 @@ stdenv.mkDerivation {
     tar xf ${documentation} -C $out/share
   '';
 
-  buildInputs = [ncurses coreutils];
+  buildInputs = [ ncurses coreutils ];
+
+  meta = {
+    description = "the Z shell";
+    longDescription = "Zsh is a UNIX command interpreter (shell) usable as an interactive login shell and as a shell script command processor.  Of the standard shells, zsh most closely resembles ksh but includes many enhancements.  Zsh has command line editing, builtin spelling correction, programmable command completion, shell functions (with autoloading), a history mechanism, and a host of other features.";
+    license = "MIT-like";
+    homePage = "http://www.zsh.org/";
+    maintainers = with stdenv.lib.maintainers; [ chaoflow ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+  };
 }

From 0009c1f650ba619de97df36322fbd0346db0c099 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Thu, 29 Dec 2011 19:46:47 +0000
Subject: [PATCH 58/96] zshprofile to load /etc/profile while emulating bash

svn path=/nixpkgs/trunk/; revision=31148
---
 pkgs/shells/zsh/default.nix | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index db0e1d107b5..61deeb4869d 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -19,14 +19,35 @@ stdenv.mkDerivation {
     sha256 = "8708f485823fb7e51aa696776d0dfac7d3558485182672cf9311c12a50a95486";
   };
   
-  configureFlags = "--with-tcsetpgrp --enable-maildir-support --enable-multibyte";
+  buildInputs = [ ncurses coreutils ];
 
+  preConfigure = ''
+    configureFlags="--enable-maildir-support --enable-multibyte --enable-zprofile=$out/etc/zprofile --with-tcsetpgrp"
+  '';
+
+  # XXX: think/discuss about this, also with respect to nixos vs nix-on-X
   postInstall = ''
     ensureDir $out/share/
     tar xf ${documentation} -C $out/share
+    ensureDir $out/etc/
+    cat > $out/etc/zprofile <<EOF
+if test -r /etc/zprofile; then
+  . /etc/zprofile
+else
+  emulate bash
+  alias shopt=false
+  . /etc/profile
+  unalias shopt
+  emulate zsh
+fi
+if test -r /etc/zprofile.local; then
+  . /etc/zprofile.local
+fi
+EOF
+    $out/bin/zsh -c "zcompile $out/etc/zprofile"
+    mv $out/etc/zprofile $out/etc/zprofile_zwc_is_used
   '';
-
-  buildInputs = [ ncurses coreutils ];
+  # XXX: patch zsh to take zwc if newer _or equal_
 
   meta = {
     description = "the Z shell";

From 89c3120b202355910f4869b297c43618f8f93394 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Thu, 29 Dec 2011 20:09:30 +0000
Subject: [PATCH 59/96] zsh profile load tweaking only on nixos

svn path=/nixpkgs/trunk/; revision=31149
---
 pkgs/shells/zsh/default.nix | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index 61deeb4869d..6b199e165d0 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -31,17 +31,25 @@ stdenv.mkDerivation {
     tar xf ${documentation} -C $out/share
     ensureDir $out/etc/
     cat > $out/etc/zprofile <<EOF
-if test -r /etc/zprofile; then
-  . /etc/zprofile
+if test -e /etc/NIXOS; then
+  if test -r /etc/zprofile; then
+    . /etc/zprofile
+  else
+    emulate bash
+    alias shopt=false
+    . /etc/profile
+    unalias shopt
+    emulate zsh
+  fi
+  if test -r /etc/zprofile.local; then
+    . /etc/zprofile.local
+  fi
 else
-  emulate bash
-  alias shopt=false
-  . /etc/profile
-  unalias shopt
-  emulate zsh
-fi
-if test -r /etc/zprofile.local; then
-  . /etc/zprofile.local
+  # on non-nixos we just source the global /etc/zprofile as if we did
+  # not use the configure flag
+  if test -r /etc/zprofile; then
+    . /etc/zprofile
+  fi
 fi
 EOF
     $out/bin/zsh -c "zcompile $out/etc/zprofile"

From 99e6a23f03a16a126517a9c2c451c7f0abc76f93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 29 Dec 2011 22:14:08 +0000
Subject: [PATCH 60/96] Adding task warrior, stable.

svn path=/nixpkgs/trunk/; revision=31150
---
 pkgs/applications/misc/taskwarrior/default.nix | 16 ++++++++++++++++
 pkgs/top-level/all-packages.nix                |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/applications/misc/taskwarrior/default.nix

diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix
new file mode 100644
index 00000000000..52b721622e4
--- /dev/null
+++ b/pkgs/applications/misc/taskwarrior/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "task-warrior-1.9.4";
+
+  src = fetchurl {
+    url = http://www.taskwarrior.org/download/task-1.9.4.tar.gz;
+    sha256 = "0jnk30k1b2j3nx39il70jmj6p49wxp6cl4awd8hw71gqkcf6480h";
+  };
+
+  meta = {
+    description = "Command-line todo list manager";
+    homepage = http://taskwarrior.org/;
+    license = "MIT";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 44d44f080e0..9d2c693e163 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7422,6 +7422,8 @@ let
     withKde = getConfig [ "taskJuggler" "kde" ] false;
   };
 
+  taskwarrior = callPackage ../applications/misc/taskwarrior { };
+
   tesseract = callPackage ../applications/graphics/tesseract { };
 
   thinkingRock = callPackage ../applications/misc/thinking-rock { };

From 7d4e6bbec9a04c604c24edf2c42db47fdd842f45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 29 Dec 2011 22:27:32 +0000
Subject: [PATCH 61/96] Adding task warrior unstable.

svn path=/nixpkgs/trunk/; revision=31151
---
 .../misc/taskwarrior/unstable.nix             | 20 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/applications/misc/taskwarrior/unstable.nix

diff --git a/pkgs/applications/misc/taskwarrior/unstable.nix b/pkgs/applications/misc/taskwarrior/unstable.nix
new file mode 100644
index 00000000000..057ebbe57c5
--- /dev/null
+++ b/pkgs/applications/misc/taskwarrior/unstable.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, cmake, lua5 }:
+
+stdenv.mkDerivation {
+  name = "task-warrior-2.0.0.beta4";
+
+  src = fetchurl {
+    url = http://www.taskwarrior.org/download/task-2.0.0.beta4.tar.gz;
+    sha256 = "1c9n6b5ly3m5kminnsvqgmjxdkb68w4av9kdnh47dw4sj3gwrn1w";
+  };
+
+  NIX_LDFLAGS = "-ldl";
+
+  buildInputs = [ cmake lua5 ];
+
+  meta = {
+    description = "Command-line todo list manager";
+    homepage = http://taskwarrior.org/;
+    license = "MIT";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9d2c693e163..bbc4a70b948 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7424,6 +7424,8 @@ let
 
   taskwarrior = callPackage ../applications/misc/taskwarrior { };
 
+  taskwarrior_unstable = callPackage ../applications/misc/taskwarrior/unstable.nix { };
+
   tesseract = callPackage ../applications/graphics/tesseract { };
 
   thinkingRock = callPackage ../applications/misc/thinking-rock { };

From 3e9953290aa023d61d407e6e4344cb7332bc8309 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 29 Dec 2011 22:28:22 +0000
Subject: [PATCH 62/96] THe stable task warrior has a licence GPLv2+, not MIT.

svn path=/nixpkgs/trunk/; revision=31152
---
 pkgs/applications/misc/taskwarrior/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix
index 52b721622e4..1202c4327bb 100644
--- a/pkgs/applications/misc/taskwarrior/default.nix
+++ b/pkgs/applications/misc/taskwarrior/default.nix
@@ -11,6 +11,6 @@ stdenv.mkDerivation {
   meta = {
     description = "Command-line todo list manager";
     homepage = http://taskwarrior.org/;
-    license = "MIT";
+    license = "GPLv2+";
   };
 }

From 573455fd44527152f4f6455b69e859d8088d8f64 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 30 Dec 2011 17:05:17 +0000
Subject: [PATCH 63/96] haskell-data-object-yaml: updated to version 0.3.4

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

diff --git a/pkgs/development/libraries/haskell/data-object-yaml/default.nix b/pkgs/development/libraries/haskell/data-object-yaml/default.nix
index a29ba40b823..1669f4be73e 100644
--- a/pkgs/development/libraries/haskell/data-object-yaml/default.nix
+++ b/pkgs/development/libraries/haskell/data-object-yaml/default.nix
@@ -1,20 +1,19 @@
-{ cabal, convertibleText, dataObject, enumerator, failure, text
+{ cabal, conduit, convertibleText, dataObject, failure, text
 , transformers, yaml
 }:
 
 cabal.mkDerivation (self: {
   pname = "data-object-yaml";
-  version = "0.3.3.6";
-  sha256 = "0hha52nrxb539bvdz6ksn9sxmksfwmjhh7h8mp223s340vxrlpk3";
+  version = "0.3.4";
+  sha256 = "1wx6m7mjmdks8ym6dh117bhkdks4d1jlfchqif0svcwg04qnfczd";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    convertibleText dataObject enumerator failure text transformers
-    yaml
+    conduit convertibleText dataObject failure text transformers yaml
   ];
   meta = {
     homepage = "http://github.com/snoyberg/data-object-yaml";
-    description = "Serialize data to and from Yaml files";
+    description = "Serialize data to and from Yaml files (deprecated)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [

From 6dfd7b14460573877c03089f80a4e8fae6881750 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 30 Dec 2011 17:05:20 +0000
Subject: [PATCH 64/96] haskell-yaml: updated to version 0.5.1.1

svn path=/nixpkgs/trunk/; revision=31159
---
 .../libraries/haskell/yaml/default.nix            | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix
index 76010bb4f86..2b25768aa69 100644
--- a/pkgs/development/libraries/haskell/yaml/default.nix
+++ b/pkgs/development/libraries/haskell/yaml/default.nix
@@ -1,12 +1,15 @@
-{ cabal, enumerator, transformers }:
+{ cabal, aeson, attoparsec, conduit, text, transformers
+, unorderedContainers, vector
+}:
 
 cabal.mkDerivation (self: {
   pname = "yaml";
-  version = "0.4.1.2";
-  sha256 = "1c7ffs5gkwk0l0vg7amsflra1j8ifd9cvvbqx9jzkqsay8hbr4vb";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ enumerator transformers ];
+  version = "0.5.1.1";
+  sha256 = "1l3f1rbdajdf9944kwbf90a1wxv00g2jcgjkg54k6c3iqbx956w2";
+  buildDepends = [
+    aeson attoparsec conduit text transformers unorderedContainers
+    vector
+  ];
   meta = {
     homepage = "http://github.com/snoyberg/yaml/";
     description = "Low-level binding to the libyaml C library";

From aefc550ae01fb396d442b97416b808aa6da26e6c Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sat, 31 Dec 2011 04:05:33 +0000
Subject: [PATCH 65/96] asciidoc-8.6.6

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

diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix
index 598cbff11f2..31c57850285 100644
--- a/pkgs/tools/typesetting/asciidoc/default.nix
+++ b/pkgs/tools/typesetting/asciidoc/default.nix
@@ -1,10 +1,10 @@
 { fetchurl, stdenv, python }:
 
 stdenv.mkDerivation rec {
-  name = "asciidoc-8.6.1";
+  name = "asciidoc-8.6.6";
   src = fetchurl {
     url = "mirror://sourceforge/asciidoc/${name}.tar.gz";
-    sha256 = "1c844ahv4naghfv1jabyr8gnv2fsx4k7366vh63zx0h0w2x7ylaq";
+    sha256 = "9d54c11716e4309ff4d942cf6a6d9745d6a28754ff1de01efed0dc659457ac71";
   };
 
   patchPhase = ''

From 19246750bfa8aa11fe5586c96adca49a74f19da3 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sat, 31 Dec 2011 04:05:44 +0000
Subject: [PATCH 66/96] libev-4.04 (frees awesome build from many warnings)

svn path=/nixpkgs/trunk/; revision=31170
---
 pkgs/development/libraries/libev/src-for-default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libev/src-for-default.nix b/pkgs/development/libraries/libev/src-for-default.nix
index c7b37ce1891..52c8e65bc4f 100644
--- a/pkgs/development/libraries/libev/src-for-default.nix
+++ b/pkgs/development/libraries/libev/src-for-default.nix
@@ -1,8 +1,8 @@
 rec {
-  advertisedUrl="http://dist.schmorp.de/libev/Attic/libev-3.8.tar.gz";
-  version = "3.8";
-  url="http://dist.schmorp.de/libev/Attic/libev-3.8.tar.gz";
-  hash = "1512n6c5q9ykqmk5zbwyb1na9qb9shd900kf4xhl5g07aypm7qr5";
-  name = "libev-3.8";
+  advertisedUrl="http://dist.schmorp.de/libev/Attic/libev-4.04.tar.gz";
+  version = "4.04";
+  url="http://dist.schmorp.de/libev/Attic/libev-4.04.tar.gz";
+  hash = "ab3a09e967e3b868055cd9363fd236aa093f8643d19cc7042e90e0dfe905b012";
+  name = "libev-4.04";
   
 }

From 251d42d03f4856d6982291797a9710d0c6afef9a Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sat, 31 Dec 2011 04:05:50 +0000
Subject: [PATCH 67/96] xcb-util-0.3.8 (+image|keysyms|renderutil|wm)

this might break things but makes awesome-3.4.11 happy

svn path=/nixpkgs/trunk/; revision=31171
---
 pkgs/servers/x11/xorg/default.nix | 48 +++++++++++++++++++++++++++++--
 1 file changed, 45 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index f25289a683a..b1c7770b2ba 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1148,15 +1148,57 @@ let
   })) // {inherit python ;};
     
   xcbutil = (stdenv.mkDerivation ((if overrides ? xcbutil then overrides.xcbutil else x: x) {
-    name = "xcb-util-0.3.6";
+    name = "xcb-util-0.3.8";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/xcb/xcb-util-0.3.6.tar.bz2;
-      sha256 = "0mqfyq6skm19hhfmd5kmcn0v4di4pmbdszmbf2lmhn01mc8yxf7z";
+      url = mirror://xorg/individual/xcb/xcb-util-0.3.8.tar.bz2;
+      sha256 = "c1eed9284750bc09352e60654df77bb585dbbe7673fdcc675e58b7f3a0b447b9";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xproto ];
   })) // {inherit gperf m4 libxcb xproto ;};
     
+  xcbutilImage = (stdenv.mkDerivation ((if overrides ? xcbutil then overrides.xcbutil else x: x) {
+    name = "xcb-util-image-0.3.8";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/xcb/xcb-util-image-0.3.8.tar.bz2;
+      sha256 = "40390528c26e8231132540f16579b821de68bb2e9152918f72182d5a4038a6d9";
+    };
+    buildInputs = [pkgconfig gperf m4 libxcb xcbutil xproto ];
+  })) // {inherit gperf m4 libxcb xcbutil xproto ;};
+    
+  # XXX: No package 'xorg-macros' found
+  xcbutilKeysyms = (stdenv.mkDerivation ((if overrides ? xcbutil then overrides.xcbutil else x: x) {
+    name = "xcb-util-keysyms-0.3.8";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/xcb/xcb-util-keysyms-0.3.8.tar.bz2;
+      sha256 = "913d32f7afe380c580da7636ee13f2728790237bb5c03def536363f552686121";
+    };
+    buildInputs = [pkgconfig gperf m4 libxcb xproto ];
+  })) // {inherit gperf m4 libxcb xproto ;};
+    
+  # XXX: No package 'xorg-macros' found
+  xcbutilRenderutil = (stdenv.mkDerivation ((if overrides ? xcbutil then overrides.xcbutil else x: x) {
+    name = "xcb-util-renderutil-0.3.8";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.8.tar.bz2;
+      sha256 = "9789a5c55728fa7bae374d9fdf1c61095869bdc68561911760879095644c7452";
+    };
+    buildInputs = [pkgconfig gperf m4 libxcb ];
+  })) // {inherit gperf m4 libxcb ;};
+    
+  xcbutilWm = (stdenv.mkDerivation ((if overrides ? xcbutil then overrides.xcbutil else x: x) {
+    name = "xcb-util-wm-0.3.8";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/xcb/xcb-util-wm-0.3.8.tar.bz2;
+      sha256 = "c557abbe4c7d45268f0541ee3d8f9a1a8799692fcc28aa33f39db93cc2e65007";
+    };
+    buildInputs = [pkgconfig gperf m4 libxcb ];
+  })) // {inherit gperf m4 libxcb ;};
+    
   xclock = (stdenv.mkDerivation ((if overrides ? xclock then overrides.xclock else x: x) {
     name = "xclock-1.0.5";
     builder = ./builder.sh;

From 096d86bfb152ff281200379b2e6e9d2bf2f65587 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sat, 31 Dec 2011 04:05:57 +0000
Subject: [PATCH 68/96] startup-notification-0.12 (works with xcb-util-0.3.8)

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

diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix
index d989c4059e6..2683a01a290 100644
--- a/pkgs/development/libraries/startup-notification/default.nix
+++ b/pkgs/development/libraries/startup-notification/default.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchurl, libX11, libxcb, pkgconfig, xcbutil}:
 
 let
-  version = "0.10";
+  version = "0.12";
 in
 stdenv.mkDerivation {
   name = "libstartup-notification-${version}";
   src = fetchurl {
     url = "http://www.freedesktop.org/software/startup-notification/releases/startup-notification-${version}.tar.gz";
-    sha256 = "0nalaay0yj3gq85insp9l31hsv5zp390m4nn37y235v151ffpfv4";
+    sha256 = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a";
   };
 
   buildInputs = [ libX11 libxcb pkgconfig xcbutil ];

From 8dd443c8dfbff99fae17266dbbca89d1cf6fa2d2 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sat, 31 Dec 2011 04:06:02 +0000
Subject: [PATCH 69/96] awesome-3.4.11 - ru manpages disabled because of build
 failure

svn path=/nixpkgs/trunk/; revision=31173
---
 .../window-managers/awesome/default.nix       | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index b94b350a848..fbf3b087cc7 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -1,10 +1,12 @@
 {stdenv, fetchurl, xz, cmake, gperf, imagemagick, pkgconfig, lua
 , glib, cairo, pango, imlib2, libxcb, libxdg_basedir, xcbutil
+, xcbutilImage, xcbutilKeysyms, xcbutilWm, libpthreadstubs, libXau
+, libXdmcp, pixman, doxygen
 , libstartup_notification, libev, asciidoc, xmlto, dbus, docbook_xsl
 , docbook_xml_dtd_45, libxslt, coreutils}:
 
 let
-  version = "3.4.9";
+  version = "3.4.11";
 in
 
 stdenv.mkDerivation rec {
@@ -12,11 +14,12 @@ stdenv.mkDerivation rec {
  
   src = fetchurl {
     url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz";
-    sha256 = "0382v482904xv295l0gvhwzc64b7631miiv8wyq7jxmwqf2vfbp7";
+    sha256 = "576b4f6d2c3f56dfbe52ad92f2eecece111f0f05816e32126cd03d4b4387761d";
   };
  
   buildInputs = [ xz cmake gperf imagemagick pkgconfig lua glib cairo pango
-    imlib2 libxcb libxdg_basedir xcbutil libstartup_notification libev
+    imlib2 libxcb libxdg_basedir xcbutil xcbutilImage xcbutilKeysyms xcbutilWm
+    libstartup_notification libev libpthreadstubs libXau libXdmcp pixman doxygen
     asciidoc xmlto dbus docbook_xsl docbook_xml_dtd_45 libxslt ];
 
   # We use coreutils for 'env', that will allow then finding 'bash' or 'zsh' in
@@ -27,10 +30,17 @@ stdenv.mkDerivation rec {
     sed s,/usr/bin/env,${coreutils}/bin/env, -i lib/awful/completion.lua.in
     # Remove the 'root' PATH override (I don't know why they have that)
     sed /WHOAMI/d -i utils/awsetbg
+    # Russian manpages fail to be generated:
+    #  [ 56%] Generating manpages/ru/man1/awesome.1.xml
+    #  asciidoc: ERROR: <stdin>: line 3: name section expected
+    #  asciidoc: FAILED: <stdin>: line 3: section title expected
+    #  make[2]: *** [manpages/ru/man1/awesome.1.xml] Error 1
+    substituteInPlace CMakeLists.txt \
+      --replace "set(AWE_MAN_LANGS es fr de ru)" \
+                "set(AWE_MAN_LANGS es fr de)"
   '';
 
-  patches = [ ./cmake284.patch ];
-
+  # XXX: maybe not needed anymore
   # Somehow libev does not get into the rpath, although it should.
   # Something may be wrong in the gcc wrapper.
   preBuild = ''

From 44ef26c8963f2f246e165f7c803b95bd117d8cde Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sat, 31 Dec 2011 04:30:46 +0000
Subject: [PATCH 70/96] xlsclients-1.1.2

svn path=/nixpkgs/trunk/; revision=31176
---
 pkgs/servers/x11/xorg/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index b1c7770b2ba..b10db9309f4 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2020,11 +2020,11 @@ let
   })) // {inherit libxcb ;};
     
   xlsclients = (stdenv.mkDerivation ((if overrides ? xlsclients then overrides.xlsclients else x: x) {
-    name = "xlsclients-1.1.1";
+    name = "xlsclients-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xlsclients-1.1.1.tar.bz2;
-      sha256 = "0ng81cm40881gddzwrfdbsvbnqfpqllxaxdsa8m2ljqxlq9mwfs5";
+      url = mirror://xorg/individual/app/xlsclients-1.1.2.tar.bz2;
+      sha256 = "1ce5f3987b63ea79b3f8421fcb1dd9c739e99efa97f280eafd8e93574b9027d1";
     };
     buildInputs = [pkgconfig libxcb xcbutil ];
   })) // {inherit libxcb xcbutil ;};

From e1556e64d735eb34dfd4f876a5ff711884aa0ff8 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sat, 31 Dec 2011 06:07:15 +0000
Subject: [PATCH 71/96] xorg: moved individuals from tarballs-7.6 to extra.list
 and regen tarballs-7.6

svn path=/nixpkgs/trunk/; revision=31177
---
 pkgs/servers/x11/xorg/extra.list        | 15 +++++++++++++
 pkgs/servers/x11/xorg/tarballs-7.6.list | 30 ++++++++++++-------------
 2 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list
index 6dd80a89978..2f384dbd336 100644
--- a/pkgs/servers/x11/xorg/extra.list
+++ b/pkgs/servers/x11/xorg/extra.list
@@ -1,2 +1,17 @@
 mirror://xorg/individual/xcb/xcb-util-0.3.6.tar.bz2
 mirror://xorg/individual/lib/pixman-0.20.2.tar.bz2
+mirror://xorg/individual/proto/dmxproto-2.3.1.tar.bz2
+mirror://xorg/individual/lib/libpciaccess-0.12.1.tar.bz2
+mirror://xorg/individual/lib/libX11-1.4.1.tar.bz2
+mirror://xorg/individual/lib/libXaw-1.0.9.tar.bz2
+mirror://xorg/individual/lib/libXi-1.4.1.tar.bz2
+mirror://xorg/individual/app/x11perf-1.5.3.tar.bz2
+mirror://xorg/individual/proto/xf86driproto-2.1.1.tar.bz2
+mirror://xorg/individual/driver/xf86-input-evdev-2.6.0.tar.bz2
+mirror://xorg/individual/driver/xf86-video-ati-6.14.2.tar.bz2
+mirror://xorg/individual/driver/xf86-video-intel-2.14.0.tar.bz2
+mirror://xorg/individual/proto/xf86vidmodeproto-2.3.1.tar.bz2
+mirror://xorg/individual/proto/xineramaproto-1.2.1.tar.bz2
+mirror://xorg/individual/app/xkbcomp-1.2.1.tar.bz2
+mirror://xorg/individual/xserver/xorg-server-1.9.5.tar.bz2
+mirror://xorg/individual/app/xrdb-1.0.8.tar.bz2
diff --git a/pkgs/servers/x11/xorg/tarballs-7.6.list b/pkgs/servers/x11/xorg/tarballs-7.6.list
index c8039d24671..fdd6409f028 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.6.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.6.list
@@ -3,7 +3,7 @@ mirror://xorg/X11R7.6/src/everything/bdftopcf-1.0.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/bigreqsproto-1.1.1.tar.bz2
 mirror://xorg/X11R7.6/src/everything/compositeproto-0.4.2.tar.bz2
 mirror://xorg/X11R7.6/src/everything/damageproto-1.2.1.tar.bz2
-mirror://xorg/individual/proto/dmxproto-2.3.1.tar.bz2
+mirror://xorg/X11R7.6/src/everything/dmxproto-2.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/dri2proto-2.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/encodings-1.0.4.tar.bz2
 mirror://xorg/X11R7.6/src/everything/fixesproto-4.1.2.tar.bz2
@@ -53,13 +53,13 @@ mirror://xorg/X11R7.6/src/everything/libdmx-1.1.1.tar.bz2
 mirror://xorg/X11R7.6/src/everything/libfontenc-1.1.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/libFS-1.0.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/libICE-1.0.7.tar.bz2
-mirror://xorg/individual/lib/libpciaccess-0.12.1.tar.bz2
+mirror://xorg/X11R7.6/src/everything/libpciaccess-0.12.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/libpthread-stubs-0.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/libSM-1.2.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/libWindowsWM-1.0.1.tar.bz2
-mirror://xorg/individual/lib/libX11-1.4.1.tar.bz2
+mirror://xorg/X11R7.6/src/everything/libX11-1.4.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/libXau-1.0.6.tar.bz2
-mirror://xorg/individual/lib/libXaw-1.0.9.tar.bz2
+mirror://xorg/X11R7.6/src/everything/libXaw-1.0.8.tar.bz2
 mirror://xorg/X11R7.6/src/everything/libxcb-1.7.tar.bz2
 mirror://xorg/X11R7.6/src/everything/libXcomposite-0.4.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/libXcursor-1.1.11.tar.bz2
@@ -69,7 +69,7 @@ mirror://xorg/X11R7.6/src/everything/libXext-1.2.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/libXfixes-4.0.5.tar.bz2
 mirror://xorg/X11R7.6/src/everything/libXfont-1.4.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/libXft-2.2.0.tar.bz2
-mirror://xorg/individual/lib/libXi-1.4.1.tar.bz2
+mirror://xorg/X11R7.6/src/everything/libXi-1.4.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/libXinerama-1.1.1.tar.bz2
 mirror://xorg/X11R7.6/src/everything/libxkbfile-1.0.7.tar.bz2
 mirror://xorg/X11R7.6/src/everything/libXmu-1.1.0.tar.bz2
@@ -99,7 +99,7 @@ mirror://xorg/X11R7.6/src/everything/smproxy-1.0.4.tar.bz2
 mirror://xorg/X11R7.6/src/everything/util-macros-1.11.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/videoproto-2.3.1.tar.bz2
 mirror://xorg/X11R7.6/src/everything/windowswmproto-1.0.4.tar.bz2
-mirror://xorg/individual/app/x11perf-1.5.3.tar.bz2
+mirror://xorg/X11R7.6/src/everything/x11perf-1.5.2.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xauth-1.0.5.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xbacklight-1.1.2.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xbitmaps-1.1.1.tar.bz2
@@ -114,10 +114,10 @@ mirror://xorg/X11R7.6/src/everything/xev-1.1.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xextproto-7.1.2.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86bigfontproto-1.2.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86dgaproto-2.1.tar.bz2
-mirror://xorg/individual/proto/xf86driproto-2.1.1.tar.bz2
+mirror://xorg/X11R7.6/src/everything/xf86driproto-2.1.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-input-acecad-1.4.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-input-aiptek-1.3.1.tar.bz2
-mirror://xorg/individual/driver/xf86-input-evdev-2.6.0.tar.bz2
+mirror://xorg/X11R7.6/src/everything/xf86-input-evdev-2.5.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-input-joystick-1.5.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-input-keyboard-1.5.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-input-mouse-1.6.0.tar.bz2
@@ -127,7 +127,7 @@ mirror://xorg/X11R7.6/src/everything/xf86-input-void-1.3.1.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-apm-1.2.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-ark-0.7.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-ast-0.91.10.tar.bz2
-mirror://xorg/individual/driver/xf86-video-ati-6.14.2.tar.bz2
+mirror://xorg/X11R7.6/src/everything/xf86-video-ati-6.13.2.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-chips-1.2.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-cirrus-1.3.2.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-dummy-0.3.4.tar.bz2
@@ -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/X11R7.6/src/everything/xf86-video-intel-2.13.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
@@ -169,12 +169,12 @@ mirror://xorg/X11R7.6/src/everything/xf86-video-voodoo-1.2.4.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-wsfb-0.3.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-xgi-1.6.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-xgixp-1.8.0.tar.bz2
-mirror://xorg/individual/proto/xf86vidmodeproto-2.3.1.tar.bz2
+mirror://xorg/X11R7.6/src/everything/xf86vidmodeproto-2.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xgamma-1.0.4.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xhost-1.0.4.tar.bz2
-mirror://xorg/individual/proto/xineramaproto-1.2.1.tar.bz2
+mirror://xorg/X11R7.6/src/everything/xineramaproto-1.2.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xinput-1.5.3.tar.bz2
-mirror://xorg/individual/app/xkbcomp-1.2.1.tar.bz2
+mirror://xorg/X11R7.6/src/everything/xkbcomp-1.2.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xkbevd-1.1.2.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xkbutils-1.0.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xkill-1.0.3.tar.bz2
@@ -182,13 +182,13 @@ mirror://xorg/X11R7.6/src/everything/xlsatoms-1.1.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xlsclients-1.1.1.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xmodmap-1.0.5.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xorg-docs-1.6.tar.bz2
-mirror://xorg/individual/xserver/xorg-server-1.9.5.tar.bz2
+mirror://xorg/X11R7.6/src/everything/xorg-server-1.9.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xorg-sgml-doctools-1.6.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xpr-1.0.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xprop-1.2.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xproto-7.0.20.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xrandr-1.3.4.tar.bz2
-mirror://xorg/individual/app/xrdb-1.0.8.tar.bz2
+mirror://xorg/X11R7.6/src/everything/xrdb-1.0.7.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xrefresh-1.0.4.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xset-1.2.1.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xsetroot-1.1.0.tar.bz2

From c9b2b8a1821648f5d30795c81f0decca64d8ae46 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sat, 31 Dec 2011 06:07:18 +0000
Subject: [PATCH 72/96] xcb-util(-*)-0.3.8 and xlsclients-1.1.2 in extra.list

svn path=/nixpkgs/trunk/; revision=31178
---
 pkgs/servers/x11/xorg/extra.list | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list
index 2f384dbd336..ce4781b9843 100644
--- a/pkgs/servers/x11/xorg/extra.list
+++ b/pkgs/servers/x11/xorg/extra.list
@@ -1,4 +1,9 @@
-mirror://xorg/individual/xcb/xcb-util-0.3.6.tar.bz2
+mirror://xorg/individual/app/xlsclients-1.1.2.tar.bz2
+mirror://xorg/individual/xcb/xcb-util-0.3.8.tar.bz2
+mirror://xorg/individual/xcb/xcb-util-image-0.3.8.tar.bz2
+mirror://xorg/individual/xcb/xcb-util-keysyms-0.3.8.tar.bz2
+mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.8.tar.bz2
+mirror://xorg/individual/xcb/xcb-util-wm-0.3.8.tar.bz2
 mirror://xorg/individual/lib/pixman-0.20.2.tar.bz2
 mirror://xorg/individual/proto/dmxproto-2.3.1.tar.bz2
 mirror://xorg/individual/lib/libpciaccess-0.12.1.tar.bz2

From 0bb20084b56bf748709d6f6bf7325ae72309b619 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sat, 31 Dec 2011 06:07:21 +0000
Subject: [PATCH 73/96] xorg: alphabetical extra.list

svn path=/nixpkgs/trunk/; revision=31179
---
 pkgs/servers/x11/xorg/extra.list | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list
index ce4781b9843..73c0355eafe 100644
--- a/pkgs/servers/x11/xorg/extra.list
+++ b/pkgs/servers/x11/xorg/extra.list
@@ -1,22 +1,22 @@
+mirror://xorg/individual/app/x11perf-1.5.3.tar.bz2
+mirror://xorg/individual/app/xkbcomp-1.2.1.tar.bz2
 mirror://xorg/individual/app/xlsclients-1.1.2.tar.bz2
+mirror://xorg/individual/app/xrdb-1.0.8.tar.bz2
+mirror://xorg/individual/driver/xf86-input-evdev-2.6.0.tar.bz2
+mirror://xorg/individual/driver/xf86-video-ati-6.14.2.tar.bz2
+mirror://xorg/individual/driver/xf86-video-intel-2.14.0.tar.bz2
+mirror://xorg/individual/lib/libX11-1.4.1.tar.bz2
+mirror://xorg/individual/lib/libXaw-1.0.9.tar.bz2
+mirror://xorg/individual/lib/libXi-1.4.1.tar.bz2
+mirror://xorg/individual/lib/libpciaccess-0.12.1.tar.bz2
+mirror://xorg/individual/lib/pixman-0.20.2.tar.bz2
+mirror://xorg/individual/proto/dmxproto-2.3.1.tar.bz2
+mirror://xorg/individual/proto/xf86driproto-2.1.1.tar.bz2
+mirror://xorg/individual/proto/xf86vidmodeproto-2.3.1.tar.bz2
+mirror://xorg/individual/proto/xineramaproto-1.2.1.tar.bz2
 mirror://xorg/individual/xcb/xcb-util-0.3.8.tar.bz2
 mirror://xorg/individual/xcb/xcb-util-image-0.3.8.tar.bz2
 mirror://xorg/individual/xcb/xcb-util-keysyms-0.3.8.tar.bz2
 mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.8.tar.bz2
 mirror://xorg/individual/xcb/xcb-util-wm-0.3.8.tar.bz2
-mirror://xorg/individual/lib/pixman-0.20.2.tar.bz2
-mirror://xorg/individual/proto/dmxproto-2.3.1.tar.bz2
-mirror://xorg/individual/lib/libpciaccess-0.12.1.tar.bz2
-mirror://xorg/individual/lib/libX11-1.4.1.tar.bz2
-mirror://xorg/individual/lib/libXaw-1.0.9.tar.bz2
-mirror://xorg/individual/lib/libXi-1.4.1.tar.bz2
-mirror://xorg/individual/app/x11perf-1.5.3.tar.bz2
-mirror://xorg/individual/proto/xf86driproto-2.1.1.tar.bz2
-mirror://xorg/individual/driver/xf86-input-evdev-2.6.0.tar.bz2
-mirror://xorg/individual/driver/xf86-video-ati-6.14.2.tar.bz2
-mirror://xorg/individual/driver/xf86-video-intel-2.14.0.tar.bz2
-mirror://xorg/individual/proto/xf86vidmodeproto-2.3.1.tar.bz2
-mirror://xorg/individual/proto/xineramaproto-1.2.1.tar.bz2
-mirror://xorg/individual/app/xkbcomp-1.2.1.tar.bz2
 mirror://xorg/individual/xserver/xorg-server-1.9.5.tar.bz2
-mirror://xorg/individual/app/xrdb-1.0.8.tar.bz2

From e45921800c7d7b34150d05ef8a13a775bfd9b962 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sat, 31 Dec 2011 06:07:23 +0000
Subject: [PATCH 74/96] adjusted example generate-expr-from-tarballs.pl call to
 7.6

svn path=/nixpkgs/trunk/; revision=31180
---
 pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 444a0637906..6acdc21ae65 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -2,9 +2,9 @@
 
 # Typical command to generate the list of tarballs:
 
-# export i="mirror://xorg/X11R7.4/src/everything/"; cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) | perl -e 'while (<>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' | sort > tarballs-7.4.list
+# export i="mirror://xorg/X11R7.6/src/everything/"; cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) | perl -e 'while (<>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' | sort > tarballs-7.6.list
 # manually update extra.list
-# then run: cat tarballs-7.4.list extra.list old.list | perl ./generate-expr-from-tarballs.pl
+# then run: cat tarballs-7.6.list extra.list old.list | perl ./generate-expr-from-tarballs.pl
 
 use strict;
 

From cebb40f53337efbba3ae52443e72cd583dd23938 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sat, 31 Dec 2011 06:07:26 +0000
Subject: [PATCH 75/96] adjusted oder of *.list in
 generate-expr-from-tarballs.pl example

svn path=/nixpkgs/trunk/; revision=31181
---
 pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 6acdc21ae65..6183c806491 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -4,7 +4,7 @@
 
 # export i="mirror://xorg/X11R7.6/src/everything/"; cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) | perl -e 'while (<>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' | sort > tarballs-7.6.list
 # manually update extra.list
-# then run: cat tarballs-7.6.list extra.list old.list | perl ./generate-expr-from-tarballs.pl
+# then run: cat extra.list tarballs-7.6.list old.list | perl ./generate-expr-from-tarballs.pl
 
 use strict;
 

From f6090f6bbae488422a1c58b50c01fdc12b1f08bc Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sat, 31 Dec 2011 06:07:28 +0000
Subject: [PATCH 76/96] reproduced my previous manual changes through
 generation of default.nix

svn path=/nixpkgs/trunk/; revision=31182
---
 pkgs/servers/x11/xorg/default.nix | 36 +++++++++++++++----------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index b10db9309f4..b5e4d0e7b98 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1152,52 +1152,50 @@ let
     builder = ./builder.sh;
     src = fetchurl {
       url = mirror://xorg/individual/xcb/xcb-util-0.3.8.tar.bz2;
-      sha256 = "c1eed9284750bc09352e60654df77bb585dbbe7673fdcc675e58b7f3a0b447b9";
+      sha256 = "1fa7njhg7dsqbrkwrzbkfszdp1dmggvlsrb05qshkg2h8wldkvn1";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xproto ];
   })) // {inherit gperf m4 libxcb xproto ;};
     
-  xcbutilImage = (stdenv.mkDerivation ((if overrides ? xcbutil then overrides.xcbutil else x: x) {
+  xcbutilimage = (stdenv.mkDerivation ((if overrides ? xcbutilimage then overrides.xcbutilimage else x: x) {
     name = "xcb-util-image-0.3.8";
     builder = ./builder.sh;
     src = fetchurl {
       url = mirror://xorg/individual/xcb/xcb-util-image-0.3.8.tar.bz2;
-      sha256 = "40390528c26e8231132540f16579b821de68bb2e9152918f72182d5a4038a6d9";
+      sha256 = "1nd67105lb8qfa7r2lli5sxnipi1p1wnbwa04l9k30kfq8l0afa0";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xcbutil xproto ];
   })) // {inherit gperf m4 libxcb xcbutil xproto ;};
     
-  # XXX: No package 'xorg-macros' found
-  xcbutilKeysyms = (stdenv.mkDerivation ((if overrides ? xcbutil then overrides.xcbutil else x: x) {
+  xcbutilkeysyms = (stdenv.mkDerivation ((if overrides ? xcbutilkeysyms then overrides.xcbutilkeysyms else x: x) {
     name = "xcb-util-keysyms-0.3.8";
     builder = ./builder.sh;
     src = fetchurl {
       url = mirror://xorg/individual/xcb/xcb-util-keysyms-0.3.8.tar.bz2;
-      sha256 = "913d32f7afe380c580da7636ee13f2728790237bb5c03def536363f552686121";
+      sha256 = "08b1d19gaqv3agpkvh5mgcir11vjy89ywdknva0cb073mzvk4gci";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xproto ];
   })) // {inherit gperf m4 libxcb xproto ;};
     
-  # XXX: No package 'xorg-macros' found
-  xcbutilRenderutil = (stdenv.mkDerivation ((if overrides ? xcbutil then overrides.xcbutil else x: x) {
+  xcbutilrenderutil = (stdenv.mkDerivation ((if overrides ? xcbutilrenderutil then overrides.xcbutilrenderutil else x: x) {
     name = "xcb-util-renderutil-0.3.8";
     builder = ./builder.sh;
     src = fetchurl {
       url = mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.8.tar.bz2;
-      sha256 = "9789a5c55728fa7bae374d9fdf1c61095869bdc68561911760879095644c7452";
+      sha256 = "0lkl9ij9b447c0br2qc5qsynjn09c4fdz7sd6yp7pyi8az2sb2cp";
     };
-    buildInputs = [pkgconfig gperf m4 libxcb ];
-  })) // {inherit gperf m4 libxcb ;};
+    buildInputs = [pkgconfig gperf m4 libxcb xproto ];
+  })) // {inherit gperf m4 libxcb xproto ;};
     
-  xcbutilWm = (stdenv.mkDerivation ((if overrides ? xcbutil then overrides.xcbutil else x: x) {
+  xcbutilwm = (stdenv.mkDerivation ((if overrides ? xcbutilwm then overrides.xcbutilwm else x: x) {
     name = "xcb-util-wm-0.3.8";
     builder = ./builder.sh;
     src = fetchurl {
       url = mirror://xorg/individual/xcb/xcb-util-wm-0.3.8.tar.bz2;
-      sha256 = "c557abbe4c7d45268f0541ee3d8f9a1a8799692fcc28aa33f39db93cc2e65007";
+      sha256 = "01shwv13rfcxycrsla6c5xlrk1qska7kvvj10n7jcibx9jzanmy5";
     };
-    buildInputs = [pkgconfig gperf m4 libxcb ];
-  })) // {inherit gperf m4 libxcb ;};
+    buildInputs = [pkgconfig gperf m4 libxcb xproto ];
+  })) // {inherit gperf m4 libxcb xproto ;};
     
   xclock = (stdenv.mkDerivation ((if overrides ? xclock then overrides.xclock else x: x) {
     name = "xclock-1.0.5";
@@ -1474,7 +1472,7 @@ let
     builder = ./builder.sh;
     src = fetchurl {
       url = mirror://xorg/individual/driver/xf86-video-ati-6.14.2.tar.bz2;
-      sha256 = "017974b622eea3b4483405368492b0c6f178854a9b9753d50e13c578b8a328dc";
+      sha256 = "1p18lfw7ii8k1vam75wv9a2piwf6n2988dh56i4b98zf4av78y81";
     };
     buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
   })) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
@@ -2024,10 +2022,10 @@ let
     builder = ./builder.sh;
     src = fetchurl {
       url = mirror://xorg/individual/app/xlsclients-1.1.2.tar.bz2;
-      sha256 = "1ce5f3987b63ea79b3f8421fcb1dd9c739e99efa97f280eafd8e93574b9027d1";
+      sha256 = "1l97j15mg4wfzpm81wlpzagfjff7v4fwn7s2z2rpksk3gfcg7r8w";
     };
-    buildInputs = [pkgconfig libxcb xcbutil ];
-  })) // {inherit libxcb xcbutil ;};
+    buildInputs = [pkgconfig libxcb ];
+  })) // {inherit libxcb ;};
     
   xmessage = (stdenv.mkDerivation ((if overrides ? xmessage then overrides.xmessage else x: x) {
     name = "xmessage-1.0.3";

From 2a2ceace7f3ae9a6cf91a8972f0e903f28bcdc4c Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sat, 31 Dec 2011 06:07:32 +0000
Subject: [PATCH 77/96] generate-expr-from-tarballs.pl support multiple
 versions

svn path=/nixpkgs/trunk/; revision=31183
---
 .../x11/xorg/generate-expr-from-tarballs.pl       | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 6183c806491..b53f436ffb8 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -44,11 +44,16 @@ while (<>) {
     my $tarball = "$_";
     print "\nDOING TARBALL $tarball\n";
 
-    $tarball =~ /\/((?:(?:[A-Za-z0-9]|(?:-[^0-9])|(?:-[0-9]*[a-z]))+))[^\/]*$/;
-    die unless defined $1;
-    my $pkg = $1;
-    $pkg =~ s/-//g;
-    #next unless $pkg eq "xcbutil";
+    my $pkg;
+    if ($tarball =~ s/:([a-zA-Z0-9_]+)$//) {
+      $pkg = $1;
+    } else {
+      $tarball =~ /\/((?:(?:[A-Za-z0-9]|(?:-[^0-9])|(?:-[0-9]*[a-z]))+))[^\/]*$/;
+      die unless defined $1;
+      $pkg = $1;
+      $pkg =~ s/-//g;
+      #next unless $pkg eq "xcbutil";
+    }
 
     $tarball =~ /\/([^\/]*)\.tar\.bz2$/;
     my $pkgName = $1;

From 174590039627261b347b5030b710304c6285924c Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sat, 31 Dec 2011 06:07:34 +0000
Subject: [PATCH 78/96] add xf86-video-intel-2.14.901 (and while at it 2.17.0)
 to extra.list

svn path=/nixpkgs/trunk/; revision=31184
---
 pkgs/servers/x11/xorg/extra.list | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list
index 73c0355eafe..f8c7c85d0dc 100644
--- a/pkgs/servers/x11/xorg/extra.list
+++ b/pkgs/servers/x11/xorg/extra.list
@@ -5,6 +5,8 @@ mirror://xorg/individual/app/xrdb-1.0.8.tar.bz2
 mirror://xorg/individual/driver/xf86-input-evdev-2.6.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ati-6.14.2.tar.bz2
 mirror://xorg/individual/driver/xf86-video-intel-2.14.0.tar.bz2
+mirror://xorg/individual/driver/xf86-video-intel-2.14.901.tar.bz2:xf86videointel_2_14_901
+mirror://xorg/individual/driver/xf86-video-intel-2.17.0.tar.bz2:xf86videointel_2_17_0
 mirror://xorg/individual/lib/libX11-1.4.1.tar.bz2
 mirror://xorg/individual/lib/libXaw-1.0.9.tar.bz2
 mirror://xorg/individual/lib/libXi-1.4.1.tar.bz2

From d2e8c37e416590a624470afcda9ed0c054a50277 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sat, 31 Dec 2011 06:07:37 +0000
Subject: [PATCH 79/96] default.nix now fully generated again

with additional xf86-video-intel-2.17.0 and what looks like a fixed
xf86-video-intel-2.14.901.

svn path=/nixpkgs/trunk/; revision=31185
---
 pkgs/servers/x11/xorg/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index b5e4d0e7b98..17f0afadef4 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1577,7 +1577,7 @@ let
     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 ;};
     
-  xf86videointel_2_14_901 = (stdenv.mkDerivation ((if overrides ? xf86videointel then overrides.xf86videointel else x: x) {
+  xf86videointel_2_14_901 = (stdenv.mkDerivation ((if overrides ? xf86videointel_2_14_901 then overrides.xf86videointel_2_14_901 else x: x) {
     name = "xf86-video-intel-2.14.901";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1587,6 +1587,16 @@ let
     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 ;};
     
+  xf86videointel_2_17_0 = (stdenv.mkDerivation ((if overrides ? xf86videointel_2_17_0 then overrides.xf86videointel_2_17_0 else x: x) {
+    name = "xf86-video-intel-2.17.0";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/driver/xf86-video-intel-2.17.0.tar.bz2;
+      sha256 = "11s3vjp0lrfmb4bv848fd5bajj77j3rf451lm0qyylnclbr5114b";
+    };
+    buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess pixman randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ];
+  })) // {inherit dri2proto fontsproto libdrm udev libpciaccess pixman randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ;};
+    
   xf86videomach64 = (stdenv.mkDerivation ((if overrides ? xf86videomach64 then overrides.xf86videomach64 else x: x) {
     name = "xf86-video-mach64-6.8.2";
     builder = ./builder.sh;

From 90dda8a07f80380a33ee1ef828384a0bd372ff8c Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sat, 31 Dec 2011 06:14:31 +0000
Subject: [PATCH 80/96] adjusted awesome to generated names of xcbutil-*

svn path=/nixpkgs/trunk/; revision=31186
---
 pkgs/applications/window-managers/awesome/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index fbf3b087cc7..b44f6d9f3aa 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, xz, cmake, gperf, imagemagick, pkgconfig, lua
 , glib, cairo, pango, imlib2, libxcb, libxdg_basedir, xcbutil
-, xcbutilImage, xcbutilKeysyms, xcbutilWm, libpthreadstubs, libXau
+, xcbutilimage, xcbutilkeysyms, xcbutilwm, libpthreadstubs, libXau
 , libXdmcp, pixman, doxygen
 , libstartup_notification, libev, asciidoc, xmlto, dbus, docbook_xsl
 , docbook_xml_dtd_45, libxslt, coreutils}:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   };
  
   buildInputs = [ xz cmake gperf imagemagick pkgconfig lua glib cairo pango
-    imlib2 libxcb libxdg_basedir xcbutil xcbutilImage xcbutilKeysyms xcbutilWm
+    imlib2 libxcb libxdg_basedir xcbutil xcbutilimage xcbutilkeysyms xcbutilwm
     libstartup_notification libev libpthreadstubs libXau libXdmcp pixman doxygen
     asciidoc xmlto dbus docbook_xsl docbook_xml_dtd_45 libxslt ];
 

From 2e31e7293acbae24aba278995853dbb6cf0a7901 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sat, 31 Dec 2011 15:37:51 +0000
Subject: [PATCH 81/96] moved parts of extra.list back to tarballs-7.6.list

also added an short description about them to generate-expr-from-tarballs.pl

svn path=/nixpkgs/trunk/; revision=31189
---
 pkgs/servers/x11/xorg/extra.list              | 16 ----------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  6 +++-
 pkgs/servers/x11/xorg/tarballs-7.6.list       | 32 +++++++++----------
 3 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list
index f8c7c85d0dc..744eb66d84c 100644
--- a/pkgs/servers/x11/xorg/extra.list
+++ b/pkgs/servers/x11/xorg/extra.list
@@ -1,24 +1,8 @@
-mirror://xorg/individual/app/x11perf-1.5.3.tar.bz2
-mirror://xorg/individual/app/xkbcomp-1.2.1.tar.bz2
-mirror://xorg/individual/app/xlsclients-1.1.2.tar.bz2
-mirror://xorg/individual/app/xrdb-1.0.8.tar.bz2
-mirror://xorg/individual/driver/xf86-input-evdev-2.6.0.tar.bz2
-mirror://xorg/individual/driver/xf86-video-ati-6.14.2.tar.bz2
-mirror://xorg/individual/driver/xf86-video-intel-2.14.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-intel-2.14.901.tar.bz2:xf86videointel_2_14_901
 mirror://xorg/individual/driver/xf86-video-intel-2.17.0.tar.bz2:xf86videointel_2_17_0
-mirror://xorg/individual/lib/libX11-1.4.1.tar.bz2
-mirror://xorg/individual/lib/libXaw-1.0.9.tar.bz2
-mirror://xorg/individual/lib/libXi-1.4.1.tar.bz2
-mirror://xorg/individual/lib/libpciaccess-0.12.1.tar.bz2
 mirror://xorg/individual/lib/pixman-0.20.2.tar.bz2
-mirror://xorg/individual/proto/dmxproto-2.3.1.tar.bz2
-mirror://xorg/individual/proto/xf86driproto-2.1.1.tar.bz2
-mirror://xorg/individual/proto/xf86vidmodeproto-2.3.1.tar.bz2
-mirror://xorg/individual/proto/xineramaproto-1.2.1.tar.bz2
 mirror://xorg/individual/xcb/xcb-util-0.3.8.tar.bz2
 mirror://xorg/individual/xcb/xcb-util-image-0.3.8.tar.bz2
 mirror://xorg/individual/xcb/xcb-util-keysyms-0.3.8.tar.bz2
 mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.8.tar.bz2
 mirror://xorg/individual/xcb/xcb-util-wm-0.3.8.tar.bz2
-mirror://xorg/individual/xserver/xorg-server-1.9.5.tar.bz2
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index b53f436ffb8..89edb571e0f 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -4,7 +4,11 @@
 
 # export i="mirror://xorg/X11R7.6/src/everything/"; cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) | perl -e 'while (<>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' | sort > tarballs-7.6.list
 # manually update extra.list
-# then run: cat extra.list tarballs-7.6.list old.list | perl ./generate-expr-from-tarballs.pl
+# then run: cat tarballs-7.6.list extra.list old.list | perl ./generate-expr-from-tarballs.pl
+# tarballs-x.y.list is generated + changes for individual packages
+# extra.list are packages not contained in the tarballs
+# old.list are packages that used to be part of the tarballs
+
 
 use strict;
 
diff --git a/pkgs/servers/x11/xorg/tarballs-7.6.list b/pkgs/servers/x11/xorg/tarballs-7.6.list
index fdd6409f028..b90f4780cfa 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.6.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.6.list
@@ -3,8 +3,8 @@ mirror://xorg/X11R7.6/src/everything/bdftopcf-1.0.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/bigreqsproto-1.1.1.tar.bz2
 mirror://xorg/X11R7.6/src/everything/compositeproto-0.4.2.tar.bz2
 mirror://xorg/X11R7.6/src/everything/damageproto-1.2.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/dmxproto-2.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/dri2proto-2.3.tar.bz2
+mirror://xorg/individual/proto/dmxproto-2.3.1.tar.bz2
 mirror://xorg/X11R7.6/src/everything/encodings-1.0.4.tar.bz2
 mirror://xorg/X11R7.6/src/everything/fixesproto-4.1.2.tar.bz2
 mirror://xorg/X11R7.6/src/everything/font-adobe-100dpi-1.0.3.tar.bz2
@@ -53,13 +53,13 @@ mirror://xorg/X11R7.6/src/everything/libdmx-1.1.1.tar.bz2
 mirror://xorg/X11R7.6/src/everything/libfontenc-1.1.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/libFS-1.0.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/libICE-1.0.7.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libpciaccess-0.12.0.tar.bz2
+mirror://xorg/individual/lib/libpciaccess-0.12.1.tar.bz2
 mirror://xorg/X11R7.6/src/everything/libpthread-stubs-0.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/libSM-1.2.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/libWindowsWM-1.0.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libX11-1.4.0.tar.bz2
+mirror://xorg/individual/lib/libX11-1.4.1.tar.bz2
 mirror://xorg/X11R7.6/src/everything/libXau-1.0.6.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXaw-1.0.8.tar.bz2
+mirror://xorg/individual/lib/libXaw-1.0.9.tar.bz2
 mirror://xorg/X11R7.6/src/everything/libxcb-1.7.tar.bz2
 mirror://xorg/X11R7.6/src/everything/libXcomposite-0.4.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/libXcursor-1.1.11.tar.bz2
@@ -69,7 +69,7 @@ mirror://xorg/X11R7.6/src/everything/libXext-1.2.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/libXfixes-4.0.5.tar.bz2
 mirror://xorg/X11R7.6/src/everything/libXfont-1.4.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/libXft-2.2.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXi-1.4.0.tar.bz2
+mirror://xorg/individual/lib/libXi-1.4.1.tar.bz2
 mirror://xorg/X11R7.6/src/everything/libXinerama-1.1.1.tar.bz2
 mirror://xorg/X11R7.6/src/everything/libxkbfile-1.0.7.tar.bz2
 mirror://xorg/X11R7.6/src/everything/libXmu-1.1.0.tar.bz2
@@ -99,7 +99,7 @@ mirror://xorg/X11R7.6/src/everything/smproxy-1.0.4.tar.bz2
 mirror://xorg/X11R7.6/src/everything/util-macros-1.11.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/videoproto-2.3.1.tar.bz2
 mirror://xorg/X11R7.6/src/everything/windowswmproto-1.0.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/x11perf-1.5.2.tar.bz2
+mirror://xorg/individual/app/x11perf-1.5.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xauth-1.0.5.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xbacklight-1.1.2.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xbitmaps-1.1.1.tar.bz2
@@ -114,10 +114,10 @@ mirror://xorg/X11R7.6/src/everything/xev-1.1.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xextproto-7.1.2.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86bigfontproto-1.2.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86dgaproto-2.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86driproto-2.1.0.tar.bz2
+mirror://xorg/individual/proto/xf86driproto-2.1.1.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-input-acecad-1.4.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-input-aiptek-1.3.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-input-evdev-2.5.0.tar.bz2
+mirror://xorg/individual/driver/xf86-input-evdev-2.6.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-input-joystick-1.5.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-input-keyboard-1.5.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-input-mouse-1.6.0.tar.bz2
@@ -127,7 +127,7 @@ mirror://xorg/X11R7.6/src/everything/xf86-input-void-1.3.1.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-apm-1.2.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-ark-0.7.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-ast-0.91.10.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-ati-6.13.2.tar.bz2
+mirror://xorg/individual/driver/xf86-video-ati-6.14.2.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-chips-1.2.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-cirrus-1.3.2.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-dummy-0.3.4.tar.bz2
@@ -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/X11R7.6/src/everything/xf86-video-intel-2.13.0.tar.bz2
+mirror://xorg/individual/driver/xf86-video-intel-2.14.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
@@ -169,26 +169,26 @@ mirror://xorg/X11R7.6/src/everything/xf86-video-voodoo-1.2.4.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-wsfb-0.3.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-xgi-1.6.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-xgixp-1.8.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86vidmodeproto-2.3.tar.bz2
+mirror://xorg/individual/proto/xf86vidmodeproto-2.3.1.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xgamma-1.0.4.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xhost-1.0.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xineramaproto-1.2.tar.bz2
+mirror://xorg/individual/proto/xineramaproto-1.2.1.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xinput-1.5.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xkbcomp-1.2.0.tar.bz2
+mirror://xorg/individual/app/xkbcomp-1.2.1.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xkbevd-1.1.2.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xkbutils-1.0.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xkill-1.0.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xlsatoms-1.1.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xlsclients-1.1.1.tar.bz2
+mirror://xorg/individual/app/xlsclients-1.1.2.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xmodmap-1.0.5.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xorg-docs-1.6.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xorg-server-1.9.3.tar.bz2
+mirror://xorg/individual/xserver/xorg-server-1.9.5.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xorg-sgml-doctools-1.6.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xpr-1.0.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xprop-1.2.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xproto-7.0.20.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xrandr-1.3.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xrdb-1.0.7.tar.bz2
+mirror://xorg/individual/app/xrdb-1.0.8.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xrefresh-1.0.4.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xset-1.2.1.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xsetroot-1.1.0.tar.bz2

From 076977b46206b3ef93d6c3e1e7c6d478c78f9931 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 1 Jan 2012 20:01:02 +0000
Subject: [PATCH 82/96] Making procps crossbuild.

svn path=/nixpkgs/trunk/; revision=31190
---
 pkgs/os-specific/linux/procps/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/os-specific/linux/procps/default.nix b/pkgs/os-specific/linux/procps/default.nix
index dce0e36edb4..9c894256413 100644
--- a/pkgs/os-specific/linux/procps/default.nix
+++ b/pkgs/os-specific/linux/procps/default.nix
@@ -19,6 +19,10 @@ stdenv.mkDerivation {
   
   makeFlags = "DESTDIR=$(out)";
 
+  crossAttrs = {
+    CC = stdenv.cross.config + "-gcc";
+  };
+
   meta = {
     homepage = http://procps.sourceforge.net/;
     description = "Utilities that give information about processes using the /proc filesystem";

From be12dae1ec4c124571d4c18fb20696e6b9e924a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 1 Jan 2012 20:14:50 +0000
Subject: [PATCH 83/96] Fixing the busybox installation. All symlinks were
 pointing wrong.

svn path=/nixpkgs/trunk/; revision=31191
---
 pkgs/misc/busybox/default.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/misc/busybox/default.nix b/pkgs/misc/busybox/default.nix
index f3a73514ed8..6ca30ddd96b 100644
--- a/pkgs/misc/busybox/default.nix
+++ b/pkgs/misc/busybox/default.nix
@@ -29,7 +29,7 @@ let
 
   nixConfig = ''
     CONFIG_PREFIX "$out"
-    CONFIG_INSTALL_NO_USR n
+    CONFIG_INSTALL_NO_USR y
   '';
 
   staticConfig = (if enableStatic then ''
@@ -58,12 +58,6 @@ stdenv.mkDerivation rec {
     make oldconfig
   '';
 
-  postInstall = ''
-    mv -v $out/usr/bin/* $out/bin
-    mv -v $out/usr/sbin/* $out/sbin
-    rm -fRv $out/usr/
-  '';
-
   crossAttrs = {
     extraCrossConfig = ''
       CONFIG_CROSS_COMPILER_PREFIX "${stdenv.cross.config}-"

From 25db17f1b3c17a446564e8fe9742530563aba003 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 1 Jan 2012 21:24:11 +0000
Subject: [PATCH 84/96] haskell-data-accessor: updated to version 0.2.2.1

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

diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
index f6b48befd5d..76bee6c05a8 100644
--- a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
+++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "data-accessor";
-  version = "0.2.2";
-  sha256 = "1jqd0qlv1yab83d5pdbzjw6q4a2kvbsar6kgczq0f0xn9gxm0qci";
+  version = "0.2.2.1";
+  sha256 = "1zb7z9fnlnxxlvjd655vadfscanzq9msvjv21cjmdric0ja24hxb";
   buildDepends = [ transformers ];
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Record_access";

From e2c7b54f8c8247a2a93a7eb7e9cbab5983ef3d40 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 1 Jan 2012 21:24:14 +0000
Subject: [PATCH 85/96] haskell-derive: updated to version 2.5.5

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

diff --git a/pkgs/development/libraries/haskell/derive/default.nix b/pkgs/development/libraries/haskell/derive/default.nix
index 7f28ad8b10d..c98ddb04cd5 100644
--- a/pkgs/development/libraries/haskell/derive/default.nix
+++ b/pkgs/development/libraries/haskell/derive/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "derive";
-  version = "2.5.4";
-  sha256 = "0gmj24qzh3vyvp0a44v4mf1qpkrg4d9q0m15d0yfbyzrimyjx1c7";
+  version = "2.5.5";
+  sha256 = "1vv7y2jfyxq2abh4avyjwia309a6rylbyiqia1m0ka7zwv2rxd6y";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ haskellSrcExts syb transformers uniplate ];

From ff5e4c4f4be3269f25d869478bcaddf9caf91bdd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 1 Jan 2012 21:24:17 +0000
Subject: [PATCH 86/96] haskell-syb-with-class: updated to version 0.6.1.3

svn path=/nixpkgs/trunk/; revision=31194
---
 pkgs/development/libraries/haskell/syb/syb-with-class.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

From a0e70167099bccee14c9318085ba3161b4d3e83a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 1 Jan 2012 21:24:20 +0000
Subject: [PATCH 87/96] haskell-texmath: updated to version 0.5.0.4

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

diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix
index d25c80a1810..032f79ce077 100644
--- a/pkgs/development/libraries/haskell/texmath/default.nix
+++ b/pkgs/development/libraries/haskell/texmath/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "texmath";
-  version = "0.5.0.3";
-  sha256 = "0pw3b5qvsngy0wdny8y3widkaphvjksg7mnpa8yzqfsw0rl36s0p";
+  version = "0.5.0.4";
+  sha256 = "0wi7zix10p73hb8aiyq47d27k5hi0l0ba5p6h7kdbhia9xm5w5w5";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ parsec syb xml ];

From 6639c58398f5c79996ca32243f8d650242a5704e Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 2 Jan 2012 10:42:25 +0000
Subject: [PATCH 88/96] Use qt-4.8 by default

Some packages may break because pkgconfig is no longer propagated.

svn path=/nixpkgs/trunk/; revision=31196
---
 pkgs/desktops/kde-4.7/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index 3bdf825410c..6abcc02139d 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, callPackageOrig, stdenv, qt47 }:
+{ callPackage, callPackageOrig, stdenv, qt48 }:
 
 let
   release = "4.7.4";
@@ -44,7 +44,7 @@ kde.modules // kde.individual //
 
   akonadi = callPackage ./support/akonadi { };
 
-  qt4 = qt47;
+  qt4 = qt48;
 
   kdebase_workspace = kde.modules.kde_workspace;
 

From 097b7635af59d6b767aebfbeff1adca98e0898ee Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 2 Jan 2012 10:42:36 +0000
Subject: [PATCH 89/96] Explicitly add sqlite to calibre.buildInputs

The better way would be adding sqlite to
pythonPackages.sqlite3.propagatedBuildInputs but I don't want to touch this
code.

svn path=/nixpkgs/trunk/; revision=31197
---
 pkgs/applications/misc/calibre/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 1685ef50b8d..b8100fbd709 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng
-, imagemagick, libjpeg, fontconfig, podofo, qt4, icu
+, imagemagick, libjpeg, fontconfig, podofo, qt4, icu, sqlite
 , pil, makeWrapper, unrar, chmlib, pythonPackages, xz
 }:
 
@@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
     [ python pyqt4 sip popplerQt4 libpng imagemagick libjpeg
       fontconfig podofo qt4 pil chmlib icu
       pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil
-      pythonPackages.cssutils pythonPackages.beautifulsoap pythonPackages.sqlite3
+      pythonPackages.cssutils pythonPackages.beautifulsoap
+      pythonPackages.sqlite3 sqlite
     ];
 
   installPhase = ''

From 78c300f0150f1ec8742d4b1fa80005a1b07f1950 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 2 Jan 2012 11:12:27 +0000
Subject: [PATCH 90/96] soprano-2.7.4, pass pkgconfig explicitly

svn path=/nixpkgs/trunk/; revision=31198
---
 pkgs/development/libraries/soprano/default.nix | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/soprano/default.nix b/pkgs/development/libraries/soprano/default.nix
index 49e6e6b96df..40fd36840fd 100644
--- a/pkgs/development/libraries/soprano/default.nix
+++ b/pkgs/development/libraries/soprano/default.nix
@@ -1,26 +1,20 @@
-{ stdenv, fetchurl, cmake, qt4, clucene_core, librdf_redland, libiodbc }:
+{ stdenv, fetchurl, cmake, qt4, clucene_core, librdf_redland, libiodbc
+, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "soprano-2.7.0";
+  name = "soprano-2.7.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/soprano/${name}.tar.bz2";
-    sha256 = "1ki92wg0i9nhn1fh5mdcls5h9h3lf2k5r66snsags4x7zw0dmv2z";
+    sha256 = "0f6kg39bi4h4iblfs9ny88cs951sigm50yr6w50afc3f1nqzdmhp";
   };
 
-  patches =
-    [ (fetchurl { # Applied upstream, remove if upgrading
-        url = https://git.reviewboard.kde.org/r/102466/diff/raw/;
-        name = "soprano-virtuoso-restart.patch";
-        sha256 = "0jk038fp7ii6847mbxdajhhc7f6ap6lriaklxcqqxf6ddj37gf3y";
-      })
-      ./find-virtuoso.patch 
-    ];
+  patches = [ ./find-virtuoso.patch ];
 
   # We disable the Java backend, since we do not need them and they make the closure size much bigger
   buildInputs = [ qt4 clucene_core librdf_redland libiodbc ];
 
-  buildNativeInputs = [ cmake ];
+  buildNativeInputs = [ cmake pkgconfig ];
 
   meta = {
     homepage = http://soprano.sourceforge.net/;

From 0c824aa4567c8dc52685caedc547b463568d21f0 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 2 Jan 2012 11:16:48 +0000
Subject: [PATCH 91/96] Pass pkgconfig to strigi

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

diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix
index 1888ef2aab6..6d7212f5c5c 100644
--- a/pkgs/development/libraries/strigi/default.nix
+++ b/pkgs/development/libraries/strigi/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cmake, qt4, perl, bzip2, libxml2, exiv2
-, clucene_core, fam, zlib, dbus_tools
+, clucene_core, fam, zlib, dbus_tools, pkgconfig
 }:
 
 stdenv.mkDerivation rec {
@@ -16,7 +16,9 @@ stdenv.mkDerivation rec {
   CLUCENE_HOME = clucene_core;
 
   buildInputs =
-    [ cmake perl zlib bzip2 stdenv.gcc.libc libxml2 qt4 exiv2 clucene_core fam dbus_tools ];
+    [ zlib bzip2 stdenv.gcc.libc libxml2 qt4 exiv2 clucene_core fam dbus_tools ];
+
+  buildNativeInputs = [ cmake pkgconfig perl ];
 
   enableParallelBuilding = true;
 

From 2a0453e43e280b42ea94217442c759d8891d20f8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Jan 2012 11:22:58 +0000
Subject: [PATCH 92/96] haskell-enumerator: updated to version 0.4.17

svn path=/nixpkgs/trunk/; revision=31200
---
 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 12e801516a6..58e5ab4b62d 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.16";
-  sha256 = "16556x3km4si7gvprf7xmsiqw1ygjwavhbgh32fmzf7709bpqnhs";
+  version = "0.4.17";
+  sha256 = "009h9phdgnkbvz5fri81b895y2hbmw5x7z67rnn31j87khbhnfz9";
   buildDepends = [ text transformers ];
   meta = {
     homepage = "https://john-millikin.com/software/enumerator/";

From a6c6878f5b1a466b5a401ee1b0f3698c250ca66d Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 2 Jan 2012 11:35:13 +0000
Subject: [PATCH 93/96] libdbusmenu-qt-0.9.0, disable apidocs

svn path=/nixpkgs/trunk/; revision=31201
---
 pkgs/development/libraries/libdbusmenu-qt/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix
index 3c138cca416..4c12880f557 100644
--- a/pkgs/development/libraries/libdbusmenu-qt/default.nix
+++ b/pkgs/development/libraries/libdbusmenu-qt/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, qt4, cmake, doxygen }:
+{ stdenv, fetchurl, qt4, cmake }:
 
 let
   baseName = "libdbusmenu-qt";
-  v = "0.8.3";
+  v = "0.9.0";
 in
 
 stdenv.mkDerivation rec {
@@ -10,10 +10,13 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://launchpad.net/${baseName}/trunk/${v}/+download/${name}.tar.bz2";
-    sha256 = "1fkw6wpxjmmx4p8779z662qphip3pgdcsn6cyb0frryfj4sa32ka";
+    sha256 = "0xdicb3fmwgbyhc6cpcmdkwysdg18m5rcqc3izpwv6brq4aq4787";
   };
 
-  buildInputs = [ cmake qt4 doxygen ];
+  buildInputs = [ qt4 ];
+  buildNativeInputs = [ cmake ];
+
+  cmakeFlags = "-DWITH_DOC=OFF";
   
   meta = with stdenv.lib; {
     description = "Provides a Qt implementation of the DBusMenu spec";

From b8a3e5fbc91e6b36a7bc07b3a619fa7749275157 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 2 Jan 2012 12:52:43 +0000
Subject: [PATCH 94/96] kdelibs: depend on libjpeg

svn path=/nixpkgs/trunk/; revision=31202
---
 pkgs/desktops/kde-4.7/kdelibs.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-4.7/kdelibs.nix b/pkgs/desktops/kde-4.7/kdelibs.nix
index 83de4e95136..d4383b3e93a 100644
--- a/pkgs/desktops/kde-4.7/kdelibs.nix
+++ b/pkgs/desktops/kde-4.7/kdelibs.nix
@@ -3,7 +3,7 @@
 , xz, openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver
 , automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt
 , docbook_xml_dtd_42, docbook_xsl, polkit_qt_1
-, getopt, udev, herqq, phonon
+, getopt, udev, herqq, phonon, libjpeg
 }:
 
 kde {
@@ -11,7 +11,7 @@ kde {
     [
       acl attr attica avahi bzip2 enchant fam getopt giflib herqq jasper
       libdbusmenu_qt libXScrnSaver libxslt pcre polkit_qt_1 qca2
-      shared_desktop_ontologies udev xz libxml2
+      shared_desktop_ontologies udev xz libxml2 libjpeg
     ];
 
   propagatedBuildInputs = [ qt4 soprano strigi phonon ];

From 15ab248bca6518e0a7e109e3276141c43f68ea99 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 2 Jan 2012 12:54:22 +0000
Subject: [PATCH 95/96] Revert "Use qt-4.8 by default"

This reverts r31196. Will re-apply after fixing most packages broken by this
change.

svn path=/nixpkgs/trunk/; revision=31203
---
 pkgs/desktops/kde-4.7/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index 6abcc02139d..3bdf825410c 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, callPackageOrig, stdenv, qt48 }:
+{ callPackage, callPackageOrig, stdenv, qt47 }:
 
 let
   release = "4.7.4";
@@ -44,7 +44,7 @@ kde.modules // kde.individual //
 
   akonadi = callPackage ./support/akonadi { };
 
-  qt4 = qt48;
+  qt4 = qt47;
 
   kdebase_workspace = kde.modules.kde_workspace;
 

From 7928d532a265f7f6966fdce792d65a0d1ac27b63 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 2 Jan 2012 13:42:11 +0000
Subject: [PATCH 96/96] Fix dia.name

svn path=/nixpkgs/trunk/; revision=31204
---
 pkgs/applications/graphics/dia/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix
index 533e196cee4..a06ec7c0b8e 100644
--- a/pkgs/applications/graphics/dia/default.nix
+++ b/pkgs/applications/graphics/dia/default.nix
@@ -3,7 +3,7 @@
 , withGNOME ? false, libgnomeui }:
 
 stdenv.mkDerivation rec {
-  inherit (src) name;
+  name = src.pkgname;
 
   src = fetchurl_gnome {
     project = "dia";