From 42fd7e5d64b79eec1a3c75e01f8377ed92071e84 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Oct 2011 10:27:57 +0000
Subject: [PATCH 01/95] python-ldap: added version 2.4.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ec71f7c881a..2ca2e261a17 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1358,6 +1358,17 @@ let pythonPackages = python.modules // rec {
     };
   };
 
+  ldap = buildPythonPackage rec {
+    name = "python-ldap-2.4.3";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/python-ldap/${name}.tar.gz";
+      sha256 = "17aysa9b4zjw00ikjirf4m37xbp2ifj1g0zjs14xzqqib3nh1yw8";
+    };
+
+    NIX_CFLAGS_COMPILE = "-I${pkgs.cyrus_sasl}/include/sasl";
+    propagatedBuildInputs = [pkgs.openldap pkgs.cyrus_sasl pkgs.openssl];
+  };
 
   pylint = buildPythonPackage rec {
     name = "pylint-0.23.0";

From 4f32c23d86d25b53bbdefaff9061a294ca42e754 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 19 Oct 2011 12:24:24 +0000
Subject: [PATCH 02/95] Bumped some versions of Disnix tools

svn path=/nixpkgs/trunk/; revision=29890
---
 .../disnix/activation-scripts/default.nix                   | 6 +++---
 pkgs/tools/package-management/disnix/default.nix            | 6 +++---
 pkgs/tools/package-management/disnix/disnixos/default.nix   | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/package-management/disnix/activation-scripts/default.nix b/pkgs/tools/package-management/disnix/activation-scripts/default.nix
index 4e1442935ee..8725f5d1250 100644
--- a/pkgs/tools/package-management/disnix/activation-scripts/default.nix
+++ b/pkgs/tools/package-management/disnix/activation-scripts/default.nix
@@ -16,10 +16,10 @@ assert enableSubversionRepository -> subversion != null;
 assert enableEjabberdDump -> ejabberd != null;
 
 stdenv.mkDerivation {
-  name = "disnix-activation-scripts-0.2";
+  name = "disnix-activation-scripts-0.3pre29887";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/910903/download/1/disnix-activation-scripts-0.2.tar.gz;
-    sha256 = "0r7yqvh3jnbvpb6lmr10lm4r5pvi4jaw0c6rhlyl5q6nh3mxymnd";
+    url = http://hydra.nixos.org/build/1461490/download/1/disnix-activation-scripts-0.3pre29887.tar.gz;
+    sha256 = "034mx096iz9dqjsrxh6jkvcwch399gfsahrm6vfnswz9jfvfdcw0";
   };
   
   preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else "";
diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix
index fbb19159ef8..631db35a9b0 100644
--- a/pkgs/tools/package-management/disnix/default.nix
+++ b/pkgs/tools/package-management/disnix/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, gettext, libiconv}:
 
 stdenv.mkDerivation {
-  name = "disnix-0.3pre27244";
+  name = "disnix-0.3pre29816";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/1083290/download/4/disnix-0.3pre27244.tar.gz;
-    sha256 = "1x7y34mxs26k019y9y8fsnzdk7wmjqfmybw99qgqqxy5kblvlzns";
+    url = http://hydra.nixos.org/build/1453079/download/4/disnix-0.3pre29816.tar.gz;
+    sha256 = "13gi0zs0a8pvgmgh3h431ydran3qf3px5m3d6vddd9b225kbkgwz";
   };
   buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable ]
                 ++ stdenv.lib.optional (!stdenv.isLinux) libiconv
diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix
index 1a7ca571604..9fe76d81070 100644
--- a/pkgs/tools/package-management/disnix/disnixos/default.nix
+++ b/pkgs/tools/package-management/disnix/disnixos/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, disnix, socat, pkgconfig}:
 
 stdenv.mkDerivation {
-  name = "disnixos-0.2pre27672";
+  name = "disnixos-0.2pre29885";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/1153468/download/3/disnixos-0.2pre27672.tar.gz;
-    sha256 = "0z74p9fnvchvl78brj2p3r9h0wwvpl86zk0ynzqcf8ww0h71ws08";
+    url = http://hydra.nixos.org/build/1461383/download/3/disnixos-0.2pre29885.tar.gz;
+    sha256 = "1lyxpadykk7nbb7gad12mbcsz29c6fqihhv3k3vkh32fimbq7bma";
   };
   buildInputs = [ socat pkgconfig disnix ];
   dontStrip = true;

From efaa164120b5c9f434904e637d3c963b83e48dbc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Oct 2011 16:36:40 +0000
Subject: [PATCH 03/95] haskell-packages.nix: fixed misspelled uuParsinglib
 attribute

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index aae14807855..c604ed49bfe 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1225,7 +1225,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   uulib = callPackage ../development/libraries/haskell/uulib {};
 
-  uuParsingLib = callPackage ../development/libraries/haskell/uu-parsinglib {};
+  uuParsinglib = callPackage ../development/libraries/haskell/uu-parsinglib {};
 
   vacuum = callPackage ../development/libraries/haskell/vacuum {};
 

From eec3529bc2a6138b785605fb588d85330b6c513e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Oct 2011 16:36:45 +0000
Subject: [PATCH 04/95] haskell-NanoProlog: added version 0.2.3.1

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

diff --git a/pkgs/development/libraries/haskell/NanoProlog/default.nix b/pkgs/development/libraries/haskell/NanoProlog/default.nix
new file mode 100644
index 00000000000..8daa9d2f815
--- /dev/null
+++ b/pkgs/development/libraries/haskell/NanoProlog/default.nix
@@ -0,0 +1,19 @@
+{ cabal, ListLike, uuParsinglib }:
+
+cabal.mkDerivation (self: {
+  pname = "NanoProlog";
+  version = "0.2.3.1";
+  sha256 = "1pyvf1vmq61nhjg09416ap37c07lavrrgj2m9wx9dkyvhipzlxjv";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ ListLike uuParsinglib ];
+  meta = {
+    description = "Very small interpreter for a Prolog-like language";
+    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 c604ed49bfe..adb1b585d77 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -874,6 +874,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   mwcRandom = callPackage ../development/libraries/haskell/mwc-random {};
 
+  NanoProlog = callPackage ../development/libraries/haskell/NanoProlog {};
+
   neither = callPackage ../development/libraries/haskell/neither {};
 
   network_2_2_1_4 = callPackage ../development/libraries/haskell/network/2.2.1.4.nix {};

From f7a1a82fcec36ac61f039c79206cf58f0fa1743e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Oct 2011 16:36:51 +0000
Subject: [PATCH 05/95] haskell-crypto-api: added version 0.7

svn path=/nixpkgs/trunk/; revision=29897
---
 .../crypto-api/{default.nix => 0.6.4.nix}      |  0
 .../libraries/haskell/crypto-api/0.7.nix       | 18 ++++++++++++++++++
 pkgs/top-level/haskell-packages.nix            |  4 +++-
 3 files changed, 21 insertions(+), 1 deletion(-)
 rename pkgs/development/libraries/haskell/crypto-api/{default.nix => 0.6.4.nix} (100%)
 create mode 100644 pkgs/development/libraries/haskell/crypto-api/0.7.nix

diff --git a/pkgs/development/libraries/haskell/crypto-api/default.nix b/pkgs/development/libraries/haskell/crypto-api/0.6.4.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/crypto-api/default.nix
rename to pkgs/development/libraries/haskell/crypto-api/0.6.4.nix
diff --git a/pkgs/development/libraries/haskell/crypto-api/0.7.nix b/pkgs/development/libraries/haskell/crypto-api/0.7.nix
new file mode 100644
index 00000000000..644edbf1961
--- /dev/null
+++ b/pkgs/development/libraries/haskell/crypto-api/0.7.nix
@@ -0,0 +1,18 @@
+{ cabal, cereal, entropy, largeword, tagged }:
+
+cabal.mkDerivation (self: {
+  pname = "crypto-api";
+  version = "0.7";
+  sha256 = "0831rmkq603ga9py5xxfw77qixdliyh15dxh9ls7rd7ia6sqjvx0";
+  buildDepends = [ cereal entropy largeword tagged ];
+  meta = {
+    homepage = "http://trac.haskell.org/crypto-api/wiki";
+    description = "A generic interface for cryptographic operations";
+    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 adb1b585d77..cface11d4e2 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -488,7 +488,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   Crypto = callPackage ../development/libraries/haskell/Crypto {};
 
-  cryptoApi = callPackage ../development/libraries/haskell/crypto-api {};
+  cryptoApi_0_6_4 = callPackage ../development/libraries/haskell/crypto-api/0.6.4.nix {};
+  cryptoApi_0_7 = callPackage ../development/libraries/haskell/crypto-api/0.7.nix {};
+  cryptoApi = self.cryptoApi_0_6_4;
 
   cryptocipher = callPackage ../development/libraries/haskell/cryptocipher {};
 

From d547b72bee62617e4aa5b213e8766f12cc5d0481 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Oct 2011 16:36:57 +0000
Subject: [PATCH 06/95] haskell-blaze-builder-enumerator: updated to version
 0.2.0.3

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

diff --git a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix
index 84d667de29a..ccc8d36d6fd 100644
--- a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-builder-enumerator";
-  version = "0.2.0.2";
-  sha256 = "0as4mjh695jpxp9qfhpsxyr1448l0pk94sh5kk8sgxv5hfiy41k9";
+  version = "0.2.0.3";
+  sha256 = "00a9rly27sh49gi5askg7z3ji8ig9llxk4qcznsag01d1z0kb97n";
   buildDepends = [ blazeBuilder enumerator transformers ];
   meta = {
     homepage = "https://github.com/meiersi/blaze-builder-enumerator";

From 34f300aee6af215e4346dfbeffa0a8874ef6afbf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Oct 2011 16:37:01 +0000
Subject: [PATCH 07/95] haskell-hp2any-core: updated to version 0.11.1

svn path=/nixpkgs/trunk/; revision=29899
---
 .../development/libraries/haskell/hp2any-core/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hp2any-core/default.nix b/pkgs/development/libraries/haskell/hp2any-core/default.nix
index 8bc4620ac26..f1634f632a3 100644
--- a/pkgs/development/libraries/haskell/hp2any-core/default.nix
+++ b/pkgs/development/libraries/haskell/hp2any-core/default.nix
@@ -1,10 +1,10 @@
-{ cabal, bytestringTrie, network, time }:
+{ cabal, attoparsec, network, time }:
 
 cabal.mkDerivation (self: {
   pname = "hp2any-core";
-  version = "0.10.1";
-  sha256 = "1qblsvlj4x22ml3k5mlr28r5xk9rmi7lpipd369dbvdzm0rflf03";
-  buildDepends = [ bytestringTrie network time ];
+  version = "0.11.1";
+  sha256 = "146bigmch7dawyyakj0w55p0jdpnxkj8q5izjsswqqk0pdxia546";
+  buildDepends = [ attoparsec network time ];
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Hp2any";
     description = "Heap profiling helper library";

From bfc36e2f8a1185d626b8a94b53ae3945117a63a7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Oct 2011 16:37:05 +0000
Subject: [PATCH 08/95] haskell-yap: updated to version 0.1

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

diff --git a/pkgs/development/libraries/haskell/yap/default.nix b/pkgs/development/libraries/haskell/yap/default.nix
index 858466ab1a4..27938a2fad0 100644
--- a/pkgs/development/libraries/haskell/yap/default.nix
+++ b/pkgs/development/libraries/haskell/yap/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yap";
-  version = "0.0";
-  sha256 = "0cjsmf9p220fb9yf2i81xspa3rpnlln3hfb9yc5x6xbcc6py0nw5";
+  version = "0.1";
+  sha256 = "14x1z5pmb499qq5sy0iksxv0mli8556s1jh9jm7rdg671h1cy1hl";
   meta = {
     description = "yet another prelude - a simplistic refactoring with algebraic classes";
     license = self.stdenv.lib.licenses.bsd3;

From 94dbab27a39dbc50bf0a4088694ce4c17cd0e87f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 19 Oct 2011 17:11:26 +0000
Subject: [PATCH 09/95] Bootstrap clang with itself

svn path=/nixpkgs/trunk/; revision=29901
---
 pkgs/development/compilers/llvm/default.nix | 15 +++++++++------
 pkgs/stdenv/adapters.nix                    |  1 +
 pkgs/top-level/all-packages.nix             |  7 ++++++-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index c98005417c9..fc308f4e61c 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -1,17 +1,20 @@
-{ stdenv, fetchurl, gcc, flex, perl, libtool, groff
-, buildClang ? false }:
+{ stdenv, fetchurl, perl, groff, buildClang ? false }:
 
 let version = "2.9"; in
 
 stdenv.mkDerivation ({
   name = "llvm-${version}";
 
+  CC = if stdenv.gcc ? clang then "clang" else "gcc";
+
+  CXX = if stdenv.gcc ? clang then "clang++" else "g++";
+
   src = fetchurl {
     url    = "http://llvm.org/releases/${version}/llvm-${version}.tgz";
     sha256 = "0y9pgdakn3n0vf8zs6fjxjw6972nyw4rkfwwza6b8a3ll77kc4k6";
   };
 
-  buildInputs = [ gcc flex perl groff ];
+  buildInputs = [ perl groff ];
 
   configureFlags = [ "--enable-optimized" "--enable-shared" "--disable-static" ];
 
@@ -51,13 +54,13 @@ stdenv.mkDerivation ({
 
     # Set up the header file paths
     preConfigure = ''
-      sed -i -e 's,C_INCLUDE_PATH,"${gcc.libc}/include/",' \
+      sed -i -e 's,C_INCLUDE_PATH,"${stdenv.gcc.libc}/include/",' \
         -e 's,CPP_HOST,"${triplet}",' \
-        -e 's,CPP_INCLUDE_PATH,"${gcc.gcc}/include/c++/${gcc.gcc.version}",' \
+        -e 's,CPP_INCLUDE_PATH,"${stdenv.gcc.gcc}/include/c++/${stdenv.gcc.gcc.version}",' \
         tools/clang/lib/Frontend/InitHeaderSearch.cpp
     '';
 
-    passthru = { gcc = gcc.gcc; };
+    passthru = { gcc = stdenv.gcc.gcc; };
 
     meta = {
       homepage = http://clang.llvm.org/;
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 3e596c4ef0e..311d967c0a3 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -11,6 +11,7 @@ rec {
   # Override the compiler in stdenv for specific packages.
   overrideGCC = stdenv: gcc: stdenv //
     { mkDerivation = args: stdenv.mkDerivation (args // { NIX_GCC = gcc; });
+      inherit gcc;
     };
 
     
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3660c152a16..ba131ccf476 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1640,7 +1640,12 @@ let
 
   ccl = builderDefsPackage ../development/compilers/ccl {};
 
-  clang = wrapClang (llvm.override { buildClang = true; });
+  clangBoot = wrapClang (llvm.override { buildClang = true; });
+
+  clang = wrapClang (llvm.override { buildClang = true; stdenv = stdenvAdapters.overrideGCC stdenv clangBoot; });
+
+  #Use this instead of stdenv to build with clang
+  clangStdenv = stdenvAdapters.overrideGCC stdenv clang;
 
   clangSVN = llvmSVN.override {
     buildClang = true;

From 94884218d440d81219fbb397cdd34097706dd227 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Oct 2011 18:06:13 +0000
Subject: [PATCH 10/95] haskell-haskeline: updated to version 0.6.4.5

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

diff --git a/pkgs/development/libraries/haskell/haskeline/default.nix b/pkgs/development/libraries/haskell/haskeline/default.nix
index 63fdc751d8d..2b15fa562bf 100644
--- a/pkgs/development/libraries/haskell/haskeline/default.nix
+++ b/pkgs/development/libraries/haskell/haskeline/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "haskeline";
-  version = "0.6.4.4";
-  sha256 = "03cnhidnpnz7fh34c7x0rpl15zi6hkh9khganrdhwa59srxzbxqb";
+  version = "0.6.4.5";
+  sha256 = "1blhbh53p6di3q3gldzmg3i8f4w3ahipai3di49i4rdcnjry0j5b";
   buildDepends = [ extensibleExceptions mtl terminfo utf8String ];
   meta = {
     homepage = "http://trac.haskell.org/haskeline";

From 3c80eda948d29ca347e1a21456fe4f43f86d30e3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Oct 2011 18:06:19 +0000
Subject: [PATCH 11/95] haskell-vector: ensure that version 0.7.1 uses the
 correct version of 'primitive'

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index cface11d4e2..73c41a9d06a 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1237,7 +1237,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   Vec = callPackage ../development/libraries/haskell/Vec {};
 
-  vector_0_7_1 = callPackage ../development/libraries/haskell/vector/0.7.1.nix {};
+  vector_0_7_1 = callPackage ../development/libraries/haskell/vector/0.7.1.nix {
+    primitive = self.primitive_0_3_1;
+  };
   vector_0_9 = callPackage ../development/libraries/haskell/vector/0.9.nix {
     primitive = self.primitive_0_4_0_1;
   };

From 0b115205578e7907874a0a19d58aaa8dcbae1ade Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Oct 2011 18:25:45 +0000
Subject: [PATCH 12/95] haskell-packages.nix: make users of haskell-vector and
 haskell-primitive explicit

svn path=/nixpkgs/trunk/; revision=29904
---
 pkgs/top-level/haskell-packages.nix | 76 ++++++++++++++++++++++-------
 1 file changed, 58 insertions(+), 18 deletions(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 73c41a9d06a..b62bd4d3bab 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -366,9 +366,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   ACVector = callPackage ../development/libraries/haskell/AC-Vector {};
 
-  aeson = callPackage ../development/libraries/haskell/aeson {};
+  aeson = callPackage ../development/libraries/haskell/aeson {
+    vector = self.vector_0_7_1;
+  };
 
-  aesonNative = callPackage ../development/libraries/haskell/aeson-native {};
+  aesonNative = callPackage ../development/libraries/haskell/aeson-native {
+    vector = self.vector_0_7_1;
+  };
 
   ansiTerminal = callPackage ../development/libraries/haskell/ansi-terminal {};
 
@@ -418,9 +422,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   blazeHtml = callPackage ../development/libraries/haskell/blaze-html {};
 
-  blazeTextual = callPackage ../development/libraries/haskell/blaze-textual {};
+  blazeTextual = callPackage ../development/libraries/haskell/blaze-textual {
+    vector = self.vector_0_7_1;
+  };
 
-  blazeTextualNative = callPackage ../development/libraries/haskell/blaze-textual-native {};
+  blazeTextualNative = callPackage ../development/libraries/haskell/blaze-textual-native {
+    vector = self.vector_0_7_1;
+  };
 
   bmp = callPackage ../development/libraries/haskell/bmp {};
 
@@ -484,7 +492,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   cprngAes = callPackage ../development/libraries/haskell/cprng-aes {};
 
-  criterion = callPackage ../development/libraries/haskell/criterion {};
+  criterion = callPackage ../development/libraries/haskell/criterion {
+    vector = self.vector_0_7_1;
+  };
 
   Crypto = callPackage ../development/libraries/haskell/Crypto {};
 
@@ -492,7 +502,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   cryptoApi_0_7 = callPackage ../development/libraries/haskell/crypto-api/0.7.nix {};
   cryptoApi = self.cryptoApi_0_6_4;
 
-  cryptocipher = callPackage ../development/libraries/haskell/cryptocipher {};
+  cryptocipher = callPackage ../development/libraries/haskell/cryptocipher {
+     primitive = self.primitive_0_3_1;
+     vector = self.vector_0_7_1;
+  };
 
   cryptohash = callPackage ../development/libraries/haskell/cryptohash {};
 
@@ -581,7 +594,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   fingertree = callPackage ../development/libraries/haskell/fingertree {};
 
-  gamma = callPackage ../development/libraries/haskell/gamma {};
+  gamma = callPackage ../development/libraries/haskell/gamma {
+    vector = self.vector_0_7_1;
+  };
 
   gdiff = callPackage ../development/libraries/haskell/gdiff {};
 
@@ -729,7 +744,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   HList = callPackage ../development/libraries/haskell/HList {};
 
-  hmatrix = callPackage ../development/libraries/haskell/hmatrix {};
+  hmatrix = callPackage ../development/libraries/haskell/hmatrix {
+    vector = self.vector_0_7_1;
+  };
 
   hopenssl = callPackage ../development/libraries/haskell/hopenssl {};
 
@@ -874,7 +891,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   murmurHash = callPackage ../development/libraries/haskell/murmur-hash {};
 
-  mwcRandom = callPackage ../development/libraries/haskell/mwc-random {};
+  mwcRandom = callPackage ../development/libraries/haskell/mwc-random {
+     primitive = self.primitive_0_3_1;
+     vector = self.vector_0_7_1;
+  };
 
   NanoProlog = callPackage ../development/libraries/haskell/NanoProlog {};
 
@@ -995,7 +1015,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   random = null; # core package until ghc-7.2.1
   random_newtime = self.random_1_0_0_2_newtime;
 
-  randomFu = callPackage ../development/libraries/haskell/random-fu {};
+  randomFu = callPackage ../development/libraries/haskell/random-fu {
+    vector = self.vector_0_7_1;
+  };
 
   randomSource = callPackage ../development/libraries/haskell/random-source {};
 
@@ -1071,15 +1093,22 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   smallcheck = callPackage ../development/libraries/haskell/smallcheck {};
 
-  snapCore = callPackage ../development/libraries/haskell/snap/core.nix {};
+  snapCore = callPackage ../development/libraries/haskell/snap/core.nix {
+    vector = self.vector_0_7_1;
+  };
 
-  snapServer = callPackage ../development/libraries/haskell/snap/server.nix {};
+  snapServer = callPackage ../development/libraries/haskell/snap/server.nix {
+    vector = self.vector_0_7_1;
+  };
 
   stateref = callPackage ../development/libraries/haskell/stateref {};
 
   StateVar = callPackage ../development/libraries/haskell/StateVar {};
 
-  statistics = callPackage ../development/libraries/haskell/statistics {};
+  statistics = callPackage ../development/libraries/haskell/statistics {
+     primitive = self.primitive_0_3_1;
+     vector = self.vector_0_7_1;
+  };
 
   streamproc = callPackage ../development/libraries/haskell/streamproc {};
 
@@ -1198,7 +1227,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   tls = callPackage ../development/libraries/haskell/tls {};
 
-  tlsExtra = callPackage ../development/libraries/haskell/tls-extra {};
+  tlsExtra = callPackage ../development/libraries/haskell/tls-extra {
+    vector = self.vector_0_7_1;
+  };
 
   transformers_0_2_2_0 = callPackage ../development/libraries/haskell/transformers/0.2.2.0.nix {};
   transformers = self.transformers_0_2_2_0;
@@ -1245,12 +1276,19 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   };
   vector = self.vector_0_7_1;
 
-  vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {};
+  vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {
+     primitive = self.primitive_0_3_1;
+     vector = self.vector_0_7_1;
+  };
 
   vectorSpace = callPackage ../development/libraries/haskell/vector-space {};
 
-  vty_4_6_0_4 = callPackage ../development/libraries/haskell/vty/4.6.0.4.nix {};
-  vty_4_7_0_4 = callPackage ../development/libraries/haskell/vty/4.7.0.4.nix {};
+  # vty_4_6_0_4 = callPackage ../development/libraries/haskell/vty/4.6.0.4.nix {
+  #   vector = self.vector_0_7_1;
+  # };
+  vty_4_7_0_4 = callPackage ../development/libraries/haskell/vty/4.7.0.4.nix {
+    vector = self.vector_0_7_1;
+  };
   vty = self.vty_4_7_0_4;
 
   wai = callPackage ../development/libraries/haskell/wai {};
@@ -1317,7 +1355,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   yesodForm = callPackage ../development/libraries/haskell/yesod-form {};
 
-  yesodJson = callPackage ../development/libraries/haskell/yesod-json {};
+  yesodJson = callPackage ../development/libraries/haskell/yesod-json {
+    vector = self.vector_0_7_1;
+  };
 
   yesodPersistent = callPackage ../development/libraries/haskell/yesod-persistent {};
 

From b903b335fbd42af9c16432d7f7c1d250da6b9a75 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Oct 2011 18:25:52 +0000
Subject: [PATCH 13/95] haskell-vty: dropped obsolete version 4.6.0.4

svn path=/nixpkgs/trunk/; revision=29905
---
 .../libraries/haskell/vty/4.6.0.4.nix          | 18 ------------------
 .../haskell/vty/{4.7.0.4.nix => default.nix}   |  0
 pkgs/top-level/haskell-packages.nix            |  6 +-----
 3 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/vty/4.6.0.4.nix
 rename pkgs/development/libraries/haskell/vty/{4.7.0.4.nix => default.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/vty/4.6.0.4.nix b/pkgs/development/libraries/haskell/vty/4.6.0.4.nix
deleted file mode 100644
index 55c73118446..00000000000
--- a/pkgs/development/libraries/haskell/vty/4.6.0.4.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ cabal, deepseq, mtl, parallel, parsec, terminfo, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "vty";
-  version = "4.6.0.4";
-  sha256 = "0kabssw3v7nglvsr687ppmdnnmii1q2g5zg8rxwi2hcmvnjx7567";
-  buildDepends = [ deepseq mtl parallel parsec terminfo utf8String ];
-  meta = {
-    homepage = "http://trac.haskell.org/vty/";
-    description = "A simple terminal access 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/vty/4.7.0.4.nix b/pkgs/development/libraries/haskell/vty/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/vty/4.7.0.4.nix
rename to pkgs/development/libraries/haskell/vty/default.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index b62bd4d3bab..d922b397c31 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1283,13 +1283,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   vectorSpace = callPackage ../development/libraries/haskell/vector-space {};
 
-  # vty_4_6_0_4 = callPackage ../development/libraries/haskell/vty/4.6.0.4.nix {
-  #   vector = self.vector_0_7_1;
-  # };
-  vty_4_7_0_4 = callPackage ../development/libraries/haskell/vty/4.7.0.4.nix {
+  vty = callPackage ../development/libraries/haskell/vty {
     vector = self.vector_0_7_1;
   };
-  vty = self.vty_4_7_0_4;
 
   wai = callPackage ../development/libraries/haskell/wai {};
 

From 8398d7ef2a77c7afa4fe2fd2956254419c51e060 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Oct 2011 18:25:57 +0000
Subject: [PATCH 14/95] haskell-packages.nix: update default attributes of
 vector and primitive to the latest versions

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index d922b397c31..fc834042dbc 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -977,7 +977,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   primitive_0_3_1 = callPackage ../development/libraries/haskell/primitive/0.3.1.nix {};
   primitive_0_4_0_1 = callPackage ../development/libraries/haskell/primitive/0.4.0.1.nix {};
-  primitive = self.primitive_0_3_1;
+  primitive = self.primitive_0_4_0_1;
 
   processLeksah = callPackage ../development/libraries/haskell/leksah/process-leksah.nix {};
 
@@ -1274,7 +1274,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   vector_0_9 = callPackage ../development/libraries/haskell/vector/0.9.nix {
     primitive = self.primitive_0_4_0_1;
   };
-  vector = self.vector_0_7_1;
+  vector = self.vector_0_9;
 
   vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {
      primitive = self.primitive_0_3_1;

From 9a8c52cf41858f8c8076e3ee0a52fa1d32a62dbc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Oct 2011 18:26:02 +0000
Subject: [PATCH 15/95] haskell-hmatrix: enable -fvector flag

svn path=/nixpkgs/trunk/; revision=29907
---
 pkgs/development/libraries/haskell/hmatrix/default.nix | 1 +
 pkgs/top-level/haskell-packages.nix                    | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix
index 43c66c3d894..5f45d99c75c 100644
--- a/pkgs/development/libraries/haskell/hmatrix/default.nix
+++ b/pkgs/development/libraries/haskell/hmatrix/default.nix
@@ -10,6 +10,7 @@ cabal.mkDerivation (self: {
     binary HUnit QuickCheck random storableComplex vector
   ];
   extraLibraries = [ blas gsl liblapack ];
+  configureFlags = "-fvector";
   meta = {
     homepage = "http://perception.inf.um.es/hmatrix";
     description = "Linear algebra and numerical computation";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index fc834042dbc..0f2f551af56 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -744,9 +744,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   HList = callPackage ../development/libraries/haskell/HList {};
 
-  hmatrix = callPackage ../development/libraries/haskell/hmatrix {
-    vector = self.vector_0_7_1;
-  };
+  hmatrix = callPackage ../development/libraries/haskell/hmatrix {};
 
   hopenssl = callPackage ../development/libraries/haskell/hopenssl {};
 

From 35bbc615f7a06045645f15c1c6097109b31d9348 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Oct 2011 19:37:27 +0000
Subject: [PATCH 16/95] haskell-packages.nix: cosmetic

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 0f2f551af56..a93d654b0fa 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -503,8 +503,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   cryptoApi = self.cryptoApi_0_6_4;
 
   cryptocipher = callPackage ../development/libraries/haskell/cryptocipher {
-     primitive = self.primitive_0_3_1;
-     vector = self.vector_0_7_1;
+    primitive = self.primitive_0_3_1;
+    vector = self.vector_0_7_1;
   };
 
   cryptohash = callPackage ../development/libraries/haskell/cryptohash {};
@@ -890,8 +890,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   murmurHash = callPackage ../development/libraries/haskell/murmur-hash {};
 
   mwcRandom = callPackage ../development/libraries/haskell/mwc-random {
-     primitive = self.primitive_0_3_1;
-     vector = self.vector_0_7_1;
+    primitive = self.primitive_0_3_1;
+    vector = self.vector_0_7_1;
   };
 
   NanoProlog = callPackage ../development/libraries/haskell/NanoProlog {};
@@ -1104,8 +1104,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   StateVar = callPackage ../development/libraries/haskell/StateVar {};
 
   statistics = callPackage ../development/libraries/haskell/statistics {
-     primitive = self.primitive_0_3_1;
-     vector = self.vector_0_7_1;
+    primitive = self.primitive_0_3_1;
+    vector = self.vector_0_7_1;
   };
 
   streamproc = callPackage ../development/libraries/haskell/streamproc {};
@@ -1275,8 +1275,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   vector = self.vector_0_9;
 
   vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {
-     primitive = self.primitive_0_3_1;
-     vector = self.vector_0_7_1;
+    primitive = self.primitive_0_3_1;
+    vector = self.vector_0_7_1;
   };
 
   vectorSpace = callPackage ../development/libraries/haskell/vector-space {};

From 172507f79e3894408cb4804f270f16896936bf96 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Oct 2011 19:37:34 +0000
Subject: [PATCH 17/95] haskell-WebBits: added version 2.1

svn path=/nixpkgs/trunk/; revision=29909
---
 .../libraries/haskell/WebBits/2.1.nix          | 18 ++++++++++++++++++
 pkgs/top-level/haskell-packages.nix            | 11 ++++++++---
 2 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/WebBits/2.1.nix

diff --git a/pkgs/development/libraries/haskell/WebBits/2.1.nix b/pkgs/development/libraries/haskell/WebBits/2.1.nix
new file mode 100644
index 00000000000..915ff0b1d60
--- /dev/null
+++ b/pkgs/development/libraries/haskell/WebBits/2.1.nix
@@ -0,0 +1,18 @@
+{ cabal, mtl, parsec, syb }:
+
+cabal.mkDerivation (self: {
+  pname = "WebBits";
+  version = "2.1";
+  sha256 = "18m19fck9zb6jh8bfd47nja1q6ab1jmd0q5r3k8m5674i6273hyn";
+  buildDepends = [ mtl parsec syb ];
+  meta = {
+    homepage = "http://www.cs.brown.edu/research/plt/";
+    description = "JavaScript analysis tools";
+    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 a93d654b0fa..74bff87bf79 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1299,10 +1299,15 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   WebBits_2_0 = callPackage ../development/libraries/haskell/WebBits/2.0.nix {
     parsec = self.parsec2;
   };
-  WebBits = self.WebBits_2_0;
+  WebBits_2_1 = callPackage ../development/libraries/haskell/WebBits/2.1.nix {};
+  WebBits = self.WebBits_2_1;
 
-  WebBitsHtml_1_0_1 = callPackage ../development/libraries/haskell/WebBits-Html/1.0.1.nix {};
-  WebBitsHtml_1_0_2 = callPackage ../development/libraries/haskell/WebBits-Html/1.0.2.nix {};
+  WebBitsHtml_1_0_1 = callPackage ../development/libraries/haskell/WebBits-Html/1.0.1.nix {
+    WebBits = self.WebBits_2_0;
+  };
+  WebBitsHtml_1_0_2 = callPackage ../development/libraries/haskell/WebBits-Html/1.0.2.nix {
+    WebBits = self.WebBits_2_0;
+  };
   WebBitsHtml = self.WebBitsHtml_1_0_2;
 
   webRoutes = callPackage ../development/libraries/haskell/web-routes {};

From f3f7cbde1905c663d8bcb36ad577dff26b17f300 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Oct 2011 19:45:38 +0000
Subject: [PATCH 18/95] updated to haskell-vector 0.9: aeson-native,
 blaze-textual-native, and cryptocipher

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 74bff87bf79..c0a88e9048c 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -370,9 +370,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     vector = self.vector_0_7_1;
   };
 
-  aesonNative = callPackage ../development/libraries/haskell/aeson-native {
-    vector = self.vector_0_7_1;
-  };
+  aesonNative = callPackage ../development/libraries/haskell/aeson-native {};
 
   ansiTerminal = callPackage ../development/libraries/haskell/ansi-terminal {};
 
@@ -426,9 +424,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     vector = self.vector_0_7_1;
   };
 
-  blazeTextualNative = callPackage ../development/libraries/haskell/blaze-textual-native {
-    vector = self.vector_0_7_1;
-  };
+  blazeTextualNative = callPackage ../development/libraries/haskell/blaze-textual-native {};
 
   bmp = callPackage ../development/libraries/haskell/bmp {};
 
@@ -502,10 +498,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   cryptoApi_0_7 = callPackage ../development/libraries/haskell/crypto-api/0.7.nix {};
   cryptoApi = self.cryptoApi_0_6_4;
 
-  cryptocipher = callPackage ../development/libraries/haskell/cryptocipher {
-    primitive = self.primitive_0_3_1;
-    vector = self.vector_0_7_1;
-  };
+  cryptocipher = callPackage ../development/libraries/haskell/cryptocipher {};
 
   cryptohash = callPackage ../development/libraries/haskell/cryptohash {};
 
@@ -1063,9 +1056,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   regular = callPackage ../development/libraries/haskell/regular {};
 
-  repa = callPackage ../development/libraries/haskell/repa {
-    vector = self.vector_0_9;
-  };
+  repa = callPackage ../development/libraries/haskell/repa {};
 
   repaAlgorithms = callPackage ../development/libraries/haskell/repa-algorithms {};
 

From fe7f1ba5705e2e13b4d512b1250fbc6484a75b10 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Oct 2011 19:45:43 +0000
Subject: [PATCH 19/95] haskell-yesod-auth: updated to version 0.7.4

svn path=/nixpkgs/trunk/; revision=29911
---
 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 56d5c43887b..fb74e1dfba2 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.2";
-  sha256 = "18i1ijxrhmmxy45ymc89f7m2zazd7lca4jv4q08d7mr1hdgsx8cn";
+  version = "0.7.4";
+  sha256 = "088hhyy7fwga7hwqqwxxn12iqnz6jadq1bc9p8hdv1jy6ib769dl";
   buildDepends = [
     aesonNative authenticate blazeHtml controlMonadAttempt hamlet
     httpEnumerator mimeMail persistent persistentTemplate pureMD5

From aa79612af53764b891f6f720cec4434e96c68b52 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Oct 2011 19:45:47 +0000
Subject: [PATCH 20/95] haskell-yesod-core: updated to version 0.9.3.2

svn path=/nixpkgs/trunk/; revision=29912
---
 .../libraries/haskell/yesod-core/default.nix  | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index 5321294e55a..9319eb9a39c 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -1,19 +1,21 @@
-{ cabal, blazeBuilder, blazeHtml, caseInsensitive, cereal
-, clientsession, cookie, enumerator, failure, hamlet, httpTypes
-, monadControl, parsec, pathPieces, random, shakespeare
-, shakespeareCss, shakespeareJs, strictConcurrency, text, time
-, transformers, wai, waiExtra
+{ cabal, aesonNative, blazeBuilder, blazeHtml, caseInsensitive
+, cereal, clientsession, cookie, dataObject, dataObjectYaml
+, enumerator, failure, hamlet, httpTypes, monadControl, parsec
+, pathPieces, random, shakespeare, shakespeareCss, shakespeareJs
+, strictConcurrency, text, time, transformers, vector, wai
+, waiExtra
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "0.9.2";
-  sha256 = "1h9w5fgdr4w4ikp5axzxmsvc14ikbsjmlwd2lmlrh1cjcx8xzjwf";
+  version = "0.9.3.2";
+  sha256 = "1h45vgxcn4sraax5rsccksx5yz57k32d7vzpp02prz2s2x5bv3xl";
   buildDepends = [
-    blazeBuilder blazeHtml caseInsensitive cereal clientsession cookie
-    enumerator failure hamlet httpTypes monadControl parsec pathPieces
-    random shakespeare shakespeareCss shakespeareJs strictConcurrency
-    text time transformers wai waiExtra
+    aesonNative blazeBuilder blazeHtml caseInsensitive cereal
+    clientsession cookie dataObject dataObjectYaml enumerator failure
+    hamlet httpTypes monadControl parsec pathPieces random shakespeare
+    shakespeareCss shakespeareJs strictConcurrency text time
+    transformers vector wai waiExtra
   ];
   meta = {
     homepage = "http://www.yesodweb.com/";

From 575ec1ce252a1657b257dc5fad51c1847a8de602 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Oct 2011 19:45:51 +0000
Subject: [PATCH 21/95] haskell-yesod-form: updated to version 0.3.3

svn path=/nixpkgs/trunk/; revision=29913
---
 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 fab623a2926..133d45c6c19 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.2.1";
-  sha256 = "1gzd8vs9nabv7vf41b5xxwy49yak9jd3mpxkg4yx7pndm4321hp9";
+  version = "0.3.3";
+  sha256 = "1lym9h7xr26i36n62cvbdyzjxna1p0alyhx9qhi5zhg0xz4nd3xq";
   buildDepends = [
     blazeBuilder blazeHtml dataDefault emailValidate hamlet network
     persistent shakespeareCss shakespeareJs text time transformers wai

From ffbe3e6ef04a84623233493f55579d75d072e933 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Oct 2011 19:45:56 +0000
Subject: [PATCH 22/95] haskell-yesod-static: updated to version 0.3.1.2

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

diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix
index 8fbc8baff49..0f700667f34 100644
--- a/pkgs/development/libraries/haskell/yesod-static/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-static/default.nix
@@ -1,13 +1,14 @@
-{ cabal, base64Bytestring, cereal, fileEmbed, httpTypes, pureMD5
-, text, transformers, unixCompat, wai, waiAppStatic, yesodCore
+{ cabal, base64Bytestring, cereal, enumerator, fileEmbed, httpTypes
+, pureMD5, text, transformers, unixCompat, wai, waiAppStatic
+, yesodCore
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-static";
-  version = "0.3.0.1";
-  sha256 = "1dvg60kawmvczwxvkxzx5k19y36i23fi0faw71ck58mlkjdczby5";
+  version = "0.3.1.2";
+  sha256 = "0r72xspxq7122k9vird4yqqzrn6p4xgzvxid7ig62zdxjlw1p36j";
   buildDepends = [
-    base64Bytestring cereal fileEmbed httpTypes pureMD5 text
+    base64Bytestring cereal enumerator fileEmbed httpTypes pureMD5 text
     transformers unixCompat wai waiAppStatic yesodCore
   ];
   meta = {

From 0c9057b912aa25813597582502dc065eb914596a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Oct 2011 19:46:00 +0000
Subject: [PATCH 23/95] haskell-yesod: updated to version 0.9.3

svn path=/nixpkgs/trunk/; revision=29915
---
 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 e4947dc94f2..84a5c25b91f 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.2.2";
-  sha256 = "09l7cdsrxlr1nb03h3nisih9sm824gnp3nkblvgh8b1pfi54wdkl";
+  version = "0.9.3";
+  sha256 = "1w5fml250i63qhlxkn1bidc3sminmxf98zsdzvdi42sfjx8fdkkx";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 1faa8711c8a7ec46831270807789c5711fb943ec Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Oct 2011 19:54:55 +0000
Subject: [PATCH 24/95] haskell-nixos-types: updated to version 1.2

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

diff --git a/pkgs/development/libraries/haskell/nixos-types/default.nix b/pkgs/development/libraries/haskell/nixos-types/default.nix
index b63f8a9fbdc..9a1103a2bb8 100644
--- a/pkgs/development/libraries/haskell/nixos-types/default.nix
+++ b/pkgs/development/libraries/haskell/nixos-types/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "nixos-types";
-  version = "1.1";
-  sha256 = "0vnlhq2pjnslq1h9h3lyaxw604s3zdhs7k8hfr35m178rdm3a5az";
+  version = "1.2";
+  sha256 = "140qk6wqq87qfk471cnhrg135fnqv0vfmfxh8kj14ar2kxvzrr8w";
   buildDepends = [ regexPosix ];
   meta = {
     homepage = "http://github.com/haskell4nix/nixos-types";

From 7784111b49bb86a1005da6d7fb2ba6f33d874710 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Oct 2011 19:54:59 +0000
Subject: [PATCH 25/95] haskell-cabal2nix: updated to version 1.18

svn path=/nixpkgs/trunk/; revision=29917
---
 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 5c354c8e156..983555bec43 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.17";
-  sha256 = "0pga0rfghpvjazhs0mgnxg2kf82m8bsmlx3g9pxhiw5f4amfr2g7";
+  version = "1.18";
+  sha256 = "1bx9gv5nxz68p8rimai6gy05l84f7n3rajacvg6dak9nsrnbl95i";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ hackageDb HTTP mtl nixosTypes regexPosix ];

From 54951e39944fa29d757d89c45aa65dfe40947f38 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 19 Oct 2011 20:41:15 +0000
Subject: [PATCH 26/95] * QEMU/KVM updated to 0.15.1.

svn path=/nixpkgs/trunk/; revision=29918
---
 pkgs/os-specific/linux/qemu-kvm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/qemu-kvm/default.nix b/pkgs/os-specific/linux/qemu-kvm/default.nix
index 3f35d3304ce..821084c1b33 100644
--- a/pkgs/os-specific/linux/qemu-kvm/default.nix
+++ b/pkgs/os-specific/linux/qemu-kvm/default.nix
@@ -4,11 +4,11 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  name = "qemu-kvm-0.15.0";
+  name = "qemu-kvm-0.15.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/kvm/${name}.tar.gz";
-    sha256 = "0y247bc2cyawliaiyk8k41kl3mcjvh52b9bgzvxv0h55zwdpg3l2";
+    sha256 = "0gkk96yid3nq8i4z8xbiarj0r9v7b2zavf5mnh0rc7kclzxa7mmf";
   };
 
   patches = [ ./smb-tmpdir.patch ];

From 6e3cde63834ef21346e80862256c6a08909f514a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 19 Oct 2011 20:57:18 +0000
Subject: [PATCH 27/95] Enable building clang separately from llvm

Note that there is some duplication when building clang now. The llvm source
is unpacked twice, ./configure is run twice, and two small unit test
libraries are compiled twice. IMO this is a fair tradeoff for having
llvm be a separate build unaffected by changes to clang

svn path=/nixpkgs/trunk/; revision=29919
---
 .../llvm/clang-system-llvm-libs.patch         |  42 ++++++
 .../compilers/llvm/clang-tblgen.patch         | 134 ++++++++++++++++++
 pkgs/development/compilers/llvm/clang.nix     |  62 ++++++++
 pkgs/development/compilers/llvm/default.nix   |  48 +------
 pkgs/top-level/all-packages.nix               |  11 +-
 5 files changed, 249 insertions(+), 48 deletions(-)
 create mode 100644 pkgs/development/compilers/llvm/clang-system-llvm-libs.patch
 create mode 100644 pkgs/development/compilers/llvm/clang-tblgen.patch
 create mode 100644 pkgs/development/compilers/llvm/clang.nix

diff --git a/pkgs/development/compilers/llvm/clang-system-llvm-libs.patch b/pkgs/development/compilers/llvm/clang-system-llvm-libs.patch
new file mode 100644
index 00000000000..0d82cf4017a
--- /dev/null
+++ b/pkgs/development/compilers/llvm/clang-system-llvm-libs.patch
@@ -0,0 +1,42 @@
+diff -Naur llvm-2.9-orig/Makefile.rules llvm-2.9/Makefile.rules
+--- llvm-2.9-orig/Makefile.rules	2011-03-25 02:26:58.000000000 -0400
++++ llvm-2.9/Makefile.rules	2011-10-19 15:31:38.538674143 -0400
+@@ -941,7 +941,7 @@
+ 	@echo "*** llvm-config doesn't exist - rebuilding it."
+ 	@$(MAKE) -C $(PROJ_OBJ_ROOT)/tools/llvm-config
+ 
+-$(ToolDir)/$(strip $(TOOLNAME))$(EXEEXT): $(LLVM_CONFIG)
++$(ToolDir)/$(strip $(TOOLNAME))$(EXEEXT):
+ 
+ ifeq ($(ENABLE_SHARED), 1)
+ # We can take the "auto-import" feature to get rid of using dllimport.
+@@ -1137,7 +1137,7 @@
+ else
+ SharedLibKindMessage := "Shared Library"
+ endif
+-$(LibName.SO): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths) $(SharedLibDir)/.dir
++$(LibName.SO): $(ObjectsO) $(ProjLibsPaths) $(SharedLibDir)/.dir
+ 	$(Echo) Linking $(BuildMode) $(SharedLibKindMessage) \
+ 	  $(notdir $@)
+ 	$(Verb) $(Link) $(SharedLinkOptions) -o $@ $(ObjectsO) \
+@@ -1411,7 +1411,7 @@
+ $(ToolBuildPath): $(ToolDir)/.dir
+ endif
+ 
+-$(ToolBuildPath): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths)
++$(ToolBuildPath): $(ObjectsO) $(ProjLibsPaths)
+ 	$(Echo) Linking $(BuildMode) executable $(TOOLNAME) $(StripWarnMsg)
+ 	$(Verb) $(Link) -o $@ $(TOOLLINKOPTS) $(ObjectsO) $(ProjLibsOptions) \
+ 	$(LLVMLibsOptions) $(ExtraLibs) $(TOOLLINKOPTSB) $(LIBS)
+diff -Naur llvm-2.9-orig/unittests/Makefile.unittest llvm-2.9/unittests/Makefile.unittest
+--- llvm-2.9-orig/unittests/Makefile.unittest	2011-02-04 12:12:18.000000000 -0500
++++ llvm-2.9/unittests/Makefile.unittest	2011-10-19 15:47:27.100035616 -0400
+@@ -47,7 +47,7 @@
+   Run.Shared := $(SHLIBPATH_VAR)="$(SharedLibDir)$${$(SHLIBPATH_VAR):+:}$$$(SHLIBPATH_VAR)"
+ endif
+ 
+-$(LLVMUnitTestExe): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths)
++$(LLVMUnitTestExe): $(ObjectsO) $(ProjLibsPaths)
+ 	$(Echo) Linking $(BuildMode) unit test $(TESTNAME) $(StripWarnMsg)
+ 	$(Verb) $(Link) -o $@ $(TOOLLINKOPTS) $(ObjectsO) $(ProjLibsOptions) \
+ 	$(TESTLIBS) $(LLVMLibsOptions) $(ExtraLibs) $(TOOLLINKOPTSB) $(LIBS)
diff --git a/pkgs/development/compilers/llvm/clang-tblgen.patch b/pkgs/development/compilers/llvm/clang-tblgen.patch
new file mode 100644
index 00000000000..9533529555d
--- /dev/null
+++ b/pkgs/development/compilers/llvm/clang-tblgen.patch
@@ -0,0 +1,134 @@
+diff -Naur a/tools/clang/include/clang/AST/Makefile b/tools/clang/include/clang/AST/Makefile
+--- a/tools/clang/include/clang/AST/Makefile	2010-08-18 19:23:40.000000000 -0400
++++ b/tools/clang/include/clang/AST/Makefile	2011-10-19 14:19:21.420750346 -0400
+@@ -6,24 +6,24 @@
+ 
+ include $(CLANG_LEVEL)/Makefile
+ 
+-$(ObjDir)/Attrs.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \
++$(ObjDir)/Attrs.inc.tmp : $(TD_SRC_DIR)/Attr.td \
+                               $(ObjDir)/.dir
+ 	$(Echo) "Building Clang attribute classes with tblgen"
+ 	$(Verb) $(TableGen) -gen-clang-attr-classes -o $(call SYSPATH, $@) \
+ 		-I $(PROJ_SRC_DIR)/../../ $<
+ 
+-$(ObjDir)/AttrImpl.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \
++$(ObjDir)/AttrImpl.inc.tmp : $(TD_SRC_DIR)/Attr.td \
+                               $(ObjDir)/.dir
+ 	$(Echo) "Building Clang attribute implementations with tblgen"
+ 	$(Verb) $(TableGen) -gen-clang-attr-impl -o $(call SYSPATH, $@) \
+ 		-I $(PROJ_SRC_DIR)/../../ $<
+ 
+-$(ObjDir)/StmtNodes.inc.tmp : $(TD_SRC_DIR)/StmtNodes.td $(TBLGEN) \
++$(ObjDir)/StmtNodes.inc.tmp : $(TD_SRC_DIR)/StmtNodes.td \
+                               $(ObjDir)/.dir
+ 	$(Echo) "Building Clang statement node tables with tblgen"
+ 	$(Verb) $(TableGen) -gen-clang-stmt-nodes -o $(call SYSPATH, $@) $<
+ 
+-$(ObjDir)/DeclNodes.inc.tmp : $(TD_SRC_DIR)/DeclNodes.td $(TBLGEN) \
++$(ObjDir)/DeclNodes.inc.tmp : $(TD_SRC_DIR)/DeclNodes.td \
+                               $(ObjDir)/.dir
+ 	$(Echo) "Building Clang declaration node tables with tblgen"
+ 	$(Verb) $(TableGen) -gen-clang-decl-nodes -o $(call SYSPATH, $@) $<
+diff -Naur a/tools/clang/include/clang/Basic/Makefile b/tools/clang/include/clang/Basic/Makefile
+--- a/tools/clang/include/clang/Basic/Makefile	2010-09-09 16:27:36.000000000 -0400
++++ b/tools/clang/include/clang/Basic/Makefile	2011-10-19 14:17:54.950837324 -0400
+@@ -29,20 +29,20 @@
+ CLANG_HAS_VERSION_PATCHLEVEL := 1
+ endif
+ 
+-$(ObjDir)/Diagnostic%Kinds.inc.tmp : Diagnostic.td Diagnostic%Kinds.td $(TBLGEN) $(ObjDir)/.dir
++$(ObjDir)/Diagnostic%Kinds.inc.tmp : Diagnostic.td Diagnostic%Kinds.td $(ObjDir)/.dir
+ 	$(Echo) "Building Clang $(patsubst Diagnostic%Kinds.inc.tmp,%,$(@F)) diagnostic tables with tblgen"
+ 	$(Verb) $(TableGen) -gen-clang-diags-defs -clang-component=$(patsubst Diagnostic%Kinds.inc.tmp,%,$(@F)) -o $(call SYSPATH, $@) $<
+ 
+-$(ObjDir)/DiagnosticGroups.inc.tmp : Diagnostic.td DiagnosticGroups.td $(INPUT_TDS) $(TBLGEN) $(ObjDir)/.dir
++$(ObjDir)/DiagnosticGroups.inc.tmp : Diagnostic.td DiagnosticGroups.td $(INPUT_TDS) $(ObjDir)/.dir
+ 	$(Echo) "Building Clang diagnostic groups with tblgen"
+ 	$(Verb) $(TableGen) -gen-clang-diag-groups -o $(call SYSPATH, $@) $<
+ 
+-$(ObjDir)/AttrList.inc.tmp : Attr.td $(TBLGEN) $(ObjDir)/.dir
++$(ObjDir)/AttrList.inc.tmp : Attr.td $(ObjDir)/.dir
+ 	$(Echo) "Building Clang attribute list with tblgen"
+ 	$(Verb) $(TableGen) -gen-clang-attr-list -o $(call SYSPATH, $@) \
+ 	  -I $(PROJ_SRC_DIR)/../.. $<
+ 
+-$(ObjDir)/arm_neon.inc.tmp : arm_neon.td $(TBLGEN) $(ObjDir)/.dir
++$(ObjDir)/arm_neon.inc.tmp : arm_neon.td $(ObjDir)/.dir
+ 	$(Echo) "Building Clang arm_neon.inc with tblgen"
+ 	$(Verb) $(TableGen) -gen-arm-neon-sema -o $(call SYSPATH, $@) $<
+ 
+diff -Naur a/tools/clang/include/clang/Driver/Makefile b/tools/clang/include/clang/Driver/Makefile
+--- a/tools/clang/include/clang/Driver/Makefile	2010-06-08 16:34:18.000000000 -0400
++++ b/tools/clang/include/clang/Driver/Makefile	2011-10-19 14:25:33.739369159 -0400
+@@ -5,14 +5,14 @@
+ 
+ include $(CLANG_LEVEL)/Makefile
+ 
+-$(ObjDir)/Options.inc.tmp : Options.td OptParser.td $(TBLGEN) $(ObjDir)/.dir
++$(ObjDir)/Options.inc.tmp : Options.td OptParser.td $(ObjDir)/.dir
+ 	$(Echo) "Building Clang Driver Option tables with tblgen"
+ 	$(Verb) $(TableGen) -gen-opt-parser-defs -o $(call SYSPATH, $@) $<
+ 
+-$(ObjDir)/CC1Options.inc.tmp : CC1Options.td OptParser.td $(TBLGEN) $(ObjDir)/.dir
++$(ObjDir)/CC1Options.inc.tmp : CC1Options.td OptParser.td $(ObjDir)/.dir
+ 	$(Echo) "Building Clang CC1 Option tables with tblgen"
+ 	$(Verb) $(TableGen) -gen-opt-parser-defs -o $(call SYSPATH, $@) $<
+ 
+-$(ObjDir)/CC1AsOptions.inc.tmp : CC1AsOptions.td OptParser.td $(TBLGEN) $(ObjDir)/.dir
++$(ObjDir)/CC1AsOptions.inc.tmp : CC1AsOptions.td OptParser.td $(ObjDir)/.dir
+ 	$(Echo) "Building Clang CC1 Assembler Option tables with tblgen"
+ 	$(Verb) $(TableGen) -gen-opt-parser-defs -o $(call SYSPATH, $@) $<
+diff -Naur a/tools/clang/include/clang/Lex/Makefile b/tools/clang/include/clang/Lex/Makefile
+--- a/tools/clang/include/clang/Lex/Makefile	2010-10-19 22:31:43.000000000 -0400
++++ b/tools/clang/include/clang/Lex/Makefile	2011-10-19 14:18:25.082807086 -0400
+@@ -6,7 +6,7 @@
+ 
+ include $(CLANG_LEVEL)/Makefile
+ 
+-$(ObjDir)/AttrSpellings.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \
++$(ObjDir)/AttrSpellings.inc.tmp : $(TD_SRC_DIR)/Attr.td \
+                                   $(ObjDir)/.dir
+ 	$(Echo) "Building Clang attribute spellings with tblgen"
+ 	$(Verb) $(TableGen) -gen-clang-attr-spelling-list -o $(call SYSPATH, $@) \
+diff -Naur a/tools/clang/include/clang/Serialization/Makefile b/tools/clang/include/clang/Serialization/Makefile
+--- a/tools/clang/include/clang/Serialization/Makefile	2010-08-18 19:23:40.000000000 -0400
++++ b/tools/clang/include/clang/Serialization/Makefile	2011-10-19 14:25:05.764398164 -0400
+@@ -6,13 +6,13 @@
+ 
+ include $(CLANG_LEVEL)/Makefile
+ 
+-$(ObjDir)/AttrPCHRead.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \
++$(ObjDir)/AttrPCHRead.inc.tmp : $(TD_SRC_DIR)/Attr.td \
+                               $(ObjDir)/.dir
+ 	$(Echo) "Building Clang PCH reader with tblgen"
+ 	$(Verb) $(TableGen) -gen-clang-attr-pch-read -o $(call SYSPATH, $@) \
+ 		-I $(PROJ_SRC_DIR)/../../ $<
+ 
+-$(ObjDir)/AttrPCHWrite.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \
++$(ObjDir)/AttrPCHWrite.inc.tmp : $(TD_SRC_DIR)/Attr.td \
+                               $(ObjDir)/.dir
+ 	$(Echo) "Building Clang PCH writer with tblgen"
+ 	$(Verb) $(TableGen) -gen-clang-attr-pch-write -o $(call SYSPATH, $@) \
+diff -Naur a/tools/clang/lib/Headers/Makefile b/tools/clang/lib/Headers/Makefile
+--- a/tools/clang/lib/Headers/Makefile	2010-07-21 21:19:36.000000000 -0400
++++ b/tools/clang/lib/Headers/Makefile	2011-10-19 14:15:18.520993127 -0400
+@@ -49,6 +49,6 @@
+ 
+ install-local:: $(INSTHEADERS)
+ 
+-$(ObjDir)/arm_neon.h.inc.tmp : $(CLANG_LEVEL)/include/clang/Basic/arm_neon.td $(TBLGEN) $(ObjDir)/.dir
++$(ObjDir)/arm_neon.h.inc.tmp : $(CLANG_LEVEL)/include/clang/Basic/arm_neon.td $(ObjDir)/.dir
+ 	$(Echo) "Building Clang arm_neon.h.inc with tblgen"
+ 	$(Verb) $(TableGen) -gen-arm-neon -o $(call SYSPATH, $@) $<
+diff -Naur a/tools/clang/lib/StaticAnalyzer/Checkers/Makefile b/tools/clang/lib/StaticAnalyzer/Checkers/Makefile
+--- a/tools/clang/lib/StaticAnalyzer/Checkers/Makefile	2011-02-15 02:42:38.000000000 -0500
++++ b/tools/clang/lib/StaticAnalyzer/Checkers/Makefile	2011-10-19 14:15:58.240953760 -0400
+@@ -19,6 +19,6 @@
+ 
+ include $(CLANG_LEVEL)/Makefile
+ 
+-$(ObjDir)/Checkers.inc.tmp : Checkers.td $(PROJ_SRC_DIR)/$(CLANG_LEVEL)/include/clang/StaticAnalyzer/Checkers/CheckerBase.td $(TBLGEN) $(ObjDir)/.dir
++$(ObjDir)/Checkers.inc.tmp : Checkers.td $(PROJ_SRC_DIR)/$(CLANG_LEVEL)/include/clang/StaticAnalyzer/Checkers/CheckerBase.td $(ObjDir)/.dir
+ 	$(Echo) "Building Clang SA Checkers tables with tblgen"
+ 	$(Verb) $(TableGen) -gen-clang-sa-checkers -I $(PROJ_SRC_DIR)/$(CLANG_LEVEL)/include -o $(call SYSPATH, $@) $<
diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix
new file mode 100644
index 00000000000..fc37a5c00d2
--- /dev/null
+++ b/pkgs/development/compilers/llvm/clang.nix
@@ -0,0 +1,62 @@
+{ stdenv, fetchurl, perl, groff, llvm }:
+
+assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
+let
+  triplet = if (stdenv.system == "i686-linux") then "i686-unknown-linux-gnu"
+            else if (stdenv.system == "x86_64-linux") then "x86_64-unknown-linux-gnu"
+            else throw "System not supported";
+
+  version = "2.9";
+in
+
+stdenv.mkDerivation {
+  name = "clang-${version}";
+
+  CC = if stdenv.gcc ? clang then "clang" else "gcc";
+
+  CXX = if stdenv.gcc ? clang then "clang++" else "g++";
+
+  src = llvm.src;
+
+  buildInputs = [ perl llvm groff ];
+
+  configureFlags = [ "--enable-optimized" "--enable-shared" "--disable-static" ];
+  srcClang = fetchurl {
+      url = "http://llvm.org/releases/${version}/clang-${version}.tgz";
+      sha256 = "1pq9g7qxw761dp6gx3amx39kl9p4zhlymmn8gfmcnw9ag0zizi3h";
+  };
+
+  prePatch = ''
+    pushd tools
+    unpackFile $srcClang
+    mv clang-${version} clang
+    popd
+    find
+  '';
+
+  patches = [ ./clang-include-paths.patch ./clang-ld-flags.patch ./clang-tblgen.patch ./clang-system-llvm-libs.patch ];
+
+  buildFlags = [ "TableGen=tblgen" "LLVM_CONFIG=llvm-config" ];
+  # Set up the header file paths
+  preBuild = ''
+    sed -i -e 's,C_INCLUDE_PATH,"${stdenv.gcc.libc}/include/",' \
+      -e 's,CPP_HOST,"${triplet}",' \
+      -e 's,CPP_INCLUDE_PATH,"${stdenv.gcc.gcc}/include/c++/${stdenv.gcc.gcc.version}",' \
+      tools/clang/lib/Frontend/InitHeaderSearch.cpp
+
+    pushd utils/unittest
+    make
+    popd
+    cd tools/clang
+  '';
+
+  passthru = { gcc = stdenv.gcc.gcc; };
+
+  meta = {
+    homepage = http://clang.llvm.org/;
+    description = "A C language family frontend for LLVM";
+    license = "BSD";
+    maintainers = with stdenv.lib.maintainers; [viric shlevy];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index fc308f4e61c..62e71d4a1b2 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, perl, groff, buildClang ? false }:
+{ stdenv, fetchurl, perl, groff }:
 
 let version = "2.9"; in
 
-stdenv.mkDerivation ({
+stdenv.mkDerivation {
   name = "llvm-${version}";
 
   CC = if stdenv.gcc ? clang then "clang" else "gcc";
@@ -26,48 +26,4 @@ stdenv.mkDerivation ({
     platforms = with stdenv.lib.platforms; all;
   };
 }
-// stdenv.lib.optionalAttrs buildClang (
-  # I write the assert because 'gcc.libc' will be evaluated although 'triplet' would not
-  # evaluate properly (in the preConfigure below)
-  assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
-  let
-    triplet = if (stdenv.system == "i686-linux") then "i686-unknown-linux-gnu"
-              else if (stdenv.system == "x86_64-linux") then "x86_64-unknown-linux-gnu"
-              else throw "System not supported";
-  in {
-    name = "clang-${version}";
 
-    srcClang = fetchurl {
-      url = "http://llvm.org/releases/${version}/clang-${version}.tgz";
-      sha256 = "1pq9g7qxw761dp6gx3amx39kl9p4zhlymmn8gfmcnw9ag0zizi3h";
-    };
-
-    prePatch = ''
-      pushd tools
-      unpackFile $srcClang
-      mv clang-${version} clang
-      popd
-      find
-    '';
-
-    patches = [ ./clang-include-paths.patch ./clang-ld-flags.patch ];
-
-    # Set up the header file paths
-    preConfigure = ''
-      sed -i -e 's,C_INCLUDE_PATH,"${stdenv.gcc.libc}/include/",' \
-        -e 's,CPP_HOST,"${triplet}",' \
-        -e 's,CPP_INCLUDE_PATH,"${stdenv.gcc.gcc}/include/c++/${stdenv.gcc.gcc.version}",' \
-        tools/clang/lib/Frontend/InitHeaderSearch.cpp
-    '';
-
-    passthru = { gcc = stdenv.gcc.gcc; };
-
-    meta = {
-      homepage = http://clang.llvm.org/;
-      description = "A C language family frontend for LLVM";
-      license = "BSD";
-      maintainers = with stdenv.lib.maintainers; [viric shlevy];
-      platforms = with stdenv.lib.platforms; linux;
-    };
-  }
-))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ba131ccf476..7d5fe94b196 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1640,9 +1640,16 @@ let
 
   ccl = builderDefsPackage ../development/compilers/ccl {};
 
-  clangBoot = wrapClang (llvm.override { buildClang = true; });
+  clangBootUnwrapped = callPackage ../development/compilers/llvm/clang.nix { };
 
-  clang = wrapClang (llvm.override { buildClang = true; stdenv = stdenvAdapters.overrideGCC stdenv clangBoot; });
+  clangBoot = wrapClang clangBootUnwrapped;
+
+  clangUnwrapped = let clangBootStdenv = stdenvAdapters.overrideGCC stdenv clangBoot; in clangBootUnwrapped.override {
+    stdenv = clangBootStdenv;
+    llvm = llvm.override { stdenv = clangBootStdenv; };
+  };
+
+  clang = wrapClang clangUnwrapped;
 
   #Use this instead of stdenv to build with clang
   clangStdenv = stdenvAdapters.overrideGCC stdenv clang;

From 1d7f2e1e90ef563bec91237ff310762edc2d2e3b Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 19 Oct 2011 21:47:28 +0000
Subject: [PATCH 28/95] clang: Install static analysis tools

svn path=/nixpkgs/trunk/; revision=29921
---
 pkgs/development/compilers/llvm/clang.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix
index fc37a5c00d2..ca3b72ffc51 100644
--- a/pkgs/development/compilers/llvm/clang.nix
+++ b/pkgs/development/compilers/llvm/clang.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
   patches = [ ./clang-include-paths.patch ./clang-ld-flags.patch ./clang-tblgen.patch ./clang-system-llvm-libs.patch ];
 
   buildFlags = [ "TableGen=tblgen" "LLVM_CONFIG=llvm-config" ];
-  # Set up the header file paths
+
   preBuild = ''
     sed -i -e 's,C_INCLUDE_PATH,"${stdenv.gcc.libc}/include/",' \
       -e 's,CPP_HOST,"${triplet}",' \
@@ -50,6 +50,11 @@ stdenv.mkDerivation {
     cd tools/clang
   '';
 
+  postInstall = ''
+    install -v -m755 tools/scan-build/scan-build $out/bin
+    install -v -m755 tools/scan-view/scan-view $out/bin
+  '';
+
   passthru = { gcc = stdenv.gcc.gcc; };
 
   meta = {

From 188df149514f541587e6699d5423b1783c76fe56 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 19 Oct 2011 23:49:22 +0000
Subject: [PATCH 29/95] clang: Use configureFlags instead of env vars to tell
 which compiler to use

svn path=/nixpkgs/trunk/; revision=29922
---
 pkgs/development/compilers/llvm/clang.nix   | 11 ++++++-----
 pkgs/development/compilers/llvm/default.nix | 10 +++++-----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix
index ca3b72ffc51..ca205022adb 100644
--- a/pkgs/development/compilers/llvm/clang.nix
+++ b/pkgs/development/compilers/llvm/clang.nix
@@ -12,15 +12,16 @@ in
 stdenv.mkDerivation {
   name = "clang-${version}";
 
-  CC = if stdenv.gcc ? clang then "clang" else "gcc";
-
-  CXX = if stdenv.gcc ? clang then "clang++" else "g++";
-
   src = llvm.src;
 
   buildInputs = [ perl llvm groff ];
 
-  configureFlags = [ "--enable-optimized" "--enable-shared" "--disable-static" ];
+  configureFlags = [ "--enable-optimized" "--enable-shared" "--disable-static" ]
+    ++ stdenv.lib.optionals (stdenv.gcc ? clang) [
+      "--with-built-clang=yes"
+      "CXX=clang++"
+    ];
+
   srcClang = fetchurl {
       url = "http://llvm.org/releases/${version}/clang-${version}.tgz";
       sha256 = "1pq9g7qxw761dp6gx3amx39kl9p4zhlymmn8gfmcnw9ag0zizi3h";
diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 62e71d4a1b2..7b38db8a646 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -5,10 +5,6 @@ let version = "2.9"; in
 stdenv.mkDerivation {
   name = "llvm-${version}";
 
-  CC = if stdenv.gcc ? clang then "clang" else "gcc";
-
-  CXX = if stdenv.gcc ? clang then "clang++" else "g++";
-
   src = fetchurl {
     url    = "http://llvm.org/releases/${version}/llvm-${version}.tgz";
     sha256 = "0y9pgdakn3n0vf8zs6fjxjw6972nyw4rkfwwza6b8a3ll77kc4k6";
@@ -16,7 +12,11 @@ stdenv.mkDerivation {
 
   buildInputs = [ perl groff ];
 
-  configureFlags = [ "--enable-optimized" "--enable-shared" "--disable-static" ];
+  configureFlags = [ "--enable-optimized" "--enable-shared" "--disable-static" ]
+    ++ stdenv.lib.optionals (stdenv.gcc ? clang) [
+      "--with-built-clang=yes"
+      "CXX=clang++"
+    ];
 
   meta = {
     homepage = http://llvm.org/;

From 1214310f5d276a2283298c039ca3309b86b66658 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 20 Oct 2011 00:15:49 +0000
Subject: [PATCH 30/95] Use the right triplet for 1686

Not sure why we're inconsistent between arches there...

svn path=/nixpkgs/trunk/; revision=29923
---
 pkgs/development/compilers/llvm/clang.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix
index ca205022adb..9f084c8a1d1 100644
--- a/pkgs/development/compilers/llvm/clang.nix
+++ b/pkgs/development/compilers/llvm/clang.nix
@@ -2,7 +2,7 @@
 
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
 let
-  triplet = if (stdenv.system == "i686-linux") then "i686-unknown-linux-gnu"
+  triplet = if (stdenv.system == "i686-linux") then "i686-pc-linux-gnu"
             else if (stdenv.system == "x86_64-linux") then "x86_64-unknown-linux-gnu"
             else throw "System not supported";
 

From 252286194e8a08a45d32102f0f68be316f661bd6 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 20 Oct 2011 02:07:00 +0000
Subject: [PATCH 31/95] clang: have gcc tell us its target triplet, no need to
 limit to x86 linuces

svn path=/nixpkgs/trunk/; revision=29924
---
 pkgs/development/compilers/llvm/clang.nix | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix
index 9f084c8a1d1..7c177544725 100644
--- a/pkgs/development/compilers/llvm/clang.nix
+++ b/pkgs/development/compilers/llvm/clang.nix
@@ -1,13 +1,6 @@
 { stdenv, fetchurl, perl, groff, llvm }:
 
-assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
-let
-  triplet = if (stdenv.system == "i686-linux") then "i686-pc-linux-gnu"
-            else if (stdenv.system == "x86_64-linux") then "x86_64-unknown-linux-gnu"
-            else throw "System not supported";
-
-  version = "2.9";
-in
+let version = "2.9"; in
 
 stdenv.mkDerivation {
   name = "clang-${version}";
@@ -41,7 +34,7 @@ stdenv.mkDerivation {
 
   preBuild = ''
     sed -i -e 's,C_INCLUDE_PATH,"${stdenv.gcc.libc}/include/",' \
-      -e 's,CPP_HOST,"${triplet}",' \
+      -e 's,CPP_HOST,"'$(${stdenv.gcc.gcc}/bin/gcc -dumpmachine)'",' \
       -e 's,CPP_INCLUDE_PATH,"${stdenv.gcc.gcc}/include/c++/${stdenv.gcc.gcc.version}",' \
       tools/clang/lib/Frontend/InitHeaderSearch.cpp
 
@@ -63,6 +56,6 @@ stdenv.mkDerivation {
     description = "A C language family frontend for LLVM";
     license = "BSD";
     maintainers = with stdenv.lib.maintainers; [viric shlevy];
-    platforms = with stdenv.lib.platforms; linux;
+    platforms = with stdenv.lib.platforms; all;
   };
 }

From 7c32c9c42688828d5ebc895c250bcad0a3a5d1f3 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 20 Oct 2011 10:15:54 +0000
Subject: [PATCH 32/95] llvm: Use the sw_vers program on darwin

svn path=/nixpkgs/trunk/; revision=29925
---
 pkgs/development/compilers/llvm/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 7b38db8a646..c8f05bb1fd7 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, groff }:
+{ stdenv, fetchurl, perl, groff, darwinSwVersUtility }:
 
 let version = "2.9"; in
 
@@ -10,7 +10,8 @@ stdenv.mkDerivation {
     sha256 = "0y9pgdakn3n0vf8zs6fjxjw6972nyw4rkfwwza6b8a3ll77kc4k6";
   };
 
-  buildInputs = [ perl groff ];
+  buildInputs = [ perl groff ] ++
+    stdenv.lib.optional stdenv.isDarwin darwinSwVersUtility;
 
   configureFlags = [ "--enable-optimized" "--enable-shared" "--disable-static" ]
     ++ stdenv.lib.optionals (stdenv.gcc ? clang) [

From 631f071df875d861974387d587aa76cccbf2009b Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Thu, 20 Oct 2011 11:07:47 +0000
Subject: [PATCH 33/95] Bumped version of disnixos

svn path=/nixpkgs/trunk/; revision=29929
---
 pkgs/tools/package-management/disnix/disnixos/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix
index 9fe76d81070..92914dd1cad 100644
--- a/pkgs/tools/package-management/disnix/disnixos/default.nix
+++ b/pkgs/tools/package-management/disnix/disnixos/default.nix
@@ -1,17 +1,17 @@
 {stdenv, fetchurl, disnix, socat, pkgconfig}:
 
 stdenv.mkDerivation {
-  name = "disnixos-0.2pre29885";
+  name = "disnixos-0.2pre29928";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/1461383/download/3/disnixos-0.2pre29885.tar.gz;
-    sha256 = "1lyxpadykk7nbb7gad12mbcsz29c6fqihhv3k3vkh32fimbq7bma";
+    url = http://hydra.nixos.org/build/1464065/download/3/disnixos-0.2pre29928.tar.gz;
+    sha256 = "0l7kszbpi8lzq95khi45fbq71l5csf8kamds4va6bxsyfwxrx6sm";
   };
   buildInputs = [ socat pkgconfig disnix ];
   dontStrip = true;
   NIX_STRIP_DEBUG = true;
   
   meta = {
-    description = "Provides complementary NixOS infrastructure deployment to NixOS";
+    description = "Provides complementary NixOS infrastructure deployment to Disnix";
     license = "LGPLv2.1+";
     maintainers = [ stdenv.lib.maintainers.sander ];
   };

From 9ee72eb9ae259b08b55c2016880690a87321f17c Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Thu, 20 Oct 2011 11:17:24 +0000
Subject: [PATCH 34/95] Added license to yafc

svn path=/nixpkgs/trunk/; revision=29930
---
 pkgs/applications/networking/yafc/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/yafc/default.nix b/pkgs/applications/networking/yafc/default.nix
index ae3ce06ca50..a6c3c43417e 100644
--- a/pkgs/applications/networking/yafc/default.nix
+++ b/pkgs/applications/networking/yafc/default.nix
@@ -16,5 +16,6 @@ stdenv.mkDerivation {
   meta = {
     description = "ftp/sftp client with readline, autocompletion and bookmarks";
     homepage = http://yafc.sourceforge.net;
+    license = "GPLv2+";
   };
 }

From d744daf77373f2b0985814795c3d7dd6441492b1 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Thu, 20 Oct 2011 11:18:43 +0000
Subject: [PATCH 35/95] Removed non existent license attribute

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

diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix
index 6ba81a4766b..e9a4f015b5b 100644
--- a/pkgs/development/libraries/yajl/default.nix
+++ b/pkgs/development/libraries/yajl/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
       C, and a small validating JSON generator.
     '';
     homepage = http://lloyd.github.com/yajl/;
-    license = stdenv.lib.license.isc;
+    license = "ISC";
     platforms = with stdenv.lib.platforms; [ linux darwin ];
     maintainers = with stdenv.lib.maintainers; [
       z77z

From bc49e0ff8476f5b2adea8d3dadcce002af1336ae Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Thu, 20 Oct 2011 11:46:13 +0000
Subject: [PATCH 36/95] yajl: fix meta.license

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

diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix
index e9a4f015b5b..573f3853869 100644
--- a/pkgs/development/libraries/yajl/default.nix
+++ b/pkgs/development/libraries/yajl/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
       C, and a small validating JSON generator.
     '';
     homepage = http://lloyd.github.com/yajl/;
-    license = "ISC";
+    license = stdenv.lib.licenses.isc;
     platforms = with stdenv.lib.platforms; [ linux darwin ];
     maintainers = with stdenv.lib.maintainers; [
       z77z

From 7e2fbda505e5307be1f5764e5090f49426275d02 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 20 Oct 2011 17:51:52 +0000
Subject: [PATCH 37/95] * Net::Amazon::EC2: use LWP::Protocol::https.

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index ece567bb075..32b804a2b19 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2413,7 +2413,7 @@ rec {
         ../development/perl-modules/net-amazon-ec2-nova-compat.patch
       ];
     propagatedBuildInputs =
-      [ DigestHMAC LWP Moose URI ParamsValidate XMLSimple Moose CryptSSLeay ];
+      [ DigestHMAC LWP LWPProtocolHttps Moose URI ParamsValidate XMLSimple ];
     doCheck = false; # wants to create actual EC2 instances (for $$$)
   };
 

From b0ead4190d561c9e1c393d7317cc8d141e3c2871 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 20 Oct 2011 18:17:37 +0000
Subject: [PATCH 38/95] * Some Net::Amazon::EC2 patches.

svn path=/nixpkgs/trunk/; revision=29944
---
 .../perl-modules/net-amazon-ec2-ipv6.patch    | 60 +++++++++++++++++++
 .../net-amazon-ec2-nova-compat.patch          | 11 +++-
 pkgs/top-level/perl-packages.nix              |  2 +
 3 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/perl-modules/net-amazon-ec2-ipv6.patch

diff --git a/pkgs/development/perl-modules/net-amazon-ec2-ipv6.patch b/pkgs/development/perl-modules/net-amazon-ec2-ipv6.patch
new file mode 100644
index 00000000000..453d8f7d29e
--- /dev/null
+++ b/pkgs/development/perl-modules/net-amazon-ec2-ipv6.patch
@@ -0,0 +1,60 @@
+Support OpenStack's DescribeInstancesV6 API call.
+
+diff -ru -x '*~' Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2/RunningInstances.pm Net-Amazon-EC2-0.14//lib/Net/Amazon/EC2/RunningInstances.pm
+--- Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2/RunningInstances.pm	2010-01-24 02:12:50.000000000 +0100
++++ Net-Amazon-EC2-0.14//lib/Net/Amazon/EC2/RunningInstances.pm	2011-06-21 17:19:36.000000000 +0200
+@@ -25,6 +25,10 @@
+ This element remains empty until the instance enters a 
+ running state.
+ 
++=item dns_name_v6 (optional)
++
++The public IPv6 address of the instance.
++
+ =item image_id (required)
+ 
+ The image id of the AMI currently running in this instance.
+@@ -126,6 +130,7 @@
+ 
+ has 'ami_launch_index'  	=> ( is => 'ro', isa => 'Str', required => 0 );
+ has 'dns_name'          	=> ( is => 'ro', isa => 'Maybe[Str]', required => 0 );
++has 'dns_name_v6'          	=> ( is => 'ro', isa => 'Maybe[Str]', required => 0 );
+ has 'image_id'          	=> ( is => 'ro', isa => 'Str', required => 1 );
+ has 'kernel_id'         	=> ( is => 'ro', isa => 'Maybe[Str]', required => 1 );
+ has 'ramdisk_id'        	=> ( is => 'ro', isa => 'Maybe[Str]', required => 1 );
+diff -ru -x '*~' Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2.pm Net-Amazon-EC2-0.14//lib/Net/Amazon/EC2.pm
+--- Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2.pm	2011-06-16 16:11:53.000000000 +0200
++++ Net-Amazon-EC2-0.14//lib/Net/Amazon/EC2.pm	2011-10-20 20:13:12.585277245 +0200
+@@ -1542,6 +1542,7 @@
+ 	my $self = shift;
+ 	my %args = validate( @_, {
+ 		InstanceId => { type => SCALAR | ARRAYREF, optional => 1 },
++		Action => { default => "DescribeInstances" },
+ 	});
+ 	
+ 	# If we have a array ref of instances lets split them out into their InstanceId.n format
+@@ -1556,7 +1557,8 @@
+ 		$args{"InstanceId.1"} = delete $args{InstanceId};
+ 	}
+ 	
+-	my $xml = $self->_sign(Action  => 'DescribeInstances', %args);
++	my $xml = $self->_sign(Action => $args{Action}, %args);
++	delete $args{Action};
+ 	my $reservations;
+ 	
+ 	if ( grep { defined && length } $xml->{Errors} ) {
+@@ -1635,6 +1637,7 @@
+ 				my $running_instance = Net::Amazon::EC2::RunningInstances->new(
+ 					ami_launch_index		=> $instance_elem->{amiLaunchIndex},
+ 					dns_name				=> $instance_elem->{dnsName},
++					dns_name_v6			=> $instance_elem->{dnsNameV6},
+ 					image_id				=> $instance_elem->{imageId},
+ 					kernel_id				=> $instance_elem->{kernelId},
+ 					ramdisk_id				=> $instance_elem->{ramdiskId},
+@@ -3866,4 +3869,4 @@
+ 
+ =head1 SEE ALSO
+ 
+-Amazon EC2 API: L<http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/>
+\ No newline at end of file
++Amazon EC2 API: L<http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/>
diff --git a/pkgs/development/perl-modules/net-amazon-ec2-nova-compat.patch b/pkgs/development/perl-modules/net-amazon-ec2-nova-compat.patch
index c08b3579fc3..5d9aef7f70d 100644
--- a/pkgs/development/perl-modules/net-amazon-ec2-nova-compat.patch
+++ b/pkgs/development/perl-modules/net-amazon-ec2-nova-compat.patch
@@ -1,6 +1,6 @@
 diff -ru -x '*~' Net-Amazon-EC2-0.14-orig/lib/Net/Amazon/EC2.pm Net-Amazon-EC2-0.14/lib/Net/Amazon/EC2.pm
 --- Net-Amazon-EC2-0.14-orig/lib/Net/Amazon/EC2.pm	2010-02-02 02:26:58.000000000 +0100
-+++ Net-Amazon-EC2-0.14/lib/Net/Amazon/EC2.pm	2011-06-16 14:18:19.874176129 +0200
++++ Net-Amazon-EC2-0.14/lib/Net/Amazon/EC2.pm	2011-06-16 16:11:53.861341300 +0200
 @@ -1552,6 +1552,8 @@
  			$args{"InstanceId." . $count} = $instance_id;
  			$count++;
@@ -10,3 +10,12 @@ diff -ru -x '*~' Net-Amazon-EC2-0.14-orig/lib/Net/Amazon/EC2.pm Net-Amazon-EC2-0
  	}
  	
  	my $xml = $self->_sign(Action  => 'DescribeInstances', %args);
+@@ -3739,6 +3741,8 @@
+ 			$args{"InstanceId." . $count} = $instance_id;
+ 			$count++;
+ 		}
++	} else {
++		$args{"InstanceId.1"} = delete $args{InstanceId};
+ 	}
+ 	
+ 	my $xml = $self->_sign(Action  => 'TerminateInstances', %args);	
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 32b804a2b19..74160ca3f23 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2411,6 +2411,8 @@ rec {
         # "InstanceId", as required by the Amazon spec.  EC2 tolerates
         # "InstanceId", but Nova doesn't.
         ../development/perl-modules/net-amazon-ec2-nova-compat.patch
+        # Support DescribeInstancesV6.
+        ../development/perl-modules/net-amazon-ec2-ipv6.patch
       ];
     propagatedBuildInputs =
       [ DigestHMAC LWP LWPProtocolHttps Moose URI ParamsValidate XMLSimple ];

From 8f76df522ecfaca887bac3c722e0451f0905638b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 20 Oct 2011 23:11:13 +0000
Subject: [PATCH 39/95] * 32-bit Flash player updated.

svn path=/nixpkgs/trunk/; revision=29951
---
 .../browsers/mozilla-plugins/flashplayer-10/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
index 6cdd175573d..ad6867ab5be 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
@@ -53,9 +53,9 @@ let
         url = http://download.macromedia.com/pub/labs/flashplayer10/flashplayer_square_p2_32bit_debug_linux_092710.tar.gz;
         sha256 = "11w3mxa39l4mnlsqzlwbdh1sald549afyqbx2kbid7in5qzamlcc";
       } else {
-        version = "10.3.183.7";
+        version = "10.3.183.10";
         url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz;
-        sha256 = "166ipldmd03psy68xxirmdd4p591vjnffpv2l97yg1bbkn5h2pj6";
+        sha256 = "0fj51dg0aa813b44yn8dvmmvw4qwi8vbi0x8n1bcqrcld3sbpmfz";
       }
     else throw "Flash Player is not supported on this platform";
 

From 6ddae753dcab1d30d31126c96ab6e13d3f07607f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 21 Oct 2011 00:43:56 +0000
Subject: [PATCH 40/95] * Added regionset, a tool for changing the region code
 setting of DVD   players.

svn path=/nixpkgs/trunk/; revision=29952
---
 pkgs/os-specific/linux/regionset/default.nix | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/os-specific/linux/regionset/default.nix

diff --git a/pkgs/os-specific/linux/regionset/default.nix b/pkgs/os-specific/linux/regionset/default.nix
new file mode 100644
index 00000000000..699c4cd82b8
--- /dev/null
+++ b/pkgs/os-specific/linux/regionset/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "regionset-20030629";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/dvd/regionset.tar.gz";
+    sha256 = "0ssr7s0g60kq04y8v60rh2fzn9wp93al3v4rl0ybza1skild9v70";
+  };
+
+  installPhase = "mkdir -p $out/sbin; cp regionset $out/sbin";
+
+  meta = {
+    homepage = http://dvd.sourceforge.net/;
+    descriptions = "Tool for changing the region code setting of DVD players";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7d5fe94b196..b5412d68f89 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5956,6 +5956,8 @@ let
   radeonR600 = callPackage ../os-specific/linux/firmware/radeon-r600 { };
   radeonJuniper = callPackage ../os-specific/linux/firmware/radeon-juniper { };
 
+  regionset = callPackage ../os-specific/linux/regionset { };
+
   rfkill = callPackage ../os-specific/linux/rfkill { };
 
   rt2860fw = callPackage ../os-specific/linux/firmware/rt2860 { };

From 572b54cb9cffc76ae520cce41412ec35c7fd67b1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 21 Oct 2011 02:26:26 +0000
Subject: [PATCH 41/95] * Spotify updated to the latest version.

svn path=/nixpkgs/trunk/; revision=29953
---
 pkgs/applications/audio/spotify/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 3a15d32aa7f..38eb51b93db 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -2,7 +2,7 @@
 
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
 
-let version = "0.6.1.309"; in
+let version = "0.6.2.291"; in
 
 stdenv.mkDerivation {
   name = "spotify-${version}";
@@ -10,13 +10,13 @@ stdenv.mkDerivation {
   src =
     if stdenv.system == "i686-linux" then 
       fetchurl {
-        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gb871a7d-1_i386.deb";
-        sha256 = "01bavmv78vd3lxsinbls72v2sj8czbcwzdg6sc2f9yd5g7snb3im";
+        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gcccc1f5.116-1_i386.deb";
+        sha256 = "164ka9xry9nbnv77w71kzi7bjidlmccw8wnn4fyzavi8pbrpmj08";
       }
     else if stdenv.system == "x86_64-linux" then 
       fetchurl {
-        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gb871a7d-1_amd64.deb";
-        sha256 = "13ki1pcpna7f5sxf1j2axww95c4kqhj0r1d11y98mfvzxxjqimjs";
+        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gcccc1f5.116-1_amd64.deb";
+        sha256 = "08snnpqd5ldiqv98pwx3fjrhdlwp4arbgda9xnsy92wfk0s85lv8";
       }
     else throw "Spotify not supported on this platform.";
 

From 11d18ba4fd2aae30cdfe380dbce4e432092fa153 Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Fri, 21 Oct 2011 14:12:46 +0000
Subject: [PATCH 42/95] Update fossil to version 1.20

svn path=/nixpkgs/trunk/; revision=29954
---
 pkgs/applications/version-management/fossil/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index 6bf401b895a..01d61165af5 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -1,8 +1,8 @@
 {stdenv, fetchurl, zlib, openssl, tcl}:
 
 let
-  version = "1.19";
-  filedate = "20110901182519";
+  version = "1.20";
+  filedate = "20111021125253";
 in
 
 stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.fossil-scm.org/download/fossil-src-${filedate}.tar.gz";
-    sha256 = "14snmwjfl9xz52d8lfzsp4zciwfbi9fwk623bm5dxhn2fczzc960";
+    sha256 = "1qislpc003ydz22ix27k01j975qw745wwjj5x82zd39412mlzycg";
   };
 
   buildInputs = [ zlib openssl ];

From 5e51aadc10b41e7dcca7150530ddb11f65fcf2bb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 21 Oct 2011 14:43:18 +0000
Subject: [PATCH 43/95] * Fix evaluation errors.

svn path=/nixpkgs/trunk/; revision=29955
---
 .../graphics/darktable/default.nix            | 25 +++++++++++--------
 pkgs/development/compilers/llvm/clang.nix     |  2 ++
 pkgs/development/libraries/yajl/default.nix   |  6 ++---
 pkgs/top-level/all-packages.nix               |  5 +---
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index c0ebb95a67a..b0452bba115 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -1,9 +1,11 @@
-{ stdenv, fetchurl,
-  GConf, atk, cairo, cmake, curl, dbus_glib, exiv2, glib,
-  gnome_keyring, gphoto2, gtk, ilmbase, intltool, lcms, lcms2,
-  lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg,
-  libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb,
-  openexr, pixman, pkgconfig, sqlite}:
+{ stdenv, fetchurl
+, GConf, atk, cairo, cmake, curl, dbus_glib, exiv2, glib
+, gnome_keyring, gphoto2, gtk, ilmbase, intltool, lcms, lcms2
+, lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg
+, libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb
+, openexr, pixman, pkgconfig, sqlite }:
+
+assert stdenv ? glibc;
 
 stdenv.mkDerivation rec {
   version = "0.9.1";
@@ -14,11 +16,12 @@ stdenv.mkDerivation rec {
     sha256 = "b687a5f1b2a6c8aa230c1dc3ef83bf74a103e3ebe1c61cdea95a612a7375f21e";
   };
 
-  buildInputs = [
-    GConf atk cairo cmake curl dbus_glib exiv2 glib gnome_keyring gtk
-    ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif
-    libglade libgphoto2 libjpeg libpng libpthreadstubs libraw1394
-    librsvg libtiff libxcb openexr pixman pkgconfig sqlite];
+  buildInputs =
+    [ GConf atk cairo cmake curl dbus_glib exiv2 glib gnome_keyring gtk
+      ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif
+      libglade libgphoto2 libjpeg libpng libpthreadstubs libraw1394
+      librsvg libtiff libxcb openexr pixman pkgconfig sqlite
+    ];
 
   preConfigure = ''
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/include/gtk-2.0"
diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix
index 7c177544725..38da51b9c27 100644
--- a/pkgs/development/compilers/llvm/clang.nix
+++ b/pkgs/development/compilers/llvm/clang.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchurl, perl, groff, llvm }:
 
+assert stdenv.isLinux;
+
 let version = "2.9"; in
 
 stdenv.mkDerivation {
diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix
index 573f3853869..221344b9125 100644
--- a/pkgs/development/libraries/yajl/default.nix
+++ b/pkgs/development/libraries/yajl/default.nix
@@ -20,9 +20,7 @@ stdenv.mkDerivation {
     '';
     homepage = http://lloyd.github.com/yajl/;
     license = stdenv.lib.licenses.isc;
-    platforms = with stdenv.lib.platforms; [ linux darwin ];
-    maintainers = with stdenv.lib.maintainers; [
-      z77z
-    ];
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
+    maintainers = with stdenv.lib.maintainers; [ z77z ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b5412d68f89..9a9ecf40731 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1663,10 +1663,7 @@ let
   cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { };
 
   dylan = callPackage ../development/compilers/gwydion-dylan {
-    dylan =
-      import ../development/compilers/gwydion-dylan/binary.nix {
-        inherit fetchurl stdenv;
-  };
+    dylan = callPackage ../development/compilers/gwydion-dylan/binary.nix {  };
   };
 
   ecl = callPackage ../development/compilers/ecl { };

From cac34d2be5a95da37d70e612cd259fac647c87e1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 21 Oct 2011 15:01:40 +0000
Subject: [PATCH 44/95] * Applied a patch to get Euca2ools / Boto to work on
 Python 2.7.

svn path=/nixpkgs/trunk/; revision=29956
---
 .../python-modules/boto-1.9-python-2.7.patch  | 19 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/python-modules/boto-1.9-python-2.7.patch

diff --git a/pkgs/development/python-modules/boto-1.9-python-2.7.patch b/pkgs/development/python-modules/boto-1.9-python-2.7.patch
new file mode 100644
index 00000000000..79ff9a7e4af
--- /dev/null
+++ b/pkgs/development/python-modules/boto-1.9-python-2.7.patch
@@ -0,0 +1,19 @@
+Fix Boto 1.9 on Python 2.7.
+
+https://github.com/boto/boto/commit/6760075073c34d6dddb7e13b80dfa8d09f0f4f79
+
+diff --git a/boto/connection.py b/boto/connection.py
+index c5779e2..71942f1 100644
+--- a/boto/connection.py
++++ b/boto/connection.py
+@@ -252,8 +252,9 @@ class AWSAuthConnection(object):
+             # versions, it would append ":443" to the hostname sent
+             # in the Host header and so we needed to make sure we
+             # did the same when calculating the V2 signature.  In 2.6
++            # (and higher!)
+             # it no longer does that.  Hence, this kludge.
+-            if sys.version[:3] == "2.6" and port == 443:
++            if sys.version[:3] in ('2.6', '2.7') and port == 443:
+                 signature_host = self.host
+             else:
+                 signature_host = '%s:%d' % (self.host, port)
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2ca2e261a17..3c1622847be 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -156,6 +156,8 @@ let pythonPackages = python.modules // rec {
       sha1 = "00a033b0a593c3ca82927867950f73d88b831155";
     };
 
+    patches = [ ../development/python-modules/boto-1.9-python-2.7.patch ];
+
     meta = {
       homepage = http://code.google.com/p/boto/;
 

From 75c3c1418dbc2c94885db10cffb076dd55af3518 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 21 Oct 2011 16:10:07 +0000
Subject: [PATCH 45/95] * Fix powerpc-linux evaluation (does anybody care?).

svn path=/nixpkgs/trunk/; revision=29958
---
 pkgs/development/compilers/llvm/clang.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix
index 38da51b9c27..78b3219a328 100644
--- a/pkgs/development/compilers/llvm/clang.nix
+++ b/pkgs/development/compilers/llvm/clang.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, perl, groff, llvm }:
 
-assert stdenv.isLinux;
+assert stdenv.isLinux && stdenv.gcc.gcc != null;
 
 let version = "2.9"; in
 

From 7d2a905c821b2140dcfc713cdc943556f8d87d25 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Oct 2011 16:13:49 +0000
Subject: [PATCH 46/95] haskell-crypto-api: updated to version 0.8

svn path=/nixpkgs/trunk/; revision=29959
---
 .../libraries/haskell/crypto-api/{0.7.nix => 0.8.nix}         | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename pkgs/development/libraries/haskell/crypto-api/{0.7.nix => 0.8.nix} (85%)

diff --git a/pkgs/development/libraries/haskell/crypto-api/0.7.nix b/pkgs/development/libraries/haskell/crypto-api/0.8.nix
similarity index 85%
rename from pkgs/development/libraries/haskell/crypto-api/0.7.nix
rename to pkgs/development/libraries/haskell/crypto-api/0.8.nix
index 644edbf1961..66204112c16 100644
--- a/pkgs/development/libraries/haskell/crypto-api/0.7.nix
+++ b/pkgs/development/libraries/haskell/crypto-api/0.8.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "crypto-api";
-  version = "0.7";
-  sha256 = "0831rmkq603ga9py5xxfw77qixdliyh15dxh9ls7rd7ia6sqjvx0";
+  version = "0.8";
+  sha256 = "1fwkafb9v2348vr1a4xnlmkgs4kh85az4f3wnrl9cbqwxf3cc328";
   buildDepends = [ cereal entropy largeword tagged ];
   meta = {
     homepage = "http://trac.haskell.org/crypto-api/wiki";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index c0a88e9048c..a3522040035 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -495,7 +495,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   Crypto = callPackage ../development/libraries/haskell/Crypto {};
 
   cryptoApi_0_6_4 = callPackage ../development/libraries/haskell/crypto-api/0.6.4.nix {};
-  cryptoApi_0_7 = callPackage ../development/libraries/haskell/crypto-api/0.7.nix {};
+  cryptoApi_0_8 = callPackage ../development/libraries/haskell/crypto-api/0.8.nix {};
   cryptoApi = self.cryptoApi_0_6_4;
 
   cryptocipher = callPackage ../development/libraries/haskell/cryptocipher {};

From bba184d3753e5353a159ab9d05f984b4ed603fa8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Oct 2011 16:13:56 +0000
Subject: [PATCH 47/95] haskell-ConfigFile: updated to version 1.1.0

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

diff --git a/pkgs/development/libraries/haskell/ConfigFile/default.nix b/pkgs/development/libraries/haskell/ConfigFile/default.nix
index 378d1e2cd37..d7a5a674bb6 100644
--- a/pkgs/development/libraries/haskell/ConfigFile/default.nix
+++ b/pkgs/development/libraries/haskell/ConfigFile/default.nix
@@ -2,11 +2,12 @@
 
 cabal.mkDerivation (self: {
   pname = "ConfigFile";
-  version = "1.0.6";
-  sha256 = "339722184b86d53d8b361933e572b6e1478824c7eba3fb66b67d0eb5245cd038";
+  version = "1.1.0";
+  sha256 = "0m5p56if711qi69lxw78746sb0jr5gqbmip5hdbb7lk4z5drgvhc";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ MissingH mtl parsec ];
+  noHaddock = true;
   meta = {
     homepage = "http://software.complete.org/configfile";
     description = "Configuration file reading & writing";

From b1dde142213552693d260dbf7dc9b1c4de22b56a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Oct 2011 16:14:00 +0000
Subject: [PATCH 48/95] haskell-NanoProlog: updated to version 0.2.3.3

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

diff --git a/pkgs/development/libraries/haskell/NanoProlog/default.nix b/pkgs/development/libraries/haskell/NanoProlog/default.nix
index 8daa9d2f815..85f5a1d9e6e 100644
--- a/pkgs/development/libraries/haskell/NanoProlog/default.nix
+++ b/pkgs/development/libraries/haskell/NanoProlog/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "NanoProlog";
-  version = "0.2.3.1";
-  sha256 = "1pyvf1vmq61nhjg09416ap37c07lavrrgj2m9wx9dkyvhipzlxjv";
+  version = "0.2.3.3";
+  sha256 = "0008xpahqbs2djchlw1bslhqqhbc0n7ql7pqm4g7lh8xd3ampxba";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ ListLike uuParsinglib ];

From 9704af30c37895a44dde127ea13a8d01e66f1aed Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 21 Oct 2011 16:25:27 +0000
Subject: [PATCH 49/95] * Latest EC2 AMI tools.

svn path=/nixpkgs/trunk/; revision=29963
---
 pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix b/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix
index d0ab00057f5..f6f32a7c5b7 100644
--- a/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix
+++ b/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, unzip, ruby, openssl, makeWrapper }:
 
 stdenv.mkDerivation {
-  name = "ec2-ami-tools-1.3-53773";
+  name = "ec2-ami-tools-1.4.0.1";
   
   buildInputs = [ unzip makeWrapper ];
   
   src = fetchurl {
     url = http://s3.amazonaws.com/ec2-downloads/ec2-ami-tools.zip;
-    sha256 = "310e3b405c11b979b1cd210c5b4c32e97065d616f6bfa449c4e1e50420ce8002";
+    sha256 = "1fjg3gx5k0z8r4apg5whz3yxc3xnz7z5g6j93hf765lfriz1rccz";
   };
 
   # Amazon EC2 requires that disk images are writable.  If they're
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
       done
       
       sed -i 's|/bin/bash|${stdenv.shell}|' $out/lib/ec2/platform/base/pipeline.rb
-    ''; 
+    '';  # */
 
   meta = {
     homepage = http://developer.amazonwebservices.com/connect/entry.jspa?externalID=368&categoryID=88;

From e98852cefda2b8428998fb14a485bc5d3df9ecee Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Oct 2011 16:34:38 +0000
Subject: [PATCH 50/95] git-annex: updated to version 3.20111011

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

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 7513a7adbc7..153ff2f03e9 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -48,8 +48,7 @@ rec {
   gitAnnex = lib.makeOverridable (import ./git-annex) {
     inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which;
     inherit (haskellPackages) ghc MissingH utf8String pcreLight SHA dataenc
-      HTTP testpack monadControl hS3 mtl network hslogger hxt json;
-    QuickCheck2 = haskellPackages.QuickCheck_2_4_0_1;
+      HTTP testpack monadControl hS3 mtl network hslogger hxt json QuickCheck2;
   };
 
   qgit = import ./qgit {
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index 848214b0fb9..5fdf9f43bb1 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@@ -4,14 +4,14 @@
 }:
 
 let
-  version = "3.20110915";
+  version = "3.20111011";
 in
 stdenv.mkDerivation {
   name = "git-annex-${version}";
 
   src = fetchurl {
     url = "http://ftp.de.debian.org/debian/pool/main/g/git-annex/git-annex_${version}.tar.gz";
-    sha256 = "d16c305c82b151ef6ce0c5cfa52a119240b66e02424aefc15a1f67392f976d47";
+    sha256 = "6bfd8ff6784d309bc20aaae38b0edd8f71ed44255b584093a881153d8a70c01c";
   };
 
   buildInputs = [

From 9016346fbda7caf443cd91ae37d3e31dd30cddff Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Oct 2011 16:50:36 +0000
Subject: [PATCH 51/95] git: updated to version 1.7.7

svn path=/nixpkgs/trunk/; revision=29965
---
 .../version-management/git-and-tools/git/default.nix   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 1491b6f7417..eb5daae67e2 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -8,15 +8,15 @@
 }:
 
 let
+  version = "1.7.7";
   svn = subversionClient.override { perlBindings = true; };
 in
-
-stdenv.mkDerivation rec {
-  name = "git-1.7.6";
+stdenv.mkDerivation {
+  name = "git-${version}";
 
   src = fetchurl {
-    url = "mirror://kernel/software/scm/git/${name}.tar.bz2";
-    sha256 = "778795cece63cd758192378f3a999870cea290181b3a4c9de573c77192561082";
+    url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
+    sha256 = "1xkpyd6mff4m8kmk4vkwi7snr2ff2nmrmsa5hf9bk2a93v07p5ss";
   };
 
   patches = [ ./docbook2texi.patch ];

From 68198ed18d895a19807e2c6d85f424c6d7fe5e95 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Oct 2011 17:00:03 +0000
Subject: [PATCH 52/95] smartmontools: updated to version 5.42

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

diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix
index 140e0008ed8..154f6acc09b 100644
--- a/pkgs/tools/system/smartmontools/default.nix
+++ b/pkgs/tools/system/smartmontools/default.nix
@@ -1,14 +1,14 @@
 {stdenv, fetchurl}:
 
 let
-  name = "smartmontools-5.41";
+  name = "smartmontools-5.42";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "mirror://sourceforge/smartmontools/${name}.tar.gz";
-    sha256 = "173eb14e3253a30230f38c7e684085bcae7fa021efff58bdf94c2702ac76fa32";
+    sha256 = "b664d11e814e114ce3a32a4fa918c9e649c684e2897c007b2a8b92574decc374";
   };
 
   meta = {

From 87a251aea5288c6a0035c8973643a4512484d489 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 21 Oct 2011 19:30:32 +0000
Subject: [PATCH 53/95] * Samba 3.6.1.

svn path=/nixpkgs/trunk/; revision=29967
---
 pkgs/servers/samba/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix
index c76c52e5fcc..280122a9d00 100644
--- a/pkgs/servers/samba/default.nix
+++ b/pkgs/servers/samba/default.nix
@@ -21,11 +21,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "samba-3.6.0";
+  name = "samba-3.6.1";
 
   src = fetchurl {
     url = "http://us3.samba.org/samba/ftp/stable/${name}.tar.gz";
-    sha256 = "0gzm09l75i95iibcxykc2h2m9haqx70jp1bpis1mhmvqwillbhg1";
+    sha256 = "0r6mbghja357xhpada5djg0gpczi50f18ap53hdn8b7y0amz5c65";
   };
 
   buildInputs = [ readline pam openldap popt iniparser libunwind fam acl cups ]
@@ -37,7 +37,6 @@ stdenv.mkDerivation rec {
 
   configureFlags = ''
     --with-pam
-    --with-cifsmount
     --with-aio-support
     --with-pam_smbpass
     --disable-swat

From 9667d5ec5acc10ca20c3a560a8d290f7b9186bbf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 21 Oct 2011 23:36:48 +0000
Subject: [PATCH 54/95] * Samba: Apply a patch that fixes readlink() on
 symlinks that point   outside of the share.  This is necessary for EC2 image
 generation   (and similar actions).  Many thanks to Jeremy Allison to fixing
 this   very quickly.  (https://bugzilla.samba.org/show_bug.cgi?id=8541)

svn path=/nixpkgs/trunk/; revision=29969
---
 pkgs/servers/samba/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix
index 280122a9d00..9cb27b23faa 100644
--- a/pkgs/servers/samba/default.nix
+++ b/pkgs/servers/samba/default.nix
@@ -28,6 +28,14 @@ stdenv.mkDerivation rec {
     sha256 = "0r6mbghja357xhpada5djg0gpczi50f18ap53hdn8b7y0amz5c65";
   };
 
+  patches =
+    [ # Fix for https://bugzilla.samba.org/show_bug.cgi?id=8541.
+      (fetchurl {
+        url = https://attachments.samba.org/attachment.cgi?id=7018;
+        sha256 = "1fmq0dx7r09pf6gdw1bcigmnx36yb80xcrh7jv0yv9m1w8m3l2w9";
+      })
+    ];
+
   buildInputs = [ readline pam openldap popt iniparser libunwind fam acl cups ]
     ++ stdenv.lib.optional useKerberos kerberos;
 

From d91165c3688016634c578b3b29802f32f5527760 Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Sat, 22 Oct 2011 00:01:26 +0000
Subject: [PATCH 55/95] Updating Inkscape to 0.48.2

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

diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 0da9bf0b41c..19a2346802c 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -4,14 +4,14 @@
 , gsl, python, pyxml, lxml, poppler }:
 
 stdenv.mkDerivation rec {
-  name = "inkscape-0.48.1";
+  name = "inkscape-0.48.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/inkscape/${name}.tar.bz2";
-    sha256 = "11mvwil787pj3kx3qvjqvd6z5hlk40i6g95g4vs52hrp2ifs9ga4";
+    sha256 = "10v7ixdz7f8vgk2wv0m81zli9p0f446cm1f4aqlvni1ndsx44fi2";
   };
 
-  patches = [ ./configure-python-libs.patch ]; 
+  patches = [ ./configure-python-libs.patch ];
 
   propagatedBuildInputs = [
     # Python is used at run-time to execute scripts, e.g., those from

From 87bf6373198112dcddbb1dda5de785ff26168f1e Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 22 Oct 2011 15:41:20 +0000
Subject: [PATCH 56/95] Mercurial: Give access to ssl and curses python
 packages for fast-export and crecord.

svn path=/nixpkgs/trunk/; revision=29972
---
 .../version-management/git-and-tools/default.nix  |  5 ++---
 .../git-and-tools/fast-export/default.nix         | 15 ++++++++-------
 .../version-management/mercurial/default.nix      |  9 +++++----
 pkgs/top-level/all-packages.nix                   |  6 +++++-
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 153ff2f03e9..6319c3592c6 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -3,7 +3,7 @@
 */
 args: with args; with pkgs;
 let
-  inherit (pkgs) stdenv fetchurl subversion;
+  inherit (pkgs) stdenv fetchgit fetchurl subversion;
 in
 rec {
 
@@ -91,8 +91,7 @@ rec {
   };
 
   gitFastExport = import ./fast-export {
-    inherit fetchurl sourceFromHead stdenv mercurial coreutils git makeWrapper
-      subversion;
+    inherit fetchgit stdenv mercurial coreutils git makeWrapper subversion;
   };
 
   git2cl = import ./git2cl {
diff --git a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
index ef633d87ca6..45860362433 100644
--- a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
@@ -1,13 +1,14 @@
-args: with args;
+{stdenv, fetchgit, mercurial, coreutils, git, makeWrapper, subversion}:
+
 stdenv.mkDerivation {
   name = "fast-export";
 
-  # REGION AUTO UPDATE:     { name="git_fast_export"; type = "git"; url="git://repo.or.cz/hg2git.git"; }
-  src = sourceFromHead "git_fast_export-1464dabbff7fe42b9069e98869db40276d295ad6.tar.gz"
-               (fetchurl { url = "http://mawercer.de/~nix/repos/git_fast_export-1464dabbff7fe42b9069e98869db40276d295ad6.tar.gz"; sha256 = "c65b8607836794b250f5faeef5ec1bcbf40f0bfaeb39ccb600966deb6a40d755"; });
-  # END
+  src = fetchgit {
+    url = "git://repo.or.cz/fast-export.git";
+    rev = "refs/heads/master";
+  };
 
-  buildInputs =([mercurial.python mercurial makeWrapper subversion]);
+  buildInputs = [mercurial.python mercurial makeWrapper subversion];
 
   buildPhase="true"; # skip svn for now
 
@@ -24,7 +25,7 @@ stdenv.mkDerivation {
     mv *.py $l
     for p in $out/bin/*.sh; do
       wrapProgram $p \
-        --set PYTHONPATH "$(echo ${mercurial}/lib/python*/site-packages)" \
+        --prefix PYTHONPATH : "$(echo ${mercurial}/lib/python*/site-packages):$(echo ${mercurial.python}/lib/python*/site-packages)${stdenv.lib.concatMapStrings (x: ":$(echo ${x}/lib/python*/site-packages)") mercurial.pythonPackages}" \
         --prefix PATH : "$(dirname $(type -p python))":$l
     done
   '';
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index eca4dfea17e..e263d7556c0 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -1,15 +1,16 @@
 { stdenv, fetchurl, python, makeWrapper, docutils
-, guiSupport ? false, tk ? null, ssl }:
+, guiSupport ? false, tk ? null, ssl, curses }:
 
 stdenv.mkDerivation rec {
-  name = "mercurial-1.9";
+  name = "mercurial-1.9.2";
 
   src = fetchurl {
     url = "http://mercurial.selenic.com/release/${name}.tar.gz";
-    sha256 = "1q1307rv5cyv7qalwkampy1h2f92j4d46v4x9647ljljs8f4n7ki";
+    sha256 = "481309264d8528a871aab013068c48fa3a6072b016a4095a22230cfdfb8bb9aa";
   };
 
   inherit python; # pass it so that the same version can be used in hg2git
+  pythonPackages = [ ssl curses ];
 
   buildInputs = [ python makeWrapper docutils ];
 
@@ -31,7 +32,7 @@ stdenv.mkDerivation rec {
     ''
       for i in $(cd $out/bin && ls); do
         wrapProgram $out/bin/$i \
-          --prefix PYTHONPATH : "$(toPythonPath "$out ${ssl}")" \
+          --prefix PYTHONPATH : "$(toPythonPath "$out ${ssl} ${curses}")" \
           $WRAP_TK
       done
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9a9ecf40731..40e514b7693 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7025,7 +7025,11 @@ let
 
   mercurial = callPackage ../applications/version-management/mercurial {
     guiSupport = getConfig ["mercurial" "guiSupport"] false; # for hgk (gitk gui for hg)
-    inherit (pythonPackages) ssl;
+    inherit (pythonPackages) ssl curses;
+    # when used with hg-fast-export (git) mercurials files are using
+    # httplib.FakeSocket which is not provided after python 2.6.  (httplib2
+    # has removed it from its interface).
+    python = python27;
   };
 
   merkaartor = callPackage ../applications/misc/merkaartor { };

From 2dcd1544dd18fd6420955b484ca33142bb73006e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 22 Oct 2011 16:21:07 +0000
Subject: [PATCH 57/95] GNU Guile 2.0.3!

svn path=/nixpkgs/trunk/; revision=29973
---
 pkgs/development/interpreters/guile/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index be8d238a97c..33349605736 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring
+{ fetchurl, stdenv, xz, libtool, readline, gmp, pkgconfig, boehmgc, libunistring
 , libffi, gawk, makeWrapper, coverageAnalysis ? null }:
 
 # Do either a coverage analysis build or a standard build.
@@ -7,13 +7,14 @@
  else stdenv.mkDerivation)
 
 rec {
-  name = "guile-2.0.2";
+  name = "guile-2.0.3";
 
   src = fetchurl {
-    url = "mirror://gnu/guile/${name}.tar.gz";
-    sha256 = "0adiwydwb285bb7mcakfdzjgyv24lrm7pk2grgxzi66kidpm6dhx";
+    url = "mirror://gnu/guile/${name}.tar.xz";
+    sha256 = "14rhlpxxa4v5y3gl992l7lnd5qnqawx0a84idnwq0w2qviwcvsyj";
   };
 
+  buildNativeInputs = [ xz ];
   buildInputs =
     [ makeWrapper gawk readline libtool libunistring
       libffi pkgconfig

From 22ff0a19c324681075fa1eb8415f0adf04a1f30b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 22 Oct 2011 20:41:37 +0000
Subject: [PATCH 58/95] Updating the fossil tarball hash, due to an update
 upstream:
 http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg06730.html

I also add readline (it may provide a nicer prompt on fossil sqlite)
and sqlite (required for some tests).

The old tarballs were broken in a way that the tests requiring sqlite were not run.


svn path=/nixpkgs/trunk/; revision=29974
---
 pkgs/applications/version-management/fossil/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index 01d61165af5..29aa9843fbe 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, zlib, openssl, tcl}:
+{stdenv, fetchurl, zlib, openssl, tcl, readline, sqlite}:
 
 let
   version = "1.20";
@@ -10,10 +10,10 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.fossil-scm.org/download/fossil-src-${filedate}.tar.gz";
-    sha256 = "1qislpc003ydz22ix27k01j975qw745wwjj5x82zd39412mlzycg";
+    sha256 = "0m75kw77iray3kbjm1xfn8hr116fn11yv1wr7adcwy314cgj0vv3";
   };
 
-  buildInputs = [ zlib openssl ];
+  buildInputs = [ zlib openssl readline sqlite ];
   buildNativeInputs = [ tcl ];
 
   doCheck = true;

From c10a1a50b81d95a0851dba9730e2983c56eca7e9 Mon Sep 17 00:00:00 2001
From: Alexander Tsamutali <astsmtl@yandex.ru>
Date: Sat, 22 Oct 2011 21:04:29 +0000
Subject: [PATCH 59/95] games/alienarena: New nixbuild.

svn path=/nixpkgs/trunk/; revision=29975
---
 pkgs/games/alienarena/default.nix | 32 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/games/alienarena/default.nix

diff --git a/pkgs/games/alienarena/default.nix b/pkgs/games/alienarena/default.nix
new file mode 100644
index 00000000000..aa7d2f1e914
--- /dev/null
+++ b/pkgs/games/alienarena/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, pkgconfig, libjpeg, libX11, libXxf86vm, curl, libogg
+, libvorbis, freetype, openal, mesa }:
+stdenv.mkDerivation rec {
+  name = "alienarena-7.52";
+  src = fetchurl {
+    url = "http://icculus.org/alienarena/Files/alienarena-7_52-linux20110929.tar.gz";
+    sha256 = "1s1l3apxsxnd8lyi568y38a1fcdr0gwmc3lkgq2nkc676k4gki3m";
+  };
+  buildInputs = [ pkgconfig libjpeg libX11 curl libogg libvorbis
+                  freetype openal mesa libXxf86vm ];
+  patchPhase = ''
+    substituteInPlace ./configure \
+      --replace libopenal.so.1 ${openal}/lib/libopenal.so.1
+  '';
+  meta = {
+    description = "A free, stand-alone first-person shooter computer game";
+    longDescription = ''
+      Do you like old school deathmatch with modern features? How
+      about rich, colorful, arcade-like atmospheres? How about retro
+      Sci-Fi? Then you're going to love what Alien Arena has in store
+      for you! This game combines some of the very best aspects of
+      such games as Quake III and Unreal Tournament and wraps them up
+      with a retro alien theme, while adding tons of original ideas to
+      make the game quite unique.
+    '';
+    homepage = http://red.planetarena.org;
+    # Engine is under GPLv2, everything else is under
+    license = [ "unfree-redistributable" ];
+    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 40e514b7693..9735091c691 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7681,6 +7681,8 @@ let
 
   ### GAMES
 
+  alienarena = callPackage ../games/alienarena { };
+
   asc = callPackage ../games/asc {
     lua = lua5;
     libsigcxx = libsigcxx12;

From d4a560845d34c313c5eb64bf8bfbbe5563ba28c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 22 Oct 2011 21:55:04 +0000
Subject: [PATCH 60/95] Make `ftp.gnu.org' the first site for GNU stuff.

svn path=/nixpkgs/trunk/; revision=29976
---
 pkgs/build-support/fetchurl/mirrors.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index b8925f89303..f65d7cc7fa5 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -24,6 +24,9 @@ rec {
 
   # GNU (http://www.gnu.org/prep/ftp.html).
   gnu = [
+    # This one is the master repository, and thus it's always up-to-date.
+    http://ftp.gnu.org/pub/gnu/
+
     # This one redirects to a (supposedly) nearby and (supposedly) up-to-date
     # mirror.
     http://ftpmirror.gnu.org/
@@ -33,8 +36,6 @@ rec {
     ftp://mirror.cict.fr/gnu/
     ftp://ftp.cs.tu-berlin.de/pub/gnu/
     ftp://ftp.chg.ru/pub/gnu/
-
-    http://ftp.gnu.org/pub/gnu/
   ];
 
   # GCC.

From 5cd2d19bb553de6041c045accdd1cac3880aac93 Mon Sep 17 00:00:00 2001
From: Alexander Tsamutali <astsmtl@yandex.ru>
Date: Sat, 22 Oct 2011 22:12:45 +0000
Subject: [PATCH 61/95] tools/misc/qjoypad: New nixbuild.

svn path=/nixpkgs/trunk/; revision=29977
---
 pkgs/tools/misc/qjoypad/default.nix | 38 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/tools/misc/qjoypad/default.nix

diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix
new file mode 100644
index 00000000000..b6c69be2f09
--- /dev/null
+++ b/pkgs/tools/misc/qjoypad/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, pkgconfig, libX11, libXtst, qt4 }:
+stdenv.mkDerivation rec {
+  name = "qjoypad-4.1.0";
+  src = fetchurl {
+    url = "mirror://sourceforge/qjoypad/${name}.tar.gz";
+    sha256 = "1jlm7i26nfp185xrl41kz5z6fgvyj51bjpz48cg27xx64y40iamm";
+  };
+  buildInputs = [ pkgconfig libX11 libXtst qt4 ];
+  patchPhase = ''
+    cd src
+    substituteInPlace config --replace /bin/bash /bin/sh
+    ensureDir $out
+    export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${libX11}/lib"
+  '';
+  meta = {
+    description = "A program that lets you use gaming devices anywhere";
+    longDescription = ''
+      A simple Linux/QT program that lets you use your gaming devices
+      where you want them: in your games! QJoyPad takes input from a
+      gamepad or joystick and translates it into key strokes or mouse
+      actions, letting you control any XWindows program with your game
+      controller. This lets you play all those games that for some
+      reason don't have joystick support with your joystick. QJoyPad
+      also gives you the advantage of multiple saved layouts so you
+      can have a separate setting for every game, or for every class
+      of game! That way you can play your games the way you want, not
+      the way the programmers decided, and you can have the same
+      button be "fire" in every one of your space fighters. QJoyPad
+      gives you the freedom and flexibility to really take advantage
+      of gaming devices in Linux, and makes the Linux gaming
+      experience just a little bit nicer.
+    '';
+    homepage = http://qjoypad.sourceforge.net;
+    license = with stdenv.lib.licenses; gpl2;
+    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9735091c691..d0f919a644e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1228,6 +1228,8 @@ let
 
   qhull = callPackage ../development/libraries/qhull { };
 
+  qjoypad = callPackage ../tools/misc/qjoypad { };
+
   qshowdiff = callPackage ../tools/text/qshowdiff { };
 
   radvd = callPackage ../tools/networking/radvd { };

From 11941954d8d7abb1304c995f4e6b55f851d6c375 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 23 Oct 2011 15:52:28 +0000
Subject: [PATCH 62/95] Linux 3.0.7

svn path=/nixpkgs/trunk/; revision=29978
---
 pkgs/os-specific/linux/kernel/linux-3.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix
index 6f1a32e5c0f..d2680db30f1 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.0.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix
@@ -200,7 +200,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.0.4";
+    version = "3.0.7";
   
     preConfigure = ''
       substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
@@ -208,7 +208,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2";
-      sha256 = "1vypjcdii75h5f4zsw9lm8wzxd5ix0mk5p94c96hxv828mqqkmhk";
+      sha256 = "1k7466p2xj3fg2kl5cy9ygd4wnd38wam64ga5nr76cz15ylgg06f";
     };
 
     config = configWithPlatform stdenv.platform;

From 5e6dbdf3867ad9d55f28aaae4147a8ae2bbfa168 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 24 Oct 2011 01:03:16 +0000
Subject: [PATCH 63/95] update to gcc 4.4.6

svn path=/nixpkgs/trunk/; revision=29979
---
 pkgs/development/compilers/gcc-4.4/default.nix |  2 +-
 pkgs/development/compilers/gcc-4.4/sources.nix | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/gcc-4.4/default.nix b/pkgs/development/compilers/gcc-4.4/default.nix
index 6c2897c56c4..fa34364912e 100644
--- a/pkgs/development/compilers/gcc-4.4/default.nix
+++ b/pkgs/development/compilers/gcc-4.4/default.nix
@@ -33,7 +33,7 @@ assert langVhdl     -> gnat != null;
 
 with stdenv.lib;
 
-let version = "4.4.3";
+let version = "4.4.6";
     javaEcj = fetchurl {
       # The `$(top_srcdir)/ecj.jar' file is automatically picked up at
       # `configure' time.
diff --git a/pkgs/development/compilers/gcc-4.4/sources.nix b/pkgs/development/compilers/gcc-4.4/sources.nix
index 351240e73ca..357cc2634ed 100644
--- a/pkgs/development/compilers/gcc-4.4/sources.nix
+++ b/pkgs/development/compilers/gcc-4.4/sources.nix
@@ -1,26 +1,26 @@
 /* Automatically generated by `update-gcc.sh', do not edit.
-   For GCC 4.4.2.  */
+   For GCC 4.4.6.  */
 { fetchurl, optional, version, langC, langCC, langFortran, langJava, langAda }:
 
-assert version == "4.4.3";
+assert version == "4.4.6";
 optional /* langC */ true (fetchurl {
   url = "mirror://gcc/releases/gcc-${version}/gcc-core-${version}.tar.bz2";
-  sha256 = "0ml360nwkf95w0ykn19zlyxmdvvzpmrbxj2vfrn0k8i2pvk13wwj";
+  sha256 = "c2959820de3e42eee6b1d381586992f26430f0083b9a51db31d706080fc9b44a";
 }) ++
 optional langCC (fetchurl {
   url = "mirror://gcc/releases/gcc-${version}/gcc-g++-${version}.tar.bz2";
-  sha256 = "1s5zy8pfn4rgfm2l1dpfzrrdhi2l5zhphqk0h3gsbn1pdw751kkv";
+  sha256 = "6d5d2dacab9569472e4caa291abe94017a9b19574b9b0d866de7b04702634ddf";
 }) ++
 optional langFortran (fetchurl {
   url = "mirror://gcc/releases/gcc-${version}/gcc-fortran-${version}.tar.bz2";
-  sha256 = "0iivw5kgwxdlqamwgaw5zhw48jajsmg09fgynyxkrxsa702s74sw";
+  sha256 = "2b9998716a16b80f4cf843ce81da1cf58ce116e0b85422e3004ce4454e8ff923";
 }) ++
 optional langJava (fetchurl {
   url = "mirror://gcc/releases/gcc-${version}/gcc-java-${version}.tar.bz2";
-  sha256 = "13r0yxz6sif3i6sxh7b3fa5m1ygynvsg1bf6ssq6njp1fzp9a2kq";
+  sha256 = "7c8c12eac21d2a5c605ea4d9b7aa52e482354205b801bc93d62603b6f0956b35";
 }) ++
 optional langAda (fetchurl {
   url = "mirror://gcc/releases/gcc-${version}/gcc-ada-${version}.tar.bz2";
-  sha256 = "146jfkwgg7gdgfqnrm04133amk8k9vr51wc01rwp2bcjai9c3kk7";
+  sha256 = "771ef0e90abf61208ce84689bed15391ad249287e36a28e816d6a044035af0c6";
 }) ++
 []

From 6bdcaec0cb8671bf65087ca7ab841a5c6d203dca Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 24 Oct 2011 13:56:50 +0000
Subject: [PATCH 64/95] * Purity fix in libwww-perl.

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 74160ca3f23..877d5aed1e1 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2116,13 +2116,14 @@ rec {
   };
 
   LWP = buildPerlPackage rec {
-    name = "libwww-perl-6.02";
+    name = "libwww-perl-6.03";
     src = fetchurl {
       url = "mirror://cpan/modules/by-module/LWP/${name}.tar.gz";
-      sha256 = "0cn2cbrz5mrpqmnfhhk0bgv0c1q1x722xlnlnzw6zymj5sg3w6dm";
+      sha256 = "1zlnz4ylk1y0rw56vlf9knawwjx72b1gm09yp06ccpgmmndif4dg";
     };
     propagatedBuildInputs =
       [ EncodeLocale FileListing HTMLParser HTTPCookies HTTPMessage LWPMediaTypes URI NetHTTP ];
+    doCheck = false; # tries to start a daemon
   };
 
   LWPMediaTypes = buildPerlPackage rec {

From c026c359881a5759c29f199e2c85774d2a91ad6f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Oct 2011 15:35:56 +0000
Subject: [PATCH 65/95] haskell-crypto-api: dropped obsolete version 0.6.4

svn path=/nixpkgs/trunk/; revision=29985
---
 .../libraries/haskell/crypto-api/0.6.4.nix     | 18 ------------------
 .../crypto-api/{0.8.nix => default.nix}        |  0
 pkgs/top-level/haskell-packages.nix            |  4 +---
 3 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/crypto-api/0.6.4.nix
 rename pkgs/development/libraries/haskell/crypto-api/{0.8.nix => default.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/crypto-api/0.6.4.nix b/pkgs/development/libraries/haskell/crypto-api/0.6.4.nix
deleted file mode 100644
index e651d03b736..00000000000
--- a/pkgs/development/libraries/haskell/crypto-api/0.6.4.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ cabal, cereal, entropy, largeword, tagged }:
-
-cabal.mkDerivation (self: {
-  pname = "crypto-api";
-  version = "0.6.4";
-  sha256 = "1v3nnfw13r514a723lsx8d1awlad6fmv27bgp76f1ssv1garraf3";
-  buildDepends = [ cereal entropy largeword tagged ];
-  meta = {
-    homepage = "http://trac.haskell.org/crypto-api/wiki";
-    description = "A generic interface for cryptographic operations";
-    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/crypto-api/0.8.nix b/pkgs/development/libraries/haskell/crypto-api/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/crypto-api/0.8.nix
rename to pkgs/development/libraries/haskell/crypto-api/default.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index a3522040035..d92dca86ecd 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -494,9 +494,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   Crypto = callPackage ../development/libraries/haskell/Crypto {};
 
-  cryptoApi_0_6_4 = callPackage ../development/libraries/haskell/crypto-api/0.6.4.nix {};
-  cryptoApi_0_8 = callPackage ../development/libraries/haskell/crypto-api/0.8.nix {};
-  cryptoApi = self.cryptoApi_0_6_4;
+  cryptoApi = callPackage ../development/libraries/haskell/crypto-api {};
 
   cryptocipher = callPackage ../development/libraries/haskell/cryptocipher {};
 

From 7f96fe0a323462f171933dc28524d3aba687d6c4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Oct 2011 15:36:06 +0000
Subject: [PATCH 66/95] haskell-bytestring-nums: updated to version 0.3.5

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

diff --git a/pkgs/development/libraries/haskell/bytestring-nums/default.nix b/pkgs/development/libraries/haskell/bytestring-nums/default.nix
index 4a480b07931..20228b9eed1 100644
--- a/pkgs/development/libraries/haskell/bytestring-nums/default.nix
+++ b/pkgs/development/libraries/haskell/bytestring-nums/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "bytestring-nums";
-  version = "0.3.3";
-  sha256 = "09gdbyj5qw98j57cs9phzsbmvdm7y6j07wg908i34jklwm24nxfd";
+  version = "0.3.5";
+  sha256 = "12knbyrvr1wa7za8bwypvq3cp81k18qi032dl98s2ylhcz1r6rdk";
   isLibrary = true;
   isExecutable = true;
   meta = {

From 142d3b222da91f875b194620fd19b1bfd1af8748 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Oct 2011 15:36:14 +0000
Subject: [PATCH 67/95] haskell-clientsession: updated to version 0.7.3.2

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

diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix
index c5096ae9a77..a2ebb5c2d9b 100644
--- a/pkgs/development/libraries/haskell/clientsession/default.nix
+++ b/pkgs/development/libraries/haskell/clientsession/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "clientsession";
-  version = "0.7.3.1";
-  sha256 = "0q16brla4m5g7dmgln3awx964ms7pi1s2r21idmc0mk4rnw2rpi7";
+  version = "0.7.3.2";
+  sha256 = "1ml1f5sarfck39qrv4zjcbk1vwgazn32gnjm78fm047ixczi9340";
   buildDepends = [
     base64Bytestring cereal cryptoApi cryptocipher skein
   ];

From f0b4235838ef7b5546bb2725d91b89e59c86708d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Oct 2011 15:36:21 +0000
Subject: [PATCH 68/95] haskell-cprng-aes: updated to version 0.2.2

svn path=/nixpkgs/trunk/; revision=29988
---
 pkgs/development/libraries/haskell/cprng-aes/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/cprng-aes/default.nix b/pkgs/development/libraries/haskell/cprng-aes/default.nix
index 1c156f47a3f..80a04e96549 100644
--- a/pkgs/development/libraries/haskell/cprng-aes/default.nix
+++ b/pkgs/development/libraries/haskell/cprng-aes/default.nix
@@ -1,10 +1,10 @@
-{ cabal, cereal, cryptoApi, cryptocipher, random }:
+{ cabal, cereal, cryptoApi, cryptocipher, entropy, random }:
 
 cabal.mkDerivation (self: {
   pname = "cprng-aes";
-  version = "0.2.1";
-  sha256 = "0q6qkvha7cckz3zjnzfsrx298arzbdavy1f73hygrd8f7n74442j";
-  buildDepends = [ cereal cryptoApi cryptocipher random ];
+  version = "0.2.2";
+  sha256 = "0jfa9fb670bqlnkplmscz878hvdbpap47xfxvshgs102iq7rjasf";
+  buildDepends = [ cereal cryptoApi cryptocipher entropy random ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-cprng-aes";
     description = "Crypto Pseudo Random Number Generator using AES in counter mode";

From 663a451a06b51a2305074f99643c3a4e6c55c75d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Oct 2011 15:36:28 +0000
Subject: [PATCH 69/95] haskell-cryptohash: updated to version 0.7.4

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

diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix
index 132a46be09e..4336be8318d 100644
--- a/pkgs/development/libraries/haskell/cryptohash/default.nix
+++ b/pkgs/development/libraries/haskell/cryptohash/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cryptohash";
-  version = "0.7.3";
-  sha256 = "1wjmf7ll9jady6p79066b5ib70ywvbgnbc71s76pibkg5hsvclgj";
+  version = "0.7.4";
+  sha256 = "1nplmwihq40jmng4r3wiyfb0i33a8wx2gmlbqajc62wny98l7sab";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ cereal cryptoApi tagged ];

From 553eb023d81db43ae8170354a99bdb49f56bb046 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Oct 2011 15:36:37 +0000
Subject: [PATCH 70/95] haskell-enumerator: updated to version 0.4.15

svn path=/nixpkgs/trunk/; revision=29990
---
 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 1037c570bdb..d42470637d4 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.14";
-  sha256 = "06bvrr76y12r3i1xi1s98fc1v6mcmn8nzhbp80wgyi743ksqcr1d";
+  version = "0.4.15";
+  sha256 = "06yzf2xaadmdhgidzyp7qywd8d401f4n1qlfyx0q72nafgnlvr6v";
   buildDepends = [ text transformers ];
   meta = {
     homepage = "https://john-millikin.com/software/enumerator/";

From 942784d483d7af5555f4ab3de3ba9986b75c50fc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Oct 2011 15:36:45 +0000
Subject: [PATCH 71/95] haskell-gloss: updated to version 1.4.0.1

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

diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix
index 509624321f8..6bc322bce0e 100644
--- a/pkgs/development/libraries/haskell/gloss/default.nix
+++ b/pkgs/development/libraries/haskell/gloss/default.nix
@@ -1,10 +1,10 @@
-{ cabal, GLUT, OpenGL }:
+{ cabal, bmp, GLUT, OpenGL }:
 
 cabal.mkDerivation (self: {
   pname = "gloss";
-  version = "1.3.4.1";
-  sha256 = "0cyk75b495vq59pnfqy6ny5kb0i0zq2hwfb1q69vj0cfyiqiwjsb";
-  buildDepends = [ GLUT OpenGL ];
+  version = "1.4.0.1";
+  sha256 = "0za7imyzfgk3ndh9db55wi7zbxrmpvshws4vywrr35b77b3nabr1";
+  buildDepends = [ bmp GLUT OpenGL ];
   meta = {
     homepage = "http://gloss.ouroborus.net";
     description = "Painless 2D vector graphics, animations and simulations";

From b5819b57385fc97ff290a779bdffec9fd6d556c2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Oct 2011 15:36:50 +0000
Subject: [PATCH 72/95] haskell-skein: updated to version 0.1.0.2

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

diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix
index 4795c5f2f04..e197ab349e3 100644
--- a/pkgs/development/libraries/haskell/skein/default.nix
+++ b/pkgs/development/libraries/haskell/skein/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "skein";
-  version = "0.1.0.1";
-  sha256 = "1i05ajmnsm0ac9cqnf1lmdaa6sxkirxv5r2h8phpapzvzwislpr8";
+  version = "0.1.0.2";
+  sha256 = "1ay7ri011vwvl74b9calbnav90d0r08gzqgdk8nvw1qx4slk1ibs";
   buildDepends = [ cereal cryptoApi tagged ];
   meta = {
     description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";

From b3f1015e6bc7ee737aff565290b8772de8390e96 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 24 Oct 2011 16:06:31 +0000
Subject: [PATCH 73/95] Linux 3.1

svn path=/nixpkgs/trunk/; revision=29993
---
 pkgs/os-specific/linux/kernel/linux-3.1.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.1.nix b/pkgs/os-specific/linux/kernel/linux-3.1.nix
index 4f8d08340e6..2b74c3a0ba9 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.1.nix
@@ -200,18 +200,17 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.1-rc8";
+    version = "3.1";
 
-    modDirVersion = "3.1.0-rc8";
+    modDirVersion = "3.1.0";
 
     preConfigure = ''
       substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
     '';
   
     src = fetchurl {
-      url = "https://github.com/torvalds/linux/tarball/v${version}";
-      sha256 = "1sz6snv2wavzasrswaprkjpzpll4247v4br0x2i6sndl2nqa6jz7";
-      name = "v${version}.tar.gz";
+      url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2";
+      sha256 = "0nck9cx66crqhw17y4vc3rfqrcz5269nwn2p5dh0qjvmihvx4wr5";
     };
 
     config = configWithPlatform stdenv.platform;

From f405ee266bf05bad91e522b74802a595c1c88c86 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 24 Oct 2011 16:30:59 +0000
Subject: [PATCH 74/95] * Enable staging drivers in Linux 3.x.  Staging drivers
 are more experimental   and lower quality than regular drivers.  However,
 there are a lot of drivers   for wireless cards that we really need to have. 
 And it doesn't really hurt   to have these drivers if you don't need them. *
 Enable the Radeon KMS option.  This shouldn't be a problem since the X driver
   supports KMS (I think).

svn path=/nixpkgs/trunk/; revision=29994
---
 pkgs/os-specific/linux/kernel/linux-3.0.nix | 7 ++++++-
 pkgs/os-specific/linux/kernel/linux-3.1.nix | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix
index d2680db30f1..f3b30b329d4 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.0.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix
@@ -77,8 +77,9 @@ let
       FB_GEODE y
 
       # Video configuration
-      # The intel drivers already require KMS
+      # Enable KMS for devices whose X.org driver supports it.
       DRM_I915_KMS y
+      DRM_RADEON_KMS y
       # Hybrid graphics support
       VGA_SWITCHEROO y
 
@@ -192,6 +193,10 @@ let
       CGROUP_MEM_RES_CTLR_SWAP? y
       DEVPTS_MULTIPLE_INSTANCES? y
 
+      # Enable staging drivers.  These are somewhat experimental, but
+      # they generally don't hurt.
+      STAGING y
+
       ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
       ${extraConfig}
     '';
diff --git a/pkgs/os-specific/linux/kernel/linux-3.1.nix b/pkgs/os-specific/linux/kernel/linux-3.1.nix
index 2b74c3a0ba9..d37887ec14a 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.1.nix
@@ -77,8 +77,9 @@ let
       FB_GEODE y
 
       # Video configuration
-      # The intel drivers already require KMS
+      # Enable KMS for devices whose X.org driver supports it.
       DRM_I915_KMS y
+      DRM_RADEON_KMS y
       # Hybrid graphics support
       VGA_SWITCHEROO y
 
@@ -192,6 +193,10 @@ let
       CGROUP_MEM_RES_CTLR_SWAP? y
       DEVPTS_MULTIPLE_INSTANCES? y
 
+      # Enable staging drivers.  These are somewhat experimental, but
+      # they generally don't hurt.
+      STAGING y
+
       ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
       ${extraConfig}
     '';

From cb823d1c08e4088a550134f9e247d1b3955c2deb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 24 Oct 2011 16:36:03 +0000
Subject: [PATCH 75/95] Adding mu0, maildir utils.

svn path=/nixpkgs/trunk/; revision=29995
---
 pkgs/tools/networking/mu0/default.nix | 25 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/tools/networking/mu0/default.nix

diff --git a/pkgs/tools/networking/mu0/default.nix b/pkgs/tools/networking/mu0/default.nix
new file mode 100644
index 00000000000..a772f237500
--- /dev/null
+++ b/pkgs/tools/networking/mu0/default.nix
@@ -0,0 +1,25 @@
+{ fetchurl, stdenv, sqlite, pkgconfig, xapian, glib, gmime }:
+
+stdenv.mkDerivation rec {
+  name = "mu0-0.9.7";
+
+  src = fetchurl {
+    url = http://mu0.googlecode.com/files/mu-0.9.7.tar.gz;
+    sha256 = "14nyn791ficyllj9idhiq3mncwnrg71lfxk126804dxba1l90r72";
+  };
+
+  buildInputs = [ sqlite pkgconfig xapian glib gmime ];
+
+  /* The tests don't pass */
+  doCheck = false;
+
+  meta = {
+    description = "mu is a collection of utilties for indexing and searching Maildirs";
+
+    licenses = [ "GPLv3+" ];
+
+    homepage = http://code.google.com/p/mu0/;
+
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d0f919a644e..bd6be112783 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -927,6 +927,8 @@ let
 
   lzop = callPackage ../tools/compression/lzop { };
 
+  mu0 = callPackage ../tools/networking/mu0 { };
+
   mailutils = callPackage ../tools/networking/mailutils {
     guile = guile_1_8;
   };

From 215e6d0c7d8b3e9982eed65625c9615dc832b740 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 24 Oct 2011 17:22:10 +0000
Subject: [PATCH 76/95] * attachments.samba.org is down, and we should not
 depend on it anyway.

svn path=/nixpkgs/trunk/; revision=29996
---
 pkgs/servers/samba/default.nix    |   5 +-
 pkgs/servers/samba/readlink.patch | 147 ++++++++++++++++++++++++++++++
 2 files changed, 148 insertions(+), 4 deletions(-)
 create mode 100755 pkgs/servers/samba/readlink.patch

diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix
index 9cb27b23faa..a6ade7400e8 100644
--- a/pkgs/servers/samba/default.nix
+++ b/pkgs/servers/samba/default.nix
@@ -30,10 +30,7 @@ stdenv.mkDerivation rec {
 
   patches =
     [ # Fix for https://bugzilla.samba.org/show_bug.cgi?id=8541.
-      (fetchurl {
-        url = https://attachments.samba.org/attachment.cgi?id=7018;
-        sha256 = "1fmq0dx7r09pf6gdw1bcigmnx36yb80xcrh7jv0yv9m1w8m3l2w9";
-      })
+      ./readlink.patch
     ];
 
   buildInputs = [ readline pam openldap popt iniparser libunwind fam acl cups ]
diff --git a/pkgs/servers/samba/readlink.patch b/pkgs/servers/samba/readlink.patch
new file mode 100755
index 00000000000..e474624c4d4
--- /dev/null
+++ b/pkgs/servers/samba/readlink.patch
@@ -0,0 +1,147 @@
+diff --git a/source3/include/smb.h b/source3/include/smb.h
+index 3a64af7..549ebb2 100644
+--- a/source3/include/smb.h
++++ b/source3/include/smb.h
+@@ -1714,6 +1714,7 @@ struct smb_file_time {
+ #define UCF_ALWAYS_ALLOW_WCARD_LCOMP	0x00000002
+ #define UCF_COND_ALLOW_WCARD_LCOMP	0x00000004
+ #define UCF_POSIX_PATHNAMES		0x00000008
++#define UCF_UNIX_NAME_LOOKUP		0x00000010
+ 
+ /*
+  * smb_filename
+diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
+index 25301e6..691a779 100644
+--- a/source3/smbd/filename.c
++++ b/source3/smbd/filename.c
+@@ -977,26 +977,39 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
+ }
+ 
+ /****************************************************************************
+- Check a filename - possibly calling check_reduced_name.
+- This is called by every routine before it allows an operation on a filename.
+- It does any final confirmation necessary to ensure that the filename is
+- a valid one for the user to access.
++ Ensure a path is not vetod.
+ ****************************************************************************/
+ 
+-NTSTATUS check_name(connection_struct *conn, const char *name)
++NTSTATUS check_veto_path(connection_struct *conn, const char *name)
+ {
+ 	if (IS_VETO_PATH(conn, name))  {
+ 		/* Is it not dot or dot dot. */
+-		if (!((name[0] == '.') && (!name[1] ||
+-					(name[1] == '.' && !name[2])))) {
+-			DEBUG(5,("check_name: file path name %s vetoed\n",
++		if (!(ISDOT(name) || ISDOTDOT(name))) {
++			DEBUG(5,("check_veto_path: file path name %s vetoed\n",
+ 						name));
+ 			return map_nt_error_from_unix(ENOENT);
+ 		}
+ 	}
++	return NT_STATUS_OK;
++}
++
++/****************************************************************************
++ Check a filename - possibly calling check_reduced_name.
++ This is called by every routine before it allows an operation on a filename.
++ It does any final confirmation necessary to ensure that the filename is
++ a valid one for the user to access.
++****************************************************************************/
++
++NTSTATUS check_name(connection_struct *conn, const char *name)
++{
++	NTSTATUS status = check_veto_path(conn, name);
++
++	if (!NT_STATUS_IS_OK(status)) {
++		return status;
++	}
+ 
+ 	if (!lp_widelinks(SNUM(conn)) || !lp_symlinks(SNUM(conn))) {
+-		NTSTATUS status = check_reduced_name(conn,name);
++		status = check_reduced_name(conn,name);
+ 		if (!NT_STATUS_IS_OK(status)) {
+ 			DEBUG(5,("check_name: name %s failed with %s\n",name,
+ 						nt_errstr(status)));
+@@ -1314,6 +1327,12 @@ NTSTATUS filename_convert(TALLOC_CTX *ctx,
+ 		return status;
+ 	}
+ 
++	if ((ucf_flags & UCF_UNIX_NAME_LOOKUP) &&
++			VALID_STAT((*pp_smb_fname)->st) &&
++			S_ISLNK((*pp_smb_fname)->st.st_ex_mode)) {
++		return check_veto_path(conn, (*pp_smb_fname)->base_name);
++	}
++
+ 	status = check_name(conn, (*pp_smb_fname)->base_name);
+ 	if (!NT_STATUS_IS_OK(status)) {
+ 		DEBUG(3,("filename_convert: check_name failed "
+diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
+index c455ffe..1e5d891 100644
+--- a/source3/smbd/proto.h
++++ b/source3/smbd/proto.h
+@@ -336,6 +336,7 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
+ 		      const char *orig_path,
+ 		      struct smb_filename **smb_fname,
+ 		      uint32_t ucf_flags);
++NTSTATUS check_veto_path(connection_struct *conn, const char *name);
+ NTSTATUS check_name(connection_struct *conn, const char *name);
+ int get_real_filename(connection_struct *conn, const char *path,
+ 		      const char *name, TALLOC_CTX *mem_ctx,
+diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
+index 0931fff..284635d 100644
+--- a/source3/smbd/trans2.c
++++ b/source3/smbd/trans2.c
+@@ -2271,6 +2271,7 @@ static void call_trans2findfirst(connection_struct *conn,
+ 	TALLOC_CTX *ctx = talloc_tos();
+ 	struct dptr_struct *dirptr = NULL;
+ 	struct smbd_server_connection *sconn = req->sconn;
++	uint32_t ucf_flags = (UCF_SAVE_LCOMP | UCF_ALWAYS_ALLOW_WCARD_LCOMP);
+ 
+ 	if (total_params < 13) {
+ 		reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
+@@ -2314,6 +2315,7 @@ close_if_end = %d requires_resume_key = %d level = 0x%x, max_data_bytes = %d\n",
+ 				reply_nterror(req, NT_STATUS_INVALID_LEVEL);
+ 				goto out;
+ 			}
++			ucf_flags |= UCF_UNIX_NAME_LOOKUP;
+ 			break;
+ 		default:
+ 			reply_nterror(req, NT_STATUS_INVALID_LEVEL);
+@@ -5103,6 +5105,7 @@ static void call_trans2qfilepathinfo(connection_struct *conn,
+ 	} else {
+ 		uint32_t name_hash;
+ 		char *fname = NULL;
++		uint32_t ucf_flags = 0;
+ 
+ 		/* qpathinfo */
+ 		if (total_params < 7) {
+@@ -5114,9 +5117,16 @@ static void call_trans2qfilepathinfo(connection_struct *conn,
+ 
+ 		DEBUG(3,("call_trans2qfilepathinfo: TRANSACT2_QPATHINFO: level = %d\n", info_level));
+ 
+-		if (INFO_LEVEL_IS_UNIX(info_level) && !lp_unix_extensions()) {
+-			reply_nterror(req, NT_STATUS_INVALID_LEVEL);
+-			return;
++		if (INFO_LEVEL_IS_UNIX(info_level)) {
++			if (!lp_unix_extensions()) {
++				reply_nterror(req, NT_STATUS_INVALID_LEVEL);
++				return;
++			}
++			if (info_level == SMB_QUERY_FILE_UNIX_BASIC ||
++					info_level == SMB_QUERY_FILE_UNIX_INFO2 ||
++					info_level == SMB_QUERY_FILE_UNIX_LINK) {
++				ucf_flags |= UCF_UNIX_NAME_LOOKUP;
++			}
+ 		}
+ 
+ 		srvstr_get_path(req, params, req->flags2, &fname, &params[6],
+@@ -5131,7 +5141,7 @@ static void call_trans2qfilepathinfo(connection_struct *conn,
+ 					conn,
+ 					req->flags2 & FLAGS2_DFS_PATHNAMES,
+ 					fname,
+-					0,
++					ucf_flags,
+ 					NULL,
+ 					&smb_fname);
+ 		if (!NT_STATUS_IS_OK(status)) {

From d7eb2167aa953145c4a59803f4af87a5ca329224 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 24 Oct 2011 18:53:24 +0000
Subject: [PATCH 77/95] Updating opendkim

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

diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix
index e77a241af72..62a343d8efc 100644
--- a/pkgs/development/libraries/opendkim/default.nix
+++ b/pkgs/development/libraries/opendkim/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, openssl, libmilter}:
 
 stdenv.mkDerivation rec {
-  name = "opendkim-1.2.2";
+  name = "opendkim-2.4.2";
   src = fetchurl {
     url = "mirror://sourceforge/opendkim/files/${name}.tar.gz";
-    sha256 = "01kvhm10kv17mm4zfz0zd24wzr98fxqwyzm56m2l1v262ng3l4nw";
+    sha256 = "0gwgcrnl5c60sxb9z38ari2gl7vd626r3z3dcq8a6aw28pw9w2lk";
   };
 
   configureFlags="--with-openssl=${openssl} --with-milter=${libmilter}";

From f71f99ce486becd76387c04bff3e761416877ca3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 24 Oct 2011 19:03:18 +0000
Subject: [PATCH 78/95] Updating mldonkey

svn path=/nixpkgs/trunk/; revision=29998
---
 pkgs/applications/networking/p2p/mldonkey/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix
index 244858757d1..16ce0d3504d 100644
--- a/pkgs/applications/networking/p2p/mldonkey/default.nix
+++ b/pkgs/applications/networking/p2p/mldonkey/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, ocaml, zlib, bzip2, ncurses, file, gd, libpng }:
 
 stdenv.mkDerivation (rec {
-  name = "mldonkey-3.0.7";
+  name = "mldonkey-3.1.0";
   
   src = fetchurl {
     url = "mirror://sourceforge/mldonkey/${name}.tar.bz2";
-    sha256 = "1m5cfx79jiym93bx789lqc1bmwrkz1b1jilhga7d994jsjcw6c2n";
+    sha256 = "02038nhh6lbb714ariy2xw1vgfycr1w750zplbgwk5pa3cm163zx";
   };
   
   meta = {

From e0b9bbdb27bddcaec084d6ad1b64a600f185eea3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Oct 2011 19:18:04 +0000
Subject: [PATCH 79/95] haskell-cabal-file-th: added version 0.1

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

diff --git a/pkgs/development/libraries/haskell/cabal-file-th/default.nix b/pkgs/development/libraries/haskell/cabal-file-th/default.nix
new file mode 100644
index 00000000000..4fea333c6f4
--- /dev/null
+++ b/pkgs/development/libraries/haskell/cabal-file-th/default.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "cabal-file-th";
+  version = "0.1";
+  sha256 = "1i0k8c9kf2av0vs9qhd15kqrkzi5z89va4gp2cfkssq66y98k8p8";
+  meta = {
+    homepage = "http://github.com/nkpart/cabal-file-th";
+    description = "Template Haskell expressions for reading fields from a project's cabal file";
+    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 d92dca86ecd..5a1e68b2f0f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -436,6 +436,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   bytestringTrie = callPackage ../development/libraries/haskell/bytestring-trie {};
 
+  cabalFileTh = callPackage ../development/libraries/haskell/cabal-file-th {};
+
   cairo = callPackage ../development/libraries/haskell/cairo {
     inherit (pkgs) cairo zlib;
     libc = pkgs.stdenv.gcc.libc;

From 19291c77e31558f304ea0276be3e01c4094ba154 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Oct 2011 19:18:10 +0000
Subject: [PATCH 80/95] haskell-hledger-web: updated to version 0.16.4

svn path=/nixpkgs/trunk/; revision=30000
---
 .../libraries/haskell/hledger-web/default.nix  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix
index a046e86e075..426e477fc0f 100644
--- a/pkgs/development/libraries/haskell/hledger-web/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-web/default.nix
@@ -1,19 +1,19 @@
-{ cabal, aesonNative, blazeHtml, clientsession, cmdargs, dataObject
-, dataObjectYaml, failure, fileEmbed, hamlet, hledger, hledgerLib
-, HUnit, ioStorage, parsec, regexpr, safe, shakespeareCss
-, shakespeareJs, shakespeareText, text, time, transformers, wai
-, waiExtra, warp, yesod, yesodCore, yesodForm, yesodJson
-, yesodStatic
+{ cabal, aesonNative, blazeHtml, cabalFileTh, clientsession
+, cmdargs, dataObject, dataObjectYaml, failure, fileEmbed, hamlet
+, hledger, hledgerLib, HUnit, ioStorage, parsec, regexpr, safe
+, shakespeareCss, shakespeareJs, shakespeareText, text, time
+, transformers, wai, waiExtra, warp, yesod, yesodCore, yesodForm
+, yesodJson, yesodStatic
 }:
 
 cabal.mkDerivation (self: {
   pname = "hledger-web";
-  version = "0.16.3";
-  sha256 = "0jciah0k6i4aa21hgpl1nqfyjkmm5kg5zmzmxwynvwckncy17ihg";
+  version = "0.16.4";
+  sha256 = "1p776fzgan9y7g03g92gsvnassc3k28l6l3gr1vd9v3fcnckg2wj";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    aesonNative blazeHtml clientsession cmdargs dataObject
+    aesonNative blazeHtml cabalFileTh clientsession cmdargs dataObject
     dataObjectYaml failure fileEmbed hamlet hledger hledgerLib HUnit
     ioStorage parsec regexpr safe shakespeareCss shakespeareJs
     shakespeareText text time transformers wai waiExtra warp yesod

From 4401a2b70cf67119102f8d57d00838f55a334898 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 24 Oct 2011 23:35:53 +0000
Subject: [PATCH 81/95] * Added the Broadcom 43xx firmware.

svn path=/nixpkgs/trunk/; revision=30002
---
 .../linux/firmware/bcm43xx/default.nix        | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/os-specific/linux/firmware/bcm43xx/default.nix

diff --git a/pkgs/os-specific/linux/firmware/bcm43xx/default.nix b/pkgs/os-specific/linux/firmware/bcm43xx/default.nix
new file mode 100644
index 00000000000..87670cb5223
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/bcm43xx/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchsvn }:
+
+stdenv.mkDerivation rec {
+  name = "bcm43xx-firmware-610.811";
+
+  # For convenience, get it from the Debian SVN repo.  Upstream seems to be
+  # https://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=tree;f=brcm
+  src = fetchsvn {
+    url = svn://svn.debian.org/kernel/dists/trunk/firmware-nonfree/brcm80211/brcm;
+    rev = 17441;
+    sha256 = "0dpc3kwgrslr3i00vx9pvvk2xvcwwf24yrbh6d5gxq9r1q65p8sz";
+  };
+
+  buildPhase = "true";
+
+  installPhase = ''
+    mkdir -p $out/brcm
+    for i in *.fw*; do
+      cp $i $out/brcm/$(echo $i | sed 's/\(.*\.fw\).*/\1/')
+    done
+  '';
+
+  meta = {
+    description = "Firmware for the Broadcom 43xx 802.11 wireless cards";
+    homepage = http://linuxwireless.org/;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd6be112783..f24714f4dc0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5072,6 +5072,8 @@ let
 
   alsaUtils = callPackage ../os-specific/linux/alsa-utils { };
 
+  bcm43xx = callPackage ../os-specific/linux/firmware/bcm43xx { };
+
   bluez = callPackage ../os-specific/linux/bluez { };
 
   bridge_utils = callPackage ../os-specific/linux/bridge-utils { };

From 6638835c9399e212acdf882791d239d823f1ccef Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 25 Oct 2011 06:21:27 +0000
Subject: [PATCH 82/95] Linux 3.0

svn path=/nixpkgs/trunk/; revision=30007
---
 pkgs/os-specific/linux/kernel/linux-3.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix
index f3b30b329d4..f5ee6711f93 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.0.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix
@@ -205,7 +205,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.0.7";
+    version = "3.0.8";
   
     preConfigure = ''
       substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
@@ -213,7 +213,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2";
-      sha256 = "1k7466p2xj3fg2kl5cy9ygd4wnd38wam64ga5nr76cz15ylgg06f";
+      sha256 = "1p9sacxz430rmq5zj8pch2i0dczi5jna5g8xf4gni3w436invlaf";
     };
 
     config = configWithPlatform stdenv.platform;

From e0e4770ec96d35c1f8bab4bda4a629dd747c704a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 25 Oct 2011 08:20:03 +0000
Subject: [PATCH 83/95] klibc 1.5.24

svn path=/nixpkgs/trunk/; revision=30008
---
 pkgs/os-specific/linux/klibc/default.nix   |  8 ++---
 pkgs/os-specific/linux/klibc/make382.patch | 35 ----------------------
 2 files changed, 3 insertions(+), 40 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/klibc/make382.patch

diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix
index b8cd2b18bc7..d71b97b9c7d 100644
--- a/pkgs/os-specific/linux/klibc/default.nix
+++ b/pkgs/os-specific/linux/klibc/default.nix
@@ -3,7 +3,7 @@
 assert stdenv.isLinux;
 
 let
-  version = "1.5.20";
+  version = "1.5.24";
   baseMakeFlags = ["V=1" "prefix=$out" "SHLIBDIR=$out/lib"];
 in
 
@@ -11,12 +11,10 @@ stdenv.mkDerivation {
   name = "klibc-${version}";
 
   src = fetchurl {
-    url = "mirror://kernel/linux/libs/klibc/1.5/klibc-${version}.tar.bz2";
-    sha256 = "07683dn18r3k35d6pp0sn88pqcx7dldqx3m6f2gz45i1j094qp7m";
+    url = "http://ftp.eu.openbsd.org/pub/linux/libs/klibc/1.5/klibc-${version}.tar.bz2";
+    sha256 = "18lm32dlj9k2ky9wwk274zmc3jndgrb41b6qm82g3lza6wlw3yki";
   };
 
-  patches = [ ./make382.patch ];
-
   # Trick to make this build on nix. It expects to have the kernel sources
   # instead of only the linux kernel headers.
   # So it cannot run the 'make headers_install' it wants to run.
diff --git a/pkgs/os-specific/linux/klibc/make382.patch b/pkgs/os-specific/linux/klibc/make382.patch
deleted file mode 100644
index e9e9aba4e79..00000000000
--- a/pkgs/os-specific/linux/klibc/make382.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-To avoid an endless loop with gnumake 3.82
-http://www.mail-archive.com/pld-cvs-commit@lists.pld-linux.org/msg228690.html
-
-Index: packages/klibc/klibc-make.patch
---- klibc-1.5.19/scripts/Kbuild.include.orig   2010-08-19 09:39:45.986816591 
-0200
-+++ klibc-1.5.19/scripts/Kbuild.include        2010-08-19 09:49:15.010816591 
-0200
-@@ -127,7 +127,7 @@
- # >'< substitution is for echo to work, >$< substitution to preserve $ when reloading .cmd file
- # note: when using inline perl scripts [perl -e '...$$t=1;...'] in $(cmd_xxx) double $$ your perl vars
- #
--if_changed = $(if $(strip $(filter-out $(PHONY),$?)          \
-+if_changed = $(if $(strip $(filter-out $(PHONY) FORCE,$?)          \
- 		$(call arg-check, $(cmd_$(1)), $(cmd_$@)) ), \
- 	@set -e; \
- 	$(echo-cmd) $(cmd_$(1)); \
-@@ -135,7 +135,7 @@
- 
- # execute the command and also postprocess generated .d dependencies
- # file
--if_changed_dep = $(if $(strip $(filter-out $(PHONY),$?)  \
-+if_changed_dep = $(if $(strip $(filter-out $(PHONY) FORCE,$?)  \
- 		$(filter-out FORCE $(wildcard $^),$^)    \
- 	$(call arg-check, $(cmd_$(1)), $(cmd_$@)) ),     \
- 	@set -e; \
-@@ -147,7 +147,7 @@
- # Usage: $(call if_changed_rule,foo)
- # will check if $(cmd_foo) changed, or any of the prequisites changed,
- # and if so will execute $(rule_foo)
--if_changed_rule = $(if $(strip $(filter-out $(PHONY),$?)            \
-+if_changed_rule = $(if $(strip $(filter-out $(PHONY) FORCE,$?)            \
- 			$(call arg-check, $(cmd_$(1)), $(cmd_$@)) ),\
- 			@set -e; \
- 			$(rule_$(1)))

From dd9e83b77faa321fe9cb8e11e79070c792d07d50 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 25 Oct 2011 08:59:39 +0000
Subject: [PATCH 84/95] Enable building full klibc as a kernelPackage

svn path=/nixpkgs/trunk/; revision=30009
---
 pkgs/os-specific/linux/klibc/default.nix | 23 ++++++++++++++++++++---
 pkgs/top-level/all-packages.nix          |  4 ++++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix
index d71b97b9c7d..e1b8c0d2836 100644
--- a/pkgs/os-specific/linux/klibc/default.nix
+++ b/pkgs/os-specific/linux/klibc/default.nix
@@ -1,4 +1,13 @@
-{stdenv, fetchurl, perl, bison, mktemp, linuxHeaders, linuxHeadersCross}:
+{
+  stdenv,
+  fetchurl,
+  perl,
+  bison,
+  mktemp,
+  linuxHeaders,
+  linuxHeadersCross,
+  kernel ? null
+}:
 
 assert stdenv.isLinux;
 
@@ -20,7 +29,7 @@ stdenv.mkDerivation {
   # So it cannot run the 'make headers_install' it wants to run.
   # We don't install the headers, so klibc will not be useful as libc, but
   # usually in nixpkgs we only use the userspace tools comming with klibc.
-  prePatch = ''
+  prePatch = stdenv.lib.optionalString (kernel == null) ''
     sed -i -e /headers_install/d scripts/Kbuild.install
   '';
   
@@ -49,10 +58,18 @@ stdenv.mkDerivation {
     echo "CONFIG_AEABI=y" >> defconfig
     makeFlags=$(eval "echo $makeFlags")
 
+  '' + (if kernel == null then ''
     mkdir linux
     cp -prsd $linuxHeaders/include linux/
     chmod -R u+w linux/include/
-  ''; # */
+  '' else ''
+    tar xvf ${kernel.src}
+    mv linux* linux
+    cd linux
+    ln -sv ${kernel}/config .config
+    make prepare
+    cd ..
+  '');
   
   # Install static binaries as well.
   postInstall = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f24714f4dc0..0815f39f19d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5737,6 +5737,10 @@ let
       inherit kernel perl;
     };
 
+    klibc = callPackage ../os-specific/linux/klibc {
+      linuxHeaders = glibc.kernelHeaders;
+    };
+
     splashutils =
       if kernel.features ? fbConDecor then pkgs.splashutils else null;
 

From a5324f21323cb8758eb60cd10c24d79570f5567f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 25 Oct 2011 09:27:41 +0000
Subject: [PATCH 85/95] pkgs/os-specific/linux/firmware/bcm43xx: please do not
 use fetchsvn in base system

Replaced use of fetchsvn with fetchurl. Please note that machines behind a
company firewall usually cannot access svn://-style URLs, which means that
nixos-rebuild is going to fail. HTTP works fine, though.

The URL I used to download the tar.gz archive is probably not stable, or
rather, the tar.gz archive generated by Gitweb at that URL might have a
different checksum every time it's generated. I'm not sure what else to do,
though. Could a kind firmware expert please improve the situation further?

Also, I wonder what is the purpose of the sed expression in the command

    cp $i $out/brcm/$(echo $i | sed 's/\(.*\.fw\).*/\1/')

...? The downloaded directory doesn't seem to contain any files that would
match that expression?

svn path=/nixpkgs/trunk/; revision=30010
---
 .../os-specific/linux/firmware/bcm43xx/default.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/bcm43xx/default.nix b/pkgs/os-specific/linux/firmware/bcm43xx/default.nix
index 87670cb5223..36ef83581f8 100644
--- a/pkgs/os-specific/linux/firmware/bcm43xx/default.nix
+++ b/pkgs/os-specific/linux/firmware/bcm43xx/default.nix
@@ -1,14 +1,12 @@
-{ stdenv, fetchsvn }:
+{ stdenv, fetchurl }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "bcm43xx-firmware-610.811";
 
-  # For convenience, get it from the Debian SVN repo.  Upstream seems to be
-  # https://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=tree;f=brcm
-  src = fetchsvn {
-    url = svn://svn.debian.org/kernel/dists/trunk/firmware-nonfree/brcm80211/brcm;
-    rev = 17441;
-    sha256 = "0dpc3kwgrslr3i00vx9pvvk2xvcwwf24yrbh6d5gxq9r1q65p8sz";
+  src = fetchurl {
+    url = "https://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=snapshot;h=e62f89cefb4660a16b192c57b446cac975836d05;sf=tgz";
+    sha256 = "a4409c3ed21b5650da9277873e4b05228937ed65526bffd9c93d09cbdf7935b2";
+    name = "brcm-e62f89cefb4660a16b192c57b446cac975836d05.tar.gz";
   };
 
   buildPhase = "true";

From c7b6e96d845173145d0c88c40157d98b184c983c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 25 Oct 2011 09:40:15 +0000
Subject: [PATCH 86/95] v86d

svn path=/nixpkgs/trunk/; revision=30011
---
 pkgs/os-specific/linux/v86d/default.nix | 32 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/os-specific/linux/v86d/default.nix

diff --git a/pkgs/os-specific/linux/v86d/default.nix b/pkgs/os-specific/linux/v86d/default.nix
new file mode 100644
index 00000000000..c8924f91c57
--- /dev/null
+++ b/pkgs/os-specific/linux/v86d/default.nix
@@ -0,0 +1,32 @@
+{stdenv, fetchurl, klibc, kernel, withKlibc ? true}:
+
+stdenv.mkDerivation rec {
+  name = "v86d-0.1.10";
+
+  src = fetchurl {
+    url = "http://dev.gentoo.org/~spock/projects/uvesafb/archive/${name}.tar.bz2";
+    sha256 = "0p3kwqjis941pns9948dxfnjnl5lwd8f2b6x794whs7g32p68jb3";
+  };
+
+  buildInputs = stdenv.lib.optional withKlibc klibc;
+
+  configurePhase = ''
+    bash ./configure $configureFlags
+  '';
+
+  configureFlags = if withKlibc then [ "--with-klibc" ] else [ "--default" ];
+
+  makeFlags = [
+    "KDIR=${kernel}/lib/modules/${kernel.modDirVersion}/source"
+    "DESTDIR=$(out)"
+  ];
+
+  meta = {
+    description = "A userspace helper that runs x86 code in an emulated environment";
+    homepage = http://dev.gentoo.org/~spock/projects/uvesafb/;
+    license = "BSD";
+    maintainers = [ stdenv.lib.maintainers.shlevy ];
+    platforms = [ "i686-linux" "x86_64-linux" ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0815f39f19d..1cf5ed27387 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5775,6 +5775,8 @@ let
       inherit (gnome) gtkmm libglademm;
     };
 
+    v86d = callPackage ../os-specific/linux/v86d { };
+
     virtualbox = callPackage ../applications/virtualization/virtualbox {
       stdenv = stdenv_32bit;
       inherit (gnome) libIDL;

From f31cd519b6673815e7a7573c15fcfe429a82808c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 25 Oct 2011 12:52:41 +0000
Subject: [PATCH 87/95] * Updated version of the readlink() patch.

svn path=/nixpkgs/trunk/; revision=30013
---
 pkgs/servers/samba/readlink.patch | 82 ++++++++++++++++++++++++++++---
 1 file changed, 76 insertions(+), 6 deletions(-)
 mode change 100755 => 100644 pkgs/servers/samba/readlink.patch

diff --git a/pkgs/servers/samba/readlink.patch b/pkgs/servers/samba/readlink.patch
old mode 100755
new mode 100644
index e474624c4d4..84c0e021b1c
--- a/pkgs/servers/samba/readlink.patch
+++ b/pkgs/servers/samba/readlink.patch
@@ -11,9 +11,18 @@ index 3a64af7..549ebb2 100644
  /*
   * smb_filename
 diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
-index 25301e6..691a779 100644
+index 25301e6..b2ed239 100644
 --- a/source3/smbd/filename.c
 +++ b/source3/smbd/filename.c
+@@ -383,7 +383,7 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
+ 
+ 	if((!conn->case_sensitive || !(conn->fs_capabilities &
+ 				       FILE_CASE_SENSITIVE_SEARCH)) &&
+-	    stat_cache_lookup(conn, &smb_fname->base_name, &dirpath, &start,
++	    stat_cache_lookup(conn, posix_pathnames, &smb_fname->base_name, &dirpath, &start,
+ 			      &smb_fname->st)) {
+ 		goto done;
+ 	}
 @@ -977,26 +977,39 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
  }
  
@@ -77,7 +86,7 @@ index 25301e6..691a779 100644
  	if (!NT_STATUS_IS_OK(status)) {
  		DEBUG(3,("filename_convert: check_name failed "
 diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
-index c455ffe..1e5d891 100644
+index c455ffe..02b5e40 100644
 --- a/source3/smbd/proto.h
 +++ b/source3/smbd/proto.h
 @@ -336,6 +336,7 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
@@ -88,8 +97,59 @@ index c455ffe..1e5d891 100644
  NTSTATUS check_name(connection_struct *conn, const char *name);
  int get_real_filename(connection_struct *conn, const char *path,
  		      const char *name, TALLOC_CTX *mem_ctx,
+@@ -1037,6 +1038,7 @@ void stat_cache_add( const char *full_orig_name,
+ 		char *translated_path,
+ 		bool case_sensitive);
+ bool stat_cache_lookup(connection_struct *conn,
++			bool posix_paths,
+ 			char **pp_name,
+ 			char **pp_dirpath,
+ 			char **pp_start,
+diff --git a/source3/smbd/statcache.c b/source3/smbd/statcache.c
+index e2ccc74..e910982 100644
+--- a/source3/smbd/statcache.c
++++ b/source3/smbd/statcache.c
+@@ -150,6 +150,7 @@ void stat_cache_add( const char *full_orig_name,
+  * Look through the stat cache for an entry
+  *
+  * @param conn    A connection struct to do the stat() with.
++ * @param posix_paths Whether to lookup using stat() or lstat()
+  * @param name    The path we are attempting to cache, modified by this routine
+  *                to be correct as far as the cache can tell us. We assume that
+  *		  it is a talloc'ed string from top of stack, we free it if
+@@ -166,6 +167,7 @@ void stat_cache_add( const char *full_orig_name,
+  */
+ 
+ bool stat_cache_lookup(connection_struct *conn,
++			bool posix_paths,
+ 			char **pp_name,
+ 			char **pp_dirpath,
+ 			char **pp_start,
+@@ -181,6 +183,7 @@ bool stat_cache_lookup(connection_struct *conn,
+ 	char *name;
+ 	TALLOC_CTX *ctx = talloc_tos();
+ 	struct smb_filename smb_fname;
++	int ret;
+ 
+ 	*pp_dirpath = NULL;
+ 	*pp_start = *pp_name;
+@@ -283,7 +286,13 @@ bool stat_cache_lookup(connection_struct *conn,
+ 	ZERO_STRUCT(smb_fname);
+ 	smb_fname.base_name = translated_path;
+ 
+-	if (SMB_VFS_STAT(conn, &smb_fname) != 0) {
++	if (posix_paths) {
++		ret = SMB_VFS_LSTAT(conn, &smb_fname);
++	} else {
++		ret = SMB_VFS_STAT(conn, &smb_fname);
++	}
++
++	if (ret != 0) {
+ 		/* Discard this entry - it doesn't exist in the filesystem. */
+ 		memcache_delete(smbd_memcache(), STAT_CACHE,
+ 				data_blob_const(chk_name, strlen(chk_name)));
 diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
-index 0931fff..284635d 100644
+index 0931fff..129ab01 100644
 --- a/source3/smbd/trans2.c
 +++ b/source3/smbd/trans2.c
 @@ -2271,6 +2271,7 @@ static void call_trans2findfirst(connection_struct *conn,
@@ -108,7 +168,17 @@ index 0931fff..284635d 100644
  			break;
  		default:
  			reply_nterror(req, NT_STATUS_INVALID_LEVEL);
-@@ -5103,6 +5105,7 @@ static void call_trans2qfilepathinfo(connection_struct *conn,
+@@ -2331,8 +2333,7 @@ close_if_end = %d requires_resume_key = %d level = 0x%x, max_data_bytes = %d\n",
+ 	ntstatus = filename_convert(ctx, conn,
+ 				    req->flags2 & FLAGS2_DFS_PATHNAMES,
+ 				    directory,
+-				    (UCF_SAVE_LCOMP |
+-					UCF_ALWAYS_ALLOW_WCARD_LCOMP),
++				    ucf_flags,
+ 				    &mask_contains_wcard,
+ 				    &smb_dname);
+ 	if (!NT_STATUS_IS_OK(ntstatus)) {
+@@ -5103,6 +5104,7 @@ static void call_trans2qfilepathinfo(connection_struct *conn,
  	} else {
  		uint32_t name_hash;
  		char *fname = NULL;
@@ -116,7 +186,7 @@ index 0931fff..284635d 100644
  
  		/* qpathinfo */
  		if (total_params < 7) {
-@@ -5114,9 +5117,16 @@ static void call_trans2qfilepathinfo(connection_struct *conn,
+@@ -5114,9 +5116,16 @@ static void call_trans2qfilepathinfo(connection_struct *conn,
  
  		DEBUG(3,("call_trans2qfilepathinfo: TRANSACT2_QPATHINFO: level = %d\n", info_level));
  
@@ -136,7 +206,7 @@ index 0931fff..284635d 100644
  		}
  
  		srvstr_get_path(req, params, req->flags2, &fname, &params[6],
-@@ -5131,7 +5141,7 @@ static void call_trans2qfilepathinfo(connection_struct *conn,
+@@ -5131,7 +5140,7 @@ static void call_trans2qfilepathinfo(connection_struct *conn,
  					conn,
  					req->flags2 & FLAGS2_DFS_PATHNAMES,
  					fname,

From e09dbeb845188f7dfbc5f39c6cba927ef359af9a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 25 Oct 2011 16:43:13 +0000
Subject: [PATCH 88/95] haskell-cabal-file-th: updated to version 0.2.1

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

diff --git a/pkgs/development/libraries/haskell/cabal-file-th/default.nix b/pkgs/development/libraries/haskell/cabal-file-th/default.nix
index 4fea333c6f4..427e4ba2cc6 100644
--- a/pkgs/development/libraries/haskell/cabal-file-th/default.nix
+++ b/pkgs/development/libraries/haskell/cabal-file-th/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal-file-th";
-  version = "0.1";
-  sha256 = "1i0k8c9kf2av0vs9qhd15kqrkzi5z89va4gp2cfkssq66y98k8p8";
+  version = "0.2.1";
+  sha256 = "0nczwicgf6kx3lk5m7wqf1wj6ghn8jfx112dzh7jh4f4xs66nsd1";
   meta = {
     homepage = "http://github.com/nkpart/cabal-file-th";
     description = "Template Haskell expressions for reading fields from a project's cabal file";

From ebdf510f744c23a204ccfbed3a59613b0014a4e7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 25 Oct 2011 17:06:38 +0000
Subject: [PATCH 89/95] os-specific/linux/firmware/bcm43xx: fetch files
 individually to avoid checksum errors in tarball

svn path=/nixpkgs/trunk/; revision=30016
---
 .../linux/firmware/bcm43xx/default.nix        | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/bcm43xx/default.nix b/pkgs/os-specific/linux/firmware/bcm43xx/default.nix
index 36ef83581f8..9dc67b32c53 100644
--- a/pkgs/os-specific/linux/firmware/bcm43xx/default.nix
+++ b/pkgs/os-specific/linux/firmware/bcm43xx/default.nix
@@ -1,20 +1,29 @@
 { stdenv, fetchurl }:
 
+let
+  src1 = fetchurl {
+    url = "https://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=blob_plain;f=brcm/bcm43xx_hdr-0.fw;hb=15888a2eab052ac3d3f49334e4f6f05f347a516e";
+    sha256 = "d02549964d21dd90fc35806483b9fc871d93d7d38ae1a70a9ce006103c2a3de3";
+    name = "bcm43xx_hdr-0.fw";
+  };
+
+  src2 = fetchurl {
+    url = "https://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=blob_plain;f=brcm/bcm43xx-0.fw;hb=15888a2eab052ac3d3f49334e4f6f05f347a516e";
+    sha256 = "f90f685903127e4db431fe1efccefebf77272712bd4bfe46d1d1d5825ee52797";
+    name = "bcm43xx-0.fw";
+  };
+in
 stdenv.mkDerivation {
   name = "bcm43xx-firmware-610.811";
 
-  src = fetchurl {
-    url = "https://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=snapshot;h=e62f89cefb4660a16b192c57b446cac975836d05;sf=tgz";
-    sha256 = "a4409c3ed21b5650da9277873e4b05228937ed65526bffd9c93d09cbdf7935b2";
-    name = "brcm-e62f89cefb4660a16b192c57b446cac975836d05.tar.gz";
-  };
+  unpackPhase = "true";
 
   buildPhase = "true";
 
   installPhase = ''
     mkdir -p $out/brcm
-    for i in *.fw*; do
-      cp $i $out/brcm/$(echo $i | sed 's/\(.*\.fw\).*/\1/')
+    for i in ${src1} ${src2}; do
+      cp -v $i $out/brcm/$(echo $i | sed -r -e 's|.*/[a-z0-9]+-||')
     done
   '';
 

From 624b8616d439593b79b0a7c538c238618a53c9ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 25 Oct 2011 17:41:43 +0000
Subject: [PATCH 90/95] Enabling the ipv6 module in the sheevaplug

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

diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix
index 259b9898f36..911dff97d0c 100644
--- a/pkgs/top-level/platforms.nix
+++ b/pkgs/top-level/platforms.nix
@@ -65,6 +65,7 @@ rec {
         IP_NF_MATCH_ADDRTYPE y
         IP_NF_TARGET_LOG y
         IP_NF_MANGLE y
+        IPV6 m
 
         # Fail to build
         DRM n

From b74d8fb90f7847ad488f56c4cfc1cdc7ccbad053 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 25 Oct 2011 17:46:26 +0000
Subject: [PATCH 91/95] Making gpgme optional in mutt. A dependency of gpgme
 (pth) does not build on arm.

svn path=/nixpkgs/trunk/; revision=30019
---
 .../networking/mailreaders/mutt/default.nix          | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index 02870c70f64..5364bd445e6 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -1,11 +1,13 @@
-{ stdenv, fetchurl, ncurses, which, perl, gpgme
+{ stdenv, fetchurl, ncurses, which, perl
 , sslSupport ? true
 , imapSupport ? true
 , headerCache ? true
 , saslSupport ? true
+, gpgmeSupport ? true
 , gdbm ? null
 , openssl ? null
 , cyrus_sasl ? null
+, gpgme ? null
 }:
 
 assert headerCache -> gdbm != null;
@@ -21,17 +23,20 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    ncurses which perl gpgme
+    ncurses which perl
     (if headerCache then gdbm else null)
     (if sslSupport then openssl else null)
     (if saslSupport then cyrus_sasl else null)
+    (if gpgmeSupport then gpgme else null)
   ];
   
   configureFlags = [
     "--with-mailpath=" "--enable-smtp"
 
     # This allows calls with "-d N", that output debug info into ~/.muttdebug*
-    "--enable-debug" "--enable-pop" "--enable-imap" "--enable-gpgme"
+    "--enable-debug"
+
+    "--enable-pop" "--enable-imap"
 
     # The next allows building mutt without having anything setgid
     # set by the installer, and removing the need for the group 'mail'
@@ -41,6 +46,7 @@ stdenv.mkDerivation rec {
     (if sslSupport then "--with-ssl" else "--without-ssl")
     (if imapSupport then "--enable-imap" else "--disable-imap")
     (if saslSupport then "--with-sasl" else "--without-sasl")
+    (if gpgmeSupport then "--enable-gpgme" else "--disable-gpgme")
   ];
 
   meta = {

From faafa3513a37df0f989b35ff4c2e2f6e23c90d6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 25 Oct 2011 17:46:39 +0000
Subject: [PATCH 92/95] Adding a kernel mirror that at least has the
 module-init-tools of nixpkgs.

svn path=/nixpkgs/trunk/; revision=30020
---
 pkgs/build-support/fetchurl/mirrors.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index f65d7cc7fa5..cd52c1ce17c 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -100,6 +100,7 @@ rec {
     http://www.de.kernel.org/pub/
     http://ramses.wh2.tu-dresden.de/pub/mirrors/kernel.org/
     http://linux-kernel.uio.no/pub/
+    http://kernel.osuosl.org/pub/
   ];
 
   # Mirrors of ftp://ftp.kde.org/pub/kde/.

From 6582f602c994784a25afbc750ac9d478b7c3a8d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 25 Oct 2011 17:53:44 +0000
Subject: [PATCH 93/95] Updating gnutls, as it failed on 'make test' on arm.
 The new does not fail.

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

diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix
index 39532c075d1..888a119bb36 100644
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@@ -1,15 +1,15 @@
 { fetchurl, stdenv, xz, zlib, lzo, libtasn1, nettle
-, guileBindings, guile }:
+, guileBindings, guile, perl }:
 
 assert guileBindings -> guile != null;
 
 stdenv.mkDerivation rec {
 
-  name = "gnutls-3.0.2";
+  name = "gnutls-3.0.4";
 
   src = fetchurl {
     url = "mirror://gnu/gnutls/${name}.tar.xz";
-    sha256 = "0jy0j77inv6yr7s9mnhs5kvjjmhj0ifg35145s1qn3hd9ma36nii";
+    sha256 = "16mhr52c07xlkv5m5bxgr51ppjz0gqjw6rgv52ql4iyi569ffrx3";
   };
 
   configurePhase = ''
@@ -22,9 +22,11 @@ stdenv.mkDerivation rec {
         else ""}
   '';
 
-  buildInputs = [ xz zlib lzo ]
+  buildInputs = [ zlib lzo ]
     ++ stdenv.lib.optional guileBindings guile;
 
+  buildNativeInputs = [ xz perl ];
+
   propagatedBuildInputs = [ nettle libtasn1 ];
 
   doCheck = true;

From 621e87f821f9f5d7af243441d7816d196977857e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 25 Oct 2011 20:34:19 +0000
Subject: [PATCH 94/95] Adding a newer dovecot

svn path=/nixpkgs/trunk/; revision=30025
---
 pkgs/servers/mail/dovecot/2.0.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/servers/mail/dovecot/2.0.nix

diff --git a/pkgs/servers/mail/dovecot/2.0.nix b/pkgs/servers/mail/dovecot/2.0.nix
new file mode 100644
index 00000000000..a2278533dad
--- /dev/null
+++ b/pkgs/servers/mail/dovecot/2.0.nix
@@ -0,0 +1,20 @@
+{stdenv, fetchurl, openssl, pam}:
+
+stdenv.mkDerivation {
+  name = "dovecot-2.0.15";
+
+  buildInputs = [openssl pam];
+
+  src = fetchurl {
+    url = http://dovecot.org/releases/2.0/dovecot-2.0.15.tar.gz;
+    sha256 = "03byp6alxxk65qfjjnqp6kcncs5cdiqgskx90nk9kcnynl1h6r33";
+  };
+
+  meta = {
+    homepage = http://dovecot.org/;
+    description = "Open source IMAP and POP3 email server written with security primarily in mind";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+  
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1cf5ed27387..18339e3ea59 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4873,6 +4873,7 @@ let
 
   dovecot = callPackage ../servers/mail/dovecot { };
   dovecot_1_1_1 = callPackage ../servers/mail/dovecot/1.1.1.nix { };
+  dovecot_2_0 = callPackage ../servers/mail/dovecot/2.0.nix { };
 
   ejabberd = callPackage ../servers/xmpp/ejabberd {
     erlang = erlangR13B ;

From 892889cf358e7858fee32e1c7fc83c53650ea706 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 25 Oct 2011 20:49:22 +0000
Subject: [PATCH 95/95] Add netperf

I will add meta later, I promise, I just need to use this now

svn path=/nixpkgs/trunk/; revision=30026
---
 pkgs/applications/networking/netperf/default.nix | 11 +++++++++++
 pkgs/top-level/all-packages.nix                  |  2 ++
 2 files changed, 13 insertions(+)
 create mode 100644 pkgs/applications/networking/netperf/default.nix

diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix
new file mode 100644
index 00000000000..7ef6a86c5eb
--- /dev/null
+++ b/pkgs/applications/networking/netperf/default.nix
@@ -0,0 +1,11 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+  name = "netperf-2.5.0";
+
+  src = fetchurl {
+    url = "ftp://ftp.netperf.org/netperf/${name}.tar.bz2";
+    sha256 = "1l06bb99b4wfnmq247b8rvp4kn3w6bh1m46ri4d74z22li7br545";
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 18339e3ea59..120521058f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -899,6 +899,8 @@ let
 
   most = callPackage ../tools/misc/most { };
 
+  netperf = callPackage ../applications/networking/netperf { };
+
   ninka = callPackage ../development/tools/misc/ninka { };
 
   nodejs = callPackage ../development/web/nodejs {};