From 143473406f4bbb40e40f1698969aff1d67162d82 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 21 Jun 2013 18:44:33 +0200
Subject: [PATCH 001/452] freetype: Update to 2.4.12

Also update the Infinality patches.

Note that FreeType 2.5 was released a few days ago, but I don't know
how stable it is.
---
 .../libraries/fontconfig/default.nix          |  2 +-
 .../libraries/freetype/default.nix            | 24 +++++++------------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index e3b0a54ee82..b2afc427b4c 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   infinality_patch = with freetype.infinality; if useInfinality
     then let subvers = "1";
       in fetchurl {
-        url = "${base_URL}/fontconfig-infinality-1-${vers}_${subvers}.tar.bz2";
+        url = http://www.infinality.net/fedora/linux/zips/fontconfig-infinality-1-20130104_1.tar.bz2;
         sha256 = "1fm5xx0mx2243jrq5rxk4v0ajw2nawpj23399h710bx6hd1rviq7";
       }
     else null;
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index 8fa75425544..235d7e72374 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -10,17 +10,7 @@ assert !(useEncumberedCode && useInfinality); # probably wouldn't make sense
 
 let
 
-  version = "2.4.11";
-
-  infinality = rec {
-    inherit useInfinality;
-    vers = "20130104";
-    subvers = "04";
-    sha256 = "0dqglig34lfcw0w6sm6vmich0pcvq303vyh8jzqapvxgvrpr2156";
-
-    base_URL = "http://www.infinality.net/fedora/linux/zips";
-    url = "${base_URL}/freetype-infinality-${version}-${vers}_${subvers}-x86_64.tar.bz2";
-  };
+  version = "2.4.12";
 
 in
 
@@ -29,12 +19,14 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/freetype/${name}.tar.bz2";
-    sha256 = "0gxyzxqpyf8g85y6g1zc1wqrh71prbbk8xfw4m8rwzb4ck5hp7gg";
+    sha256 = "10akr2c37iv9y7fkgwp2szgwjyl2g6qmk9z1m596iaw9cr41g2m7";
   };
 
-  infinality_patch = if useInfinality
-    then fetchurl { inherit (infinality) url sha256; }
-    else null;
+  infinality_patch =
+    if useInfinality then fetchurl {
+      url = http://www.infinality.net/fedora/linux/zips/freetype-infinality-2.4.12-20130514_01-x86_64.tar.bz2;
+      sha256 = "1lg2nzvxmwzwdfhxranw8iyflhr72cw9p11rkpgq1scxbp37668m";
+    } else null;
 
   configureFlags = "--disable-static";
 
@@ -68,7 +60,7 @@ stdenv.mkDerivation rec {
     configureFlags = "--disable-static CC_BUILD=gcc";
   };
 
-  passthru = { inherit infinality; }; # for fontconfig
+  passthru.infinality.useInfinality = useInfinality; # for fontconfig
 
   meta = {
     description = "A font rendering engine";

From 9b502a9ae1f48f50daa2109baaf935ed1e7f8225 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 21 Jun 2013 19:18:52 -0400
Subject: [PATCH 002/452] llvm: Update to 3.3

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/development/compilers/llvm/default.nix   | 20 +++++++++----------
 .../llvm/more-memory-for-bugpoint.patch       | 15 ++++++++++++++
 .../compilers/llvm/set_soname.patch           | 12 -----------
 3 files changed, 25 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/development/compilers/llvm/more-memory-for-bugpoint.patch
 delete mode 100644 pkgs/development/compilers/llvm/set_soname.patch

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 59e2bdc5509..0212c4a1fd2 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -1,30 +1,30 @@
 { stdenv, fetchurl, perl, groff, cmake, python, libffi }:
 
-let version = "3.2"; in
+let version = "3.3"; in
 
 stdenv.mkDerivation {
   name = "llvm-${version}";
 
   src = fetchurl {
     url    = "http://llvm.org/releases/${version}/llvm-${version}.src.tar.gz";
-    sha256 = "0hv30v5l4fkgyijs56sr1pbrlzgd674pg143x7az2h37sb290l0j";
+    sha256 = "0y3mfbb5qzcpw3v5qncn69x1hdrrrfirgs82ypi2annhf0g6nxk8";
   };
 
-  patches = [ ./set_soname.patch ]; # http://llvm.org/bugs/show_bug.cgi?id=12334
-  patchFlags = "-p0";
+  # The default rlimits are too low for shared libraries.
+  patches = [ ./more-memory-for-bugpoint.patch ];
 
-  preConfigure = "patchShebangs .";
-
-  propagatedBuildInputs = [ libffi ];
-  buildInputs = [ perl groff cmake python ]; # ToDo: polly, libc++; enable cxx11?
+  # libffi was propagated before, but it wasn't even being used, so
+  # unless something needs it just an input is fine.
+  buildInputs = [ perl groff cmake python libffi ]; # ToDo: polly, libc++; enable cxx11?
 
   # created binaries need to be run before installation... I coudn't find a better way
   preBuild = ''export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:"`pwd`/lib'';
 
-  cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DBUILD_SHARED_LIBS=ON" ];
+  cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DBUILD_SHARED_LIBS=ON" "-DLLVM_ENABLE_FFI=ON" ];
 
   enableParallelBuilding = true;
-  #doCheck = true; # tests are broken, don't know why
+
+  doCheck = true;
 
   meta = {
     homepage = http://llvm.org/;
diff --git a/pkgs/development/compilers/llvm/more-memory-for-bugpoint.patch b/pkgs/development/compilers/llvm/more-memory-for-bugpoint.patch
new file mode 100644
index 00000000000..fa19ce4f587
--- /dev/null
+++ b/pkgs/development/compilers/llvm/more-memory-for-bugpoint.patch
@@ -0,0 +1,15 @@
+diff -Naur llvm-3.3.src-orig/tools/bugpoint/bugpoint.cpp llvm-3.3.src/tools/bugpoint/bugpoint.cpp
+--- llvm-3.3.src-orig/tools/bugpoint/bugpoint.cpp	2013-01-27 20:35:51.000000000 -0500
++++ llvm-3.3.src/tools/bugpoint/bugpoint.cpp	2013-06-21 18:29:47.612731499 -0400
+@@ -48,9 +48,9 @@
+                       "is killed (default is 300s), 0 disables timeout"));
+ 
+ static cl::opt<int>
+-MemoryLimit("mlimit", cl::init(-1), cl::value_desc("MBytes"),
++MemoryLimit("mlimit", cl::init(0), cl::value_desc("MBytes"),
+              cl::desc("Maximum amount of memory to use. 0 disables check."
+-                      " Defaults to 100MB (800MB under valgrind)."));
++                      " Check disabled by default."));
+ 
+ static cl::opt<bool>
+ UseValgrind("enable-valgrind",
diff --git a/pkgs/development/compilers/llvm/set_soname.patch b/pkgs/development/compilers/llvm/set_soname.patch
deleted file mode 100644
index 69ba74dddad..00000000000
--- a/pkgs/development/compilers/llvm/set_soname.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=409267
-http://llvm.org/bugs/show_bug.cgi?id=12334
---- tools/llvm-shlib/Makefile.orig	2012-03-26 18:14:13.071797115 +0200
-+++ tools/llvm-shlib/Makefile	2012-03-26 17:31:12.491196254 +0200
-@@ -67,6 +67,7 @@
-     # Include everything from the .a's into the shared library.
-     LLVMLibsOptions := -Wl,--whole-archive $(LLVMLibsOptions) \
-                        -Wl,--no-whole-archive
-+    LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT)
- endif
- 
- ifeq ($(HOST_OS),Linux)

From 6425ad2847b897623e646c353d08c6ee13282735 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 21 Jun 2013 19:50:56 -0400
Subject: [PATCH 003/452] clang: Update to 3.3

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 .../compilers/llvm/clang-purity.patch         | 105 +++++++++++-------
 pkgs/development/compilers/llvm/clang.nix     |  10 +-
 2 files changed, 70 insertions(+), 45 deletions(-)

diff --git a/pkgs/development/compilers/llvm/clang-purity.patch b/pkgs/development/compilers/llvm/clang-purity.patch
index 18c70b56c54..e82305189e8 100644
--- a/pkgs/development/compilers/llvm/clang-purity.patch
+++ b/pkgs/development/compilers/llvm/clang-purity.patch
@@ -1,8 +1,8 @@
-diff -Naur clang-3.2.src-orig/lib/Driver/ToolChains.cpp clang-3.2.src/lib/Driver/ToolChains.cpp
---- clang-3.2.src-orig/lib/Driver/ToolChains.cpp	2012-12-16 10:59:27.000000000 -0500
-+++ clang-3.2.src/lib/Driver/ToolChains.cpp	2013-01-22 14:16:55.787547681 -0500
-@@ -2153,16 +2153,6 @@
-       addPathIfExists(LibPath + "/../" + GCCTriple.str() + "/lib", Paths);
+diff -Naur cfe-3.3.src-orig/lib/Driver/ToolChains.cpp cfe-3.3.src/lib/Driver/ToolChains.cpp
+--- cfe-3.3.src-orig/lib/Driver/ToolChains.cpp	2013-05-06 12:26:41.000000000 -0400
++++ cfe-3.3.src/lib/Driver/ToolChains.cpp	2013-06-21 19:28:12.120364372 -0400
+@@ -2318,17 +2318,6 @@
+                       Paths);
      }
    }
 -  addPathIfExists(SysRoot + "/lib/" + MultiarchTriple, Paths);
@@ -15,29 +15,30 @@ diff -Naur clang-3.2.src-orig/lib/Driver/ToolChains.cpp clang-3.2.src/lib/Driver
 -  if (GCCInstallation.isValid())
 -    addPathIfExists(SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() +
 -                    "/../../" + Multilib, Paths);
- 
+-
    // Add the non-multilib suffixed paths (if potentially different).
    if (GCCInstallation.isValid()) {
-@@ -2176,8 +2166,6 @@
+     const std::string &LibPath = GCCInstallation.getParentLibPath();
+@@ -2341,8 +2330,6 @@
        addPathIfExists(LibPath, Paths);
      }
    }
 -  addPathIfExists(SysRoot + "/lib", Paths);
 -  addPathIfExists(SysRoot + "/usr/lib", Paths);
- }
  
- bool Linux::HasNativeLLVMSupport() const {
-@@ -2228,9 +2216,6 @@
+   IsPIEDefault = SanitizerArgs(*this, Args).hasZeroBaseShadow();
+ }
+@@ -2395,9 +2382,6 @@
    if (DriverArgs.hasArg(options::OPT_nostdinc))
      return;
  
 -  if (!DriverArgs.hasArg(options::OPT_nostdlibinc))
--    addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/local/include");
+-    addSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/local/include");
 -
    if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
      llvm::sys::Path P(D.ResourceDir);
      P.appendComponent("include");
-@@ -2295,24 +2280,6 @@
+@@ -2479,26 +2463,6 @@
      "/usr/include/powerpc64-linux-gnu"
    };
    ArrayRef<StringRef> MultiarchIncludeDirs;
@@ -45,6 +46,8 @@ diff -Naur clang-3.2.src-orig/lib/Driver/ToolChains.cpp clang-3.2.src/lib/Driver
 -    MultiarchIncludeDirs = X86_64MultiarchIncludeDirs;
 -  } else if (getTriple().getArch() == llvm::Triple::x86) {
 -    MultiarchIncludeDirs = X86MultiarchIncludeDirs;
+-  } else if (getTriple().getArch() == llvm::Triple::aarch64) {
+-    MultiarchIncludeDirs = AArch64MultiarchIncludeDirs;
 -  } else if (getTriple().getArch() == llvm::Triple::arm) {
 -    if (getTriple().getEnvironment() == llvm::Triple::GNUEABIHF)
 -      MultiarchIncludeDirs = ARMHFMultiarchIncludeDirs;
@@ -62,7 +65,7 @@ diff -Naur clang-3.2.src-orig/lib/Driver/ToolChains.cpp clang-3.2.src/lib/Driver
    for (ArrayRef<StringRef>::iterator I = MultiarchIncludeDirs.begin(),
                                       E = MultiarchIncludeDirs.end();
         I != E; ++I) {
-@@ -2324,13 +2291,6 @@
+@@ -2510,13 +2474,6 @@
  
    if (getTriple().getOS() == llvm::Triple::RTEMS)
      return;
@@ -70,24 +73,30 @@ diff -Naur clang-3.2.src-orig/lib/Driver/ToolChains.cpp clang-3.2.src/lib/Driver
 -  // Add an include of '/include' directly. This isn't provided by default by
 -  // system GCCs, but is often used with cross-compiling GCCs, and harmless to
 -  // add even when Clang is acting as-if it were a system compiler.
--  addExternCSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/include");
+-  addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + "/include");
 -
--  addExternCSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/include");
+-  addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/include");
  }
  
- /// \brief Helper to add the thre variant paths for a libstdc++ installation.
-diff -Naur clang-3.2.src-orig/lib/Driver/Tools.cpp clang-3.2.src/lib/Driver/Tools.cpp
---- clang-3.2.src-orig/lib/Driver/Tools.cpp	2012-11-21 02:56:23.000000000 -0500
-+++ clang-3.2.src/lib/Driver/Tools.cpp	2013-01-22 14:24:37.167212186 -0500
-@@ -5972,34 +5972,6 @@
-       ToolChain.getArch() == llvm::Triple::thumb ||
-       (!Args.hasArg(options::OPT_static) &&
-        !Args.hasArg(options::OPT_shared))) {
+ /// \brief Helper to add the three variant paths for a libstdc++ installation.
+diff -Naur cfe-3.3.src-orig/lib/Driver/Tools.cpp cfe-3.3.src/lib/Driver/Tools.cpp
+--- cfe-3.3.src-orig/lib/Driver/Tools.cpp	2013-05-30 14:01:30.000000000 -0400
++++ cfe-3.3.src/lib/Driver/Tools.cpp	2013-06-21 19:30:51.604726574 -0400
+@@ -5976,43 +5976,6 @@
+     }
+   }
+ 
+-  if (ToolChain.getArch() == llvm::Triple::arm ||
+-      ToolChain.getArch() == llvm::Triple::thumb ||
+-      (!Args.hasArg(options::OPT_static) &&
+-       !Args.hasArg(options::OPT_shared))) {
 -    CmdArgs.push_back("-dynamic-linker");
 -    if (isAndroid)
 -      CmdArgs.push_back("/system/bin/linker");
 -    else if (ToolChain.getArch() == llvm::Triple::x86)
 -      CmdArgs.push_back("/lib/ld-linux.so.2");
+-    else if (ToolChain.getArch() == llvm::Triple::aarch64)
+-      CmdArgs.push_back("/lib/ld-linux-aarch64.so.1");
 -    else if (ToolChain.getArch() == llvm::Triple::arm ||
 -             ToolChain.getArch() == llvm::Triple::thumb) {
 -      if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF)
@@ -107,31 +116,47 @@ diff -Naur clang-3.2.src-orig/lib/Driver/Tools.cpp clang-3.2.src/lib/Driver/Tool
 -    }
 -    else if (ToolChain.getArch() == llvm::Triple::ppc)
 -      CmdArgs.push_back("/lib/ld.so.1");
--    else if (ToolChain.getArch() == llvm::Triple::ppc64)
+-    else if (ToolChain.getArch() == llvm::Triple::ppc64 ||
+-	     ToolChain.getArch() == llvm::Triple::systemz)
 -      CmdArgs.push_back("/lib64/ld64.so.1");
 -    else
 -      CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2");
-   }
- 
+-  }
+-
    CmdArgs.push_back("-o");
-diff -Naur clang-3.2.src-orig/lib/Frontend/InitHeaderSearch.cpp clang-3.2.src/lib/Frontend/InitHeaderSearch.cpp
---- clang-3.2.src-orig/lib/Frontend/InitHeaderSearch.cpp	2012-10-24 12:19:39.000000000 -0400
-+++ clang-3.2.src/lib/Frontend/InitHeaderSearch.cpp	2013-01-22 14:20:32.803925775 -0500
-@@ -221,8 +221,6 @@
-     case llvm::Triple::Bitrig:
-       break;
-     default:
+   CmdArgs.push_back(Output.getFilename());
+ 
+diff -Naur cfe-3.3.src-orig/lib/Frontend/InitHeaderSearch.cpp cfe-3.3.src/lib/Frontend/InitHeaderSearch.cpp
+--- cfe-3.3.src-orig/lib/Frontend/InitHeaderSearch.cpp	2013-04-29 21:21:43.000000000 -0400
++++ cfe-3.3.src/lib/Frontend/InitHeaderSearch.cpp	2013-06-21 19:32:47.627016565 -0400
+@@ -225,20 +225,6 @@
+                                             const HeaderSearchOptions &HSOpts) {
+   llvm::Triple::OSType os = triple.getOS();
+ 
+-  if (HSOpts.UseStandardSystemIncludes) {
+-    switch (os) {
+-    case llvm::Triple::FreeBSD:
+-    case llvm::Triple::NetBSD:
+-    case llvm::Triple::OpenBSD:
+-    case llvm::Triple::Bitrig:
+-      break;
+-    default:
 -      // FIXME: temporary hack: hard-coded paths.
--      AddPath("/usr/local/include", System, true, false, false);
-       break;
-     }
-   }
-@@ -330,8 +328,6 @@
+-      AddPath("/usr/local/include", System, false);
+-      break;
+-    }
+-  }
+-
+   // Builtin includes use #include_next directives and should be positioned
+   // just prior C include dirs.
+   if (HSOpts.UseBuiltinIncludes) {
+@@ -332,9 +318,6 @@
+   default:
      break;
    }
- 
+-
 -  if ( os != llvm::Triple::RTEMS )
--    AddPath("/usr/include", System, false, false, false);
+-    AddPath("/usr/include", ExternCSystem, false);
  }
  
  void InitHeaderSearch::
diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix
index c2117798666..df58591973e 100644
--- a/pkgs/development/compilers/llvm/clang.nix
+++ b/pkgs/development/compilers/llvm/clang.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, perl, groff, llvm, cmake, libxml2 }:
+{ stdenv, fetchurl, perl, groff, llvm, cmake, libxml2, python }:
 
 let
-  version = "3.2";
+  version = "3.3";
   gccReal = if (stdenv.gcc.gcc or null) == null then stdenv.gcc else stdenv.gcc.gcc;
 in
 
 stdenv.mkDerivation {
   name = "clang-${version}";
 
-  buildInputs = [ perl llvm groff cmake libxml2 ];
+  buildInputs = [ perl llvm groff cmake libxml2 python ];
 
   patches = stdenv.lib.optional (stdenv.gcc.libc != null) ./clang-purity.patch;
 
@@ -24,8 +24,8 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   src = fetchurl {
-      url = "http://llvm.org/releases/${version}/clang-${version}.src.tar.gz";
-      sha256 = "0n2nzw3pw2v7fk67f2k2qyzd9wibvi3i5j7cjzz1csqgghzz1aia";
+      url = "http://llvm.org/releases/${version}/cfe-${version}.src.tar.gz";
+      sha256 = "15mrvw43s4frk1j49qr4v5viq68h8qlf10qs6ghd6mrsmgj5vddi";
   };
 
   passthru = { gcc = stdenv.gcc.gcc; };

From b0b5c24fa6bbcb88dd47ad9425005c5b229f9ebc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 25 Jun 2013 13:21:35 +0200
Subject: [PATCH 004/452] Add nixops

---
 .../package-management/nixops/default.nix     | 37 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/tools/package-management/nixops/default.nix

diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix
new file mode 100644
index 00000000000..4e47a50078a
--- /dev/null
+++ b/pkgs/tools/package-management/nixops/default.nix
@@ -0,0 +1,37 @@
+{ lib, pythonPackages, fetchurl, libxslt, docbook5_xsl }:
+
+pythonPackages.buildPythonPackage rec {
+  name = "nixops-1.0";
+  namePrefix = "";
+
+  src = fetchurl {
+    url = "http://nixos.org/releases/nixops/${name}/${name}.tar.bz2";
+    sha256 = "9ae2dfac8e1fa895aef81323b14a3398f03a1cbd8c86ea10b6fff7312e1fadbb";
+  };
+
+  buildInputs = [ libxslt ];
+
+  pythonPath =
+    [ pythonPackages.prettytable
+      pythonPackages.boto
+      pythonPackages.sqlite3
+    ];
+
+  doCheck = false;
+
+  postInstall =
+    ''
+      make -C doc/manual install nixops.1 docbookxsl=${docbook5_xsl}/xml/xsl/docbook \
+        docdir=$out/share/doc/nixops mandir=$out/share/man
+
+      mkdir -p $out/share/nix/nixops
+      cp -av nix/* $out/share/nix/nixops
+    '';
+
+  meta = {
+    homepage = https://github.com/NixOS/nixops;
+    description = "NixOS cloud provisioning and deployment tool";
+    maintainers = [ lib.maintainers.eelco lib.maintainers.rob ];
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 404a36bb2b9..23c0e7b0adf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9384,6 +9384,8 @@ let
   };
   */
 
+  nixops = callPackage ../tools/package-management/nixops { };
+
   nut = callPackage ../applications/misc/nut { };
 
   solfege = callPackage ../misc/solfege {

From e9f0d1013d3cb76c33150b11c0b4fbe5bdec9006 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 4 Jul 2013 11:37:25 +0200
Subject: [PATCH 005/452] qt4: maintenance update 4.8.4 -> 4.8.5

Also fixed search path for libGL.
Tested building against master.
---
 pkgs/development/libraries/mesa/default.nix   |  2 +-
 .../libraries/qt-4.x/4.8/CVE-2013-0254.patch  | 66 ----------------
 .../libraries/qt-4.x/4.8/default.nix          | 15 ++--
 .../qt-4.x/4.8/dlopen-absolute-paths.diff     | 75 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  5 +-
 5 files changed, 66 insertions(+), 97 deletions(-)
 delete mode 100644 pkgs/development/libraries/qt-4.x/4.8/CVE-2013-0254.patch

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index de130d465c2..680030b33c7 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -137,7 +137,7 @@ stdenv.mkDerivation {
   '';
   #ToDo: @vcunat isn't sure if drirc will be found when in $out/etc/, but it doesn't seem important ATM
 
-  passthru = { inherit libdrm; inherit version; };
+  passthru = { inherit libdrm version driverLink; };
 
   meta = {
     description = "An open source implementation of OpenGL";
diff --git a/pkgs/development/libraries/qt-4.x/4.8/CVE-2013-0254.patch b/pkgs/development/libraries/qt-4.x/4.8/CVE-2013-0254.patch
deleted file mode 100644
index 48cc05f1800..00000000000
--- a/pkgs/development/libraries/qt-4.x/4.8/CVE-2013-0254.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 20b26bdb3dd5e46b01b9a7e1ce8342074df3c89c Mon Sep 17 00:00:00 2001
-From: Thiago Macieira <thiago.macieira@intel.com>
-Date: Sat, 22 Dec 2012 08:32:12 -0800
-Subject: [PATCH] Change all shmget calls to user-only memory
-
-Drop the read and write permissions for group and other users in the
-system.
-
-Change-Id: I8fc753f09126651af3fb82df3049050f0b14e876
-(cherry-picked from Qt 5 commit 856f209fb63ae336bfb389a12d2a75fa886dc1c5)
-Reviewed-by: Richard J. Moore <rich@kde.org>
----
- src/corelib/kernel/qsharedmemory_unix.cpp          |    6 +++---
- src/corelib/kernel/qsystemsemaphore_unix.cpp       |    4 ++--
-
-diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp
-index 20d76e3..4cf3acf 100644
---- a/src/corelib/kernel/qsharedmemory_unix.cpp
-+++ b/src/corelib/kernel/qsharedmemory_unix.cpp
-@@ -238,7 +238,7 @@ bool QSharedMemoryPrivate::create(int size)
-     }
- 
-     // create
--    if (-1 == shmget(unix_key, size, 0666 | IPC_CREAT | IPC_EXCL)) {
-+    if (-1 == shmget(unix_key, size, 0600 | IPC_CREAT | IPC_EXCL)) {
-         QString function = QLatin1String("QSharedMemory::create");
-         switch (errno) {
-         case EINVAL:
-@@ -293,7 +293,7 @@ bool QSharedMemoryPrivate::attach(QSharedMemory::AccessMode mode)
- {
- #ifndef QT_POSIX_IPC
-     // grab the shared memory segment id
--    int id = shmget(unix_key, 0, (mode == QSharedMemory::ReadOnly ? 0444 : 0660));
-+    int id = shmget(unix_key, 0, (mode == QSharedMemory::ReadOnly ? 0400 : 0600));
-     if (-1 == id) {
-         setErrorString(QLatin1String("QSharedMemory::attach (shmget)"));
-         return false;
-@@ -381,7 +381,7 @@ bool QSharedMemoryPrivate::detach()
-     size = 0;
- 
-     // Get the number of current attachments
--    int id = shmget(unix_key, 0, 0444);
-+    int id = shmget(unix_key, 0, 0400);
-     cleanHandle();
- 
-     struct shmid_ds shmid_ds;
-diff --git a/src/corelib/kernel/qsystemsemaphore_unix.cpp b/src/corelib/kernel/qsystemsemaphore_unix.cpp
-index fad9acc..e77456b 100644
---- a/src/corelib/kernel/qsystemsemaphore_unix.cpp
-+++ b/src/corelib/kernel/qsystemsemaphore_unix.cpp
-@@ -153,10 +153,10 @@ key_t QSystemSemaphorePrivate::handle(QSystemSemaphore::AccessMode mode)
-     }
- 
-     // Get semaphore
--    semaphore = semget(unix_key, 1, 0666 | IPC_CREAT | IPC_EXCL);
-+    semaphore = semget(unix_key, 1, 0600 | IPC_CREAT | IPC_EXCL);
-     if (-1 == semaphore) {
-         if (errno == EEXIST)
--            semaphore = semget(unix_key, 1, 0666 | IPC_CREAT);
-+            semaphore = semget(unix_key, 1, 0600 | IPC_CREAT);
-         if (-1 == semaphore) {
-             setErrorString(QLatin1String("QSystemSemaphore::handle"));
-             cleanHandle();
--- 
-1.7.1
-
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index b797f631b8e..a2a35fb1ea5 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -17,18 +17,23 @@
 
 with stdenv.lib;
 
-let v = "4.8.4"; in
+let
+  v_maj = "4.8";
+  v_min = "5";
+  vers = "${v_maj}.${v_min}";
+in
 
 # TODO:
 #  * move some plugins (e.g., SQL plugins) to dedicated derivations to avoid
 #    false build-time dependencies
 
 stdenv.mkDerivation rec {
-  name = "qt-${v}";
+  name = "qt-${vers}";
 
   src = fetchurl {
-    url = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${v}.tar.gz";
-    sha256 = "0w1j16q6glniv4hppdgcvw52w72gb2jab35ylkw0qjn5lj5y7c1k";
+    url = "http://download.qt-project.org/official_releases/qt/"
+      + "${v_maj}/${vers}/qt-everywhere-opensource-src-${vers}.tar.gz";
+    sha256 = "0f51dbgn1dcck8pqimls2qyf1pfmsmyknh767cvw87c3d218ywpb";
   };
 
   prePatch = ''
@@ -39,11 +44,11 @@ stdenv.mkDerivation rec {
 
   patches =
     [ ./glib-2.32.patch
-      ./CVE-2013-0254.patch
       (substituteAll {
         src = ./dlopen-absolute-paths.diff;
         inherit cups icu libXfixes;
         glibc = stdenv.gcc.libc;
+        openglDriver = mesa.driverLink;
       })
     ] ++ stdenv.lib.optional gtkStyle (substituteAll {
         src = ./dlopen-gtkstyle.diff;
diff --git a/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff b/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff
index fe691996277..0f5cf2b79c9 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff
+++ b/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff
@@ -1,7 +1,8 @@
-diff -ru qt-everywhere-opensource-src-4.8.3-orig/src/corelib/tools/qlocale_icu.cpp qt-everywhere-opensource-src-4.8.3/src/corelib/tools/qlocale_icu.cpp
---- qt-everywhere-opensource-src-4.8.3-orig/src/corelib/tools/qlocale_icu.cpp	2012-09-10 21:36:50.000000000 -0400
-+++ qt-everywhere-opensource-src-4.8.3/src/corelib/tools/qlocale_icu.cpp	2012-09-28 22:57:40.764153828 -0400
-@@ -81,7 +81,7 @@
+diff --git a/src/corelib/tools/qlocale_icu.cpp b/src/corelib/tools/qlocale_icu.cpp
+index c3e2907..2fac4e1 100644
+--- a/src/corelib/tools/qlocale_icu.cpp
++++ b/src/corelib/tools/qlocale_icu.cpp
+@@ -81,7 +81,7 @@ bool qt_initIcu(const QString &localeString)
      if (status == NotLoaded) {
  
          // resolve libicui18n
@@ -10,7 +11,7 @@ diff -ru qt-everywhere-opensource-src-4.8.3-orig/src/corelib/tools/qlocale_icu.c
          lib.setLoadHints(QLibrary::ImprovedSearchHeuristics);
          if (!lib.load()) {
              qWarning() << "Unable to load library icui18n" << lib.errorString();
-@@ -111,7 +111,7 @@
+@@ -111,7 +111,7 @@ bool qt_initIcu(const QString &localeString)
          }
  
          // resolve libicuuc
@@ -19,10 +20,11 @@ diff -ru qt-everywhere-opensource-src-4.8.3-orig/src/corelib/tools/qlocale_icu.c
          ucLib.setLoadHints(QLibrary::ImprovedSearchHeuristics);
          if (!ucLib.load()) {
              qWarning() << "Unable to load library icuuc" << ucLib.errorString();
-diff -ru qt-everywhere-opensource-src-4.8.3-orig/src/gui/painting/qcups.cpp qt-everywhere-opensource-src-4.8.3/src/gui/painting/qcups.cpp
---- qt-everywhere-opensource-src-4.8.3-orig/src/gui/painting/qcups.cpp	2012-09-10 21:36:51.000000000 -0400
-+++ qt-everywhere-opensource-src-4.8.3/src/gui/painting/qcups.cpp	2012-09-28 18:08:26.600720491 -0400
-@@ -87,7 +87,7 @@
+diff --git a/src/gui/painting/qcups.cpp b/src/gui/painting/qcups.cpp
+index 99ea43f..acdf9c9 100644
+--- a/src/gui/painting/qcups.cpp
++++ b/src/gui/painting/qcups.cpp
+@@ -87,7 +87,7 @@ static CupsPrintFile _cupsPrintFile = 0;
  
  static void resolveCups()
  {
@@ -31,10 +33,11 @@ diff -ru qt-everywhere-opensource-src-4.8.3-orig/src/gui/painting/qcups.cpp qt-e
      if(cupsLib.load()) {
          _cupsGetDests = (CupsGetDests) cupsLib.resolve("cupsGetDests");
          _cupsFreeDests = (CupsFreeDests) cupsLib.resolve("cupsFreeDests");
-diff -ru qt-everywhere-opensource-src-4.8.3-orig/src/gui/painting/qprinterinfo_unix.cpp qt-everywhere-opensource-src-4.8.3/src/gui/painting/qprinterinfo_unix.cpp
---- qt-everywhere-opensource-src-4.8.3-orig/src/gui/painting/qprinterinfo_unix.cpp	2012-09-10 21:36:51.000000000 -0400
-+++ qt-everywhere-opensource-src-4.8.3/src/gui/painting/qprinterinfo_unix.cpp	2012-09-28 18:08:26.601720488 -0400
-@@ -454,7 +454,7 @@
+diff --git a/src/gui/painting/qprinterinfo_unix.cpp b/src/gui/painting/qprinterinfo_unix.cpp
+index 3d15538..f0f5351 100644
+--- a/src/gui/painting/qprinterinfo_unix.cpp
++++ b/src/gui/painting/qprinterinfo_unix.cpp
+@@ -454,7 +454,7 @@ int qt_retrieveNisPrinters(QList<QPrinterDescription> *printers)
      char *domain;
      int err;
  
@@ -43,22 +46,50 @@ diff -ru qt-everywhere-opensource-src-4.8.3-orig/src/gui/painting/qprinterinfo_u
      typedef int (*ypGetDefaultDomain)(char **);
      ypGetDefaultDomain _ypGetDefaultDomain = (ypGetDefaultDomain)lib.resolve("yp_get_default_domain");
      typedef int (*ypAll)(const char *, const char *, const struct ypall_callback *);
-diff -ru qt-everywhere-opensource-src-4.8.3-orig/src/network/kernel/qhostinfo_unix.cpp qt-everywhere-opensource-src-4.8.3/src/network/kernel/qhostinfo_unix.cpp
---- qt-everywhere-opensource-src-4.8.3-orig/src/network/kernel/qhostinfo_unix.cpp	2012-09-10 21:36:51.000000000 -0400
-+++ qt-everywhere-opensource-src-4.8.3/src/network/kernel/qhostinfo_unix.cpp	2012-09-28 18:08:53.186643755 -0400
-@@ -95,7 +95,7 @@
+diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp
+index 6b42d1e..f88b628 100644
+--- a/src/network/kernel/qhostinfo_unix.cpp
++++ b/src/network/kernel/qhostinfo_unix.cpp
+@@ -95,7 +95,7 @@ static res_state_ptr local_res = 0;
  static void resolveLibrary()
  {
- #ifndef QT_NO_LIBRARY
+ #if !defined(QT_NO_LIBRARY) && !defined(Q_OS_QNX)
 -    QLibrary lib(QLatin1String("resolv"));
 +    QLibrary lib(QLatin1String("@glibc@/lib/libresolv"));
      lib.setLoadHints(QLibrary::ImprovedSearchHeuristics);
      if (!lib.load())
          return;
-diff -ru qt-everywhere-opensource-src-4.8.3-orig/src/plugins/platforms/xlib/qxlibstatic.cpp qt-everywhere-opensource-src-4.8.3/src/plugins/platforms/xlib/qxlibstatic.cpp
---- qt-everywhere-opensource-src-4.8.3-orig/src/plugins/platforms/xlib/qxlibstatic.cpp	2012-09-10 21:36:51.000000000 -0400
-+++ qt-everywhere-opensource-src-4.8.3/src/plugins/platforms/xlib/qxlibstatic.cpp	2012-09-28 18:08:26.601720488 -0400
-@@ -242,7 +242,7 @@
+diff --git a/src/plugins/platforms/xcb/qglxintegration.cpp b/src/plugins/platforms/xcb/qglxintegration.cpp
+index 229d6f9..c122bf3 100644
+--- a/src/plugins/platforms/xcb/qglxintegration.cpp
++++ b/src/plugins/platforms/xcb/qglxintegration.cpp
+@@ -136,7 +136,7 @@ void* QGLXContext::getProcAddress(const QString& procName)
+             {
+                 extern const QString qt_gl_library_name();
+ //                QLibrary lib(qt_gl_library_name());
+-                QLibrary lib(QLatin1String("GL"));
++                QLibrary lib(QLatin1String("@openglDriver@/lib/libGL"));
+                 glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB");
+             }
+         }
+diff --git a/src/plugins/platforms/xlib/qglxintegration.cpp b/src/plugins/platforms/xlib/qglxintegration.cpp
+index 2467247..a2441d4 100644
+--- a/src/plugins/platforms/xlib/qglxintegration.cpp
++++ b/src/plugins/platforms/xlib/qglxintegration.cpp
+@@ -137,7 +137,7 @@ void* QGLXContext::getProcAddress(const QString& procName)
+             {
+                 extern const QString qt_gl_library_name();
+ //                QLibrary lib(qt_gl_library_name());
+-                QLibrary lib(QLatin1String("GL"));
++                QLibrary lib(QLatin1String("@openglDriver@/lib/libGL"));
+                 glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB");
+             }
+         }
+diff --git a/src/plugins/platforms/xlib/qxlibstatic.cpp b/src/plugins/platforms/xlib/qxlibstatic.cpp
+index f8f3d69..d63c5bc 100644
+--- a/src/plugins/platforms/xlib/qxlibstatic.cpp
++++ b/src/plugins/platforms/xlib/qxlibstatic.cpp
+@@ -242,7 +242,7 @@ static void* qt_load_library_runtime(const char *library, int vernum,
  }
  
  #  define XFIXES_LOAD_RUNTIME(vernum, symbol, symbol_type) \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 23c0e7b0adf..b3d64bbbca4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5077,13 +5077,12 @@ let
 
   qt48 = callPackage ../development/libraries/qt-4.x/4.8 {
     # GNOME dependencies are not used unless gtkStyle == true
+    mesa = mesa_noglu;
     inherit (pkgs.gnome) libgnomeui GConf gnome_vfs;
     cups = if stdenv.isLinux then cups else null;
   };
 
-  qt48Full = callPackage ../development/libraries/qt-4.x/4.8 {
-    # GNOME dependencies are not used unless gtkStyle == true
-    inherit (pkgs.gnome) libgnomeui GConf gnome_vfs;
+  qt48Full = qt48.override {
     docs = true;
     demos = true;
     examples = true;

From 8e3a92e30689eefac1ebb55239037343fcf82666 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 14 Jul 2013 01:46:44 +0200
Subject: [PATCH 006/452] libxcb: enable XKB extension

SDDM, a display manager that I'm trying to package, depends on this.
---
 pkgs/servers/x11/xorg/overrides.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index ff815fb1cf5..5a7e9622ca8 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -49,6 +49,7 @@ in
 
   libxcb = attrs : attrs // {
     nativeBuildInputs = [ args.python ];
+    configureFlags = "--enable-xkb";
   };
 
   xcbproto = attrs : attrs // {

From 8eea8bbd1fc389f0874f927efd2e077de49cb6e8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 17 Jul 2013 15:29:02 +0200
Subject: [PATCH 007/452] mesa: Update to 9.1.4

---
 pkgs/development/libraries/mesa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 680030b33c7..e957cd572dd 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -23,7 +23,7 @@ else
 */
 
 let
-  version = "9.1.3";
+  version = "9.1.4";
   driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
 in
 stdenv.mkDerivation {
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
-    sha256="0rnpaambxv5cd6kbfyvv4b8x2rw1xj13a67xbkzmndfh08iaqpcd";
+    sha256 = "1nk8xvw0dg07jd8w5gfdbk0abwv4lr8x6dsh4jm7k3p6x638g1bf";
   };
 
   prePatch = "patchShebangs .";

From 48a0d477dba256ac47c335b5518b06d54c9c6093 Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Sun, 14 Jul 2013 12:54:17 +1000
Subject: [PATCH 008/452] qt4: fix build on darwin (close #750)

---
 .../libraries/qt-4.x/4.8/default.nix          | 48 ++++++++++++-------
 1 file changed, 31 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index a2a35fb1ea5..f39bf1d108a 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -61,19 +61,23 @@ stdenv.mkDerivation rec {
         inherit gtk gdk_pixbuf;
       });
 
-  preConfigure =
-    ''
-      export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH"
-      configureFlags+="
-        -docdir $out/share/doc/${name}
-        -plugindir $out/lib/qt4/plugins
-        -importdir $out/lib/qt4/imports
-        -examplesdir $out/share/doc/${name}/examples
-        -demosdir $out/share/doc/${name}/demos
-        -datadir $out/share/${name}
-        -translationdir $out/share/${name}/translations
-      "
-    '';
+  preConfigure = ''
+    export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH"
+    configureFlags+="
+      -docdir $out/share/doc/${name}
+      -plugindir $out/lib/qt4/plugins
+      -importdir $out/lib/qt4/imports
+      -examplesdir $out/share/doc/${name}/examples
+      -demosdir $out/share/doc/${name}/demos
+      -datadir $out/share/${name}
+      -translationdir $out/share/${name}/translations
+    "
+  '' + optionalString stdenv.isDarwin ''
+    export CXX=clang++
+    export CC=clang
+    sed -i 's/QMAKE_CC = gcc/QMAKE_CC = clang/' mkspecs/common/g++-base.conf
+    sed -i 's/QMAKE_CXX = g++/QMAKE_CXX = clang++/' mkspecs/common/g++-base.conf
+  '';
 
   prefixKey = "-prefix ";
   configureFlags =
@@ -97,12 +101,10 @@ stdenv.mkDerivation rec {
     '';
 
   propagatedBuildInputs =
-    [ libXrender libXrandr libXinerama libXcursor libXext libXfixes
-      libXv libXi libSM
-    ]
+    [ libXrender libXrandr libXinerama libXcursor libXext libXfixes libXv libXi
+      libSM zlib libpng openssl dbus.libs freetype fontconfig glib ]
     ++ optional (stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms) mesa
     ++ optional ((buildWebkit || buildMultimedia) && stdenv.isLinux ) alsaLib
-    ++ [ zlib libpng openssl dbus.libs freetype fontconfig glib ]
     ++ optionals (buildWebkit || buildMultimedia) [ gstreamer gst_plugins_base ];
 
   # The following libraries are only used in plugins
@@ -117,6 +119,18 @@ stdenv.mkDerivation rec {
   # @vcunat has been unable to find a *reliable* fix
   enableParallelBuilding = false;
 
+  NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin
+    "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include";
+
+  NIX_LDFLAGS = optionalString stdenv.isDarwin
+    "-lglib-2.0";
+
+  preBuild = optionalString stdenv.isDarwin ''
+    # resolve "extra qualification on member" error
+    sed -i 's/struct ::TabletProximityRec;/struct TabletProximityRec;/' \
+      src/gui/kernel/qt_cocoa_helpers_mac_p.h
+  '';
+
   crossAttrs = let
     isMingw = stdenv.cross.config == "i686-pc-mingw32" ||
       stdenv.cross.config == "x86_64-w64-mingw32";

From 4d495c7c44d5221a25b23b8fccd2247ba0deb202 Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Sun, 14 Jul 2013 13:41:26 +1000
Subject: [PATCH 009/452] pyqt4: fix build on darwin (close #751)

* build with clangStdenv
---
 pkgs/top-level/all-packages.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3d64bbbca4..4436fabc26b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5621,7 +5621,11 @@ let
 
   sip = callPackage ../development/python-modules/python-sip { };
 
-  pyqt4 = callPackage ../development/python-modules/pyqt { };
+  pyqt4 = callPackage ../development/python-modules/pyqt {
+    stdenv = if stdenv.isDarwin
+      then clangStdenv
+      else stdenv;
+  };
 
   pysideApiextractor = callPackage ../development/python-modules/pyside/apiextractor.nix { };
 

From 11b5b06fbd3b02dc1243b17d7439072e358ebdf3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 29 Jul 2013 21:39:56 +0200
Subject: [PATCH 010/452] libpng: Update to 1.6.3

---
 pkgs/development/libraries/libpng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 0a150610781..9f4548c3001 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -3,11 +3,11 @@
 assert zlib != null;
 
 stdenv.mkDerivation rec {
-  name = "libpng-1.6.2";
+  name = "libpng-1.6.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/libpng/${name}.tar.xz";
-    sha256 = "1pljkqjqgyz8c32w8fipd9f0v2gcyhah2ypp0h7ya1r1q85sk5qw";
+    sha256 = "0i8gz8mbkygc0ny7aa2i2wiavysxy6fdaphl52l49fb3hv9w1v65";
   };
 
   propagatedBuildInputs = [ zlib ];

From bdb525e020b3875ddc92b0315938b5d842285386 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Thu, 1 Aug 2013 08:24:31 +0200
Subject: [PATCH 011/452] add haskell-llvm-general

---
 .../haskell/llvm-general/default.nix          | 21 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  4 ++++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/llvm-general/default.nix

diff --git a/pkgs/development/libraries/haskell/llvm-general/default.nix b/pkgs/development/libraries/haskell/llvm-general/default.nix
new file mode 100644
index 00000000000..16d9859aae2
--- /dev/null
+++ b/pkgs/development/libraries/haskell/llvm-general/default.nix
@@ -0,0 +1,21 @@
+{ cabal, HUnit, llvmConfig, mtl, parsec, QuickCheck, setenv
+, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text
+, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "llvm-general";
+  version = "3.3.5.0";
+  sha256 = "15zrav7339jn6p75g1d7h3qkr1wyal1jzfs8xy73kckw2fzn4nlf";
+  buildDepends = [ mtl parsec setenv text transformers ];
+  testDepends = [
+    HUnit mtl QuickCheck testFramework testFrameworkHunit
+    testFrameworkQuickcheck2
+  ];
+  buildTools = [ llvmConfig ];
+  meta = {
+    description = "General purpose LLVM bindings";
+    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 58706742e07..2684d6df7c3 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1335,6 +1335,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   ListZipper = callPackage ../development/libraries/haskell/ListZipper {};
 
+  llvmGeneral = callPackage ../development/libraries/haskell/llvm-general {
+    llvmConfig = pkgs.llvm;
+  };
+
   lrucache = callPackage ../development/libraries/haskell/lrucache {};
 
   ltk = callPackage ../development/libraries/haskell/ltk {};

From 114b961b8c08d167ab9416bc7c252324996f6eba Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 8 Jun 2013 23:28:50 +0200
Subject: [PATCH 012/452] idris: upgrade to 0.9.9

---
 pkgs/development/compilers/idris/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix
index 225f8afcd82..e36924f63fe 100644
--- a/pkgs/development/compilers/idris/default.nix
+++ b/pkgs/development/compilers/idris/default.nix
@@ -1,19 +1,20 @@
 { cabal, binary, Cabal, filepath, gmp, happy, haskeline
-, languageJava, libffi, mtl, parsec, split, text, transformers
+, languageJava, libffi, llvmGeneral, mtl, parsec, split, text
+, transformers, vector, vectorBinaryInstances, boehmgc
 }:
 
 cabal.mkDerivation (self: {
   pname = "idris";
-  version = "0.9.8";
-  sha256 = "1mxc6mic3d508ni9pqxw8q31f27shyaxs1rchfl2jg58i9w6iy7h";
+  version = "0.9.9";
+  sha256 = "0wwssgpiyn7akyfrpi1khvqxx1k8753kk7151zvvymz0zkks643m";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-    binary Cabal filepath haskeline languageJava libffi mtl parsec
-    split text transformers
+    binary Cabal filepath haskeline languageJava libffi llvmGeneral mtl
+    parsec split text transformers vector vectorBinaryInstances
   ];
   buildTools = [ happy ];
-  extraLibraries = [ gmp ];
+  extraLibraries = [ gmp boehmgc ];
   meta = {
     homepage = "http://www.idris-lang.org/";
     description = "Functional Programming Language with Dependent Types";

From d239d24a89276cc7ee4bab1343c7e5bb40cbdfd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 2 Aug 2013 17:13:54 +0200
Subject: [PATCH 013/452] mesa: bugfix update 9.1.4 -> 9.1.6

---
 pkgs/development/libraries/mesa/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index e957cd572dd..a361f06e4ba 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -3,7 +3,7 @@
 , libdrm, xorg, wayland, udev, llvm, libffi
 , libvdpau
 , enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt
-, enableR600LlvmCompiler ? false # we would need currently unreleased LLVM or patches
+, enableR600LlvmCompiler ? false # current llvm-3.3 + mesa-9.1.6 don't configure
 , enableExtraFeatures ? false # add ~15 MB to mesa_drivers
 }:
 
@@ -23,7 +23,7 @@ else
 */
 
 let
-  version = "9.1.4";
+  version = "9.1.6";
   driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
 in
 stdenv.mkDerivation {
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
-    sha256 = "1nk8xvw0dg07jd8w5gfdbk0abwv4lr8x6dsh4jm7k3p6x638g1bf";
+    sha256 = "0gay00fy84hrnp25hpacz5cbvxrpvgg1d390vichmbdgmkqdycp6";
   };
 
   prePatch = "patchShebangs .";

From 661a1a68a601843ffe4e1321e496f7f23c31e6fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 3 Aug 2013 09:39:31 +0200
Subject: [PATCH 014/452] automake113x: minor update to .4

I can't make glib build without it.
---
 pkgs/development/tools/misc/automake/automake-1.13.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/automake/automake-1.13.x.nix b/pkgs/development/tools/misc/automake/automake-1.13.x.nix
index 3556b4f47aa..400d554b65e 100644
--- a/pkgs/development/tools/misc/automake/automake-1.13.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.13.x.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }:
 
 stdenv.mkDerivation rec {
-  name = "automake-1.13.1";
+  name = "automake-1.13.4";
 
   src = fetchurl {
     url = "mirror://gnu/automake/${name}.tar.xz";
-    sha256 = "12yi1bzkipi7qdmkdy77pazljsa9z7q66hi6c4rq73p7hbv6rkbf";
+    sha256 = "0rhx1mr2gv483s4bc9yy9skwr5d5a3jcyfaw24h0r3wvylrlkkl9";
   };
 
   buildInputs = [ perl autoconf ];

From d374527509657cfeb8499118b26e7605fab8f4d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 3 Aug 2013 09:45:22 +0200
Subject: [PATCH 015/452] GTK-related minor updates

---
 .../gnome-3/core/at-spi2-atk/default.nix      |  4 +--
 pkgs/desktops/gnome-3/default.nix             |  2 +-
 .../libraries/gdk-pixbuf/default.nix          |  4 +--
 pkgs/development/libraries/glib/default.nix   | 32 ++++++++++++-------
 pkgs/development/libraries/gtk+/2.x.nix       |  9 ++----
 pkgs/development/libraries/pango/default.nix  |  2 +-
 pkgs/top-level/all-packages.nix               |  1 +
 7 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix b/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix
index 94877457267..ab25845c413 100644
--- a/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix
+++ b/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   versionMajor = "2.8";
-  versionMinor = "0";
+  versionMinor = "1";
   moduleName   = "at-spi2-atk";
   name = "${moduleName}-${versionMajor}.${versionMinor}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
-    sha256 = "085sqww174vl3i9ccb477v706rkjs2d107rl96ma1kbl2jyar226";
+    sha256 = "01pxfnksixrjj27ivllpla54r6nkwsjj34acb0phmp76zna9nrgb";
   };
 
   buildInputs = [ python pkgconfig popt atk libX11 libICE xlibs.libXtst libXi
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 5d517da82b3..a5f230ae32c 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -11,7 +11,7 @@ rec {
 
 #### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
 
-  at_spi2_atk = lib.lowPrio (callPackage ./core/at-spi2-atk { });
+  at_spi2_atk = callPackage ./core/at-spi2-atk { };
 
   at_spi2_core = callPackage ./core/at-spi2-core { };
 
diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 3a22bb4c3c1..fabc009e3ef 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -2,11 +2,11 @@
 , jasper, libintlOrEmpty }:
 
 stdenv.mkDerivation rec {
-  name = "gdk-pixbuf-2.28.1";
+  name = "gdk-pixbuf-2.28.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gdk-pixbuf/2.28/${name}.tar.xz";
-    sha256 = "1fy2a05xhfg7gy4l4aajsbmgj62zxhikdxqh6bicihxmzm1vg85y";
+    sha256 = "05s6ksvy1yan6h6zny9n3bmvygcnzma6ljl6i0z9cci2xg116c8q";
   };
 
   # !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index b5e2b1e43b2..6c53e573bf6 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconvOrEmpty, zlib, libffi
-, python, pcre, libelf, libintlOrEmpty }:
+{ stdenv, fetchurl, pkgconfig, gettext, perl, python, autoconf, automake, libtool
+, libiconvOrEmpty, libintlOrEmpty, zlib, libffi, pcre, libelf, dbus }:
 
 # TODO:
 # * Add gio-module-fam
@@ -23,30 +23,41 @@ let
     ln -sr -t "$out/include/" $out/lib/*/include/* 2>/dev/null || true
   '';
 in
+with { inherit (stdenv.lib) optionalString; };
 
 stdenv.mkDerivation rec {
-  name = "glib-2.36.1";
+  name = "glib-2.36.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/2.36/${name}.tar.xz";
-    sha256 = "090bw5par3dfy5m6dhq393pmy92zpw3d7rgbzqjc14jfg637bqvx";
+    sha256 = "07kn9j0gbh97mmmn72ird628klfdrswx1hqrcr1lqbp0djzk7i2y";
   };
 
-  # configure script looks for d-bus but it is only needed for tests
-  buildInputs = [ libelf ] ++ libintlOrEmpty;
+  # configure script looks for d-bus but it is (probably) only needed for tests
+  buildInputs = [ libelf ];
 
-  nativeBuildInputs = [ perl pkgconfig gettext python ];
+  # I don't know why the autotools are needed now, even without modifying configure scripts
+  nativeBuildInputs = [ pkgconfig gettext perl python ] ++ [ autoconf automake libtool ];
 
-  propagatedBuildInputs = [ pcre zlib libffi ] ++ libiconvOrEmpty;
+  propagatedBuildInputs = [ pcre zlib libffi ] ++ libiconvOrEmpty ++ libintlOrEmpty;
 
+  preConfigure = "autoreconf -fi";
   configureFlags = "--with-pcre=system --disable-fam";
 
-  postConfigure = "sed '/SANE_MALLOC_PROTOS/s,^,//,' -i config.h";
+  postConfigure =
+    optionalString stdenv.isDarwin (''
+      sed '24 i #include <Foundation/Foundation.h>'
+    '' + /* Disable the NeXTstep back-end because stdenv.gcc doesn't support Objective-C. */ ''
+      sed -i configure -e's/glib_have_cocoa=yes/glib_have_cocoa=no/g'
+    '');
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
+  NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-lintl";
 
   enableParallelBuilding = true;
 
+  doCheck = false; # ToDo: fix the remaining problems, so we have checked glib by default
+  LD_LIBRARY_PATH = optionalString doCheck "${stdenv.gcc.gcc}/lib";
+
   postInstall = ''rm -rvf $out/share/gtk-doc'';
 
   passthru = {
@@ -69,4 +80,3 @@ stdenv.mkDerivation rec {
     '';
   };
 }
-
diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
index 6debf2a807b..92463d80c2b 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@@ -8,19 +8,16 @@ assert xineramaSupport -> xlibs.libXinerama != null;
 assert cupsSupport -> cups != null;
 
 stdenv.mkDerivation rec {
-  name = "gtk+-2.24.18";
+  name = "gtk+-2.24.20";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.xz";
-    sha256 = "1193frzg0qrwa885w77kd055zfpbdjwby88xn2skpx9g4w0k35kc";
+    sha256 = "18qdvb7nxi25hfnpmcy01p3majw9jnx83ikm263dk9rrjazvqrnc";
   };
 
   enableParallelBuilding = true;
 
-  NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo"
-    + stdenv.lib.optionalString (libintlOrEmpty != []) " -lintl";
-
-  buildInputs = stdenv.lib.optional stdenv.isDarwin xlibs.libXi;
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (libintlOrEmpty != []) "-lintl";
 
   nativeBuildInputs = [ perl pkgconfig gettext ];
 
diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index 1acb3639f06..cec3d1dccc0 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -2,7 +2,7 @@
 , libintlOrEmpty }:
 
 stdenv.mkDerivation rec {
-  name = "pango-1.32.5"; #.6 needs a not-yet-stable fontconfig
+  name = "pango-1.32.5"; #.6 and higher need a not-yet-stable fontconfig (!)
 
   src = fetchurl {
     url = "mirror://gnome/sources/pango/1.32/${name}.tar.xz";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 938d107a43e..539a862138f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4235,6 +4235,7 @@ let
     stdenv = if stdenv.isDarwin
       then overrideGCC stdenv gccApple
       else stdenv;
+    automake = automake113x;
   };
   glibmm = callPackage ../development/libraries/glibmm { };
 

From 98f37166505f3559f53bef238cebc5a69fe00201 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 3 Aug 2013 10:45:13 +0200
Subject: [PATCH 016/452] clean some include flags that weren't really needed

Tested the builds still work (x86_64-linux).
---
 pkgs/development/compilers/swi-prolog/default.nix |  4 ----
 pkgs/development/libraries/cairo/default.nix      |  2 --
 pkgs/development/libraries/glib/default.nix       | 12 +++++++-----
 pkgs/development/libraries/pango/default.nix      |  2 --
 pkgs/development/libraries/pangomm/2.28.x.nix     |  2 --
 pkgs/tools/graphics/gnuplot/default.nix           |  2 --
 pkgs/tools/typesetting/tex/texlive/default.nix    |  1 -
 7 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix
index a17e104b5bb..e8db962d9c4 100644
--- a/pkgs/development/compilers/swi-prolog/default.nix
+++ b/pkgs/development/compilers/swi-prolog/default.nix
@@ -18,10 +18,6 @@ stdenv.mkDerivation {
   configureFlags = "--with-world --enable-gmp --enable-shared";
   makeFlags = "world";
 
-  preConfigure = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2"
-  '';
-
   meta = {
     homepage = http://www.swi-prolog.org/;
     description = "A Prolog compiler and interpreter";
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index a09903f7ea9..22e1ca0d6e4 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -34,8 +34,6 @@ stdenv.mkDerivation rec {
     ++ optional pdfSupport "--enable-pdf"
     ;
 
-  NIX_CFLAGS_COMPILE = "-I${pixman}/include/pixman-1";
-
   preConfigure =
   # On FreeBSD, `-ldl' doesn't exist.
     (stdenv.lib.optionalString stdenv.isFreeBSD
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 6c53e573bf6..b2c5966c267 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -12,15 +12,17 @@
 #       $out/bin/gtester-report' to postInstall if this is solved
 
 let
-  # some packages don't get "Cflags" from pkgconfig correctly
-  # and then fail to build when directly including like <glib/...>
+  # Some packages don't get "Cflags" from pkgconfig correctly
+  # and then fail to build when directly including like <glib/...>.
+  # This is intended to be run in postInstall of any package
+  # which has $out/include/ containing just some disjunct directories.
   flattenInclude = ''
-    for dir in $out/include/*; do
-      cp -r $dir/* "$out/include/"
+    for dir in "$out"/include/*; do
+      cp -r "$dir"/* "$out/include/"
       rm -r "$dir"
       ln -s . "$dir"
     done
-    ln -sr -t "$out/include/" $out/lib/*/include/* 2>/dev/null || true
+    ln -sr -t "$out/include/" "$out"/lib/*/include/* 2>/dev/null || true
   '';
 in
 with { inherit (stdenv.lib) optionalString; };
diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index cec3d1dccc0..b1faa6c30f6 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -9,8 +9,6 @@ stdenv.mkDerivation rec {
     sha256 = "08aqis6j8nd1lb4f2h4h9d9kjvp54iwf8zvqzss0qn4v7nfcjyvx";
   };
 
-  NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo";
-
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ gettext fontconfig ];
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/pangomm/2.28.x.nix b/pkgs/development/libraries/pangomm/2.28.x.nix
index d03aa4311fe..6843ff7a307 100644
--- a/pkgs/development/libraries/pangomm/2.28.x.nix
+++ b/pkgs/development/libraries/pangomm/2.28.x.nix
@@ -11,8 +11,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   propagatedBuildInputs = [ pango glibmm cairomm libpng cairo ];
 
-  NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo";
-
   meta = with stdenv.lib; {
     description = "C++ interface to the Pango text rendering library";
     homepage    = http://www.pango.org/;
diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix
index 5dee1079ae2..23d57f5b652 100644
--- a/pkgs/tools/graphics/gnuplot/default.nix
+++ b/pkgs/tools/graphics/gnuplot/default.nix
@@ -32,8 +32,6 @@ stdenv.mkDerivation rec {
 
   configureFlags = if libX11 != null then ["--with-x"] else ["--without-x"];
 
-  NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo";
-
   postInstall = stdenv.lib.optionalString (libX11 != null) ''
     wrapProgram $out/bin/gnuplot \
        --prefix PATH : '${gnused}/bin' \
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index aac8da784b3..7f512bade8a 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -35,7 +35,6 @@ rec {
     sed -e s@ncurses/curses.h@curses.h@g -i $(grep ncurses/curses.h -rl . )
     sed -e '1i\#include <string.h>\n\#include <stdlib.h>' -i $( find libs/teckit -name '*.cpp' -o -name '*.c' )
 
-    NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2"
     NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${icu}/include/layout";
 
     ./Build --prefix="$out" --datadir="$out/share" --mandir "$out/share/man" --infodir "$out/share/info" \

From d5ac09f60f05fc2da4dddd9ae415b76d97419313 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 3 Aug 2013 10:46:48 +0200
Subject: [PATCH 017/452] poppler: bugfix update, waiting with major bump

---
 pkgs/development/libraries/poppler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 55ab0da0cfd..c5bf80b5ca3 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -4,8 +4,8 @@
 }:
 
 let
-  version = "0.22.4"; # even major numbers are stable
-  sha256 = "0fz1vk0rbxvnv7ssj8l910k1rx0gjhzl5wr7hkdf4r9jwqs8yhsg";
+  version = "0.22.5"; # even major numbers are stable
+  sha256 = "0678frlr39xvrbva490hk0mqyfnx3bk7i5pma8j6hjmzy68a6hpp";
 
   qtcairo_patches =
     let qtcairo = fetchgit { # the version for poppler-0.22

From daf9c75ef4f999aea6e6c70506ee80f35714043e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 3 Aug 2013 15:36:22 +0200
Subject: [PATCH 018/452] xorg: bugfix updates of some libs

Now using stable release of libXi, instead of the git version we had due
to security stuff.
---
 pkgs/servers/x11/xorg/default.nix       | 24 ++++++++++++------------
 pkgs/servers/x11/xorg/overrides.nix     |  7 -------
 pkgs/servers/x11/xorg/tarballs-7.7.list |  8 ++++----
 3 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 3a523469248..852d7ab9841 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -580,11 +580,11 @@ let
   })) // {inherit windowswmproto libX11 libXext xextproto ;};
 
   libX11 = (stdenv.mkDerivation ((if overrides ? libX11 then overrides.libX11 else x: x) {
-    name = "libX11-1.6.0";
+    name = "libX11-1.6.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libX11-1.6.0.tar.bz2;
-      sha256 = "1yhrf36is2f2h28x8wjd87wmdhslmzg06jg1gwq55hiy6h9184sk";
+      url = mirror://xorg/individual/lib/libX11-1.6.1.tar.bz2;
+      sha256 = "14hqf180dxax3xf65bq95psd4bx8az1q1l6lxsjzbd2qdg0lz98h";
     };
     buildInputs = [pkgconfig inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ];
   })) // {inherit inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ;};
@@ -680,11 +680,11 @@ let
   })) // {inherit fixesproto libX11 xextproto xproto ;};
 
   libXfont = (stdenv.mkDerivation ((if overrides ? libXfont then overrides.libXfont else x: x) {
-    name = "libXfont-1.4.5";
+    name = "libXfont-1.4.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/libXfont-1.4.5.tar.bz2;
-      sha256 = "0w3irg00k6b6mziddnacln9q2rkf5848b04nvjqwv5bb1fw6zydv";
+      url = mirror://xorg/individual/lib/libXfont-1.4.6.tar.bz2;
+      sha256 = "17vy2p8myxx8644yd05qsl2qvv9m3mhdbniw87mcw5ywai2zxjyh";
     };
     buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ];
   })) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;};
@@ -700,11 +700,11 @@ let
   })) // {inherit fontconfig freetype libX11 xproto libXrender ;};
 
   libXi = (stdenv.mkDerivation ((if overrides ? libXi then overrides.libXi else x: x) {
-    name = "libXi-1.7.1";
+    name = "libXi-1.7.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXi-1.7.1.tar.bz2;
-      sha256 = "1ib6026bh4bcc2q0y04klqsvjl9pwabxnr8ybkh52g65d5mxnap9";
+      url = mirror://xorg/individual/lib/libXi-1.7.2.tar.bz2;
+      sha256 = "03mj9i6h0n8icjkx5a16wh1gyyhfiayj02ydc6sy4i9nqqfph96z";
     };
     buildInputs = [pkgconfig inputproto libX11 libXext xextproto libXfixes xproto ];
   })) // {inherit inputproto libX11 libXext xextproto libXfixes xproto ;};
@@ -870,11 +870,11 @@ let
   })) // {inherit xproto zlib ;};
 
   libpciaccess = (stdenv.mkDerivation ((if overrides ? libpciaccess then overrides.libpciaccess else x: x) {
-    name = "libpciaccess-0.13.1";
+    name = "libpciaccess-0.13.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/libpciaccess-0.13.1.tar.bz2;
-      sha256 = "11509lkgd5j4g5wy0g13z4sf31h50hqx3jfwb2i4q6k98pv6iar7";
+      url = mirror://xorg/individual/lib/libpciaccess-0.13.2.tar.bz2;
+      sha256 = "06fy43n3c450h7xqpn3094bnfn7ca1mrq3i856y8kyqa0lmqraxb";
     };
     buildInputs = [pkgconfig zlib ];
   })) // {inherit zlib ;};
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index c800b06fc7c..7286f71a8dc 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -111,13 +111,6 @@ in
   libSM = attrs: attrs
     // { propagatedBuildInputs = [ xorg.libICE ]; };
 
-  libXi = gitRelease {
-    libName = "libXi";
-    version = "1.7.1.91";
-    rev = "661c45ca17c434dbd342a46fd3fb813852ae0ca9";
-    sha256 = "01wx8fgjjfqm0sm9anj6rmz72yvjyb4y3ifjk2q4ixd7pdp63bx6";
-  };
-
   libXrender = attrs: attrs
     // { preConfigure = setMalloc0ReturnsNullCrossCompiling; };
 
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 2517da4a20f..4464aeea9b8 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -53,10 +53,10 @@ mirror://xorg/individual/lib/libdmx-1.1.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libfontenc-1.1.1.tar.bz2
 mirror://xorg/individual/lib/libFS-1.0.5.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libICE-1.0.8.tar.bz2
-mirror://xorg/X11R7.7/src/everything/libpciaccess-0.13.1.tar.bz2
+mirror://xorg/individual/lib/libpciaccess-0.13.2.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libSM-1.2.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2
-mirror://xorg/individual/lib/libX11-1.6.0.tar.bz2
+mirror://xorg/individual/lib/libX11-1.6.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libXau-1.0.7.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libXaw-1.0.11.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libXcomposite-0.4.3.tar.bz2
@@ -65,9 +65,9 @@ mirror://xorg/X11R7.7/src/everything/libXdamage-1.1.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libXdmcp-1.1.1.tar.bz2
 mirror://xorg/individual/lib/libXext-1.3.2.tar.bz2
 mirror://xorg/individual/lib/libXfixes-5.0.1.tar.bz2
-mirror://xorg/X11R7.7/src/everything/libXfont-1.4.5.tar.bz2
+mirror://xorg/individual/lib/libXfont-1.4.6.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libXft-2.3.1.tar.bz2
-mirror://xorg/individual/lib/libXi-1.7.1.tar.bz2
+mirror://xorg/individual/lib/libXi-1.7.2.tar.bz2
 mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libxkbfile-1.0.8.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libXmu-1.1.1.tar.bz2

From 7fbcc562609249a6ba81b26064e31c00ed38ebda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 4 Aug 2013 20:59:05 +0200
Subject: [PATCH 019/452] add introspection into GTK libs (part of #517)

This is all work of Marc Weber <marco-oweber@gmx.de>, except for a few nitpicks.

Tested space blowup: IMHO negligible to headers and similar stuff,
e.g. the firefox closure (reported by du) grows from 560 to 579 MB.
Saving space should be handled separately,
e.g. we have the multiple-outputs branch.
---
 pkgs/desktops/gnome-3/default.nix             |  3 ++-
 .../gnome-3/desktop/gnome-desktop/default.nix |  4 +++-
 pkgs/development/libraries/atk/default.nix    |  4 ++--
 .../libraries/gdk-pixbuf/default.nix          |  8 ++++---
 .../gobject-introspection/default.nix         | 21 ++++++++++++-------
 .../gobject-introspection/setup-hook.sh       | 14 +++++++++++++
 pkgs/development/libraries/gtk+/3.x.nix       |  4 ++--
 pkgs/development/libraries/pango/default.nix  |  6 ++++--
 .../libraries/wxGTK-2.8/default.nix           |  1 +
 9 files changed, 46 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/libraries/gobject-introspection/setup-hook.sh

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index a5f230ae32c..8af6d65420a 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -3,7 +3,8 @@
 rec {
   inherit (pkgs) fetchurl_gnome glib gtk3 atk pango;
   gtk = gtk3;
-  orbit = pkgs.gnome2.ORBit2;
+  inherit (pkgs.gnome2) gnome_common ORBit2;
+  orbit = ORBit2;
 
   inherit (lib) lowPrio hiPrio appendToName makeOverridable;
 
diff --git a/pkgs/desktops/gnome-3/desktop/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/desktop/gnome-desktop/default.nix
index 4d22f6ad746..1f0b6c2a971 100644
--- a/pkgs/desktops/gnome-3/desktop/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/desktop/gnome-desktop/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gnome3
-, intltool, gnome_doc_utils}:
+, intltool, gnome_doc_utils }:
 
 stdenv.mkDerivation rec {
 
@@ -7,6 +7,8 @@ stdenv.mkDerivation rec {
   minorVersion = "3";
   name = "gnome-desktop-${majorVersion}.${minorVersion}";
 
+  enableParallelBuilding = true;
+
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-desktop/${majorVersion}/${name}.tar.xz";
     sha256 = "1nrqcp1p5cxhfjjy5hjpvkqmzsgl2353a08fg0b11c932v95bsba";
diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix
index cea207f27bc..f4c33c86911 100644
--- a/pkgs/development/libraries/atk/default.nix
+++ b/pkgs/development/libraries/atk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, perl, glib, libintlOrEmpty }:
+{ stdenv, fetchurl, pkgconfig, perl, glib, libintlOrEmpty, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
   name = "atk-2.8.0";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig perl ];
 
-  propagatedBuildInputs = [ glib ];
+  propagatedBuildInputs = [ glib gobjectIntrospection /*ToDo: why propagate*/ ];
 
   postInstall = "rm -rf $out/share/gtk-doc";
 
diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index fabc009e3ef..6ad30f66e03 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, xz
-, jasper, libintlOrEmpty }:
+, jasper, libintlOrEmpty, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
   name = "gdk-pixbuf-2.28.2";
@@ -12,11 +12,13 @@ stdenv.mkDerivation rec {
   # !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
   buildInputs = [ libX11 libintlOrEmpty ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
 
   propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ];
 
-  configureFlags = "--with-libjasper --with-x11";
+  configureFlags = "--with-libjasper --with-x11"
+    + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes"
+    ;
 
   postInstall = "rm -rf $out/share/gtk-doc";
 
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index 99a80640bb8..6a2caa28136 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -1,10 +1,18 @@
-{ stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python, gdk_pixbuf
+{ stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python
 , libintlOrEmpty, autoconf, automake, otool }:
+# now that gobjectIntrospection creates large .gir files (eg gtk3 case)
+# it may be worth thinking about using multiple derivation outputs
+# In that case its about 6MB which could be separated
 
 stdenv.mkDerivation rec {
-  name = "gobject-introspection-1.34.2";
+  name = "gobject-introspection-1.36.0";
 
-  buildInputs = [ flex bison glib pkgconfig python gdk_pixbuf ]
+  src = fetchurl {
+    url = "mirror://gnome/sources/gobject-introspection/1.36/${name}.tar.xz";
+    sha256 = "10v3idh489vra7pjn1g8f844nnl6719zgkgq3dv38xcf8afnvrz3";
+  };
+
+  buildInputs = [ flex bison glib pkgconfig python ]
     ++ libintlOrEmpty
     ++ stdenv.lib.optional stdenv.isDarwin otool;
   propagatedBuildInputs = [ libffi ];
@@ -13,13 +21,10 @@ stdenv.mkDerivation rec {
   # other dependencies).
   configureFlags = [ "--disable-tests" ];
 
-  src = fetchurl {
-    url = "mirror://gnome/sources/gobject-introspection/1.34/${name}.tar.xz";
-    sha256 = "0a9lq0y67sr3g37l1hy0biqn046jr9wnd05hvwi8j8g2bjilhydw";
-  };
-
   postInstall = "rm -rf $out/share/gtk-doc";
 
+  setupHook = ./setup-hook.sh;
+
   meta = with stdenv.lib; {
     description = "A middleware layer between C libraries and language bindings";
     homepage    = http://live.gnome.org/GObjectIntrospection;
diff --git a/pkgs/development/libraries/gobject-introspection/setup-hook.sh b/pkgs/development/libraries/gobject-introspection/setup-hook.sh
new file mode 100644
index 00000000000..d411ad69dc4
--- /dev/null
+++ b/pkgs/development/libraries/gobject-introspection/setup-hook.sh
@@ -0,0 +1,14 @@
+make_gobject_introspection_find_gir_files() {
+
+    # required for .typelib files, eg mypaint git version
+    if [ -d "$1/lib/girepository-1.0" ]; then
+      addToSearchPath GI_TYPELIB_PATH $1/lib/girepository-1.0
+    fi
+
+    # XDG_DATA_DIRS: required for .gir files?
+    if [ -d "$1/share" ]; then
+      addToSearchPath XDG_DATA_DIRS $1/share
+    fi
+}
+
+envHooks+=(make_gobject_introspection_find_gir_files)
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index f89b521758c..31bdba716b9 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gettext
-, expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, xlibs, x11
+, expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, xlibs, x11, gobjectIntrospection
 , xineramaSupport ? stdenv.isLinux
 , cupsSupport ? stdenv.isLinux, cups ? null
 }:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [ pkgconfig gettext ];
+  nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection ];
   propagatedBuildInputs = with xlibs; with stdenv.lib;
     [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk ]
     ++ optionals stdenv.isLinux [ libXrandr libXrender libXcomposite libXi libXcursor ]
diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index b1faa6c30f6..99bf8f10fd8 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng, harfbuzz, fontconfig
-, libintlOrEmpty }:
+, libintlOrEmpty, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
   name = "pango-1.32.5"; #.6 and higher need a not-yet-stable fontconfig (!)
@@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
     sha256 = "08aqis6j8nd1lb4f2h4h9d9kjvp54iwf8zvqzss0qn4v7nfcjyvx";
   };
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ gettext fontconfig ];
+  buildInputs = [ gobjectIntrospection ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ gettext fontconfig ];
+
 
   nativeBuildInputs = [ pkgconfig ];
 
diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxGTK-2.8/default.nix
index e11de87415d..62d2de0238f 100644
--- a/pkgs/development/libraries/wxGTK-2.8/default.nix
+++ b/pkgs/development/libraries/wxGTK-2.8/default.nix
@@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
     "--disable-precomp-headers"
     (if unicode then "--enable-unicode" else "")
     "--enable-mediactrl"
+    "--enable-graphics_ctx"
   ] ++ optional withMesa "--with-opengl";
 
   # These variables are used by configure to find some dependencies.

From a926bad1ccdba5528b7094170f1352f50d2b995d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 6 Aug 2013 08:06:26 +0200
Subject: [PATCH 020/452] disable auto-detected introspection for libwnck and
 clutter

Didn't build as it was, and not needed anywhere AFAIK.
---
 pkgs/development/libraries/clutter/default.nix | 2 ++
 pkgs/development/libraries/libwnck/default.nix | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix
index 6c6891fb279..b5aacad7bf0 100644
--- a/pkgs/development/libraries/clutter/default.nix
+++ b/pkgs/development/libraries/clutter/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation {
       atk json_glib
     ];
 
+  configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK
+
   meta = {
     description = "Clutter, a library for creating fast, dynamic graphical user interfaces";
 
diff --git a/pkgs/development/libraries/libwnck/default.nix b/pkgs/development/libraries/libwnck/default.nix
index 3c248622142..d2855afc43e 100644
--- a/pkgs/development/libraries/libwnck/default.nix
+++ b/pkgs/development/libraries/libwnck/default.nix
@@ -9,4 +9,6 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ pkgconfig libX11 gtk intltool ];
+
+  configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK
 }

From 72a8019334c9d27925ae6a006d925159d9a23e65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 6 Aug 2013 09:10:00 +0200
Subject: [PATCH 021/452] introspection disabling -- clutter-gtk, NM-applet,
 gnome_panel

Didn't build as it was, and not needed anywhere AFAIK.
---
 pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix    | 3 ++-
 pkgs/development/libraries/clutter-gtk/0.10.8.nix        | 2 ++
 pkgs/development/libraries/clutter-gtk/default.nix       | 2 ++
 pkgs/tools/networking/network-manager-applet/default.nix | 2 ++
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix
index 6ca2a9142c1..277ca9a1a69 100644
--- a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix
@@ -19,7 +19,8 @@ stdenv.mkDerivation {
     ];
 
   nativeBuildInputs = [ pkgconfig intltool which ];
-  configureFlags = "--disable-scrollkeeper";
+
+  configureFlags = [ "--disable-scrollkeeper" "--disable-introspection"/*not useful AFAIK*/ ];
 
   NIX_CFLAGS_COMPILE="-I${GConf}/include/gconf/2";
 }
diff --git a/pkgs/development/libraries/clutter-gtk/0.10.8.nix b/pkgs/development/libraries/clutter-gtk/0.10.8.nix
index 182040f5c41..bce5dd1b489 100644
--- a/pkgs/development/libraries/clutter-gtk/0.10.8.nix
+++ b/pkgs/development/libraries/clutter-gtk/0.10.8.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ clutter gtk ];
   nativeBuildInputs = [ pkgconfig ];
 
+  configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK
+
   postBuild = "rm -rf $out/share/gtk-doc";
 
   meta = {
diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix
index 3e13ff2da7e..d3878379027 100644
--- a/pkgs/development/libraries/clutter-gtk/default.nix
+++ b/pkgs/development/libraries/clutter-gtk/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ clutter gtk3 ];
   nativeBuildInputs = [ pkgconfig ];
 
+  configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK
+
   postBuild = "rm -rf $out/share/gtk-doc";
 
   meta = {
diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index 69c7b77e3f9..81bf7c908ef 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
 
   propagatedUserEnvPkgs = [ GConf gnome_keyring hicolor_icon_theme ];
 
+  configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK
+
   makeFlags = [
     ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"''
   ];

From de5b992ecf9f88dff27737f24e614980f56d4735 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 6 Aug 2013 10:33:41 +0200
Subject: [PATCH 022/452] qt, glew: propagate glu

After removing qt's dependency on the symlinked combination of mesa and glu,
many qt apps were missing it now (since e9f0d10).
I resove this to a compromise.
---
 pkgs/development/libraries/glew/default.nix       | 5 +++--
 pkgs/development/libraries/qt-4.x/4.8/default.nix | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix
index ebd60f61057..14b44801e76 100644
--- a/pkgs/development/libraries/glew/default.nix
+++ b/pkgs/development/libraries/glew/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, mesa, x11, libXmu, libXi }:
+{ stdenv, fetchurl, mesa_glu, x11, libXmu, libXi }:
 
 stdenv.mkDerivation rec {
   name = "glew-1.9.0";
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "11xpmsw7m5qn7y8fa2ihhqcislz1bdd83mp99didd5ac84756dlv";
   };
 
-  buildInputs = [ mesa x11 libXmu libXi ];
+  buildInputs = [ x11 libXmu libXi ];
+  propagatedBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h
 
   patchPhase = ''
     sed -i 's|lib64|lib|' config/Makefile.linux
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index 386429bbd59..a29dcec2b39 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, substituteAll
 , libXrender, libXinerama, libXcursor, libXmu , libXv, libXext
 , libXfixes, libXrandr, libSM, freetype, fontconfig
-, zlib, libjpeg, libpng, libmng, which, mesa, openssl, dbus, cups, pkgconfig
+, zlib, libjpeg, libpng, libmng, which, mesa, mesa_glu, openssl, dbus, cups, pkgconfig
 , libtiff, glib, icu
 , mysql, postgresql, sqlite
 , perl, coreutils, libXi
@@ -103,7 +103,8 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs =
     [ libXrender libXrandr libXinerama libXcursor libXext libXfixes libXv libXi
       libSM zlib libpng openssl dbus.libs freetype fontconfig glib ]
-    ++ optional (stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms) mesa
+        # Qt doesn't directly need GLU (just GL), but many apps use, it's small and doesn't remain a runtime-dep if not used
+    ++ optional (stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms) mesa_glu
     ++ optional ((buildWebkit || buildMultimedia) && stdenv.isLinux ) alsaLib
     ++ optionals (buildWebkit || buildMultimedia) [ gstreamer gst_plugins_base ];
 

From b6bb1e513d9cb10adeef2dc5967d05b9378a59f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 6 Aug 2013 12:20:34 +0200
Subject: [PATCH 023/452] mesa: attempt to fix driverLink on darwin

---
 pkgs/top-level/all-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 539a862138f..9e43b4d8904 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4977,7 +4977,8 @@ let
   mesaSupported = lib.elem system lib.platforms.mesaPlatforms;
 
   mesa_original = callPackage ../development/libraries/mesa { };
-  mesa_noglu = if stdenv.isDarwin then darwinX11AndOpenGL
+  mesa_noglu = if stdenv.isDarwin
+    then darwinX11AndOpenGL // { driverLink = mesa_noglu; }
     else mesa_original;
   mesa_drivers = mesa_original.drivers;
   mesa_glu = callPackage ../development/libraries/mesa-glu { };

From 758c21bf3bb1ed12cd138a278d6f119a9fd4852e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 7 Aug 2013 08:51:15 +0200
Subject: [PATCH 024/452] introspection disabling -- libchamplain

Didn't build as it was, and not needed anywhere AFAIK.
---
 pkgs/development/libraries/libchamplain/0.6.nix     | 2 ++
 pkgs/development/libraries/libchamplain/default.nix | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/libchamplain/0.6.nix b/pkgs/development/libraries/libchamplain/0.6.nix
index 5ec324131e3..9b75e9fc0a8 100644
--- a/pkgs/development/libraries/libchamplain/0.6.nix
+++ b/pkgs/development/libraries/libchamplain/0.6.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs =
     [ glib gtk cairo clutter clutter_gtk_0_10 sqlite libsoup ];
 
+  configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK
+
   meta = {
     homepage = http://projects.gnome.org/libchamplain/;
     license = "LGPLv2+";
diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix
index 4df3d00d1f4..6c323953973 100644
--- a/pkgs/development/libraries/libchamplain/default.nix
+++ b/pkgs/development/libraries/libchamplain/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ glib gtk3 cairo clutter_gtk sqlite libsoup ];
 
+  configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK
+
   meta = {
     homepage = http://projects.gnome.org/libchamplain/;
     license = "LGPLv2+";

From 207ca1f05a4b803dad2f571584e287f743942032 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 7 Aug 2013 18:28:04 +0200
Subject: [PATCH 025/452] darwin: attempt to fix pango via flattening cairo
 includes

Changes hash only on darwin.
---
 pkgs/development/libraries/cairo/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 22e1ca0d6e4..59a0a131585 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -54,7 +54,11 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   # The default `--disable-gtk-doc' is ignored.
-  postInstall = "rm -rf $out/share/gtk-doc";
+  postInstall = "rm -rf $out/share/gtk-doc"
+    + stdenv.lib.optionalString stdenv.isDarwin (''
+      #newline
+    '' + glib.flattenInclude
+    );
 
   meta = {
     description = "A 2D graphics library with support for multiple output devices";

From 0656eff7360e72ff03d3831f5bdcdf9107773076 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 9 Aug 2013 16:31:39 +0200
Subject: [PATCH 026/452] pixman: Update to 0.30.2

---
 pkgs/development/libraries/pixman/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix
index 7fbcedda395..23bfbeeb808 100644
--- a/pkgs/development/libraries/pixman/default.nix
+++ b/pkgs/development/libraries/pixman/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, pkgconfig, perl, withPNG ? true, libpng, glib /*just passthru*/ }:
 
 stdenv.mkDerivation rec {
-  name = "pixman-0.28.2";
+  name = "pixman-0.30.2";
 
   src = fetchurl {
     url = "http://cairographics.org/releases/${name}.tar.gz";
-    sha256 = "0mcvxd5gx3w1wzgph91l2vaiic91jmx7s01hi2igphyvd80ckyia";
+    sha256 = "1sgnpx34pj3245a9v8056jddc4cg4xxkqdjvvw6k2hnprhh8k65x";
   };
 
   nativeBuildInputs = [ pkgconfig perl ];

From 11c8ca0a1a48e645825504a0ef78b1d0d6c7052a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 13 Aug 2013 07:32:34 +0200
Subject: [PATCH 027/452] otool: fix licenses, adding the new APSL 2.0 as well

Now Hydra can build glib introspection and all that depends on it
(just darwin).
---
 pkgs/lib/licenses.nix                     | 6 ++++++
 pkgs/os-specific/darwin/otool/default.nix | 8 ++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix
index fcf7420e425..ec2f9aca95f 100644
--- a/pkgs/lib/licenses.nix
+++ b/pkgs/lib/licenses.nix
@@ -28,6 +28,12 @@
     url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/licenses/AMD-ADL?revision=1.1";
   };
 
+  apsl20 = {
+    shortName = "APSL 2.0";
+    fullName = "Apple Public Source License 2.0";
+    url = http://opensource.org/licenses/APSL-2.0;
+  };
+
   asl20 = {
     shortName = "ASL2.0";
     fullName = "Apache Software License 2.0";
diff --git a/pkgs/os-specific/darwin/otool/default.nix b/pkgs/os-specific/darwin/otool/default.nix
index c998253d148..671e51542d0 100644
--- a/pkgs/os-specific/darwin/otool/default.nix
+++ b/pkgs/os-specific/darwin/otool/default.nix
@@ -1,7 +1,11 @@
 { stdenv }:
 
-# this tool only exists on darwin
 assert stdenv.isDarwin;
+/*  this tool only exists on darwin
+    NOTE: it might make sense to compile this from source (maybe it even works for non-darwin)
+    I see cctools source is under GPL2+ as well as APSL 2.0
+    http://opensource.apple.com/release/developer-tools-46/
+*/
 
 stdenv.mkDerivation {
   name = "otool";
@@ -20,7 +24,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description = "Object file displaying tool";
     homepage    = https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man1/otool.1.html;
-    license     = licenses.unfree;
+    license     = with licenses; [ apsl20 gpl2Plus ];
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.darwin;
 

From d2e1023d73dcb86b0598688a352d3af5c7b3400a Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Thu, 15 Aug 2013 13:39:35 +1000
Subject: [PATCH 028/452] gobjectIntrospection: fix build on darwin (close
 #832)

vcunat edit: SANE_MALLOC_PROTOS is gone, removing the handling
https://git.gnome.org/browse/glib/commit/?id=518e3104bf6cdb5d8e6b43d3b721805db5951139
---
 pkgs/development/libraries/glib/default.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index b2c5966c267..4a14ed0f216 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -46,13 +46,6 @@ stdenv.mkDerivation rec {
   preConfigure = "autoreconf -fi";
   configureFlags = "--with-pcre=system --disable-fam";
 
-  postConfigure =
-    optionalString stdenv.isDarwin (''
-      sed '24 i #include <Foundation/Foundation.h>'
-    '' + /* Disable the NeXTstep back-end because stdenv.gcc doesn't support Objective-C. */ ''
-      sed -i configure -e's/glib_have_cocoa=yes/glib_have_cocoa=no/g'
-    '');
-
   NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-lintl";
 
   enableParallelBuilding = true;

From 7d23ab7c7529b97cd3b266e235a306c5bc01cf4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 15 Aug 2013 08:31:31 +0200
Subject: [PATCH 029/452] glib: bugfix update (important for ext4 sync)

---
 pkgs/development/libraries/glib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 4a14ed0f216..119584deb1e 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -28,11 +28,11 @@ in
 with { inherit (stdenv.lib) optionalString; };
 
 stdenv.mkDerivation rec {
-  name = "glib-2.36.3";
+  name = "glib-2.36.4";
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/2.36/${name}.tar.xz";
-    sha256 = "07kn9j0gbh97mmmn72ird628klfdrswx1hqrcr1lqbp0djzk7i2y";
+    sha256 = "0zmdbkg2yjyxdl72w34lxvrssbzqzdficskkfn22s0994dad4m7n";
   };
 
   # configure script looks for d-bus but it is (probably) only needed for tests

From 504a68f821c88aa77e7e71c23abb0a322487a9b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 15 Jun 2013 13:42:28 +0200
Subject: [PATCH 030/452] lcms2: "featured+maintenance" updates

I see nothing potentially dangerous in changelog, and packages seem to build and run.
---
 pkgs/development/libraries/lcms2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/development/libraries/lcms2/default.nix
index f3dcc7772e7..c543398fb57 100644
--- a/pkgs/development/libraries/lcms2/default.nix
+++ b/pkgs/development/libraries/lcms2/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, libtiff, libjpeg, zlib}:
 
 stdenv.mkDerivation rec {
-  name = "lcms2-2.3";
+  name = "lcms2-2.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/lcms/${name}.tar.gz";
-    sha256 = "1r5gmzhginzm90y70dcbamycdfcaz4f7v0bb4nwyaywlvsxpg89y";
+    sha256 = "1vyjsvld0881n5vrvw3bcxiqmn7yyy6j1yj1nz76ksaxkarschnk";
   };
 
   propagatedBuildInputs = [ libtiff libjpeg zlib ];

From b8d00ac1536e2a083413646aa9fc8baff5dc3488 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 15 Aug 2013 20:48:14 +0200
Subject: [PATCH 031/452] ghostscript: minor update, a little refactoring

Builds fine, I tried running some apps depending on it.
---
 pkgs/misc/ghostscript/default.nix | 27 +++++++++++++++------------
 pkgs/top-level/all-packages.nix   |  1 -
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 24debae860a..f5d82168773 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -1,6 +1,7 @@
-{ stdenv, fetchurl, libjpeg, libpng, libtiff, zlib, pkgconfig, fontconfig, openssl
-, lcms, freetype, libpaper, jbig2dec, expat, libiconvOrEmpty
-, x11Support, x11 ? null
+{ stdenv, fetchurl, pkgconfig, zlib, expat, openssl
+, libjpeg, libpng, libtiff, freetype, fontconfig, lcms2, libpaper, jbig2dec
+, libiconvOrEmpty
+, x11Support ? false, x11 ? null
 , cupsSupport ? false, cups ? null
 , gnuFork ? true
 }:
@@ -40,10 +41,10 @@ let
   };
 
   mainlineSrc = rec {
-    name = "ghostscript-9.06";
+    name = "ghostscript-9.08";
     src = fetchurl {
       url = "http://downloads.ghostscript.com/public/${name}.tar.bz2";
-      sha256 = "014f10rxn4ihvcr1frby4szd1jvkrwvmdhnbivpp55c9fssx3b05";
+      sha256 = "0k1rvnvmiz456hiixfm130p3irbp1ddd0ycf7rf6bx7nzkp6sxb1";
     };
     meta = meta_common // {
       homepage = "http://www.ghostscript.com/";
@@ -51,7 +52,7 @@ let
     };
 
     preConfigure = ''
-      rm -R libpng jpeg lcms{,2} tiff freetype jbig2dec expat jasper openjpeg
+      rm -R libpng jpeg lcms{,2} tiff freetype jbig2dec expat openjpeg
 
       substituteInPlace base/unix-aux.mak --replace "INCLUDE=/usr/include" "INCLUDE=/no-such-path"
       sed "s@if ( test -f \$(INCLUDE)[^ ]* )@if ( true )@" -i base/unix-aux.mak
@@ -79,9 +80,9 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    libjpeg libpng libtiff zlib pkgconfig fontconfig openssl lcms
-    libpaper jbig2dec expat
-  ] ++ stdenv.lib.optionals x11Support [x11 freetype]
+    pkgconfig zlib expat openssl
+    libjpeg libpng libtiff freetype fontconfig lcms2 libpaper jbig2dec
+  ] ++ stdenv.lib.optional x11Support x11
     ++ stdenv.lib.optional cupsSupport cups
     ++ libiconvOrEmpty
     # [] # maybe sometimes jpeg2000 support
@@ -101,9 +102,11 @@ stdenv.mkDerivation rec {
     makeFlagsArray=(CUPSSERVERBIN=$out/lib/cups CUPSSERVERROOT=$out/etc/cups CUPSDATA=$out/share/cups)
   '' + stdenv.lib.optionalString (variant ? preConfigure) variant.preConfigure;
 
-  configureFlags = [ "--with-system-libtiff" ] ++
-    (if x11Support then [ "--with-x" ] else [ "--without-x" ]) ++
-    (if cupsSupport then [ "--enable-cups" "--with-install-cups" ] else [ "--disable-cups" ]);
+  configureFlags = [
+    "--with-system-libtiff"
+    (if x11Support then "--with-x" else "--without-x")
+    (if cupsSupport then "--enable-cups" else "--disable-cups")
+  ];
 
   doCheck = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e43b4d8904..97ef1d4f71e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9606,7 +9606,6 @@ let
   gensgs = callPackage_i686 ../misc/emulators/gens-gs { };
 
   ghostscript = callPackage ../misc/ghostscript {
-    lcms = lcms2;
     x11Support = false;
     cupsSupport = config.ghostscript.cups or true;
     gnuFork = config.ghostscript.gnu or false;

From 374a27fe8ee5c44935a742853c4d68f6bd2ff6bc Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Wed, 1 May 2013 19:09:34 +0200
Subject: [PATCH 032/452] binutils: Also enable plugins when building with
 gold.

---
 pkgs/development/tools/misc/binutils/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index ca763a5e1fb..6b93240ba05 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
       + stdenv.lib.optionalString (stdenv.system == "mips64el-linux")
         " --enable-fix-loongson2f-nop"
       + stdenv.lib.optionalString (cross != null) " --target=${cross.config}"
-      + stdenv.lib.optionalString gold " --enable-gold"
+      + stdenv.lib.optionalString gold " --enable-gold --enable-plugins"
       + stdenv.lib.optionalString deterministic " --enable-deterministic-archives";
 
   enableParallelBuilding = true;

From 8bc805a21177f40b00ddbff703bee1849f8ed888 Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Thu, 2 May 2013 20:14:24 +0200
Subject: [PATCH 033/452] llvm: Build the LLVMgold.so plugin for ld.gold &c.

Conflicts (simple):
	pkgs/development/compilers/llvm/default.nix
---
 pkgs/development/compilers/llvm/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 3e95a41be6f..abd3277d919 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, perl, groff, cmake, python, libffi }:
+{ stdenv, fetchurl, perl, groff, cmake, python, libffi, binutils_gold }:
 
 let version = "3.3"; in
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "llvm-${version}";
 
   src = fetchurl {
@@ -21,8 +21,11 @@ stdenv.mkDerivation {
   preBuild = let LD = if stdenv.isDarwin then "DYLD" else "LD";
     in "export ${LD}_LIBRARY_PATH='$$${LD}_LIBRARY_PATH:'`pwd`/lib";
 
-  cmakeFlags = with stdenv; [ "-DCMAKE_BUILD_TYPE=Release" "-DLLVM_ENABLE_FFI=ON" ]
-    ++ lib.optional (!isDarwin) [ "-DBUILD_SHARED_LIBS=ON" ];
+  cmakeFlags = with stdenv; [
+    "-DCMAKE_BUILD_TYPE=Release"
+    "-DLLVM_ENABLE_FFI=ON"
+    "-DLLVM_BINUTILS_INCDIR=${binutils_gold}/include"
+  ] ++ lib.optional (!isDarwin) [ "-DBUILD_SHARED_LIBS=ON" ];
 
   enableParallelBuilding = true;
 

From b25bcf853f45c648f9456f62239c96a2865edee0 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 21 Aug 2013 20:38:48 +0300
Subject: [PATCH 034/452] package KDE 4.11

---
 pkgs/desktops/kde-4.11/applications/kate.nix  |  11 +
 .../kde-4.11/applications/konsole.nix         |  11 +
 pkgs/desktops/kde-4.11/default.nix            |  42 ++
 .../files/kde-wallpapers-buildsystem.patch    |  17 +
 .../kde-4.11/files/polkit-install.patch       |  12 +
 pkgs/desktops/kde-4.11/kactivities.nix        |   9 +
 pkgs/desktops/kde-4.11/kde-base-artwork.nix   |  14 +
 .../kde-4.11/kde-baseapps/kde-baseapps.nix    |  11 +
 pkgs/desktops/kde-4.11/kde-package/4.11.0.nix | 444 ++++++++++++++++++
 .../desktops/kde-4.11/kde-package/default.nix | 127 +++++
 .../kde-4.11/kde-package/kde-manifest.sh      | 146 ++++++
 pkgs/desktops/kde-4.11/kde-runtime.nix        |  23 +
 pkgs/desktops/kde-4.11/kde-wallpapers.nix     |  17 +
 pkgs/desktops/kde-4.11/kde-workspace.nix      |  39 ++
 .../kde-4.11/kdeaccessibility/jovie.nix       |   9 +
 .../kde-4.11/kdeaccessibility/kaccessible.nix |   9 +
 .../kde-4.11/kdeaccessibility/kmag.nix        |  10 +
 .../kde-4.11/kdeaccessibility/kmousetool.nix  |   9 +
 .../kde-4.11/kdeaccessibility/kmouth.nix      |   9 +
 pkgs/desktops/kde-4.11/kdeadmin/kcron.nix     |   9 +
 .../desktops/kde-4.11/kdeadmin/ksystemlog.nix |   9 +
 pkgs/desktops/kde-4.11/kdeadmin/kuser.nix     |   9 +
 .../kde-4.11/kdeartwork/ColorSchemes.nix      |  11 +
 .../kdeartwork/FindXscreensaver.cmake         |  73 +++
 .../kdeartwork/HighResolutionWallpapers.nix   |  11 +
 .../kde-4.11/kdeartwork/IconThemes.nix        |  13 +
 .../kde-4.11/kdeartwork/WeatherWallpapers.nix |  11 +
 .../kde-4.11/kdeartwork/desktopthemes.nix     |  11 +
 .../kde-4.11/kdeartwork/emoticons.nix         |  11 +
 .../kde-4.11/kdeartwork/kscreensaver.nix      |  15 +
 .../kde-4.11/kdeartwork/kwin-styles.nix       |   9 +
 pkgs/desktops/kde-4.11/kdeartwork/sounds.nix  |  11 +
 pkgs/desktops/kde-4.11/kdeartwork/styles.nix  |  11 +
 .../kde-4.11/kdeartwork/wallpapers.nix        |  11 +
 pkgs/desktops/kde-4.11/kdebindings/perlqt.nix |  14 +
 pkgs/desktops/kde-4.11/kdebindings/pykde4.nix |  32 ++
 .../kdebindings/qtruby-install-prefix.patch   |  15 +
 pkgs/desktops/kde-4.11/kdebindings/qtruby.nix |  20 +
 .../smokegen-CMakeLists.txt-nix.patch         |  13 +
 .../kde-4.11/kdebindings/smokegen-nix.patch   |  13 +
 .../kde-4.11/kdebindings/smokegen.nix         |  13 +
 .../kde-4.11/kdebindings/smokekde.nix         |  19 +
 .../desktops/kde-4.11/kdebindings/smokeqt.nix |  15 +
 pkgs/desktops/kde-4.11/kdeedu/analitza.nix    |   8 +
 pkgs/desktops/kde-4.11/kdeedu/blinken.nix     |   8 +
 pkgs/desktops/kde-4.11/kdeedu/cantor.nix      |  13 +
 pkgs/desktops/kde-4.11/kdeedu/kalgebra.nix    |   8 +
 pkgs/desktops/kde-4.11/kdeedu/kalzium.nix     |  13 +
 pkgs/desktops/kde-4.11/kdeedu/kanagram.nix    |   8 +
 pkgs/desktops/kde-4.11/kdeedu/kbruch.nix      |   8 +
 pkgs/desktops/kde-4.11/kdeedu/kgeography.nix  |   8 +
 pkgs/desktops/kde-4.11/kdeedu/khangman.nix    |   8 +
 pkgs/desktops/kde-4.11/kdeedu/kig.nix         |  12 +
 pkgs/desktops/kde-4.11/kdeedu/kiten.nix       |   9 +
 pkgs/desktops/kde-4.11/kdeedu/klettres.nix    |   9 +
 pkgs/desktops/kde-4.11/kdeedu/kmplot.nix      |  12 +
 pkgs/desktops/kde-4.11/kdeedu/kstars.nix      |  14 +
 pkgs/desktops/kde-4.11/kdeedu/ktouch.nix      |   9 +
 pkgs/desktops/kde-4.11/kdeedu/kturtle.nix     |   9 +
 pkgs/desktops/kde-4.11/kdeedu/kwordquiz.nix   |   9 +
 pkgs/desktops/kde-4.11/kdeedu/libkdeedu.nix   |   8 +
 pkgs/desktops/kde-4.11/kdeedu/marble.nix      |  12 +
 pkgs/desktops/kde-4.11/kdeedu/pairs.nix       |   9 +
 pkgs/desktops/kde-4.11/kdeedu/parley.nix      |   9 +
 pkgs/desktops/kde-4.11/kdeedu/rocs.nix        |  14 +
 pkgs/desktops/kde-4.11/kdeedu/step.nix        |  15 +
 pkgs/desktops/kde-4.11/kdegames/bomber.nix    |   7 +
 pkgs/desktops/kde-4.11/kdegames/bovo.nix      |   8 +
 pkgs/desktops/kde-4.11/kdegames/granatier.nix |   7 +
 pkgs/desktops/kde-4.11/kdegames/kajongg.nix   |  13 +
 pkgs/desktops/kde-4.11/kdegames/kapman.nix    |   7 +
 pkgs/desktops/kde-4.11/kdegames/katomic.nix   |   7 +
 pkgs/desktops/kde-4.11/kdegames/kblackbox.nix |   7 +
 pkgs/desktops/kde-4.11/kdegames/kblocks.nix   |   7 +
 pkgs/desktops/kde-4.11/kdegames/kbounce.nix   |   7 +
 pkgs/desktops/kde-4.11/kdegames/kbreakout.nix |   7 +
 pkgs/desktops/kde-4.11/kdegames/kdiamond.nix  |   7 +
 .../kde-4.11/kdegames/kfourinline.nix         |   7 +
 .../kde-4.11/kdegames/kgoldrunner.nix         |   7 +
 pkgs/desktops/kde-4.11/kdegames/kigo.nix      |   7 +
 pkgs/desktops/kde-4.11/kdegames/killbots.nix  |   7 +
 pkgs/desktops/kde-4.11/kdegames/kiriki.nix    |   7 +
 .../kde-4.11/kdegames/kjumpingcube.nix        |   7 +
 pkgs/desktops/kde-4.11/kdegames/klickety.nix  |   7 +
 pkgs/desktops/kde-4.11/kdegames/klines.nix    |   7 +
 pkgs/desktops/kde-4.11/kdegames/kmahjongg.nix |   7 +
 pkgs/desktops/kde-4.11/kdegames/kmines.nix    |   7 +
 .../kde-4.11/kdegames/knavalbattle.nix        |   7 +
 pkgs/desktops/kde-4.11/kdegames/knetwalk.nix  |   7 +
 pkgs/desktops/kde-4.11/kdegames/kolf.nix      |   7 +
 pkgs/desktops/kde-4.11/kdegames/kollision.nix |   7 +
 pkgs/desktops/kde-4.11/kdegames/konquest.nix  |   7 +
 pkgs/desktops/kde-4.11/kdegames/kpat.nix      |   7 +
 pkgs/desktops/kde-4.11/kdegames/kreversi.nix  |   7 +
 pkgs/desktops/kde-4.11/kdegames/kshisen.nix   |   7 +
 pkgs/desktops/kde-4.11/kdegames/ksirk.nix     |   7 +
 .../desktops/kde-4.11/kdegames/ksnakeduel.nix |   7 +
 .../desktops/kde-4.11/kdegames/kspaceduel.nix |   7 +
 pkgs/desktops/kde-4.11/kdegames/ksquares.nix  |   7 +
 pkgs/desktops/kde-4.11/kdegames/ksudoku.nix   |   7 +
 .../desktops/kde-4.11/kdegames/ktuberling.nix |   7 +
 pkgs/desktops/kde-4.11/kdegames/kubrick.nix   |   7 +
 .../kde-4.11/kdegames/libkdegames.nix         |   7 +
 .../kde-4.11/kdegames/libkmahjongg.nix        |   7 +
 pkgs/desktops/kde-4.11/kdegames/lskat.nix     |   7 +
 pkgs/desktops/kde-4.11/kdegames/palapeli.nix  |  11 +
 pkgs/desktops/kde-4.11/kdegames/picmi.nix     |   7 +
 .../kde-4.11/kdegraphics/gwenview.nix         |  15 +
 pkgs/desktops/kde-4.11/kdegraphics/kamera.nix |  10 +
 .../kde-4.11/kdegraphics/kcolorchooser.nix    |  10 +
 .../kdegraphics/kdegraphics-mobipocket.nix    |  10 +
 .../kdegraphics-strigi-analyzer.nix           |  10 +
 .../kdegraphics/kdegraphics-thumbnailers.nix  |  13 +
 pkgs/desktops/kde-4.11/kdegraphics/kgamma.nix |  10 +
 .../kde-4.11/kdegraphics/kolourpaint.nix      |  10 +
 pkgs/desktops/kde-4.11/kdegraphics/kruler.nix |  10 +
 .../kde-4.11/kdegraphics/ksaneplugin.nix      |  10 +
 .../kde-4.11/kdegraphics/ksnapshot.nix        |  10 +
 .../kde-4.11/kdegraphics/libkdcraw.nix        |  13 +
 .../kde-4.11/kdegraphics/libkexiv2.nix        |  10 +
 .../desktops/kde-4.11/kdegraphics/libkipi.nix |  10 +
 .../kde-4.11/kdegraphics/libksane.nix         |  10 +
 pkgs/desktops/kde-4.11/kdegraphics/okular.nix |  17 +
 .../desktops/kde-4.11/kdegraphics/svgpart.nix |  10 +
 pkgs/desktops/kde-4.11/kdelibs/kdelibs.nix    |  46 ++
 .../kde-4.11/kdelibs/nepomuk-core.nix         |  20 +
 .../kde-4.11/kdelibs/nepomuk-widgets.nix      |  11 +
 .../kde-4.11/kdemultimedia/audiocd-kio.nix    |   7 +
 .../kde-4.11/kdemultimedia/dragon.nix         |   7 +
 .../kde-4.11/kdemultimedia/ffmpegthumbs.nix   |   7 +
 pkgs/desktops/kde-4.11/kdemultimedia/juk.nix  |  10 +
 pkgs/desktops/kde-4.11/kdemultimedia/kmix.nix |   7 +
 pkgs/desktops/kde-4.11/kdemultimedia/kscd.nix |   7 +
 .../kde-4.11/kdemultimedia/libkcddb.nix       |   8 +
 .../kdemultimedia/libkcompactdisc.nix         |   7 +
 .../kde-4.11/kdemultimedia/mplayerthumbs.nix  |   7 +
 .../kdenetwork/kdenetwork-filesharing.nix     |   9 +
 .../kdenetwork-strigi-analyzers.nix           |   9 +
 pkgs/desktops/kde-4.11/kdenetwork/kdnssd.nix  |   9 +
 pkgs/desktops/kde-4.11/kdenetwork/kget.nix    |  20 +
 pkgs/desktops/kde-4.11/kdenetwork/kopete.nix  |  27 ++
 pkgs/desktops/kde-4.11/kdenetwork/kppp.nix    |   9 +
 pkgs/desktops/kde-4.11/kdenetwork/krdc.nix    |   9 +
 pkgs/desktops/kde-4.11/kdenetwork/krfb.nix    |   9 +
 pkgs/desktops/kde-4.11/kdepim-runtime.nix     |  16 +
 pkgs/desktops/kde-4.11/kdepim.nix             |  28 ++
 pkgs/desktops/kde-4.11/kdepimlibs.nix         |  19 +
 pkgs/desktops/kde-4.11/kdeplasma-addons.nix   |  23 +
 pkgs/desktops/kde-4.11/kdesdk/cervisia.nix    |   9 +
 .../kde-4.11/kdesdk/dolphin-plugins.nix       |  11 +
 .../desktops/kde-4.11/kdesdk/kapptemplate.nix |   9 +
 pkgs/desktops/kde-4.11/kdesdk/kcachegrind.nix |   9 +
 .../kde-4.11/kdesdk/kde-dev-scripts.nix       |   9 +
 .../kde-4.11/kdesdk/kde-dev-utils.nix         |  11 +
 .../kde-4.11/kdesdk/kdesdk-kioslaves.nix      |  12 +
 .../kdesdk/kdesdk-strigi-analyzers.nix        |   9 +
 .../kde-4.11/kdesdk/kdesdk-thumbnailers.nix   |  10 +
 pkgs/desktops/kde-4.11/kdesdk/kompare.nix     |   9 +
 pkgs/desktops/kde-4.11/kdesdk/lokalize.nix    |  13 +
 pkgs/desktops/kde-4.11/kdesdk/okteta.nix      |  13 +
 pkgs/desktops/kde-4.11/kdesdk/poxml.nix       |   9 +
 pkgs/desktops/kde-4.11/kdesdk/umbrello.nix    |   9 +
 pkgs/desktops/kde-4.11/kdetoys/amor.nix       |   9 +
 pkgs/desktops/kde-4.11/kdetoys/kteatime.nix   |   9 +
 pkgs/desktops/kde-4.11/kdetoys/ktux.nix       |   9 +
 pkgs/desktops/kde-4.11/kdeutils/ark.nix       |   9 +
 pkgs/desktops/kde-4.11/kdeutils/filelight.nix |   9 +
 pkgs/desktops/kde-4.11/kdeutils/kcalc.nix     |   9 +
 .../kde-4.11/kdeutils/kcharselect.nix         |   9 +
 pkgs/desktops/kde-4.11/kdeutils/kdf.nix       |   9 +
 pkgs/desktops/kde-4.11/kdeutils/kfloppy.nix   |   9 +
 pkgs/desktops/kde-4.11/kdeutils/kgpg.nix      |  12 +
 .../kde-4.11/kdeutils/kremotecontrol.nix      |   9 +
 pkgs/desktops/kde-4.11/kdeutils/ktimer.nix    |   9 +
 pkgs/desktops/kde-4.11/kdeutils/kwallet.nix   |   9 +
 .../kde-4.11/kdeutils/print-manager.nix       |  27 ++
 .../kde-4.11/kdeutils/superkaramba.nix        |  11 +
 pkgs/desktops/kde-4.11/kdeutils/sweeper.nix   |   9 +
 .../kde-4.11/kdewebdev/kfilereplace.nix       |  10 +
 .../kde-4.11/kdewebdev/kimagemapeditor.nix    |  10 +
 .../kde-4.11/kdewebdev/klinkstatus.nix        |  11 +
 .../desktops/kde-4.11/kdewebdev/kommander.nix |   9 +
 pkgs/desktops/kde-4.11/l10n/default.nix       |  44 ++
 pkgs/desktops/kde-4.11/l10n/l10n-manifest.sh  |  32 ++
 .../kde-4.11/l10n/manifest-4.11.0.nix         | 272 +++++++++++
 pkgs/desktops/kde-4.11/oxygen-icons.nix       |  15 +
 .../kde-4.11/support/akonadi/default.nix      |  24 +
 pkgs/top-level/all-packages.nix               |   9 +
 188 files changed, 3142 insertions(+)
 create mode 100644 pkgs/desktops/kde-4.11/applications/kate.nix
 create mode 100644 pkgs/desktops/kde-4.11/applications/konsole.nix
 create mode 100644 pkgs/desktops/kde-4.11/default.nix
 create mode 100644 pkgs/desktops/kde-4.11/files/kde-wallpapers-buildsystem.patch
 create mode 100644 pkgs/desktops/kde-4.11/files/polkit-install.patch
 create mode 100644 pkgs/desktops/kde-4.11/kactivities.nix
 create mode 100644 pkgs/desktops/kde-4.11/kde-base-artwork.nix
 create mode 100644 pkgs/desktops/kde-4.11/kde-baseapps/kde-baseapps.nix
 create mode 100644 pkgs/desktops/kde-4.11/kde-package/4.11.0.nix
 create mode 100644 pkgs/desktops/kde-4.11/kde-package/default.nix
 create mode 100755 pkgs/desktops/kde-4.11/kde-package/kde-manifest.sh
 create mode 100644 pkgs/desktops/kde-4.11/kde-runtime.nix
 create mode 100644 pkgs/desktops/kde-4.11/kde-wallpapers.nix
 create mode 100644 pkgs/desktops/kde-4.11/kde-workspace.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeaccessibility/jovie.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeaccessibility/kaccessible.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeaccessibility/kmag.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeaccessibility/kmousetool.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeaccessibility/kmouth.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeadmin/kcron.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeadmin/ksystemlog.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeadmin/kuser.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeartwork/ColorSchemes.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeartwork/FindXscreensaver.cmake
 create mode 100644 pkgs/desktops/kde-4.11/kdeartwork/HighResolutionWallpapers.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeartwork/IconThemes.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeartwork/WeatherWallpapers.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeartwork/desktopthemes.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeartwork/emoticons.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeartwork/kscreensaver.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeartwork/kwin-styles.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeartwork/sounds.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeartwork/styles.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeartwork/wallpapers.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdebindings/perlqt.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdebindings/pykde4.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdebindings/qtruby-install-prefix.patch
 create mode 100644 pkgs/desktops/kde-4.11/kdebindings/qtruby.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdebindings/smokegen-CMakeLists.txt-nix.patch
 create mode 100644 pkgs/desktops/kde-4.11/kdebindings/smokegen-nix.patch
 create mode 100644 pkgs/desktops/kde-4.11/kdebindings/smokegen.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdebindings/smokekde.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdebindings/smokeqt.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeedu/analitza.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeedu/blinken.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeedu/cantor.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeedu/kalgebra.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeedu/kalzium.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeedu/kanagram.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeedu/kbruch.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeedu/kgeography.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeedu/khangman.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeedu/kig.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeedu/kiten.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeedu/klettres.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeedu/kmplot.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeedu/kstars.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeedu/ktouch.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeedu/kturtle.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeedu/kwordquiz.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeedu/libkdeedu.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeedu/marble.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeedu/pairs.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeedu/parley.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeedu/rocs.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeedu/step.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/bomber.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/bovo.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/granatier.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/kajongg.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/kapman.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/katomic.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/kblackbox.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/kblocks.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/kbounce.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/kbreakout.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/kdiamond.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/kfourinline.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/kgoldrunner.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/kigo.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/killbots.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/kiriki.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/kjumpingcube.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/klickety.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/klines.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/kmahjongg.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/kmines.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/knavalbattle.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/knetwalk.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/kolf.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/kollision.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/konquest.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/kpat.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/kreversi.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/kshisen.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/ksirk.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/ksnakeduel.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/kspaceduel.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/ksquares.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/ksudoku.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/ktuberling.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/kubrick.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/libkdegames.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/libkmahjongg.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/lskat.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/palapeli.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegames/picmi.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegraphics/gwenview.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegraphics/kamera.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegraphics/kcolorchooser.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegraphics/kdegraphics-mobipocket.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegraphics/kdegraphics-strigi-analyzer.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegraphics/kdegraphics-thumbnailers.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegraphics/kgamma.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegraphics/kolourpaint.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegraphics/kruler.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegraphics/ksaneplugin.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegraphics/ksnapshot.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegraphics/libkdcraw.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegraphics/libkexiv2.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegraphics/libkipi.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegraphics/libksane.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegraphics/okular.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdegraphics/svgpart.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdelibs/kdelibs.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdelibs/nepomuk-core.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdelibs/nepomuk-widgets.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdemultimedia/audiocd-kio.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdemultimedia/dragon.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdemultimedia/ffmpegthumbs.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdemultimedia/juk.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdemultimedia/kmix.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdemultimedia/kscd.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdemultimedia/libkcddb.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdemultimedia/libkcompactdisc.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdemultimedia/mplayerthumbs.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdenetwork/kdenetwork-filesharing.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdenetwork/kdenetwork-strigi-analyzers.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdenetwork/kdnssd.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdenetwork/kget.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdenetwork/kopete.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdenetwork/kppp.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdenetwork/krdc.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdenetwork/krfb.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdepim-runtime.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdepim.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdepimlibs.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeplasma-addons.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdesdk/cervisia.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdesdk/dolphin-plugins.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdesdk/kapptemplate.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdesdk/kcachegrind.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdesdk/kde-dev-scripts.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdesdk/kde-dev-utils.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdesdk/kdesdk-kioslaves.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdesdk/kdesdk-strigi-analyzers.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdesdk/kdesdk-thumbnailers.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdesdk/kompare.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdesdk/lokalize.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdesdk/okteta.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdesdk/poxml.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdesdk/umbrello.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdetoys/amor.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdetoys/kteatime.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdetoys/ktux.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeutils/ark.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeutils/filelight.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeutils/kcalc.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeutils/kcharselect.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeutils/kdf.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeutils/kfloppy.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeutils/kgpg.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeutils/kremotecontrol.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeutils/ktimer.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeutils/kwallet.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeutils/print-manager.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeutils/superkaramba.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdeutils/sweeper.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdewebdev/kfilereplace.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdewebdev/kimagemapeditor.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdewebdev/klinkstatus.nix
 create mode 100644 pkgs/desktops/kde-4.11/kdewebdev/kommander.nix
 create mode 100644 pkgs/desktops/kde-4.11/l10n/default.nix
 create mode 100755 pkgs/desktops/kde-4.11/l10n/l10n-manifest.sh
 create mode 100644 pkgs/desktops/kde-4.11/l10n/manifest-4.11.0.nix
 create mode 100644 pkgs/desktops/kde-4.11/oxygen-icons.nix
 create mode 100644 pkgs/desktops/kde-4.11/support/akonadi/default.nix

diff --git a/pkgs/desktops/kde-4.11/applications/kate.nix b/pkgs/desktops/kde-4.11/applications/kate.nix
new file mode 100644
index 00000000000..e8efc87775a
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/applications/kate.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs, kactivities, qjson, pyqt4, sip, python, pykde4 }:
+
+kde {
+
+  buildInputs = [ kdelibs kactivities qjson pyqt4 sip python pykde4];
+
+  meta = {
+    description = "Kate, the KDE Advanced Text Editor, as well as KWrite";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/applications/konsole.nix b/pkgs/desktops/kde-4.11/applications/konsole.nix
new file mode 100644
index 00000000000..0db47fb2d7c
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/applications/konsole.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs, kde_baseapps }:
+
+kde {
+
+  buildInputs = [ kdelibs kde_baseapps ];
+
+  meta = {
+    description = "Konsole, the KDE terminal emulator";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/default.nix b/pkgs/desktops/kde-4.11/default.nix
new file mode 100644
index 00000000000..b1cd9e919fb
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/default.nix
@@ -0,0 +1,42 @@
+{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.11.0" }:
+
+let
+  # Need callPackageOrig to avoid infinite cycle
+  kde = callPackageOrig ./kde-package {
+    inherit release ignoreList extraSubpkgs callPackage;
+  };
+
+  # The list of igored individual modules
+  ignoreList = {
+    # Doesn't work yet
+    kdeutils = [ "ksecrets" ];
+    # kdeadmin/strigi-analyzer has no real code
+    kdeadmin = [ "strigi-analyzer" ];
+    # Most of kdebindings do not compile due to a bug in the buildsystem
+    kdebindings = [ "kimono" "korundum" "kross-interpreters" "perlkde" "qyoto" ];
+  };
+
+  # Extra subpackages in the manifest format
+  extraSubpkgs = {};
+
+in
+
+kde.modules // kde.individual //
+{
+  inherit (kde) manifest modules individual splittedModuleList;
+
+  akonadi = callPackage ./support/akonadi { };
+
+  qt4 = qt48;
+
+  kdebase_workspace = kde.modules.kde_workspace;
+
+  inherit release;
+
+  full = stdenv.lib.attrValues kde.modules;
+
+  l10n = callPackage ./l10n {
+    inherit release;
+    inherit (kde.manifest) stable;
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/files/kde-wallpapers-buildsystem.patch b/pkgs/desktops/kde-4.11/files/kde-wallpapers-buildsystem.patch
new file mode 100644
index 00000000000..378cdb64694
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/files/kde-wallpapers-buildsystem.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3d3e247..f78db67 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,5 +1,10 @@
+-find_package(KDE4 REQUIRED)
+-include(KDE4Defaults)
++project(kde-wallpapers NONE)
++if( WALLPAPER_INSTALL_DIR )
++  message(STATUS "Installing wallpapers to user-supplied directory ${WALLPAPER_INSTALL_DIR}")
++else()
++  find_package(KDE4 REQUIRED)
++  include(KDE4Defaults)
++endif()
+ 
+ install(DIRECTORY Air DESTINATION ${WALLPAPER_INSTALL_DIR} PATTERN .svn EXCLUDE)
+ 
diff --git a/pkgs/desktops/kde-4.11/files/polkit-install.patch b/pkgs/desktops/kde-4.11/files/polkit-install.patch
new file mode 100644
index 00000000000..d2ecac663ec
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/files/polkit-install.patch
@@ -0,0 +1,12 @@
+diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake
+--- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake	2011-05-20 22:24:54.000000000 +0200
++++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake	2011-07-12 14:03:00.000000000 +0200
+@@ -139,7 +139,7 @@
+         ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR
+         ${POLKITQT-1_POLICY_FILES_INSTALL_DIR})
+ 
+-    set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING 
++    set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING 
+         "Where policy files generated by KAuth will be installed" FORCE)
+ elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE")
+     set (KAUTH_COMPILING_FAKE_BACKEND TRUE)
diff --git a/pkgs/desktops/kde-4.11/kactivities.nix b/pkgs/desktops/kde-4.11/kactivities.nix
new file mode 100644
index 00000000000..06381bb13d7
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kactivities.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, nepomuk_core }:
+
+kde {
+  propagatedBuildInputs = [ kdelibs nepomuk_core ];
+
+  meta = {
+    description = "KDE activities library and daemon";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kde-base-artwork.nix b/pkgs/desktops/kde-4.11/kde-base-artwork.nix
new file mode 100644
index 00000000000..3f416cebddc
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kde-base-artwork.nix
@@ -0,0 +1,14 @@
+{ kde, kdelibs }:
+
+kde {
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "0mrd3w7rhsj0v92c8rh9zjxyifq7wyvwszksf2gyn53dzd06blk8";
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE Base artwork";
+    license = "GPL";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kde-baseapps/kde-baseapps.nix b/pkgs/desktops/kde-4.11/kde-baseapps/kde-baseapps.nix
new file mode 100644
index 00000000000..c2a25664678
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kde-baseapps/kde-baseapps.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs, htmlTidy, kactivities
+, nepomuk_core, nepomuk_widgets, libXt }:
+
+kde {
+  buildInputs = [ kdelibs nepomuk_core nepomuk_widgets htmlTidy kactivities libXt ];
+
+  meta = {
+    description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kde-package/4.11.0.nix b/pkgs/desktops/kde-4.11/kde-package/4.11.0.nix
new file mode 100644
index 00000000000..08de0fe4b0e
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kde-package/4.11.0.nix
@@ -0,0 +1,444 @@
+{stable=true;
+hashes=builtins.listToAttrs[
+  {name="amor";value="0xz73rnznng6nd8ax2s8yh5wmvlwlhy7qm2y0m15fxw8x9dyym2s";}
+  {name="analitza";value="1pvi6nsdh64pjmrq0xm6vjl2rdpllm8vizf5pxm64m3s225x11r8";}
+  {name="ark";value="152cilip6g0jvqvczv29kdnlghyra0qs9166g4py82w94f96h4a0";}
+  {name="audiocd-kio";value="1xly06zy2m7xg8b675y2l3xj2mixy739f65b6mciyz0240qlian5";}
+  {name="blinken";value="0kyrblhn4b46fcf2rkidkkvpvnirz1z866yp7mi3m9dnl9iqzk32";}
+  {name="bomber";value="1s9wkdz7mgmsr438ikjxc3qj810aw39kblwc2a0v21skhv9glx40";}
+  {name="bovo";value="1p4v5nvx6nfprpv5wm9ab25d0wklx0znf6257ssy97p9knj7lzf4";}
+  {name="cantor";value="00j2fwl2y93k3mwqmnl9ndcqdfmxl2r5nff920sjmylhplsrvzri";}
+  {name="cervisia";value="1gg53a5lcp2mlii285ys6d570wzjx7v5h3g0r1l3h146ipnddkpm";}
+  {name="dolphin-plugins";value="1cj0vajrpmi1imz3gg6has8bqm2hj2px0k2fda35lc0wb2h6vwip";}
+  {name="dragon";value="1gclq1v9a84aq9jbakc0fs0c4y7ykzf05vl0gkpjkijnnb5sr028";}
+  {name="ffmpegthumbs";value="04zarg373420mzdc4psziw173flpv1jc80xavq5qff4j8njjynw4";}
+  {name="filelight";value="1q7lsiq2xxvfs30i0l0ywvpzch0kd8blbg10r56p15wyyjc84h1d";}
+  {name="granatier";value="14zlk4y30kgbx69hb516dcva78xqk7yhi90f7yg327r5a72njwvv";}
+  {name="gwenview";value="0686bybi10vyz6yb2h5zi906d295rcd7wlgh87zjiw0p2rz5qd6b";}
+  {name="jovie";value="02b2jl3ip7y0sd4xscw8qmkmm646ksmlm0c3xwwcijwvdj1h3xsw";}
+  {name="juk";value="1wm0ngpsc62766l127nk38cg5vdhlqsh3gsl7alk2rcrgfainkhh";}
+  {name="kaccessible";value="0mixfx8f8097p2y7zqacawb64r8jzj6iqrkhh7xp9ldwrrnf8jr0";}
+  {name="kactivities";value="0s5l0h2axq43ip8a4wn9lqb7i6hvxzzpscr1wv9qm02g98h1kzc5";}
+  {name="kajongg";value="0g7cx3qjrhga37wp9wypwwhzsk4q4fy63qqbpzh7znc4kfiw3j56";}
+  {name="kalgebra";value="01vgg54sr7g3h7lk9cd3m739y317x680brnp858chqvi7jq9nw5i";}
+  {name="kalzium";value="1zbrq2jm7j9sjzxfl93kambv1n665ah57ljr16r5dqk0x3xchirn";}
+  {name="kamera";value="1bhmxij7fnzc26hv4fbglqm3fhi5jdd8bqxnyx91sjja34wr55l4";}
+  {name="kanagram";value="1hdv0ydklz8y8wh49drpmgc9hqkwp59zvwn39h67fsiig44k6jag";}
+  {name="kapman";value="024q8w4x1hy518qcl76nxgr6q8h3blkw9qfg9z6d899qa6zb6ihq";}
+  {name="kapptemplate";value="09xgy5wrqhxlgvk6yhdfvickqx4v4rqd0s9zda7mlj13yfphbq8k";}
+  {name="kate";value="1r8i3hiqfxs2idjkszkzzn5lpkpm5bzjprs9dv33gzfnnq7w6q54";}
+  {name="katomic";value="0g197ynk6pzwxhr3yw20jw16qd9664j35vsr7511jxyydadbnrx6";}
+  {name="kblackbox";value="1pv9f3vh7l25xlvxpvznjiw3va2ljcz2znc1qxy6ib907qfgnryv";}
+  {name="kblocks";value="0rahh2hra6k0f0z9sh906avznv6x451da6w62bn561hl1fsd3qmy";}
+  {name="kbounce";value="1h25lyga30fxrhrlagw51la3vl38h5qil6zrwr5j3n8agard6nxf";}
+  {name="kbreakout";value="09mq49ia5synl9k166k2zw7n4awv2jkv0c0cckfc1byfvyfp6hnq";}
+  {name="kbruch";value="1fmc1mi94c8dz20qlj8gva64qk8kwdy22frlx8mv049lpaslhnh9";}
+  {name="kcachegrind";value="0iqa5vd03b3ysms692yqk4wy0igmrzjg1jfyw5sapdch1fv4v5bq";}
+  {name="kcalc";value="0yy41pjy0ai47yl2q8ii74b1qqcrg79xan8m1pxlx1pn0pdqib5h";}
+  {name="kcharselect";value="0sbz5c3jkmh6vpb2zh1jmy1l5f37nwxvhn3a1gbzv20wf2a3mh4x";}
+  {name="kcolorchooser";value="11kjklvvxfg2drwc0gh3z14gh94d6yimswh4g0nrpb7ppny8h0hh";}
+  {name="kcron";value="0ydm9b9x38j4n2v6j144v1jkh91nblbfln0yyfshiig44lxfcg4y";}
+  {name="kdeartwork";value="17s40canzk0z6v4hr683l1xzmpld53lma6m2z7kb537ms4sjrim9";}
+  {name="kde-baseapps";value="06mavmk0v54lwma083w7wyr2374vdwblcbisqb6kr4fsqdng67yk";}
+  {name="kde-base-artwork";value="020j4hi6qmwkjipgf9840m1828bjlcy9vg3nmhrjxvj6wxbaijib";}
+  {name="kde-dev-scripts";value="1hscdf1qdg8kc8x2hp0mibp0k3lq255h8a1kj03b8bk0agrzycjr";}
+  {name="kde-dev-utils";value="05nlisn69r6p58340gaaa8ma1ndpafv69yrynln4nzsw5va6awiv";}
+  {name="kdegraphics-mobipocket";value="1f1x07yy0awz7bas0c189xqn1zrv4sz9fb2vlix1g9qbz4j7440v";}
+  {name="kdegraphics-strigi-analyzer";value="0sq5lmnlgz52znz5jlsd2dixfmiqb6cmwrf6x9pw1px5i76gc63m";}
+  {name="kdegraphics-thumbnailers";value="09bmhxxr53p4szqln8s5pz4yfacyn8drq4p7ffsmp7crhjfjxad3";}
+  {name="kdelibs";value="0q7gzfzkdy8vi56v7xkq79ib3d3x22mi9prc5lkqzq3w9f08xnim";}
+  {name="kdenetwork-filesharing";value="11sc6jxnjl3i5wncc6jpif9d8c6dha3r96qjm5l2afg3g945kjq0";}
+  {name="kdenetwork-strigi-analyzers";value="125vk7y2yjni5bwgld47fg9ms0fksd2mwgpzlmbalcz5a05pwxqr";}
+  {name="kdepim";value="017005mndsg69pfvwn24mdbw0cjny7i3hhvc9102hwv7vn3b38c9";}
+  {name="kdepimlibs";value="0q5g626n6117ri11inyr29lnzirpm8ls68h72m8gy7jbbhpsy2h9";}
+  {name="kdepim-runtime";value="17yjsyyn7hp24r1nx4aggcfjkpw8nyb7lzpp21nf61fb26gdk0m9";}
+  {name="kdeplasma-addons";value="174770q0jgx7h61z48322aqvzprnfyfb1yipv2v725r79wpl8knc";}
+  {name="kde-runtime";value="0yafj2mxqp26zsg3kh1s0vw77wx0l9468jh1g0wkl1hbwxjlszp7";}
+  {name="kdesdk-kioslaves";value="00prg3pblgil86way9air9sl01gfrag8ika96nv8i5qhv0fs5x3n";}
+  {name="kdesdk-strigi-analyzers";value="08rpclbv0csrciqh688akfzh36wy2nc60gsbqfrwrmz82cn0rgyp";}
+  {name="kdesdk-thumbnailers";value="1zx6g94vixk7id1zb7a4f6x4ymkfm4n6g6j2akklzwnba1nqadjx";}
+  {name="kde-wallpapers";value="0km2zpgy4qpqlvnbnbfnklal900idf85xls9h3dn57qckrvscs7n";}
+  {name="kdewebdev";value="1pzph18gw47gy7yfmzcmz7hx35wgsdgc7z7h50p15irrfqd9vxvz";}
+  {name="kde-workspace";value="0wdnnwvzd8djysims0sflban0vvf4rjl5xy9cfxl5c61kgf31zvy";}
+  {name="kdf";value="0znmsv5cpxciqx1pksicpchfqk25damz4zrhsh8fl1y41wr5i0g7";}
+  {name="kdiamond";value="13pz413fvwz74jhvyfvn3l18p5asin2l8r39mqvrp5izz876lrxs";}
+  {name="kdnssd";value="1my59awfn0h67aza1wym7cdlbffm22hf1dma80k4kqwrcws433q7";}
+  {name="kfloppy";value="0aglds7n33pk19qmq26xdr2bmfn3hv80zd479a3czlh0yn0wl0lb";}
+  {name="kfourinline";value="0mbggqssizcsrddi2nb93hwyf9wa6lnqmyswia5bp6803diw0iyr";}
+  {name="kgamma";value="0fwgk3jq5x5fp36jp1yvid69pzqdaac7p8xyd7qwa0m2zz2mbddy";}
+  {name="kgeography";value="0hya5wqigyahl24cmm1ssi5xc6pv8d6hvrd5z4s185pd5i2syfyf";}
+  {name="kget";value="0pnnfizq6xmv3bmpdvqf12pnr1rlbzpdn05c71cl0200frd0samd";}
+  {name="kgoldrunner";value="1s2847rhl1r35a3sjh10yadg7qjs4qycv2j2yc4k6yvh226wixzn";}
+  {name="kgpg";value="1hsa5z4igqn5fd9rnjmm80k6mylf3zyg6ss0m66j96f1r1hc7y9g";}
+  {name="khangman";value="0myjlfm1bws6g8a6r27n4cfdiz6vsii7wk03dhc25a63mbw30lq2";}
+  {name="kig";value="1w0i2q6vvy310ffsc87dahbxx2pv0alsv36wcz5j41a0c0q1lnnq";}
+  {name="kigo";value="026dwwakci2xsxzr05k9wdfn8k22sd0f2qd2hjpjf3nd3306q2m7";}
+  {name="killbots";value="1acn16i1k9il6qflw5kbmwgrdhgf59ziqv0dsdj541wp06v9syzf";}
+  {name="kimono";value="0vws62kw7n6xy4sgyn2w1a1ysfb7g3l730rfvcgdcch1v5k5w6sx";}
+  {name="kiriki";value="0jz9rsmvyb3yqnxpb0fr8nxqcbb55ah4gg75mphxvagfak6180x8";}
+  {name="kiten";value="1vvpd63783lzwb1ixchxzcnv4dwhdfdqvgf6ambxiabdhwzzhrfp";}
+  {name="kjumpingcube";value="0czsirg9r8kngy8y21ds491mdqcysn7c5yravrbvv399j71fgcl7";}
+  {name="klettres";value="0b7zd1f9a3b2d3r4wx03b3gclbnxyxl8sdq4mkrmvxlbv6is4w41";}
+  {name="klickety";value="00yzd79lm7rlfc96cg0asvj3zy1bwb4d0qx2sarf0ny1sbs05d52";}
+  {name="klines";value="1qvjhb88vzymy8c75azhchqxp21iwvbhxiq0mzzb4wg513qz9b1w";}
+  {name="kmag";value="0p7k9w93zyl6ffjwydjfm9pps4irrgdcjf9ksbzm5r41ayj1x3nh";}
+  {name="kmahjongg";value="0wz4lvy4gzix5c5viwcfxqvv43n65151wfz9jay09227f5qfqz1w";}
+  {name="kmines";value="0gsyhmzcj3579bscdlzyp3y1lsxgk7fz6s8gzs36pb1d7cll30i1";}
+  {name="kmix";value="1h5z508yy0y39p5dhmz4lvq2fsl1y9hiqgm0m3xk6js1ysz5cp0w";}
+  {name="kmousetool";value="1p57b4s87hw5rhj3d1m9qaw8r0wx4x7brc9ksizxyjfm90q8hj00";}
+  {name="kmouth";value="1bmmv8w6w9z9dnmm8bwai8wvj1cz3nbibd9qilv0wzy8f9x8z2n2";}
+  {name="kmplot";value="037n51fvpj8r4fz98f1f1jm9pzmlpbcn428cq8kn2p6ahy9g0zhn";}
+  {name="knavalbattle";value="1i128qa95zi0fz6bkkkc0qic630c4n6r24bnc73wp38kkklj1mfm";}
+  {name="knetwalk";value="1yfflp2yndjv0fawahiqq33x9ivv0r5dxivhy38p1xx3bw7aa3qg";}
+  {name="kolf";value="0cfi9mfj1ng7p6vqckjpx4hvzs4cqkiy0wk0c32gyzm3w76ggdsk";}
+  {name="kollision";value="17hzzp4pwl46skf7n2aapxc1wbihxvb8p6z5ch7315d967fbw1iy";}
+  {name="kolourpaint";value="1mvqicbjmbyx7wmw8l8gsfci2x0mg7c7csfbib09p6l5ypr0w5an";}
+  {name="kompare";value="1s5yb2jk6dgsaciwklil43vc3zpr70sarakray0jz22w8sbp00l4";}
+  {name="konquest";value="0v9icbn3pam8w6akz8sk4qpmq8447l9d692877yz9a0wbd4kc3yk";}
+  {name="konsole";value="07pikjzjn824xvjjszvczwwg2alj8qqr7ajy0c7wa9w711hqj654";}
+  {name="kopete";value="114g0pl67vdacxfcnpnhzmy9aarmjm1j6iy6jxc1v3ahrmv7iy1q";}
+  {name="korundum";value="07s4y585a2x6wg9m8hfwhxixbp03aa8z4f7cyk7i7fgvhy32s4wh";}
+  {name="kpat";value="1dqbhn3lypjfnhn4i6212g3spdihp0j12vgkxwf0pii79dwk1lih";}
+  {name="kppp";value="1qk2hvpi72w10gyipw3dcsmkqlg5shvr943rxhkjpx7vp327gcii";}
+  {name="krdc";value="0ikb0bmcq8zpmhr2jbyg40ihjzvi1zfkhcf6y76yjsifzx5nkxaj";}
+  {name="kremotecontrol";value="03mwsl79ljd6zni1ijxbrhl4pm7l52dxdjr5456avx6pbp7rq8j7";}
+  {name="kreversi";value="0r66kj0lanj54ajk1fdn6kijsq412gknva3i29wsvy0hlg18lwgf";}
+  {name="krfb";value="096a61zv76nyqkh9cdzjbgy62g3vi9a7xiwkx0mw63jpfag5sqws";}
+  {name="kross-interpreters";value="0x12cl1hnj9rfasivs3j1m15lr5pmh65bm2dghcypzffs1h4m17h";}
+  {name="kruler";value="0cv3qrs20qckx3d4y0a5ciy6n3hnlxhi20ln9m6szk5nrqwwf8hv";}
+  {name="ksaneplugin";value="02kdbnalq6jfkvcj0dmiyp6hijm8jjl1wl4fxd0kky0wdpj25mqw";}
+  {name="kscd";value="1dmmjzphxy00yynvmb238s60c0xjb9arcyjnynm1pyz8gwbjv370";}
+  {name="kshisen";value="1rildx85ajl14j7qhkwfv3ddyai2m3d2mf6d4i6hd4f6hi01y6lc";}
+  {name="ksirk";value="1rzihjagj78lxyprhzrixk129wgn6v9zacbh5ash6mfgmvpp28fq";}
+  {name="ksnakeduel";value="0fi32y79gjnajswwb5ldkyk0aap1cbdb7i6wdaskpwjh7m9xgbqj";}
+  {name="ksnapshot";value="162rbwlg16b0lq436rsmdaljrp4na0c7hsviw8mv989ylm7k78g5";}
+  {name="kspaceduel";value="1k228vhlv1fglp4572w7li3dvz1inn9x08rqfm167qisz7lz9gk0";}
+  {name="ksquares";value="0i0gw2dq657p3nnlp7billnwlz0jynb01bd3alis9b0y7fzr8141";}
+  {name="kstars";value="1hlv4x43asrz0kha7sypw073zpnb0z1mmwxqsjm7rdb3fzr664ca";}
+  {name="ksudoku";value="1ym6q32jlh55q4af622mq2x4q7ir61h54y03i1cwwl0n536jarw3";}
+  {name="ksystemlog";value="1lipz5ijw90zifvcj8j5cbm5myn3j31v0faik352dy552zbc69ld";}
+  {name="kteatime";value="0nkfshr4gh71yvb4fn3zv99mj8ywq98fmzl41pc8g7zb78c56min";}
+  {name="ktimer";value="0bfyhxcnz4cll3al5sqjiilhhy0wckvnsxl1j9v9cl6fj0yclccx";}
+  {name="ktouch";value="0j2qxh2r1pasa86zakil9hbw0vb39qgwcmkjkds4mgd1rdx3z063";}
+  {name="ktuberling";value="0imb0djrsi3b8aasyycalv7b6r42879053h9r89bq0vr7frshza5";}
+  {name="kturtle";value="04739cjbc8hnhjmccamiim3nhm09jpd5398ckwbqa7z1jrnrfglx";}
+  {name="ktux";value="1dkcca00s2cxr9kimqm8vlar0d47184ba0miihipgi7p752sik5a";}
+  {name="kubrick";value="1f1sfr1w66b3i4pi7b8y3wbks5l2dxij4azx8dzracanfraymhs6";}
+  {name="kuser";value="1r1ysz52w7v8nhl4qj9b4aybb7q45qav9yyzdqxjlz3ixvvvyndy";}
+  {name="kwallet";value="0a5009qx820nfbdhcmwvzbda3bvdmjzbi9i5d05rkcbmxz7l3i7v";}
+  {name="kwordquiz";value="11rhwmzn93gilwlgjmh64pbmmkxf4nxjn3sg8plxnvfnjl27dlwr";}
+  {name="libkcddb";value="0jkblif31r3raykhl69c9mjircsdwrbmzdjks7ngwacyfng2ys7l";}
+  {name="libkcompactdisc";value="1c6g1q543siyk8m81bvxca4qv6pnfjxcmv5mgpnqsv5lbi0k0dil";}
+  {name="libkdcraw";value="1bi0ayf6sg93hx30k5yvblv3jfs8ba6sva7fig1xwag2a1dmpbms";}
+  {name="libkdeedu";value="080mmb6spbr9gyz16n92jai8hv13kxjqgnid8qmgzvrkl9dr5zpi";}
+  {name="libkdegames";value="07324rsyqszsjgpybpr7kpvfpkmg61c4yaaajfr0sbj5a0flypn9";}
+  {name="libkexiv2";value="0rpqj634vxffz1498m2vbjhndc3xha06b4w79wv9qlqgcsaglr9c";}
+  {name="libkipi";value="0har58a6ir3cywsl289avblpqlc67ghv6bhli79nhplblycaf56k";}
+  {name="libkmahjongg";value="1xz4x96l0cim2mcjk9ndikzb0p53i6nximmiwji5ysk9k9ijz8l2";}
+  {name="libksane";value="1wydrqjfczb6c37vpzzavqk4n4fxlg7xfxm3qmg90973z9mhndql";}
+  {name="lokalize";value="0ikcq18jsnk9iqf1636c1llbs43dcbv6pnanydsd8m7pp2x8wd77";}
+  {name="lskat";value="0ld93jvy7w6zy3jifwhb2cvm4qrylknbkgknhxcycq7vxxi1nd1r";}
+  {name="marble";value="0l32r5hbqzyvx85xzvphkyv8fz0ar9l6yyql01y54p9q7g2i0wvy";}
+  {name="mplayerthumbs";value="022n2mi1mkc6isc06b1w7q10k4qxgmvjdg9inysqnyw25zgzqbk0";}
+  {name="nepomuk-core";value="1a08gv05lql1jkkng655k8n4y9bxivaq3j6i9np901calr6q7vq6";}
+  {name="nepomuk-widgets";value="12pfyi4y64p0xs62ax18mbkwf9gd4gn0zsih338ryf2zdpw806c9";}
+  {name="okteta";value="0pg9i7ywcp377brrprl93ayxjjizdmyzgw6fx3zmry7amf45dw1z";}
+  {name="okular";value="1kgkvzfwcqc9v18qgm9vm36v9svasdwyqgbn70nxmwr7rmkvzpsy";}
+  {name="oxygen-icons";value="1m0mha40zg03jy2nvw1cnsi9li8kb84hq3mdr2839jd0qwf06rcs";}
+  {name="pairs";value="0scqagvvp0aaa5gknl5rlfv49r289mgrf5ll0sqbb7w2ga1z71kf";}
+  {name="palapeli";value="1qw6cn7qa5p918x5hhl45c17firyrj3llghd808k9jn0azffkn2k";}
+  {name="parley";value="191ql9jc7pib36ndrn3dyz7h0zqa1a5z06vcppcy56adw395khga";}
+  {name="perlkde";value="0x9pf8hjlnii6kh6jrli8p1glqmnly8ck5f0a9jllx5ylc2v7xgy";}
+  {name="perlqt";value="01wwnpkr0rafmp4lqggpnnzan4abgcbdkf49dzvzf202ksyc7i4s";}
+  {name="picmi";value="1x0gx8spda3m4d8gp3dw4wrjq9plya17x945dd3xww5jb537k9jg";}
+  {name="poxml";value="1icgyilfyv3kfgqnx81c0xfdjklx8rr8xhllqlgh5gpr109ib0v3";}
+  {name="print-manager";value="1bxkf7lfg2bvqy655zd22p1zsj68zyw95kl1xgk2fsbv4p4d4s46";}
+  {name="pykde4";value="0x2zx012n3ng7cnbwv6mjjy7d5cpxj0xicnnp5xpd7cqmi2v4k8x";}
+  {name="qtruby";value="0vbhfynyc0bffr76iz2jfxn15l1nv95g8y7lr9iy32ha84bmc5g3";}
+  {name="qyoto";value="0r8q9hwinac1bk0mvym60s9fwx7ahdsc80mk2a7i9bns5fpd30x8";}
+  {name="rocs";value="16kk54yqpx94cvhkmxvclzkz5w3lfrvcy3mvhyqb0czsknv7hmgm";}
+  {name="smokegen";value="0v1adb6qfmdpvw4yimq8dlxw8zsdbjdw0viwvlxbmvaf4an5kd3y";}
+  {name="smokekde";value="00rw321lcm0by0p8ij60kylg56nrpi0y3j0xj2ss10k9cr13cgwd";}
+  {name="smokeqt";value="116avrlmy7k3ihc176rjl81jlzcp9jlpym1j2cziyxpzygki77ip";}
+  {name="step";value="16vzcw16hqifhmscvhdrww0ykcim8bw271xbqb2g75rf2dcl1zvf";}
+  {name="superkaramba";value="1fx5qwmd6md2x8zxn8xqnildrcxpwlrxbqmi2ia4qm7ivngpdsy4";}
+  {name="svgpart";value="0az94772zvzsikm3imdaq7a22c1gfpn0yv2alc5nk85sa7yl3jzc";}
+  {name="sweeper";value="18nwfrjpdczrmm5ckr64vgznz0nfj53lbwafwyzabp1d2wbvp1r8";}
+  {name="umbrello";value="09pg5xng1mgfvna5kdl4wbfc38b4wrswfl48kdmskjk640p854z7";}
+];
+modules=[
+{
+  module="kdemultimedia";
+  split=true;
+  pkgs=[
+    { name="audiocd-kio"; sane="audiocd_kio"; }
+    { name="dragon";  }
+    { name="ffmpegthumbs";  }
+    { name="juk";  }
+    { name="kmix";  }
+    { name="kscd";  }
+    { name="libkcddb";  }
+    { name="libkcompactdisc";  }
+    { name="mplayerthumbs";  }
+  ];
+}
+{
+  module="kdegraphics";
+  split=true;
+  pkgs=[
+    { name="gwenview";  }
+    { name="kamera";  }
+    { name="kcolorchooser";  }
+    { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; }
+    { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
+    { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
+    { name="kgamma";  }
+    { name="kolourpaint";  }
+    { name="kruler";  }
+    { name="ksaneplugin";  }
+    { name="ksnapshot";  }
+    { name="libkdcraw";  }
+    { name="libkexiv2";  }
+    { name="libkipi";  }
+    { name="libksane";  }
+    { name="okular";  }
+    { name="svgpart";  }
+  ];
+}
+{
+  module="kdelibs";
+  split=true;
+  pkgs=[
+    { name="kdelibs";  }
+    { name="nepomuk-core"; sane="nepomuk_core"; }
+    { name="nepomuk-widgets"; sane="nepomuk_widgets"; }
+  ];
+}
+{
+  module="kdenetwork";
+  split=true;
+  pkgs=[
+    { name="kdenetwork-filesharing"; sane="kdenetwork_filesharing"; }
+    { name="kdenetwork-strigi-analyzers"; sane="kdenetwork_strigi_analyzers"; }
+    { name="kdnssd";  }
+    { name="kget";  }
+    { name="kopete";  }
+    { name="kppp";  }
+    { name="krdc";  }
+    { name="krfb";  }
+  ];
+}
+{
+  module="kdeutils";
+  split=true;
+  pkgs=[
+    { name="ark";  }
+    { name="filelight";  }
+    { name="kcalc";  }
+    { name="kcharselect";  }
+    { name="kdf";  }
+    { name="kfloppy";  }
+    { name="kgpg";  }
+    { name="kremotecontrol";  }
+    { name="ktimer";  }
+    { name="kwallet";  }
+    { name="print-manager"; sane="print_manager"; }
+    { name="superkaramba";  }
+    { name="sweeper";  }
+  ];
+}
+{
+  module="applications";
+  split=true;
+  pkgs=[
+    { name="kate";  }
+    { name="konsole";  }
+  ];
+}
+{
+  module="kdetoys";
+  split=true;
+  pkgs=[
+    { name="amor";  }
+    { name="kteatime";  }
+    { name="ktux";  }
+  ];
+}
+{
+  module="kdesdk";
+  split=true;
+  pkgs=[
+    { name="cervisia";  }
+    { name="dolphin-plugins"; sane="dolphin_plugins"; }
+    { name="kapptemplate";  }
+    { name="kcachegrind";  }
+    { name="kde-dev-scripts"; sane="kde_dev_scripts"; }
+    { name="kde-dev-utils"; sane="kde_dev_utils"; }
+    { name="kdesdk-kioslaves"; sane="kdesdk_kioslaves"; }
+    { name="kdesdk-strigi-analyzers"; sane="kdesdk_strigi_analyzers"; }
+    { name="kdesdk-thumbnailers"; sane="kdesdk_thumbnailers"; }
+    { name="kompare";  }
+    { name="lokalize";  }
+    { name="okteta";  }
+    { name="poxml";  }
+    { name="umbrello";  }
+  ];
+}
+{
+  module="kdegames";
+  split=true;
+  pkgs=[
+    { name="bomber";  }
+    { name="bovo";  }
+    { name="granatier";  }
+    { name="kajongg";  }
+    { name="kapman";  }
+    { name="katomic";  }
+    { name="kblackbox";  }
+    { name="kblocks";  }
+    { name="kbounce";  }
+    { name="kbreakout";  }
+    { name="kdiamond";  }
+    { name="kfourinline";  }
+    { name="kgoldrunner";  }
+    { name="kigo";  }
+    { name="killbots";  }
+    { name="kiriki";  }
+    { name="kjumpingcube";  }
+    { name="klickety";  }
+    { name="klines";  }
+    { name="kmahjongg";  }
+    { name="kmines";  }
+    { name="knavalbattle";  }
+    { name="knetwalk";  }
+    { name="kolf";  }
+    { name="kollision";  }
+    { name="konquest";  }
+    { name="kpat";  }
+    { name="kreversi";  }
+    { name="kshisen";  }
+    { name="ksirk";  }
+    { name="ksnakeduel";  }
+    { name="kspaceduel";  }
+    { name="ksquares";  }
+    { name="ksudoku";  }
+    { name="ktuberling";  }
+    { name="kubrick";  }
+    { name="libkdegames";  }
+    { name="libkmahjongg";  }
+    { name="lskat";  }
+    { name="palapeli";  }
+    { name="picmi";  }
+  ];
+}
+{
+  module="kdeedu";
+  split=true;
+  pkgs=[
+    { name="analitza";  }
+    { name="blinken";  }
+    { name="cantor";  }
+    { name="kalgebra";  }
+    { name="kalzium";  }
+    { name="kanagram";  }
+    { name="kbruch";  }
+    { name="kgeography";  }
+    { name="khangman";  }
+    { name="kig";  }
+    { name="kiten";  }
+    { name="klettres";  }
+    { name="kmplot";  }
+    { name="kstars";  }
+    { name="ktouch";  }
+    { name="kturtle";  }
+    { name="kwordquiz";  }
+    { name="libkdeedu";  }
+    { name="marble";  }
+    { name="pairs";  }
+    { name="parley";  }
+    { name="rocs";  }
+    { name="step";  }
+  ];
+}
+{
+  module="kdeadmin";
+  split=true;
+  pkgs=[
+    { name="kcron";  }
+    { name="ksystemlog";  }
+    { name="kuser";  }
+  ];
+}
+{
+  module="kdebindings";
+  split=true;
+  pkgs=[
+    { name="kimono";  }
+    { name="korundum";  }
+    { name="kross-interpreters"; sane="kross_interpreters"; }
+    { name="perlkde";  }
+    { name="perlqt";  }
+    { name="pykde4";  }
+    { name="qtruby";  }
+    { name="qyoto";  }
+    { name="smokegen";  }
+    { name="smokekde";  }
+    { name="smokeqt";  }
+  ];
+}
+{
+  module="kdeaccessibility";
+  split=true;
+  pkgs=[
+    { name="jovie";  }
+    { name="kaccessible";  }
+    { name="kmag";  }
+    { name="kmousetool";  }
+    { name="kmouth";  }
+  ];
+}
+{
+  module="kde-baseapps";
+sane="kde_baseapps";  split=true;
+  pkgs=[
+    { name="kde-baseapps"; sane="kde_baseapps"; }
+  ];
+}
+{ module="kactivities";  split=false;}
+{ module="kdeartwork";  split=false;
+  pkgs=[
+    { name="ColorSchemes"; }
+    { name="IconThemes"; }
+    { name="emoticons"; }
+    { name="kscreensaver"; }
+    { name="kwin-styles"; sane="kwin_styles";}
+    { name="sounds"; }
+    { name="styles"; }
+    { name="wallpapers"; }
+    { name="HighResolutionWallpapers"; }
+    { name="WeatherWallpapers"; }
+    { name="desktopthemes"; }
+  ];
+
+}
+{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;}
+{ module="kdelibs";  split=false;}
+{ module="kdepim";  split=false;}
+{ module="kdepimlibs";  split=false;}
+{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
+{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
+{ module="kde-runtime"; sane="kde_runtime"; split=false;}
+{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
+{ module="kdewebdev";  split=false;
+  pkgs=[
+    { name="klinkstatus"; }
+    { name="kfilereplace"; }
+    { name="kimagemapeditor"; }
+    { name="kommander"; }
+  ];
+
+}
+{ module="kde-workspace"; sane="kde_workspace"; split=false;}
+{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
+];
+}
diff --git a/pkgs/desktops/kde-4.11/kde-package/default.nix b/pkgs/desktops/kde-4.11/kde-package/default.nix
new file mode 100644
index 00000000000..cd2860920d6
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kde-package/default.nix
@@ -0,0 +1,127 @@
+{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4
+, release, ignoreList, extraSubpkgs
+}:
+
+let
+  inherit (stdenv.lib) filter fold;
+  inherit (builtins) getAttr hasAttr remoteAttrs listToAttrs tail head;
+in
+rec {
+  manifest = import (./. + "/${release}.nix");
+
+  # src attribute for $name tarball
+  kdesrc = name: fetchurl {
+    url = "mirror://kde/" + (if manifest.stable then "" else "un")
+      + "stable/${release}/src/${name}-${release}.tar.xz";
+    sha256 = getAttr name manifest.hashes;
+  };
+
+  # Default meta attribute
+  defMeta = {
+    homepage = http://www.kde.org;
+    inherit (qt4.meta) platforms maintainers;
+  };
+
+  # KDE package built from the whole tarball
+  # This function is used both for monolithic modules and modules which are
+  # released as individual tarballs
+  kdeMonoPkg = name: let n_ = name; in a@{meta, name ? n_, ...}:
+    stdenv.mkDerivation ({
+      name = "${name}-${release}";
+      src = kdesrc name;
+      meta = defMeta // meta;
+      enableParallelBuilding = true;
+    } // (removeAttrs a [ "meta" "name" ]));
+
+  # kdeMonoPkg wrapper for modules splitted upstream compatible with combinePkgs
+  # API.
+  kdeSplittedPkg = module: {name, sane ? name}: kdeMonoPkg name;
+
+  # Build subdirectory ${subdir} of tarball ${module}-${release}.tar.xz
+  kdeSubdirPkg = module:
+    {name, subdir ? name, sane ? name}:
+    let name_ = name; in
+    a@{cmakeFlags ? [], name ? name_, meta ? {}, ...}:
+    stdenv.mkDerivation ({
+      name = "${name}-${release}";
+      src = kdesrc module;
+      cmakeFlags =
+        [ "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE"
+          "-DBUILD_doc=TRUE"
+          "-DBUILD_${subdir}=TRUE"
+        ] ++ cmakeFlags;
+      meta = defMeta // meta;
+      enableParallelBuilding = module.enableParallelBuilding or true;
+    } // (removeAttrs a [ "meta" "name" "cmakeFlags" ]));
+
+  # A KDE monolithic module
+  kdeMonoModule = name: path: callPackage path { kde = kdeMonoPkg name; };
+
+  # Combine packages in one module.
+  # Arguments:
+  #  * pkgFun --- a function of the following signature:
+  #               module: manifest_attrs: manual_attrs: derivation;
+  #  * module --- name of the module
+  #  * pkgs --- list of packages in manifest format
+  combinePkgs = pkgFun: module: pkgs:
+    let
+      f = p@{name, ...}:
+        callPackage (./.. + "/${module}/${name}.nix") { kde = pkgFun module p; };
+      list = map f pkgs;
+      attrs = listToAttrs (map
+        ({name, sane ? name, ...}@p: { name = sane; value = f p; })
+        pkgs);
+    in
+      runCommand "${module}-${release}"
+      ({passthru = attrs // {
+         propagatedUserEnvPackages = list;
+         projects = attrs;
+       };})
+        ''
+          mkdir -pv $out/nix-support
+          echo "${toString list}" | tee $out/nix-support/propagated-user-env-packages
+        '';
+
+  # Given manifest module data, return the module
+  kdeModule = { module, sane ? module, split, pkgs ? [] }:
+    let
+      pkgs_ = filterPkgs module pkgs;
+    in
+    # Module is splitted by upstream
+    if split then combinePkgs kdeSplittedPkg module pkgs_
+    # Monolithic module
+    else if pkgs == [] then kdeMonoModule module (./.. + "/${module}.nix")
+    # Module is splitted by us
+    else combinePkgs kdeSubdirPkg module pkgs_;
+
+  # The same, as nameValuePair with sane name
+  kdeModuleNV = a@{ module, sane ? module, ... }:
+    { name = sane; value = kdeModule a; };
+
+  filterPkgs = module: (p:
+      removeNames (stdenv.lib.attrByPath [module] [] ignoreList) p
+      ++ (stdenv.lib.attrByPath [module] [] extraSubpkgs));
+
+  # Remove attrsets with x.name in subst. Optimized for empty subst.
+  removeNames = subst: big:
+    fold (s: out: filter (x: x.name != s) out) big subst;
+
+  modules = listToAttrs (map kdeModuleNV manifest.modules);
+
+  splittedModuleList =
+    let
+      splitted = filter (a: a ? pkgs) manifest.modules;
+      names = map ({module, sane ? module, ...}: sane) splitted;
+    in
+    map (m: m.projects) (stdenv.lib.attrVals names modules);
+
+  individual =
+    stdenv.lib.zipAttrsWith
+    (
+      name: list:
+      if tail list == []
+      then head list
+      else abort "Multiple modules define ${name}"
+    )
+    splittedModuleList;
+}
diff --git a/pkgs/desktops/kde-4.11/kde-package/kde-manifest.sh b/pkgs/desktops/kde-4.11/kde-package/kde-manifest.sh
new file mode 100755
index 00000000000..e964ce3ddc1
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kde-package/kde-manifest.sh
@@ -0,0 +1,146 @@
+#! /bin/sh
+
+# Usage: download kde release to $dir, then run
+# $0 $dir
+
+dir="$1"
+
+# Detect release number & whether it is a stable release
+if [[ ! -d "${dir}" ]]; then
+  echo "${dir} is not a directory (or doesn't exist)!" >&2
+  exit 1
+fi
+
+release=$(ls "${dir}"/kdelibs-*.tar.xz | \
+  sed -e 's/.*kdelibs-//' -e 's/\.tar\.xz//')
+
+if [[ ${release##*.} -gt 50 ]]; then
+  stable="false"
+else
+  stable="true"
+fi
+
+echo "Detected release ${release}" >&2
+
+declare -A hash
+declare -A modules
+declare -a packages
+declare -a top_level
+
+# xsltproc output declares -A module
+if [[ ! -f kde_projects.xml ]]; then
+  curl -O -J http://projects.kde.org/kde_projects.xml
+fi
+eval `xsltproc kde-submodules.xslt kde_projects.xml`
+
+module[kde-baseapps]=kde-baseapps
+unset module[kactivities]
+
+print_sane() {
+  echo "Called print_sane $1" >&2
+  sane="${1//[^a-z0-9_]/_}"
+  if [[ "$sane" != "$1" ]]; then
+    echo "Sane version is $sane" >&2
+    echo -n "sane=\"$sane\";"
+  fi
+}
+
+for i in `cd "${dir}"; ls *-${release}.tar.xz`; do
+  package=${i%-${release}.tar.xz}
+  packages+=( "$package" )
+  echo -n "${package}.. " >&2
+  hash[$package]=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
+  echo -n ${hash[$package]} >&2
+
+  if [ -n "${module[$package]}" ]; then
+    m="${module[$package]}"
+    echo " (${m})" >&2
+    modules[$m]=1
+  else
+    top_level+=( "$package" )
+    echo " (top-level)" >&2
+  fi
+  #nix-store --add-fixed sha256 "${dir}/${i}" >&2
+done
+
+
+print_pkg_hash() {
+  echo "  {name=\"${1}\";value=\"${hash[$1]}\";}"
+}
+
+print_hashes(){
+  echo "hashes=builtins.listToAttrs["
+  for p in "${packages[@]}"; do print_pkg_hash "$p"; done
+  echo "];"
+}
+
+print_split_module(){
+  echo -n "$1:" >&2
+  echo -e "{\n  module=\"$1\";"
+  print_sane "$1"
+  echo "  split=true;"
+  echo "  pkgs=["
+  for p in "${packages[@]}"; do
+    if [[ "${module[$p]}" == "$1" ]]; then
+      echo -n "    { name=\"$p\"; "
+      print_sane "$p"
+      echo " }"
+      echo -n " $p" >&2
+    fi
+  done
+  echo "  ];"
+  echo "}"
+  echo >&2
+}
+
+print_mono_module(){
+  echo -en "{ module=\"$1\"; "
+  print_sane "$1"
+  echo -n "$1 ... " >&2
+  echo -n " split=false;"
+  cml="$1-$release/CMakeLists.txt"
+  tar -xf "${dir}/$1-${release}.tar.xz" "$cml"
+  if grep '^[^#]*add_subdirectory' $cml >/dev/null; then
+    if grep '^[^#]*add_subdirectory' $cml | grep -v macro_optional_add_subdirectory >/dev/null; then
+      echo " is monolithic (has unconditionally added subdirs)" >&2
+    else
+      subdirs=( `grep '^[^#]*add_subdirectory' $cml |
+        sed -e 's/[^#]*add_subdirectory *( *\(.*\) *)/\1/' |
+        grep -v '\(doc\|cmake\)'` )
+      echo " seems splittable, subdirs: ${subdirs[*]}" >&2
+      echo -e "\n  pkgs=["
+      for s in "${subdirs[@]}"; do
+        echo -en "    {"
+		echo -n " name=\"${s//\//-}\"; "
+        print_sane "$s"
+        if [[ $s != "${s//\//-}" ]]; then
+          echo -n "subdir=\"$s\"; "
+        fi
+        echo "}"
+      done
+      echo -e "  ];\n"
+    fi
+  else
+    echo " is monolithic (has no subdirs)" >&2
+  fi
+  rm $cml
+  rmdir $1-$release
+  echo "}"
+}
+
+print_modules(){
+  echo "modules=["
+  echo "Printing modules splitted by upstream" >&2
+  for m in "${!modules[@]}"; do print_split_module "$m"; done
+  echo >&2
+  echo "Printing modules not splitted by upstream (${top_level[*]})" >&2
+  for m in "${top_level[@]}"; do print_mono_module "$m"; done
+  echo "];"
+}
+
+echo "Writing ${release}.nix" >&2
+exec > "${release}.nix"
+echo "{stable=${stable};"
+print_hashes
+print_modules
+echo "}"
diff --git a/pkgs/desktops/kde-4.11/kde-runtime.nix b/pkgs/desktops/kde-4.11/kde-runtime.nix
new file mode 100644
index 00000000000..28e9aa52e62
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kde-runtime.nix
@@ -0,0 +1,23 @@
+{ kde, kdelibs, bzip2, libssh, exiv2, attica, qca2
+, libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, xz, pulseaudio
+, networkmanager, kactivities, kdepimlibs, openexr, ilmbase
+}:
+
+kde {
+  buildInputs = [
+    kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack
+    qca2 samba libcanberra pulseaudio
+    networkmanager kactivities kdepimlibs openexr
+#todo: add openslp
+  ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
+
+  passthru.propagatedUserEnvPackages = [ virtuoso ];
+
+  meta = {
+    license = "LGPL";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kde-wallpapers.nix b/pkgs/desktops/kde-4.11/kde-wallpapers.nix
new file mode 100644
index 00000000000..701a1f3771f
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kde-wallpapers.nix
@@ -0,0 +1,17 @@
+{ kde, cmake }:
+
+kde {
+  nativeBuildInputs = [ cmake ];
+
+  patches = [ ./files/kde-wallpapers-buildsystem.patch ];
+
+  cmakeFlags = "-DWALLPAPER_INSTALL_DIR=share/wallpapers";
+
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "07jwbxp4gdxkvxdasbzbv00l3kqrjph4d8dlbyxgryf12waykcmm";
+
+  meta = {
+    description = "Wallpapers for KDE";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kde-workspace.nix b/pkgs/desktops/kde-4.11/kde-workspace.nix
new file mode 100644
index 00000000000..0bb6ed606c7
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kde-workspace.nix
@@ -0,0 +1,39 @@
+{ kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, lm_sensors
+, pciutils, libraw1394, libusb1, python, libqalculate, akonadi
+, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison
+, libjpeg, pkgconfig, kactivities, qjson, udev
+}:
+
+kde {
+
+#todo: wayland, consolekit, xmms, opengles,  libusb isn't found
+  buildInputs =
+    [ kdelibs qimageblitz libdbusmenu_qt xorg.libxcb xorg.xcbutilimage libjpeg 
+      xorg.xcbutilrenderutil xorg.xcbutilkeysyms xorg.libpthreadstubs xorg.libXdmcp
+      xorg.libxkbfile xorg.libXcomposite  xorg.libXtst
+      xorg.libXdamage
+
+      python boost qjson lm_sensors gpsd libraw1394 pciutils udev
+      akonadi pam libusb1 libqalculate kdepimlibs  prison
+      kactivities
+    ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  preConfigure =
+   ''
+     # Fix incorrect path to kde4-config.
+     substituteInPlace startkde.cmake --replace '$bindir/kde4-config' ${kdelibs}/bin/kde4-config
+
+     # Fix the path to the keyboard configuration files.
+     substituteInPlace kcontrol/keyboard/xkb_rules.cpp \
+       --replace /usr/share/X11 ${xkeyboard_config}/etc/X11
+   '';
+
+  enableParallelBuilding = false; # frequent problems on Hydra
+
+  meta = {
+    description = "KDE workspace components such as Plasma, Kwin and System Settings";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeaccessibility/jovie.nix b/pkgs/desktops/kde-4.11/kdeaccessibility/jovie.nix
new file mode 100644
index 00000000000..d38c80c4c36
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeaccessibility/jovie.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, speechd }:
+
+kde {
+  buildInputs = [ kdelibs speechd ];
+
+  meta = {
+    description = "Text-to-speech synthesis daemon";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeaccessibility/kaccessible.nix b/pkgs/desktops/kde-4.11/kdeaccessibility/kaccessible.nix
new file mode 100644
index 00000000000..98fae7c983f
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeaccessibility/kaccessible.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, speechd }:
+
+kde {
+  buildInputs = [ kdelibs speechd ];
+
+  meta = {
+    description = "Bridge that provides accessibility services to applications";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeaccessibility/kmag.nix b/pkgs/desktops/kde-4.11/kdeaccessibility/kmag.nix
new file mode 100644
index 00000000000..606c61cddb6
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeaccessibility/kmag.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs }:
+
+kde {
+#todo: package qaccessibilityclient
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Screen magnifier for KDE";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeaccessibility/kmousetool.nix b/pkgs/desktops/kde-4.11/kdeaccessibility/kmousetool.nix
new file mode 100644
index 00000000000..8e0caa76ed9
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeaccessibility/kmousetool.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libXtst, libXt }:
+
+kde {
+  buildInputs = [ kdelibs libXtst libXt ];
+
+  meta = {
+    description = "A program that clicks the mouse for you";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeaccessibility/kmouth.nix b/pkgs/desktops/kde-4.11/kdeaccessibility/kmouth.nix
new file mode 100644
index 00000000000..4159501967c
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeaccessibility/kmouth.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "A type-and-say front end for speech synthesizers";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeadmin/kcron.nix b/pkgs/desktops/kde-4.11/kdeadmin/kcron.nix
new file mode 100644
index 00000000000..f585461af38
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeadmin/kcron.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Configure and schedule tasks";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeadmin/ksystemlog.nix b/pkgs/desktops/kde-4.11/kdeadmin/ksystemlog.nix
new file mode 100644
index 00000000000..88757a6b91c
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeadmin/ksystemlog.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "System log viewer tool";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeadmin/kuser.nix b/pkgs/desktops/kde-4.11/kdeadmin/kuser.nix
new file mode 100644
index 00000000000..6118cf558bb
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeadmin/kuser.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, kdepimlibs }:
+
+kde {
+  buildInputs = [ kdelibs kdepimlibs ];
+
+  meta = {
+    description = "User management tool";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeartwork/ColorSchemes.nix b/pkgs/desktops/kde-4.11/kdeartwork/ColorSchemes.nix
new file mode 100644
index 00000000000..acccf66976f
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeartwork/ColorSchemes.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde {
+  name = "kde-color-schemes";
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Additional KDE color schemes";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeartwork/FindXscreensaver.cmake b/pkgs/desktops/kde-4.11/kdeartwork/FindXscreensaver.cmake
new file mode 100644
index 00000000000..499ed75268e
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeartwork/FindXscreensaver.cmake
@@ -0,0 +1,73 @@
+#Macro to find xscreensaver directory
+
+# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+if (NOT XSCREENSAVER_FOUND)
+  FIND_PATH(XSCREENSAVER_DIR deco
+    HINTS
+      ${KDE4_INCLUDE_DIR}
+    PATHS
+      /usr
+      /usr/local
+      /opt/local
+      /usr/X11R6
+      /opt/kde
+      /opt/kde3
+      /usr/kde
+      /usr/local/kde
+      /usr/local/xscreensaver
+      /usr/openwin/lib/xscreensaver
+      /etc
+    PATH_SUFFIXES
+      lib${LIB_SUFFIX}/xscreensaver
+      lib${LIB_SUFFIX}/misc/xscreensaver
+      lib/xscreensaver
+      lib64/xscreensaver
+      lib/misc/xscreensaver
+      libexec/xscreensaver
+      bin/xscreensaver-hacks
+      hacks)
+  message(STATUS "XSCREENSAVER_DIR <${XSCREENSAVER_DIR}>")
+
+  FIND_PATH(XSCREENSAVER_CONFIG_DIR deco.xml
+    PATHS
+    ${KDE4_INCLUDE_DIR}
+    /usr/
+    /usr/local/
+    /opt/local/
+    /usr/X11R6/
+    /opt/kde/
+    /opt/kde3/
+    /usr/kde/
+    /usr/local/kde/
+    /usr/openwin/lib/xscreensaver/
+    /etc/
+    PATH_SUFFIXES xscreensaver xscreensaver/config share/xscreensaver/config
+  )
+  MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
+
+endif(NOT XSCREENSAVER_FOUND)
+
+#MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
+#MESSAGE(STATUS "XSCREENSAVER_DIR :<${XSCREENSAVER_DIR}>")
+
+# Need to fix hack
+if(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
+    set(XSCREENSAVER_FOUND TRUE)
+endif(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
+
+if (XSCREENSAVER_FOUND)
+  if (NOT Xscreensaver_FIND_QUIETLY)
+    message(STATUS "Found XSCREENSAVER_CONFIG_DIR <${XSCREENSAVER_CONFIG_DIR}>")
+  endif (NOT Xscreensaver_FIND_QUIETLY)
+else (XSCREENSAVER_FOUND)
+  if (Xscreensaver_FIND_REQUIRED)
+    message(FATAL_ERROR "XScreenSaver not found")
+  endif (Xscreensaver_FIND_REQUIRED)
+endif (XSCREENSAVER_FOUND)
+
+
+MARK_AS_ADVANCED(XSCREENSAVER_DIR XSCREENSAVER_CONFIG_DIR)
diff --git a/pkgs/desktops/kde-4.11/kdeartwork/HighResolutionWallpapers.nix b/pkgs/desktops/kde-4.11/kdeartwork/HighResolutionWallpapers.nix
new file mode 100644
index 00000000000..edffca1562e
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeartwork/HighResolutionWallpapers.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde rec {
+  name = "kde-wallpapers-high-resolution";
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE wallpapers in high resolution";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeartwork/IconThemes.nix b/pkgs/desktops/kde-4.11/kdeartwork/IconThemes.nix
new file mode 100644
index 00000000000..43071e8bd14
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeartwork/IconThemes.nix
@@ -0,0 +1,13 @@
+{ kde, kdelibs }:
+
+kde {
+  name = "kdeartwork-icon-themes";
+
+  # Sources contain primary and kdeclassic as well but they're not installed
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE nuvola and mono icon themes";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeartwork/WeatherWallpapers.nix b/pkgs/desktops/kde-4.11/kdeartwork/WeatherWallpapers.nix
new file mode 100644
index 00000000000..947e5e17ab0
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeartwork/WeatherWallpapers.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde rec {
+  name = "kde-weather-wallpapers";
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Additional KDE wallpapers (weather)";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeartwork/desktopthemes.nix b/pkgs/desktops/kde-4.11/kdeartwork/desktopthemes.nix
new file mode 100644
index 00000000000..93dd361af73
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeartwork/desktopthemes.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde {
+  name = "kde-desktop-themes";
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Additional KDE desktop themes";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeartwork/emoticons.nix b/pkgs/desktops/kde-4.11/kdeartwork/emoticons.nix
new file mode 100644
index 00000000000..5ef9f78a719
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeartwork/emoticons.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde {
+  name = "kde-emotion-icons";
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Additional KDE emotion icons (smiles)";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeartwork/kscreensaver.nix b/pkgs/desktops/kde-4.11/kdeartwork/kscreensaver.nix
new file mode 100644
index 00000000000..84cb008056e
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeartwork/kscreensaver.nix
@@ -0,0 +1,15 @@
+{ kde, kdelibs, xscreensaver, kde_workspace, eigen, libkexiv2, libXt, pkgconfig }:
+
+kde {
+  buildInputs = [ kdelibs xscreensaver kde_workspace eigen libkexiv2 libXt ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  prePatch = "cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake";
+
+  cmakeFlags = [ "-DBUILD_asciiquarium:BOOL=ON" ];
+
+  meta = {
+    description = "KDE screensavers";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeartwork/kwin-styles.nix b/pkgs/desktops/kde-4.11/kdeartwork/kwin-styles.nix
new file mode 100644
index 00000000000..b5d769b216d
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeartwork/kwin-styles.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, kde_workspace }:
+
+kde {
+  buildInputs = [ kdelibs kde_workspace ];
+
+  meta = {
+    description = "Styles for KWin";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeartwork/sounds.nix b/pkgs/desktops/kde-4.11/kdeartwork/sounds.nix
new file mode 100644
index 00000000000..e98705da889
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeartwork/sounds.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde rec {
+  name = "kde-sounds";
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "New login/logout sounds";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeartwork/styles.nix b/pkgs/desktops/kde-4.11/kdeartwork/styles.nix
new file mode 100644
index 00000000000..6a1306c3710
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeartwork/styles.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde rec {
+  name = "kde-style-phase";
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Phase, a widget style for KDE";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeartwork/wallpapers.nix b/pkgs/desktops/kde-4.11/kdeartwork/wallpapers.nix
new file mode 100644
index 00000000000..7c9846fbf9e
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeartwork/wallpapers.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde rec {
+  name = "kdeartwork-wallpapers";
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Additional KDE wallpapers";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdebindings/perlqt.nix b/pkgs/desktops/kde-4.11/kdebindings/perlqt.nix
new file mode 100644
index 00000000000..48eed141ce6
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdebindings/perlqt.nix
@@ -0,0 +1,14 @@
+{ kde, cmake, smokeqt, perl }:
+
+kde {
+
+  # TODO: qscintilla2, qwt5
+
+  buildInputs = [ smokeqt perl ];
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = {
+    description = "Perl bindings for Qt library";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.11/kdebindings/pykde4.nix
new file mode 100644
index 00000000000..64e196452e3
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdebindings/pykde4.nix
@@ -0,0 +1,32 @@
+{ kde, kdelibs, python, sip, pyqt4, kdepimlibs, shared_desktop_ontologies,
+  polkit_qt_1, boost, lndir, pkgconfig }:
+
+let pydir = "lib/python${python.majorVersion}"; in
+
+kde {
+
+  # todo: polkit isn't found by the build system
+
+  buildInputs = [
+    python kdepimlibs shared_desktop_ontologies
+    boost polkit_qt_1
+  ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  propagatedBuildInputs = [ pyqt4 sip ];
+
+  preConfigure =
+    ''
+      # Symlink PyQt into PyKDE.  This is necessary because PyQt looks
+      # in its PyQt4/uic/widget-plugins directory for plugins, and KDE
+      # needs to install a plugin.
+      mkdir -pv $out/${pydir}
+      ${lndir}/bin/lndir ${pyqt4}/${pydir} $out/${pydir}
+      cmakeFlagsArray=( "-DSIP_DEFAULT_SIP_DIR=$prefix/share/sip" )
+    '';
+
+  meta = {
+    description = "Python bindings for KDE";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdebindings/qtruby-install-prefix.patch b/pkgs/desktops/kde-4.11/kdebindings/qtruby-install-prefix.patch
new file mode 100644
index 00000000000..bd95a0d8bd3
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdebindings/qtruby-install-prefix.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 33078b4..30aec0e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -31,8 +31,8 @@ if (NOT COMPILE_RUBY)
+     return()
+ endif (NOT COMPILE_RUBY)
+ 
+-SET(CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR} CACHE DIR "custom installation directory for ruby binary extension" )
+-SET(CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR} CACHE DIR "custom installation directory for ruby extension" )
++string(REPLACE "${RUBY_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR})
++string(REPLACE "${RUBY_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR})
+ 
+ # compute an overall version number which can be compared at once
+ MATH(EXPR RUBY_VERSION_NUMBER "${RUBY_VERSION_MAJOR}*10000 + ${RUBY_VERSION_MINOR}*100 + ${RUBY_VERSION_PATCH}")
diff --git a/pkgs/desktops/kde-4.11/kdebindings/qtruby.nix b/pkgs/desktops/kde-4.11/kdebindings/qtruby.nix
new file mode 100644
index 00000000000..03e9dc9a007
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdebindings/qtruby.nix
@@ -0,0 +1,20 @@
+{ kde, cmake, smokeqt, ruby }:
+
+kde {
+
+ # TODO: scintilla2, qwt5
+
+  buildInputs = [ smokeqt ruby ];
+
+  nativeBuildInputs = [ cmake ];
+
+  # The patch is not ready for upstream submmission.
+  # I should add an option() instead.
+  patches = [ ./qtruby-install-prefix.patch ];
+
+  cmakeFlags="-DRUBY_ROOT_DIR=${ruby}";
+
+  meta = {
+    description = "Ruby bindings for Qt library";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdebindings/smokegen-CMakeLists.txt-nix.patch b/pkgs/desktops/kde-4.11/kdebindings/smokegen-CMakeLists.txt-nix.patch
new file mode 100644
index 00000000000..f0811d335a7
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdebindings/smokegen-CMakeLists.txt-nix.patch
@@ -0,0 +1,13 @@
+--- smokegen-4.10.5.orig/CMakeLists.txt 2013-06-28 17:14:50.000000000 +0000
++++ smokegen-4.10.5/CMakeLists.txt 2013-07-31 19:15:17.000000000 +0000
+@@ -36,6 +36,10 @@
+ set (CMAKE_SKIP_BUILD_RPATH FALSE)
+ set (CMAKE_SKIP_RPATH FALSE)
+
++# add the automatically determined parts of the RPATH
++# which point to directories outside the build tree to the install RPATH
++SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
++
+ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h @ONLY )
+
+ add_executable(smokegen ${generator_SRC})
\ No newline at end of file
diff --git a/pkgs/desktops/kde-4.11/kdebindings/smokegen-nix.patch b/pkgs/desktops/kde-4.11/kdebindings/smokegen-nix.patch
new file mode 100644
index 00000000000..53257e836e0
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdebindings/smokegen-nix.patch
@@ -0,0 +1,13 @@
+diff -urN smokegen-4.10.5.orig/cmake/SmokeConfig.cmake.in smokegen-4.10.5/cmake/SmokeConfig.cmake.in
+--- smokegen-4.10.5.orig/cmake/SmokeConfig.cmake.in	2013-06-28 17:14:50.000000000 +0000
++++ smokegen-4.10.5/cmake/SmokeConfig.cmake.in	2013-07-30 21:26:33.000000000 +0000
+@@ -80,8 +80,7 @@
+ set(SMOKE_API_BIN "@SMOKE_API_BIN@")
+ 
+ find_library(SMOKE_BASE_LIBRARY smokebase 
+-              PATHS "@SMOKE_LIBRARY_PREFIX@"
+-              NO_DEFAULT_PATH)
++              PATHS "@SMOKE_LIBRARY_PREFIX@")
+ 
+ if (NOT SMOKE_BASE_LIBRARY)
+     if (Smoke_FIND_REQUIRED)
diff --git a/pkgs/desktops/kde-4.11/kdebindings/smokegen.nix b/pkgs/desktops/kde-4.11/kdebindings/smokegen.nix
new file mode 100644
index 00000000000..a80574ff67a
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdebindings/smokegen.nix
@@ -0,0 +1,13 @@
+{ kde, qt4, cmake }:
+
+kde {
+  buildInputs = [ qt4 ];
+  nativeBuildInputs = [ cmake ];
+
+  patches = [ ./smokegen-nix.patch ./smokegen-CMakeLists.txt-nix.patch ];
+
+  meta = {
+    description = "C++ parser used to generate language bindings for Qt/KDE";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdebindings/smokekde.nix b/pkgs/desktops/kde-4.11/kdebindings/smokekde.nix
new file mode 100644
index 00000000000..4474c1d9731
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdebindings/smokekde.nix
@@ -0,0 +1,19 @@
+{ kde, cmake, smokeqt, kdelibs, akonadi, kdepimlibs, okular
+, shared_desktop_ontologies, attica, pkgconfig }:
+
+kde {
+
+  # TODO: attica, akonadi and kdepimlibs are disabled due to smokegen crash
+  # okular is disabled because the code generated is broken
+  buildInputs = [
+    smokeqt kdelibs shared_desktop_ontologies
+  ];
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  LD_LIBRARY_PATH = "${smokeqt}/lib/";
+
+  meta = {
+    description = "SMOKE bindings for kdelibs";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdebindings/smokeqt.nix b/pkgs/desktops/kde-4.11/kdebindings/smokeqt.nix
new file mode 100644
index 00000000000..72b267e43c5
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdebindings/smokeqt.nix
@@ -0,0 +1,15 @@
+{ kde, qt4, cmake, phonon, qimageblitz, smokegen }:
+
+kde {
+
+# TODO: Qwt5, QScintilla2
+
+  propagatedBuildInputs = [ qt4 phonon qimageblitz ];
+  nativeBuildInputs = [ cmake ];
+  propagatedNativeBuildInputs = [ smokegen ];
+
+  meta = {
+    description = "C++ parser used to generate language bindings for Qt/KDE";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/analitza.nix b/pkgs/desktops/kde-4.11/kdeedu/analitza.nix
new file mode 100644
index 00000000000..74c3a1ebb20
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeedu/analitza.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs, readline }:
+kde {
+  buildInputs = [ kdelibs readline ];
+
+  meta = {
+    description = "Library part of KAlgebra";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/blinken.nix b/pkgs/desktops/kde-4.11/kdeedu/blinken.nix
new file mode 100644
index 00000000000..cdf9728833c
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeedu/blinken.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs }:
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Memory Enhancement Game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/cantor.nix b/pkgs/desktops/kde-4.11/kdeedu/cantor.nix
new file mode 100644
index 00000000000..670a3429032
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeedu/cantor.nix
@@ -0,0 +1,13 @@
+{ kde, kdelibs, libspectre, analitza, R, pkgconfig, libqalculate }:
+kde {
+
+# TODO: R is not found
+
+  buildInputs = [ kdelibs libspectre analitza R libqalculate];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = {
+    description = "KDE Frontend to Mathematical Software";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/kalgebra.nix b/pkgs/desktops/kde-4.11/kdeedu/kalgebra.nix
new file mode 100644
index 00000000000..3675c3a225f
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeedu/kalgebra.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs, libkdeedu, analitza }:
+kde {
+  buildInputs = [ kdelibs libkdeedu analitza ];
+
+  meta = {
+    description = "2D and 3D Graph Calculator";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/kalzium.nix b/pkgs/desktops/kde-4.11/kdeedu/kalzium.nix
new file mode 100644
index 00000000000..09de79ce1c0
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeedu/kalzium.nix
@@ -0,0 +1,13 @@
+{ kde, kdelibs, facile, ocaml, eigen, openbabel, avogadro, pkgconfig }:
+kde {
+
+# TODO: chemical mime data
+
+  buildInputs = [ kdelibs facile ocaml eigen openbabel avogadro ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = {
+    description = "Periodic Table of Elements";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/kanagram.nix b/pkgs/desktops/kde-4.11/kdeedu/kanagram.nix
new file mode 100644
index 00000000000..8759c96d78c
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeedu/kanagram.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs, libkdeedu }:
+kde {
+  buildInputs = [ kdelibs libkdeedu ];
+
+  meta = {
+    description = "Letter Order Game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/kbruch.nix b/pkgs/desktops/kde-4.11/kdeedu/kbruch.nix
new file mode 100644
index 00000000000..dc50f1e85a3
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeedu/kbruch.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs }:
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Practice Fractions";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/kgeography.nix b/pkgs/desktops/kde-4.11/kdeedu/kgeography.nix
new file mode 100644
index 00000000000..bd8d27c8d6e
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeedu/kgeography.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs }:
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Geography Trainer";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/khangman.nix b/pkgs/desktops/kde-4.11/kdeedu/khangman.nix
new file mode 100644
index 00000000000..997b50e906a
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeedu/khangman.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs, libkdeedu }:
+kde {
+  buildInputs = [ kdelibs libkdeedu ];
+
+  meta = {
+    description = "KDE hangman game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/kig.nix b/pkgs/desktops/kde-4.11/kdeedu/kig.nix
new file mode 100644
index 00000000000..bd5ef67529c
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeedu/kig.nix
@@ -0,0 +1,12 @@
+{ kde, kdelibs, boost, python}:
+kde {
+  buildInputs = [ kdelibs boost python ];
+
+  cmakeFlags = ''
+    -DBOOST_PYTHON_INCLUDES:PATH=${boost}/include;${python}/include/${python.libPrefix}
+    -DBOOST_PYTHON_LIBS=boost_python;${python.libPrefix} -DKIG_ENABLE_PYTHON_SCRIPTING=1
+    '';
+  meta = {
+    description = "KDE Interactive Geometry";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/kiten.nix b/pkgs/desktops/kde-4.11/kdeedu/kiten.nix
new file mode 100644
index 00000000000..939b7a9f77a
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeedu/kiten.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Japanese Reference/Study Tool";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/klettres.nix b/pkgs/desktops/kde-4.11/kdeedu/klettres.nix
new file mode 100644
index 00000000000..7a0fa83078e
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeedu/klettres.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "A KDE alphabet tutorial";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/kmplot.nix b/pkgs/desktops/kde-4.11/kdeedu/kmplot.nix
new file mode 100644
index 00000000000..18458cf6f0b
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeedu/kmplot.nix
@@ -0,0 +1,12 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "A KDE mathematical function plotter";
+    kde = {
+      name = "kmplot";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/kstars.nix b/pkgs/desktops/kde-4.11/kdeedu/kstars.nix
new file mode 100644
index 00000000000..4ae36c480f9
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeedu/kstars.nix
@@ -0,0 +1,14 @@
+{ kde, kdelibs, eigen, xplanet, indilib, pkgconfig }:
+
+kde {
+
+# TODO: wcslib
+
+  buildInputs = [ kdelibs eigen xplanet indilib ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = {
+    description = "A KDE graphical desktop planetarium";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/ktouch.nix b/pkgs/desktops/kde-4.11/kdeedu/ktouch.nix
new file mode 100644
index 00000000000..9e606adde33
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeedu/ktouch.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libxkbfile }:
+
+kde {
+  buildInputs = [ kdelibs libxkbfile ];
+
+  meta = {
+    description = "Touch Typing Tutor";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/kturtle.nix b/pkgs/desktops/kde-4.11/kdeedu/kturtle.nix
new file mode 100644
index 00000000000..1e1922b1410
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeedu/kturtle.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Educational Programming Environment";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/kwordquiz.nix b/pkgs/desktops/kde-4.11/kdeedu/kwordquiz.nix
new file mode 100644
index 00000000000..1b33ba2e469
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeedu/kwordquiz.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libkdeedu }:
+
+kde {
+  buildInputs = [ kdelibs libkdeedu ];
+
+  meta = {
+    description = "Flash Card Trainer";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/libkdeedu.nix b/pkgs/desktops/kde-4.11/kdeedu/libkdeedu.nix
new file mode 100644
index 00000000000..def6c85fefe
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeedu/libkdeedu.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs }:
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Libraries used by KDE Education applications";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/marble.nix b/pkgs/desktops/kde-4.11/kdeedu/marble.nix
new file mode 100644
index 00000000000..2dc07d14a0d
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeedu/marble.nix
@@ -0,0 +1,12 @@
+{ kde, kdelibs, gpsd }:
+
+kde {
+
+# TODO: package QextSerialPort, libshp(shapelib), QtMobility, QtLocation, libwlocate, quazip
+
+  buildInputs = [ kdelibs gpsd ];
+
+  meta = {
+    description = "Marble Virtual Globe";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/pairs.nix b/pkgs/desktops/kde-4.11/kdeedu/pairs.nix
new file mode 100644
index 00000000000..36c4aba9604
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeedu/pairs.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "A memory and pairs game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/parley.nix b/pkgs/desktops/kde-4.11/kdeedu/parley.nix
new file mode 100644
index 00000000000..f9f86dde150
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeedu/parley.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libkdeedu, attica }:
+
+kde {
+  buildInputs = [ kdelibs libkdeedu attica ];
+
+  meta = {
+    description = "Vocabulary Trainer";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/rocs.nix b/pkgs/desktops/kde-4.11/kdeedu/rocs.nix
new file mode 100644
index 00000000000..ce30d11fda3
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeedu/rocs.nix
@@ -0,0 +1,14 @@
+{ kde, kdelibs, boost, grantlee }:
+
+kde {
+  buildInputs = [ kdelibs (boost.override { enableExceptions = true; }) grantlee ];
+
+  NIX_CFLAGS_COMPILE = "-fexceptions";
+
+  meta = {
+    description = "A KDE graph theory viewer";
+    kde = {
+      name = "rocs";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/step.nix b/pkgs/desktops/kde-4.11/kdeedu/step.nix
new file mode 100644
index 00000000000..997cfb42c9e
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeedu/step.nix
@@ -0,0 +1,15 @@
+{ kde, kdelibs, gsl, libqalculate, eigen, pkgconfig }:
+
+kde {
+
+  buildInputs = [ kdelibs gsl libqalculate eigen ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = {
+    description = "A KDE interactive physical simulator";
+    kde = {
+      name = "step";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/bomber.nix b/pkgs/desktops/kde-4.11/kdegames/bomber.nix
new file mode 100644
index 00000000000..026227910f2
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/bomber.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a single player arcade game. The player is invading various cities in a plane that is decreasing in height";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/bovo.nix b/pkgs/desktops/kde-4.11/kdegames/bovo.nix
new file mode 100644
index 00000000000..b0e7d99c589
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/bovo.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a Gomoku (from Japanese 五目並べ - lit. \"five points\") like game for two players, where the opponents alternate in placing their respective pictogram on the game board";
+  };
+
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/granatier.nix b/pkgs/desktops/kde-4.11/kdegames/granatier.nix
new file mode 100644
index 00000000000..9f1ab005309
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/granatier.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a clone of the classic Bomberman game, inspired by the work of the Clanbomber clone";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kajongg.nix b/pkgs/desktops/kde-4.11/kdegames/kajongg.nix
new file mode 100644
index 00000000000..9a6f5e83695
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/kajongg.nix
@@ -0,0 +1,13 @@
+{ kde, kdelibs, libkdegames, pythonPackages, sqlite,  pykde4 }:
+kde rec {
+
+  buildInputs = [ kdelibs libkdegames pythonPackages.python pythonPackages.wrapPython sqlite ] ++ pythonPath;
+
+  pythonPath = [ pythonPackages.twisted pykde4 ];
+
+  postInstall = "wrapPythonPrograms";
+
+  meta = {
+    description = "an ancient Chinese board game for 4 players";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kapman.nix b/pkgs/desktops/kde-4.11/kdegames/kapman.nix
new file mode 100644
index 00000000000..f10e099da3c
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/kapman.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a clone of the well known game Pac-Man";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/katomic.nix b/pkgs/desktops/kde-4.11/kdegames/katomic.nix
new file mode 100644
index 00000000000..a9936c04f0e
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/katomic.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a fun and educational puzzle game built around molecular geometry";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kblackbox.nix b/pkgs/desktops/kde-4.11/kdegames/kblackbox.nix
new file mode 100644
index 00000000000..27eeff2f65b
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/kblackbox.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a game of hide and seek played on an grid of boxes, where the player shoots rays into the grid to deduce the positions of hidden objects";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kblocks.nix b/pkgs/desktops/kde-4.11/kdegames/kblocks.nix
new file mode 100644
index 00000000000..98cf068de09
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/kblocks.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a classic single player falling blocks puzzle game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kbounce.nix b/pkgs/desktops/kde-4.11/kdegames/kbounce.nix
new file mode 100644
index 00000000000..77fa0db6352
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/kbounce.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a single player arcade game with the elements of puzzle";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kbreakout.nix b/pkgs/desktops/kde-4.11/kdegames/kbreakout.nix
new file mode 100644
index 00000000000..3a484d919bb
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/kbreakout.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a Breakout-like game. Its object is to destroy as many bricks as possible without losing the ball";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kdiamond.nix b/pkgs/desktops/kde-4.11/kdegames/kdiamond.nix
new file mode 100644
index 00000000000..06dfcee5ac3
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/kdiamond.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a single player puzzle game. The object of the game is to build lines of three similar diamonds";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kfourinline.nix b/pkgs/desktops/kde-4.11/kdegames/kfourinline.nix
new file mode 100644
index 00000000000..11b8838e708
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/kfourinline.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a board game for two players based on the Connect-Four game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kgoldrunner.nix b/pkgs/desktops/kde-4.11/kdegames/kgoldrunner.nix
new file mode 100644
index 00000000000..6217c47a806
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/kgoldrunner.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "an action game where the hero runs through a maze, climbs stairs, dig holes and dodges enemies in order to collect all the gold nuggets and escape to the next level";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kigo.nix b/pkgs/desktops/kde-4.11/kdegames/kigo.nix
new file mode 100644
index 00000000000..32eee67cc1e
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/kigo.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "an open-source implementation of the popular Go game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/killbots.nix b/pkgs/desktops/kde-4.11/kdegames/killbots.nix
new file mode 100644
index 00000000000..d9c1472495e
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/killbots.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a simple game of evading killer robots";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kiriki.nix b/pkgs/desktops/kde-4.11/kdegames/kiriki.nix
new file mode 100644
index 00000000000..72f7ab67501
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/kiriki.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "an addictive and fun dice game, designed to be played by as many as six players";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kjumpingcube.nix b/pkgs/desktops/kde-4.11/kdegames/kjumpingcube.nix
new file mode 100644
index 00000000000..a6d22cff51c
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/kjumpingcube.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a simple dice driven tactical game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/klickety.nix b/pkgs/desktops/kde-4.11/kdegames/klickety.nix
new file mode 100644
index 00000000000..b592bc40641
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/klickety.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a puzzle game where the player removes groups of colored marbles to clear the board";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/klines.nix b/pkgs/desktops/kde-4.11/kdegames/klines.nix
new file mode 100644
index 00000000000..90952fe91c0
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/klines.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a simple but highly addictive one player game. The player has to move the colored balls around the game board, gathering them into the lines of the same color by five";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kmahjongg.nix b/pkgs/desktops/kde-4.11/kdegames/kmahjongg.nix
new file mode 100644
index 00000000000..946b531ff12
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/kmahjongg.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames, libkmahjongg }:
+kde {
+  buildInputs = [ kdelibs libkdegames libkmahjongg ];
+  meta = {
+    description = "the tiles are scrambled and staked on top of each other to resemble a certain shape. The player is then expected to remove all the tiles off the game board by locating each tile's matching pair";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kmines.nix b/pkgs/desktops/kde-4.11/kdegames/kmines.nix
new file mode 100644
index 00000000000..538454e9598
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/kmines.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a classic Minesweeper game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/knavalbattle.nix b/pkgs/desktops/kde-4.11/kdegames/knavalbattle.nix
new file mode 100644
index 00000000000..42ffd2fcb4d
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/knavalbattle.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a Battle Ship game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/knetwalk.nix b/pkgs/desktops/kde-4.11/kdegames/knetwalk.nix
new file mode 100644
index 00000000000..a16e578ce84
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/knetwalk.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a small game where you have to build up a computer network by rotating the wires to connect the terminals to the server";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kolf.nix b/pkgs/desktops/kde-4.11/kdegames/kolf.nix
new file mode 100644
index 00000000000..78815ee5799
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/kolf.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a miniature golf game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kollision.nix b/pkgs/desktops/kde-4.11/kdegames/kollision.nix
new file mode 100644
index 00000000000..3147c7305ea
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/kollision.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a simple ball dodging game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/konquest.nix b/pkgs/desktops/kde-4.11/kdegames/konquest.nix
new file mode 100644
index 00000000000..53ddd64928c
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/konquest.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "the KDE version of Gnu-Lactic Konquest";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kpat.nix b/pkgs/desktops/kde-4.11/kdegames/kpat.nix
new file mode 100644
index 00000000000..f8d9bad36dc
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/kpat.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a relaxing card sorting game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kreversi.nix b/pkgs/desktops/kde-4.11/kdegames/kreversi.nix
new file mode 100644
index 00000000000..2aed981428e
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/kreversi.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a simple one player strategy game played against the computer. If a player's piece is captured by an opposing player, that piece is turned over to reveal the color of that player";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kshisen.nix b/pkgs/desktops/kde-4.11/kdegames/kshisen.nix
new file mode 100644
index 00000000000..9c888034038
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/kshisen.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames, libkmahjongg }:
+kde {
+  buildInputs = [ kdelibs libkdegames libkmahjongg ];
+  meta = {
+    description = "a solitaire-like game played using the standard set of Mahjong tiles";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/ksirk.nix b/pkgs/desktops/kde-4.11/kdegames/ksirk.nix
new file mode 100644
index 00000000000..767eb67971a
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/ksirk.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames, qca2 }:
+kde {
+  buildInputs = [ kdelibs libkdegames qca2 ];
+  meta = {
+    description = "a computerized version of the well known strategic board game Risk";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/ksnakeduel.nix b/pkgs/desktops/kde-4.11/kdegames/ksnakeduel.nix
new file mode 100644
index 00000000000..ccf1fb551e9
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/ksnakeduel.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a simple Tron-Clone";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kspaceduel.nix b/pkgs/desktops/kde-4.11/kdegames/kspaceduel.nix
new file mode 100644
index 00000000000..5285f7916ca
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/kspaceduel.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "each of two possible players control a satellite spaceship orbiting the sun. As the game progresses players have to eliminate the opponent's spacecraft with bullets or mines";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/ksquares.nix b/pkgs/desktops/kde-4.11/kdegames/ksquares.nix
new file mode 100644
index 00000000000..a17be2da632
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/ksquares.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a game modeled after the well known pen and paper based game of Dots and Boxes";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/ksudoku.nix b/pkgs/desktops/kde-4.11/kdegames/ksudoku.nix
new file mode 100644
index 00000000000..ea4e13a5e4f
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/ksudoku.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a logic-based symbol placement puzzle";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/ktuberling.nix b/pkgs/desktops/kde-4.11/kdegames/ktuberling.nix
new file mode 100644
index 00000000000..1a6ba9d653c
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/ktuberling.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a simple constructor game suitable for children and adults alike";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kubrick.nix b/pkgs/desktops/kde-4.11/kdegames/kubrick.nix
new file mode 100644
index 00000000000..9bdc6879db4
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/kubrick.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a game based on the Rubik's Cube™ puzzle";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/libkdegames.nix b/pkgs/desktops/kde-4.11/kdegames/libkdegames.nix
new file mode 100644
index 00000000000..3819dcdc9ae
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/libkdegames.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, openal, libsndfile }:
+kde {
+  buildInputs = [ kdelibs openal libsndfile ];
+  meta = {
+    description = "KDE games library";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/libkmahjongg.nix b/pkgs/desktops/kde-4.11/kdegames/libkmahjongg.nix
new file mode 100644
index 00000000000..383b347dc33
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/libkmahjongg.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a library for KMahjongg game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/lskat.nix b/pkgs/desktops/kde-4.11/kdegames/lskat.nix
new file mode 100644
index 00000000000..2a5050cd667
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/lskat.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a fun and engaging card game for two players, where the second player is either live opponent, or a built in artificial intelligence";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/palapeli.nix b/pkgs/desktops/kde-4.11/kdegames/palapeli.nix
new file mode 100644
index 00000000000..010dbd5d623
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/palapeli.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+
+# TODO: package qvoronoi
+
+  buildInputs = [ kdelibs libkdegames ];
+
+  meta = {
+    description = "a single-player jigsaw puzzle game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegames/picmi.nix b/pkgs/desktops/kde-4.11/kdegames/picmi.nix
new file mode 100644
index 00000000000..165d7422f95
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegames/picmi.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a single player logic-based puzzle game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegraphics/gwenview.nix b/pkgs/desktops/kde-4.11/kdegraphics/gwenview.nix
new file mode 100644
index 00000000000..b6fd701ac12
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegraphics/gwenview.nix
@@ -0,0 +1,15 @@
+{ kde, kdelibs, exiv2, kde_baseapps, libkipi, nepomuk_core
+, libjpeg, pkgconfig, kactivities, lcms2 }:
+
+kde {
+
+  buildInputs =
+    [ kdelibs exiv2 nepomuk_core kactivities kde_baseapps libkipi libjpeg lcms2 ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = {
+    description = "Gwenview, the KDE image viewer";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegraphics/kamera.nix b/pkgs/desktops/kde-4.11/kdegraphics/kamera.nix
new file mode 100644
index 00000000000..70904b17c23
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegraphics/kamera.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, libgphoto2 }:
+
+kde {
+  buildInputs = [ kdelibs libgphoto2 ];
+
+  meta = {
+    description = "KDE camera interface library";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegraphics/kcolorchooser.nix b/pkgs/desktops/kde-4.11/kdegraphics/kcolorchooser.nix
new file mode 100644
index 00000000000..58528cb186b
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegraphics/kcolorchooser.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "A small utility to select a color";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegraphics/kdegraphics-mobipocket.nix b/pkgs/desktops/kde-4.11/kdegraphics/kdegraphics-mobipocket.nix
new file mode 100644
index 00000000000..2c2ba3796a2
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegraphics/kdegraphics-mobipocket.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, okular }:
+
+kde {
+  buildInputs = [ kdelibs okular ];
+
+  meta = {
+    description = "A collection of plugins to handle mobipocket files";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegraphics/kdegraphics-strigi-analyzer.nix b/pkgs/desktops/kde-4.11/kdegraphics/kdegraphics-strigi-analyzer.nix
new file mode 100644
index 00000000000..35af39aa611
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegraphics/kdegraphics-strigi-analyzer.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, libtiff }:
+
+kde {
+  buildInputs = [ kdelibs libtiff ];
+
+  meta = {
+    description = "Strigi analyzers for various graphics file formats";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegraphics/kdegraphics-thumbnailers.nix b/pkgs/desktops/kde-4.11/kdegraphics/kdegraphics-thumbnailers.nix
new file mode 100644
index 00000000000..18c6534eb5c
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegraphics/kdegraphics-thumbnailers.nix
@@ -0,0 +1,13 @@
+{ kde, kdelibs, libkexiv2, libkdcraw, pkgconfig }:
+
+kde {
+
+  buildInputs = [ kdelibs libkexiv2 libkdcraw ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = {
+    description = "Thumbnailers for various graphics file formats";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegraphics/kgamma.nix b/pkgs/desktops/kde-4.11/kdegraphics/kgamma.nix
new file mode 100644
index 00000000000..28d9252187e
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegraphics/kgamma.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, libXxf86vm }:
+
+kde {
+  buildInputs = [ kdelibs libXxf86vm ];
+
+  meta = {
+    description = "KDE monitor calibration tool";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegraphics/kolourpaint.nix b/pkgs/desktops/kde-4.11/kdegraphics/kolourpaint.nix
new file mode 100644
index 00000000000..5276ec09f46
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegraphics/kolourpaint.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, qimageblitz }:
+
+kde {
+  buildInputs = [ kdelibs qimageblitz ];
+
+  meta = {
+    description = "KDE paint program";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegraphics/kruler.nix b/pkgs/desktops/kde-4.11/kdegraphics/kruler.nix
new file mode 100644
index 00000000000..c5c2c6e05d7
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegraphics/kruler.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE screen ruler";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegraphics/ksaneplugin.nix b/pkgs/desktops/kde-4.11/kdegraphics/ksaneplugin.nix
new file mode 100644
index 00000000000..1381ed7dd26
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegraphics/ksaneplugin.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, libksane }:
+
+kde {
+  buildInputs = [ kdelibs libksane ];
+
+  meta = {
+    description = "A KScan plugin that implements the scanning through libksane";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegraphics/ksnapshot.nix b/pkgs/desktops/kde-4.11/kdegraphics/ksnapshot.nix
new file mode 100644
index 00000000000..f01a609e20d
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegraphics/ksnapshot.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, libkipi }:
+
+kde {
+  buildInputs = [ kdelibs libkipi ];
+
+  meta = {
+    description = "KDE screenshot utility";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegraphics/libkdcraw.nix b/pkgs/desktops/kde-4.11/kdegraphics/libkdcraw.nix
new file mode 100644
index 00000000000..b4d5e5922ca
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegraphics/libkdcraw.nix
@@ -0,0 +1,13 @@
+{ kde, kdelibs, libjpeg_original, lcms1, jasper, pkgconfig }:
+
+kde {
+
+  buildInputs = [ kdelibs libjpeg_original lcms1 jasper ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = {
+    description = "Library for decoding RAW images";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegraphics/libkexiv2.nix b/pkgs/desktops/kde-4.11/kdegraphics/libkexiv2.nix
new file mode 100644
index 00000000000..096b0a6e957
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegraphics/libkexiv2.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, exiv2 }:
+
+kde {
+  buildInputs = [ kdelibs exiv2 ];
+
+  meta = {
+    description = "Exiv2 support library";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegraphics/libkipi.nix b/pkgs/desktops/kde-4.11/kdegraphics/libkipi.nix
new file mode 100644
index 00000000000..6b16265e7a3
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegraphics/libkipi.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Interface library to kipi-plugins";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegraphics/libksane.nix b/pkgs/desktops/kde-4.11/kdegraphics/libksane.nix
new file mode 100644
index 00000000000..b539eab3899
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegraphics/libksane.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, saneBackends }:
+
+kde {
+  buildInputs = [ kdelibs saneBackends ];
+
+  meta = {
+    description = "An image scanning library that provides a QWidget that contains all the logic needed to interface a sacanner";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegraphics/okular.nix b/pkgs/desktops/kde-4.11/kdegraphics/okular.nix
new file mode 100644
index 00000000000..17b8a33ed43
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegraphics/okular.nix
@@ -0,0 +1,17 @@
+{ chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, popplerQt4, qca2
+, qimageblitz, libtiff, kactivities, pkgconfig }:
+
+kde {
+
+# TODO: package activeapp
+
+  buildInputs =
+    [ kdelibs chmlib djvulibre ebook_tools libspectre popplerQt4 qca2 qimageblitz libtiff kactivities ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = {
+    description = "Okular, the KDE document viewer";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdegraphics/svgpart.nix b/pkgs/desktops/kde-4.11/kdegraphics/svgpart.nix
new file mode 100644
index 00000000000..a344cc4b4b4
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdegraphics/svgpart.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "SVG KPart";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdelibs/kdelibs.nix b/pkgs/desktops/kde-4.11/kdelibs/kdelibs.nix
new file mode 100644
index 00000000000..0bf18e8efb0
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdelibs/kdelibs.nix
@@ -0,0 +1,46 @@
+{ kde, gcc, cmake, perl
+, qt4, bzip2, fam, shared_mime_info, giflib, jasper, strigi
+, openexr, avahi, kerberos, shared_desktop_ontologies, libXScrnSaver
+, automoc4, soprano, qca2, attica, enchant, libdbusmenu_qt, grantlee
+, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1, acl
+, udev, herqq, phonon, libjpeg, xz, ilmbase, libxslt
+, pkgconfig
+}:
+
+kde {
+
+# TODO: media-player-info, ACL
+
+  buildInputs =
+    [ pkgconfig attica avahi bzip2 enchant fam giflib grantlee herqq
+      libdbusmenu_qt libXScrnSaver polkit_qt_1 qca2 acl jasper libxslt 
+      shared_desktop_ontologies xz udev libjpeg kerberos openexr
+    ];
+
+  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
+
+  propagatedBuildInputs = [ qt4 soprano phonon strigi ];
+
+  propagatedNativeBuildInputs = [ automoc4 cmake perl shared_mime_info ];
+
+  # TODO: make sonnet plugins (dictionaries) really work.
+  # There are a few hardcoded paths.
+  # Split plugins from libs?
+
+  patches = [ ../files/polkit-install.patch ];
+
+  # cmake fails to find acl.h because of C++-style comment
+
+  cmakeFlags = [
+    "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
+    "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
+    "-DHUPNP_ENABLED=ON"
+  ];
+
+  passthru.wantsUdisks2 = false;
+
+  meta = {
+    description = "KDE libraries";
+    license = "LGPL";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdelibs/nepomuk-core.nix b/pkgs/desktops/kde-4.11/kdelibs/nepomuk-core.nix
new file mode 100644
index 00000000000..0bd0bf378dd
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdelibs/nepomuk-core.nix
@@ -0,0 +1,20 @@
+{ kde, kdelibs, soprano, shared_desktop_ontologies, exiv2, ffmpeg, taglib, popplerQt4
+, pkgconfig, doxygen, ebook_tools
+}:
+
+kde {
+
+# TODO: epub
+
+  buildInputs = [
+    kdelibs soprano shared_desktop_ontologies taglib exiv2 ffmpeg
+    popplerQt4 ebook_tools
+  ];
+
+  nativeBuildInputs = [ pkgconfig doxygen ];
+
+  meta = {
+    description = "NEPOMUK core";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdelibs/nepomuk-widgets.nix b/pkgs/desktops/kde-4.11/kdelibs/nepomuk-widgets.nix
new file mode 100644
index 00000000000..0d29a4f97de
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdelibs/nepomuk-widgets.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs, nepomuk_core }:
+
+kde {
+
+  buildInputs = [ kdelibs nepomuk_core ];
+
+  meta = {
+    description = "NEPOMUK Widgets";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdemultimedia/audiocd-kio.nix b/pkgs/desktops/kde-4.11/kdemultimedia/audiocd-kio.nix
new file mode 100644
index 00000000000..4c56e7529dd
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdemultimedia/audiocd-kio.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkcompactdisc, cdparanoia, libkcddb, libvorbis, flac, lame }:
+kde {
+  buildInputs = [ kdelibs libkcompactdisc cdparanoia libkcddb libvorbis flac lame ];
+  meta = {
+    description = "transparent audio CD access for applications using the KDE Platform";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdemultimedia/dragon.nix b/pkgs/desktops/kde-4.11/kdemultimedia/dragon.nix
new file mode 100644
index 00000000000..006300742ec
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdemultimedia/dragon.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs }:
+kde {
+  buildInputs = [ kdelibs ];
+  meta = {
+    description = "a multimedia player with the focus on simplicity";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdemultimedia/ffmpegthumbs.nix b/pkgs/desktops/kde-4.11/kdemultimedia/ffmpegthumbs.nix
new file mode 100644
index 00000000000..45f6c9abcb6
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdemultimedia/ffmpegthumbs.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, ffmpeg }:
+kde {
+  buildInputs = [ kdelibs ffmpeg ];
+  meta = {
+    description = "a video thumbnail generator for KDE file managers like Dolphin and Konqueror";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdemultimedia/juk.nix b/pkgs/desktops/kde-4.11/kdemultimedia/juk.nix
new file mode 100644
index 00000000000..5d7b1db224e
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdemultimedia/juk.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, taglib, libtunepimp }:
+kde {
+
+# TODO: opusfile
+
+  buildInputs = [ kdelibs taglib libtunepimp ];
+  meta = {
+    description = "an audio jukebox application";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdemultimedia/kmix.nix b/pkgs/desktops/kde-4.11/kdemultimedia/kmix.nix
new file mode 100644
index 00000000000..1dd8108166f
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdemultimedia/kmix.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libcanberra, pulseaudio }:
+kde {
+  buildInputs = [ kdelibs libcanberra pulseaudio ];
+  meta = {
+    description = "sound mixer, an application to allow you to change the volume of your sound card";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdemultimedia/kscd.nix b/pkgs/desktops/kde-4.11/kdemultimedia/kscd.nix
new file mode 100644
index 00000000000..e99ae53935b
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdemultimedia/kscd.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libmusicbrainz }:
+kde {
+  buildInputs = [ kdelibs libmusicbrainz ];
+  meta = {
+    description = "KDE CD player";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdemultimedia/libkcddb.nix b/pkgs/desktops/kde-4.11/kdemultimedia/libkcddb.nix
new file mode 100644
index 00000000000..720b01d1861
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdemultimedia/libkcddb.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs }:
+kde {
+#todo: libmusicbrainz5
+  buildInputs = [ kdelibs ];
+  meta = {
+    description = "a library used to retrieve audio CD meta data from the internet";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdemultimedia/libkcompactdisc.nix b/pkgs/desktops/kde-4.11/kdemultimedia/libkcompactdisc.nix
new file mode 100644
index 00000000000..6ed08af89f3
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdemultimedia/libkcompactdisc.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs }:
+kde {
+  buildInputs = [ kdelibs ];
+  meta = {
+    description = "KDE library for playing & ripping CDs";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdemultimedia/mplayerthumbs.nix b/pkgs/desktops/kde-4.11/kdemultimedia/mplayerthumbs.nix
new file mode 100644
index 00000000000..c88ebcc2a5a
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdemultimedia/mplayerthumbs.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs }:
+kde {
+  buildInputs = [ kdelibs ];
+  meta = {
+    description = "a video thumbnail generator for KDE";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdenetwork/kdenetwork-filesharing.nix b/pkgs/desktops/kde-4.11/kdenetwork/kdenetwork-filesharing.nix
new file mode 100644
index 00000000000..0330511a258
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdenetwork/kdenetwork-filesharing.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE properties dialog plugin to share a directory with the local network";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdenetwork/kdenetwork-strigi-analyzers.nix b/pkgs/desktops/kde-4.11/kdenetwork/kdenetwork-strigi-analyzers.nix
new file mode 100644
index 00000000000..e838d84fc5e
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdenetwork/kdenetwork-strigi-analyzers.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, boost }:
+
+kde {
+  buildInputs = [ kdelibs boost ];
+
+  meta = {
+    description = "Strigi analyzers for various network protocols";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdenetwork/kdnssd.nix b/pkgs/desktops/kde-4.11/kdenetwork/kdnssd.nix
new file mode 100644
index 00000000000..f65960cc337
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdenetwork/kdnssd.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE tool that monitors the network for DNS-SD services";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdenetwork/kget.nix b/pkgs/desktops/kde-4.11/kdenetwork/kget.nix
new file mode 100644
index 00000000000..f986da2de21
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdenetwork/kget.nix
@@ -0,0 +1,20 @@
+{ kde, kdelibs, libktorrent, kde_workspace, sqlite, boost
+, kde_baseapps, libmms, qca2, nepomuk_core, nepomuk_widgets
+, pkgconfig }:
+
+kde {
+
+# TODO: QGpgME
+
+  buildInputs =
+    [ kdelibs libktorrent nepomuk_core nepomuk_widgets sqlite qca2
+      libmms kde_baseapps kde_workspace boost ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  KDEDIRS = libktorrent;
+
+  meta = {
+    description = "KDE download manager";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.11/kdenetwork/kopete.nix
new file mode 100644
index 00000000000..961d646474e
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdenetwork/kopete.nix
@@ -0,0 +1,27 @@
+{ kde, kdelibs, speex, libmsn, libotr, kdepimlibs, qimageblitz, libktorrent,
+  jasper, libidn, mediastreamer, msilbc, pkgconfig, libxslt, giflib,
+  libgadu, boost, qca2, gpgme, sqlite, telepathy_qt, shared_desktop_ontologies,
+  libjpeg, libmms, ortp, srtp, libv4l}:
+
+kde {
+
+# TODO: libmeanwhile, xmms, jsoncpp
+# commented out deps seem to not be needed anymore, but why so many?
+
+  buildInputs = [
+    kdelibs qca2 mediastreamer libgadu # telepathy_qt shared_desktop_ontologies  gpgme 
+    kdepimlibs qimageblitz sqlite jasper libotr libmsn giflib # libktorrent libjpeg 
+    libidn libxslt boost # speex  libmms msilbc
+    ortp srtp libv4l
+  ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  KDEDIRS = libktorrent;
+
+  cmakeFlags = [ "-DBUILD_skypebuttons=TRUE" ];
+
+  meta = {
+    description = "A KDE multi-protocol IM client";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdenetwork/kppp.nix b/pkgs/desktops/kde-4.11/kdenetwork/kppp.nix
new file mode 100644
index 00000000000..4c6bd65769f
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdenetwork/kppp.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "PPP(Dial-Up) client tool";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdenetwork/krdc.nix b/pkgs/desktops/kde-4.11/kdenetwork/krdc.nix
new file mode 100644
index 00000000000..80557e827fe
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdenetwork/krdc.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libvncserver, freerdp, telepathy_qt }:
+
+kde {
+  buildInputs = [ kdelibs libvncserver freerdp telepathy_qt ];
+
+  meta = {
+    description = "KDE remote desktop client";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdenetwork/krfb.nix b/pkgs/desktops/kde-4.11/kdenetwork/krfb.nix
new file mode 100644
index 00000000000..cb4857965a3
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdenetwork/krfb.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libvncserver, libXdamage, libXtst, libjpeg, telepathy_qt }:
+
+kde {
+  buildInputs = [ kdelibs libvncserver libXdamage libXtst libjpeg telepathy_qt ];
+
+  meta = {
+    description = "KDE desktop sharing";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdepim-runtime.nix b/pkgs/desktops/kde-4.11/kdepim-runtime.nix
new file mode 100644
index 00000000000..43006fe5115
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdepim-runtime.nix
@@ -0,0 +1,16 @@
+{ kde, libxslt, boost, kdepimlibs, akonadi, shared_desktop_ontologies }:
+
+kde {
+
+# TODO: libkgapi, LibKFbAPI,libkolab, libkolabxml
+
+  buildInputs = [
+    kdepimlibs akonadi boost shared_desktop_ontologies
+    libxslt
+  ];
+
+  meta = {
+    description = "KDE PIM runtime";
+    license = "GPL";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdepim.nix b/pkgs/desktops/kde-4.11/kdepim.nix
new file mode 100644
index 00000000000..f5e28a044bb
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdepim.nix
@@ -0,0 +1,28 @@
+{ kde, boost, gpgme, libassuan, libxslt, kdepimlibs, kdepim_runtime
+, akonadi, shared_desktop_ontologies, cyrus_sasl, grantlee, prison
+, nepomuk_widgets, kactivities, libXScrnSaver
+, pkgconfig }:
+
+kde {
+
+# TODO: LinkGrammar
+
+  buildInputs =
+    [ kdepimlibs boost shared_desktop_ontologies akonadi nepomuk_widgets
+      libxslt cyrus_sasl gpgme libassuan grantlee prison kactivities
+      libXScrnSaver
+    ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  passthru.propagatedUserEnvPackages = [ akonadi kdepimlibs kdepim_runtime ];
+
+  meta = {
+    description = "KDE PIM tools";
+    longDescription = ''
+      Contains various personal information management tools for KDE, such as an organizer.
+    '';
+    license = "GPL";
+    homepage = http://pim.kde.org;
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdepimlibs.nix b/pkgs/desktops/kde-4.11/kdepimlibs.nix
new file mode 100644
index 00000000000..ca0af9400b1
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdepimlibs.nix
@@ -0,0 +1,19 @@
+{ kde, pkgconfig, boost, cyrus_sasl, gpgme, libical, openldap, prison
+, kdelibs, akonadi, libxslt, nepomuk_core
+, shared_desktop_ontologies, qjson }:
+
+kde {
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs =
+    [ boost gpgme libical libxslt qjson prison
+      openldap cyrus_sasl akonadi shared_desktop_ontologies
+    ];
+
+  propagatedBuildInputs = [ kdelibs nepomuk_core ];
+
+  meta = {
+    description = "KDE PIM libraries";
+    license = "LGPL";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeplasma-addons.nix b/pkgs/desktops/kde-4.11/kdeplasma-addons.nix
new file mode 100644
index 00000000000..550099830d9
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeplasma-addons.nix
@@ -0,0 +1,23 @@
+{ kde, kdelibs, marble, shared_desktop_ontologies, pkgconfig
+, boost, eigen, kde_workspace, attica, qca2, qimageblitz
+, kdepimlibs, libkexiv2, libqalculate, libXtst, libdbusmenu_qt
+, qjson, qoauth }:
+
+kde {
+
+# TODO: qwt, scim, ibus
+
+  KDEDIRS=marble;
+
+  buildInputs = [ kdelibs boost kde_workspace kdepimlibs attica qjson qoauth
+                  eigen qca2 libXtst qimageblitz libqalculate 
+                  shared_desktop_ontologies marble libkexiv2 libdbusmenu_qt
+  ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = {
+    description = "KDE Plasma Addons";
+    license = "GPL";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdesdk/cervisia.nix b/pkgs/desktops/kde-4.11/kdesdk/cervisia.nix
new file mode 100644
index 00000000000..1dabe46cd42
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdesdk/cervisia.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "A KDE CVS frontend";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdesdk/dolphin-plugins.nix b/pkgs/desktops/kde-4.11/kdesdk/dolphin-plugins.nix
new file mode 100644
index 00000000000..ad8132a850e
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdesdk/dolphin-plugins.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs, kde_baseapps }:
+
+kde {
+
+  # Needs kdebase for libkonq
+  buildInputs = [ kdelibs kde_baseapps ];
+
+  meta = {
+    description = "Svn, mercurial, git and bazaar plugins for dolphin";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdesdk/kapptemplate.nix b/pkgs/desktops/kde-4.11/kdesdk/kapptemplate.nix
new file mode 100644
index 00000000000..391536248dd
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdesdk/kapptemplate.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "A KDE 4 project template generator";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdesdk/kcachegrind.nix b/pkgs/desktops/kde-4.11/kdesdk/kcachegrind.nix
new file mode 100644
index 00000000000..65d410cca48
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdesdk/kcachegrind.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE Frontend for Callgrind/Cachegrind";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdesdk/kde-dev-scripts.nix b/pkgs/desktops/kde-4.11/kdesdk/kde-dev-scripts.nix
new file mode 100644
index 00000000000..df81145e5d6
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdesdk/kde-dev-scripts.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Various scripts to ease KDE development";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdesdk/kde-dev-utils.nix b/pkgs/desktops/kde-4.11/kdesdk/kde-dev-utils.nix
new file mode 100644
index 00000000000..215c0a3c613
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdesdk/kde-dev-utils.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs, gcc, libtool }:
+
+kde {
+  buildInputs = [ kdelibs libtool ];
+
+  preConfigure = "export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.gcc}";
+
+  meta = {
+    description = "various KDE development utilities";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdesdk/kdesdk-kioslaves.nix b/pkgs/desktops/kde-4.11/kdesdk/kdesdk-kioslaves.nix
new file mode 100644
index 00000000000..98bbce35a97
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdesdk/kdesdk-kioslaves.nix
@@ -0,0 +1,12 @@
+{ kde, kdelibs, subversionClient, apr, aprutil,perl }:
+
+kde {
+
+  buildInputs = [ kdelibs subversionClient apr aprutil perl ];
+
+  cmakeFlags = [ "-DBUILD_perldoc=ON" ];
+
+  meta = {
+    description = "Subversion and perldoc kioslaves";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdesdk/kdesdk-strigi-analyzers.nix b/pkgs/desktops/kde-4.11/kdesdk/kdesdk-strigi-analyzers.nix
new file mode 100644
index 00000000000..4d579b88ba8
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdesdk/kdesdk-strigi-analyzers.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Strigi analyzers for diff, po and ts";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdesdk/kdesdk-thumbnailers.nix b/pkgs/desktops/kde-4.11/kdesdk/kdesdk-thumbnailers.nix
new file mode 100644
index 00000000000..d707fe9038f
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdesdk/kdesdk-thumbnailers.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, gettext }:
+
+kde {
+
+  buildInputs = [ kdelibs gettext ];
+
+  meta = {
+    description = "PO file format thumbnailer";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdesdk/kompare.nix b/pkgs/desktops/kde-4.11/kdesdk/kompare.nix
new file mode 100644
index 00000000000..1ddb4b8ea5b
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdesdk/kompare.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "A program to view the differences between files and optionally generate a diff";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdesdk/lokalize.nix b/pkgs/desktops/kde-4.11/kdesdk/lokalize.nix
new file mode 100644
index 00000000000..1565426eb1f
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdesdk/lokalize.nix
@@ -0,0 +1,13 @@
+{ kde, kdelibs, hunspell }:
+
+kde {
+  buildInputs = [ kdelibs hunspell ];
+
+  meta = {
+    description = "KDE 4 Computer-aided translation system";
+    longDescription = ''
+      Computer-aided translation system.
+      Do not translate what had already been translated.
+    '';
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdesdk/okteta.nix b/pkgs/desktops/kde-4.11/kdesdk/okteta.nix
new file mode 100644
index 00000000000..058636596ad
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdesdk/okteta.nix
@@ -0,0 +1,13 @@
+{ kde, kdelibs, qca2 }:
+
+kde {
+  buildInputs = [ kdelibs qca2 ];
+
+# TODO: Look what does -DBUILD_mobile add
+
+  enableParallelBuilding = false;
+
+  meta = {
+    description = "KDE byte editor";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdesdk/poxml.nix b/pkgs/desktops/kde-4.11/kdesdk/poxml.nix
new file mode 100644
index 00000000000..6e46c3e3ab4
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdesdk/poxml.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, antlr, gettext }:
+
+kde {
+  buildInputs = [ kdelibs antlr gettext ];
+
+  meta = {
+    description = "Po<->xml tools";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdesdk/umbrello.nix b/pkgs/desktops/kde-4.11/kdesdk/umbrello.nix
new file mode 100644
index 00000000000..e83a2d9a901
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdesdk/umbrello.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libxml2, libxslt, boost }:
+
+kde {
+  buildInputs = [ kdelibs libxml2 libxslt boost ];
+
+  meta = {
+    description = "Umbrello UML modeller";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdetoys/amor.nix b/pkgs/desktops/kde-4.11/kdetoys/amor.nix
new file mode 100644
index 00000000000..936d63d544a
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdetoys/amor.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE creature for your desktop";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdetoys/kteatime.nix b/pkgs/desktops/kde-4.11/kdetoys/kteatime.nix
new file mode 100644
index 00000000000..dacf54def4b
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdetoys/kteatime.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE utility for making a fine cup of tea";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdetoys/ktux.nix b/pkgs/desktops/kde-4.11/kdetoys/ktux.nix
new file mode 100644
index 00000000000..108f9be7c72
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdetoys/ktux.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, kde_workspace }:
+
+kde {
+  buildInputs = [ kdelibs kde_workspace ];
+
+  meta = {
+    description = "Tux Screen Saver";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeutils/ark.nix b/pkgs/desktops/kde-4.11/kdeutils/ark.nix
new file mode 100644
index 00000000000..eb3e12281d6
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeutils/ark.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libarchive, bzip2, kde_baseapps, lzma, qjson }:
+
+kde {
+  buildInputs = [ kdelibs kde_baseapps libarchive bzip2 lzma qjson ];
+
+  meta = {
+    description = "KDE Archiving Tool";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeutils/filelight.nix b/pkgs/desktops/kde-4.11/kdeutils/filelight.nix
new file mode 100644
index 00000000000..25ecabed27c
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeutils/filelight.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Tool to visualise file and directory sizes";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeutils/kcalc.nix b/pkgs/desktops/kde-4.11/kdeutils/kcalc.nix
new file mode 100644
index 00000000000..08b202e8f0e
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeutils/kcalc.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, gmp }:
+
+kde {
+  buildInputs = [ kdelibs gmp ];
+
+  meta = {
+    description = "KDE Calculator";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeutils/kcharselect.nix b/pkgs/desktops/kde-4.11/kdeutils/kcharselect.nix
new file mode 100644
index 00000000000..d4c9c06f483
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeutils/kcharselect.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE character selection utility";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeutils/kdf.nix b/pkgs/desktops/kde-4.11/kdeutils/kdf.nix
new file mode 100644
index 00000000000..3f9da58d0a6
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeutils/kdf.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE free disk space utility";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeutils/kfloppy.nix b/pkgs/desktops/kde-4.11/kdeutils/kfloppy.nix
new file mode 100644
index 00000000000..2434a4fa671
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeutils/kfloppy.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Floppy disk formatting utility";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeutils/kgpg.nix b/pkgs/desktops/kde-4.11/kdeutils/kgpg.nix
new file mode 100644
index 00000000000..944b9edc64d
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeutils/kgpg.nix
@@ -0,0 +1,12 @@
+{ kde, kdelibs, kdepimlibs, libuuid }:
+
+kde {
+
+# TODO: uuid/uuid.h - not found
+
+  buildInputs = [ kdelibs kdepimlibs libuuid ];
+
+  meta = {
+    description = "Simple KDE GUI for GPG";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeutils/kremotecontrol.nix b/pkgs/desktops/kde-4.11/kdeutils/kremotecontrol.nix
new file mode 100644
index 00000000000..70311a789f9
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeutils/kremotecontrol.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libXtst }:
+
+kde {
+  buildInputs = [ kdelibs libXtst ];
+
+  meta = {
+    description = "KDE remote control";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeutils/ktimer.nix b/pkgs/desktops/kde-4.11/kdeutils/ktimer.nix
new file mode 100644
index 00000000000..5700977349e
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeutils/ktimer.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE Timer";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeutils/kwallet.nix b/pkgs/desktops/kde-4.11/kdeutils/kwallet.nix
new file mode 100644
index 00000000000..9ec0e6c0396
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeutils/kwallet.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE Wallet (password storage) management tool";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeutils/print-manager.nix b/pkgs/desktops/kde-4.11/kdeutils/print-manager.nix
new file mode 100644
index 00000000000..ae72becd1e4
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeutils/print-manager.nix
@@ -0,0 +1,27 @@
+{ kde, kdelibs
+, pythonPackages, cups, pyqt4, pykde4, pycups, system_config_printer }:
+
+let s_c_p = system_config_printer.override { withGUI = false; }; in
+
+kde rec {
+  buildInputs = [ kdelibs pythonPackages.python pythonPackages.wrapPython
+    ] ++ pythonPath;
+
+  pythonPath = [ cups pyqt4 pykde4 pycups s_c_p ];
+
+  passthru.propagatedUserEnvPackages = [ s_c_p ];
+
+  postInstall =
+    ''
+      wrapPythonPrograms
+
+      # "system-config-printer" supplies some D-Bus policy that we need.
+      mkdir -p $out/nix-support
+      echo ${s_c_p} > $out/nix-support/propagated-user-env-packages
+    '';
+
+  meta = {
+    description = "KDE printer manager";
+    longDescription = "Applet to view current print jobs and configure new printers";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeutils/superkaramba.nix b/pkgs/desktops/kde-4.11/kdeutils/superkaramba.nix
new file mode 100644
index 00000000000..cbe7a285606
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeutils/superkaramba.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs, qimageblitz, python }:
+
+kde {
+  buildInputs = [ kdelibs qimageblitz python ];
+
+  cmakeFlags = [ "-DBUILD_icons=TRUE" "-DBUILD_plasma=TRUE" ];
+
+  meta = {
+    description = "A KDE Eye-candy Application";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdeutils/sweeper.nix b/pkgs/desktops/kde-4.11/kdeutils/sweeper.nix
new file mode 100644
index 00000000000..78d56c7df30
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdeutils/sweeper.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Helps clean unwanted traces the user leaves on the system";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdewebdev/kfilereplace.nix b/pkgs/desktops/kde-4.11/kdewebdev/kfilereplace.nix
new file mode 100644
index 00000000000..55e37809e07
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdewebdev/kfilereplace.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Batch search and replace tool";
+    homepage = http://www.kdewebdev.org;
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdewebdev/kimagemapeditor.nix b/pkgs/desktops/kde-4.11/kdewebdev/kimagemapeditor.nix
new file mode 100644
index 00000000000..6d22f72461f
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdewebdev/kimagemapeditor.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "An HTML imagemap editor";
+    homepage = http://www.nongnu.org/kimagemap/;
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdewebdev/klinkstatus.nix b/pkgs/desktops/kde-4.11/kdewebdev/klinkstatus.nix
new file mode 100644
index 00000000000..33a4d8c6083
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdewebdev/klinkstatus.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs, libxml2, libxslt, kdepimlibs, htmlTidy, boost, ruby18 }:
+
+kde {
+
+  buildInputs = [ kdelibs kdepimlibs ruby18 htmlTidy boost ];
+
+  meta = {
+    description = "A KDE link checker";
+    homepage = http://klinkstatus.kdewebdev.org;
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/kdewebdev/kommander.nix b/pkgs/desktops/kde-4.11/kdewebdev/kommander.nix
new file mode 100644
index 00000000000..d5f4337f714
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kdewebdev/kommander.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "A graphical editor of scripted dialogs";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/l10n/default.nix b/pkgs/desktops/kde-4.11/l10n/default.nix
new file mode 100644
index 00000000000..57d41fb35bf
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/l10n/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchurl, kdelibs, gettext, release, stable }:
+
+let
+
+  inherit (stdenv.lib) attrByPath singleton;
+
+  kdeL10nDerivation =
+    { lang, saneName, sha256 }:
+
+    stdenv.mkDerivation rec {
+      name = "kde-l10n-${saneName}-${release}";
+
+      src = fetchurl {
+        url = "mirror://kde/${if stable then "" else "un"}stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.xz";
+        name = "${name}.tar.xz";
+        inherit sha256;
+      };
+
+      buildInputs = [ gettext kdelibs ];
+
+      cmakeFlags = "-Wno-dev";
+
+      meta = {
+        description = "KDE translation for ${lang}";
+        license = "GPL";
+        inherit (kdelibs.meta) maintainers platforms homepage;
+      };
+    };
+
+  kdeL10nRelease =
+    builtins.listToAttrs (
+      map ({lang, saneName, sha256}:
+        {
+          name = saneName;
+          value = kdeL10nDerivation { inherit lang saneName sha256; };
+        }
+      ) (import (./manifest + "-${release}.nix"))
+    );
+
+in
+{
+  inherit kdeL10nDerivation;
+  recurseForDerivations = true;
+} // kdeL10nRelease
diff --git a/pkgs/desktops/kde-4.11/l10n/l10n-manifest.sh b/pkgs/desktops/kde-4.11/l10n/l10n-manifest.sh
new file mode 100755
index 00000000000..ec159a1e204
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/l10n/l10n-manifest.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+# Usage: download kde-l10n to $dir, then run
+# $0 $dir
+
+dir=$1
+
+if [[ ! -d "${dir}" ]]; then
+  echo "${dir} is not a directory (or doesn't exist)!" >&2
+  exit 1
+fi
+
+release=$(ls "${dir}"/kde-l10n-en_GB-*.tar.xz | \
+	sed -e 's/.*en_GB-//' -e 's/\.tar\.xz//')
+
+echo "Detected release ${release}" >&2
+
+exec > "manifest-${release}.nix"
+echo "["
+for i in `cd "${dir}"; ls kde-l10n-*-${release}.tar.xz`; do
+  lang=${i%-${release}.tar.xz}
+  lang=${lang#kde-l10n-}
+  echo -n "${lang}.. " >&2
+  hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
+  echo "{"
+  echo "  lang = \"${lang}\";"
+  echo "  saneName = \"$(echo $lang | sed s^@^_^g)\";"
+  echo "  sha256 = \"${hash}\";"
+  echo "}"
+  echo $hash >&2
+done
+echo "]"
diff --git a/pkgs/desktops/kde-4.11/l10n/manifest-4.11.0.nix b/pkgs/desktops/kde-4.11/l10n/manifest-4.11.0.nix
new file mode 100644
index 00000000000..c3a46c7637e
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/l10n/manifest-4.11.0.nix
@@ -0,0 +1,272 @@
+[
+{
+  lang = "ar";
+  saneName = "ar";
+  sha256 = "10bgdg0npcnxyyqgs1dyfabq8fv08qqifd2vyaffxal3n2qagi1l";
+}
+{
+  lang = "bg";
+  saneName = "bg";
+  sha256 = "0jqnav02skkkjphjc3llsqqhb6fid74djng17yhcl1zzdcim2xg1";
+}
+{
+  lang = "bs";
+  saneName = "bs";
+  sha256 = "1fh9zddwjz3wirhcr962hcaxri9342q39nqgi1xmwdj2n3mj57xk";
+}
+{
+  lang = "ca";
+  saneName = "ca";
+  sha256 = "1y83qi5j5wx6fb0zbch3q95nsrhf4x2rrkcxdfcgfx7gwr04d2fz";
+}
+{
+  lang = "ca@valencia";
+  saneName = "ca_valencia";
+  sha256 = "1pqbl2mwnpkiby0gm1dk55cij2x1501pgn74zkasy2agacvfaslb";
+}
+{
+  lang = "cs";
+  saneName = "cs";
+  sha256 = "1cnmsjfzc8cimp0h06dm7rfmj9rw47f61py8z288a0iw7j5rgrr4";
+}
+{
+  lang = "da";
+  saneName = "da";
+  sha256 = "0a7jhy43j9x7z0bp5yijvkx51zfycizvd6kd9a7d88467vxc54hz";
+}
+{
+  lang = "de";
+  saneName = "de";
+  sha256 = "1i2gc86b77k5swmphl25ivpigiqrkhipmnc2vmrp444jialksgdy";
+}
+{
+  lang = "el";
+  saneName = "el";
+  sha256 = "1pgc64gw46gb8hbjmw06q1d6rawpcqw8llgp55drghcjy484j1sw";
+}
+{
+  lang = "en_GB";
+  saneName = "en_GB";
+  sha256 = "0p1cralvfggqnjvikrgibvlic01fpc5fbdyxjrhrhj195f30sjmw";
+}
+{
+  lang = "es";
+  saneName = "es";
+  sha256 = "0msz90jyac7y20rdglbmr8jf7yhb7vwncjynfgrvxd9b998rk4h8";
+}
+{
+  lang = "et";
+  saneName = "et";
+  sha256 = "1yykm0hg4bay7i3i16ssa0rvf3kmqv3vgq3gxmism774c4sgng2i";
+}
+{
+  lang = "eu";
+  saneName = "eu";
+  sha256 = "00ma7hhjj08gwzy6f9xmbakkbhcc2gpn5v2j1jdqah52jmnw2d1c";
+}
+{
+  lang = "fa";
+  saneName = "fa";
+  sha256 = "045wmlmv2rwik1c4v94d68c62bqkrmf6igxz65dv4hw2f5jj86gr";
+}
+{
+  lang = "fi";
+  saneName = "fi";
+  sha256 = "1sbgdhr60f10g4lxlcqsx4pid3lmzs2rywdjpqil9ymfy2kpbrc6";
+}
+{
+  lang = "fr";
+  saneName = "fr";
+  sha256 = "07y67hg9rp4xckg19zk0lkhrd7i857qkqsbxc0wa9a9chldspjvs";
+}
+{
+  lang = "ga";
+  saneName = "ga";
+  sha256 = "1jrr7d14i18r1v1d20vrjn942wa5ppp6zxl6xk6vjsvbz66aj36g";
+}
+{
+  lang = "gl";
+  saneName = "gl";
+  sha256 = "1af0wldc8f01zdlc184zqa6gvd11jd5pw1ya51j457rz69k1hvyx";
+}
+{
+  lang = "he";
+  saneName = "he";
+  sha256 = "1h5ngkc79pkh1zplq06x2v6qv81mh0fw6yidlw54knqz1bblg1k9";
+}
+{
+  lang = "hi";
+  saneName = "hi";
+  sha256 = "11wh3s80khm0czyxm5hcb381dn2hvmdg6k2gggq4jicnycm4rffl";
+}
+{
+  lang = "hr";
+  saneName = "hr";
+  sha256 = "10p1h4k728p18r2m08d165gx640946zf40a57cf9jwv0z6xa3hbq";
+}
+{
+  lang = "hu";
+  saneName = "hu";
+  sha256 = "1ymgdbvcyq278gxx197jl0i0fiwf1gpycnkyc578g39gddzzh18g";
+}
+{
+  lang = "ia";
+  saneName = "ia";
+  sha256 = "1azvfzffqgm15cavv5biy5ymn2wawszgrppk3mki1qnmwrlppx2p";
+}
+{
+  lang = "is";
+  saneName = "is";
+  sha256 = "19g7w461g73z0lnmzwkjavg416d54gclhac8bvc53hs7dr6kwnfh";
+}
+{
+  lang = "it";
+  saneName = "it";
+  sha256 = "0m6rjgv8x33mhmnis86821djc3xsr2xfx5knajhnyrj5yycyy01p";
+}
+{
+  lang = "ja";
+  saneName = "ja";
+  sha256 = "0xcpzlzff4s71miia4gnlxr0qvpipnqmk5lgnxjq27rh1isyasj6";
+}
+{
+  lang = "kk";
+  saneName = "kk";
+  sha256 = "1h3bxk7lvd3ivh613805x5xrcfvbxnn0qzbpyy4bysk3lz9kb4bm";
+}
+{
+  lang = "km";
+  saneName = "km";
+  sha256 = "1mabfvpwxnqhim9gvxb7qxapy6mzmrrhr4q6ai5w2ssyg0sxrb4b";
+}
+{
+  lang = "ko";
+  saneName = "ko";
+  sha256 = "14hzpw2phy6yc6ykx7ny22dqwic7lmkv96f6jhdmcwsjbq9jkj69";
+}
+{
+  lang = "lt";
+  saneName = "lt";
+  sha256 = "1bk1ghwhzbgw6awxnz7w5wl49632rb708l8v080l6is3hb88l9gi";
+}
+{
+  lang = "lv";
+  saneName = "lv";
+  sha256 = "12yhzg22h1x6dmpmx79bryq94kii8brqasn49ahvshckx3i2y1hm";
+}
+{
+  lang = "mr";
+  saneName = "mr";
+  sha256 = "1ag0f1qafm75k1zr5i0jzi3kgal7sw004s2qpq0mkda66p8sxwgv";
+}
+{
+  lang = "nb";
+  saneName = "nb";
+  sha256 = "0mc0760yyr23913x6g8f56mfrfwn8s1zav1hz3714jif7sjg6bjs";
+}
+{
+  lang = "nds";
+  saneName = "nds";
+  sha256 = "03c0x26plqlvpnsxv5k0x4j92n1dh9mdgg8f5qpwm7cq2k8pnl72";
+}
+{
+  lang = "nl";
+  saneName = "nl";
+  sha256 = "0naglfrd0bkahq4pbxb7pi4nkp6cj09w0q8j4jnxf7b104rcj3fv";
+}
+{
+  lang = "nn";
+  saneName = "nn";
+  sha256 = "0bmz5l4yasslaqql0zkp5s4k9rsw79rf37vnm6d4hprpckam051h";
+}
+{
+  lang = "pa";
+  saneName = "pa";
+  sha256 = "1rykl2z38asa23aa5cqsmril5j0x57j0n0k4qygpy52ifc5gvvf7";
+}
+{
+  lang = "pl";
+  saneName = "pl";
+  sha256 = "18yc8hdn4m4h867di098qswdhyx0jsnsh3ax1ax1dfxrdzmy57rq";
+}
+{
+  lang = "pt";
+  saneName = "pt";
+  sha256 = "187mgq4s2gmhzd625rni8cmdpvhlnf6zn179wlp140lvdfzblr6c";
+}
+{
+  lang = "pt_BR";
+  saneName = "pt_BR";
+  sha256 = "1726qd01iaq730c2dkjb8r8fw34fmqn741c5qz2i57f2f527vf8z";
+}
+{
+  lang = "ro";
+  saneName = "ro";
+  sha256 = "0zip2v24ha69si76rjz4qpmwjqnv0w427qa5c1cgc19a04jnbi32";
+}
+{
+  lang = "ru";
+  saneName = "ru";
+  sha256 = "1irrhlqmv2cij04kc29rhg0yamw4h6gqijjnhgj6a89gffqn9p1i";
+}
+{
+  lang = "sk";
+  saneName = "sk";
+  sha256 = "00pb7z1bqwbymzf91l82ggiqax7qf0pxhjgbbjj5aq25s8rc950v";
+}
+{
+  lang = "sl";
+  saneName = "sl";
+  sha256 = "10xixsja2jqhhfwp59yjvzvwmcqvfcs782y7j3wwxmh9a3m6ckzi";
+}
+{
+  lang = "sr";
+  saneName = "sr";
+  sha256 = "1pxy8x8jgri25qr4v53kqnilk8hjqcq6mgdk8p795s0zi73bhh0a";
+}
+{
+  lang = "sv";
+  saneName = "sv";
+  sha256 = "15npn4nq91hxhqpnyvk2c0c7ka2mm6r6p3cm4amyb22dq8qqfw50";
+}
+{
+  lang = "tg";
+  saneName = "tg";
+  sha256 = "077anp6h7prj6hlxbm5lzxv8ria2zbrlgixxinf3cywxq0haajx2";
+}
+{
+  lang = "tr";
+  saneName = "tr";
+  sha256 = "06l5y2bl57sfx9jh9g5idl3y76sg4dysgxdvwp8sgg9yj19dnjmn";
+}
+{
+  lang = "ug";
+  saneName = "ug";
+  sha256 = "1jr920hihgr27rfznzdn4rc6sz1wi97pnhvikz2hg7nzqrycmb8a";
+}
+{
+  lang = "uk";
+  saneName = "uk";
+  sha256 = "1qr6hyh0pqskc4mc7655b5nzkvbmw3hzpzz5iiwp37n3w72ig9km";
+}
+{
+  lang = "vi";
+  saneName = "vi";
+  sha256 = "12bnagz2wq1i9zhs7rl6akr6a7h2pndrpqipdynj4dx0nvs0vc15";
+}
+{
+  lang = "wa";
+  saneName = "wa";
+  sha256 = "093mwn705f1bp3143pzm4h85hrjjr9fiiahbfvvy2ih6xv3x88nb";
+}
+{
+  lang = "zh_CN";
+  saneName = "zh_CN";
+  sha256 = "1swcnfpv9n4561hl7rqivny7mcmnk95j495rvr8hs384gq2q1b67";
+}
+{
+  lang = "zh_TW";
+  saneName = "zh_TW";
+  sha256 = "0x7b3jz0ilb4ww3yi70w36zkid2sgnf0mld1kxkkc8aacm00bmq9";
+}
+]
diff --git a/pkgs/desktops/kde-4.11/oxygen-icons.nix b/pkgs/desktops/kde-4.11/oxygen-icons.nix
new file mode 100644
index 00000000000..bdc3c581371
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/oxygen-icons.nix
@@ -0,0 +1,15 @@
+{ kde, cmake }:
+
+kde {
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "03wzq5b9yn7x7qjl6vypsa4jh2km0vz122wyg0pfk6nfl1frgnjf";
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = {
+    description = "KDE Oxygen theme icons";
+    longDescription = "Icons for KDE's default theme";
+    license = "GPL";
+  };
+}
diff --git a/pkgs/desktops/kde-4.11/support/akonadi/default.nix b/pkgs/desktops/kde-4.11/support/akonadi/default.nix
new file mode 100644
index 00000000000..af27b683f25
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/support/akonadi/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano, sqlite }:
+
+stdenv.mkDerivation rec {
+  name = "akonadi-1.10.2";
+  
+  src = fetchurl {
+    url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2";
+    sha256 = "1jij7vmrxg4kzqcq4ci73q3m3927bym5xb34kvmpq3h7p1d0vmgk";
+  };
+
+  buildInputs = [ qt4 soprano libxslt boost sqlite ];
+
+  nativeBuildInputs = [ cmake automoc4 shared_mime_info ];
+
+  enableParallelBuilding = true;
+  
+  meta = with stdenv.lib; {
+    description = "KDE PIM Storage Service";
+    license = "LGPL";
+    homepage = http://pim.kde.org/akonadi;
+    maintainers = [ maintainers.sander maintainers.urkud ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 433653e9c21..1eeb5bc2f07 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9180,6 +9180,15 @@ let
       libcanberra = libcanberra_kde;
     }) ../desktops/kde-4.10;
 
+ kde411 = kdePackagesFor (pkgs.kde411 // {
+      boost = boost149;
+      eigen = eigen2;
+      libotr = libotr_3_2;
+      libusb = libusb1;
+      ffmpeg = ffmpeg_1;
+      libcanberra = libcanberra_kde;
+    }) ../desktops/kde-4.11;
+
   kdePackagesFor = self: dir:
     let callPackageOrig = callPackage; in
     let

From b2c4b68a386db5b9b595355883fc3c31cd12d539 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 21 Aug 2013 20:39:32 +0300
Subject: [PATCH 035/452] Amarok: update to 2.8.0

---
 pkgs/applications/audio/amarok/default.nix    | 10 ++--
 .../audio/amarok/find-mysql.patch             | 46 -------------------
 2 files changed, 5 insertions(+), 51 deletions(-)
 delete mode 100644 pkgs/applications/audio/amarok/find-mysql.patch

diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix
index 6e20acab523..f45ca59e0ea 100644
--- a/pkgs/applications/audio/amarok/default.nix
+++ b/pkgs/applications/audio/amarok/default.nix
@@ -1,24 +1,24 @@
 { stdenv, fetchurl, lib, qtscriptgenerator, perl, gettext, curl
 , libxml2, mysql, taglib, taglib_extras, loudmouth , kdelibs
 , qca2, libmtp, liblastfm, libgpod, pkgconfig, automoc4, phonon
-, strigi, soprano, qjson, ffmpeg, libofa }:
+, strigi, soprano, qjson, ffmpeg, libofa, nepomuk_core }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   pname = "amarok";
-  version = "2.7.1";
+  version = "2.8.0";
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
-    sha256 = "12dvqnx6jniykbi6sz94xxlnxzafjsaxlf0mppk9w5wn61jwc3cy";
+    sha256 = "1ilf9wdp3wna5pmvxill8x08rb9gw86qkc2zwm3xk9hpy8l9pf7l";
   };
 
   QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins";
-  patches = ./find-mysql.patch;
+
   buildInputs = [ qtscriptgenerator stdenv.gcc.libc gettext curl
     libxml2 mysql taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi
-    soprano qca2 libmtp liblastfm libgpod pkgconfig qjson ffmpeg libofa ];
+    soprano qca2 libmtp liblastfm libgpod pkgconfig qjson ffmpeg libofa nepomuk_core ];
 
   cmakeFlags = "-DKDE4_BUILD_TESTS=OFF";
 
diff --git a/pkgs/applications/audio/amarok/find-mysql.patch b/pkgs/applications/audio/amarok/find-mysql.patch
deleted file mode 100644
index 57a5ec46b84..00000000000
--- a/pkgs/applications/audio/amarok/find-mysql.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-commit 9979970f05f25329100168d85a5c4cdc8c084b7a
-Author: Yury G. Kudryashov <urkud.urkud@gmail.com>
-Date:   Thu Aug 30 12:32:53 2012 +0400
-
-    FindMySQLAmarok.cmake: use PATH_SUFFIXES
-
-diff --git a/cmake/modules/FindMySQLAmarok.cmake b/cmake/modules/FindMySQLAmarok.cmake
-index 910b434..4c8b8e8 100644
---- a/cmake/modules/FindMySQLAmarok.cmake
-+++ b/cmake/modules/FindMySQLAmarok.cmake
-@@ -13,18 +13,17 @@
- # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
- 
- if(NOT WIN32)
--    find_program(MYSQLCONFIG_EXECUTABLE NAMES mysql_config mysql_config5 PATHS ${BIN_INSTALL_DIR} ~/usr/bin /usr/local/bin)
-+    find_program(MYSQLCONFIG_EXECUTABLE NAMES mysql_config mysql_config5 HINTS ${BIN_INSTALL_DIR})
- endif(NOT WIN32)
- 
- find_path(MYSQL_INCLUDE_DIR mysql.h
--    /opt/local/include/mysql5/mysql
-+    PATHS
-+    /opt/local/include
-     /opt/mysql/mysql/include
--    /opt/mysqle/include/mysql
--    /opt/ports/include/mysql5/mysql
--    /usr/include/mysql
--    /usr/local/include/mysql
--    /usr/mysql/include/mysql
--    ~/usr/include/mysql
-+    /opt/mysqle/include
-+    /opt/ports/include
-+    /usr/mysql/include
-+    PATH_SUFFIXES mysql mysql5/mysql
- )
- 
- if(MYSQLCONFIG_EXECUTABLE)
-@@ -40,8 +39,7 @@ if(MYSQLCONFIG_EXECUTABLE)
- 
-     find_library(MYSQLD_PIC_SEPARATE
-         mysqld_pic
--        PATHS
--        /usr/lib/mysql
-+        PATH_SUFFIXES mysql
-     )
- 
-     if(MYSQLD_PIC_SEPARATE)

From d65cea26dc763d8e4b5ba59481841690097b2ff2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 21 Aug 2013 20:22:23 +0200
Subject: [PATCH 036/452] ncftp: 3.2.4 -> 3.2.5

Also, add missing ncurses buildInput and add/update meta attributes. The
homepage is back up!
---
 pkgs/tools/networking/ncftp/default.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/networking/ncftp/default.nix b/pkgs/tools/networking/ncftp/default.nix
index 21bcb56bf0d..515ea5edf88 100644
--- a/pkgs/tools/networking/ncftp/default.nix
+++ b/pkgs/tools/networking/ncftp/default.nix
@@ -1,15 +1,16 @@
 {stdenv, fetchurl, ncurses, coreutils}:
 
-let version = "3.2.4"; in
+let version = "3.2.5"; in
 stdenv.mkDerivation {
   name = "ncftp-${version}";
 
   src = fetchurl {
-    # `ncftp.com' got stolen, apparently, so resort to Debian.
-    url = "mirror://debian/pool/main/n/ncftp/ncftp_${version}.orig.tar.gz";
-    sha256 = "6f26e7891f3eab27eebd2bbbe2bc87d5ae872e610eaf0bc5652aec520adcf68a";
+    url = "ftp://ftp.ncftp.com/ncftp/ncftp-${version}-src.tar.bz2";
+    sha256 = "0hlx12i0lwi99qsrx7nccf4nvwjj2gych4yks5y179b1ax0y5sxl";
   };
 
+  buildInputs = [ ncurses ];
+
   preConfigure = ''
     find . -name "*.sh" -type f | xargs sed 's@/bin/ls@${coreutils}/bin/ls@g' -i
     find . -name "*.in" -type f | xargs sed 's@/bin/ls@${coreutils}/bin/ls@g' -i
@@ -22,10 +23,10 @@ stdenv.mkDerivation {
     sed 's@/bin/rm@${coreutils}/bin/rm@g' -i configure
   '';
 
-  meta = {
-    description = "NcFTP Client (also known as just NcFTP) is a set of FREE application programs implementing the File Transfer Protocol (FTP).";
-
-    # Homeless!
-    # homepage = http://www.ncftp.com/ncftp/;
+  meta = with stdenv.lib; {
+    description = "Command line FTP (File Transfer Protocol) client";
+    homepage = http://www.ncftp.com/ncftp/;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
   };
 }

From 7a2bbda91d39c025d9b94f029831561e478a86de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 21 Aug 2013 19:53:06 +0200
Subject: [PATCH 037/452] duplicity: 0.6.20 -> 0.6.21

Update to latest stable release. See changelog:

http://duplicity.nongnu.org/CHANGELOG
---
 pkgs/tools/backup/duplicity/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix
index 0b0c1dbb943..5805e29e395 100644
--- a/pkgs/tools/backup/duplicity/default.nix
+++ b/pkgs/tools/backup/duplicity/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python, librsync, gnupg, boto, makeWrapper }:
 
 stdenv.mkDerivation {
-  name = "duplicity-0.6.20";
+  name = "duplicity-0.6.21";
 
   src = fetchurl {
-    url = "http://code.launchpad.net/duplicity/0.6-series/0.6.20/+download/duplicity-0.6.20.tar.gz";
-    sha256 = "0r0nf7arc3n5ipvvbh7h6ksqzbl236iv5pjpmd5s7lff3xswdl2i";
+    url = "http://code.launchpad.net/duplicity/0.6-series/0.6.21/+download/duplicity-0.6.21.tar.gz";
+    sha256 = "01ppxzghnig7al9cwi8ap95y0d3j5n0vf3ag06iw3ysiq6k8lqm3";
   };
 
   installPhase = ''

From 80452891996797c54677ca16ca9a8caea2d11e72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 21 Aug 2013 20:42:09 +0200
Subject: [PATCH 038/452] duplicity: add dependency on ncftp (makes ftp://
 work)

ncftp increases the closure size with 5 MiB. Now it is at 310 MiB.
---
 pkgs/tools/backup/duplicity/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix
index 5805e29e395..e10b44d63c8 100644
--- a/pkgs/tools/backup/duplicity/default.nix
+++ b/pkgs/tools/backup/duplicity/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, librsync, gnupg, boto, makeWrapper }:
+{ stdenv, fetchurl, python, librsync, ncftp, gnupg, boto, makeWrapper }:
 
 stdenv.mkDerivation {
   name = "duplicity-0.6.21";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
     python setup.py install --prefix=$out
     wrapProgram $out/bin/duplicity \
       --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${boto})" \
-      --prefix PATH : "${gnupg}/bin"
+      --prefix PATH : "${gnupg}/bin:${ncftp}/bin"
     wrapProgram $out/bin/rdiffdir \
       --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${boto})" \
   '';

From 115e78216e51191f9062809ec79efbadba38ae9a Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 21 Aug 2013 21:45:28 +0200
Subject: [PATCH 039/452] Update nodejs to 0.10.12

---
 pkgs/development/web/nodejs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index 6660cccc6fb..610cdd09a71 100644
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -6,7 +6,7 @@ let
     ln -sv /usr/sbin/dtrace $out/bin
   '';
 
-  version = "0.10.10";
+  version = "0.10.12";
 
   # !!! Should we also do shared libuv?
   deps = {
@@ -27,7 +27,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
-    sha256 = "0p6ii9xgshv2aak1rb4hq54pszdjxip0nr5r9a3axirs5hfyfkd5";
+    sha256 = "1dlnjjr135h2xcxifb06g33yi2bc5zpvc06985x5cjj56g1sffbk";
   };
 
   configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps);

From 61822435fd2fc4262ee4c513cc7a95abd8740c0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 21 Aug 2013 21:56:33 +0200
Subject: [PATCH 040/452] duply: new package

Duply is a shell front end for the duplicity backup tool
http://duplicity.nongnu.org/. It greatly simplifies it's usage by
implementing backup job profiles, batch commands and more. Who says
secure backups on non-trusted spaces are no child's play?

Homepage: http://duply.net/
---
 pkgs/tools/backup/duply/default.nix | 39 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/tools/backup/duply/default.nix

diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix
new file mode 100644
index 00000000000..affedcae73a
--- /dev/null
+++ b/pkgs/tools/backup/duply/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, coreutils, python, duplicity, gawk, gnupg1, bash
+, gnugrep, txt2man, makeWrapper }:
+
+stdenv.mkDerivation {
+  name = "duply-1.5.11";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/1.5.x/duply_1.5.11.tgz";
+    sha256 = "07z4wl75z227v8y9xwc2pfdp307a5jzx4sif598vprqync0g6mmk";
+  };
+
+  buildInputs = [ txt2man makeWrapper ];
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    mkdir -p "$out/share/man/man1"
+    sed -i 's|/usr/bin/env bash|${bash}/bin/bash|' duply
+    mv duply "$out/bin"
+    wrapProgram "$out/bin/duply" --set PATH \
+        "${coreutils}/bin:${python}/bin:${duplicity}/bin:${gawk}/bin:${gnupg1}/bin:${bash}/bin:${gnugrep}/bin:${txt2man}/bin"
+    "$out/bin/duply" txt2man | gzip -c > "$out/share/man/man1/duply.1.gz"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Shell front end for the duplicity backup tool";
+    longDescription = ''
+      Duply is a shell front end for the duplicity backup tool
+      http://duplicity.nongnu.org/. It greatly simplifies it's usage by
+      implementing backup job profiles, batch commands and more. Who says
+      secure backups on non-trusted spaces are no child's play?
+    '';
+    homepage = http://duply.net/;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.bjornfor ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1eeb5bc2f07..044389d9e3c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -763,6 +763,8 @@ let
     gnupg = gnupg1;
   };
 
+  duply = callPackage ../tools/backup/duply { };
+
   dvdplusrwtools = callPackage ../tools/cd-dvd/dvd+rw-tools { };
 
   dvgrab = callPackage ../tools/video/dvgrab { };

From e8a37d3d41b369bef00bcb718ad5d8c387b2b2c8 Mon Sep 17 00:00:00 2001
From: Gergely Risko <gergely@risko.hu>
Date: Wed, 21 Aug 2013 23:39:07 +0200
Subject: [PATCH 041/452] Add ncurses haskell library

---
 .../libraries/haskell/ncurses/default.nix     | 22 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/ncurses/default.nix

diff --git a/pkgs/development/libraries/haskell/ncurses/default.nix b/pkgs/development/libraries/haskell/ncurses/default.nix
new file mode 100644
index 00000000000..c98f711f297
--- /dev/null
+++ b/pkgs/development/libraries/haskell/ncurses/default.nix
@@ -0,0 +1,22 @@
+{ cabal, c2hs, ncurses, text, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "ncurses";
+  version = "0.2.4";
+  sha256 = "0d4h85qgva1sf59g55k9xidqdpw18qj51xj7w5cqsf5pcpxgkcwh";
+  buildDepends = [ text transformers ];
+  buildTools = [ c2hs ];
+  extraLibraries = [ ncurses ];
+  preConfigure = ''
+    sed -i -e "s,ncursesw/,," lib/UI/NCurses.chs
+    sed -i -e "s,ncursesw/,," lib/UI/NCurses/Enums.chs
+    sed -i -e "s,ncursesw/,," lib/UI/NCurses/Panel.chs
+    sed -i -e "s,ncursesw/,," cbits/hsncurses-shim.c
+  '';
+  meta = {
+    homepage = "https://john-millikin.com/software/haskell-ncurses/";
+    description = "Modernised bindings to GNU ncurses";
+    license = self.stdenv.lib.licenses.gpl3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 07b4071a004..61b4d6c50b3 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1473,6 +1473,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   naturals = callPackage ../development/libraries/haskell/naturals {};
 
+  ncurses = callPackage ../development/libraries/haskell/ncurses { inherit (pkgs) ncurses; };
+
   netlist = callPackage ../development/libraries/haskell/netlist {};
 
   netlistToVhdl = callPackage ../development/libraries/haskell/netlist-to-vhdl {};

From ed3b96687058668942f30841118c2c04acb022e5 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Thu, 22 Aug 2013 10:43:59 +1000
Subject: [PATCH 042/452] vimPlugin.eighties: add expression

---
 pkgs/misc/vim-plugins/default.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 6e337b8feef..4896755c634 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -184,6 +184,22 @@ in
     '';
   };
 
+  eighties = simpleDerivation {
+    name = "vim-eighties-1.0.4";
+    src = fetchurl {
+      url    = "https://github.com/justincampbell/vim-eighties/archive/1.0.4.tar.gz";
+      sha256 = "0cjd9hbg2qd7jjkvyi15f9ysp7m3aa2sg8nvbf80yb890rfkwaqr";
+    };
+    path = "eighties";
+    meta = with stdenv.lib; {
+      description = "Automatically resizes your windows to 80 characters";
+      homepage    = https://github.com/justincampbell/vim-eighties;
+      license     = licenses.publicDomain;
+      maintainers = with maintainers; [ lovek323 ];
+      platforms   = platforms.unix;
+    };
+  };
+
   xdebug = simpleDerivation {
 
     name = "vim-xdebug-a4980fa65f7f159780593ee37c178281691ba2c4";

From 8938a2ac9e2b2a186ae54f97d58424e5057507f5 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 22 Aug 2013 03:01:49 +0200
Subject: [PATCH 043/452] zabbix20: Update to new upstream version 2.0.8.

Upstream changes for version 2.0.7:

http://www.zabbix.com/rn2.0.7.php

Upstream changes for version 2.0.8:

http://www.zabbix.com/rn2.0.8.php

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/servers/monitoring/zabbix/2.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix
index 90206f35853..14a4e8bd5a5 100644
--- a/pkgs/servers/monitoring/zabbix/2.0.nix
+++ b/pkgs/servers/monitoring/zabbix/2.0.nix
@@ -5,11 +5,11 @@ assert enableJabber -> minmay != null;
 
 let
 
-  version = "2.0.6";
+  version = "2.0.8";
 
   src = fetchurl {
     url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz";
-    sha256 = "1y7dp9rqxkn8ik7bvk2qysz3zp3r07kmax5avlf9jf1x7pkagps6";
+    sha256 = "16jiwjw4041j3qn1cs4k812mih8mjwz5022ac0h0n78avrh4kff4";
   };
 
   preConfigure =

From f87a374647c5df999abae4b78b0af1f5522a8c95 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 22 Aug 2013 03:37:27 +0200
Subject: [PATCH 044/452] chromium: Update all channels to latest versions.

Version 29 has now made it into stable, the release announcement blog
post can be found here:

http://googlechromereleases.blogspot.de/2013/08/stable-channel-update.html

Overview of the updated channels:

stable: 28.0.1500.95 -> 29.0.1547.57
beta:   29.0.1547.49 -> 29.0.1547.57
dev:    30.0.1588.0  -> 30.0.1599.10 (userns patch updated)

All channels build fine and are tested (manually at the moment, until we
can run the test suite).

The userns patch for version 30.0.1599.0 from the dev channel didn't
apply anymore and is now rebased against 30.0.1599.10.

In addition, in version 30 the gyp flag for setting the sandbox path
isn't recognized anymore, so we patch it into the source directly.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/default.nix  |  5 ++++
 .../browsers/chromium/sandbox_userns_30.patch | 24 ++++++++++++-------
 .../networking/browsers/chromium/sources.nix  | 18 +++++++-------
 3 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index df2a8ca5ce7..9fc3b3896af 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -137,6 +137,11 @@ in stdenv.mkDerivation rec {
   '' + optionalString (versionOlder sourceInfo.version "29.0.0.0") ''
     sed -i -e '/struct SECItemArray/,/^};/d' \
       net/third_party/nss/ssl/bodge/secitem_array.c
+  '' + optionalString (!versionOlder sourceInfo.version "30.0.0.0") ''
+    sed -i -e '/base::FilePath exe_dir/,/^ *} *$/c \
+      sandbox_binary = \
+        base::FilePath("'"${libExecPath}/${packageName}_sandbox"'");
+    ' content/browser/browser_main_loop.cc
   '';
 
   gypFlags = mkGypFlags (gypFlagsUseSystemLibs // {
diff --git a/pkgs/applications/networking/browsers/chromium/sandbox_userns_30.patch b/pkgs/applications/networking/browsers/chromium/sandbox_userns_30.patch
index ef1a08ee313..9a412352c52 100644
--- a/pkgs/applications/networking/browsers/chromium/sandbox_userns_30.patch
+++ b/pkgs/applications/networking/browsers/chromium/sandbox_userns_30.patch
@@ -1,4 +1,4 @@
-commit b9a1fa30eb3296b169f51ffa8ee05513c5c1dbae
+commit 41510de6ae32e6161073992bd1243f7f33148a06
 Author: aszlig <aszlig@redmoonstudios.org>
 Date:   Thu May 16 14:17:56 2013 +0200
 
@@ -43,10 +43,10 @@ index 45b1053..ce71418 100644
  
  #if defined(OS_CHROMEOS)
 diff --git a/base/process/launch_posix.cc b/base/process/launch_posix.cc
-index 336633c..4b50a5d 100644
+index 52e149c..312f835 100644
 --- a/base/process/launch_posix.cc
 +++ b/base/process/launch_posix.cc
-@@ -36,6 +36,13 @@
+@@ -37,6 +37,13 @@
  #include "base/threading/platform_thread.h"
  #include "base/threading/thread_restrictions.h"
  
@@ -60,12 +60,11 @@ index 336633c..4b50a5d 100644
  #if defined(OS_CHROMEOS)
  #include <sys/ioctl.h>
  #endif
-@@ -395,8 +402,19 @@ bool LaunchProcess(const std::vector<std::string>& argv,
+@@ -416,13 +423,23 @@ bool LaunchProcess(const std::vector<std::string>& argv,
  
    pid_t pid;
  #if defined(OS_LINUX)
 -  if (options.clone_flags) {
--    pid = syscall(__NR_clone, options.clone_flags, 0, 0, 0);
 +  int map_pipe_fd[2];
 +  int flags = options.clone_flags;
 +
@@ -78,11 +77,18 @@ index 336633c..4b50a5d 100644
 +  }
 +
 +  if (options.clone_flags || options.new_user_namespace) {
+     // Signal handling in this function assumes the creation of a new
+     // process, so we check that a thread is not being created by mistake
+     // and that signal handling follows the process-creation rules.
+-    RAW_CHECK(
+-        !(options.clone_flags & (CLONE_SIGHAND | CLONE_THREAD | CLONE_VM)));
+-    pid = syscall(__NR_clone, options.clone_flags, 0, 0, 0);
++    RAW_CHECK(!(flags & (CLONE_SIGHAND | CLONE_THREAD | CLONE_VM)));
 +    pid = syscall(__NR_clone, flags, 0, 0, 0);
    } else
  #endif
    {
-@@ -409,6 +427,21 @@ bool LaunchProcess(const std::vector<std::string>& argv,
+@@ -440,6 +457,21 @@ bool LaunchProcess(const std::vector<std::string>& argv,
    } else if (pid == 0) {
      // Child process
  
@@ -104,7 +110,7 @@ index 336633c..4b50a5d 100644
      // DANGER: fork() rule: in the child, if you don't end up doing exec*(),
      // you call _exit() instead of exit(). This is because _exit() does not
      // call any previously-registered (in the parent) exit handlers, which
-@@ -523,6 +556,40 @@ bool LaunchProcess(const std::vector<std::string>& argv,
+@@ -555,6 +587,40 @@ bool LaunchProcess(const std::vector<std::string>& argv,
      _exit(127);
    } else {
      // Parent process
@@ -209,10 +215,10 @@ index bb84e62..bce0d18 100644
  
    if (using_suid_sandbox_) {
 diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc
-index dcea4c0..c06b4ae 100644
+index 1f0e9f5..ade5aab 100644
 --- a/content/zygote/zygote_main_linux.cc
 +++ b/content/zygote/zygote_main_linux.cc
-@@ -398,6 +398,13 @@ static bool EnterSandbox(sandbox::SetuidSandboxClient* setuid_sandbox,
+@@ -420,6 +420,13 @@ static bool EnterSandbox(sandbox::SetuidSandboxClient* setuid_sandbox,
        *has_started_new_init = true;
      }
  
diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix
index a4769d172cd..bfdcef1373d 100644
--- a/pkgs/applications/networking/browsers/chromium/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/sources.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   dev = {
-    version = "30.0.1588.0";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-30.0.1588.0.tar.xz";
-    sha256 = "1jwc2pkd75gax8vj8wzahhpzl6ilgrlj3bcbah975yy67m7c8p13";
+    version = "30.0.1599.10";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-30.0.1599.10.tar.xz";
+    sha256 = "1h6wak2sy0cawsk63gdbg7ggq8lg7cahs1v8i0hvzwm9k6apwphs";
   };
   beta = {
-    version = "29.0.1547.49";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1547.49.tar.xz";
-    sha256 = "03r64rydi2kbxgi2dcpslmpb716ppadqy1jzrbw39icz5xpgmg3k";
+    version = "29.0.1547.57";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1547.57.tar.xz";
+    sha256 = "0xl595fng7qzlc8vh73lslzchr6ayd4vlmz2mpqppb8pai520xxf";
   };
   stable = {
-    version = "28.0.1500.95";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.95.tar.xz";
-    sha256 = "0d6pj57nyx7wfgxws98f6ly749flcyv7zg5sc3w16ggdxf5qhf1w";
+    version = "29.0.1547.57";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1547.57.tar.xz";
+    sha256 = "0xl595fng7qzlc8vh73lslzchr6ayd4vlmz2mpqppb8pai520xxf";
   };
 }

From cdde887778d85f090c8b472ae82c52104b2dd4b5 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 22 Aug 2013 03:46:18 +0200
Subject: [PATCH 045/452] chromium: Drop patches for version 28.

This drops the initial version of the user namespaces sandbox patch and
the fix for NSS 3.15, which is no longer needed because it was fixed
upstream.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/default.nix  |  11 +-
 .../browsers/chromium/sandbox_userns.patch    | 292 ------------------
 2 files changed, 3 insertions(+), 300 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/chromium/sandbox_userns.patch

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 9fc3b3896af..087bde000ed 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -88,11 +88,9 @@ let
   libExecPath = "$out/libexec/${packageName}";
 
   # user namespace sandbox patch
-  userns_patch = if versionOlder sourceInfo.version "29.0.0.0"
-                 then ./sandbox_userns.patch
-                 else if versionOlder sourceInfo.version "30.0.0.0"
-                      then ./sandbox_userns_29.patch
-                      else ./sandbox_userns_30.patch;
+  userns_patch = if versionOlder sourceInfo.version "30.0.0.0"
+                 then ./sandbox_userns_29.patch
+                 else ./sandbox_userns_30.patch;
 
 in stdenv.mkDerivation rec {
   name = "${packageName}-${version}";
@@ -134,9 +132,6 @@ in stdenv.mkDerivation rec {
     sed -i -e 's|/usr/bin/gcc|gcc|' third_party/WebKit/Source/core/core.gypi
   '' + optionalString useOpenSSL ''
     cat $opensslPatches | patch -p1 -d third_party/openssl/openssl
-  '' + optionalString (versionOlder sourceInfo.version "29.0.0.0") ''
-    sed -i -e '/struct SECItemArray/,/^};/d' \
-      net/third_party/nss/ssl/bodge/secitem_array.c
   '' + optionalString (!versionOlder sourceInfo.version "30.0.0.0") ''
     sed -i -e '/base::FilePath exe_dir/,/^ *} *$/c \
       sandbox_binary = \
diff --git a/pkgs/applications/networking/browsers/chromium/sandbox_userns.patch b/pkgs/applications/networking/browsers/chromium/sandbox_userns.patch
deleted file mode 100644
index 694cebe7c14..00000000000
--- a/pkgs/applications/networking/browsers/chromium/sandbox_userns.patch
+++ /dev/null
@@ -1,292 +0,0 @@
-From a242351d8a32ea33e6337b928969cc9f715e314e Mon Sep 17 00:00:00 2001
-From: aszlig <aszlig@redmoonstudios.org>
-Date: Thu, 16 May 2013 14:17:56 +0200
-Subject: [PATCH] zygote: Add support for user namespaces on Linux.
-
-The implementation is done by patching the Zygote host to execute the sandbox
-binary with CLONE_NEWUSER and setting the uid and gid mapping so that the child
-process is using uid 0 and gid 0 which map to the current user of the parent.
-Afterwards, the sandbox will continue as if it was called as a setuid binary.
-
-In addition, this adds new_user_namespace as an option in process_util in order
-to set the UID and GID mapping correctly. The reason for this is that just
-passing CLONE_NEWUSER to clone_flags doesn't help in LaunchProcess(), because
-without setting the mappings exec*() will clear the process's capability sets.
-
-If the kernel doesn't support unprivileged user namespaces and the sandbox
-binary doesn't have the setuid flag, the Zygote main process will run without a
-sandbox. This is to mimic the behaviour if no SUID sandbox binary path is set.
-
-Signed-off-by: aszlig <aszlig@redmoonstudios.org>
----
- base/process_util.h                                |  4 ++
- base/process_util_posix.cc                         | 71 +++++++++++++++++++++-
- .../browser/zygote_host/zygote_host_impl_linux.cc  | 28 +++++++--
- content/zygote/zygote_main_linux.cc                |  7 +++
- sandbox/linux/suid/client/setuid_sandbox_client.cc |  8 +++
- sandbox/linux/suid/client/setuid_sandbox_client.h  |  4 ++
- sandbox/linux/suid/common/sandbox.h                |  1 +
- 7 files changed, 117 insertions(+), 6 deletions(-)
-
-diff --git a/base/process_util.h b/base/process_util.h
-index 6efc70c..0f0c74c 100644
---- a/base/process_util.h
-+++ b/base/process_util.h
-@@ -261,3 +261,4 @@ struct LaunchOptions {
-+        , new_user_namespace(false)
- #endif  // OS_LINUX
- #if defined(OS_CHROMEOS)
-         , ctrl_terminal_fd(-1)
-@@ -332,6 +333,9 @@ struct LaunchOptions {
- #if defined(OS_LINUX)
-   // If non-zero, start the process using clone(), using flags as provided.
-   int clone_flags;
-+
-+  // If true, start the process in a new user namespace.
-+  bool new_user_namespace;
- #endif  // defined(OS_LINUX)
- 
- #if defined(OS_CHROMEOS)
-diff --git a/base/process_util_posix.cc b/base/process_util_posix.cc
-index 6f15130..cea07f0 100644
---- a/base/process_util_posix.cc
-+++ b/base/process_util_posix.cc
-@@ -34,6 +34,13 @@
- #include "base/threading/platform_thread.h"
- #include "base/threading/thread_restrictions.h"
- 
-+#if defined(OS_LINUX)
-+#include <sched.h>
-+#if !defined(CLONE_NEWUSER)
-+#define CLONE_NEWUSER 0x10000000
-+#endif
-+#endif
-+
- #if defined(OS_CHROMEOS)
- #include <sys/ioctl.h>
- #endif
-@@ -621,8 +628,19 @@ bool LaunchProcess(const std::vector<std::string>& argv,
- 
-   pid_t pid;
- #if defined(OS_LINUX)
--  if (options.clone_flags) {
--    pid = syscall(__NR_clone, options.clone_flags, 0, 0, 0);
-+  int map_pipe_fd[2];
-+  int flags = options.clone_flags;
-+
-+  if (options.new_user_namespace) {
-+    flags |= CLONE_NEWUSER;
-+    if (pipe(map_pipe_fd) < 0) {
-+      DPLOG(ERROR) << "user namespace pipe";
-+      return false;
-+    }
-+  }
-+
-+  if (options.clone_flags || options.new_user_namespace) {
-+    pid = syscall(__NR_clone, flags, 0, 0, 0);
-   } else
- #endif
-   {
-@@ -635,6 +653,21 @@ bool LaunchProcess(const std::vector<std::string>& argv,
-   } else if (pid == 0) {
-     // Child process
- 
-+#if defined(OS_LINUX)
-+    if (options.new_user_namespace) {
-+      // Close the write end of the pipe so we get an EOF when the parent closes
-+      // the FD. This is to avoid race conditions when the UID/GID mappings are
-+      // written _after_ execvp().
-+      close(map_pipe_fd[1]);
-+
-+      char dummy;
-+      if (HANDLE_EINTR(read(map_pipe_fd[0], &dummy, 1)) != 0) {
-+        RAW_LOG(ERROR, "Unexpected input in uid/gid mapping pipe.");
-+        _exit(127);
-+      }
-+    }
-+#endif
-+
-     // DANGER: fork() rule: in the child, if you don't end up doing exec*(),
-     // you call _exit() instead of exit(). This is because _exit() does not
-     // call any previously-registered (in the parent) exit handlers, which
-@@ -749,6 +782,40 @@ bool LaunchProcess(const std::vector<std::string>& argv,
-     _exit(127);
-   } else {
-     // Parent process
-+#if defined(OS_LINUX)
-+    if (options.new_user_namespace) {
-+      // We need to write UID/GID mapping here to map the current user outside
-+      // the namespace to the root user inside the namespace in order to
-+      // correctly "fool" the child process.
-+      char buf[256];
-+      int map_fd, map_len;
-+
-+      snprintf(buf, sizeof(buf), "/proc/%d/uid_map", pid);
-+      map_fd = open(buf, O_RDWR);
-+      DPCHECK(map_fd >= 0);
-+      snprintf(buf, sizeof(buf), "0 %d 1", geteuid());
-+      map_len = strlen(buf);
-+      if (write(map_fd, buf, map_len) != map_len) {
-+        RAW_LOG(WARNING, "Can't write to uid_map.");
-+      }
-+      close(map_fd);
-+
-+      snprintf(buf, sizeof(buf), "/proc/%d/gid_map", pid);
-+      map_fd = open(buf, O_RDWR);
-+      DPCHECK(map_fd >= 0);
-+      snprintf(buf, sizeof(buf), "0 %d 1", getegid());
-+      map_len = strlen(buf);
-+      if (write(map_fd, buf, map_len) != map_len) {
-+        RAW_LOG(WARNING, "Can't write to gid_map.");
-+      }
-+      close(map_fd);
-+
-+      // Close the pipe on the parent, so the child can continue doing the
-+      // execvp() call.
-+      close(map_pipe_fd[1]);
-+    }
-+#endif
-+
-     if (options.wait) {
-       // While this isn't strictly disk IO, waiting for another process to
-       // finish is the sort of thing ThreadRestrictions is trying to prevent.
-diff --git a/content/browser/zygote_host/zygote_host_impl_linux.cc b/content/browser/zygote_host/zygote_host_impl_linux.cc
-index ba7884f8..2a674a0 100644
---- a/content/browser/zygote_host/zygote_host_impl_linux.cc
-+++ b/content/browser/zygote_host/zygote_host_impl_linux.cc
-@@ -117,6 +117,9 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) {
- 
-   sandbox_binary_ = sandbox_cmd.c_str();
- 
-+  bool userns_sandbox = false;
-+  const std::vector<std::string> cmd_line_unwrapped(cmd_line.argv());
-+
-   if (!sandbox_cmd.empty()) {
-     struct stat st;
-     if (stat(sandbox_binary_.c_str(), &st) != 0) {
-@@ -124,16 +127,21 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) {
-                  << sandbox_binary_ << " Aborting now.";
-     }
- 
--    if (access(sandbox_binary_.c_str(), X_OK) == 0 &&
--        (st.st_uid == 0) &&
--        (st.st_mode & S_ISUID) &&
--        (st.st_mode & S_IXOTH)) {
-+    if (access(sandbox_binary_.c_str(), X_OK) == 0) {
-       using_suid_sandbox_ = true;
-+
-       cmd_line.PrependWrapper(sandbox_binary_);
- 
-       scoped_ptr<sandbox::SetuidSandboxClient>
-           sandbox_client(sandbox::SetuidSandboxClient::Create());
-       sandbox_client->SetupLaunchEnvironment();
-+
-+      if (!((st.st_uid == 0) &&
-+            (st.st_mode & S_ISUID) &&
-+            (st.st_mode & S_IXOTH))) {
-+        userns_sandbox = true;
-+        sandbox_client->SetNoSuid();
-+      }
-     } else {
-       LOG(FATAL) << "The SUID sandbox helper binary was found, but is not "
-                     "configured correctly. Rather than run without sandboxing "
-@@ -161,7 +169,19 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) {
-   base::ProcessHandle process = -1;
-   base::LaunchOptions options;
-   options.fds_to_remap = &fds_to_map;
-+  if (userns_sandbox)
-+    options.new_user_namespace = true;
-   base::LaunchProcess(cmd_line.argv(), options, &process);
-+
-+  if (process == -1 && userns_sandbox) {
-+    LOG(ERROR) << "User namespace sandbox failed to start, running without "
-+               << "sandbox! You need at least kernel 3.8.0 with CONFIG_USER_NS "
-+               << "enabled in order to use the sandbox without setuid bit.";
-+    using_suid_sandbox_ = false;
-+    options.new_user_namespace = false;
-+    base::LaunchProcess(cmd_line_unwrapped, options, &process);
-+  }
-+
-   CHECK(process != -1) << "Failed to launch zygote process";
- 
-   if (using_suid_sandbox_) {
-diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc
-index ca75518..d906411 100644
---- a/content/zygote/zygote_main_linux.cc
-+++ b/content/zygote/zygote_main_linux.cc
-@@ -402,6 +402,13 @@ static bool EnterSandbox(sandbox::SetuidSandboxClient* setuid_sandbox,
-       *has_started_new_init = true;
-     }
- 
-+    // Don't set non-dumpable, as it causes trouble when the host tries to find
-+    // the zygote process (XXX: Not quite sure why this happens with user
-+    // namespaces). Fortunately, we also have the seccomp filter sandbox which
-+    // should disallow the use of ptrace.
-+    if (setuid_sandbox->IsNoSuid())
-+      return true;
-+
- #if !defined(OS_OPENBSD)
-     // Previously, we required that the binary be non-readable. This causes the
-     // kernel to mark the process as non-dumpable at startup. The thinking was
-diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.cc b/sandbox/linux/suid/client/setuid_sandbox_client.cc
-index 7a174ef..633401e 100644
---- a/sandbox/linux/suid/client/setuid_sandbox_client.cc
-+++ b/sandbox/linux/suid/client/setuid_sandbox_client.cc
-@@ -166,6 +166,10 @@ bool SetuidSandboxClient::IsInNewNETNamespace() const {
-   return env_->HasVar(kSandboxNETNSEnvironmentVarName);
- }
- 
-+bool SetuidSandboxClient::IsNoSuid() const {
-+  return env_->HasVar(kSandboxNoSuidVarName);
-+}
-+
- bool SetuidSandboxClient::IsSandboxed() const {
-   return sandboxed_;
- }
-@@ -175,5 +179,9 @@ void SetuidSandboxClient::SetupLaunchEnvironment() {
-   SetSandboxAPIEnvironmentVariable(env_);
- }
- 
-+void SetuidSandboxClient::SetNoSuid() {
-+  env_->SetVar(kSandboxNoSuidVarName, "1");
-+}
-+
- }  // namespace sandbox
- 
-diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.h b/sandbox/linux/suid/client/setuid_sandbox_client.h
-index a9f6536..2e8113a 100644
---- a/sandbox/linux/suid/client/setuid_sandbox_client.h
-+++ b/sandbox/linux/suid/client/setuid_sandbox_client.h
-@@ -39,6 +39,8 @@ class SetuidSandboxClient {
-   bool IsInNewPIDNamespace() const;
-   // Did the setuid helper create a new network namespace ?
-   bool IsInNewNETNamespace() const;
-+  // Is sandboxed without SUID binary ?
-+  bool IsNoSuid() const;
-   // Are we done and fully sandboxed ?
-   bool IsSandboxed() const;
- 
-@@ -46,6 +48,8 @@ class SetuidSandboxClient {
-   // helper.
-   void SetupLaunchEnvironment();
- 
-+  void SetNoSuid();
-+
-  private:
-   // Holds the environment. Will never be NULL.
-   base::Environment* env_;
-diff --git a/sandbox/linux/suid/common/sandbox.h b/sandbox/linux/suid/common/sandbox.h
-index aad4ff8..bd710d5 100644
---- a/sandbox/linux/suid/common/sandbox.h
-+++ b/sandbox/linux/suid/common/sandbox.h
-@@ -18,6 +18,7 @@ static const char kAdjustLowMemMarginSwitch[] = "--adjust-low-mem";
- 
- static const char kSandboxDescriptorEnvironmentVarName[] = "SBX_D";
- static const char kSandboxHelperPidEnvironmentVarName[] = "SBX_HELPER_PID";
-+static const char kSandboxNoSuidVarName[] = "SBX_NO_SUID";
- 
- static const long kSUIDSandboxApiNumber = 1;
- static const char kSandboxEnvironmentApiRequest[] = "SBX_CHROME_API_RQ";
--- 
-1.8.2.1
-

From 983bd2d05976bb45281a10d398ca50f9942673fa Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 22 Aug 2013 07:08:34 +0300
Subject: [PATCH 046/452] Amarok: Fix build against KDE 4.8

---
 pkgs/applications/audio/amarok/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix
index f45ca59e0ea..1dac3f6b853 100644
--- a/pkgs/applications/audio/amarok/default.nix
+++ b/pkgs/applications/audio/amarok/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, lib, qtscriptgenerator, perl, gettext, curl
 , libxml2, mysql, taglib, taglib_extras, loudmouth , kdelibs
 , qca2, libmtp, liblastfm, libgpod, pkgconfig, automoc4, phonon
-, strigi, soprano, qjson, ffmpeg, libofa, nepomuk_core }:
+, strigi, soprano, qjson, ffmpeg, libofa, nepomuk_core ? null }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";

From b00d82493028c8d88a90359fa238454f0d978842 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 22 Aug 2013 09:37:20 +0300
Subject: [PATCH 047/452] Drop inferred, because "it was supposed to be used at
 every location which has no type" according to pierron - but isn't used in
 nixos/nixpkgs

---
 pkgs/lib/types.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/lib/types.nix b/pkgs/lib/types.nix
index 6ddac61d91b..f268580d783 100644
--- a/pkgs/lib/types.nix
+++ b/pkgs/lib/types.nix
@@ -47,10 +47,6 @@ rec {
 
   types = rec {
 
-    inferred = mkOptionType {
-      name = "inferred type";
-    };
-
     bool = mkOptionType {
       name = "boolean";
       check = lib.traceValIfNot builtins.isBool;

From fd803fce606a007403ba6d05f09ed2e6a3371830 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 22 Aug 2013 09:45:22 +0300
Subject: [PATCH 048/452] List should be an alias of listOf, and it should no
 longer be used. Add deprecation notice to list. Nixos has already been ported
 from list to listOf (8b2256686b4082f8ce6f8f61cba1eb6c1e786471).

---
 pkgs/lib/types.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/lib/types.nix b/pkgs/lib/types.nix
index f268580d783..b62c08f3af5 100644
--- a/pkgs/lib/types.nix
+++ b/pkgs/lib/types.nix
@@ -96,8 +96,10 @@ rec {
       check = lib.traceValIfNot (x: builtins.unsafeDiscardStringContext (builtins.substring 0 1 (toString x)) == "/");
     };
 
-    listOf = types.list;
-    list = elemType: mkOptionType {
+    # drop this in the future:
+    list = builtins.trace "types.list is deprecated, use types.listOf instead" types.listOf;
+
+    listOf = elemType: mkOptionType { 
       name = "list of ${elemType.name}s";
       check = value: lib.traceValIfNot isList value && all elemType.check value;
       merge = concatLists;

From 983c87a1dd371044c3e7ff0e8e662353094ddcc1 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 22 Aug 2013 09:50:25 +0300
Subject: [PATCH 049/452] Improve the error message for uniq option type.

---
 pkgs/lib/types.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/lib/types.nix b/pkgs/lib/types.nix
index b62c08f3af5..f9a195a80ba 100644
--- a/pkgs/lib/types.nix
+++ b/pkgs/lib/types.nix
@@ -166,7 +166,7 @@ rec {
         if length list == 1 then
           head list
         else
-          throw "Multiple definitions. Only one is allowed for this option.";
+          throw "Multiple definitions of ${elemType.name}. Only one is allowed for this option.";
     };
 
     none = elemType: mkOptionType {

From a3f148ce96493fa320a947e7a134b417880ee987 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 22 Aug 2013 10:01:27 +0300
Subject: [PATCH 050/452] Improve option types documentation.

---
 pkgs/lib/types.nix | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/pkgs/lib/types.nix b/pkgs/lib/types.nix
index f9a195a80ba..b634cccc8c6 100644
--- a/pkgs/lib/types.nix
+++ b/pkgs/lib/types.nix
@@ -19,7 +19,7 @@ rec {
 
 
   # name (name of the type)
-  # check (boolean function)
+  # check (check the config value. Before returning false it should trace the bad value eg using traceValIfNot)
   # merge (default merge function)
   # iter (iterate on all elements contained in this type)
   # fold (fold all elements contained in this type)
@@ -196,8 +196,21 @@ rec {
       hasOptions = false;
     };
 
-    # !!! this should be a type constructor that takes the options as
-    # an argument.
+    # usually used with listOf, attrsOf, loaOf like this:
+    # users = mkOption {
+    #   type = loaOf optionSet;
+    #
+    #   # you can omit the list if there is one element only
+    #   options = [ {
+    #     name = mkOption {
+    #       description = "name of the user"
+    #       ...
+    #     };
+    #     # more options here
+    #   } { more options } ];
+    # }
+    # TODO: !!! document passing options as an argument to optionSet,
+    # deprecate the current approach.
     optionSet = mkOptionType {
       name = "option set";
       # merge is done in "options.nix > addOptionMakeUp > handleOptionSets"

From fcbc4fe9ffe55924e760dd163a428f95c109d2bf Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 22 Aug 2013 10:06:43 +0300
Subject: [PATCH 051/452] Deprecate lib.zip in favor of lib.zipAttrsWith. Add
 deprecation trace message. Nixos has been ported away from lib.zip in
 d705c0c3a4b84768907ade90b3f420d62db422a2.

---
 pkgs/lib/attrsets.nix | 2 +-
 pkgs/lib/types.nix    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/lib/attrsets.nix b/pkgs/lib/attrsets.nix
index f562a2f7df4..01d51779c80 100644
--- a/pkgs/lib/attrsets.nix
+++ b/pkgs/lib/attrsets.nix
@@ -246,7 +246,7 @@ rec {
 
   /* backward compatibility */
   zipWithNames = zipAttrsWithNames;
-  zip = zipAttrsWith;
+  zip = builtins.trace "lib.zip is deprecated, use lib.zipAttrsWith instead" zipAttrsWith;
 
 
   /* Does the same as the update operator '//' except that attributes are
diff --git a/pkgs/lib/types.nix b/pkgs/lib/types.nix
index b634cccc8c6..afd5ed5e17c 100644
--- a/pkgs/lib/types.nix
+++ b/pkgs/lib/types.nix
@@ -117,7 +117,7 @@ rec {
       name = "attribute set of ${elemType.name}s";
       check = x: lib.traceValIfNot isAttrs x
         && fold (e: v: v && elemType.check e) true (lib.attrValues x);
-      merge = lib.zip (name: elemType.merge);
+      merge = lib.zipAttrsWith (name: elemType.merge);
       iter = f: path: set: lib.mapAttrs (name: elemType.iter f (path + "." + name)) set;
       fold = op: nul: set: fold (e: l: elemType.fold op l e) nul (lib.attrValues set);
       docPath = path: elemType.docPath (path + ".<name>");

From 53994036d35d2605ea79620b3cd9d37065f3a6be Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 22 Aug 2013 10:16:00 +0300
Subject: [PATCH 052/452] Replace fold by all because its more readable and
 shorter

---
 pkgs/lib/types.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/lib/types.nix b/pkgs/lib/types.nix
index afd5ed5e17c..9dce885b182 100644
--- a/pkgs/lib/types.nix
+++ b/pkgs/lib/types.nix
@@ -116,7 +116,7 @@ rec {
     attrsOf = elemType: mkOptionType {
       name = "attribute set of ${elemType.name}s";
       check = x: lib.traceValIfNot isAttrs x
-        && fold (e: v: v && elemType.check e) true (lib.attrValues x);
+        && all elemType.check (lib.attrValues x); 
       merge = lib.zipAttrsWith (name: elemType.merge);
       iter = f: path: set: lib.mapAttrs (name: elemType.iter f (path + "." + name)) set;
       fold = op: nul: set: fold (e: l: elemType.fold op l e) nul (lib.attrValues set);

From acd4dcde6328dbacd8bff817d589dec132dae45e Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 22 Aug 2013 10:32:13 +0300
Subject: [PATCH 053/452] Always merge functions "merge" and "check" if type
 defines them.

---
 pkgs/lib/options.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pkgs/lib/options.nix b/pkgs/lib/options.nix
index 5c896d5714c..5f04f1ca8fb 100644
--- a/pkgs/lib/options.nix
+++ b/pkgs/lib/options.nix
@@ -55,12 +55,7 @@ rec {
       };
 
       functionsFromType = opt:
-        if decl ? type && decl.type ? merge then
-          opt
-          // optionalAttrs (decl.type ? merge) { inherit (decl.type) merge; }
-          // optionalAttrs (decl.type ? check) { inherit (decl.type) check; }
-        else
-          opt;
+        opt // (builtins.intersectAttrs { merge = 1; check = 1; } (decl.type or {})); 
 
       addDeclaration = opt: opt // decl;
 

From f4b3007ef95961a96cce3e42a7f6ef7d85713feb Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Thu, 15 Aug 2013 15:07:04 +0200
Subject: [PATCH 054/452] Add re2, an efficient, principled regular expression
 library

---
 pkgs/development/libraries/re2/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/libraries/re2/default.nix

diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix
new file mode 100644
index 00000000000..26ef47199e3
--- /dev/null
+++ b/pkgs/development/libraries/re2/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "re2";
+  version = "20130802";
+
+  src = fetchurl {
+    url = "https://re2.googlecode.com/files/${name}-${version}.tgz";
+    sha256 = "12yxbjsnc1ym7jny470wbnb6h3rgsfv0z75vdp12npklck5nmwhp";
+  };
+
+  preConfigure = ''
+    substituteInPlace Makefile --replace "/usr/local" "$out"
+  '';
+
+  meta = {
+    homepage = https://code.google.com/p/re2/;
+    description = "An efficient, principled regular expression library";
+    license = with stdenv.lib.licenses; bsd3;
+    platforms = with stdenv.lib.platforms; all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 027172935ae..6a2f3f4b65e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5178,6 +5178,8 @@ let
 
   ptlib = callPackage ../development/libraries/ptlib {};
 
+  re2 = callPackage ../development/libraries/re2 { };
+
   qca2 = callPackage ../development/libraries/qca2 {};
 
   qca2_ossl = callPackage ../development/libraries/qca2/ossl.nix {};

From 52204af457c30781b09accc91c5d18d045d674ea Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Wed, 13 Mar 2013 15:05:30 +0100
Subject: [PATCH 055/452] Refactor: introduce isType reducing redundancy
 (trivial change)

---
 pkgs/lib/options.nix    |  6 +++---
 pkgs/lib/properties.nix | 16 ++++++++--------
 pkgs/lib/systems.nix    | 12 ++++++------
 pkgs/lib/types.nix      |  3 ++-
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/pkgs/lib/options.nix b/pkgs/lib/options.nix
index 5f04f1ca8fb..f10b5831267 100644
--- a/pkgs/lib/options.nix
+++ b/pkgs/lib/options.nix
@@ -11,10 +11,10 @@ with import ./properties.nix;
 
 rec {
 
-  inherit (lib) typeOf;
+  inherit (lib) isType;
   
 
-  isOption = attrs: (typeOf attrs) == "option";
+  isOption = isType "option";
   mkOption = attrs: attrs // {
     _type = "option";
     # name (this is the name of the attributem it is automatically generated by the traversal)
@@ -190,7 +190,7 @@ rec {
             defValue = builtins.getAttr defName defs;
             optValue = builtins.getAttr defName opts;
           in
-          if typeOf defValue == "option"
+          if isOption defValue
           then
             # `defValue' is an option.
             if hasAttr defName opts
diff --git a/pkgs/lib/properties.nix b/pkgs/lib/properties.nix
index eeac27ae70c..22aa8d891d8 100644
--- a/pkgs/lib/properties.nix
+++ b/pkgs/lib/properties.nix
@@ -11,13 +11,13 @@ with import ./attrsets.nix;
 
 rec {
 
-  inherit (lib) typeOf;
+  inherit (lib) isType;
 
   # Tell that nothing is defined.  When properties are evaluated, this type
   # is used to remove an entry.  Thus if your property evaluation semantic
   # implies that you have to mute the content of an attribute, then your
   # property should produce this value.
-  isNotdef = attrs: (typeOf attrs) == "notdef";
+  isNotdef = isType "notdef";
   mkNotdef = {_type = "notdef";};
 
   # General property type, it has a property attribute and a content
@@ -32,7 +32,7 @@ rec {
   #  - onGlobalDelay: run on all copied properties.
   #  - onEval: run on an evaluated property.
   #  - onGlobalEval: run on a list of property stack on top of their values.
-  isProperty = attrs: (typeOf attrs) == "property";
+  isProperty = isType "property";
   mkProperty = p@{property, content, ...}: p // {
     _type = "property";
   };
@@ -187,7 +187,7 @@ rec {
   # and interpreted by the underlying system using properties (modules).
 
   # Create a "Merge" property which only contains a condition.
-  isMerge = attrs: (typeOf attrs) == "merge";
+  isMerge = isType "merge";
   mkMerge = content: mkProperty {
     property = {
       _type = "merge";
@@ -204,7 +204,7 @@ rec {
   # is ignore.
 
   # Create a "If" property which only contains a condition.
-  isIf = attrs: (typeOf attrs) == "if";
+  isIf = isType "if";
   mkIf = condition: content: mkProperty {
     property = {
       _type = "if";
@@ -271,7 +271,7 @@ rec {
   # priorities between values.  The default priority is 100. The lowest
   # priorities are kept.  The template argument must reproduce the same
   # attribute set hierarchy to override leaves of the hierarchy.
-  isOverride = attrs: (typeOf attrs) == "override";
+  isOverride = isType "override";
   mkOverrideTemplate = priority: template: content: mkProperty {
     property = {
       _type = "override";
@@ -371,7 +371,7 @@ rec {
   # of the list used by the merge function.  And the highest ranked
   # definition would be the last.  Definitions which does not have any rank
   # value have the default rank of 100.
-  isOrder = attrs: (typeOf attrs) == "order";
+  isOrder = isType "order";
   mkOrder = rank: content: mkProperty {
     property = {
       _type = "order";
@@ -434,7 +434,7 @@ rec {
   # properties on top of the option definition is nice for user manipulation
   # but require to check if the content of the property is not another
   # property.  Such testing implies to verify if this is an attribute set
-  # and if it possess the type 'property'. (see isProperty & typeOf)
+  # and if it possess the type 'property'. (see isProperty & typeOf/isType)
   #
   # To avoid strict evaluation of option definitions, 'mkFixStrictness' is
   # introduced.  This property protects an option definition by replacing
diff --git a/pkgs/lib/systems.nix b/pkgs/lib/systems.nix
index 09d04042f1c..02c26ba600a 100644
--- a/pkgs/lib/systems.nix
+++ b/pkgs/lib/systems.nix
@@ -15,14 +15,14 @@ in
 
 rec {
 
-  isSignificantByte = x: typeOf x == "significant-byte";
+  isSignificantByte = isType "significant-byte";
   significantBytes = setTypes "significant-byte" {
     bigEndian = {};
     littleEndian = {};
   };
 
 
-  isCpuType = x: typeOf x == "cpu-type"
+  isCpuType = isType "cpu-type"
     && elem x.bits [8 16 32 64 128]
     && (builtins.lessThan 8 x.bits -> isSignificantByte x.significantByte);
 
@@ -37,7 +37,7 @@ rec {
     };
 
 
-  isExecFormat = x: typeOf x == "exec-format";
+  isExecFormat = isType "exec-format";
   execFormats = setTypes "exec-format" {
     aout = {}; # a.out
     elf = {};
@@ -47,7 +47,7 @@ rec {
   };
 
 
-  isKernel = x: typeOf x == "kernel";
+  isKernel = isType "kernel";
   kernels = with execFormats;
     setTypes "kernel" {
       cygwin =  { execFormat = pe; };
@@ -61,7 +61,7 @@ rec {
     };
 
 
-  isArchitecture = x: typeOf x == "architecture";
+  isArchitecture = isType "architecture";
   architectures = setTypes "architecture" {
     apple = {};
     pc = {};
@@ -69,7 +69,7 @@ rec {
   };
 
 
-  isSystem = x: typeOf x == "system"
+  isSystem = isType "system"
     && isCpuType x.cpu
     && isArchitecture x.arch
     && isKernel x.kernel;
diff --git a/pkgs/lib/types.nix b/pkgs/lib/types.nix
index 9dce885b182..156d72ac5e7 100644
--- a/pkgs/lib/types.nix
+++ b/pkgs/lib/types.nix
@@ -10,6 +10,7 @@ with import ./trivial.nix;
 
 rec {
 
+  isType = type: x: (x._type or "") == type;
   hasType = x: isAttrs x && x ? _type;
   typeOf = x: x._type or "";
 
@@ -26,7 +27,7 @@ rec {
   # hasOptions (boolean: whatever this option contains an option set)
   # delayOnGlobalEval (boolean: should properties go through the evaluation of this option)
   # docPath (path concatenated to the option name contained in the option set)
-  isOptionType = attrs: typeOf attrs == "option-type";
+  isOptionType = isType "option-type";
   mkOptionType =
     { name
     , check ? (x: true)

From 7a7659844715241f8a05fc5d7a20c07f47463134 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 22 Aug 2013 11:20:57 +0300
Subject: [PATCH 056/452] Improve error messages.

Improve function name: ensureDefaultType: It runs the check function, so
checkDefault is much easier to understand.
---
 pkgs/lib/options.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/lib/options.nix b/pkgs/lib/options.nix
index f10b5831267..a7d1a3483a0 100644
--- a/pkgs/lib/options.nix
+++ b/pkgs/lib/options.nix
@@ -66,18 +66,18 @@ rec {
               if all opt.check list then
                 opt.merge list
               else
-                throw "One of the definitions has a bad type.";
+                throw "One of option ${name} values is of a bad type.";
           }
         else opt;
 
-      ensureDefaultType = opt:
+      checkDefault = opt:
         if opt ? check && opt ? default then
           opt // {
             default =
               if opt.check opt.default then
                 opt.default
               else
-                throw "The default value has a bad type.";
+                throw "The default value of option ${name} is of a bad type.";
           }
         else opt;
 
@@ -136,7 +136,7 @@ rec {
 
         # override settings
         ensureMergeInputType
-        ensureDefaultType
+        checkDefault
         handleOptionSets
       ];
 

From 959e79f4c766be8a072c90cb20b98121e7a85f48 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 22 Aug 2013 10:32:42 +0200
Subject: [PATCH 057/452] haskell-packages.nix: fix builds of 'terminfo' and
 'readline'

These builds depend on the ncurses library, but that package was
shadowed when the 'ncurses' Haskell library was added.
---
 pkgs/top-level/haskell-packages.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 61b4d6c50b3..4c7fb8602a5 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1473,7 +1473,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   naturals = callPackage ../development/libraries/haskell/naturals {};
 
-  ncurses = callPackage ../development/libraries/haskell/ncurses { inherit (pkgs) ncurses; };
+  ncurses = callPackage ../development/libraries/haskell/ncurses {
+    inherit (pkgs) ncurses;
+  };
 
   netlist = callPackage ../development/libraries/haskell/netlist {};
 
@@ -1697,7 +1699,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   ReadArgs = callPackage ../development/libraries/haskell/ReadArgs {};
 
   readline = callPackage ../development/libraries/haskell/readline {
-    inherit (pkgs) readline;
+    inherit (pkgs) readline ncurses;
   };
 
   recaptcha = callPackage ../development/libraries/haskell/recaptcha {};
@@ -1927,7 +1929,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   terminalProgressBar = callPackage ../development/libraries/haskell/terminal-progress-bar {};
 
-  terminfo = callPackage ../development/libraries/haskell/terminfo {};
+  terminfo = callPackage ../development/libraries/haskell/terminfo {
+    inherit (pkgs) ncurses;
+  };
 
   testFramework = callPackage ../development/libraries/haskell/test-framework {};
 

From 77cf3c3e0caf3852bd7541f4e5f280aab6bb3098 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Wed, 21 Aug 2013 08:19:59 +1000
Subject: [PATCH 058/452] vimPlugins.taglist: add expression

---
 pkgs/misc/vim-plugins/default.nix | 35 ++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 4896755c634..8758475f347 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1,4 +1,4 @@
-{fetchurl, stdenv, python, cmake, vim, perl, ruby}:
+{ fetchurl, stdenv, python, cmake, vim, perl, ruby, unzip }:
 
 /*
 About Vim and plugins
@@ -164,18 +164,13 @@ in
   };
 
   command_T = simpleDerivation {
-
     name = "vim-command-t-1.4";
-
     src = fetchurl {
       url    = "https://github.com/wincent/Command-T/archive/1.4.tar.gz";
       sha256 = "1ka9hwx9n0vj1dd5qsd2l1wq0kriwl76jmmdjzh7zaf0p547v98s";
     };
-
     path = "Command-T";
-
     buildInputs = [ perl ruby ];
-
     buildPhase = ''
       pushd ruby/command-t
       ruby extconf.rb
@@ -200,17 +195,37 @@ in
     };
   };
 
+  taglist = simpleDerivation {
+    name = "vim-taglist-4.6";
+    meta = with stdenv.lib; {
+      description = "Source code browser plugin";
+      homepage    = "http://www.vim.org/scripts/script.php?script_id=273";
+      license     = stdenv.lib.licenses.gpl3;
+      maintainers = with maintainers; [ lovek323 ];
+      platforms   = platforms.unix;
+    };
+    src = fetchurl {
+      url    = "http://www.vim.org/scripts/download_script.php?src_id=19574";
+      name   = "taglist_46.zip";
+      sha256 = "18cbv462vwg7vip2p99qlahm99hswav96cj4ki227kyi05q2lkjj";
+    };
+    setSourceRoot = ''
+      export sourceRoot=taglist
+      mkdir taglist
+      mv doc taglist
+      mv plugin taglist
+    '';
+    buildInputs = [ unzip ];
+    path = "taglist";
+  };
+
   xdebug = simpleDerivation {
-
     name = "vim-xdebug-a4980fa65f7f159780593ee37c178281691ba2c4";
-
     src = fetchurl {
       url = "https://github.com/joonty/vim-xdebug/archive/a4980fa65f7f159780593ee37c178281691ba2c4.tar.gz";
       sha256 = "1348gzp0zhc2wifvs5vmf92m9y8ik8ldnvy7bawsxahy8hmhiksk";
     };
-
     path = "xdebug";
-
     postInstall = false;
   };
 }

From 2c089337e7a4260cec5b83f98754e5dc8445a0f4 Mon Sep 17 00:00:00 2001
From: Christophe Raffalli <raffalli@univ-savoie.fr>
Date: Sat, 15 Jun 2013 06:40:01 +0000
Subject: [PATCH 059/452] OpenSSH: add Kerberos support

---
 pkgs/tools/networking/openssh/default.nix |  9 ++++++++-
 pkgs/top-level/all-packages.nix           | 13 ++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 4296ba57f88..6d3120e7b99 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -1,8 +1,12 @@
 { stdenv, fetchurl, zlib, openssl, perl, libedit, pkgconfig, pam
 , etcDir ? null
 , hpnSupport ? false
+, withKerberos ? false
+, kerberos
 }:
 
+assert withKerberos -> kerberos != null;
+
 let
 
   hpnSrc = fetchurl {
@@ -28,7 +32,9 @@ stdenv.mkDerivation rec {
 
   patches = [ ./locale_archive.patch ];
 
-  buildInputs = [ zlib openssl libedit pkgconfig pam ];
+  buildInputs = [ zlib openssl libedit pkgconfig pam ] ++
+    (if withKerberos then [ kerberos ] else [])
+  ;
 
   # I set --disable-strip because later we strip anyway. And it fails to strip
   # properly when cross building.
@@ -39,6 +45,7 @@ stdenv.mkDerivation rec {
       --disable-strip
       ${if pam != null then "--with-pam" else "--without-pam"}
       ${if etcDir != null then "--sysconfdir=${etcDir}" else ""}
+      ${if withKerberos  then "--with-kerberos5=${kerberos}" else ""}
     '';
 
   preConfigure =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 319089ae223..1555d505b1a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1420,11 +1420,14 @@ let
 
   opensc_dnie_wrapper = callPackage ../tools/security/opensc-dnie-wrapper { };
 
-  openssh = callPackage ../tools/networking/openssh {
-    hpnSupport = false;
-    etcDir = "/etc/ssh";
-    pam = if stdenv.isLinux then pam else null;
-  };
+  openssh =
+    callPackage ../tools/networking/openssh {
+      hpnSupport = false;
+      withKerberos = false;
+      etcDir = "/etc/ssh";
+      pam = if stdenv.isLinux then pam else null;
+    };
+  openssh_with_kerberos = lowPrio (pkgs.appendToName "with-kerberos" (openssh.override { withKerberos = true; }));
 
   opensp = callPackage ../tools/text/sgml/opensp { };
 

From 57032af1ae59f12cfad9f2321882153e216e5dec Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 22 Aug 2013 13:00:23 +0300
Subject: [PATCH 060/452] ati-proprietary: update, make it build with linux
 3.10, fix breakage. with contributions by Jaka Hudoklin.

---
 pkgs/os-specific/linux/ati-drivers/builder.sh |   9 +-
 .../os-specific/linux/ati-drivers/default.nix |  20 +-
 .../linux/ati-drivers/gentoo-patches.patch    | 293 ++++++++++++++++++
 3 files changed, 313 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/os-specific/linux/ati-drivers/gentoo-patches.patch

diff --git a/pkgs/os-specific/linux/ati-drivers/builder.sh b/pkgs/os-specific/linux/ati-drivers/builder.sh
index abb78549cee..2a20aa29fcc 100644
--- a/pkgs/os-specific/linux/ati-drivers/builder.sh
+++ b/pkgs/os-specific/linux/ati-drivers/builder.sh
@@ -11,6 +11,7 @@ unzip $src
 run_file=$(echo amd-driver-installer-*)
 sh $run_file --extract .
 
+eval "$patchPhase"
 
 kernelVersion=$(cd ${kernel}/lib/modules && ls)
 kernelBuild=$(echo ${kernel}/lib/modules/$kernelVersion/build)
@@ -166,7 +167,7 @@ GCC_MAJOR="`gcc --version | grep -o -e ") ." | head -1 | cut -d " " -f 2`"
   # fail saying different kernel versions
   cp -r $TMP/arch/$arch/usr/X11R6/$lib_arch/modules/dri $out/lib
   cp -r $TMP/arch/$arch/usr/X11R6/$lib_arch/modules/dri/* $out/lib
-  cp -r $TMP/arch/$arch/usr/X11R6/$lib_arch/*.so.* $out/lib
+  cp -r $TMP/arch/$arch/usr/X11R6/$lib_arch/*.so* $out/lib
   cp -r $TMP/arch/$arch/usr/X11R6/$lib_arch/fglrx/fglrx-libGL.so.1.2 $out/lib/fglrx-libGL.so.1.2
 
   cp -r $TMP/arch/$arch/usr/$lib_arch/* $out/lib
@@ -224,3 +225,9 @@ GCC_MAJOR="`gcc --version | grep -o -e ") ." | head -1 | cut -d " " -f 2`"
   rm -fr $out/lib/modules/fglrx # don't think those .a files are needed. They cause failure of the mod
 
 }
+
+for p in $extraDRIlibs; do
+  for lib in $p/lib/*.so*; do
+    ln -s $lib $out/lib/
+  done
+done
diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix
index ff508deed12..326de9ed81a 100644
--- a/pkgs/os-specific/linux/ati-drivers/default.nix
+++ b/pkgs/os-specific/linux/ati-drivers/default.nix
@@ -23,27 +23,26 @@
 assert stdenv.system == "x86_64-linux";
 
 stdenv.mkDerivation rec {
-  name = "ati-drivers-${version}-${kernelDev.version}";
-  version = "10-11-x86";
+  name = "ati-drivers-${version}-${kernel.version}";
+  version = "13.4";
 
   builder = ./builder.sh;
 
   inherit libXxf86vm xf86vidmodeproto;
 
   src = fetchurl {
-    url = http://www2.ati.com/drivers/linux/amd-driver-installer-12-8-x86.x86_64.zip;
-    sha256 = "0hdv89vdap6v0dnwhddizfmlkwyh0j910sp4wyj2lq5pn9rm2lk2";
-
-    # beta
-    # url = "http://www2.ati.com/drivers/beta/amd-driver-installer-12-9-beta-x86.x86_64.zip";
-    # sha256 = "02dmflzfrgr07fa1hv34m7ad8pra21xv7qbk500gqm6v8s9vbplk";
+    url = http://www2.ati.com/drivers/linux/amd-driver-installer-catalyst-13-4-linux-x86.x86_64.zip;
+    sha256 = "1914ikdich0kg047bqh89ai5z4dyryj5mlw5i46n90fsfiaxa532";
   };
 
+  patchPhase = "patch -p0 < ${./gentoo-patches.patch}";
+
   buildInputs =
     [ xlibs.libXext xlibs.libX11
       xlibs.libXrandr which imake makeWrapper
       patchelf
       unzip
+      mesa
     ];
 
   kernel = kernelDev;
@@ -57,6 +56,11 @@ stdenv.mkDerivation rec {
       "${xorg.libX11}/lib"
     ];
 
+  # without this some applications like blender don't start, but they start
+  # with nvidia. This causes them to be symlinked to $out/lib so that they
+  # appear in /run/opengl-driver/lib which get's added to LD_LIBRARY_PATH
+ extraDRIlibs = [ xorg.libXext ];
+
   inherit mesa; # only required to build examples
 
   meta = {
diff --git a/pkgs/os-specific/linux/ati-drivers/gentoo-patches.patch b/pkgs/os-specific/linux/ati-drivers/gentoo-patches.patch
new file mode 100644
index 00000000000..ce4871c0658
--- /dev/null
+++ b/pkgs/os-specific/linux/ati-drivers/gentoo-patches.patch
@@ -0,0 +1,293 @@
+diff -Nur common/lib/modules/fglrx/build_mod/drmP.h common-r1/lib/modules/fglrx/build_mod/drmP.h
+--- common/lib/modules/fglrx/build_mod/drmP.h	2013-05-15 09:26:23.555752577 +0300
++++ common-r1/lib/modules/fglrx/build_mod/drmP.h	2013-05-16 10:39:17.496212055 +0300
+@@ -901,10 +901,6 @@
+ int                   DRM(stub_unregister)(int minor);
+ 
+ 				/* Proc support (drm_proc.h) */
+-extern struct proc_dir_entry *DRM(proc_init)(drm_device_t *dev,
+-					     int minor,
+-					     struct proc_dir_entry *root,
+-					     struct proc_dir_entry **dev_root);
+ extern int            DRM(proc_cleanup)(int minor,
+ 					struct proc_dir_entry *root,
+ 					struct proc_dir_entry *dev_root);
+diff -Nur common/lib/modules/fglrx/build_mod/drm_proc.h common-r1/lib/modules/fglrx/build_mod/drm_proc.h
+--- common/lib/modules/fglrx/build_mod/drm_proc.h	2013-05-15 09:26:23.555752577 +0300
++++ common-r1/lib/modules/fglrx/build_mod/drm_proc.h	2013-05-19 02:16:16.584406160 +0300
+@@ -75,61 +75,6 @@
+ #define DRM_PROC_ENTRIES (sizeof(DRM(proc_list))/sizeof(DRM(proc_list)[0]))
+ 
+ /**
+- * Initialize the DRI proc filesystem for a device.
+- *
+- * \param dev DRM device.
+- * \param minor device minor number.
+- * \param root DRI proc dir entry.
+- * \param dev_root resulting DRI device proc dir entry.
+- * \return root entry pointer on success, or NULL on failure.
+- * 
+- * Create the DRI proc root entry "/proc/ati", the device proc root entry
+- * "/proc/ati/%minor%/", and each entry in proc_list as
+- * "/proc/ati/%minor%/%name%".
+- */
+-struct proc_dir_entry *DRM(proc_init)(drm_device_t *dev, int minor,
+-				      struct proc_dir_entry *root,
+-				      struct proc_dir_entry **dev_root)
+-{
+-	struct proc_dir_entry *ent;
+-	int		      i, j;
+-	char                  name[64];
+-
+-	if (!minor) root = create_proc_entry("dri", S_IFDIR, NULL);
+-	if (!root) {
+-		DRM_ERROR("Cannot create /proc/ati\n");
+-		return NULL;
+-	}
+-
+-	sprintf(name, "%d", minor);
+-	*dev_root = create_proc_entry(name, S_IFDIR, root);
+-	if (!*dev_root) {
+-		DRM_ERROR("Cannot create /proc/ati/%s\n", name);
+-		return NULL;
+-	}
+-
+-	for (i = 0; i < DRM_PROC_ENTRIES; i++) {
+-		ent = create_proc_entry(DRM(proc_list)[i].name,
+-					S_IFREG|S_IRUGO, *dev_root);
+-		if (!ent) {
+-			DRM_ERROR("Cannot create /proc/ati/%s/%s\n",
+-				  name, DRM(proc_list)[i].name);
+-			for (j = 0; j < i; j++)
+-				remove_proc_entry(DRM(proc_list)[i].name,
+-						  *dev_root);
+-			remove_proc_entry(name, root);
+-			if (!minor) remove_proc_entry("dri", NULL);
+-			return NULL;
+-		}
+-		ent->read_proc = DRM(proc_list)[i].f;
+-		ent->data      = dev;
+-	}
+-
+-	return root;
+-}
+-
+-
+-/**
+  * Cleanup the proc filesystem resources.
+  *
+  * \param minor device minor number.
+diff -Nur common/lib/modules/fglrx/build_mod/firegl_public.c common-r1/lib/modules/fglrx/build_mod/firegl_public.c
+--- common/lib/modules/fglrx/build_mod/firegl_public.c	2013-05-15 09:26:23.545752925 +0300
++++ common-r1/lib/modules/fglrx/build_mod/firegl_public.c	2013-05-19 03:07:10.236552522 +0300
+@@ -583,6 +583,202 @@
+     { "NULL",           NULL,                       NULL} // Terminate List!!!
+ };
+ 
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
++typedef int (read_proc_t)(char *page, char **start, off_t off, int count, int *eof, void *data);
++typedef int (write_proc_t)(struct file *file, const char __user *buffer, unsigned long count, void *data);
++#else
++#define PDE_DATA(inode) (PDE((inode))->data)
++#endif
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
++typedef struct {
++	read_proc_t *read_func;
++	write_proc_t *write_func;
++	void *data;
++} gentoo_proc_wrapper_t;
++
++#define GENTOO_PROC_WRAPPER_OVERFLOW_MAGIC 939750305
++
++static ssize_t gentoo_proc_wrapper_read (struct file *myfile, char __user *buffer, size_t count, loff_t *offset) {
++	int is_eof=0, retval;
++	char *start, *usebuffer=NULL;
++	gentoo_proc_wrapper_t* wrapper_data=(gentoo_proc_wrapper_t*)(myfile->private_data);
++	if (PAGE_SIZE<*offset) {
++		printk(KERN_ERR "Trying to read beyond 4k on proc\n");
++		return -EIO;
++	}
++	//printk(KERN_NOTICE " call with: dev %p, func %p\n", wrapper_data->data, wrapper_data->read_func);
++	
++	usebuffer=kmalloc(2*PAGE_SIZE, GFP_KERNEL);
++	if (!usebuffer)
++		return -ENOMEM;
++	((u32*)usebuffer)[1024]=GENTOO_PROC_WRAPPER_OVERFLOW_MAGIC;
++
++	retval=wrapper_data->read_func(usebuffer, &start, *offset, count, &is_eof, wrapper_data->data);
++
++	BUG_ON(GENTOO_PROC_WRAPPER_OVERFLOW_MAGIC != ((u32*)usebuffer)[1024]);
++
++	if (0 > retval)
++	{
++		printk(KERN_ERR "Proc read failed with %d", retval);
++		goto out;
++	}
++
++	if (copy_to_user(buffer, start, retval)) {
++		printk(KERN_NOTICE "copy to user failed in amd drivers proc code\n");
++		retval=-EFAULT;
++		goto out;
++	}
++	*offset+=retval;
++	
++out:
++	if (usebuffer)
++		kfree(usebuffer);
++	return retval;
++}
++static ssize_t gentoo_proc_wrapper_write (struct file *myfile, const char __user *buffer, size_t count, loff_t *offset) {
++	gentoo_proc_wrapper_t* wrapper_data=(gentoo_proc_wrapper_t*)(myfile->private_data);
++	int retval=0;
++	void *usebuffer=NULL;
++
++	BUG_ON(*offset);
++	if (!wrapper_data->write_func)
++		return -EPERM;
++	
++	usebuffer=kmalloc(count, GFP_KERNEL);
++	if (!usebuffer)
++		return -ENOMEM;
++	if (copy_from_user(usebuffer, buffer, count)) {
++		printk(KERN_NOTICE "copy from user failed in amd drivers proc code\n");
++		retval=-EFAULT;
++		goto out;
++	}
++	
++	retval=wrapper_data->write_func(myfile, buffer, count, wrapper_data->data);
++	*offset+=retval;
++out:
++	if (usebuffer)
++		kfree(usebuffer);
++	return retval;
++}
++static int gentoo_proc_wrapper_open(struct inode *myinode, struct file *myfile) {
++	myfile->private_data=PDE_DATA(myinode);
++	return generic_file_open(myinode, myfile);
++}
++struct file_operations gentoo_proc_fops = {
++	.read=gentoo_proc_wrapper_read,
++	.write=gentoo_proc_wrapper_write,
++	.open=gentoo_proc_wrapper_open,
++};
++	
++static void *gentoo_proc_wrapper_data(read_proc_t *reader, write_proc_t *writer, void *mydata) {
++	gentoo_proc_wrapper_t *retval=kmalloc(sizeof(gentoo_proc_wrapper_t), GFP_KERNEL);
++	if (!retval)
++		return retval;
++	retval->read_func=reader;
++	retval->write_func=writer;
++	retval->data=mydata;
++	return retval;
++}
++
++static struct proc_dir_entry *firegl_proc_init( device_t *dev,
++                                                int minor,
++                                                struct proc_dir_entry *root,
++                                                struct proc_dir_entry **dev_root,
++                                                kcl_proc_list_t *proc_list ) // proc_list must be terminated!
++{
++    struct proc_dir_entry *ent;
++    char    name[64];
++    kcl_proc_list_t *list = proc_list;
++	void *tempdata;
++    KCL_DEBUG1(FN_FIREGL_PROC, "minor %d, proc_list 0x%08lx\n", minor, (unsigned long)proc_list);
++    if (!minor)
++    {
++        root = proc_mkdir("ati", NULL);
++    }
++
++    if (!root)
++    {
++        KCL_DEBUG_ERROR("Cannot create /proc/ati\n");
++        return NULL;
++    }
++
++    if (minor == 0)
++    {
++        // Global major debice number entry
++		tempdata=gentoo_proc_wrapper_data((read_proc_t*)firegl_major_proc_read, NULL, NULL);
++		if (!tempdata)
++			return NULL;
++        ent = proc_create_data("major", S_IFREG|S_IRUGO, root, &gentoo_proc_fops, tempdata);
++        if (!ent)
++        {
++            remove_proc_entry("ati", NULL);
++            KCL_DEBUG_ERROR("Cannot create /proc/ati/major\n");
++            return NULL;
++        }
++    }
++
++    sprintf(name, "%d", minor);
++    *dev_root = proc_mkdir(name, root);
++    if (!*dev_root) {
++        remove_proc_entry("major", root);
++        remove_proc_entry("ati", NULL);
++        KCL_DEBUG_ERROR("Cannot create /proc/ati/%s\n", name);
++        return NULL;
++    }
++
++    while (list->f || list->fops)
++    {
++		struct file_operations *my_fops = &gentoo_proc_fops;
++        if (list->fops)
++        {
++            my_fops = (struct file_operations*)list->fops;
++			tempdata=(dev->pubdev.signature == FGL_DEVICE_SIGNATURE)? firegl_find_device(minor) : (dev);
++        }
++		else {
++			BUG_ON(!list->f);
++			tempdata=gentoo_proc_wrapper_data((read_proc_t*)list->f, NULL, (dev->pubdev.signature == FGL_DEVICE_SIGNATURE)? firegl_find_device(minor) : (dev) );
++			if (!tempdata)
++				return NULL;
++		}
++		//printk(KERN_NOTICE "name %s, dev %p, func %p, data %p\n", list->name, (dev->pubdev.signature == FGL_DEVICE_SIGNATURE)? firegl_find_device(minor) : (dev), list->f, tempdata);
++        ent = proc_create_data(list->name, S_IFREG|S_IRUGO, *dev_root, my_fops, tempdata);
++
++        if (!ent)
++        {
++            KCL_DEBUG_ERROR("Cannot create /proc/ati/%s/%s\n", name, list->name);
++            while (proc_list != list)
++            {
++                remove_proc_entry(proc_list->name, *dev_root);
++                proc_list++;
++            }
++            remove_proc_entry(name, root);
++            if (!minor)
++            {
++                remove_proc_entry("major", root);
++                remove_proc_entry("ati", NULL);
++            }
++            return NULL;
++        }
++
++        list++;
++    }
++
++    if (minor == 0)
++    {
++        // Global debug entry, only create it once
++		tempdata=gentoo_proc_wrapper_data((read_proc_t*)firegl_debug_proc_read_wrap, (write_proc_t*)firegl_debug_proc_write_wrap, dev);
++		if (!tempdata)
++			return NULL;
++        ent=proc_create_data("debug", S_IFREG|S_IRUGO, root, &gentoo_proc_fops, tempdata);
++		if (!ent)
++			return NULL;
++    }
++
++    return root;
++}
++#else
+ static struct proc_dir_entry *firegl_proc_init( device_t *dev,
+                                                 int minor,
+                                                 struct proc_dir_entry *root,
+@@ -677,6 +873,7 @@
+ 
+     return root;
+ }
++#endif
+ 
+ static int firegl_proc_cleanup( int minor,
+                                 struct proc_dir_entry *root,

From 538990d475757d26329d61c056249f36741a4277 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 22 Aug 2013 12:33:03 +0200
Subject: [PATCH 061/452] lcms2: update the hash

Upstream changed one line in the source, without bumping the version.
---
 pkgs/development/libraries/lcms2/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/development/libraries/lcms2/default.nix
index c543398fb57..774cc7047e8 100644
--- a/pkgs/development/libraries/lcms2/default.nix
+++ b/pkgs/development/libraries/lcms2/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/lcms/${name}.tar.gz";
-    sha256 = "1vyjsvld0881n5vrvw3bcxiqmn7yyy6j1yj1nz76ksaxkarschnk";
+    sha256 = "0ax71bmscjzlpmg1r8vj3dypxf2jr7j9qfx5vc8j22j78hmpf9v7";
   };
 
   propagatedBuildInputs = [ libtiff libjpeg zlib ];

From af0e6b6b2b41eb7ebd3484fb4fbefd06a5b2a8b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 22 Aug 2013 12:37:19 +0200
Subject: [PATCH 062/452] ghostscript: bugfix update (old tarball removed
 upstream)

There was some incompatibility problem with the last update,
so upstream retracted the previous release.
---
 pkgs/misc/ghostscript/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index f5d82168773..7dd2981c6c4 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -41,10 +41,10 @@ let
   };
 
   mainlineSrc = rec {
-    name = "ghostscript-9.08";
+    name = "ghostscript-9.09";
     src = fetchurl {
       url = "http://downloads.ghostscript.com/public/${name}.tar.bz2";
-      sha256 = "0k1rvnvmiz456hiixfm130p3irbp1ddd0ycf7rf6bx7nzkp6sxb1";
+      sha256 = "1xwn4zlfb9jz0vrda0vd42qwfqddiav7rdkga0q94jc2q1qddzx6";
     };
     meta = meta_common // {
       homepage = "http://www.ghostscript.com/";

From d28a189af684e9ef61cc26b83e6e3798fe44b6f8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 Aug 2013 16:39:25 +0200
Subject: [PATCH 063/452] Revert "Refactor: introduce isType reducing
 redundancy (trivial change)"

This reverts commit 52204af457c30781b09accc91c5d18d045d674ea.  It
breaks Nixpkgs evaluation.

http://hydra.nixos.org/build/5758197
---
 pkgs/lib/options.nix    |  6 +++---
 pkgs/lib/properties.nix | 16 ++++++++--------
 pkgs/lib/systems.nix    | 12 ++++++------
 pkgs/lib/types.nix      |  3 +--
 4 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/pkgs/lib/options.nix b/pkgs/lib/options.nix
index a7d1a3483a0..620de84e707 100644
--- a/pkgs/lib/options.nix
+++ b/pkgs/lib/options.nix
@@ -11,10 +11,10 @@ with import ./properties.nix;
 
 rec {
 
-  inherit (lib) isType;
+  inherit (lib) typeOf;
   
 
-  isOption = isType "option";
+  isOption = attrs: (typeOf attrs) == "option";
   mkOption = attrs: attrs // {
     _type = "option";
     # name (this is the name of the attributem it is automatically generated by the traversal)
@@ -190,7 +190,7 @@ rec {
             defValue = builtins.getAttr defName defs;
             optValue = builtins.getAttr defName opts;
           in
-          if isOption defValue
+          if typeOf defValue == "option"
           then
             # `defValue' is an option.
             if hasAttr defName opts
diff --git a/pkgs/lib/properties.nix b/pkgs/lib/properties.nix
index 22aa8d891d8..eeac27ae70c 100644
--- a/pkgs/lib/properties.nix
+++ b/pkgs/lib/properties.nix
@@ -11,13 +11,13 @@ with import ./attrsets.nix;
 
 rec {
 
-  inherit (lib) isType;
+  inherit (lib) typeOf;
 
   # Tell that nothing is defined.  When properties are evaluated, this type
   # is used to remove an entry.  Thus if your property evaluation semantic
   # implies that you have to mute the content of an attribute, then your
   # property should produce this value.
-  isNotdef = isType "notdef";
+  isNotdef = attrs: (typeOf attrs) == "notdef";
   mkNotdef = {_type = "notdef";};
 
   # General property type, it has a property attribute and a content
@@ -32,7 +32,7 @@ rec {
   #  - onGlobalDelay: run on all copied properties.
   #  - onEval: run on an evaluated property.
   #  - onGlobalEval: run on a list of property stack on top of their values.
-  isProperty = isType "property";
+  isProperty = attrs: (typeOf attrs) == "property";
   mkProperty = p@{property, content, ...}: p // {
     _type = "property";
   };
@@ -187,7 +187,7 @@ rec {
   # and interpreted by the underlying system using properties (modules).
 
   # Create a "Merge" property which only contains a condition.
-  isMerge = isType "merge";
+  isMerge = attrs: (typeOf attrs) == "merge";
   mkMerge = content: mkProperty {
     property = {
       _type = "merge";
@@ -204,7 +204,7 @@ rec {
   # is ignore.
 
   # Create a "If" property which only contains a condition.
-  isIf = isType "if";
+  isIf = attrs: (typeOf attrs) == "if";
   mkIf = condition: content: mkProperty {
     property = {
       _type = "if";
@@ -271,7 +271,7 @@ rec {
   # priorities between values.  The default priority is 100. The lowest
   # priorities are kept.  The template argument must reproduce the same
   # attribute set hierarchy to override leaves of the hierarchy.
-  isOverride = isType "override";
+  isOverride = attrs: (typeOf attrs) == "override";
   mkOverrideTemplate = priority: template: content: mkProperty {
     property = {
       _type = "override";
@@ -371,7 +371,7 @@ rec {
   # of the list used by the merge function.  And the highest ranked
   # definition would be the last.  Definitions which does not have any rank
   # value have the default rank of 100.
-  isOrder = isType "order";
+  isOrder = attrs: (typeOf attrs) == "order";
   mkOrder = rank: content: mkProperty {
     property = {
       _type = "order";
@@ -434,7 +434,7 @@ rec {
   # properties on top of the option definition is nice for user manipulation
   # but require to check if the content of the property is not another
   # property.  Such testing implies to verify if this is an attribute set
-  # and if it possess the type 'property'. (see isProperty & typeOf/isType)
+  # and if it possess the type 'property'. (see isProperty & typeOf)
   #
   # To avoid strict evaluation of option definitions, 'mkFixStrictness' is
   # introduced.  This property protects an option definition by replacing
diff --git a/pkgs/lib/systems.nix b/pkgs/lib/systems.nix
index 02c26ba600a..09d04042f1c 100644
--- a/pkgs/lib/systems.nix
+++ b/pkgs/lib/systems.nix
@@ -15,14 +15,14 @@ in
 
 rec {
 
-  isSignificantByte = isType "significant-byte";
+  isSignificantByte = x: typeOf x == "significant-byte";
   significantBytes = setTypes "significant-byte" {
     bigEndian = {};
     littleEndian = {};
   };
 
 
-  isCpuType = isType "cpu-type"
+  isCpuType = x: typeOf x == "cpu-type"
     && elem x.bits [8 16 32 64 128]
     && (builtins.lessThan 8 x.bits -> isSignificantByte x.significantByte);
 
@@ -37,7 +37,7 @@ rec {
     };
 
 
-  isExecFormat = isType "exec-format";
+  isExecFormat = x: typeOf x == "exec-format";
   execFormats = setTypes "exec-format" {
     aout = {}; # a.out
     elf = {};
@@ -47,7 +47,7 @@ rec {
   };
 
 
-  isKernel = isType "kernel";
+  isKernel = x: typeOf x == "kernel";
   kernels = with execFormats;
     setTypes "kernel" {
       cygwin =  { execFormat = pe; };
@@ -61,7 +61,7 @@ rec {
     };
 
 
-  isArchitecture = isType "architecture";
+  isArchitecture = x: typeOf x == "architecture";
   architectures = setTypes "architecture" {
     apple = {};
     pc = {};
@@ -69,7 +69,7 @@ rec {
   };
 
 
-  isSystem = isType "system"
+  isSystem = x: typeOf x == "system"
     && isCpuType x.cpu
     && isArchitecture x.arch
     && isKernel x.kernel;
diff --git a/pkgs/lib/types.nix b/pkgs/lib/types.nix
index 156d72ac5e7..9dce885b182 100644
--- a/pkgs/lib/types.nix
+++ b/pkgs/lib/types.nix
@@ -10,7 +10,6 @@ with import ./trivial.nix;
 
 rec {
 
-  isType = type: x: (x._type or "") == type;
   hasType = x: isAttrs x && x ? _type;
   typeOf = x: x._type or "";
 
@@ -27,7 +26,7 @@ rec {
   # hasOptions (boolean: whatever this option contains an option set)
   # delayOnGlobalEval (boolean: should properties go through the evaluation of this option)
   # docPath (path concatenated to the option name contained in the option set)
-  isOptionType = isType "option-type";
+  isOptionType = attrs: typeOf attrs == "option-type";
   mkOptionType =
     { name
     , check ? (x: true)

From 3f928466df1b03735e6bf44ed63847c5718f317b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 22 Aug 2013 21:40:37 +0200
Subject: [PATCH 064/452] jing-trang: update to version 20091111

Also add meta attributes and a wrapper for jing so that it can be
invoked directly from the shell as "jing" (similar to Debian/Ubuntu).
Trang already has such a wrapper.
---
 pkgs/tools/text/xml/jing/default.nix      | 21 +++++++++++++++------
 pkgs/tools/text/xml/jing/unzip-builder.sh |  8 ++++++++
 pkgs/tools/text/xml/trang/default.nix     | 21 +++++++++++++++------
 3 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/text/xml/jing/default.nix b/pkgs/tools/text/xml/jing/default.nix
index 5b7c0803fc8..5737fff14f5 100644
--- a/pkgs/tools/text/xml/jing/default.nix
+++ b/pkgs/tools/text/xml/jing/default.nix
@@ -1,13 +1,22 @@
-{stdenv, fetchurl, unzip} :
+{ stdenv, fetchurl, unzip, jre }:
 
 stdenv.mkDerivation {
-  name = "jing-20030619";
+  name = "jing-20091111";
   builder = ./unzip-builder.sh;
 
   src = fetchurl {
-    url = http://www.thaiopensource.com/download/jing-20030619.zip;
-    md5 = "f9b0775d8740f16ab3df82ad3707a093";
+    url = https://jing-trang.googlecode.com/files/jing-20091111.zip;
+    sha256 = "134h2r22r64v5yk4v8mhl6r893dlw5vzx9daf2sj2mbbma004sap";
   };
 
-  inherit unzip;
-}
\ No newline at end of file
+  inherit unzip jre;
+
+  meta = with stdenv.lib; {
+    description = "A RELAX NG validator in Java";
+    # The homepage is www.thaiopensource.com, but it links to googlecode.com
+    # for downloads and call it the "project site".
+    homepage = http://www.thaiopensource.com/relaxng/jing.html;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/tools/text/xml/jing/unzip-builder.sh b/pkgs/tools/text/xml/jing/unzip-builder.sh
index 5f8738da51c..c02920e5a69 100755
--- a/pkgs/tools/text/xml/jing/unzip-builder.sh
+++ b/pkgs/tools/text/xml/jing/unzip-builder.sh
@@ -4,3 +4,11 @@ source $stdenv/setup
 $unzip/bin/unzip $src
 mkdir -p $out
 mv $name/* $out
+
+cat > "$out/bin/jing" <<EOF
+#! $SHELL
+export JAVA_HOME="$jre"
+exec "$jre/bin/java" -jar "$out/bin/jing.jar" "\$@"
+EOF
+
+chmod a+x "$out/bin/jing"
diff --git a/pkgs/tools/text/xml/trang/default.nix b/pkgs/tools/text/xml/trang/default.nix
index b87a5575d26..952dcfedc0f 100644
--- a/pkgs/tools/text/xml/trang/default.nix
+++ b/pkgs/tools/text/xml/trang/default.nix
@@ -1,15 +1,24 @@
-{stdenv, fetchurl, jre, unzip}:
+{ stdenv, fetchurl, unzip, jre }:
 
 stdenv.mkDerivation {
-  name = "trang-20030619";
+  name = "trang-20091111";
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://www.thaiopensource.com/download/trang-20030619.zip;
-    md5 = "9611ea59fda0f62fecc4a5017a72984e";
+    url = https://jing-trang.googlecode.com/files/trang-20091111.zip;
+    sha256 = "16551j63n2y3w9lc7krjazddsab7xvdymbss4rdvx3liz4sg18yq";
   };
 
-  buildInputs = [unzip];
-
   inherit jre;
+
+  buildInputs = [ unzip ];
+
+  meta = with stdenv.lib; {
+    description = "Multi-format schema converter based on RELAX NG";
+    # The homepage is www.thaiopensource.com, but it links to googlecode.com
+    # for downloads and call it the "project site".
+    homepage = http://www.thaiopensource.com/relaxng/trang.html;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
 }

From 6c97e9ef722e60d93b843254cd90591ed26bda97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 22 Aug 2013 22:06:45 +0200
Subject: [PATCH 065/452] duply: platforms.unix -> platforms.linux

Dependency ncftp fails to build on freebsd and darwin.
---
 pkgs/tools/backup/duply/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix
index affedcae73a..5e95ede695c 100644
--- a/pkgs/tools/backup/duply/default.nix
+++ b/pkgs/tools/backup/duply/default.nix
@@ -34,6 +34,6 @@ stdenv.mkDerivation {
     homepage = http://duply.net/;
     license = licenses.gpl2;
     maintainers = [ maintainers.bjornfor ];
-    platforms = platforms.unix;
+    platforms = platforms.linux;
   };
 }

From 993deb1a4a96971f0de41fa596bb2ddd134ef171 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 13 Mar 2013 15:05:30 +0100
Subject: [PATCH 066/452] Hopefully a fixed version of Refactor: introduce
 isType reducing redundancy. Coding-by-sed wasn't a good idea :(

---
 pkgs/lib/options.nix    |  6 +++---
 pkgs/lib/properties.nix | 16 ++++++++--------
 pkgs/lib/systems.nix    |  8 ++++----
 pkgs/lib/types.nix      |  3 ++-
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/pkgs/lib/options.nix b/pkgs/lib/options.nix
index 620de84e707..a7d1a3483a0 100644
--- a/pkgs/lib/options.nix
+++ b/pkgs/lib/options.nix
@@ -11,10 +11,10 @@ with import ./properties.nix;
 
 rec {
 
-  inherit (lib) typeOf;
+  inherit (lib) isType;
   
 
-  isOption = attrs: (typeOf attrs) == "option";
+  isOption = isType "option";
   mkOption = attrs: attrs // {
     _type = "option";
     # name (this is the name of the attributem it is automatically generated by the traversal)
@@ -190,7 +190,7 @@ rec {
             defValue = builtins.getAttr defName defs;
             optValue = builtins.getAttr defName opts;
           in
-          if typeOf defValue == "option"
+          if isOption defValue
           then
             # `defValue' is an option.
             if hasAttr defName opts
diff --git a/pkgs/lib/properties.nix b/pkgs/lib/properties.nix
index eeac27ae70c..22aa8d891d8 100644
--- a/pkgs/lib/properties.nix
+++ b/pkgs/lib/properties.nix
@@ -11,13 +11,13 @@ with import ./attrsets.nix;
 
 rec {
 
-  inherit (lib) typeOf;
+  inherit (lib) isType;
 
   # Tell that nothing is defined.  When properties are evaluated, this type
   # is used to remove an entry.  Thus if your property evaluation semantic
   # implies that you have to mute the content of an attribute, then your
   # property should produce this value.
-  isNotdef = attrs: (typeOf attrs) == "notdef";
+  isNotdef = isType "notdef";
   mkNotdef = {_type = "notdef";};
 
   # General property type, it has a property attribute and a content
@@ -32,7 +32,7 @@ rec {
   #  - onGlobalDelay: run on all copied properties.
   #  - onEval: run on an evaluated property.
   #  - onGlobalEval: run on a list of property stack on top of their values.
-  isProperty = attrs: (typeOf attrs) == "property";
+  isProperty = isType "property";
   mkProperty = p@{property, content, ...}: p // {
     _type = "property";
   };
@@ -187,7 +187,7 @@ rec {
   # and interpreted by the underlying system using properties (modules).
 
   # Create a "Merge" property which only contains a condition.
-  isMerge = attrs: (typeOf attrs) == "merge";
+  isMerge = isType "merge";
   mkMerge = content: mkProperty {
     property = {
       _type = "merge";
@@ -204,7 +204,7 @@ rec {
   # is ignore.
 
   # Create a "If" property which only contains a condition.
-  isIf = attrs: (typeOf attrs) == "if";
+  isIf = isType "if";
   mkIf = condition: content: mkProperty {
     property = {
       _type = "if";
@@ -271,7 +271,7 @@ rec {
   # priorities between values.  The default priority is 100. The lowest
   # priorities are kept.  The template argument must reproduce the same
   # attribute set hierarchy to override leaves of the hierarchy.
-  isOverride = attrs: (typeOf attrs) == "override";
+  isOverride = isType "override";
   mkOverrideTemplate = priority: template: content: mkProperty {
     property = {
       _type = "override";
@@ -371,7 +371,7 @@ rec {
   # of the list used by the merge function.  And the highest ranked
   # definition would be the last.  Definitions which does not have any rank
   # value have the default rank of 100.
-  isOrder = attrs: (typeOf attrs) == "order";
+  isOrder = isType "order";
   mkOrder = rank: content: mkProperty {
     property = {
       _type = "order";
@@ -434,7 +434,7 @@ rec {
   # properties on top of the option definition is nice for user manipulation
   # but require to check if the content of the property is not another
   # property.  Such testing implies to verify if this is an attribute set
-  # and if it possess the type 'property'. (see isProperty & typeOf)
+  # and if it possess the type 'property'. (see isProperty & typeOf/isType)
   #
   # To avoid strict evaluation of option definitions, 'mkFixStrictness' is
   # introduced.  This property protects an option definition by replacing
diff --git a/pkgs/lib/systems.nix b/pkgs/lib/systems.nix
index 09d04042f1c..1ef869fb012 100644
--- a/pkgs/lib/systems.nix
+++ b/pkgs/lib/systems.nix
@@ -15,7 +15,7 @@ in
 
 rec {
 
-  isSignificantByte = x: typeOf x == "significant-byte";
+  isSignificantByte = isType "significant-byte";
   significantBytes = setTypes "significant-byte" {
     bigEndian = {};
     littleEndian = {};
@@ -37,7 +37,7 @@ rec {
     };
 
 
-  isExecFormat = x: typeOf x == "exec-format";
+  isExecFormat = isType "exec-format";
   execFormats = setTypes "exec-format" {
     aout = {}; # a.out
     elf = {};
@@ -47,7 +47,7 @@ rec {
   };
 
 
-  isKernel = x: typeOf x == "kernel";
+  isKernel = isType "kernel";
   kernels = with execFormats;
     setTypes "kernel" {
       cygwin =  { execFormat = pe; };
@@ -61,7 +61,7 @@ rec {
     };
 
 
-  isArchitecture = x: typeOf x == "architecture";
+  isArchitecture = isType "architecture";
   architectures = setTypes "architecture" {
     apple = {};
     pc = {};
diff --git a/pkgs/lib/types.nix b/pkgs/lib/types.nix
index 9dce885b182..156d72ac5e7 100644
--- a/pkgs/lib/types.nix
+++ b/pkgs/lib/types.nix
@@ -10,6 +10,7 @@ with import ./trivial.nix;
 
 rec {
 
+  isType = type: x: (x._type or "") == type;
   hasType = x: isAttrs x && x ? _type;
   typeOf = x: x._type or "";
 
@@ -26,7 +27,7 @@ rec {
   # hasOptions (boolean: whatever this option contains an option set)
   # delayOnGlobalEval (boolean: should properties go through the evaluation of this option)
   # docPath (path concatenated to the option name contained in the option set)
-  isOptionType = attrs: typeOf attrs == "option-type";
+  isOptionType = isType "option-type";
   mkOptionType =
     { name
     , check ? (x: true)

From edd2d907a001506715beab28af01bd3be4f430f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 22 Aug 2013 22:52:10 +0200
Subject: [PATCH 067/452] Remove jing_tools expression (now contained in jing
 expression itself)

The jing expression now creates its own "jing" wrapper script, so there
is no need for jing_tools anymore.

jing hasn't been updated in years, so I assume (or hope) that not many
(if any) have jing_tools in their configuration.nix. If you do, just
change it to jing and it should behave the same.
---
 pkgs/tools/text/xml/jing/jing-script.nix   | 12 ------------
 pkgs/tools/text/xml/jing/script-builder.sh | 14 --------------
 pkgs/top-level/all-packages.nix            |  2 --
 pkgs/top-level/release-python.nix          |  1 -
 4 files changed, 29 deletions(-)
 delete mode 100644 pkgs/tools/text/xml/jing/jing-script.nix
 delete mode 100644 pkgs/tools/text/xml/jing/script-builder.sh

diff --git a/pkgs/tools/text/xml/jing/jing-script.nix b/pkgs/tools/text/xml/jing/jing-script.nix
deleted file mode 100644
index d6433f43a0c..00000000000
--- a/pkgs/tools/text/xml/jing/jing-script.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl, jre, unzip} :
-
-stdenv.mkDerivation {
-  name = "jing-tools-20030619";
-  builder = ./script-builder.sh;
-
-  jing = (import ./default.nix) {
-    inherit stdenv fetchurl unzip;
-  };
-
-  inherit jre;
-}
\ No newline at end of file
diff --git a/pkgs/tools/text/xml/jing/script-builder.sh b/pkgs/tools/text/xml/jing/script-builder.sh
deleted file mode 100644
index d9cc8849276..00000000000
--- a/pkgs/tools/text/xml/jing/script-builder.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-source $stdenv/setup
-
-mkdir -p $out/bin
-
-cat >> $out/bin/jing <<EOF
-#! $SHELL
-
-export JAVA_HOME=$jre
-export LANG="en_US"
-
-exec $jre/bin/java -jar $jing/bin/jing.jar "\$@"
-EOF
-
-chmod a+x $out/bin/jing
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1555d505b1a..0eea3c8db1a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1112,8 +1112,6 @@ let
 
   jing = callPackage ../tools/text/xml/jing { };
 
-  jing_tools = callPackage ../tools/text/xml/jing/jing-script.nix { };
-
   jnettop = callPackage ../tools/networking/jnettop { };
 
   jq = callPackage ../development/tools/jq {};
diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix
index 770a434c8d7..1de3a8aff8b 100644
--- a/pkgs/top-level/release-python.nix
+++ b/pkgs/top-level/release-python.nix
@@ -717,7 +717,6 @@ let
   jedit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   jfsrec = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   jigdo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
-  jing_tools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   jjtraveler = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   jnettop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   jre = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };

From 2d310a91c8b83556a7f772321b117348fa7944b5 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 23 Aug 2013 09:01:12 +0300
Subject: [PATCH 068/452] Trivial change of wording of error messages

---
 pkgs/lib/options.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/lib/options.nix b/pkgs/lib/options.nix
index a7d1a3483a0..e8e01083a77 100644
--- a/pkgs/lib/options.nix
+++ b/pkgs/lib/options.nix
@@ -66,7 +66,7 @@ rec {
               if all opt.check list then
                 opt.merge list
               else
-                throw "One of option ${name} values is of a bad type.";
+                throw "One of option ${name} values has a bad type.";
           }
         else opt;
 
@@ -77,7 +77,7 @@ rec {
               if opt.check opt.default then
                 opt.default
               else
-                throw "The default value of option ${name} is of a bad type.";
+                throw "The default value of option ${name} has a bad type.";
           }
         else opt;
 

From 310ae0915ef29de3c4d9e6e383d7d380cdcb79ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 23 Aug 2013 09:02:10 +0200
Subject: [PATCH 069/452] tarball: add --show-trace on the remaining calls

This should help tracing some evaluation problems in future.
---
 pkgs/top-level/make-tarball.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix
index 7fb597fd6d8..2e5d92b8ed2 100644
--- a/pkgs/top-level/make-tarball.nix
+++ b/pkgs/top-level/make-tarball.nix
@@ -47,7 +47,7 @@ releaseTools.sourceTarball {
     nix-store --init
 
     # Run the regression tests in `lib'.
-    res="$(nix-instantiate --eval-only --strict pkgs/lib/tests.nix)"
+    res="$(nix-instantiate --eval-only --strict --show-trace pkgs/lib/tests.nix)"
     if test "$res" != "[ ]"; then
         echo "regression tests for lib failed, got: $res"
         exit 1
@@ -63,7 +63,7 @@ releaseTools.sourceTarball {
     done
 
     header "checking eval-release.nix"
-    nix-instantiate --eval-only --strict --xml ./maintainers/scripts/eval-release.nix > $TMPDIR/out.xml
+    nix-instantiate --eval-only --strict --xml --show-trace ./maintainers/scripts/eval-release.nix > $TMPDIR/out.xml
     xmllint --noout $TMPDIR/out.xml
     stopNest
   '';

From 76792f5a9d9363d85a6dafca4ebab9231d5f4cfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 23 Aug 2013 09:13:51 +0200
Subject: [PATCH 070/452] tarball: fix evaluation of qt on freebsd (mesa)

---
 pkgs/development/libraries/qt-4.x/4.8/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index a29dcec2b39..311ed43729e 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, substituteAll
 , libXrender, libXinerama, libXcursor, libXmu , libXv, libXext
 , libXfixes, libXrandr, libSM, freetype, fontconfig
-, zlib, libjpeg, libpng, libmng, which, mesa, mesa_glu, openssl, dbus, cups, pkgconfig
+, zlib, libjpeg, libpng, libmng, which, mesaSupported, mesa, mesa_glu, openssl, dbus, cups, pkgconfig
 , libtiff, glib, icu
 , mysql, postgresql, sqlite
 , perl, coreutils, libXi
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
         src = ./dlopen-absolute-paths.diff;
         inherit cups icu libXfixes;
         glibc = stdenv.gcc.libc;
-        openglDriver = mesa.driverLink;
+        openglDriver = if mesaSupported then mesa.driverLink else "/no-such-path";
       })
     ] ++ stdenv.lib.optional gtkStyle (substituteAll {
         src = ./dlopen-gtkstyle.diff;
@@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
     [ libXrender libXrandr libXinerama libXcursor libXext libXfixes libXv libXi
       libSM zlib libpng openssl dbus.libs freetype fontconfig glib ]
         # Qt doesn't directly need GLU (just GL), but many apps use, it's small and doesn't remain a runtime-dep if not used
-    ++ optional (stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms) mesa_glu
+    ++ optional mesaSupported mesa_glu
     ++ optional ((buildWebkit || buildMultimedia) && stdenv.isLinux ) alsaLib
     ++ optionals (buildWebkit || buildMultimedia) [ gstreamer gst_plugins_base ];
 

From 183ae4c812c281605a717582dd81434082a2124f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 23 Aug 2013 09:57:12 +0200
Subject: [PATCH 071/452] Adding the python package 'muttils'

---
 pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 903f48b2fa4..59707c58de8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3138,6 +3138,25 @@ pythonPackages = modules // import ./python-packages-generated.nix {
   });
 
 
+  muttils = buildPythonPackage (rec {
+    name = "muttils-1.3";
+
+    src = fetchurl {
+      url = http://www.blacktrash.org/hg/muttils/archive/8bb26094df06.tar.bz2;
+      sha256 = "1a4kxa0fpgg6rdj5p4kggfn8xpniqh8v5kbiaqc6wids02m7kag6";
+    };
+
+    # Tests don't work
+    doCheck = false;
+
+    meta = {
+      description = "Utilities for use with console mail clients, like mutt";
+      homepage = http://www.blacktrash.org/hg/muttils;
+      license = "GPLv2+";
+    };
+  });
+
+
   MySQL_python = buildPythonPackage {
     name = "MySQL-python-1.2.3";
 

From 5303fb0f0f5aa7eee8bc356537b16856e0489289 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 23 Aug 2013 10:26:29 +0200
Subject: [PATCH 072/452] qemu: Update to 1.6.0

---
 pkgs/applications/virtualization/qemu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index dcf5b4e5009..b826434549f 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -7,14 +7,14 @@
 , x86Only ? false
 }:
 
-let n = "qemu-1.5.2"; in
+let n = "qemu-1.6.0"; in
 
 stdenv.mkDerivation rec {
   name = n + (if x86Only then "-x86-only" else "");
 
   src = fetchurl {
     url = "http://wiki.qemu.org/download/${n}.tar.bz2";
-    sha256 = "0l52jwlxmwp9g3jpq0g7ix9dq4qgh46nd2h58lh47f0a35yi8qgn";
+    sha256 = "0j6bnaa93fyqwzg07krx5w1fb88ap1yz1hp84ilkpm16va5facii";
   };
 
   buildInputs =

From 5b9227c5a815edb78fbb8ab15b5738251af1e61b Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 23 Aug 2013 11:21:08 +0200
Subject: [PATCH 073/452] libvirt: Update to 1.1.1

---
 pkgs/development/libraries/libvirt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index e1e4a759e06..06ead3ca23f 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -3,14 +3,14 @@
 , libtasn1, ebtables, libgcrypt, yajl, makeWrapper, pmutils
 }:
 
-let version = "1.1.0"; in
+let version = "1.1.1"; in
 
 stdenv.mkDerivation {
   name = "libvirt-${version}";
 
   src = fetchurl {
     url = "http://libvirt.org/sources/libvirt-${version}.tar.gz";
-    sha256 = "0a39cwvzwf79gv3zw5mwp9q9n792rr1m0rl9ji39bdgcjxb7d7nf";
+    sha256 = "1hi27d5pld925g1azx8jq0wv557wpkd6xrq6lzm91cdr2lg1wvyw";
   };
 
   buildInputs =

From 7ef49ddee538f203d09ab314964d29d448b63fb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 23 Aug 2013 12:41:19 +0200
Subject: [PATCH 074/452] setuptools: add note why darwin tests are disabled

---
 pkgs/development/python-modules/setuptools/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index 4c719e7dc42..bd1cb756f27 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
       wrapPythonPrograms
     '';
 
+  # tests fail on darwin, see http://bitbucket.org/pypa/setuptools/issue/55/1-failure-lc_all-c-python33m-setuppy-test 
   doCheck = (!stdenv.isDarwin);
 
   checkPhase = ''

From a327b681649e3d6cdfaa201cf0bbd0d8537fb145 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 23 Aug 2013 12:41:48 +0200
Subject: [PATCH 075/452] pypy: add setuphook for PYTHONPATH

---
 .../development/interpreters/pypy/2.0/default.nix |  1 +
 .../interpreters/pypy/2.0/setup-hook.sh           | 15 +++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/interpreters/pypy/2.0/setup-hook.sh

diff --git a/pkgs/development/interpreters/pypy/2.0/default.nix b/pkgs/development/interpreters/pypy/2.0/default.nix
index 2dd681239a6..fb64d804056 100644
--- a/pkgs/development/interpreters/pypy/2.0/default.nix
+++ b/pkgs/development/interpreters/pypy/2.0/default.nix
@@ -47,6 +47,7 @@ let
         --replace "libraries = ['curses']" "libraries = ['ncurses']"
     '';
 
+    setupHook = ./setup-hook.sh;
 
     doCheck = true;
     checkPhase = ''
diff --git a/pkgs/development/interpreters/pypy/2.0/setup-hook.sh b/pkgs/development/interpreters/pypy/2.0/setup-hook.sh
new file mode 100644
index 00000000000..96a04cb05dd
--- /dev/null
+++ b/pkgs/development/interpreters/pypy/2.0/setup-hook.sh
@@ -0,0 +1,15 @@
+addPythonPath() {
+    addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.0/site-packages
+}
+
+toPythonPath() {
+    local paths="$1"
+    local result=
+    for i in $paths; do
+        p="$i/lib/pypy2.0/site-packages"
+        result="${result}${result:+:}$p"
+    done
+    echo $result
+}
+
+envHooks=(${envHooks[@]} addPythonPath)

From 50c0290f5178750784e15d5155c122f23b0babc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 23 Aug 2013 12:45:46 +0200
Subject: [PATCH 076/452] pypy: 2.0 -> 2.1

---
 pkgs/development/interpreters/pypy/2.0/default.nix   | 6 +++---
 pkgs/development/interpreters/pypy/2.0/setup-hook.sh | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/interpreters/pypy/2.0/default.nix b/pkgs/development/interpreters/pypy/2.0/default.nix
index fb64d804056..d02d5a8cb67 100644
--- a/pkgs/development/interpreters/pypy/2.0/default.nix
+++ b/pkgs/development/interpreters/pypy/2.0/default.nix
@@ -5,8 +5,8 @@ assert zlibSupport -> zlib != null;
 
 let
 
-  majorVersion = "2.0";
-  version = "${majorVersion}.2";
+  majorVersion = "2.1";
+  version = "${majorVersion}";
   pythonVersion = "2.7";
   libPrefix = "pypy${majorVersion}";
 
@@ -17,7 +17,7 @@ let
 
     src = fetchurl {
       url = "https://bitbucket.org/pypy/pypy/downloads/pypy-${version}-src.tar.bz2";
-      sha256 = "0g2cajs6m3yf0lak5f18ccs6j77cf5xvbm4h6y5l1qlqdc6wk48r";
+      sha256 = "05vz7ya6jh5pw5yl607cf1rvdhwxj5d4ip0vpgb1gc9rjxn0dcri";
     };
 
     buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite ]
diff --git a/pkgs/development/interpreters/pypy/2.0/setup-hook.sh b/pkgs/development/interpreters/pypy/2.0/setup-hook.sh
index 96a04cb05dd..87874f0370b 100644
--- a/pkgs/development/interpreters/pypy/2.0/setup-hook.sh
+++ b/pkgs/development/interpreters/pypy/2.0/setup-hook.sh
@@ -1,12 +1,12 @@
 addPythonPath() {
-    addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.0/site-packages
+    addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.1/site-packages
 }
 
 toPythonPath() {
     local paths="$1"
     local result=
     for i in $paths; do
-        p="$i/lib/pypy2.0/site-packages"
+        p="$i/lib/pypy2.1/site-packages"
         result="${result}${result:+:}$p"
     done
     echo $result

From a09d595c77c035a37248e9a01b9b0eb374d570eb Mon Sep 17 00:00:00 2001
From: modulistic <modulistic@gmail.com>
Date: Fri, 23 Aug 2013 13:52:35 +0200
Subject: [PATCH 077/452] Add 'modulistic' to the maintainers list

---
 pkgs/lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix
index 97bc8b915b8..78c77f61f4e 100644
--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@@ -31,6 +31,7 @@
   lovek323 = "Jason O'Conal <jason@oconal.id.au>";
   ludo = "Ludovic Courtès <ludo@gnu.org>";
   marcweber = "Marc Weber <marco-oweber@gmx.de>";
+  modulistic = "Pablo Costa <modulistic@gmail.com>";
   mornfall = "Petr Ročkai <me@mornfall.net>";
   offline = "Jaka Hudoklin <jakahudoklin@gmail.com>";
   orbitz = "Malcolm Matalka <mmatalka@gmail.com>";

From cca6a6724c296e8a03e856b9f443b07179f4acbe Mon Sep 17 00:00:00 2001
From: modulistic <modulistic@gmail.com>
Date: Fri, 23 Aug 2013 14:05:36 +0200
Subject: [PATCH 078/452] i3 window manager: version bump from 4.5.1 to 4.6

---
 .../window-managers/i3/default.nix            | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index 9f9aaa5d665..f6d2dc4cfe5 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "i3-${version}";
-  version = "4.5.1";
+  version = "4.6";
 
   src = fetchurl {
     url = "http://i3wm.org/downloads/${name}.tar.bz2";
-    sha256 = "bae55f1c7c4a21d71aae182e4fab6038ba65ba4be5d1ceff9e269f4f74b823f2";
+    sha256 = "1qand44hjqz84f2xzd0mmyk9vpsm7iwz6446s4ivdj6f86213lpm";
   };
 
   buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil xcbutilwm
@@ -20,12 +20,21 @@ stdenv.mkDerivation rec {
 
   configurePhase = "makeFlags=PREFIX=$out";
 
-  meta = {
-    description = "i3 is a tiling window manager";
-    homepage = "http://i3wm.org";
-    maintainers = [ stdenv.lib.maintainers.garbas ];
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.all;
+  meta = with stdenv.lib; {
+    description = "A tiling window manager";
+    homepage    = "http://i3wm.org";
+    maintainers = with maintainers; [ garbas modulistic ];
+    license     = licenses.bsd3;
+    platforms   = platforms.all;
+
+    longDescription = ''
+      A tiling window manager primarily targeted at advanced users and
+      developers. Based on a tree as data structure, supports tiling,
+      stacking, and tabbing layouts, handled dynamically, as well as
+      floating windows. Configured via plain text file. Multi-monitor.
+      UTF-8 clean.
+    '';
   };
 
 }
+

From e0819b1e2657dbfdd820eb8120807094cadf5fbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 23 Aug 2013 15:05:49 +0200
Subject: [PATCH 079/452] fcron: 3.0.4 -> 3.1.2

---
 pkgs/tools/system/fcron/default.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/system/fcron/default.nix b/pkgs/tools/system/fcron/default.nix
index 233a0c39d17..58719c682cb 100644
--- a/pkgs/tools/system/fcron/default.nix
+++ b/pkgs/tools/system/fcron/default.nix
@@ -2,28 +2,26 @@
 # restart using 'killall -TERM fcron; fcron -b
 # use convert-fcrontab to update fcrontab files
 
-{ stdenv, fetchurl, perl }:
+{ stdenv, fetchurl, perl, busybox, vim }:
 
-stdenv.mkDerivation {
-  name = "fcron-3.0.4";
+stdenv.mkDerivation rec {
+  name = "fcron-3.1.2";
 
   src = fetchurl {
-    url = http://fcron.free.fr/archives/fcron-3.0.4.src.tar.gz;
-    sha256 = "15kgphsfa0nqgjd8yxyz947x2xyljj4iyh298kw4c8bz6iznqxn8";
+    url = "http://fcron.free.fr/archives/${name}.src.tar.gz";
+    sha256 = "0p8sn4m3frh2x2llafq2gbcm46rfrn6ck4qi0d0v3ql6mfx9k4hw";
   };
 
   buildInputs = [ perl ];
 
   configureFlags =
-    [ "--with-sendmail=/var/setuid-wrappers/sendmail"
-      "--with-editor=/var/run/current-system/sw/bin/vi"
+    [ "--with-sendmail=${busybox}/sbin/sendmail"
+      "--with-editor=${vim}/bin/vi"  # TODO customizable
       "--with-bootinstall=no"
       "--sysconfdir=/etc"
       # fcron would have been default user/grp
       "--with-username=root"
       "--with-groupname=root"
-      # fcron must not try to verify that sendmail has already been installed int /var/setuid-wrappers/sendmail
-      "--disable-checks"
     ];
     
   installTargets = "install-staged"; # install does also try to change permissions of /etc/* files
@@ -52,5 +50,6 @@ stdenv.mkDerivation {
     description="A command scheduler with extended capabilities over cron and anacron";
     homepage = http://fcron.free.fr;
     license = "GPLv2";
+    platforms = stdenv.lib.platforms.all;
   };
 }

From 21bd48f4395d8a58d8b734840b64aac47fe41223 Mon Sep 17 00:00:00 2001
From: Danylo Hlynskyi <abcz2.uprola@gmail.com>
Date: Fri, 23 Aug 2013 17:14:44 +0300
Subject: [PATCH 080/452] Add convenient executable name to libreoffice

... so you can run libreoffice from command-line with `libreoffice` instead of `soffice`
---
 pkgs/applications/office/libreoffice/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 6e3f83caae3..ebc65394081 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -115,6 +115,7 @@ stdenv.mkDerivation rec {
     for a in sbase scalc sdraw smath swriter spadmin simpress soffice; do
       ln -s $out/lib/libreoffice/program/$a $out/bin/$a
     done
+    ln -s $out/bin/soffice $out/bin/libreoffice
   '';
 
   configureFlags = [

From cbfe6c0e8df5d5334f0f7d3c22f018f457c86018 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 23 Aug 2013 17:05:50 +0200
Subject: [PATCH 081/452] pypy: patch ncurses name correctly

---
 pkgs/development/interpreters/pypy/{2.0 => 2.1}/default.nix   | 2 +-
 pkgs/development/interpreters/pypy/{2.0 => 2.1}/setup-hook.sh | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/development/interpreters/pypy/{2.0 => 2.1}/default.nix (97%)
 rename pkgs/development/interpreters/pypy/{2.0 => 2.1}/setup-hook.sh (100%)

diff --git a/pkgs/development/interpreters/pypy/2.0/default.nix b/pkgs/development/interpreters/pypy/2.1/default.nix
similarity index 97%
rename from pkgs/development/interpreters/pypy/2.0/default.nix
rename to pkgs/development/interpreters/pypy/2.1/default.nix
index d02d5a8cb67..f80a1dc7242 100644
--- a/pkgs/development/interpreters/pypy/2.0/default.nix
+++ b/pkgs/development/interpreters/pypy/2.1/default.nix
@@ -44,7 +44,7 @@ let
         --replace "/usr/include/ncurses/curses.h" "${ncurses}/include/curses.h" \
         --replace "ncurses/curses.h" "${ncurses}/include/curses.h" \
         --replace "ncurses/term.h" "${ncurses}/include/term.h" \
-        --replace "libraries = ['curses']" "libraries = ['ncurses']"
+        --replace "libraries=['curses']" "libraries=['ncurses']"
     '';
 
     setupHook = ./setup-hook.sh;
diff --git a/pkgs/development/interpreters/pypy/2.0/setup-hook.sh b/pkgs/development/interpreters/pypy/2.1/setup-hook.sh
similarity index 100%
rename from pkgs/development/interpreters/pypy/2.0/setup-hook.sh
rename to pkgs/development/interpreters/pypy/2.1/setup-hook.sh

From 17662a9a6eb6789cc07d06e048e890be6d11fbd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 23 Aug 2013 17:52:37 +0200
Subject: [PATCH 082/452] pypy: forgot to commit all-packages changes

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0eea3c8db1a..eceb85ef5d0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3151,7 +3151,7 @@ let
     libX11 = xlibs.libX11;
   };
 
-  pypy = callPackage ../development/interpreters/pypy/2.0 { };
+  pypy = callPackage ../development/interpreters/pypy/2.1 { };
 
   pythonFull = python27Full;
   python26Full = callPackage ../development/interpreters/python/wrapper.nix {

From b86b1b81f575415e9f6094313f8af2458484eccd Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 23 Aug 2013 19:00:28 +0300
Subject: [PATCH 083/452] Calligra: update to 2.7.2

---
 pkgs/applications/office/calligra/default.nix | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix
index 1b692586e0c..137e7be019f 100644
--- a/pkgs/applications/office/calligra/default.nix
+++ b/pkgs/applications/office/calligra/default.nix
@@ -1,24 +1,33 @@
 { stdenv, fetchurl, cmake, kdelibs, attica, perl, zlib, libpng, boost, mesa
 , kdepimlibs, createresources ? null, eigen, qca2, exiv2, soprano, marble, lcms2
 , fontconfig, freetype, sqlite, icu, libwpd, libwpg, pkgconfig, popplerQt4
-, libkdcraw, libxslt, fftw, glew, gsl, shared_desktop_ontologies, okular }:
+, libkdcraw, libxslt, fftw, glew, gsl, shared_desktop_ontologies, okular
+, libvisio, kactivities, mysql, postgresql, freetds, xbase, openexr, ilmbase
+ }:
 
 stdenv.mkDerivation rec {
-  name = "calligra-2.5.5";
+  name = "calligra-2.7.2";
 
   src = fetchurl {
-    url = "mirror://kde/stable/${name}/${name}.tar.bz2";
-    sha256 = "0h9idadrcyjvd0mkwri4lg310mzpna6s0pvc7b7r3267wzjbn9kw";
+    url = "mirror://kde/stable/${name}/${name}.tar.xz";
+    sha256 = "1awnvv62fp5bjhi6fys37s6lpzxaig4v15m1zjlgxq82ig61w6sq";
   };
 
   nativeBuildInputs = [ cmake perl pkgconfig ];
 
-  patches = [ ./fix-kde4.10-build.patch ];
+#  patches = [ ./fix-kde4.10-build.patch ];
+
+# TODO: package Vc, libWPS, OCIO, OpenShiva, QtShiva, Spnav, m2mml
+# TODO: not found popplerQt4
 
   buildInputs = [ kdelibs attica zlib libpng boost mesa kdepimlibs
     createresources eigen qca2 exiv2 soprano marble lcms2 fontconfig freetype
     sqlite icu libwpd libwpg popplerQt4 libkdcraw libxslt fftw glew gsl
-    shared_desktop_ontologies okular ];
+    shared_desktop_ontologies okular 
+    libvisio kactivities mysql postgresql freetds xbase openexr
+];
+
+  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
 
   meta = {
     description = "A Qt/KDE office suite, formely known as koffice";

From a10812f7921d1f9aa4d0329ead7d861a79785141 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Wed, 14 Aug 2013 15:02:07 +0200
Subject: [PATCH 084/452] Add emacs24-nox: emacs built without X (or GTK)
 libraries.

This commit also fixes an issue where pkgconfig was only added as a
dependency when gtk support was enabled. This made ./configure unable
to find other libraries (libtiff, libxml2, gnutls, and others).
---
 pkgs/applications/editors/emacs-24/default.nix | 17 +++++++++--------
 pkgs/top-level/all-packages.nix                |  4 ++++
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix
index 0e4c9a14d20..fbb7d7a4b16 100644
--- a/pkgs/applications/editors/emacs-24/default.nix
+++ b/pkgs/applications/editors/emacs-24/default.nix
@@ -2,9 +2,9 @@
 , pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif
 , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls
 , alsaLib
+, withX ? true
 }:
 
-assert (gtk != null) -> (pkgconfig != null);
 assert (libXft != null) -> libpng != null;	# probably a bug
 assert stdenv.isDarwin -> libXaw != null;	# fails to link otherwise
 
@@ -19,14 +19,15 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ ncurses x11 texinfo libXaw Xaw3d libXpm libpng libjpeg libungif
-      libtiff librsvg libXft gconf libxml2 imagemagick gnutls alsaLib
-    ]
-    ++ stdenv.lib.optionals (gtk != null) [ gtk pkgconfig ]
-    ++ stdenv.lib.optional stdenv.isLinux dbus;
+    [ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo ]
+    ++ stdenv.lib.optional stdenv.isLinux dbus
+    ++ stdenv.lib.optionals withX [
+         x11 libXaw Xaw3d libXpm libpng libjpeg libungif
+         libtiff librsvg libXft imagemagick gtk
+       ];
 
   configureFlags =
-    (if gtk != null then 
+    (if withX then 
       [ "--with-x-toolkit=gtk" "--with-xft"]
     else
       [ "--with-x-toolkit=no" ])
@@ -69,7 +70,7 @@ EOF
     homepage = "http://www.gnu.org/software/emacs/";
     license = "GPLv3+";
 
-    maintainers = with maintainers; [ chaoflow lovek323 simons ];
+    maintainers = with maintainers; [ chaoflow lovek323 simons the-kenny ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eceb85ef5d0..c3e4ce5aa92 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7375,6 +7375,10 @@ let
       else stdenv;
   };
 
+  emacs24-nox = (appendToName "nox" (emacs24.override {
+    withX = false;
+  }));
+
   emacsPackages = emacs: self: let callPackage = newScope self; in rec {
     inherit emacs;
 

From fc101c01a537b087e146ac91defb20464b4edcca Mon Sep 17 00:00:00 2001
From: Jack Cummings <jack@mudshark.org>
Date: Fri, 23 Aug 2013 23:20:03 -0700
Subject: [PATCH 085/452] zfs-0.6.2 and spl-0.6.2

Enable parallelBuilding, too.
---
 pkgs/os-specific/linux/spl/default.nix | 8 +++++---
 pkgs/os-specific/linux/zfs/default.nix | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index 75ff2893972..6a9a4cc963f 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, kernelDev, perl, autoconf, automake, libtool, coreutils, gawk }:
 
 stdenv.mkDerivation {
-  name = "spl-0.6.1-${kernelDev.version}";
+  name = "spl-0.6.2-${kernelDev.version}";
   src = fetchurl {
-    url = "http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.1.tar.gz";
-    sha256 = "1bnianc00bkpdbcmignzqfv9yr8h6vj56wfl7lkhi9a5m5b3xakb";
+    url = http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.2.tar.gz;
+    sha256 = "196scl8q0bkkak6m0p1l1fz254cgsizqm73bf9wk3iynamq7qmrw";
   };
 
   patches = [ ./install_prefix.patch ];
@@ -27,6 +27,8 @@ stdenv.mkDerivation {
      --with-linux-obj=${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build
   '';
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)";
 
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index ac07474d3f4..06615d170a1 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, kernelDev, spl, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }:
 
 stdenv.mkDerivation {
-  name = "zfs-0.6.1-${kernelDev.version}";
+  name = "zfs-0.6.2-${kernelDev.version}";
 
   src = fetchurl {
-    url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.1.tar.gz;
-    sha256 = "1ykph9d4p70mam6lvcx0zld6d34gch15dsilds5ncbxh0m52knl0";
+    url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.2.tar.gz;
+    sha256 = "18b5f18k8mwb17r5ippsilmp1a2sqjw9fwn0z82159dkhsadg33b";
   };
 
   patches = [ ./mount_zfs_prefix.patch ./nix-build.patch ];
@@ -33,6 +33,8 @@ stdenv.mkDerivation {
     --with-spl=${spl}/libexec/spl
   '';
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "ZFS Filesystem Linux Kernel module";
     longDescription = ''

From 2f2eb135be136c6efe804d8b113150bd2d55f0b8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 24 Aug 2013 12:19:56 +0200
Subject: [PATCH 086/452] Don't prefer 'emacs24-nox' over the normal 'emacs24'
 attribute.

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c3e4ce5aa92..74623b9c61b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7375,7 +7375,7 @@ let
       else stdenv;
   };
 
-  emacs24-nox = (appendToName "nox" (emacs24.override {
+  emacs24-nox = lowPrio (appendToName "nox" (emacs24.override {
     withX = false;
   }));
 

From 27d77bfc182fc01731d07fa17a4f32565477aa4c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 Aug 2013 10:10:44 +0200
Subject: [PATCH 087/452] haskell-syb: add version 0.4.1

---
 pkgs/development/libraries/haskell/syb/0.4.1.nix | 15 +++++++++++++++
 pkgs/top-level/haskell-packages.nix              |  3 ++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/haskell/syb/0.4.1.nix

diff --git a/pkgs/development/libraries/haskell/syb/0.4.1.nix b/pkgs/development/libraries/haskell/syb/0.4.1.nix
new file mode 100644
index 00000000000..63fb364511f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/syb/0.4.1.nix
@@ -0,0 +1,15 @@
+{ cabal, HUnit, mtl }:
+
+cabal.mkDerivation (self: {
+  pname = "syb";
+  version = "0.4.1";
+  sha256 = "1lkh4rrqdzvb8kyry07x2z88v478hrw5cp8wmhjgpg0ck8ywncma";
+  testDepends = [ HUnit mtl ];
+  meta = {
+    homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
+    description = "Scrap Your Boilerplate";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 4c7fb8602a5..c49e3d6bcf8 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -164,7 +164,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     regexPosix   = self.regexPosix_0_95_2;
     split        = self.split_0_2_2;
     stm          = self.stm_2_4_2;
-    syb          = self.syb_0_4_0;
+    syb          = self.syb_0_4_1;
     text         = self.text_0_11_3_1;
     transformers = self.transformers_0_3_0_0;
     unorderedContainers = self.unorderedContainers_0_2_3_0;
@@ -1836,6 +1836,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   syb_0_3_6_2 = callPackage ../development/libraries/haskell/syb/0.3.6.2.nix {};
   syb_0_3_7 = callPackage ../development/libraries/haskell/syb/0.3.7.nix {};
   syb_0_4_0 = callPackage ../development/libraries/haskell/syb/0.4.0.nix {};
+  syb_0_4_1 = callPackage ../development/libraries/haskell/syb/0.4.1.nix {};
   syb = null;  # by default, we assume that syb ships with GHC, which is
                # true for the older GHC versions
 

From 938a27d1bf5d508f3650e5cd5e0759852458c9df Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 Aug 2013 10:14:22 +0200
Subject: [PATCH 088/452] haskell-Graphalyze: delete obsolete package

This library hasn't compiled in ages.
---
 .../libraries/haskell/Graphalyze/default.nix   | 18 ------------------
 pkgs/top-level/haskell-packages.nix            |  2 --
 2 files changed, 20 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/Graphalyze/default.nix

diff --git a/pkgs/development/libraries/haskell/Graphalyze/default.nix b/pkgs/development/libraries/haskell/Graphalyze/default.nix
deleted file mode 100644
index d61abc7a245..00000000000
--- a/pkgs/development/libraries/haskell/Graphalyze/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ cabal, bktrees, fgl, filepath, graphviz, pandoc, random, text
-, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "Graphalyze";
-  version = "0.14.0.1";
-  sha256 = "1prgszkrnb22x9xkwmxbvb9w1h78ffig9268f3q3y65knggmwp1x";
-  buildDepends = [
-    bktrees fgl filepath graphviz pandoc random text time
-  ];
-  meta = {
-    description = "Graph-Theoretic Analysis library";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index c49e3d6bcf8..a3048514fb7 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1077,8 +1077,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     libc = pkgs.stdenv.gcc.libc;
   };
 
-  Graphalyze = callPackage ../development/libraries/haskell/Graphalyze {};
-
   graphviz = callPackage ../development/libraries/haskell/graphviz {};
 
   groupoids = callPackage ../development/libraries/haskell/groupoids {};

From b92c0c28960d89379a9a7b229dda515c1a5f3d4d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 Aug 2013 10:14:41 +0200
Subject: [PATCH 089/452] haskell-SourceGraph: delete obsolete package

This library hasn't compiled in ages.
---
 .../tools/haskell/SourceGraph/default.nix     | 21 -------------------
 pkgs/top-level/haskell-packages.nix           |  4 ----
 2 files changed, 25 deletions(-)
 delete mode 100644 pkgs/development/tools/haskell/SourceGraph/default.nix

diff --git a/pkgs/development/tools/haskell/SourceGraph/default.nix b/pkgs/development/tools/haskell/SourceGraph/default.nix
deleted file mode 100644
index 17d19106481..00000000000
--- a/pkgs/development/tools/haskell/SourceGraph/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ cabal, Cabal, fgl, filepath, Graphalyze, graphviz, haskellSrcExts
-, mtl, multiset, random
-}:
-
-cabal.mkDerivation (self: {
-  pname = "SourceGraph";
-  version = "0.7.0.5";
-  sha256 = "0lbgs5a0ivn44bmc242hynsvczvxq2snz1fyjf13mrpfx8j5n8gk";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    Cabal fgl filepath Graphalyze graphviz haskellSrcExts mtl multiset
-    random
-  ];
-  meta = {
-    description = "Static code analysis using graph-theoretic techniques";
-    license = "GPL";
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index a3048514fb7..e85e5c36d46 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2289,10 +2289,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   hslogger = callPackage ../development/tools/haskell/hslogger {};
 
-  SourceGraph = callPackage ../development/tools/haskell/SourceGraph {
-    haskellSrcExts = self.haskellSrcExts_1_11_1;
-  };
-
   tar = callPackage ../development/libraries/haskell/tar {};
 
   threadscope = callPackage ../development/tools/haskell/threadscope {};

From ab006e69c4bf68a4d6fe9139b76a0d32f1a2f198 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 Aug 2013 10:18:45 +0200
Subject: [PATCH 090/452] haskell-tasty: add version 0.2

---
 .../libraries/haskell/tasty-hunit/default.nix   | 13 +++++++++++++
 .../haskell/tasty-smallcheck/default.nix        | 14 ++++++++++++++
 .../libraries/haskell/tasty/default.nix         | 17 +++++++++++++++++
 pkgs/top-level/haskell-packages.nix             |  6 ++++++
 4 files changed, 50 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/tasty-hunit/default.nix
 create mode 100644 pkgs/development/libraries/haskell/tasty-smallcheck/default.nix
 create mode 100644 pkgs/development/libraries/haskell/tasty/default.nix

diff --git a/pkgs/development/libraries/haskell/tasty-hunit/default.nix b/pkgs/development/libraries/haskell/tasty-hunit/default.nix
new file mode 100644
index 00000000000..8bfaf3e4365
--- /dev/null
+++ b/pkgs/development/libraries/haskell/tasty-hunit/default.nix
@@ -0,0 +1,13 @@
+{ cabal, HUnit, mtl, tasty }:
+
+cabal.mkDerivation (self: {
+  pname = "tasty-hunit";
+  version = "0.2";
+  sha256 = "1476ac3rsaag9rfgglzs65wqlkzm09xzdz47ksyj3a4c6ajba1kw";
+  buildDepends = [ HUnit mtl tasty ];
+  meta = {
+    description = "HUnit support for the Tasty test framework";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix b/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix
new file mode 100644
index 00000000000..b5b718cf04e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix
@@ -0,0 +1,14 @@
+{ cabal, async, smallcheck, tagged, tasty }:
+
+cabal.mkDerivation (self: {
+  pname = "tasty-smallcheck";
+  version = "0.2";
+  sha256 = "1xw0l1bikwavyq7s8q71a92x87mg7z65mk32nn5qx0zxwqsfb5l4";
+  buildDepends = [ async smallcheck tagged tasty ];
+  meta = {
+    homepage = "https://github.com/feuerbach/tasty";
+    description = "SmallCheck support for the Tasty test framework";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix
new file mode 100644
index 00000000000..b9f403bcc3d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/tasty/default.nix
@@ -0,0 +1,17 @@
+{ cabal, ansiTerminal, mtl, optparseApplicative, regexPosix, stm
+, tagged
+}:
+
+cabal.mkDerivation (self: {
+  pname = "tasty";
+  version = "0.2";
+  sha256 = "1shd4bl0wb67abs7vv3cagvpinkz2348fh7fdh3rq8l5g1jflp8q";
+  buildDepends = [
+    ansiTerminal mtl optparseApplicative regexPosix stm tagged
+  ];
+  meta = {
+    description = "Modern and extensible testing framework";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index e85e5c36d46..cdfdce27fb4 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1920,6 +1920,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   tagstreamConduit = callPackage ../development/libraries/haskell/tagstream-conduit {};
 
+  tasty = callPackage ../development/libraries/haskell/tasty {};
+
+  tastyHunit = callPackage ../development/libraries/haskell/tasty-hunit {};
+
+  tastySmallcheck = callPackage ../development/libraries/haskell/tasty-smallcheck {};
+
   templateDefault = callPackage ../development/libraries/haskell/template-default {};
 
   temporary = callPackage ../development/libraries/haskell/temporary {};

From 8216bc5bc4d8133c6e490130ef0e82244afc2215 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 Aug 2013 10:18:58 +0200
Subject: [PATCH 091/452] haskell-contravariant: update to version 0.4.4

---
 pkgs/development/libraries/haskell/contravariant/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/contravariant/default.nix b/pkgs/development/libraries/haskell/contravariant/default.nix
index 7978a4185af..d38058a25de 100644
--- a/pkgs/development/libraries/haskell/contravariant/default.nix
+++ b/pkgs/development/libraries/haskell/contravariant/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "contravariant";
-  version = "0.4.3";
-  sha256 = "1hhcsy5bshi2yx8618wxa40gax5wfapnbgdmv1acgjyxb6vbmsp6";
+  version = "0.4.4";
+  sha256 = "1b4422wpcyvrf4r7rr8c8wa008f5ykaxs17vr4plp91rcczr87s4";
   buildDepends = [ tagged transformers transformersCompat ];
   meta = {
     homepage = "http://github.com/ekmett/contravariant/";

From 3c56bcd0adc2e9cefec8a10ae404660cdf1274a3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 Aug 2013 10:18:58 +0200
Subject: [PATCH 092/452] haskell-crypto-cipher-tests: update to version 0.0.4

---
 .../libraries/haskell/crypto-cipher-tests/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix b/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix
index 3e93912b3a7..12118a37540 100644
--- a/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "crypto-cipher-tests";
-  version = "0.0.2";
-  sha256 = "1jzci2a6827jgiklj8sh7pjl7g4igk2j6mim20619i4rk6x0lhgz";
+  version = "0.0.4";
+  sha256 = "1c725zj94d6n33wldyzlm1qd32a0ais0w221ykpgs49rrd6hrpbh";
   buildDepends = [
     byteable cryptoCipherTypes HUnit mtl QuickCheck securemem
     testFramework testFrameworkHunit testFrameworkQuickcheck2

From 86a35f8b8d9830a1f4a8b43d24122c9171999506 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 Aug 2013 10:18:58 +0200
Subject: [PATCH 093/452] haskell-crypto-cipher-types: update to version 0.0.4

---
 .../libraries/haskell/crypto-cipher-types/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix b/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix
index 378ccf3dbcc..f1665950a55 100644
--- a/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "crypto-cipher-types";
-  version = "0.0.2";
-  sha256 = "1vjf9g1w7ja8x42k6hq6pcw7jvviw9rq512ncdqd7j20411zjbf4";
+  version = "0.0.4";
+  sha256 = "0ipwplw1mn6amjxk2i5sksxvfsnf2fv8rnrgyncl21mp1gbnq7h0";
   buildDepends = [ byteable securemem ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-crypto-cipher";

From 47c084a6a1bf6c7d02015f1a5589fed04225ea87 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 Aug 2013 10:18:58 +0200
Subject: [PATCH 094/452] haskell-cryptocipher: update to version 0.5.2

---
 pkgs/development/libraries/haskell/cryptocipher/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/cryptocipher/default.nix b/pkgs/development/libraries/haskell/cryptocipher/default.nix
index 6efca94a651..0f99ccdfe38 100644
--- a/pkgs/development/libraries/haskell/cryptocipher/default.nix
+++ b/pkgs/development/libraries/haskell/cryptocipher/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cryptocipher";
-  version = "0.5.1";
-  sha256 = "118sabi90qjyqbvfincn737c4mi9mvjij1dzx7k9rsgad47p0753";
+  version = "0.5.2";
+  sha256 = "0ffd3w2hvi1zbhgk0xvgbnlfzzwijbrs5b9b4g2vc5p69wkv24zr";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 2635ef463e4bcc634d359f2d2e2a9cd8f080d7bb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 Aug 2013 10:18:59 +0200
Subject: [PATCH 095/452] haskell-derive: update to version 2.5.12

---
 pkgs/development/libraries/haskell/derive/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/derive/default.nix b/pkgs/development/libraries/haskell/derive/default.nix
index 906c51fc072..7fe2fdcba9f 100644
--- a/pkgs/development/libraries/haskell/derive/default.nix
+++ b/pkgs/development/libraries/haskell/derive/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "derive";
-  version = "2.5.11";
-  sha256 = "0934k49kpp32wffpvpk2sia7frd9ik56k6ghy6d6j31cabxf9m8r";
+  version = "2.5.12";
+  sha256 = "17agsdarxm22z4g911layb5g11gg8r1p2ar86pg1ch1q0jnhfqxr";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From fb720f8caadab5e5652d81e902f6f12eaf93517e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 Aug 2013 10:18:59 +0200
Subject: [PATCH 096/452] haskell-monoid-extras: update to version 0.3.1.0

---
 .../libraries/haskell/monoid-extras/default.nix           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/monoid-extras/default.nix b/pkgs/development/libraries/haskell/monoid-extras/default.nix
index 969ab8bd0b8..2025ceaffe5 100644
--- a/pkgs/development/libraries/haskell/monoid-extras/default.nix
+++ b/pkgs/development/libraries/haskell/monoid-extras/default.nix
@@ -1,10 +1,10 @@
-{ cabal, semigroups }:
+{ cabal, semigroupoids, semigroups }:
 
 cabal.mkDerivation (self: {
   pname = "monoid-extras";
-  version = "0.3.0.0";
-  sha256 = "1bb8yq2vja80177h3wfadkjkwvcrszx0nq6m5n10f4lh9spvr087";
-  buildDepends = [ semigroups ];
+  version = "0.3.1.0";
+  sha256 = "0nxdkx0j67nb41ingp1yl0appfx64ikf5709f48469qbaf3pgax3";
+  buildDepends = [ semigroupoids semigroups ];
   meta = {
     description = "Various extra monoid-related definitions and utilities";
     license = self.stdenv.lib.licenses.bsd3;

From a2a7e611a33646ccca1b9278bb226eb1fb25fc88 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 Aug 2013 10:18:59 +0200
Subject: [PATCH 097/452] haskell-postgresql-simple: update to version 0.3.6.0

---
 .../libraries/haskell/postgresql-simple/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
index 2b99bb2eb6c..f9fa750b4b3 100644
--- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix
+++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "postgresql-simple";
-  version = "0.3.5.0";
-  sha256 = "09w9cdjn9jvmcwh63ydjl8p28xfhrhy448y211z3carx2zwryshi";
+  version = "0.3.6.0";
+  sha256 = "1qszr3k7cihizbaq3naj134gavkpamk8q3g02rsilzvn0ivq8wb8";
   buildDepends = [
     attoparsec blazeBuilder blazeTextual postgresqlLibpq text time
     transformers vector

From 0b46d3c76b69cfabe65ff52d8ad384f09fbf1f66 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 Aug 2013 10:18:59 +0200
Subject: [PATCH 098/452] haskell-securemem: update to version 0.1.3

---
 pkgs/development/libraries/haskell/securemem/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/securemem/default.nix b/pkgs/development/libraries/haskell/securemem/default.nix
index cc031470593..5b6fc4e95ca 100644
--- a/pkgs/development/libraries/haskell/securemem/default.nix
+++ b/pkgs/development/libraries/haskell/securemem/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "securemem";
-  version = "0.1.2";
-  sha256 = "1szb530jw7666cnrfa8988p2b5scl2bfafi8kgslf7xi5yv7grqh";
+  version = "0.1.3";
+  sha256 = "1kycpk73vh8wwxzn35hmv36vwsc9r4g53f2fy6bn21q9gfm2r90j";
   buildDepends = [ byteable ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-securemem";

From c359bac0a3e7aaeb72fd6b8a0a614bb7704dd560 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 Aug 2013 10:18:59 +0200
Subject: [PATCH 099/452] haskell-stylish-haskell: update to version 0.5.8.0

---
 .../development/libraries/haskell/stylish-haskell/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix
index 5c1059e634c..74646c9acca 100644
--- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix
+++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "stylish-haskell";
-  version = "0.5.7.0";
-  sha256 = "12ka5lyp28fy8gablhymxdldl792ycr8d51lsknhldb54pmklf73";
+  version = "0.5.8.0";
+  sha256 = "1wjrn4cq47jjmqkb2zv02x90l2mv6n7zh4mvcav25s9bwvvca10r";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From fe2acafee750f9addcfeecb1469373f686448336 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 Aug 2013 10:18:59 +0200
Subject: [PATCH 100/452] haskell-hlint: update to version 1.8.51

---
 pkgs/development/tools/haskell/hlint/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix
index c6640873a52..d1d03c2c890 100644
--- a/pkgs/development/tools/haskell/hlint/default.nix
+++ b/pkgs/development/tools/haskell/hlint/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hlint";
-  version = "1.8.50";
-  sha256 = "02gbqlyi1c82jjzy9ipmrvxcyizvs86af7z35x9wz3imlnzx1l6c";
+  version = "1.8.51";
+  sha256 = "0cm78921ksysiz81x3m7kjq343fr46fpm61cw367aljd86lhivv1";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 37440d740c494a807521eea46941b3fbcde42b2c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 Aug 2013 11:52:00 +0200
Subject: [PATCH 101/452] haskell-hoogle: update to version 4.2.19

---
 .../libraries/haskell/hoogle/default.nix      | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix
index 1e722a186dc..dfca21b1ce3 100644
--- a/pkgs/development/libraries/haskell/hoogle/default.nix
+++ b/pkgs/development/libraries/haskell/hoogle/default.nix
@@ -1,18 +1,23 @@
-{ cabal, binary, blazeBuilder, Cabal, caseInsensitive, cmdargs
-, conduit, filepath, haskellSrcExts, httpTypes, parsec, random
-, safe, tagsoup, time, transformers, uniplate, wai, warp
+{ cabal, aeson, binary, blazeBuilder, Cabal, caseInsensitive
+, cmdargs, conduit, deepseq, filepath, haskellSrcExts, hspec
+, hspecExpectations, httpTypes, HUnit, parsec, random, safe
+, systemFileio, tagsoup, text, time, transformers, uniplate, wai
+, warp
 }:
 
 cabal.mkDerivation (self: {
   pname = "hoogle";
-  version = "4.2.16";
-  sha256 = "1hamwqhndrkajm4xvxxfhr2rnlmf3z2ysyfxx3y6d24jawjyqf8a";
+  version = "4.2.19";
+  sha256 = "0mfmb3ky93gicwd1i4n3xfhlr3y6zgc4dv2nrilrr9l0kfka37f8";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    binary blazeBuilder Cabal caseInsensitive cmdargs conduit filepath
-    haskellSrcExts httpTypes parsec random safe tagsoup time
-    transformers uniplate wai warp
+    aeson binary blazeBuilder Cabal caseInsensitive cmdargs conduit
+    deepseq filepath haskellSrcExts httpTypes parsec random safe
+    tagsoup text time transformers uniplate wai warp
+  ];
+  testDepends = [
+    conduit hspec hspecExpectations HUnit systemFileio transformers
   ];
   meta = {
     homepage = "http://www.haskell.org/hoogle/";

From 67167c9170aec411ab9f68137f6e343dce022c92 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 Aug 2013 11:52:57 +0200
Subject: [PATCH 102/452] haskell-src-exts: add version 1.14.0 and drop
 obsolete 1.11.1

---
 .../haskell-src-exts/{1.11.1.nix => 1.14.0.nix}     | 13 +++++++++----
 pkgs/top-level/haskell-packages.nix                 |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)
 rename pkgs/development/libraries/haskell/haskell-src-exts/{1.11.1.nix => 1.14.0.nix} (55%)

diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix b/pkgs/development/libraries/haskell/haskell-src-exts/1.14.0.nix
similarity index 55%
rename from pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix
rename to pkgs/development/libraries/haskell/haskell-src-exts/1.14.0.nix
index 1918260cc62..16595e33156 100644
--- a/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix
+++ b/pkgs/development/libraries/haskell/haskell-src-exts/1.14.0.nix
@@ -1,14 +1,19 @@
-{ cabal, cpphs, happy }:
+{ cabal, cpphs, filepath, happy, smallcheck, tasty, tastyHunit
+, tastySmallcheck
+}:
 
 cabal.mkDerivation (self: {
   pname = "haskell-src-exts";
-  version = "1.11.1";
-  sha256 = "1jqf8l81zw7x5ryf8h2n0b2636yhxkfp3j4ndbqw6hc7i5q581m6";
+  version = "1.14.0";
+  sha256 = "070khsw56xwyrclamv5wckj9na2xbzibv702xx52ik2wbs21dr0d";
   buildDepends = [ cpphs ];
+  testDepends = [
+    filepath smallcheck tasty tastyHunit tastySmallcheck
+  ];
   buildTools = [ happy ];
   doCheck = false;
   meta = {
-    homepage = "http://code.haskell.org/haskell-src-exts";
+    homepage = "https://github.com/haskell-suite/haskell-src-exts";
     description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
     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 cdfdce27fb4..a949a56fa0b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1114,8 +1114,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   haskellSrc_1_0_1_5 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.5.nix {};
   haskellSrc = self.haskellSrc_1_0_1_5;
 
-  haskellSrcExts_1_11_1 = callPackage ../development/libraries/haskell/haskell-src-exts/1.11.1.nix {};
   haskellSrcExts_1_13_5 = callPackage ../development/libraries/haskell/haskell-src-exts/1.13.5.nix {};
+  haskellSrcExts_1_14_0 = callPackage ../development/libraries/haskell/haskell-src-exts/1.14.0.nix {};
   haskellSrcExts = self.haskellSrcExts_1_13_5;
 
   haskellSrcMeta = callPackage ../development/libraries/haskell/haskell-src-meta {};

From 3bf9a5a7730ac1fd2a2a850d3003803fbd453bd6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 Aug 2013 11:58:16 +0200
Subject: [PATCH 103/452] Switch hoogle, hlint, derive, and stylish-haskell to
 the latest version of haskell-src-exts.

---
 pkgs/top-level/haskell-packages.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index a949a56fa0b..bb946f2a8b1 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -830,7 +830,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   deepseqTh = callPackage ../development/libraries/haskell/deepseq-th {};
 
-  derive = callPackage ../development/libraries/haskell/derive {};
+  derive = callPackage ../development/libraries/haskell/derive {
+    haskellSrcExts = self.haskellSrcExts_1_14_0;
+  };
 
   dependentMap = callPackage ../development/libraries/haskell/dependent-map {};
 
@@ -1189,7 +1191,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   hoauth = callPackage ../development/libraries/haskell/hoauth {};
 
-  hoogle = callPackage ../development/libraries/haskell/hoogle {};
+  hoogle = callPackage ../development/libraries/haskell/hoogle {
+    haskellSrcExts = self.haskellSrcExts_1_14_0;
+  };
 
   hopenssl = callPackage ../development/libraries/haskell/hopenssl {};
 
@@ -1825,7 +1829,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   strptime = callPackage ../development/libraries/haskell/strptime {};
 
-  stylishHaskell = callPackage ../development/libraries/haskell/stylish-haskell {};
+  stylishHaskell = callPackage ../development/libraries/haskell/stylish-haskell {
+    haskellSrcExts = self.haskellSrcExts_1_14_0;
+  };
 
   syb_0_2_2 = callPackage ../development/libraries/haskell/syb/0.2.2.nix {};
   syb_0_3 = callPackage ../development/libraries/haskell/syb/0.3.nix {};
@@ -2291,7 +2297,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   hasktags = callPackage ../development/tools/haskell/hasktags {};
 
-  hlint = callPackage ../development/tools/haskell/hlint {};
+  hlint = callPackage ../development/tools/haskell/hlint {
+    haskellSrcExts = self.haskellSrcExts_1_14_0;
+  };
 
   hslogger = callPackage ../development/tools/haskell/hslogger {};
 

From 384292b4d553862d99f5a4d9afc3f6a665da033e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 Aug 2013 12:14:04 +0200
Subject: [PATCH 104/452] haskell-hoogle: disable test suite to fix the build

Running 1 test suites...
Test suite hoogle-test: RUNNING...
hoogle-test: datadir/testdata.txt: openFile: does not exist (No such file or directory)
Test suite hoogle-test: FAIL
Test suite logged to: dist/test/hoogle-4.2.19-hoogle-test.log
0 of 1 test suites (0 of 1 test cases) passed.
---
 pkgs/development/libraries/haskell/hoogle/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix
index dfca21b1ce3..c4039458d76 100644
--- a/pkgs/development/libraries/haskell/hoogle/default.nix
+++ b/pkgs/development/libraries/haskell/hoogle/default.nix
@@ -19,6 +19,7 @@ cabal.mkDerivation (self: {
   testDepends = [
     conduit hspec hspecExpectations HUnit systemFileio transformers
   ];
+  doCheck = false;
   meta = {
     homepage = "http://www.haskell.org/hoogle/";
     description = "Haskell API Search";

From 1a3667773f8898c47bdd17f497f7bd910c8ec9a3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 22 Aug 2013 11:47:13 +0200
Subject: [PATCH 105/452] haskell-MissingH: update to version 1.2.0.2

---
 pkgs/development/libraries/haskell/MissingH/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/MissingH/default.nix b/pkgs/development/libraries/haskell/MissingH/default.nix
index b87c47f04be..59656d51978 100644
--- a/pkgs/development/libraries/haskell/MissingH/default.nix
+++ b/pkgs/development/libraries/haskell/MissingH/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "MissingH";
-  version = "1.2.0.1";
-  sha256 = "0hxyf82g2rz36ks6n136p6brgs0r9cnxfkh4xgl6iw11wbq2rb5m";
+  version = "1.2.0.2";
+  sha256 = "1wrrfa8dy0h0c53f1zjzwdkj8wkwsbi6qhv35wwlaz39dk32c4nn";
   buildDepends = [
     filepath hslogger HUnit mtl network parsec random regexCompat time
   ];

From dd476c7276c03c0b50f02773422a75f333d618bc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 22 Aug 2013 11:47:14 +0200
Subject: [PATCH 106/452] haskell-comonad-transformers: update to version 3.1

---
 .../libraries/haskell/comonad-transformers/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/comonad-transformers/default.nix b/pkgs/development/libraries/haskell/comonad-transformers/default.nix
index 45b218a40f7..ef0ffe06198 100644
--- a/pkgs/development/libraries/haskell/comonad-transformers/default.nix
+++ b/pkgs/development/libraries/haskell/comonad-transformers/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "comonad-transformers";
-  version = "3.0.4";
-  sha256 = "1jvg08vmi47p8ji1llci02lk675q93pm6dd8imqj6xjrq34g4x9a";
+  version = "3.1";
+  sha256 = "024l437xfi0bkbn3121xi8slwsh9jby9a92qg1m5y0nmxzs9lxda";
   buildDepends = [
     comonad contravariant distributive semigroupoids semigroups
     transformers

From 3740307b5b3658673995b0ac4d09648279fd42b5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 22 Aug 2013 11:47:14 +0200
Subject: [PATCH 107/452] haskell-xml-conduit: update to version 1.1.0.7

---
 pkgs/development/libraries/haskell/xml-conduit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix
index bd21eee5aa9..4e965c2ebaa 100644
--- a/pkgs/development/libraries/haskell/xml-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xml-conduit";
-  version = "1.1.0.6";
-  sha256 = "08kz982c95hcni6zbrflv8kqvy7wccb19plsmwczhzcsifam5a9k";
+  version = "1.1.0.7";
+  sha256 = "04yg2mif9s3hsm5c18mf6rmw22j8prs8a1272fz25vzxzljfs2r9";
   buildDepends = [
     attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
     blazeHtml blazeMarkup conduit dataDefault deepseq failure

From eb703936d064596842b4588c48af278a81a70d9f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 22 Aug 2013 11:47:14 +0200
Subject: [PATCH 108/452] haskell-cabal2ghci: update to version 0.0.1.1

---
 pkgs/development/tools/haskell/cabal2ghci/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/haskell/cabal2ghci/default.nix b/pkgs/development/tools/haskell/cabal2ghci/default.nix
index cd7bf9dc9d1..f8adaee4671 100644
--- a/pkgs/development/tools/haskell/cabal2ghci/default.nix
+++ b/pkgs/development/tools/haskell/cabal2ghci/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal2ghci";
-  version = "0.0.1.0";
-  sha256 = "0l5225gwm6j25694cp94d4z31i1p68pq6js3psbr7m204q409dr5";
+  version = "0.0.1.1";
+  sha256 = "1fg3pr25f78a6b8nqxvxki4z3fvgx4i6zkmpl992a0iarycqdrsg";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

From db9383d93b7af92c22062111a536b5c319e3c58b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 22 Aug 2013 11:47:14 +0200
Subject: [PATCH 109/452] haskell-hslogger: update to version 1.2.2

---
 pkgs/development/tools/haskell/hslogger/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/haskell/hslogger/default.nix b/pkgs/development/tools/haskell/hslogger/default.nix
index 4443637def4..f99a4585ec6 100644
--- a/pkgs/development/tools/haskell/hslogger/default.nix
+++ b/pkgs/development/tools/haskell/hslogger/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hslogger";
-  version = "1.2.1";
-  sha256 = "1vfdf7i6fd4mb3rn57z3wn7bhw4z5g47f4vggb4sms5rg4zqqly5";
+  version = "1.2.2";
+  sha256 = "0j15nma6yf3cxb9j232kif1a836zmncfyklz9wp1mx064nblr5jf";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ mtl network time ];

From 5ba7c2a24f78c43573f64a3654a52d094f78f753 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 22 Aug 2013 11:54:56 +0200
Subject: [PATCH 110/452] haskell-cabal2nix: update to version 1.54

---
 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 29585256216..4e2bbf63b31 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal2nix";
-  version = "1.53";
-  sha256 = "1xhvxx5maj03rc6zd8bcqwzyn3b9yqxsbzgdh4d9ss4myn8x2zp3";
+  version = "1.54";
+  sha256 = "169syf99gs0gj44hcnpgx0xvrmz5mq70hb6bq6ydma9ivjvz2jg4";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];

From baf22bd8f6c13bc66c2718c41f28db950ac070e1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 24 Aug 2013 11:24:22 +0200
Subject: [PATCH 111/452] haskell-diagrams: update to version 0.7.1

---
 pkgs/development/libraries/haskell/diagrams/diagrams.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/diagrams/diagrams.nix b/pkgs/development/libraries/haskell/diagrams/diagrams.nix
index 84d3d9bbf48..efa63bdc0b7 100644
--- a/pkgs/development/libraries/haskell/diagrams/diagrams.nix
+++ b/pkgs/development/libraries/haskell/diagrams/diagrams.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams";
-  version = "0.7";
-  sha256 = "08ibmxzykb9v8y7ars9jz2qyss8ln8i6j87sm31bq5g9kvpy287c";
+  version = "0.7.1";
+  sha256 = "0rdpp26zvimdhdw0jpw6w606jkzkqdx0pq4051fkyk2mldwk9ipj";
   buildDepends = [
     diagramsContrib diagramsCore diagramsLib diagramsSvg
   ];

From cc14d21bc26a54794b598d937811af16616df677 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 24 Aug 2013 11:24:22 +0200
Subject: [PATCH 112/452] haskell-http-conduit: update to version 1.9.4.3

---
 pkgs/development/libraries/haskell/http-conduit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
index f6a06e33515..eb7f1a0d468 100644
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-conduit";
-  version = "1.9.4.2";
-  sha256 = "13qjf3c3qkaqdi7qp1iqywvsbsiqq8brbzwh8idaj1bhl9jizwhx";
+  version = "1.9.4.3";
+  sha256 = "0lmshqv1ybim4201nb9wskyhg4fnslbm4ymvlmhn5zx0nwd777p9";
   buildDepends = [
     asn1Data base64Bytestring blazeBuilder blazeBuilderConduit
     caseInsensitive certificate conduit cookie cprngAes dataDefault

From 82e1c8a34bef74cb14b9c8005faf198066d465ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 24 Aug 2013 19:55:00 +0200
Subject: [PATCH 113/452] v8: build binaries for unix platforms

---
 pkgs/development/libraries/v8/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix
index 25deb9eb351..3fc3138ef52 100644
--- a/pkgs/development/libraries/v8/default.nix
+++ b/pkgs/development/libraries/v8/default.nix
@@ -53,4 +53,10 @@ stdenv.mkDerivation {
       install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.gcc.gcc}/lib/libgcc_s.1.dylib $out/bin/d8
       install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.gcc.gcc}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib
     '' else null;
+
+    meta = with stdenv.lib; {
+      description = "V8 is Google's open source JavaScript engine";
+      platforms = platforms.unix; 
+      license = licenses.bsd3;
+    };
 }

From 03dd7deef21b2bd59b46137e14130b00a6be33b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 24 Aug 2013 19:55:28 +0200
Subject: [PATCH 114/452] node-packages: add ungit and update packages

---
 pkgs/top-level/node-packages-generated.nix | 1266 +++++++++++++++++---
 1 file changed, 1098 insertions(+), 168 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index d3477447d8c..7bb1a67c489 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -115,6 +115,23 @@
     ];
     passthru.names = [ "adm-zip" ];
   };
+  full."ambi"."~2.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "ambi-2.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ambi/-/ambi-2.0.0.tgz";
+        sha1 = "42c2bf98e8d101aa4da28a812678a5dbe36ada66";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ambi"."~2.0.0" or []);
+    deps = [
+      self.full."typechecker"."~2.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ambi" ];
+  };
   full."amdefine"."*" = lib.makeOverridable self.buildNodePackage {
     name = "amdefine-0.0.8";
     src = [
@@ -429,6 +446,22 @@
     ];
     passthru.names = [ "async" ];
   };
+  full."async"."0.2.9" = lib.makeOverridable self.buildNodePackage {
+    name = "async-0.2.9";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/async/-/async-0.2.9.tgz";
+        sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."async"."0.2.9" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "async" ];
+  };
   full."async"."0.2.x" = lib.makeOverridable self.buildNodePackage {
     name = "async-0.2.9";
     src = [
@@ -612,6 +645,28 @@
     ];
     passthru.names = [ "backoff" ];
   };
+  full."bal-util"."~2.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "bal-util-2.0.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/bal-util/-/bal-util-2.0.5.tgz";
+        sha1 = "b5a3b78e520b17892dfa051d2a819e8a48455b9c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."bal-util"."~2.0.0" or []);
+    deps = [
+      self.full."ambi"."~2.0.0"
+      self.full."eachr"."~2.0.2"
+      self.full."extendr"."~2.0.1"
+      self.full."safefs"."~3.0.1"
+      self.full."taskgroup"."~3.1.1"
+      self.full."typechecker"."~2.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "bal-util" ];
+  };
   full."base64id"."0.1.0" = lib.makeOverridable self.buildNodePackage {
     name = "base64id-0.1.0";
     src = [
@@ -765,11 +820,11 @@
     passthru.names = [ "boom" ];
   };
   full."bower".">=0.9.0" = lib.makeOverridable self.buildNodePackage {
-    name = "bower-1.2.2";
+    name = "bower-1.2.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/bower/-/bower-1.2.2.tgz";
-        sha1 = "f6bc27b0a3b87d201c9223792795b6d7fd31b6c0";
+        url = "http://registry.npmjs.org/bower/-/bower-1.2.4.tgz";
+        sha1 = "7dce66cef5ffab8ef56c053d8df5aa1f1356cfac";
       })
     ];
     buildInputs =
@@ -817,11 +872,11 @@
     passthru.names = [ "bower" ];
   };
   full."bower-config"."~0.4.3" = lib.makeOverridable self.buildNodePackage {
-    name = "bower-config-0.4.3";
+    name = "bower-config-0.4.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/bower-config/-/bower-config-0.4.3.tgz";
-        sha1 = "6d3d9d31967c76daf140eca4b06924b13daccc89";
+        url = "http://registry.npmjs.org/bower-config/-/bower-config-0.4.4.tgz";
+        sha1 = "33c6a772397f24d46322a294b415128a6e3090ff";
       })
     ];
     buildInputs =
@@ -1276,16 +1331,16 @@
     ];
     passthru.names = [ "chalk" ];
   };
-  full."character-parser"."1.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "character-parser-1.0.2";
+  full."character-parser"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "character-parser-1.2.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/character-parser/-/character-parser-1.0.2.tgz";
-        sha1 = "55384d6afcf8c6b9dd483e8347646a790e4545e7";
+        url = "http://registry.npmjs.org/character-parser/-/character-parser-1.2.0.tgz";
+        sha1 = "94134d6e5d870a39be359f7d22460935184ddef6";
       })
     ];
     buildInputs =
-      (self.nativeDeps."character-parser"."1.0.2" or []);
+      (self.nativeDeps."character-parser"."1.2.0" or []);
     deps = [
     ];
     peerDependencies = [
@@ -1570,6 +1625,24 @@
     ];
     passthru.names = [ "cmd-shim" ];
   };
+  full."cmd-shim"."~1.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "cmd-shim-1.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cmd-shim/-/cmd-shim-1.1.0.tgz";
+        sha1 = "e69fe26e9a8b9040c7b61dc8ad6b04d7dbabe767";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."cmd-shim"."~1.1.0" or []);
+    deps = [
+      self.full."mkdirp"."~0.3.3"
+      self.full."graceful-fs"."1.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "cmd-shim" ];
+  };
   full."coffee-script"."*" = lib.makeOverridable self.buildNodePackage {
     name = "coffee-script-1.6.3";
     src = [
@@ -1684,11 +1757,11 @@
     passthru.names = [ "colors" ];
   };
   full."colors"."0.6.x" = lib.makeOverridable self.buildNodePackage {
-    name = "colors-0.6.1";
+    name = "colors-0.6.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/colors/-/colors-0.6.1.tgz";
-        sha1 = "59c7799f6c91e0e15802980a98ed138b3c78f4e9";
+        url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz";
+        sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc";
       })
     ];
     buildInputs =
@@ -1700,11 +1773,11 @@
     passthru.names = [ "colors" ];
   };
   full."colors"."0.x.x" = lib.makeOverridable self.buildNodePackage {
-    name = "colors-0.6.1";
+    name = "colors-0.6.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/colors/-/colors-0.6.1.tgz";
-        sha1 = "59c7799f6c91e0e15802980a98ed138b3c78f4e9";
+        url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz";
+        sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc";
       })
     ];
     buildInputs =
@@ -1797,18 +1870,17 @@
     ];
     passthru.names = [ "commander" ];
   };
-  full."commander"."1.3.2" = lib.makeOverridable self.buildNodePackage {
-    name = "commander-1.3.2";
+  full."commander"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "commander-2.0.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/commander/-/commander-1.3.2.tgz";
-        sha1 = "8a8f30ec670a6fdd64af52f1914b907d79ead5b5";
+        url = "http://registry.npmjs.org/commander/-/commander-2.0.0.tgz";
+        sha1 = "d1b86f901f8b64bd941bdeadaf924530393be928";
       })
     ];
     buildInputs =
-      (self.nativeDeps."commander"."1.3.2" or []);
+      (self.nativeDeps."commander"."2.0.0" or []);
     deps = [
-      self.full."keypress"."0.1.x"
     ];
     peerDependencies = [
     ];
@@ -1887,6 +1959,32 @@
     ];
     passthru.names = [ "configstore" ];
   };
+  full."connect"."2.7.11" = lib.makeOverridable self.buildNodePackage {
+    name = "connect-2.7.11";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/connect/-/connect-2.7.11.tgz";
+        sha1 = "f561d5eef70b8d719c397f724d34ba4065c77a3e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."connect"."2.7.11" or []);
+    deps = [
+      self.full."qs"."0.6.5"
+      self.full."formidable"."1.0.14"
+      self.full."cookie-signature"."1.0.1"
+      self.full."buffer-crc32"."0.2.1"
+      self.full."cookie"."0.0.5"
+      self.full."send"."0.1.1"
+      self.full."bytes"."0.2.0"
+      self.full."fresh"."0.1.0"
+      self.full."pause"."0.0.1"
+      self.full."debug"."*"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "connect" ];
+  };
   full."connect"."2.7.5" = lib.makeOverridable self.buildNodePackage {
     name = "connect-2.7.5";
     src = [
@@ -2791,6 +2889,23 @@
     ];
     passthru.names = [ "dtrace-provider" ];
   };
+  full."eachr"."~2.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "eachr-2.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/eachr/-/eachr-2.0.2.tgz";
+        sha1 = "f1100c5bb1619f6ee86a0661fe604e3a9ad7559d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."eachr"."~2.0.2" or []);
+    deps = [
+      self.full."typechecker"."~2.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "eachr" ];
+  };
   full."editor"."0.0.4" = lib.makeOverridable self.buildNodePackage {
     name = "editor-0.0.4";
     src = [
@@ -3090,6 +3205,33 @@
     ];
     passthru.names = [ "express" ];
   };
+  full."express"."3.2.6" = lib.makeOverridable self.buildNodePackage {
+    name = "express-3.2.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/express/-/express-3.2.6.tgz";
+        sha1 = "d8a9fe065adc23c5b41ec2c689c672b261430ffc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."express"."3.2.6" or []);
+    deps = [
+      self.full."connect"."2.7.11"
+      self.full."commander"."0.6.1"
+      self.full."range-parser"."0.0.4"
+      self.full."mkdirp"."0.3.4"
+      self.full."cookie"."0.1.0"
+      self.full."buffer-crc32"."0.2.1"
+      self.full."fresh"."0.1.0"
+      self.full."methods"."0.0.1"
+      self.full."send"."0.1.0"
+      self.full."cookie-signature"."1.0.1"
+      self.full."debug"."*"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "express" ];
+  };
   full."express"."3.x" = lib.makeOverridable self.buildNodePackage {
     name = "express-3.3.5";
     src = [
@@ -3197,6 +3339,23 @@
     passthru.names = [ "extend" ];
   };
   "extend" = self.full."extend"."*";
+  full."extendr"."~2.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "extendr-2.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/extendr/-/extendr-2.0.1.tgz";
+        sha1 = "d8ab375fcbb833e4ba2cd228540f04e4aa07de90";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."extendr"."~2.0.1" or []);
+    deps = [
+      self.full."typechecker"."~2.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "extendr" ];
+  };
   full."extsprintf"."1.0.0" = lib.makeOverridable self.buildNodePackage {
     name = "extsprintf-1.0.0";
     src = [
@@ -3313,6 +3472,24 @@
     ];
     passthru.names = [ "findup-sync" ];
   };
+  full."findup-sync"."~0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "findup-sync-0.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/findup-sync/-/findup-sync-0.1.2.tgz";
+        sha1 = "da2b96ca9f800e5a13d0a11110f490b65f62e96d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."findup-sync"."~0.1.2" or []);
+    deps = [
+      self.full."glob"."~3.1.21"
+      self.full."lodash"."~1.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "findup-sync" ];
+  };
   full."flatiron"."*" = lib.makeOverridable self.buildNodePackage {
     name = "flatiron-0.3.8";
     src = [
@@ -3457,6 +3634,28 @@
     passthru.names = [ "forever-monitor" ];
   };
   "forever-monitor" = self.full."forever-monitor"."*";
+  full."forever-monitor"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "forever-monitor-1.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.1.0.tgz";
+        sha1 = "439ce036f999601cff551aea7f5151001a869ef9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."forever-monitor"."1.1.0" or []);
+    deps = [
+      self.full."broadway"."0.2.x"
+      self.full."minimatch"."0.0.x"
+      self.full."pkginfo"."0.x.x"
+      self.full."ps-tree"."0.0.x"
+      self.full."watch"."0.5.x"
+      self.full."utile"."0.1.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "forever-monitor" ];
+  };
   full."forever-monitor"."1.2.2" = lib.makeOverridable self.buildNodePackage {
     name = "forever-monitor-1.2.2";
     src = [
@@ -3518,18 +3717,18 @@
     passthru.names = [ "form-data" ];
   };
   full."form-data"."~0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "form-data-0.1.0";
+    name = "form-data-0.1.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/form-data/-/form-data-0.1.0.tgz";
-        sha1 = "d36b59baf9b292bb2e5034d7a6079b2bd1e9df83";
+        url = "http://registry.npmjs.org/form-data/-/form-data-0.1.1.tgz";
+        sha1 = "0d5f2805647b45533ba10bc8a59cf17d1efa5f12";
       })
     ];
     buildInputs =
       (self.nativeDeps."form-data"."~0.1.0" or []);
     deps = [
       self.full."combined-stream"."~0.0.4"
-      self.full."mime"."~1.2.9"
+      self.full."mime"."~1.2.11"
       self.full."async"."~0.2.9"
     ];
     peerDependencies = [
@@ -3827,39 +4026,40 @@
     passthru.names = [ "fstream-npm" ];
   };
   full."generator-angular"."*" = lib.makeOverridable self.buildNodePackage {
-    name = "generator-angular-0.3.1";
+    name = "generator-angular-0.4.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/generator-angular/-/generator-angular-0.3.1.tgz";
-        sha1 = "124d8752a0252b2ba833285ee3415a455d0b4bdd";
+        url = "http://registry.npmjs.org/generator-angular/-/generator-angular-0.4.0.tgz";
+        sha1 = "4fbaaa87b829f3f2fc72fac3da1fa47ff801ca1d";
       })
     ];
     buildInputs =
       (self.nativeDeps."generator-angular"."*" or []);
     deps = [
-      self.full."yeoman-generator"."~0.12.0"
+      self.full."yeoman-generator"."~0.13.0"
     ];
     peerDependencies = [
-      self.full."generator-karma"."~0.4.0"
+      self.full."generator-karma"."~0.5.0"
       self.full."yo".">=1.0.0-rc.1.1"
     ];
     passthru.names = [ "generator-angular" ];
   };
   "generator-angular" = self.full."generator-angular"."*";
-  full."generator-karma"."~0.4.0" = lib.makeOverridable self.buildNodePackage {
-    name = "generator-karma-0.4.1";
+  full."generator-karma"."~0.5.0" = lib.makeOverridable self.buildNodePackage {
+    name = "generator-karma-0.5.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/generator-karma/-/generator-karma-0.4.1.tgz";
-        sha1 = "50ee26e3e9d246d2f2a1ada72c5f4a7bf1c08a0b";
+        url = "http://registry.npmjs.org/generator-karma/-/generator-karma-0.5.0.tgz";
+        sha1 = "3b9dc1154e232a135c0e4598834540977038617d";
       })
     ];
     buildInputs =
-      (self.nativeDeps."generator-karma"."~0.4.0" or []);
+      (self.nativeDeps."generator-karma"."~0.5.0" or []);
     deps = [
-      self.full."yeoman-generator"."~0.12.0"
+      self.full."yeoman-generator"."~0.13.0"
     ];
     peerDependencies = [
+      self.full."yo".">=1.0.0-rc.1.1"
     ];
     passthru.names = [ "generator-karma" ];
   };
@@ -3881,22 +4081,22 @@
     passthru.names = [ "generator-mocha" ];
   };
   full."generator-webapp"."*" = lib.makeOverridable self.buildNodePackage {
-    name = "generator-webapp-0.2.7";
+    name = "generator-webapp-0.3.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/generator-webapp/-/generator-webapp-0.2.7.tgz";
-        sha1 = "3d8f776719910802f4bf5156d6473f435c5fd570";
+        url = "http://registry.npmjs.org/generator-webapp/-/generator-webapp-0.3.1.tgz";
+        sha1 = "def094ddf1b079fd1e33fe381bc898c4f094bd1e";
       })
     ];
     buildInputs =
       (self.nativeDeps."generator-webapp"."*" or []);
     deps = [
-      self.full."yeoman-generator"."~0.12.3"
+      self.full."yeoman-generator"."~0.13.1"
       self.full."cheerio"."~0.12.1"
     ];
     peerDependencies = [
-      self.full."generator-mocha"."~0.1.1"
       self.full."yo".">=1.0.0-rc.1.1"
+      self.full."generator-mocha"."~0.1.1"
     ];
     passthru.names = [ "generator-webapp" ];
   };
@@ -4061,6 +4261,22 @@
     ];
     passthru.names = [ "glob" ];
   };
+  full."graceful-fs"."1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "graceful-fs-1.2.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz";
+        sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."graceful-fs"."1.2" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "graceful-fs" ];
+  };
   full."graceful-fs"."2" = lib.makeOverridable self.buildNodePackage {
     name = "graceful-fs-2.0.0";
     src = [
@@ -4141,6 +4357,22 @@
     ];
     passthru.names = [ "graceful-fs" ];
   };
+  full."graceful-fs"."~1.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "graceful-fs-1.2.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz";
+        sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."graceful-fs"."~1.2.2" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "graceful-fs" ];
+  };
   full."graceful-fs"."~2" = lib.makeOverridable self.buildNodePackage {
     name = "graceful-fs-2.0.0";
     src = [
@@ -4835,6 +5067,26 @@
     ];
     passthru.names = [ "ini" ];
   };
+  full."init-package-json"."0.0.10" = lib.makeOverridable self.buildNodePackage {
+    name = "init-package-json-0.0.10";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.10.tgz";
+        sha1 = "7baf10535227e0878105a04e44b78f132475da6a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."init-package-json"."0.0.10" or []);
+    deps = [
+      self.full."promzard"."~0.2.0"
+      self.full."read"."~1.0.1"
+      self.full."read-package-json"."1"
+      self.full."semver"."2.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "init-package-json" ];
+  };
   full."init-package-json"."0.0.11" = lib.makeOverridable self.buildNodePackage {
     name = "init-package-json-0.0.11";
     src = [
@@ -4856,11 +5108,11 @@
     passthru.names = [ "init-package-json" ];
   };
   full."inquirer"."~0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "inquirer-0.2.4";
+    name = "inquirer-0.2.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/inquirer/-/inquirer-0.2.4.tgz";
-        sha1 = "55dd181ad7826153a2bc959635a3ae8013311d64";
+        url = "http://registry.npmjs.org/inquirer/-/inquirer-0.2.5.tgz";
+        sha1 = "6b49a9cbe03de776122211f174ef9fe2822c08f6";
       })
     ];
     buildInputs =
@@ -4876,11 +5128,11 @@
     passthru.names = [ "inquirer" ];
   };
   full."inquirer"."~0.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "inquirer-0.2.4";
+    name = "inquirer-0.2.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/inquirer/-/inquirer-0.2.4.tgz";
-        sha1 = "55dd181ad7826153a2bc959635a3ae8013311d64";
+        url = "http://registry.npmjs.org/inquirer/-/inquirer-0.2.5.tgz";
+        sha1 = "6b49a9cbe03de776122211f174ef9fe2822c08f6";
       })
     ];
     buildInputs =
@@ -4896,11 +5148,11 @@
     passthru.names = [ "inquirer" ];
   };
   full."inquirer"."~0.2.4" = lib.makeOverridable self.buildNodePackage {
-    name = "inquirer-0.2.4";
+    name = "inquirer-0.2.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/inquirer/-/inquirer-0.2.4.tgz";
-        sha1 = "55dd181ad7826153a2bc959635a3ae8013311d64";
+        url = "http://registry.npmjs.org/inquirer/-/inquirer-0.2.5.tgz";
+        sha1 = "6b49a9cbe03de776122211f174ef9fe2822c08f6";
       })
     ];
     buildInputs =
@@ -5018,21 +5270,21 @@
     passthru.names = [ "isbinaryfile" ];
   };
   full."jade"."*" = lib.makeOverridable self.buildNodePackage {
-    name = "jade-0.34.1";
+    name = "jade-0.35.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/jade/-/jade-0.34.1.tgz";
-        sha1 = "6cb1f0928adfe9be7323d0b57e507e5c3c70f650";
+        url = "http://registry.npmjs.org/jade/-/jade-0.35.0.tgz";
+        sha1 = "75ec1d966a1203733613e8c180e2aa8685c16da9";
       })
     ];
     buildInputs =
       (self.nativeDeps."jade"."*" or []);
     deps = [
-      self.full."commander"."1.3.2"
+      self.full."commander"."2.0.0"
       self.full."mkdirp"."0.3.x"
       self.full."transformers"."2.1.0"
-      self.full."character-parser"."1.0.2"
-      self.full."monocle"."0.1.50"
+      self.full."character-parser"."1.2.0"
+      self.full."monocle"."1.1.50"
       self.full."with"."~1.1.0"
       self.full."constantinople"."~1.0.1"
     ];
@@ -5060,21 +5312,21 @@
     passthru.names = [ "jade" ];
   };
   full."jade".">= 0.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "jade-0.34.1";
+    name = "jade-0.35.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/jade/-/jade-0.34.1.tgz";
-        sha1 = "6cb1f0928adfe9be7323d0b57e507e5c3c70f650";
+        url = "http://registry.npmjs.org/jade/-/jade-0.35.0.tgz";
+        sha1 = "75ec1d966a1203733613e8c180e2aa8685c16da9";
       })
     ];
     buildInputs =
       (self.nativeDeps."jade".">= 0.0.1" or []);
     deps = [
-      self.full."commander"."1.3.2"
+      self.full."commander"."2.0.0"
       self.full."mkdirp"."0.3.x"
       self.full."transformers"."2.1.0"
-      self.full."character-parser"."1.0.2"
-      self.full."monocle"."0.1.50"
+      self.full."character-parser"."1.2.0"
+      self.full."monocle"."1.1.50"
       self.full."with"."~1.1.0"
       self.full."constantinople"."~1.0.1"
     ];
@@ -5291,15 +5543,15 @@
     passthru.names = [ "junk" ];
   };
   full."karma"."*" = lib.makeOverridable self.buildNodePackage {
-    name = "karma-0.10.1";
+    name = "karma-0.10.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma/-/karma-0.10.1.tgz";
-        sha1 = "eaa70b63dc67edb4883809c9be4e47e8b334e704";
+        url = "http://registry.npmjs.org/karma/-/karma-0.10.2.tgz";
+        sha1 = "4e100bd346bb24a1260dcd34b5b3d2d4a9b27b17";
       })
       (fetchurl {
-        url = "http://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.0.tgz";
-        sha1 = "94c805915c90a7cd8c32cb0829984865e27246fa";
+        url = "http://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.2.tgz";
+        sha1 = "4f4b8271ffbb7aba543daf38bbc004f4f7f28da3";
       })
       (fetchurl {
         url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.1.0.tgz";
@@ -5366,15 +5618,15 @@
   };
   "karma" = self.full."karma"."*";
   full."karma".">=0.9" = lib.makeOverridable self.buildNodePackage {
-    name = "karma-0.10.1";
+    name = "karma-0.10.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma/-/karma-0.10.1.tgz";
-        sha1 = "eaa70b63dc67edb4883809c9be4e47e8b334e704";
+        url = "http://registry.npmjs.org/karma/-/karma-0.10.2.tgz";
+        sha1 = "4e100bd346bb24a1260dcd34b5b3d2d4a9b27b17";
       })
       (fetchurl {
-        url = "http://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.0.tgz";
-        sha1 = "94c805915c90a7cd8c32cb0829984865e27246fa";
+        url = "http://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.2.tgz";
+        sha1 = "4f4b8271ffbb7aba543daf38bbc004f4f7f28da3";
       })
       (fetchurl {
         url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.1.0.tgz";
@@ -5440,15 +5692,15 @@
     passthru.names = [ "karma" "karma-jasmine" "karma-requirejs" "karma-coffee-preprocessor" "karma-html2js-preprocessor" "karma-chrome-launcher" "karma-firefox-launcher" "karma-phantomjs-launcher" "karma-script-launcher" ];
   };
   full."karma".">=0.9.3" = lib.makeOverridable self.buildNodePackage {
-    name = "karma-0.10.1";
+    name = "karma-0.10.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma/-/karma-0.10.1.tgz";
-        sha1 = "eaa70b63dc67edb4883809c9be4e47e8b334e704";
+        url = "http://registry.npmjs.org/karma/-/karma-0.10.2.tgz";
+        sha1 = "4e100bd346bb24a1260dcd34b5b3d2d4a9b27b17";
       })
       (fetchurl {
-        url = "http://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.0.tgz";
-        sha1 = "94c805915c90a7cd8c32cb0829984865e27246fa";
+        url = "http://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.2.tgz";
+        sha1 = "4f4b8271ffbb7aba543daf38bbc004f4f7f28da3";
       })
       (fetchurl {
         url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.1.0.tgz";
@@ -5662,12 +5914,28 @@
     passthru.names = [ "libyaml" ];
   };
   "libyaml" = self.full."libyaml"."*";
-  full."lockfile"."~0.4.0" = lib.makeOverridable self.buildNodePackage {
-    name = "lockfile-0.4.0";
+  full."lockfile"."~0.3.2" = lib.makeOverridable self.buildNodePackage {
+    name = "lockfile-0.3.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/lockfile/-/lockfile-0.4.0.tgz";
-        sha1 = "0f815a7ee7c3d603ddec6fbfa8a212b5645d54c5";
+        url = "http://registry.npmjs.org/lockfile/-/lockfile-0.3.4.tgz";
+        sha1 = "932b63546e4915f81b71924b36187740358eda03";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lockfile"."~0.3.2" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lockfile" ];
+  };
+  full."lockfile"."~0.4.0" = lib.makeOverridable self.buildNodePackage {
+    name = "lockfile-0.4.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lockfile/-/lockfile-0.4.2.tgz";
+        sha1 = "ab91f5d3745bc005ae4fa34d078910d1f2b9612d";
       })
     ];
     buildInputs =
@@ -5775,11 +6043,11 @@
     passthru.names = [ "lodash" ];
   };
   full."log4js"."~0.6.3" = lib.makeOverridable self.buildNodePackage {
-    name = "log4js-0.6.7";
+    name = "log4js-0.6.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/log4js/-/log4js-0.6.7.tgz";
-        sha1 = "9a9eaa28ee056071c7a628e629dde2e57362bb6f";
+        url = "http://registry.npmjs.org/log4js/-/log4js-0.6.8.tgz";
+        sha1 = "86baebdcaf8ef989295d65a07773f7e32093d0b6";
       })
     ];
     buildInputs =
@@ -6041,6 +6309,22 @@
     ];
     passthru.names = [ "mime" ];
   };
+  full."mime"."~1.2.11" = lib.makeOverridable self.buildNodePackage {
+    name = "mime-1.2.11";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
+        sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mime"."~1.2.11" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mime" ];
+  };
   full."mime"."~1.2.2" = lib.makeOverridable self.buildNodePackage {
     name = "mime-1.2.11";
     src = [
@@ -6331,6 +6615,22 @@
     ];
     passthru.names = [ "mkdirp" ];
   };
+  full."mkdirp"."0.3.4" = lib.makeOverridable self.buildNodePackage {
+    name = "mkdirp-0.3.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.4.tgz";
+        sha1 = "f8c81d213b7299a031f193a57d752a17d2f6c7d8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mkdirp"."0.3.4" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mkdirp" ];
+  };
   full."mkdirp"."0.3.5" = lib.makeOverridable self.buildNodePackage {
     name = "mkdirp-0.3.5";
     src = [
@@ -6468,6 +6768,22 @@
     passthru.names = [ "mocha" ];
   };
   "mocha" = self.full."mocha"."*";
+  full."moment"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "moment-2.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/moment/-/moment-2.0.0.tgz";
+        sha1 = "2bbc5b44c321837693ab6efcadbd46ed946211fe";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."moment"."2.0.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "moment" ];
+  };
   full."moment"."2.1.0" = lib.makeOverridable self.buildNodePackage {
     name = "moment-2.1.0";
     src = [
@@ -6485,11 +6801,11 @@
     passthru.names = [ "moment" ];
   };
   full."mongodb"."*" = lib.makeOverridable self.buildNodePackage {
-    name = "mongodb-1.3.18";
+    name = "mongodb-1.3.19";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.18.tgz";
-        sha1 = "9dd1ba4f6c2c04c014a9aabb8f194c1c0ee7da5d";
+        url = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.19.tgz";
+        sha1 = "f229db24098f019d86d135aaf8a1ab5f2658b1d4";
       })
     ];
     buildInputs =
@@ -6537,16 +6853,16 @@
     ];
     passthru.names = [ "mongodb" ];
   };
-  full."mongodb"."1.3.18" = lib.makeOverridable self.buildNodePackage {
-    name = "mongodb-1.3.18";
+  full."mongodb"."1.3.19" = lib.makeOverridable self.buildNodePackage {
+    name = "mongodb-1.3.19";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.18.tgz";
-        sha1 = "9dd1ba4f6c2c04c014a9aabb8f194c1c0ee7da5d";
+        url = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.19.tgz";
+        sha1 = "f229db24098f019d86d135aaf8a1ab5f2658b1d4";
       })
     ];
     buildInputs =
-      (self.nativeDeps."mongodb"."1.3.18" or []);
+      (self.nativeDeps."mongodb"."1.3.19" or []);
     deps = [
       self.full."bson"."0.2.2"
       self.full."kerberos"."0.0.3"
@@ -6556,25 +6872,25 @@
     passthru.names = [ "mongodb" ];
   };
   full."mongoose"."*" = lib.makeOverridable self.buildNodePackage {
-    name = "mongoose-3.7.2";
+    name = "mongoose-3.7.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mongoose/-/mongoose-3.7.2.tgz";
-        sha1 = "e7550bb44ce1eaa9fc78223360d43b2722caa258";
+        url = "http://registry.npmjs.org/mongoose/-/mongoose-3.7.3.tgz";
+        sha1 = "32c707bd919db3ae534326042be0b9ef9ee7ff57";
       })
     ];
     buildInputs =
       (self.nativeDeps."mongoose"."*" or []);
     deps = [
       self.full."hooks"."0.2.1"
-      self.full."mongodb"."1.3.18"
+      self.full."mongodb"."1.3.19"
       self.full."ms"."0.1.0"
       self.full."sliced"."0.0.5"
       self.full."muri"."0.3.1"
       self.full."mpromise"."0.3.0"
       self.full."mpath"."0.1.1"
       self.full."regexp-clone"."0.0.1"
-      self.full."mquery"."0.2.4"
+      self.full."mquery"."0.3.1"
     ];
     peerDependencies = [
     ];
@@ -6604,18 +6920,18 @@
     passthru.names = [ "mongoose" ];
   };
   full."mongoose"."3.6.x" = lib.makeOverridable self.buildNodePackage {
-    name = "mongoose-3.6.17";
+    name = "mongoose-3.6.18";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.17.tgz";
-        sha1 = "2f53a041fe28974f3e536aabd81dd4bb31e2abd0";
+        url = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.18.tgz";
+        sha1 = "cdf41325433ea795a1b3632ef1d7591db487d224";
       })
     ];
     buildInputs =
       (self.nativeDeps."mongoose"."3.6.x" or []);
     deps = [
       self.full."hooks"."0.2.1"
-      self.full."mongodb"."1.3.18"
+      self.full."mongodb"."1.3.19"
       self.full."ms"."0.1.0"
       self.full."sliced"."0.0.5"
       self.full."muri"."0.3.1"
@@ -6662,16 +6978,16 @@
     passthru.names = [ "mongoose-schema-extend" ];
   };
   "mongoose-schema-extend" = self.full."mongoose-schema-extend"."*";
-  full."monocle"."0.1.50" = lib.makeOverridable self.buildNodePackage {
-    name = "monocle-0.1.50";
+  full."monocle"."1.1.50" = lib.makeOverridable self.buildNodePackage {
+    name = "monocle-1.1.50";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/monocle/-/monocle-0.1.50.tgz";
-        sha1 = "9a7cbd0ccc10de95fd78a04b9beb2482ae4940b7";
+        url = "http://registry.npmjs.org/monocle/-/monocle-1.1.50.tgz";
+        sha1 = "e21b059d99726d958371f36240c106b8a067fa7d";
       })
     ];
     buildInputs =
-      (self.nativeDeps."monocle"."0.1.50" or []);
+      (self.nativeDeps."monocle"."1.1.50" or []);
     deps = [
       self.full."readdirp"."~0.2.3"
     ];
@@ -6745,16 +7061,16 @@
     ];
     passthru.names = [ "mpromise" ];
   };
-  full."mquery"."0.2.4" = lib.makeOverridable self.buildNodePackage {
-    name = "mquery-0.2.4";
+  full."mquery"."0.3.1" = lib.makeOverridable self.buildNodePackage {
+    name = "mquery-0.3.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mquery/-/mquery-0.2.4.tgz";
-        sha1 = "5d6e7f7f5129aa334e7e754d3f6a93cf304b7778";
+        url = "http://registry.npmjs.org/mquery/-/mquery-0.3.1.tgz";
+        sha1 = "b67051685b3ec71c9dc6d0ca41385297325c4c45";
       })
     ];
     buildInputs =
-      (self.nativeDeps."mquery"."0.2.4" or []);
+      (self.nativeDeps."mquery"."0.3.1" or []);
     deps = [
       self.full."sliced"."0.0.5"
       self.full."debug"."0.7.0"
@@ -6877,6 +7193,22 @@
     ];
     passthru.names = [ "mv" ];
   };
+  full."nan"."~0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "nan-0.3.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/nan/-/nan-0.3.1.tgz";
+        sha1 = "672523b3fbdbc8e73213dc1951b636e98b3b176f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."nan"."~0.3.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "nan" ];
+  };
   full."natural"."0.0.69" = lib.makeOverridable self.buildNodePackage {
     name = "natural-0.0.69";
     src = [
@@ -7099,6 +7431,35 @@
     passthru.names = [ "node-gyp" ];
   };
   "node-gyp" = self.full."node-gyp"."*";
+  full."node-gyp"."~0.10.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-gyp-0.10.9";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.9.tgz";
+        sha1 = "de5e20f75ee291975d67c105a5653b981bf8974f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."node-gyp"."~0.10.2" or []);
+    deps = [
+      self.full."glob"."3"
+      self.full."graceful-fs"."2"
+      self.full."fstream"."0"
+      self.full."minimatch"."0"
+      self.full."mkdirp"."0"
+      self.full."nopt"."2"
+      self.full."npmlog"."0"
+      self.full."osenv"."0"
+      self.full."request"."2"
+      self.full."rimraf"."2"
+      self.full."semver"."~2.1"
+      self.full."tar"."0"
+      self.full."which"."1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "node-gyp" ];
+  };
   full."node-gyp"."~0.10.9" = lib.makeOverridable self.buildNodePackage {
     name = "node-gyp-0.10.9";
     src = [
@@ -7412,11 +7773,11 @@
     passthru.names = [ "nopt" ];
   };
   full."normalize-package-data"."~0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "normalize-package-data-0.2.1";
+    name = "normalize-package-data-0.2.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.1.tgz";
-        sha1 = "6c13a4b7ab1bca0323265418d354666da2e5ad43";
+        url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.2.tgz";
+        sha1 = "9efde8d32a96e797ea61f8b4916e0f48a5ad83d9";
       })
     ];
     buildInputs =
@@ -7430,11 +7791,11 @@
     passthru.names = [ "normalize-package-data" ];
   };
   full."npm"."*" = lib.makeOverridable self.buildNodePackage {
-    name = "npm-1.3.8";
+    name = "npm-1.3.9";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npm/-/npm-1.3.8.tgz";
-        sha1 = "fe271a4ca2b7077d6e45c1ce2a29e905327dc4d8";
+        url = "http://registry.npmjs.org/npm/-/npm-1.3.9.tgz";
+        sha1 = "dbf815e1661845046e82105a705f8df1735bb1ee";
       })
     ];
     buildInputs =
@@ -7487,6 +7848,63 @@
     passthru.names = [ "npm" ];
   };
   "npm" = self.full."npm"."*";
+  full."npm"."1.3.1" = lib.makeOverridable self.buildNodePackage {
+    name = "npm-1.3.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/npm/-/npm-1.3.1.tgz";
+        sha1 = "c64f1c82362254cd4804a3dea5efbe6ec396460c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."npm"."1.3.1" or []);
+    deps = [
+      self.full."semver"."~2.0.8"
+      self.full."ini"."~1.1.0"
+      self.full."slide"."~1.1.4"
+      self.full."abbrev"."~1.0.4"
+      self.full."graceful-fs"."~1.2.2"
+      self.full."minimatch"."~0.2.12"
+      self.full."nopt"."~2.1.1"
+      self.full."rimraf"."~2.2.0"
+      self.full."request"."~2.21.0"
+      self.full."which"."1"
+      self.full."tar"."~0.1.17"
+      self.full."fstream"."~0.1.22"
+      self.full."block-stream"."*"
+      self.full."inherits"."1"
+      self.full."mkdirp"."~0.3.3"
+      self.full."read"."~1.0.4"
+      self.full."lru-cache"."~2.3.0"
+      self.full."node-gyp"."~0.10.2"
+      self.full."fstream-npm"."~0.1.3"
+      self.full."uid-number"."0"
+      self.full."archy"."0"
+      self.full."chownr"."0"
+      self.full."npmlog"."0.0.3"
+      self.full."ansi"."~0.1.2"
+      self.full."npm-registry-client"."~0.2.25"
+      self.full."read-package-json"."~1.1.0"
+      self.full."read-installed"."~0.2.2"
+      self.full."glob"."~3.2.1"
+      self.full."init-package-json"."0.0.10"
+      self.full."osenv"."0"
+      self.full."lockfile"."~0.3.2"
+      self.full."retry"."~0.6.0"
+      self.full."once"."~1.1.1"
+      self.full."npmconf"."~0.1.1"
+      self.full."opener"."~1.3.0"
+      self.full."chmodr"."~0.1.0"
+      self.full."cmd-shim"."~1.1.0"
+      self.full."sha"."~1.0.1"
+      self.full."editor"."0.0.4"
+      self.full."child-process-close"."~0.1.1"
+      self.full."npm-user-validate"."0.0.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "npm" ];
+  };
   full."npm-registry-client"."0.2.27" = lib.makeOverridable self.buildNodePackage {
     name = "npm-registry-client-0.2.27";
     src = [
@@ -7513,6 +7931,32 @@
     ];
     passthru.names = [ "npm-registry-client" ];
   };
+  full."npm-registry-client"."~0.2.25" = lib.makeOverridable self.buildNodePackage {
+    name = "npm-registry-client-0.2.28";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.28.tgz";
+        sha1 = "959141fc0180d7b1ad089e87015a8a2142a8bffc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."npm-registry-client"."~0.2.25" or []);
+    deps = [
+      self.full."request"."2 >=2.25.0"
+      self.full."graceful-fs"."~2.0.0"
+      self.full."semver"."~2.1.0"
+      self.full."slide"."~1.1.3"
+      self.full."chownr"."0"
+      self.full."mkdirp"."~0.3.3"
+      self.full."rimraf"."~2"
+      self.full."retry"."0.6.0"
+      self.full."couch-login"."~0.1.18"
+      self.full."npmlog"."*"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "npm-registry-client" ];
+  };
   full."npm-registry-client"."~0.2.28" = lib.makeOverridable self.buildNodePackage {
     name = "npm-registry-client-0.2.28";
     src = [
@@ -7625,6 +8069,30 @@
     ];
     passthru.names = [ "npmconf" ];
   };
+  full."npmconf"."~0.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "npmconf-0.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.2.tgz";
+        sha1 = "99af8122f0067802436a5b71dbf8c3539697e62c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."npmconf"."~0.1.1" or []);
+    deps = [
+      self.full."config-chain"."~1.1.1"
+      self.full."inherits"."~2.0.0"
+      self.full."once"."~1.1.1"
+      self.full."mkdirp"."~0.3.3"
+      self.full."osenv"."0.0.3"
+      self.full."nopt"."2"
+      self.full."semver"."2"
+      self.full."ini"."~1.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "npmconf" ];
+  };
   full."npmconf"."~0.1.2" = lib.makeOverridable self.buildNodePackage {
     name = "npmconf-0.1.2";
     src = [
@@ -7683,6 +8151,23 @@
     ];
     passthru.names = [ "npmlog" ];
   };
+  full."npmlog"."0.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "npmlog-0.0.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/npmlog/-/npmlog-0.0.3.tgz";
+        sha1 = "c424ad1531af402eef8da201fc3d63bdbd37dacb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."npmlog"."0.0.3" or []);
+    deps = [
+      self.full."ansi"."~0.1.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "npmlog" ];
+  };
   full."npmlog"."0.0.4" = lib.makeOverridable self.buildNodePackage {
     name = "npmlog-0.0.4";
     src = [
@@ -7950,6 +8435,23 @@
     ];
     passthru.names = [ "optimist" ];
   };
+  full."optimist"."~0.3.4" = lib.makeOverridable self.buildNodePackage {
+    name = "optimist-0.3.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz";
+        sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."optimist"."~0.3.4" or []);
+    deps = [
+      self.full."wordwrap"."~0.0.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "optimist" ];
+  };
   full."optimist"."~0.3.5" = lib.makeOverridable self.buildNodePackage {
     name = "optimist-0.3.7";
     src = [
@@ -8117,6 +8619,24 @@
     passthru.names = [ "passport" ];
   };
   "passport" = self.full."passport"."*";
+  full."passport"."0.1.17" = lib.makeOverridable self.buildNodePackage {
+    name = "passport-0.1.17";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/passport/-/passport-0.1.17.tgz";
+        sha1 = "2cd503be0d35f33a9726d00ad2654786643a23fc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."passport"."0.1.17" or []);
+    deps = [
+      self.full."pkginfo"."0.2.x"
+      self.full."pause"."0.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "passport" ];
+  };
   full."passport"."~0.1.1" = lib.makeOverridable self.buildNodePackage {
     name = "passport-0.1.17";
     src = [
@@ -8191,6 +8711,24 @@
     passthru.names = [ "passport-local" ];
   };
   "passport-local" = self.full."passport-local"."*";
+  full."passport-local"."0.1.6" = lib.makeOverridable self.buildNodePackage {
+    name = "passport-local-0.1.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/passport-local/-/passport-local-0.1.6.tgz";
+        sha1 = "fb0cf828048db931b67d19985c7aa06dd377a9db";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."passport-local"."0.1.6" or []);
+    deps = [
+      self.full."pkginfo"."0.2.x"
+      self.full."passport"."~0.1.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "passport-local" ];
+  };
   full."pause"."0.0.1" = lib.makeOverridable self.buildNodePackage {
     name = "pause-0.0.1";
     src = [
@@ -8665,6 +9203,25 @@
     passthru.names = [ "rbytes" ];
   };
   "rbytes" = self.full."rbytes"."*";
+  full."rc"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "rc-0.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/rc/-/rc-0.3.0.tgz";
+        sha1 = "caffdaafc17e8608e50db0c6ee63f1c344d9ac58";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."rc"."0.3.0" or []);
+    deps = [
+      self.full."optimist"."~0.3.4"
+      self.full."deep-extend"."~0.2.5"
+      self.full."ini"."~1.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "rc" ];
+  };
   full."read"."1" = lib.makeOverridable self.buildNodePackage {
     name = "read-1.0.5";
     src = [
@@ -9600,12 +10157,29 @@
     passthru.names = [ "s3http" ];
   };
   "s3http" = self.full."s3http"."*";
-  full."sax"."0.5.x" = lib.makeOverridable self.buildNodePackage {
-    name = "sax-0.5.4";
+  full."safefs"."~3.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "safefs-3.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/sax/-/sax-0.5.4.tgz";
-        sha1 = "a3a4e1a9cf182bb547156c5232a49a1c3732ff7d";
+        url = "http://registry.npmjs.org/safefs/-/safefs-3.0.1.tgz";
+        sha1 = "a4fd36bcd4805782f0d702e97b47323eafc94cb8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."safefs"."~3.0.1" or []);
+    deps = [
+      self.full."taskgroup".">=3 <3.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "safefs" ];
+  };
+  full."sax"."0.5.x" = lib.makeOverridable self.buildNodePackage {
+    name = "sax-0.5.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/sax/-/sax-0.5.5.tgz";
+        sha1 = "b1ec13d77397248d059bcc18bb9530d8210bb5d3";
       })
     ];
     buildInputs =
@@ -9617,11 +10191,11 @@
     passthru.names = [ "sax" ];
   };
   full."sax".">=0.4.2" = lib.makeOverridable self.buildNodePackage {
-    name = "sax-0.5.4";
+    name = "sax-0.5.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/sax/-/sax-0.5.4.tgz";
-        sha1 = "a3a4e1a9cf182bb547156c5232a49a1c3732ff7d";
+        url = "http://registry.npmjs.org/sax/-/sax-0.5.5.tgz";
+        sha1 = "b1ec13d77397248d059bcc18bb9530d8210bb5d3";
       })
     ];
     buildInputs =
@@ -9697,6 +10271,22 @@
     ];
     passthru.names = [ "semver" ];
   };
+  full."semver"."2.0.8" = lib.makeOverridable self.buildNodePackage {
+    name = "semver-2.0.8";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/semver/-/semver-2.0.8.tgz";
+        sha1 = "f5c28ba4a6d56bd1d9dbe34aed288d69366a73c6";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."semver"."2.0.8" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "semver" ];
+  };
   full."semver"."2.x" = lib.makeOverridable self.buildNodePackage {
     name = "semver-2.1.0";
     src = [
@@ -9793,6 +10383,22 @@
     ];
     passthru.names = [ "semver" ];
   };
+  full."semver"."~2.0.8" = lib.makeOverridable self.buildNodePackage {
+    name = "semver-2.0.11";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz";
+        sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."semver"."~2.0.8" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "semver" ];
+  };
   full."semver"."~2.1" = lib.makeOverridable self.buildNodePackage {
     name = "semver-2.1.0";
     src = [
@@ -9865,6 +10471,26 @@
     ];
     passthru.names = [ "send" ];
   };
+  full."send"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "send-0.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/send/-/send-0.1.1.tgz";
+        sha1 = "0bcfcbd03def6e2d8612e1abf8f4895b450c60c8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."send"."0.1.1" or []);
+    deps = [
+      self.full."debug"."*"
+      self.full."mime"."~1.2.9"
+      self.full."fresh"."0.1.0"
+      self.full."range-parser"."0.0.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "send" ];
+  };
   full."send"."0.1.4" = lib.makeOverridable self.buildNodePackage {
     name = "send-0.1.4";
     src = [
@@ -9933,12 +10559,29 @@
     ];
     passthru.names = [ "setimmediate" ];
   };
-  full."sha"."~1.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "sha-1.2.2";
+  full."sha"."~1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "sha-1.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/sha/-/sha-1.2.2.tgz";
-        sha1 = "f2aa387e8182631fd5f462bd80250d37a8920e62";
+        url = "http://registry.npmjs.org/sha/-/sha-1.0.1.tgz";
+        sha1 = "9b87a92113103e7406f7e7ef00006f3fa1975122";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."sha"."~1.0.1" or []);
+    deps = [
+      self.full."graceful-fs"."1.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "sha" ];
+  };
+  full."sha"."~1.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "sha-1.2.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/sha/-/sha-1.2.3.tgz";
+        sha1 = "3a96ef3054a0fe0b87c9aa985824a6a736fc0329";
       })
     ];
     buildInputs =
@@ -10017,11 +10660,11 @@
     passthru.names = [ "sigmund" ];
   };
   full."simplesmtp".">= 0.1.22" = lib.makeOverridable self.buildNodePackage {
-    name = "simplesmtp-0.3.7";
+    name = "simplesmtp-0.3.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.7.tgz";
-        sha1 = "2e5319c5dea8824be88d5dba9a6dc85551cad76b";
+        url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.8.tgz";
+        sha1 = "64bea183c9d95211e17e21e228a20312661def09";
       })
     ];
     buildInputs =
@@ -10246,6 +10889,26 @@
     ];
     passthru.names = [ "socket.io" ];
   };
+  full."socket.io"."0.9.16" = lib.makeOverridable self.buildNodePackage {
+    name = "socket.io-0.9.16";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.16.tgz";
+        sha1 = "3bab0444e49b55fbbc157424dbd41aa375a51a76";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."socket.io"."0.9.16" or []);
+    deps = [
+      self.full."socket.io-client"."0.9.16"
+      self.full."policyfile"."0.0.4"
+      self.full."base64id"."0.1.0"
+      self.full."redis"."0.7.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "socket.io" ];
+  };
   full."socket.io"."~0.9.13" = lib.makeOverridable self.buildNodePackage {
     name = "socket.io-0.9.16";
     src = [
@@ -10326,11 +10989,11 @@
   };
   "sockjs" = self.full."sockjs"."*";
   full."source-map"."*" = lib.makeOverridable self.buildNodePackage {
-    name = "source-map-0.1.28";
+    name = "source-map-0.1.29";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/source-map/-/source-map-0.1.28.tgz";
-        sha1 = "9cae9d9b8352fb030f77c4e12226cc28cb251f39";
+        url = "http://registry.npmjs.org/source-map/-/source-map-0.1.29.tgz";
+        sha1 = "39d571a0988fb7a548a676c4de72db78914d173c";
       })
     ];
     buildInputs =
@@ -10344,11 +11007,11 @@
   };
   "source-map" = self.full."source-map"."*";
   full."source-map"."~0.1.7" = lib.makeOverridable self.buildNodePackage {
-    name = "source-map-0.1.28";
+    name = "source-map-0.1.29";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/source-map/-/source-map-0.1.28.tgz";
-        sha1 = "9cae9d9b8352fb030f77c4e12226cc28cb251f39";
+        url = "http://registry.npmjs.org/source-map/-/source-map-0.1.29.tgz";
+        sha1 = "39d571a0988fb7a548a676c4de72db78914d173c";
       })
     ];
     buildInputs =
@@ -10394,6 +11057,23 @@
     ];
     passthru.names = [ "ssh-agent" ];
   };
+  full."ssh2"."0.2.8" = lib.makeOverridable self.buildNodePackage {
+    name = "ssh2-0.2.8";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ssh2/-/ssh2-0.2.8.tgz";
+        sha1 = "50acd6d7a7fb4da18ef4364737bb9a5066bf689d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ssh2"."0.2.8" or []);
+    deps = [
+      self.full."streamsearch"."0.1.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ssh2" ];
+  };
   full."stack-trace"."0.0.x" = lib.makeOverridable self.buildNodePackage {
     name = "stack-trace-0.0.7";
     src = [
@@ -10464,6 +11144,22 @@
     passthru.names = [ "stream-splitter-transform" ];
   };
   "stream-splitter-transform" = self.full."stream-splitter-transform"."*";
+  full."streamsearch"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "streamsearch-0.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz";
+        sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."streamsearch"."0.1.2" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "streamsearch" ];
+  };
   full."stringify-object"."~0.1.4" = lib.makeOverridable self.buildNodePackage {
     name = "stringify-object-0.1.5";
     src = [
@@ -10537,6 +11233,28 @@
     ];
     passthru.names = [ "sudo-block" ];
   };
+  full."superagent"."0.14.7" = lib.makeOverridable self.buildNodePackage {
+    name = "superagent-0.14.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/superagent/-/superagent-0.14.7.tgz";
+        sha1 = "5740625d9c6343381b03b2ff95a3c988415fc406";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."superagent"."0.14.7" or []);
+    deps = [
+      self.full."qs"."0.6.5"
+      self.full."formidable"."1.0.9"
+      self.full."mime"."1.2.5"
+      self.full."emitter-component"."1.0.0"
+      self.full."methods"."0.0.1"
+      self.full."cookiejar"."1.3.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "superagent" ];
+  };
   full."superagent"."0.15.1" = lib.makeOverridable self.buildNodePackage {
     name = "superagent-0.15.1";
     src = [
@@ -10751,6 +11469,42 @@
     ];
     passthru.names = [ "tar" ];
   };
+  full."taskgroup".">=3 <3.2" = lib.makeOverridable self.buildNodePackage {
+    name = "taskgroup-3.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/taskgroup/-/taskgroup-3.1.2.tgz";
+        sha1 = "81fec5dc7eb647fd5a0ba8ed02ee3a730244ca16";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."taskgroup".">=3 <3.2" or []);
+    deps = [
+      self.full."ambi"."~2.0.0"
+      self.full."eventemitter2"."~0.4.11"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "taskgroup" ];
+  };
+  full."taskgroup"."~3.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "taskgroup-3.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/taskgroup/-/taskgroup-3.1.2.tgz";
+        sha1 = "81fec5dc7eb647fd5a0ba8ed02ee3a730244ca16";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."taskgroup"."~3.1.1" or []);
+    deps = [
+      self.full."ambi"."~2.0.0"
+      self.full."eventemitter2"."~0.4.11"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "taskgroup" ];
+  };
   full."temp"."*" = lib.makeOverridable self.buildNodePackage {
     name = "temp-0.5.1";
     src = [
@@ -10769,6 +11523,38 @@
     passthru.names = [ "temp" ];
   };
   "temp" = self.full."temp"."*";
+  full."temp"."0.5.0" = lib.makeOverridable self.buildNodePackage {
+    name = "temp-0.5.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/temp/-/temp-0.5.0.tgz";
+        sha1 = "605fa983bcbed88bac99370bc5bf934678cb289e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."temp"."0.5.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "temp" ];
+  };
+  full."text-table"."~0.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "text-table-0.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/text-table/-/text-table-0.1.1.tgz";
+        sha1 = "9aa4347a39b6950cd24190264576f62db6e52d93";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."text-table"."~0.1.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "text-table" ];
+  };
   full."throttleit"."~0.0.2" = lib.makeOverridable self.buildNodePackage {
     name = "throttleit-0.0.2";
     src = [
@@ -10949,6 +11735,22 @@
     ];
     passthru.names = [ "tunnel-agent" ];
   };
+  full."typechecker"."~2.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "typechecker-2.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/typechecker/-/typechecker-2.0.1.tgz";
+        sha1 = "e18e99be60762c01bde38ef02f9a067ed887c454";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."typechecker"."~2.0.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "typechecker" ];
+  };
   full."uglify-js"."1.2.5" = lib.makeOverridable self.buildNodePackage {
     name = "uglify-js-1.2.5";
     src = [
@@ -11105,6 +11907,22 @@
     passthru.names = [ "underscore" ];
   };
   "underscore" = self.full."underscore"."*";
+  full."underscore"."1.4.4" = lib.makeOverridable self.buildNodePackage {
+    name = "underscore-1.4.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz";
+        sha1 = "61a6a32010622afa07963bf325203cf12239d604";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."underscore"."1.4.4" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "underscore" ];
+  };
   full."underscore"."1.4.x" = lib.makeOverridable self.buildNodePackage {
     name = "underscore-1.4.4";
     src = [
@@ -11201,6 +12019,41 @@
     ];
     passthru.names = [ "underscore.string" ];
   };
+  full."ungit"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "ungit-0.1.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ungit/-/ungit-0.1.6.tgz";
+        sha1 = "83c7aa319fea9201ae1b5ed43612303881b593d2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ungit"."*" or []);
+    deps = [
+      self.full."express"."3.2.6"
+      self.full."superagent"."0.14.7"
+      self.full."underscore"."1.4.4"
+      self.full."temp"."0.5.0"
+      self.full."watchr"."2.4.3"
+      self.full."socket.io"."0.9.16"
+      self.full."moment"."2.0.0"
+      self.full."async"."0.2.9"
+      self.full."ssh2"."0.2.8"
+      self.full."rc"."0.3.0"
+      self.full."uuid"."1.4.1"
+      self.full."winston"."0.7.1"
+      self.full."passport"."0.1.17"
+      self.full."passport-local"."0.1.6"
+      self.full."npm"."1.3.1"
+      self.full."semver"."2.0.8"
+      self.full."forever-monitor"."1.1.0"
+      self.full."open"."0.0.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ungit" ];
+  };
+  "ungit" = self.full."ungit"."*";
   full."unzip"."~0.1.7" = lib.makeOverridable self.buildNodePackage {
     name = "unzip-0.1.8";
     src = [
@@ -11365,6 +12218,22 @@
     ];
     passthru.names = [ "utile" ];
   };
+  full."uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "uuid-1.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/uuid/-/uuid-1.4.1.tgz";
+        sha1 = "a337828580d426e375b8ee11bd2bf901a596e0b8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."uuid"."1.4.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "uuid" ];
+  };
   full."validator"."0.4.x" = lib.makeOverridable self.buildNodePackage {
     name = "validator-0.4.28";
     src = [
@@ -11535,6 +12404,28 @@
     ];
     passthru.names = [ "watch" ];
   };
+  full."watchr"."2.4.3" = lib.makeOverridable self.buildNodePackage {
+    name = "watchr-2.4.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/watchr/-/watchr-2.4.3.tgz";
+        sha1 = "b7e32fc1cc7a730043a73b3fc6559ad2283af79e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."watchr"."2.4.3" or []);
+    deps = [
+      self.full."bal-util"."~2.0.0"
+      self.full."typechecker"."~2.0.1"
+      self.full."extendr"."~2.0.1"
+      self.full."eachr"."~2.0.2"
+      self.full."safefs"."~3.0.1"
+      self.full."taskgroup"."~3.1.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "watchr" ];
+  };
   full."websocket-driver".">=0.2.0" = lib.makeOverridable self.buildNodePackage {
     name = "websocket-driver-0.2.2";
     src = [
@@ -11760,17 +12651,18 @@
     passthru.names = [ "wordwrap" ];
   };
   full."ws"."0.4.x" = lib.makeOverridable self.buildNodePackage {
-    name = "ws-0.4.28";
+    name = "ws-0.4.29";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/ws/-/ws-0.4.28.tgz";
-        sha1 = "03bcea020195847d1184c6c08f45baaf12322eee";
+        url = "http://registry.npmjs.org/ws/-/ws-0.4.29.tgz";
+        sha1 = "4b79ef62b4f3f782a05ba56b41b122d1252d4f90";
       })
     ];
     buildInputs =
       (self.nativeDeps."ws"."0.4.x" or []);
     deps = [
       self.full."commander"."~0.6.1"
+      self.full."nan"."~0.3.0"
       self.full."tinycolor"."0.x"
       self.full."options".">=0.0.5"
     ];
@@ -11941,20 +12833,20 @@
     ];
     passthru.names = [ "yeoman-generator" ];
   };
-  full."yeoman-generator"."~0.12.0" = lib.makeOverridable self.buildNodePackage {
-    name = "yeoman-generator-0.12.3";
+  full."yeoman-generator"."~0.13.0" = lib.makeOverridable self.buildNodePackage {
+    name = "yeoman-generator-0.13.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.12.3.tgz";
-        sha1 = "a11288e7ed11c46efd816b268eeea96acd960d1f";
+        url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.13.3.tgz";
+        sha1 = "5e0f0a74d6ebb61e72689d446404c200e915d14c";
       })
     ];
     buildInputs =
-      (self.nativeDeps."yeoman-generator"."~0.12.0" or []);
+      (self.nativeDeps."yeoman-generator"."~0.13.0" or []);
     deps = [
       self.full."cheerio"."~0.12.0"
-      self.full."request"."~2.21.0"
-      self.full."rimraf"."~2.1.4"
+      self.full."request"."~2.25.0"
+      self.full."rimraf"."~2.2.0"
       self.full."tar"."~0.1.17"
       self.full."diff"."~1.0.4"
       self.full."mime"."~1.2.9"
@@ -11962,8 +12854,6 @@
       self.full."lodash"."~1.3.0"
       self.full."mkdirp"."~0.3.5"
       self.full."glob"."~3.2.0"
-      self.full."nopt"."~2.1.1"
-      self.full."cli-table"."~0.2.0"
       self.full."debug"."~0.7.2"
       self.full."isbinaryfile"."~0.1.8"
       self.full."dargs"."~0.1.0"
@@ -11971,25 +12861,28 @@
       self.full."inquirer"."~0.2.0"
       self.full."iconv-lite"."~0.2.10"
       self.full."shelljs"."~0.1.4"
+      self.full."findup-sync"."~0.1.2"
+      self.full."chalk"."~0.2.0"
+      self.full."text-table"."~0.1.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "yeoman-generator" ];
   };
-  full."yeoman-generator"."~0.12.3" = lib.makeOverridable self.buildNodePackage {
-    name = "yeoman-generator-0.12.3";
+  full."yeoman-generator"."~0.13.1" = lib.makeOverridable self.buildNodePackage {
+    name = "yeoman-generator-0.13.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.12.3.tgz";
-        sha1 = "a11288e7ed11c46efd816b268eeea96acd960d1f";
+        url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.13.3.tgz";
+        sha1 = "5e0f0a74d6ebb61e72689d446404c200e915d14c";
       })
     ];
     buildInputs =
-      (self.nativeDeps."yeoman-generator"."~0.12.3" or []);
+      (self.nativeDeps."yeoman-generator"."~0.13.1" or []);
     deps = [
       self.full."cheerio"."~0.12.0"
-      self.full."request"."~2.21.0"
-      self.full."rimraf"."~2.1.4"
+      self.full."request"."~2.25.0"
+      self.full."rimraf"."~2.2.0"
       self.full."tar"."~0.1.17"
       self.full."diff"."~1.0.4"
       self.full."mime"."~1.2.9"
@@ -11997,8 +12890,6 @@
       self.full."lodash"."~1.3.0"
       self.full."mkdirp"."~0.3.5"
       self.full."glob"."~3.2.0"
-      self.full."nopt"."~2.1.1"
-      self.full."cli-table"."~0.2.0"
       self.full."debug"."~0.7.2"
       self.full."isbinaryfile"."~0.1.8"
       self.full."dargs"."~0.1.0"
@@ -12006,23 +12897,62 @@
       self.full."inquirer"."~0.2.0"
       self.full."iconv-lite"."~0.2.10"
       self.full."shelljs"."~0.1.4"
+      self.full."findup-sync"."~0.1.2"
+      self.full."chalk"."~0.2.0"
+      self.full."text-table"."~0.1.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "yeoman-generator" ];
+  };
+  full."yeoman-generator"."~0.13.2" = lib.makeOverridable self.buildNodePackage {
+    name = "yeoman-generator-0.13.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.13.3.tgz";
+        sha1 = "5e0f0a74d6ebb61e72689d446404c200e915d14c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."yeoman-generator"."~0.13.2" or []);
+    deps = [
+      self.full."cheerio"."~0.12.0"
+      self.full."request"."~2.25.0"
+      self.full."rimraf"."~2.2.0"
+      self.full."tar"."~0.1.17"
+      self.full."diff"."~1.0.4"
+      self.full."mime"."~1.2.9"
+      self.full."underscore.string"."~2.3.1"
+      self.full."lodash"."~1.3.0"
+      self.full."mkdirp"."~0.3.5"
+      self.full."glob"."~3.2.0"
+      self.full."debug"."~0.7.2"
+      self.full."isbinaryfile"."~0.1.8"
+      self.full."dargs"."~0.1.0"
+      self.full."async"."~0.2.8"
+      self.full."inquirer"."~0.2.0"
+      self.full."iconv-lite"."~0.2.10"
+      self.full."shelljs"."~0.1.4"
+      self.full."findup-sync"."~0.1.2"
+      self.full."chalk"."~0.2.0"
+      self.full."text-table"."~0.1.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "yeoman-generator" ];
   };
   full."yo"."*" = lib.makeOverridable self.buildNodePackage {
-    name = "yo-1.0.0-rc.1.4";
+    name = "yo-1.0.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/yo/-/yo-1.0.0-rc.1.4.tgz";
-        sha1 = "9c416c7006e94e756eb52a7a6884127b41f62ca6";
+        url = "http://registry.npmjs.org/yo/-/yo-1.0.3.tgz";
+        sha1 = "7235b66201eb66e523204a463a0ed2cf3c2ee45b";
       })
     ];
     buildInputs =
       (self.nativeDeps."yo"."*" or []);
     deps = [
-      self.full."yeoman-generator"."~0.12.3"
+      self.full."yeoman-generator"."~0.13.2"
       self.full."nopt"."~2.1.1"
       self.full."lodash"."~1.3.1"
       self.full."update-notifier"."~0.1.3"
@@ -12040,17 +12970,17 @@
   };
   "yo" = self.full."yo"."*";
   full."yo".">=1.0.0-rc.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "yo-1.0.0-rc.1.4";
+    name = "yo-1.0.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/yo/-/yo-1.0.0-rc.1.4.tgz";
-        sha1 = "9c416c7006e94e756eb52a7a6884127b41f62ca6";
+        url = "http://registry.npmjs.org/yo/-/yo-1.0.3.tgz";
+        sha1 = "7235b66201eb66e523204a463a0ed2cf3c2ee45b";
       })
     ];
     buildInputs =
       (self.nativeDeps."yo".">=1.0.0-rc.1.1" or []);
     deps = [
-      self.full."yeoman-generator"."~0.12.3"
+      self.full."yeoman-generator"."~0.13.2"
       self.full."nopt"."~2.1.1"
       self.full."lodash"."~1.3.1"
       self.full."update-notifier"."~0.1.3"

From 952aa0e71934b40ced4042f4dabf34ca84c929f4 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sun, 25 Aug 2013 01:01:13 +0300
Subject: [PATCH 115/452] KDE: we don't really support anything but Linux right
 now, so no reason to have all those evaluation errors.

---
 pkgs/desktops/kde-4.10/kde-package/default.nix | 3 ++-
 pkgs/desktops/kde-4.10/l10n/default.nix        | 3 ++-
 pkgs/desktops/kde-4.11/kde-package/default.nix | 3 ++-
 pkgs/desktops/kde-4.11/l10n/default.nix        | 3 ++-
 pkgs/desktops/kde-4.8/kde-package/default.nix  | 3 ++-
 pkgs/desktops/kde-4.8/l10n/default.nix         | 3 ++-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/kde-4.10/kde-package/default.nix b/pkgs/desktops/kde-4.10/kde-package/default.nix
index cd2860920d6..8a6e8e16751 100644
--- a/pkgs/desktops/kde-4.10/kde-package/default.nix
+++ b/pkgs/desktops/kde-4.10/kde-package/default.nix
@@ -19,7 +19,8 @@ rec {
   # Default meta attribute
   defMeta = {
     homepage = http://www.kde.org;
-    inherit (qt4.meta) platforms maintainers;
+    platforms = stdenv.lib.platforms.linux;
+    inherit (qt4.meta) maintainers;
   };
 
   # KDE package built from the whole tarball
diff --git a/pkgs/desktops/kde-4.10/l10n/default.nix b/pkgs/desktops/kde-4.10/l10n/default.nix
index 57d41fb35bf..c9fab80bffb 100644
--- a/pkgs/desktops/kde-4.10/l10n/default.nix
+++ b/pkgs/desktops/kde-4.10/l10n/default.nix
@@ -23,7 +23,8 @@ let
       meta = {
         description = "KDE translation for ${lang}";
         license = "GPL";
-        inherit (kdelibs.meta) maintainers platforms homepage;
+        platforms = stdenv.lib.platforms.linux;
+        inherit (kdelibs.meta) maintainers homepage;
       };
     };
 
diff --git a/pkgs/desktops/kde-4.11/kde-package/default.nix b/pkgs/desktops/kde-4.11/kde-package/default.nix
index cd2860920d6..8a6e8e16751 100644
--- a/pkgs/desktops/kde-4.11/kde-package/default.nix
+++ b/pkgs/desktops/kde-4.11/kde-package/default.nix
@@ -19,7 +19,8 @@ rec {
   # Default meta attribute
   defMeta = {
     homepage = http://www.kde.org;
-    inherit (qt4.meta) platforms maintainers;
+    platforms = stdenv.lib.platforms.linux;
+    inherit (qt4.meta) maintainers;
   };
 
   # KDE package built from the whole tarball
diff --git a/pkgs/desktops/kde-4.11/l10n/default.nix b/pkgs/desktops/kde-4.11/l10n/default.nix
index 57d41fb35bf..c9fab80bffb 100644
--- a/pkgs/desktops/kde-4.11/l10n/default.nix
+++ b/pkgs/desktops/kde-4.11/l10n/default.nix
@@ -23,7 +23,8 @@ let
       meta = {
         description = "KDE translation for ${lang}";
         license = "GPL";
-        inherit (kdelibs.meta) maintainers platforms homepage;
+        platforms = stdenv.lib.platforms.linux;
+        inherit (kdelibs.meta) maintainers homepage;
       };
     };
 
diff --git a/pkgs/desktops/kde-4.8/kde-package/default.nix b/pkgs/desktops/kde-4.8/kde-package/default.nix
index cd2860920d6..8a6e8e16751 100644
--- a/pkgs/desktops/kde-4.8/kde-package/default.nix
+++ b/pkgs/desktops/kde-4.8/kde-package/default.nix
@@ -19,7 +19,8 @@ rec {
   # Default meta attribute
   defMeta = {
     homepage = http://www.kde.org;
-    inherit (qt4.meta) platforms maintainers;
+    platforms = stdenv.lib.platforms.linux;
+    inherit (qt4.meta) maintainers;
   };
 
   # KDE package built from the whole tarball
diff --git a/pkgs/desktops/kde-4.8/l10n/default.nix b/pkgs/desktops/kde-4.8/l10n/default.nix
index 57d41fb35bf..c9fab80bffb 100644
--- a/pkgs/desktops/kde-4.8/l10n/default.nix
+++ b/pkgs/desktops/kde-4.8/l10n/default.nix
@@ -23,7 +23,8 @@ let
       meta = {
         description = "KDE translation for ${lang}";
         license = "GPL";
-        inherit (kdelibs.meta) maintainers platforms homepage;
+        platforms = stdenv.lib.platforms.linux;
+        inherit (kdelibs.meta) maintainers homepage;
       };
     };
 

From cf9a8f5d257c02001295906306d59211597abe9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 25 Aug 2013 10:55:15 +0200
Subject: [PATCH 116/452] getmail: 4.20.0 -> 4.42.0

---
 pkgs/tools/networking/getmail/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix
index 147a9673abf..06e7789eca3 100644
--- a/pkgs/tools/networking/getmail/default.nix
+++ b/pkgs/tools/networking/getmail/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, buildPythonPackage }:
 
 buildPythonPackage rec {
-  name = "getmail-4.20.0";
+  name = "getmail-4.42.0";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz";
-    sha256 = "17cpyra61virk1d223w8pdwhv2qzhbwdbnrr1ab1znf4cv9m3knn";
+    sha256 = "0n6sxp8vwa19ffr7bagzwp0hvxfjiy43xpz9sa1qmsyjs7c3xdqj";
   };
 
   doCheck = false;
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   
   meta = {
     description = "A program for retrieving mail";
-    maintainers = [ stdenv.lib.maintainers.raskin ];
+    maintainers = [ stdenv.lib.maintainers.raskin stdenv.lib.maintainers.iElectric ];
     platforms = stdenv.lib.platforms.linux;
   };
 }

From 75d8d312e87cdce2d69d6167d3963a3d85b5d8a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 25 Aug 2013 10:55:33 +0200
Subject: [PATCH 117/452] add ungit to node-packages.json

---
 pkgs/top-level/node-packages.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index 3e21fd62865..05892068dc8 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -74,6 +74,7 @@
 , "generator-angular"
 , "statsd"
 , "karma"
+, "ungit"
 , { "node-uptime": "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" }
 , { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " }
 ]

From 61021c57393138b3e9f7d587c3751ea1c362bc39 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 24 Aug 2013 18:35:44 +0200
Subject: [PATCH 118/452] bbswitch: upgrade to 0.7

---
 pkgs/os-specific/linux/bbswitch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix
index 692ec0df5bd..675fe7695af 100644
--- a/pkgs/os-specific/linux/bbswitch/default.nix
+++ b/pkgs/os-specific/linux/bbswitch/default.nix
@@ -2,7 +2,7 @@
 
 let
   baseName = "bbswitch";
-  version = "0.6";
+  version = "0.7";
   name = "${baseName}-${version}-${kernelDev.version}";
 
 in
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://github.com/Bumblebee-Project/${baseName}/archive/v${version}.tar.gz";
-    sha256 = "1y1wggfrlpxybz5cvrbvvpqa2hh6ncazzdlg9c94sx40n6p5dcf4";
+    sha256 = "0na6gfnvmp5fjbm430ms342hmrsbr6cf78n6hldqb8js2ry3f8dw";
   };
 
   preBuild = ''

From c9318f4d2d28d9716699c92280eccb4f12638aef Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 25 Aug 2013 09:49:20 +0200
Subject: [PATCH 119/452] calibre: upgrade to 1.0

Upstream insists on using private qt headers.
We do not want nixpkgs' qt to export those.
So I provided a small hack to take them directly from qt's source tarball.
I made sure everything uses the normal system qt and headers, except for the
1 .so file (qt_hack) that needs these private headers.

Because of this, there is barely any increate in size or buildtime.
---
 pkgs/applications/misc/calibre/default.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 01060909f3d..559a4d3ea0b 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -4,24 +4,31 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-0.9.11";
+  name = "calibre-1.0.0";
   # 0.9.12+ versions won't build due to missing qt4 private headers: https://bugs.launchpad.net/calibre/+bug/1094719
 
   src = fetchurl {
     url = "mirror://sourceforge/calibre/${name}.tar.xz";
-    sha256 = "0jjs2cx222pbv4nrivlxag5fxa0v9m63x7arcll6xi173zdn4gg8";
+    sha256 = "0qz369n46ijk8jbbgwnvj3v0byp5npn2zdb4lvc6mwa143mr6d62";
   };
 
   inherit python;
 
   nativeBuildInputs = [ makeWrapper pkgconfig ];
 
+  patchPhase = ''
+    tar xf ${qt48.src}
+    sed -i setup/build_environment.py \
+        -e "s|^qt_private_inc = .*|qt_private_inc = ['%s/%s'%('`pwd`/qt-everywhere-opensource-src-4.8.5/include', m) for m in ('QtGui', 'QtCore')]|"
+  '';
+
   buildInputs =
     [ python pyqt4 sip popplerQt4 libpng imagemagick libjpeg
-      fontconfig podofo qt48 pil chmlib icu
+      fontconfig podofo qt48 pil chmlib icu sqlite libusb1 libmtp
       pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil
       pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.pillow
-      pythonPackages.sqlite3 pythonPackages.netifaces sqlite libusb1 libmtp
+      pythonPackages.sqlite3 pythonPackages.netifaces pythonPackages.apsw
+      pythonPackages.cssselect
     ];
 
   installPhase = ''

From 4326c0631960119f720adbdc3a4142a26dd4f7aa Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 25 Aug 2013 18:15:19 +0200
Subject: [PATCH 120/452] calibre: fix for chroot builds (probably)

---
 pkgs/applications/misc/calibre/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 559a4d3ea0b..0987f961baf 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   patchPhase = ''
     tar xf ${qt48.src}
     sed -i setup/build_environment.py \
-        -e "s|^qt_private_inc = .*|qt_private_inc = ['%s/%s'%('`pwd`/qt-everywhere-opensource-src-4.8.5/include', m) for m in ('QtGui', 'QtCore')]|"
+        -e "s|^qt_private_inc = .*|qt_private_inc = ['../qt-everywhere-opensource-src-4.8.5/include/%s'%(m) for m in ('QtGui', 'QtCore')]|"
   '';
 
   buildInputs =

From 378f94f5da54902e3be358e8524086e2f5e346ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 25 Aug 2013 18:41:35 +0200
Subject: [PATCH 121/452] samba: install libnss_{wins,winbind}.so

This is the first step to get WINS/NetBIOS name lookup with nsswitch.
---
 pkgs/servers/samba/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix
index 8b58bd8d2a2..dacfa75181f 100644
--- a/pkgs/servers/samba/default.nix
+++ b/pkgs/servers/samba/default.nix
@@ -68,6 +68,8 @@ stdenv.mkDerivation rec {
       ln -sv ../../../bin/smbspool $out/lib/cups/backend/smb
       mkdir -pv $out/etc/openldap/schema
       cp ../examples/LDAP/samba.schema $out/etc/openldap/schema
+      cp -v ../nsswitch/libnss_wins.so "$out/lib"
+      cp -v ../nsswitch/libnss_winbind.so "$out/lib"
     '' # */
     + stdenv.lib.optionalString (configDir == "") "touch $out/lib/smb.conf";
 

From 93c4fd2855e12abd2c2720d2c4b05844a2d32291 Mon Sep 17 00:00:00 2001
From: Matej Cotman <cotman.matej@gmail.com>
Date: Thu, 22 Aug 2013 21:50:19 +0200
Subject: [PATCH 122/452] vte: patch for alt key (close #858)

Edit (vcunat): bump to latest version supporting gtk2.
---
 pkgs/desktops/gnome-2/desktop/vte/alt.patch   | 50 +++++++++++++++++++
 pkgs/desktops/gnome-2/desktop/vte/default.nix | 10 ++--
 2 files changed, 56 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/desktops/gnome-2/desktop/vte/alt.patch

diff --git a/pkgs/desktops/gnome-2/desktop/vte/alt.patch b/pkgs/desktops/gnome-2/desktop/vte/alt.patch
new file mode 100644
index 00000000000..65c3ddf1fcf
--- /dev/null
+++ b/pkgs/desktops/gnome-2/desktop/vte/alt.patch
@@ -0,0 +1,50 @@
+From a9d6a34708f846952f423d078397352858f7b1a4 Mon Sep 17 00:00:00 2001
+From: Christian Persch <chpe@gnome.org>
+Date: Sat, 12 May 2012 18:48:05 +0200
+Subject: [PATCH] keymap: Treat ALT as META
+
+https://bugzilla.gnome.org/show_bug.cgi?id=663779
+---
+ src/vte.c |   23 ++++++++++++++---------
+ 1 files changed, 14 insertions(+), 9 deletions(-)
+
+diff --git a/src/vte.c b/src/vte.c
+index dd27e9a..0657921 100644
+--- a/src/vte.c
++++ b/src/vte.c
+@@ -5170,19 +5170,24 @@ static void
+ vte_terminal_read_modifiers (VteTerminal *terminal,
+ 			     GdkEvent *event)
+ {
++        GdkKeymap *keymap;
+ 	GdkModifierType modifiers;
+ 
+ 	/* Read the modifiers. */
+-	if (gdk_event_get_state((GdkEvent*)event, &modifiers)) {
+-		GdkKeymap *keymap;
+-#if GTK_CHECK_VERSION (2, 90, 8)
+-                keymap = gdk_keymap_get_for_display(gdk_window_get_display(((GdkEventAny*)event)->window));
+-#else
+-                keymap = gdk_keymap_get_for_display(gdk_drawable_get_display(((GdkEventAny*)event)->window));
++	if (!gdk_event_get_state((GdkEvent*)event, &modifiers))
++                return;
++
++        keymap = gdk_keymap_get_for_display(gdk_window_get_display(((GdkEventAny*)event)->window));
++
++        gdk_keymap_add_virtual_modifiers (keymap, &modifiers);
++
++#if 1
++        /* HACK! Treat ALT as META; see bug #663779. */
++        if (modifiers & GDK_MOD1_MASK)
++                modifiers |= VTE_META_MASK;
+ #endif
+-                gdk_keymap_add_virtual_modifiers (keymap, &modifiers);
+-		terminal->pvt->modifiers = modifiers;
+-	}
++
++        terminal->pvt->modifiers = modifiers;
+ }
+ 
+ /* Read and handle a keypress event. */
+-- 
+1.7.5.1.217.g4e3aa.dirty
\ No newline at end of file
diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix
index 00072657e06..e9928aa73cf 100644
--- a/pkgs/desktops/gnome-2/desktop/vte/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix
@@ -2,16 +2,18 @@
 , pythonSupport ? false, python, pygtk}:
 
 stdenv.mkDerivation rec {
-  name = "vte-0.28.0";
-  
+  name = "vte-0.28.2";
+
   src = fetchurl {
     url = "mirror://gnome/sources/vte/0.28/${name}.tar.bz2";
-    sha256 = "0blmblvjr35xajr0a07zcd58lk6x2hzympx17biw2mcym9kcarql";
+    sha256 = "00zrip28issgmz2cqk5k824cbqpbixi5x7k88zxksdqpnq1f414d";
   };
 
+  patches = [ ./alt.patch ];
+
   buildInputs = [ intltool pkgconfig glib gtk ncurses ] ++
                 stdenv.lib.optionals pythonSupport [python pygtk];
-                
+
   configureFlags = ''
     ${if pythonSupport then "--enable-python" else "--disable-python"}
   '';

From a0192e3d0e1e166afe10a31db01f251d19512f39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 25 Aug 2013 19:54:02 +0200
Subject: [PATCH 123/452] poppler: update

Tested by running evince.
---
 pkgs/development/libraries/poppler/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index c5bf80b5ca3..95d34520802 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -4,14 +4,14 @@
 }:
 
 let
-  version = "0.22.5"; # even major numbers are stable
-  sha256 = "0678frlr39xvrbva490hk0mqyfnx3bk7i5pma8j6hjmzy68a6hpp";
+  version = "0.24.0"; # even major numbers are stable
+  sha256 = "088cdl6gb724aihibmj7yqp7x6mzdkxpjnklw35qwgwackm1gidx";
 
   qtcairo_patches =
     let qtcairo = fetchgit { # the version for poppler-0.22
       url = "git://github.com/giddie/poppler-qt4-cairo-backend.git";
-      rev = "7a12c58e5cefc2b7a5179c53b387fca8963195c0";
-      sha256 = "1jg2d5y62d0bv206nijb63x426zfb2awy70505nx22d0fx1v1p9k";
+      rev = "ad9a9ba0628df33522f4b7722cb0cd027269babe";
+      sha256 = "072p7x9902avg2r1ma5br97q8nm8sbk19y0qi4b4g9x2xj2fpajq";
     }; in
       [ "${qtcairo}/0001-Cairo-backend-added-to-Qt4-wrapper.patch"
         "${qtcairo}/0002-Setting-default-Qt4-backend-to-Cairo.patch"
@@ -22,7 +22,7 @@ let
     name = "poppler-${nameSuff}-${version}";
 
     src = fetchurl {
-      url = "${meta.homepage}/poppler-${version}.tar.gz";
+      url = "${meta.homepage}/poppler-${version}.tar.xz";
       inherit sha256;
     };
 

From efcffe61e49a827de02c3f82ff3d18684f1d96ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 25 Aug 2013 20:42:51 +0200
Subject: [PATCH 124/452] eagle: bump version 6.4.0 -> 6.5.0

And name the desktop file "eagle.desktop", not "Eagle.desktop". The user
facing application name is still "Eagle"; it has nothing to do with the
name of the desktop file.
---
 pkgs/applications/science/electronics/eagle/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/electronics/eagle/default.nix b/pkgs/applications/science/electronics/eagle/default.nix
index 04c9a9b79ec..8693e45ce10 100644
--- a/pkgs/applications/science/electronics/eagle/default.nix
+++ b/pkgs/applications/science/electronics/eagle/default.nix
@@ -13,15 +13,15 @@ in
 
 stdenv.mkDerivation rec {
   name = "eagle-${version}";
-  version = "6.4.0";
+  version = "6.5.0";
 
   src = fetchurl {
-    url = "ftp://ftp.cadsoft.de/eagle/program/6.4/eagle-lin-${version}.run";
-    sha256 = "0jb44dsq4cl9rx5nam6rxsw9fsmm6fsksv9s544p2zrwnad2x2i8";
+    url = "ftp://ftp.cadsoft.de/eagle/program/6.5/eagle-lin-${version}.run";
+    sha256 = "17plwx2p8q2ylk0nzj5crfbdm7jc35pw7v3j8f4j81yl37l7bj22";
   };
 
   desktopItem = makeDesktopItem {
-    name = "Eagle";
+    name = "eagle";
     exec = "eagle";
     icon = "eagle";
     comment = "Schematic capture and PCB layout";

From 9d530a48fa0a8c726d0b37b667c059166cf05ddf Mon Sep 17 00:00:00 2001
From: Gergely Risko <gergely@risko.hu>
Date: Sun, 25 Aug 2013 21:42:46 +0200
Subject: [PATCH 125/452] Add lens-datetime haskell library

---
 .../libraries/haskell/lens-datetime/default.nix    | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/lens-datetime/default.nix

diff --git a/pkgs/development/libraries/haskell/lens-datetime/default.nix b/pkgs/development/libraries/haskell/lens-datetime/default.nix
new file mode 100644
index 00000000000..b1a472dfc7c
--- /dev/null
+++ b/pkgs/development/libraries/haskell/lens-datetime/default.nix
@@ -0,0 +1,14 @@
+{ cabal, lens, time }:
+
+cabal.mkDerivation (self: {
+  pname = "lens-datetime";
+  version = "0.1.1";
+  sha256 = "0p93211ibq1rkh4aj69xdwan0338k35vb5qyf7zp761nghnk3d47";
+  buildDepends = [ lens time ];
+  meta = {
+    homepage = "http://github.com/klao/lens-datetime";
+    description = "Lenses for Data.Time.* types";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index bb946f2a8b1..7713c63c818 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1338,6 +1338,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   lens = callPackage ../development/libraries/haskell/lens {};
 
+  lensDatetime = callPackage ../development/libraries/haskell/lens-datetime {};
+
   lenses = callPackage ../development/libraries/haskell/lenses {};
 
   libffi = callPackage ../development/libraries/haskell/libffi {

From b0fd3c79f72ff2a705572c93abb3d4cbf5702f7a Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sun, 25 Aug 2013 21:56:36 +0200
Subject: [PATCH 126/452] pypi2nix: updated

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 59707c58de8..2a8bc3038e9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7014,13 +7014,13 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 } // pkgs.lib.optionalAttrs (python.majorVersion == "2.7") {
 
   pypi2nix = pythonPackages.buildPythonPackage rec {
-    rev = "e231db7e8874d4543a6f0fffc46c0fffbe6108c5";
+    rev = "e85eb9e75e7290c17e89822d6a5c1c52c1b59269";
     name = "pypi2nix-1.0_${rev}";
 
     src = pkgs.fetchurl {
       url = "https://github.com/garbas/pypi2nix/tarball/${rev}";
       name = "${name}.tar.bz";
-      sha256 = "0wqk6milnagr0b0v8igjp8p25d5y63pki3pkdy7hbgjxvyw8wril";
+      sha256 = "0wk9019pgpc2467819cz98fdvihjkpihlh1yywfxlvn04ymb315q";
     };
 
     propagatedBuildInputs = [ pythonPackages."Distutils2-1.0a4" ];

From dd51b431649e17c94ba3a79d1455428a1fec2758 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sun, 25 Aug 2013 21:57:10 +0200
Subject: [PATCH 127/452] Plone: fixed Pillow

---
 pkgs/top-level/python-packages-generated.nix | 284 +------------------
 pkgs/top-level/python-packages.json          |  17 ++
 2 files changed, 32 insertions(+), 269 deletions(-)

diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix
index 6a8f080ccac..ff86757c979 100644
--- a/pkgs/top-level/python-packages-generated.nix
+++ b/pkgs/top-level/python-packages-generated.nix
@@ -17,7 +17,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."zope.browserpage-3.12.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         UUIDs for content items
@@ -38,7 +37,6 @@ in
     buildInputs = [  ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Python 2 and 3 compatibility utilities
@@ -59,7 +57,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Zope Version Control
@@ -80,7 +77,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.app.folder-1.0.5" self."plone.folder-1.0.4" self."plone.uuid-1.0.3" self."Products.CMFCalendar-2.2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.3" self."Products.Marshall-2.1.2" self."Products.MimetypesRegistry-2.0.4" self."Products.PlacelessTranslationService-2.0.3" self."Products.PortalTransforms-2.1.2" self."Products.statusmessages-4.0" self."Products.validation-2.0" self."Products.ZSQLMethods-2.13.4" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.contenttype-3.5.5" self."zope.datetime-3.4.1" self."zope.deferredimport-3.5.3" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.tal-3.5.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Archetypes is a developers framework for rapidly developing and deploying rich, full featured content types within the context of Zope/CMF and Plone.
@@ -101,7 +97,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.uuid-1.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."transaction-1.1.1" self."zope.contenttype-3.5.5" self."zope.interface-3.6.7" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Configurable Marshallers for Archetypes
@@ -122,7 +117,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."plone.memoize-1.1.1" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.interface-3.6.7" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         BTree-based folder implementation with order support
@@ -143,7 +137,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self."archetypes.querywidget-1.0.8" self."archetypes.referencebrowserwidget-2.4.18" self."borg.localrole-3.0.2" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."five.customerize-1.1" self."five.localsitemanager-2.0.5" self."Pillow-1.7.8" self."plone.app.blob-1.5.8" self."plone.app.collection-1.0.10" self."plone.app.content-2.1.2" self."plone.app.contentlisting-1.0.4" self."plone.app.contentmenu-2.0.8" self."plone.app.contentrules-3.0.3" self."plone.app.controlpanel-2.3.6" self."plone.app.customerize-1.2.2" self."plone.app.discussion-2.2.6" self."plone.app.folder-1.0.5" self."plone.app.form-2.2.2" self."plone.app.i18n-2.0.2" self."plone.app.jquery-1.7.2" self."plone.app.jquerytools-1.5.5" self."plone.app.layout-2.3.5" self."plone.app.linkintegrity-1.5.2" self."plone.app.locales-4.3.1" self."plone.app.portlets-2.4.4" self."plone.app.redirector-1.2" self."plone.app.search-1.1.4" self."plone.app.upgrade-1.3.3" self."plone.app.users-1.2a2" self."plone.app.uuid-1.0" self."plone.app.viewletmanager-2.0.3" self."plone.app.vocabularies-2.1.10" self."plone.app.workflow-2.1.5" self."plone.batching-1.0" self."plone.browserlayer-2.1.2" self."plone.contentrules-2.0.3" self."plone.fieldsets-2.0.2" self."plone.i18n-2.0.8" self."plone.indexer-1.0.2" self."plone.intelligenttext-2.0.2" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."plone.portlet.collection-2.1.5" self."plone.portlet.static-2.0.2" self."plone.portlets-2.2" self."plone.protect-2.0.2" self."plone.registry-1.0.1" self."plone.session-3.5.3" self."plone.theme-2.1" self."plonetheme.classic-1.3.2" self."plonetheme.sunburst-1.4.4" self."Products.Archetypes-1.9.1" self."Products.ATContentTypes-2.1.13" self."Products.CMFActionIcons-2.1.3" self."Products.CMFCalendar-2.2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDiffTool-2.1" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.CMFEditions-2.2.8" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.CMFUid-2.2.1" self."Products.DCWorkflow-2.2.4" self."Products.ExtendedPathIndex-3.1" self."Products.ExternalEditor-1.1.0" self."Products.GenericSetup-1.7.3" self."Products.MimetypesRegistry-2.0.4" self."Products.PasswordResetTool-2.0.14" self."Products.PlacelessTranslationService-2.0.3" self."Products.PloneLanguageTool-3.2.7" self."Products.PlonePAS-4.1.1" self."Products.PluggableAuthService-1.10.0" self."Products.PluginRegistry-1.3" self."Products.PortalTransforms-2.1.2" self."Products.ResourceRegistries-2.2.9" self."Products.statusmessages-4.0" self."Products.TinyMCE-1.3.4" self.setuptools self."transaction-1.1.1" self."z3c.autoinclude-0.3.4" self."ZODB3-3.10.5" self."zope.app.locales-3.6.2" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.deferredimport-3.5.3" self."zope.deprecation-3.4.1" self."zope.dottedname-3.4.6" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.site-3.9.2" self."zope.structuredtext-3.5.1" self."zope.tal-3.5.2" self."zope.tales-3.5.3" self."zope.traversing-3.13.2" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         The Plone Content Management System (core)
@@ -164,7 +157,6 @@ in
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.proxy-3.6.1" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         zope.deferredimport allows you to perform imports names that will only be resolved when used in the code.
@@ -185,7 +177,6 @@ in
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-
     meta = {
       description = ''
         Waitress WSGI server
@@ -206,7 +197,6 @@ in
     buildInputs = [  ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-
     meta = {
       description = ''
         Code coverage measurement for Python
@@ -227,7 +217,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.3" self."Products.statusmessages-4.0" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         workflow and security settings for Plone
@@ -248,7 +237,6 @@ in
     buildInputs = [  ];
     propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."Zope2-2.13.20" self."eggtestinfo-0.3" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Uid product for the Zope Content Management Framework
@@ -269,7 +257,6 @@ in
     buildInputs = [  ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Integer to Roman numerals converter
@@ -290,7 +277,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."plone.supermodel-1.2.2" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.0" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Tools to construct z3c.form forms
@@ -311,7 +297,6 @@ in
     buildInputs = [  ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         US-ASCII transliterations of Unicode text
@@ -332,7 +317,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."five.formlib-1.0.4" self.setuptools self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         An extension to zope.formlib, which allows to group fields into different fieldsets.
@@ -353,7 +337,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."plone.memoize-1.1.1" self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         redirection tool
@@ -374,7 +357,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."archetypes.schemaextender-2.1.2" self."plone.app.imaging-1.0.9" self."plone.scale__storage-1.3.2" self.setuptools self."ZODB3-3.10.5" self."zope.proxy-3.6.1" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         ZODB blob support for Plone
@@ -395,7 +377,6 @@ in
     buildInputs = [ self."nose-1.3.0" ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         WSGI request and response object
@@ -416,7 +397,6 @@ in
     buildInputs = [  ];
     propagatedBuildInputs = [ self."mechanize-0.2.5" self."pytz-2013b" self.setuptools self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Programmable browser for functional black-box tests
@@ -437,7 +417,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.traversing-3.13.2" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Tools for managing themes in CMF and Plone sites
@@ -458,7 +437,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self."Products.MimetypesRegistry-2.0.4" self."Products.PortalTransforms-2.1.2" self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Transformations applied to HTML in Plone text fields as they are rendered
@@ -479,7 +457,6 @@ in
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.security__untrustedpython-3.7.4" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Local registries for zope component architecture
@@ -500,7 +477,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Batching facilities used in Plone.
@@ -521,7 +497,6 @@ in
     buildInputs = [  ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-
     meta = {
       description = ''
         Python 2 and 3 compatibility utilities
@@ -542,7 +517,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.CMFDiffTool-2.1" self."Products.CMFUid-2.2.1" self."Products.GenericSetup-1.7.3" self."Products.ZopeVersionControl-1.1.3" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.copy-3.5.0" self."zope.dottedname-3.4.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Versioning for Plone
@@ -560,10 +534,17 @@ in
         md5 = "41d8688d4db72673069a6dc63b5289d6";
     };
     doCheck = false;
-    buildInputs = [ pkgs.unzip ];
+    buildInputs = [ pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp pkgs.unzip ];
     propagatedBuildInputs = [  ];
+    configurePhase = ''
+      sed -i "setup.py" \
+          -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = _lib_include("${pkgs.freetype}")|g ;
+              s|^JPEG_ROOT =.*$|JPEG_ROOT = _lib_include("${pkgs.libjpeg}")|g ;
+              s|^ZLIB_ROOT =.*$|ZLIB_ROOT = _lib_include("${pkgs.zlib}")|g ;
+              s|^LCMS_ROOT =.*$|LCMS_ROOT = _lib_include("${pkgs.libwebp}")|g ;
+              s|^TIFF_ROOT =.*$|TIFF_ROOT = _lib_include("${pkgs.libtiff}")|g ;'
+    '';
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Python Imaging Library (fork)
@@ -584,7 +565,6 @@ in
     buildInputs = [  ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Structured Configuration Library
@@ -605,7 +585,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."python-gettext-1.2" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.deferredimport-3.5.3" self."zope.deprecation-3.4.1" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         PTS provides a way of internationalizing (i18n'ing) and localizing (l10n'ing) software for Zope 2.
@@ -626,7 +605,6 @@ in
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Zope Deprecation Infrastructure
@@ -647,7 +625,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."transaction-1.1.1" self."zope.interface-3.6.7" self."zope.structuredtext-3.5.1" self."zope.tales-3.5.3" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         CMFFormController provides a form validation mechanism for CMF.
@@ -668,7 +645,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self.setuptools self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Data validation package for Archetypes
@@ -689,7 +665,6 @@ in
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-
     meta = {
       description = ''
         Very basic event publishing system
@@ -710,7 +685,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."five.globalrequest-1.0" self."plone.registry-1.0.1" self."plone.transformchain-1.0.3" self.setuptools self."z3c.caching__zcml-2.0a1" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Zope 2 integration for z3c.caching
@@ -731,7 +705,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Generic Transparent Proxies
@@ -752,7 +725,6 @@ in
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Component vocabularies
@@ -773,7 +745,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."zope.event-4.0.2" self."zope.interface-4.0.5" ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-
     meta = {
       description = ''
         Zope Component Architecture
@@ -794,7 +765,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."plone.i18n-2.0.8" self."plone.memoize-1.1.1" self."plone.session-3.5.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self."Products.PluggableAuthService-1.10.0" self.setuptools self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         PlonePAS adapts the PluggableAuthService for use by Plone.
@@ -815,7 +785,6 @@ in
     buildInputs = [ self."unittest2-0.5.1" ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-
     meta = {
       description = ''
         A Python Mocking and Patching Library for Testing
@@ -836,7 +805,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."archetypes.referencebrowserwidget-2.4.18" self.setuptools self."zope.deprecation-3.4.1" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         ATReferenceBrowserWidget is reference widget for Archetypes.
@@ -857,7 +825,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."ExtensionClass-2.13.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Special MultiMapping objects used in Zope2.
@@ -878,7 +845,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."Missing-2.13.1" self."Persistence-2.13.2" self."Record-2.13.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         SQL method support for Zope 2.
@@ -899,7 +865,6 @@ in
     buildInputs = [ self."nose-1.3.0" ];
     propagatedBuildInputs = [ self."MarkupSafe-0.18" ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-
     meta = {
       description = ''
         A super-fast templating language that borrows the  best ideas from the existing templating languages.
@@ -920,7 +885,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Hook into repoze.zope2 that allows third party packages to register a sequence of hooks that will be allowed to modify the response before it is returned to the browser
@@ -941,7 +905,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."zope.event-4.0.2" self."zope.interface-4.0.5" ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-
     meta = {
       description = ''
         zope.interface extension for defining data schemas
@@ -962,7 +925,6 @@ in
     buildInputs = [  ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" self."eggtestinfo-0.3" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         CMFQuickInstallerTool is a facility for comfortable activation/deactivation of CMF compliant products.
@@ -983,7 +945,6 @@ in
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-
     meta = {
       description = ''
         Zope Deprecation Infrastructure
@@ -1004,7 +965,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."five.formlib-1.0.4" self."plone.app.vocabularies-2.1.10" self."plone.locking-2.0.4" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         zope.formlib integration for Plone
@@ -1025,7 +985,6 @@ in
     buildInputs = [  ];
     propagatedBuildInputs = [ self."five.formlib-1.0.4" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."Zope2-2.13.20" self."eggtestinfo-0.3" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Default product for the Zope Content Management Framework
@@ -1046,7 +1005,6 @@ in
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Zope process lifetime events
@@ -1067,7 +1025,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Password reset tool for Plone
@@ -1088,7 +1045,6 @@ in
     buildInputs = [  ];
     propagatedBuildInputs = [ self."six-1.3.0" self."WebOb-1.2.3" ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-
     meta = {
       description = ''
         UNKNOWN
@@ -1109,7 +1065,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Simple decorators to support synchronized methods
@@ -1130,7 +1085,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Support for applying monkey patches late in the startup cycle by using ZCML configuration actions
@@ -1151,7 +1105,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.i18n__zcml-3.7.4" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Adaptable string interpolation
@@ -1172,7 +1125,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         The default theme for Plone 4.
@@ -1193,7 +1145,6 @@ in
     buildInputs = [ self."nose-1.3.0" ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-
     meta = {
       description = ''
         Load, configure, and compose WSGI applications and servers
@@ -1214,7 +1165,6 @@ in
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Sequence Sorting
@@ -1235,7 +1185,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.PluggableAuthService-1.10.0" self."python-openid-2.2.5" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         OpenID authentication support for PAS
@@ -1256,7 +1205,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."plone.resource-1.0.2" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         UNKNOWN
@@ -1277,7 +1225,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."six-1.2.0" self."zope.browser-1.3" self."zope.browserpage-3.12.2" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contentprovider-3.7.2" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.site-3.9.2" self."zope.traversing-3.13.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         An advanced form and widget framework for Zope 3
@@ -1298,7 +1245,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.authentication-3.7.1" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.error-3.7.4" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.traversing-3.13.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Zope publication
@@ -1319,7 +1265,6 @@ in
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.event-3.5.2" self."zope.interface-3.6.7" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         zope.interface extension for defining data schemas
@@ -1340,7 +1285,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Zope External Editor
@@ -1361,7 +1305,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.batching-1.0" self."plone.i18n-2.0.8" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self.setuptools self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Content Views for Plone
@@ -1382,7 +1325,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."zope.interface-3.6.7" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Diff tool for Plone
@@ -1403,7 +1345,6 @@ in
     buildInputs = [ self."nose-1.3.0" ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-
     meta = {
       description = ''
         A tiny LRU cache implementation and decorator
@@ -1424,7 +1365,6 @@ in
     buildInputs = [  ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Python implementation of Markdown.
@@ -1445,7 +1385,6 @@ in
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."experimental.cssselect-0.3" self."lxml-2.3.6" self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Diazo implements a Deliverance like language using a pure XSLT engine. With Diazo, you
@@ -1469,7 +1408,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Infrastructure for maintaining a registry of available behaviors
@@ -1490,7 +1428,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Basic inter-process locks
@@ -1511,7 +1448,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" self."zope.tal-3.5.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Zope Template Application Language Expression Syntax (TALES)
@@ -1532,7 +1468,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."pytz-2013b" self."zope.interface-3.6.7" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         This package provides a DateTime data type, as known from Zope 2.Unless you need to communicate with Zope 2 APIs, you're probablybetter off using Python's built-in datetime module.
@@ -1553,7 +1488,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."zc.buildout-1.7.1" self."zope.configuration-3.7.4" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Automatically include ZCML
@@ -1574,7 +1508,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         World timezone definitions, modern and historical
@@ -1595,7 +1528,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."zope.interface-4.0.5" self."zope.proxy-4.1.3" self."zope.schema-4.3.2" ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-
     meta = {
       description = ''
         Zope Location
@@ -1616,7 +1548,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."Products.Archetypes-1.9.1" self."Products.CMFCore-2.2.7" self."Products.CMFEditions-2.2.8" self."Products.CMFPlacefulWorkflow-1.5.9" self."Products.DCWorkflow-2.2.4" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         check-out/check-in staging for Plone
@@ -1637,7 +1568,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Markdown-2.0.3" self."plone.intelligenttext-2.0.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.MimetypesRegistry-2.0.4" self.setuptools self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."zope.structuredtext-3.5.1" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         MIME based content transformations
@@ -1658,7 +1588,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         zope.sendmail integration for Zope 2.
@@ -1679,7 +1608,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.libxml2 pkgs.libxslt ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-
     meta = {
       description = ''
         Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API.
@@ -1700,7 +1628,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."RestrictedPython-3.6.0" self."zExceptions-2.13.0" self."zope.sequencesort-3.4.0" self."zope.structuredtext-3.5.1" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Document Templating Markup Language (DTML)
@@ -1721,7 +1648,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.form-2.2.2" self."plone.app.vocabularies-2.1.10" self."plone.app.workflow-2.1.5" self."plone.fieldsets-2.0.2" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."plone.protect-2.0.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.PlonePAS-4.1.1" self."Products.PortalTransforms-2.1.2" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.cachedescriptors-3.5.1" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.ramcache-1.0" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Formlib-based controlpanels for Plone.
@@ -1742,7 +1668,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.browserresource-3.10.3" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.security__untrustedpython-3.7.4" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Page template resource plugin for zope.browserresource
@@ -1763,7 +1688,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self.setuptools self."ZODB3-3.10.5" self."zope.contenttype-3.5.5" self."zope.interface-3.6.7" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         MIME type handling for Zope
@@ -1784,7 +1708,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Docutils -- Python Documentation Utilities
@@ -1795,20 +1718,19 @@ development, check it into Subversion, and not touch Diazo during deployment.
   };
 
 
-  "beautifulsoup4-4.3.0" = self.buildPythonPackage {
-    name = "beautifulsoup4-4.3.0";
+  "beautifulsoup4-4.3.1" = self.buildPythonPackage {
+    name = "beautifulsoup4-4.3.1";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/b/beautifulsoup4/beautifulsoup4-4.3.0.tar.gz";
-        md5 = "8341b12402d942661bbfcc9f35420529";
+        url = "https://pypi.python.org/packages/source/b/beautifulsoup4/beautifulsoup4-4.3.1.tar.gz";
+        md5 = "508095f2784c64114e06856edc1dafed";
     };
     doCheck = false;
     buildInputs = [  ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-
     meta = {
       description = ''
-        Improvements to the lxml tree builder.
+        UNKNOWN
         '';
       homepage = "http://www.crummy.com/software/BeautifulSoup/bs4/";
       license = "MIT";
@@ -1826,7 +1748,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-
     meta = {
       description = ''
         nose extends unittest to make testing easier
@@ -1847,7 +1768,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-
     meta = {
       description = ''
         Python Packaging Library
@@ -1868,7 +1788,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self."borg.localrole-3.0.2" self."five.localsitemanager-2.0.5" self."plone.app.folder-1.0.5" self."plone.app.portlets-2.4.4" self."plone.portlets-2.2" self."plone.session-3.5.3" self."Products.Archetypes-1.9.1" self."Products.CMFActionIcons-2.1.3" self."Products.CMFCalendar-2.2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDiffTool-2.1" self."Products.CMFEditions-2.2.8" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.CMFUid-2.2.1" self."Products.contentmigration-2.1.4" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.3" self."Products.MimetypesRegistry-2.0.4" self."Products.PloneLanguageTool-3.2.7" self."Products.PlonePAS-4.1.1" self."Products.PluggableAuthService-1.10.0" self."Products.PortalTransforms-2.1.2" self."Products.ResourceRegistries-2.2.9" self."Products.SecureMailHost-1.1.2" self."Products.ZCatalog-2.13.23" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.ramcache-1.0" self."zope.site-3.9.2" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Upgrade machinery for Plone.
@@ -1889,7 +1808,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.exceptions-3.6.2" self."zope.interface-3.6.7" self."zope.location-3.9.1" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         An error reporting utility for Zope3
@@ -1910,7 +1828,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self."plone.app.portlets-2.4.4" self."plone.openid-2.0.1" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self."Products.PlonePAS-4.1.1" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Plone OpenID authentication support
@@ -1931,7 +1848,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.globalrequest-1.0" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Zope 2 integration for zope.globalrequest
@@ -1952,7 +1868,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Hooks to facilitate managing custom index values in Zope 2/CMF applications
@@ -1973,7 +1888,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.container-3.11.2" self."zope.interface-3.6.7" self."zope.location-3.9.1" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Manage secrets
@@ -1994,7 +1908,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."feedparser-5.0.1" self."five.customerize-1.1" self."five.formlib-1.0.4" self."plone.app.form-2.2.2" self."plone.app.i18n-2.0.2" self."plone.app.vocabularies-2.1.10" self."plone.i18n-2.0.8" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.3" self."Products.PluggableAuthService-1.10.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.container-3.11.2" self."zope.contentprovider-3.7.2" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.traversing-3.13.2" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Plone integration for the basic plone.portlets package
@@ -2015,7 +1928,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."plone.alterego-1.0" self."plone.autoform-1.4" self."plone.behavior-1.0.2" self."plone.folder-1.0.4" self."plone.memoize-1.1.1" self."plone.rfc822-1.0.1" self."plone.supermodel-1.2.2" self."plone.synchronize-1.0.1" self."plone.uuid-1.0.3" self."plone.z3cform-0.8.0" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.dottedname-3.4.6" self."zope.filerepresentation-3.6.1" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.size-3.4.1" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Flexible CMF content
@@ -2036,7 +1948,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         
@@ -2057,7 +1968,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Acquisition-2.13.8" self."Persistence-2.13.2" self.setuptools self."ZODB3-3.10.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.lifecycleevent-3.6.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         A BTree based implementation for Zope 2's OFS.
@@ -2078,7 +1988,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."DocumentTemplate-2.13.2" self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         MIMETools provides the &lt;!--#mime--&gt; tag for DocumentTemplate.
@@ -2099,7 +2008,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.exceptions-3.6.2" self."zope.interface-3.6.7" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Zope testing framework, including the testrunner script.
@@ -2120,7 +2028,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.interface-3.6.7" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Object life-cycle events
@@ -2141,7 +2048,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Metaclass for subclassable extension types
@@ -2162,7 +2068,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self."five.formlib-1.0.4" self."plone.app.form-2.2.2" self."plone.app.vocabularies-2.1.10" self."plone.contentrules-2.0.3" self."plone.memoize-1.1.1" self."plone.stringinterp-1.0.10" self."plone.uuid-1.0.3" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.GenericSetup-1.7.3" self."Products.statusmessages-4.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.traversing-3.13.2" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Plone integration for plone.contentrules
@@ -2183,7 +2088,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ self."nose-1.3.0" ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-
     meta = {
       description = ''
         Utility library for i18n relied on by various Repoze and Pyramid packages
@@ -2204,7 +2108,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-
     meta = {
       description = ''
         Implements a XML/HTML/XHTML Markup safe string for Python
@@ -2225,7 +2128,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.security__untrustedpython-3.7.4" self."zope.tal-3.5.2" self."zope.tales-3.5.3" self."zope.traversing-3.13.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Zope Page Templates
@@ -2246,7 +2148,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."unittest2-0.5.1" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Python Gettext po to mo file compiler.
@@ -2267,7 +2168,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         System for managing development buildouts
@@ -2288,7 +2188,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."plone.uuid-1.0.3" self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Dynamically extend Archetypes schemas with named adapters.
@@ -2309,7 +2208,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Zope 3 Template Application Languate (TAL)
@@ -2330,7 +2228,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Persistence-2.13.2" self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         General Zope 2 help screens.
@@ -2351,7 +2248,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-
     meta = {
       description = ''
         cssselect parses CSS3 Selectors and translates them to XPath 1.0
@@ -2372,7 +2268,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."plone.app.contentlisting-1.0.4" self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Search user interface for Plone CMS.
@@ -2393,7 +2288,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.broken-3.6.0" self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.event-3.5.2" self."zope.filerepresentation-3.6.1" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.size-3.4.1" self."zope.traversing-3.13.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Zope Container
@@ -2414,7 +2308,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.ATContentTypes-2.1.13" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.1" self."Products.GenericSetup-1.7.3" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Integration testing framework for Plone.
@@ -2435,7 +2328,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         The new features in unittest for Python 2.7 backported to Python 2.3+.
@@ -2456,7 +2348,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.security__untrustedpython-3.7.4" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         zExceptions contains common exceptions used in Zope2.
@@ -2477,7 +2368,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self."ZODB3-3.10.5" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Persistent ExtensionClass
@@ -2498,7 +2388,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."zope.browsermenu-3.9.1" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         CMFDynamicViewFTI is a product for dynamic views in CMF.
@@ -2519,7 +2408,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contenttype-3.5.5" self."zope.event-3.5.2" self."zope.exceptions-3.6.2" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.proxy-3.6.1" self."zope.security__untrustedpython-3.7.4" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         The Zope publisher publishes Python objects on the web.
@@ -2540,7 +2428,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         ZCML directives for configuring browser views for Zope.
@@ -2561,7 +2448,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Plone specific i18n extensions.
@@ -2582,7 +2468,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.proxy-3.6.1" self."zope.schema-4.2.2" self."RestrictedPython-3.6.0" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Zope Security Framework
@@ -2603,7 +2488,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."five.globalrequest-1.0" self."plone.registry-1.0.1" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Cache purging support for Zope 2 applications
@@ -2624,7 +2508,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."zope.component__zcml-3.9.5" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         jQuery Tools integration for Plone plus overlay and AJAX form helpers.
@@ -2645,7 +2528,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.configuration-3.7.4" self."zope.i18nmessageid-3.5.3" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Zope Component Architecture
@@ -2666,7 +2548,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contentprovider-3.7.2" self."zope.event-3.5.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Zope Viewlets
@@ -2687,7 +2568,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self."pytz-2013b" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.schema-4.2.2" self."zope.configuration-3.7.4" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Zope Internationalization Support
@@ -2708,7 +2588,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self."archetypes.referencebrowserwidget-2.4.18" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.app.folder-1.0.5" self."plone.app.layout-2.3.5" self."plone.i18n-2.0.8" self."plone.memoize-1.1.1" self."Products.Archetypes-1.9.1" self."Products.ATReferenceBrowserWidget-3.0" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.3" self."Products.MimetypesRegistry-2.0.4" self."Products.PortalTransforms-2.1.2" self."Products.validation-2.0" self.setuptools self."transaction-1.1.1" self."ZConfig-2.9.1" self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.tal-3.5.2" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Default Content Types for Plone
@@ -2729,7 +2608,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contenttype-3.5.5" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.traversing-3.13.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Browser resources implementation for Zope.
@@ -2750,7 +2628,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Registry for managing CSS and JS
@@ -2771,7 +2648,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self.setuptools self."transaction-1.1.1" self."zope.app.form-4.0.2" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         zope.formlib integration for Zope 2
@@ -2792,7 +2668,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."zope.annotation-3.5.0" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         statusmessages provides an easy way of handling internationalized status messages managed via an BrowserRequest adapter storing status messages in client-side cookies.
@@ -2813,7 +2688,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ self."nose-1.3.0" self."WebTest-2.0.7" self."zope.component-4.1.0" self."zope.interface-4.0.5" ];
     propagatedBuildInputs = [ self."Chameleon-2.11" self."Mako-0.8.1" self."PasteDeploy-1.5.0" self."repoze.lru-0.6" self.setuptools self."translationstring-1.1" self."venusian-1.0a8" self."WebOb-1.2.3" self."zope.deprecation-4.0.2" self."zope.interface-4.0.5" ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-
     meta = {
       description = ''
         The Pyramid web application development framework, a Pylons project
@@ -2834,7 +2708,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Extensions to the standard python 2.3+ datetime module
@@ -2855,7 +2728,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         PloneLanguageTool allows you to set the available languages in your Plone site, select various fallback mechanisms, and control the use of flags for language selection and translations.
@@ -2876,7 +2748,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Provides transforms from text/x-web-intelligent to text/html and vice versa.
@@ -2897,7 +2768,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."plone.rfc822-1.0.1" self.setuptools self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" self."plone.scale__storage-1.3.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         File types and fields for images, files and blob files with filenames
@@ -2918,7 +2788,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Zope contenttype
@@ -2939,7 +2808,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."zope.interface-4.0.5" ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-
     meta = {
       description = ''
         Generic Transparent Proxies
@@ -2960,7 +2828,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Global way of retrieving the currently active request.
@@ -2981,7 +2848,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."python-dateutil-1.5" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         RFC822 marshalling for zope.schema fields
@@ -3002,7 +2868,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Zope sendmail
@@ -3023,7 +2888,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         webdav locking support
@@ -3044,7 +2908,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.proxy-3.6.1" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Object annotation mechanism
@@ -3065,7 +2928,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self."five.customerize-1.1" self."plone.browserlayer-2.1.2" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Integrate five.customerize into Plone.
@@ -3084,9 +2946,8 @@ development, check it into Subversion, and not touch Diazo during deployment.
     };
     doCheck = true;
     buildInputs = [ self."nose-1.3.0" self."unittest2-0.5.1" self."pyquery-1.2.4" self."WSGIProxy2-0.2" self."PasteDeploy-1.5.0" self."mock-1.0.1" self."coverage-3.6" pkgs.unzip ];
-    propagatedBuildInputs = [ self."beautifulsoup4-4.3.0" self."six-1.3.0" self."waitress-0.8.6" self."WebOb-1.2.3" ];
+    propagatedBuildInputs = [ self."beautifulsoup4-4.3.1" self."six-1.3.0" self."waitress-0.8.6" self."WebOb-1.2.3" ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-
     meta = {
       description = ''
         Helper to test WSGI applications
@@ -3107,7 +2968,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."lxml-2.3.6" self."plone.app.z3cform-0.7.3" self."plone.autoform-1.4" self."plone.registry-1.0.1" self."plone.supermodel-1.2.2" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.1" self."Products.GenericSetup-1.7.3" self."Products.statusmessages-4.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Zope 2 and Plone  integration for plone.registry
@@ -3128,7 +2988,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."plone.keyring-2.0.1" self."plone.protect-2.0.2" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Session based authentication for Zope
@@ -3149,7 +3008,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.configuration-3.7.4" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Caching infrastructure for web apps
@@ -3170,7 +3028,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Acquisition-2.13.8" self."Persistence-2.13.2" self.setuptools self."transaction-1.1.1" self."zExceptions-2.13.0" self."ZODB3-3.10.5" self."zope.interface-3.6.7" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Full text indexing for ZCatalog / Zope 2.
@@ -3191,7 +3048,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         File-system Representation Interfaces
@@ -3212,7 +3068,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.ramcache-1.0" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Decorators for caching the values of functions and methods
@@ -3233,7 +3088,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Interfaces for Python
@@ -3254,7 +3108,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Interfaces and simple adapter that give the size of an object
@@ -3275,7 +3128,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.portlets-2.2" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.componentvocabulary-1.0.1" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."zope.traversing-3.13.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         TTW customization of template-based Zope views
@@ -3296,7 +3148,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Resolver for Python dotted names.
@@ -3317,7 +3168,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."plone.caching-1.0" self."python-dateutil-1.5" self.setuptools self."z3c.caching__zcml-2.0a1" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.filerepresentation-3.6.1" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.traversing-3.13.2" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         UNKNOWN
@@ -3338,7 +3188,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."Zope2-2.13.20" self."eggtestinfo-0.3" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         DCWorkflow product for the Zope Content Management Framework
@@ -3359,7 +3208,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Translation files for Plone
@@ -3380,7 +3228,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."z3c.form-3.0" self."zope.deprecation-3.4.1" self."zope.i18n__zcml-3.7.4" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         z3c.form date and datetime widgets
@@ -3401,7 +3248,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."plone.uuid-1.0.3" self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Listing of content for the Plone CMS
@@ -3422,7 +3268,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Acquisition-2.13.8" self."DateTime-3.0.3" self."DocumentTemplate-2.13.2" self."docutils-0.9.1" self."ExtensionClass-2.13.2" self."initgroups-2.13.0" self."Missing-2.13.1" self."MultiMapping-2.13.0" self."Persistence-2.13.2" self."Products.BTreeFolder2-2.13.3" self."Products.ExternalMethod-2.13.0" self."Products.MailHost-2.13.1" self."Products.MIMETools-2.13.0" self."Products.OFSP-2.13.2" self."Products.PythonScripts-2.13.2" self."Products.StandardCacheManagers-2.13.0" self."Products.ZCatalog-2.13.23" self."Products.ZCTextIndex-2.13.4" self."pytz-2013b" self."Record-2.13.0" self."RestrictedPython-3.6.0" self.setuptools self."tempstorage-2.12.2" self."transaction-1.1.1" self."ZConfig-2.9.1" self."zdaemon-2.0.7" self."zExceptions-2.13.0" self."zLOG-2.11.1" self."ZODB3-3.10.5" self."zope.browser-1.3" self."zope.browsermenu-3.9.1" self."zope.browserpage-3.12.2" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.container-3.11.2" self."zope.contentprovider-3.7.2" self."zope.contenttype-3.5.5" self."zope.deferredimport-3.5.3" self."zope.event-3.5.2" self."zope.exceptions-3.6.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.processlifetime-1.0" self."zope.proxy-3.6.1" self."zope.ptresource-3.9.0" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.sendmail-3.7.5" self."zope.sequencesort-3.4.0" self."zope.site-3.9.2" self."zope.size-3.4.1" self."zope.structuredtext-3.5.1" self."zope.tal-3.5.2" self."zope.tales-3.5.3" self."zope.testbrowser-3.11.1" self."zope.testing-3.9.7" self."zope.traversing-3.13.2" self."zope.viewlet-3.7.2" self."ZopeUndo-2.12.0" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Zope2 application server / web framework
@@ -3443,7 +3288,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."Persistence-2.13.2" self.setuptools self."ZODB3-3.10.5" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         This package provides support for external Python methods within a Zope 2 environment.
@@ -3464,7 +3308,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.traversing-3.13.2" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Browser layer management for Zope 2 applications
@@ -3485,7 +3328,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."plone.folder-1.0.4" self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Integration package for `plone.folder` into Plone
@@ -3506,7 +3348,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ self."zope.event-4.0.2" ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-
     meta = {
       description = ''
         Fast HTML/XML Template Compiler.
@@ -3527,7 +3368,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."AccessControl-3.0.6" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Cache managers for Zope 2.
@@ -3548,7 +3388,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         RestrictedPython provides a restricted execution environment for Python, e.g. for running untrusted code.
@@ -3569,7 +3408,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.testing-3.9.7" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         A RAM-based storage for ZODB
@@ -3590,7 +3428,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."plone.indexer-1.0.2" self."plone.uuid-1.0.3" self.setuptools self."zope.interface-3.6.7" self."zope.publisher-3.12.6" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Plone integration for the basic plone.uuid package
@@ -3611,7 +3448,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self."zope.interface-3.6.7" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Acquisition is a mechanism that allows objects to obtain attributes from the containment hierarchy they're in.
@@ -3632,7 +3468,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Zope datetime
@@ -3653,7 +3488,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API.
@@ -3674,7 +3508,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."collective.z3cform.datetimewidget-1.2.3" self."lxml-2.3.6" self."plone.app.content-2.1.2" self."plone.app.layout-2.3.5" self."plone.app.textfield-1.2.2" self."plone.app.uuid-1.0" self."plone.app.z3cform-0.7.3" self."plone.autoform-1.4" self."plone.behavior-1.0.2" self."plone.contentrules-2.0.3" self."plone.dexterity-2.1.3" self."plone.formwidget.namedfile-1.0.6" self."plone.namedfile__scales-2.0.2" self."plone.portlets-2.2" self."plone.rfc822-1.0.1" self."plone.schemaeditor-1.3.2" self."plone.supermodel-1.2.2" self."plone.z3cform-0.8.0" self."Products.ATContentTypes-2.1.13" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.1" self."Products.GenericSetup-1.7.3" self.setuptools self."z3c.form-3.0" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Dexterity is a content type framework for CMF applications, with particular emphasis on Plone. It can be viewed as an alternative to Archetypes that is more light-weight and modular.
@@ -3695,7 +3528,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Zope locale extraction and management utilities
@@ -3716,7 +3548,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.app.portlets-2.4.4" self."plone.app.viewletmanager-2.0.3" self."plone.i18n-2.0.8" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.CMFEditions-2.2.8" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.deprecation-3.4.1" self."zope.dottedname-3.4.6" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Layout mechanisms for Plone
@@ -3737,7 +3568,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.componentvocabulary-1.0.1" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Zope Content Type
@@ -3758,7 +3588,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Stateful programmatic web browsing.
@@ -3779,7 +3608,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."z3c.form-3.0" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         A source query widget for z3c.form.
@@ -3800,7 +3628,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."collective.z3cform.datetimewidget-1.2.3" self."plone.protect-2.0.2" self."plone.z3cform-0.8.0" self.setuptools self."z3c.formwidget.query-0.9" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.traversing-3.13.2" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         A collection of widgets, templates and other components for use with z3c.form and Plone
@@ -3821,7 +3648,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."DateTime-3.0.3" self."plone.app.contentlisting-1.0.4" self."plone.app.layout-2.3.5" self."plone.app.vocabularies-2.1.10" self."plone.registry-1.0.1" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.globalrequest-1.0" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         UNKNOWN
@@ -3842,7 +3668,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ self."zope.event-4.0.2" pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-
     meta = {
       description = ''
         Interfaces for Python
@@ -3863,7 +3688,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."Unidecode-0.04.1" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Advanced i18n/l10n features
@@ -3884,7 +3708,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         A generic content migration framework for Plone.
@@ -3905,7 +3728,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."ExtensionClass-2.13.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Special Missing objects used in Zope2.
@@ -3926,7 +3748,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Method and property caching decorators
@@ -3947,7 +3768,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Browser menu implementation for Zope.
@@ -3968,7 +3788,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self."transaction-1.1.1" self."zc.lockfile-1.0.2" self."ZConfig-2.9.1" self."zdaemon-2.0.7" self."zope.event-3.5.2" self."zope.interface-3.6.7" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Zope Object Database: object database and persistence
@@ -3989,7 +3808,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."plone.app.form-2.2.2" self."plone.app.jquerytools-1.5.5" self.setuptools self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.interface-3.6.7" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         A referencebrowser implementation for Archetypes
@@ -4010,7 +3828,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Zope Configuration Markup Language (ZCML)
@@ -4031,7 +3848,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ self."nose-1.3.0" ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-
     meta = {
       description = ''
         A library for deferring decorator actions
@@ -4052,7 +3868,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.content-2.1.2" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self.setuptools self."zope.browsermenu-3.9.1" self."zope.component__zcml-3.9.5" self."zope.contentprovider-3.7.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Plone's content menu implementation
@@ -4073,7 +3888,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.componentvocabulary-1.0.1" self."zope.configuration-3.7.4" self."zope.container-3.11.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.testing-3.9.7" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Plone ContentRules Engine
@@ -4094,7 +3908,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."plone.keyring-2.0.1" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Security for browser forms
@@ -4115,7 +3928,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self."zope.interface-3.6.7" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Transaction management for Python
@@ -4136,7 +3948,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."diazo-1.0.3" self."docutils-0.9.1" self."five.globalrequest-1.0" self."lxml-2.3.6" self."plone.app.registry-1.2.3" self."plone.resource-1.0.2" self."plone.resourceeditor-1.0" self."plone.subrequest-1.6.7" self."plone.transformchain-1.0.3" self."Products.CMFPlone-4.3.1" self."repoze.xmliter-0.5" self."roman-1.4.0" self.setuptools self."zope.traversing-3.13.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Integrates the Diazo theming engine with Plone
@@ -4157,7 +3968,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."collective.monkeypatcher-1.0.1" self."plone.app.layout-2.3.5" self."plone.app.uuid-1.0" self."plone.app.z3cform-0.7.3" self."plone.indexer-1.0.2" self."plone.registry-1.0.1" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.0" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.site-3.9.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Enhanced discussion support for Plone
@@ -4178,7 +3988,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self."Products.PlonePAS-4.1.1" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.deferredimport-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         A PAS plugin which can manage local roles via an adapter lookup on the current context
@@ -4199,7 +4008,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Acquisition-2.13.8" self."DateTime-3.0.3" self."DocumentTemplate-2.13.2" self."ExtensionClass-2.13.2" self."Missing-2.13.1" self."Persistence-2.13.2" self."Products.ZCTextIndex-2.13.4" self."Record-2.13.0" self."RestrictedPython-3.6.0" self.setuptools self."zExceptions-2.13.0" self."ZODB3-3.10.5" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.testing-3.9.7" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Zope 2's indexing and search solution.
@@ -4220,7 +4028,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."plone.app.imaging-1.0.9" self."plone.app.layout-2.3.5" self."plone.caching-1.0" self."plone.namedfile__scales-2.0.2" self."plone.outputfilters-1.10" self."Products.Archetypes-1.9.1" self."Products.ResourceRegistries-2.2.9" self.setuptools self."zope.app.content-3.5.1" self."zope.schema-4.2.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Adds support for TinyMCE, a platform independent web based Javascript HTML WYSIWYG editor, to Plone.
@@ -4241,7 +4048,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         OpenID support for servers and consumers.
@@ -4262,7 +4068,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."lxml-2.3.6" self.setuptools self."z3c.zcmlhook-1.0b1" self."zope.component__zcml-3.9.5" self."zope.deferredimport-3.5.3" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Serialize Zope schema definitions to and from XML
@@ -4283,7 +4088,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Zope Exceptions
@@ -4304,7 +4108,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."five.formlib-1.0.4" self."plone.app.controlpanel-2.3.6" self."plone.app.layout-2.3.5" self."plone.protect-2.0.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         A package for all things users and groups related (specific to plone)
@@ -4325,7 +4128,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."plone.batching-1.0" self.setuptools self."z3c.form-3.0" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         plone.z3cform is a library that allows use of z3c.form with Zope 2 and the CMF.
@@ -4346,7 +4148,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.registry-1.2.3" self."plone.app.z3cform-0.7.3" self."plone.cachepurging-1.0.4" self."plone.caching-1.0" self."plone.memoize-1.1.1" self."plone.protect-2.0.2" self."plone.registry-1.0.1" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.3" self."Products.statusmessages-4.0" self."python-dateutil-1.5" self.setuptools self."z3c.form-3.0" self."z3c.zcmlhook-1.0b1" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Plone UI and default rules for plone.caching/z3c.caching
@@ -4367,7 +4168,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."ExtensionClass-2.13.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Special Record objects used in Zope2.
@@ -4388,7 +4188,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."Persistence-2.13.2" self."Record-2.13.0" self."RestrictedPython-3.6.0" self."transaction-1.1.1" self."zExceptions-2.13.0" self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.deferredimport-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.testing-3.9.7" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Security framework for Zope2.
@@ -4409,7 +4208,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.1" self."Products.GenericSetup-1.7.3" self."Products.PloneTestCase-0.9.17" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.testing-3.9.7" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Workflow policies for CMF and Plone
@@ -4430,7 +4228,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Text field with MIME type support
@@ -4451,7 +4248,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Very basic event publishing system
@@ -4472,7 +4268,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self."cssselect-0.8" self."lxml-3.2.3" ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-
     meta = {
       description = ''
         A jquery-like library for python
@@ -4493,7 +4288,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Convenience uid/gid helper function used in Zope2.
@@ -4514,7 +4308,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self."ZConfig-2.9.1" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Daemon process control library and tools for Unix-based systems
@@ -4535,7 +4328,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Low level support for dynamic modules
@@ -4556,7 +4348,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Easily hook into the ZCML processing machinery
@@ -4577,7 +4368,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Definition of authentication basics for the Zope Framework
@@ -4598,7 +4388,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Add test information to .egg-info
@@ -4619,7 +4408,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."plone.app.form-2.2.2" self."plone.app.portlets-2.4.4" self."plone.app.vocabularies-2.1.10" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         A portlet that fetches results from a collection
@@ -4640,7 +4428,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Shared Zope Toolkit browser components
@@ -4661,7 +4448,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."archetypes.querywidget-1.0.8" self."plone.app.contentlisting-1.0.4" self."plone.app.form-2.2.2" self."plone.app.portlets-2.4.4" self."plone.app.vocabularies-2.1.10" self."plone.portlet.collection-2.1.5" self."plone.portlets-2.2" self."Products.Archetypes-1.9.1" self."Products.CMFCore-2.2.7" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.validation-2.0" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         This package adds 'saved search' functionality to Plone.
@@ -4682,7 +4468,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.GenericSetup-1.7.3" self.setuptools self."Zope2-2.13.20" self."eggtestinfo-0.3" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Calendar product for the Zope Content Management Framework
@@ -4703,7 +4488,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self."Products.GenericSetup-1.7.3" self."Products.PluginRegistry-1.3" self.setuptools self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Pluggable Zope2 authentication / authorization framework
@@ -4724,7 +4508,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."plone.app.caching-1.1.4" self."plone.app.dexterity-2.0.8" self."plone.app.iterate-2.1.10" self."plone.app.openid-2.0.2" self."plone.app.theming-1.1.1" self."Products.CMFPlacefulWorkflow-1.5.9" self."Products.CMFPlone-4.3.1" self.setuptools self."wicked-1.1.10" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         The Plone Content Management System
@@ -4745,7 +4528,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."zope.container-3.11.2" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.traversing-3.13.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         wicked is a compact syntax for doing wiki-like content linking and creation in zope and plone
@@ -4766,7 +4548,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Zope Broken Object Interfaces
@@ -4787,7 +4568,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."plone.namedfile__scales-2.0.2" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.0" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Image widget for z3c.form and Plone
@@ -4808,7 +4588,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.vocabularies-2.1.10" self."Products.GenericSetup-1.7.3" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.contentprovider-3.7.2" self."zope.interface-3.6.7" self."zope.site-3.9.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         configurable viewlet manager
@@ -4829,7 +4608,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self."five.localsitemanager-2.0.5" self.setuptools self."zope.formlib-4.0.6" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Read Zope configuration state from profile dirs / tarballs
@@ -4850,7 +4628,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         jQuery integration for Plone
@@ -4871,7 +4648,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."plone.autoform-1.4" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Provides through-the-web editing of a zope schema/interface.
@@ -4892,7 +4668,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         StructuredText parser
@@ -4913,7 +4688,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.testing-3.9.7" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Zope RAM Cache
@@ -4934,7 +4708,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         ZODB undo support for Zope2.
@@ -4955,7 +4728,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.proxy-3.6.1" self."zope.publisher-3.12.6" self."zope.security__untrustedpython-3.7.4" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Resolving paths in the object hierarchy
@@ -4976,7 +4748,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.tales-3.5.3" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Content Provider Framework for Zope Templates
@@ -4997,7 +4768,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         The classic Plone 3 default theme.
@@ -5018,7 +4788,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self."five.localsitemanager-2.0.5" self."Products.GenericSetup-1.7.3" self."Products.ZSQLMethods-2.13.4" self.setuptools self."zope.app.publication-3.12.0" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Zope Content Management Framework core components
@@ -5039,7 +4808,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."Persistence-2.13.2" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Image scaling
@@ -5060,7 +4828,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."plone.app.form-2.2.2" self."plone.app.portlets-2.4.4" self."plone.i18n-2.0.8" self."plone.portlets-2.2" self.setuptools self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         A simple static HTML portlet for Plone.
@@ -5081,7 +4848,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."plone.scale__storage-1.3.2" self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         User-configurable, blob-aware image scaling for Plone.
@@ -5102,7 +4868,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         SecureMailHost is a reimplementation of the standard Zope2 MailHost with some security and usability enhancements.
@@ -5123,7 +4888,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."plone.memoize-1.1.1" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.contentprovider-3.7.2" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         An extension of zope.viewlet to support dynamic portlets
@@ -5144,7 +4908,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."plone.app.jquerytools-1.5.5" self."plone.app.querystring-1.0.8" self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         UNKNOWN
@@ -5165,7 +4928,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self."Products.GenericSetup-1.7.3" self.setuptools self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Configure application plugins based on interfaces
@@ -5186,7 +4948,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."lxml-2.3.6" self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Wrapper for ``lxml`` trees which serializes to string upon iteration.
@@ -5207,7 +4968,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self."ZConfig-2.9.1" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         A general logging facility
@@ -5228,7 +4988,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.proxy-3.6.1" self."zope.schema-4.2.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Zope Location
@@ -5249,7 +5008,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."lxml-2.3.6" self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Experimental version of lxml.cssselect
@@ -5270,7 +5028,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."pytz-2013b" self.setuptools self."zope.browser-1.3" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.datetime-3.4.1" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Form generation and validation library for Zope
@@ -5291,7 +5048,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Pluggable object copying mechanism
@@ -5312,7 +5068,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."five.globalrequest-1.0" self.setuptools self."zope.globalrequest-1.0" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Subrequests for Zope2
@@ -5333,7 +5088,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         A collection of generally useful vocabularies.
@@ -5354,7 +5108,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.testing-3.9.7" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         A debconf-like (or about:config-like) registry for storing application settings
@@ -5375,7 +5128,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."AccessControl-3.0.6" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Zope catalog index for paths
@@ -5396,7 +5148,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Message Identifiers for internationalization
@@ -5417,7 +5168,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Manage link integrity in Plone.
@@ -5438,7 +5188,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."eggtestinfo-0.3" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Action icons product for the Zope Content Management Framework
@@ -5459,7 +5208,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [  ];
     propagatedBuildInputs = [ self.setuptools self."transaction-1.1.1" self."zope.browser-1.3" self."zope.browsermenu-3.9.1" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.datetime-3.4.1" self."zope.exceptions-3.6.2" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.proxy-3.6.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         The Original Zope 3 Form Framework
@@ -5480,7 +5228,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."Acquisition-2.13.8" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.20" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Local site manager implementation for Zope 2
@@ -5501,7 +5248,6 @@ development, check it into Subversion, and not touch Diazo during deployment.
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Acquisition-2.13.8" self."DateTime-3.0.3" self."DocumentTemplate-2.13.2" self."RestrictedPython-3.6.0" self.setuptools self."zExceptions-2.13.0" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-
     meta = {
       description = ''
         Provides support for restricted execution of Python scripts in Zope 2.
diff --git a/pkgs/top-level/python-packages.json b/pkgs/top-level/python-packages.json
index cc345d5c5bc..a87f7eb78be 100644
--- a/pkgs/top-level/python-packages.json
+++ b/pkgs/top-level/python-packages.json
@@ -103,6 +103,23 @@
       },
       "Products.CMFCalendar": {
         "propagatedBuildInputs": [ "eggtestinfo" ]
+      },
+      "Pillow": {
+        "buildInputs": [
+          "pkgs.freetype",
+          "pkgs.libjpeg",
+          "pkgs.zlib",
+          "pkgs.libtiff",
+          "pkgs.libwebp"
+        ],
+        "configurePhase": [
+          "sed -i \"setup.py\" \\",
+          "    -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = _lib_include(\"${pkgs.freetype}\")|g ;",
+          "        s|^JPEG_ROOT =.*$|JPEG_ROOT = _lib_include(\"${pkgs.libjpeg}\")|g ;",
+          "        s|^ZLIB_ROOT =.*$|ZLIB_ROOT = _lib_include(\"${pkgs.zlib}\")|g ;",
+          "        s|^LCMS_ROOT =.*$|LCMS_ROOT = _lib_include(\"${pkgs.libwebp}\")|g ;",
+          "        s|^TIFF_ROOT =.*$|TIFF_ROOT = _lib_include(\"${pkgs.libtiff}\")|g ;'"
+        ]
       }
     }
   },

From 946f219a32c8e776f10e698144427c0a2879d14a Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 25 Aug 2013 23:41:15 +0200
Subject: [PATCH 128/452] calibre: really fix building on master

It turns out I hardcoded the output path that qt's tarball extracts.
But that path is versioned (4.8.5 for example).
As I've already merged x-updates on my own system, my qt version was
different (4.8.4 vs 4.8.5). Made the path-guessing more flexible, so
now it should work with any 4.8.*
---
 pkgs/applications/misc/calibre/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 0987f961baf..c74795f52c4 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -18,8 +18,9 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''
     tar xf ${qt48.src}
+    qtdir=$(realpath $(ls | grep qt | grep 4.8 | grep src))
     sed -i setup/build_environment.py \
-        -e "s|^qt_private_inc = .*|qt_private_inc = ['../qt-everywhere-opensource-src-4.8.5/include/%s'%(m) for m in ('QtGui', 'QtCore')]|"
+        -e "s|^qt_private_inc = .*|qt_private_inc = ['$qtdir/include/%s\'%(m) for m in ('QtGui', 'QtCore')]|"
   '';
 
   buildInputs =

From 45e975abff596d87e0d58fe919e48eac17982bad Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 26 Aug 2013 02:43:12 +0200
Subject: [PATCH 129/452] Wrap Erlang scripts to provide missing 'sed' and
 'awk'.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
---
 pkgs/development/interpreters/erlang/R14B04.nix | 11 +++++++++--
 pkgs/development/interpreters/erlang/R15B03.nix |  8 ++++++++
 pkgs/development/interpreters/erlang/R16B01.nix |  9 ++++++++-
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/R14B04.nix b/pkgs/development/interpreters/erlang/R14B04.nix
index 1d5c9ae3d39..4dd32cd806c 100644
--- a/pkgs/development/interpreters/erlang/R14B04.nix
+++ b/pkgs/development/interpreters/erlang/R14B04.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, perl, gnum4, ncurses, openssl }:
+{ stdenv, fetchurl, perl, gnum4, ncurses, openssl
+, makeWrapper, gnused, gawk }:
 
 let version = "14B04"; in
 
@@ -10,7 +11,7 @@ stdenv.mkDerivation {
     sha256 = "0vlvjlg8vzcy6inb4vj00bnj0aarvpchzxwhmi492nv31s8kb6q9";
   };
 
-  buildInputs = [ perl gnum4 ncurses openssl ];
+  buildInputs = [ perl gnum4 ncurses openssl makeWrapper ];
 
   patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';
 
@@ -21,6 +22,12 @@ stdenv.mkDerivation {
 
   configureFlags = "--with-ssl=${openssl}";
 
+  # Some erlang bin/ scripts run sed and awk
+  postFixup = ''
+    wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"
+    wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin"
+  '';
+
   meta = {
     homepage = "http://www.erlang.org/";
     description = "Programming language used for massively scalable soft real-time systems";
diff --git a/pkgs/development/interpreters/erlang/R15B03.nix b/pkgs/development/interpreters/erlang/R15B03.nix
index d282e45dc62..e0760db9f58 100644
--- a/pkgs/development/interpreters/erlang/R15B03.nix
+++ b/pkgs/development/interpreters/erlang/R15B03.nix
@@ -1,4 +1,5 @@
 { stdenv, fetchurl, perl, gnum4, ncurses, openssl
+, makeWrapper, gnused, gawk
 , wxSupport ? false, mesa ? null, wxGTK ? null, xlibs ? null }:
 
 assert wxSupport -> mesa != null && wxGTK != null && xlibs != null;
@@ -15,6 +16,7 @@ stdenv.mkDerivation {
 
   buildInputs =
     [ perl gnum4 ncurses openssl
+      makeWrapper
     ] ++ stdenv.lib.optional wxSupport [ mesa wxGTK xlibs.libX11 ];
 
   patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';
@@ -26,6 +28,12 @@ stdenv.mkDerivation {
 
   configureFlags = "--with-ssl=${openssl}";
 
+  # Some erlang bin/ scripts run sed and awk
+  postFixup = ''
+    wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"
+    wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin"
+  '';
+
   meta = {
     homepage = "http://www.erlang.org/";
     description = "Programming language used for massively scalable soft real-time systems";
diff --git a/pkgs/development/interpreters/erlang/R16B01.nix b/pkgs/development/interpreters/erlang/R16B01.nix
index 902af75d494..168db4484b1 100644
--- a/pkgs/development/interpreters/erlang/R16B01.nix
+++ b/pkgs/development/interpreters/erlang/R16B01.nix
@@ -1,4 +1,5 @@
 { stdenv, fetchurl, perl, gnum4, ncurses, openssl
+, gnused, gawk, makeWrapper
 , wxSupport ? false, mesa ? null, wxGTK ? null, xlibs ? null }:
 
 assert wxSupport -> mesa != null && wxGTK != null && xlibs != null;
@@ -14,7 +15,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs =
-    [ perl gnum4 ncurses openssl
+    [ perl gnum4 ncurses openssl makeWrapper
     ] ++ stdenv.lib.optional wxSupport [ mesa wxGTK xlibs.libX11 ];
 
   patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';
@@ -26,6 +27,12 @@ stdenv.mkDerivation {
 
   configureFlags = "--with-ssl=${openssl}";
 
+  # Some erlang bin/ scripts run sed and awk
+  postFixup = ''
+    wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"
+    wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin"
+  '';
+
   meta = {
     homepage = "http://www.erlang.org/";
     description = "Programming language used for massively scalable soft real-time systems";

From e46fc8843c40e861ba740188189c9f5d5763b16c Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 26 Aug 2013 02:44:54 +0200
Subject: [PATCH 130/452] Elixir: Fix impurity with Erlang.

The bash scripts of elixir contain some references to `erl'. This
patch wraps the scripts and extends PATH so `erl' is available.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
---
 pkgs/development/interpreters/elixir/default.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix
index ffa4402a72a..3ac2368342d 100644
--- a/pkgs/development/interpreters/elixir/default.nix
+++ b/pkgs/development/interpreters/elixir/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, erlang, rebar }:
+{ stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils }:
 
 stdenv.mkDerivation {
   name = "elixir-0.10.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "0gfr2bz3mw7ag9z2wb2g22n2vlyrp8dwy78fj9zi52kzl5w3vc3w";
   };
 
-  buildInputs = [ erlang rebar ];
+  buildInputs = [ erlang rebar makeWrapper ];
 
   preBuild = ''
     substituteInPlace rebar \
@@ -18,6 +18,17 @@ stdenv.mkDerivation {
       --replace "/usr/local" $out
   '';
 
+  postFixup = ''
+    # Elixirs binaries are shell scripts which run erl. This adds some
+    # stuff to PATH so the scripts run without problems.
+
+    for f in $out/bin/*
+    do
+      wrapProgram $f \
+      --prefix PATH ":" "${erlang}/bin:${coreutils}/bin"
+    done
+  '';
+
   meta = {
     homepage = "http://elixir-lang.org/";
     description = "Elixir is a functional, meta-programming aware language built on top of the Erlang VM.";

From 52293798cc4287c835e9e31fdb748d12266369d4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Aug 2013 12:18:03 +0200
Subject: [PATCH 131/452] haskell-distributed-process: drop broken package

distributed-process won't compile, and upstream doesn't accept bug reports
without some elaborate registration procedure.
---
 .../default.nix                               | 23 -------------
 .../haskell/distributed-process/default.nix   | 32 -------------------
 pkgs/top-level/haskell-packages.nix           |  4 ---
 3 files changed, 59 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/distributed-process/default.nix

diff --git a/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix b/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix
deleted file mode 100644
index aaca850c0d7..00000000000
--- a/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ cabal, binary, dataAccessor, distributedProcess, network
-, networkMulticast, networkTransport, networkTransportTcp
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "distributed-process-simplelocalnet";
-  version = "0.2.0.9";
-  sha256 = "0bkb26bfpmyhh26hgznnw073kvk78ws6lqi86pxrgnnm9sx5mi21";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    binary dataAccessor distributedProcess network networkMulticast
-    networkTransport networkTransportTcp transformers
-  ];
-  meta = {
-    homepage = "http://github.com/haskell-distributed/distributed-process";
-    description = "Simple zero-configuration backend for Cloud Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/distributed-process/default.nix b/pkgs/development/libraries/haskell/distributed-process/default.nix
deleted file mode 100644
index 95f7993da22..00000000000
--- a/pkgs/development/libraries/haskell/distributed-process/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ cabal, ansiTerminal, binary, dataAccessor, distributedStatic
-, HUnit, mtl, network, networkTransport, networkTransportTcp
-, random, rank1dynamic, stm, syb, testFramework, testFrameworkHunit
-, time, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "distributed-process";
-  version = "0.4.2";
-  sha256 = "16w8jp66903vn089ysqdn534v0744cr2m6wkqd77zri6a0caaa6c";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    binary dataAccessor distributedStatic mtl networkTransport random
-    rank1dynamic stm syb time transformers
-  ];
-  testDepends = [
-    ansiTerminal binary distributedStatic HUnit network
-    networkTransport networkTransportTcp random stm testFramework
-    testFrameworkHunit
-  ];
-  noHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/haskell-distributed/distributed-process";
-    description = "Cloud Haskell: Erlang-style concurrency in Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7713c63c818..94f34bfd1fe 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -869,10 +869,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   directoryTree = callPackage ../development/libraries/haskell/directory-tree {};
 
-  distributedProcess = callPackage ../development/libraries/haskell/distributed-process {};
-
-  distributedProcessSimplelocalnet = callPackage ../development/libraries/haskell/distributed-process-simplelocalnet {};
-
   distributedStatic = callPackage ../development/libraries/haskell/distributed-static {};
 
   distributive = callPackage ../development/libraries/haskell/distributive {};

From 7ee76ebd0c59422df32d1e6836de1f5cc0f71911 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 26 Aug 2013 15:25:00 +0200
Subject: [PATCH 132/452] qemu: Revert to 1.5.2

1.6.0 breaks many VM builds because it gives incorrect RTC values to
the guest.  See

  http://hydra.nixos.org/eval/981543
  http://hydra.nixos.org/eval/981440
---
 pkgs/applications/virtualization/qemu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index b826434549f..dcf5b4e5009 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -7,14 +7,14 @@
 , x86Only ? false
 }:
 
-let n = "qemu-1.6.0"; in
+let n = "qemu-1.5.2"; in
 
 stdenv.mkDerivation rec {
   name = n + (if x86Only then "-x86-only" else "");
 
   src = fetchurl {
     url = "http://wiki.qemu.org/download/${n}.tar.bz2";
-    sha256 = "0j6bnaa93fyqwzg07krx5w1fb88ap1yz1hp84ilkpm16va5facii";
+    sha256 = "0l52jwlxmwp9g3jpq0g7ix9dq4qgh46nd2h58lh47f0a35yi8qgn";
   };
 
   buildInputs =

From 78ae5bb3c285ba6cc8055a586a78e0380cc91369 Mon Sep 17 00:00:00 2001
From: Gergely Risko <gergely@risko.hu>
Date: Mon, 26 Aug 2013 17:15:46 +0200
Subject: [PATCH 133/452] Add noHaddock flag to modular-artihmetic

Building of haddock for packages with UTF-8 source is already
fixed in the stdenv-updates branch.  This fixes modular-arithmetic
until that branch is merged.  Will send another pull request to
add back haddock for that branch.
---
 .../development/libraries/haskell/modular-arithmetic/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/modular-arithmetic/default.nix b/pkgs/development/libraries/haskell/modular-arithmetic/default.nix
index c4a77630e6a..7d53d81f7bb 100644
--- a/pkgs/development/libraries/haskell/modular-arithmetic/default.nix
+++ b/pkgs/development/libraries/haskell/modular-arithmetic/default.nix
@@ -4,6 +4,7 @@ cabal.mkDerivation (self: {
   pname = "modular-arithmetic";
   version = "1.0.1.1";
   sha256 = "14n83kjmz8mqjivjhwxk1zckms5z3gn77yq2hsw2yybzff2vkdkd";
+  noHaddock = true;
   meta = {
     description = "A type for integers modulo some constant";
     license = self.stdenv.lib.licenses.bsd3;

From c7187ad59fe0c0dac70b4d5abac8cce28066ef97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 17 Aug 2013 07:17:44 +0200
Subject: [PATCH 134/452] libav: major update and refactoring (close #839)

Also leaving 0_8 branch, as it's compatible with older ffmpeg versions.
I'm planning that all expressions will be able to switch easily
between ffmpeg and libav (whatever default we choose, but I prefer libav).

Edited (twice) according to notes on the reverted b003138.
---
 pkgs/development/libraries/libav/default.nix | 168 ++++++++++++-------
 pkgs/top-level/all-packages.nix              |   4 +-
 2 files changed, 107 insertions(+), 65 deletions(-)

diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index 3fb1650bf46..ce305a2880b 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -1,72 +1,112 @@
-{ stdenv, fetchurl, pkgconfig, yasm, xz
-, mp3Support ? true, lame ? null
-, speexSupport ? true, speex ? null
-, theoraSupport ? true, libtheora ? null
-, vorbisSupport ? true, libvorbis ? null
-, vpxSupport ? false, libvpx ? null
-, x264Support ? false, x264 ? null
-, xvidSupport ? true, xvidcore ? null
-, faacSupport ? false, faac ? null
+{ stdenv, fetchurl, pkgconfig, yasm, bzip2, zlib
+, mp3Support    ? true,   lame      ? null
+, speexSupport  ? true,   speex     ? null
+, theoraSupport ? true,   libtheora ? null
+, vorbisSupport ? true,   libvorbis ? null
+, vpxSupport    ? true,   libvpx    ? null
+, x264Support   ? false,  x264      ? null
+, xvidSupport   ? true,   xvidcore  ? null
+, faacSupport   ? false,  faac      ? null
+, vaapiSupport  ? false,  libva     ? null # ToDo: it has huge closure
+, vdpauSupport  ? true,   libvdpau  ? null
+, freetypeSupport ? true, freetype  ? null # it's small and almost everywhere
+, SDL # only for avplay in $tools, adds nontrivial closure to it
+, enableGPL ? true # ToDo: some additional default stuff may need GPL
+, enableUnfree ? faacSupport
 }:
 
-assert speexSupport -> speex != null;
-assert theoraSupport -> libtheora != null;
-assert vorbisSupport -> libvorbis != null;
-assert vpxSupport -> libvpx != null;
-assert x264Support -> x264 != null;
-assert xvidSupport -> xvidcore != null;
+assert faacSupport -> enableUnfree;
 
-stdenv.mkDerivation rec {
-  name = "libav-0.7";
-  
-  src = fetchurl {
-    url = "http://libav.org/releases/${name}.tar.xz";
-    sha256 = "04pl6y53xh6xmwzz0f12mg5vh62ylp5zwwinj6dxzd8pnbjg4lsz";
+with { inherit (stdenv.lib) optional optionals; };
+
+/* ToDo:
+    - more deps, inspiration: http://packages.ubuntu.com/raring/libav-tools
+    - maybe do some more splitting into outputs
+*/
+
+let
+  result = {
+    libav_9   = libavFun   "9.8" "0r7hg9wg3cxjsmwzpa6f2p1a092g2iazyjjy23604ccskzbnirg3";
+    libav_0_8 = libavFun "0.8.8" "1wnbmbs0z4f55y8r9bwb63l04zn383l1avy4c9x1ffb2xccgcp79";
   };
 
-  # `--enable-gpl' (as well as the `postproc' and `swscale') mean that
-  # the resulting library is GPL'ed, so it can only be used in GPL'ed
-  # applications.
-  configureFlags = [
-    "--enable-gpl"
-    "--enable-postproc"
-    "--enable-swscale"
-    "--disable-ffserver"
-    "--disable-ffplay"
-    "--enable-shared"
-    "--enable-runtime-cpudetect"
-  ]
-    ++ stdenv.lib.optional mp3Support "--enable-libmp3lame"
-    ++ stdenv.lib.optional speexSupport "--enable-libspeex"
-    ++ stdenv.lib.optional theoraSupport "--enable-libtheora"
-    ++ stdenv.lib.optional vorbisSupport "--enable-libvorbis"
-    ++ stdenv.lib.optional vpxSupport "--enable-libvpx"
-    ++ stdenv.lib.optional x264Support "--enable-libx264"
-    ++ stdenv.lib.optional xvidSupport "--enable-libxvid"
-    ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree";
+  libavFun = version : sha256 : stdenv.mkDerivation rec {
+    name = "libav-${version}";
 
-  buildInputs = [ pkgconfig lame yasm ]
-    ++ stdenv.lib.optional mp3Support lame
-    ++ stdenv.lib.optional speexSupport speex
-    ++ stdenv.lib.optional theoraSupport libtheora
-    ++ stdenv.lib.optional vorbisSupport libvorbis
-    ++ stdenv.lib.optional vpxSupport libvpx
-    ++ stdenv.lib.optional x264Support x264
-    ++ stdenv.lib.optional xvidSupport xvidcore
-    ++ stdenv.lib.optional faacSupport faac;
+    src = fetchurl {
+      url = "http://libav.org/releases/${name}.tar.xz";
+      inherit sha256;
+    };
+    configureFlags =
+      assert stdenv.lib.all (x: x!=null) buildInputs;
+    [
+      #"--enable-postproc" # it's now a separate package in upstream
+      "--disable-avserver" # upstream says it's in a bad state
+      "--enable-avplay"
+      "--enable-shared"
+      "--enable-runtime-cpudetect"
+    ]
+      ++ optionals enableGPL [ "--enable-gpl" "--enable-swscale" ]
+      ++ optional mp3Support "--enable-libmp3lame"
+      ++ optional speexSupport "--enable-libspeex"
+      ++ optional theoraSupport "--enable-libtheora"
+      ++ optional vorbisSupport "--enable-libvorbis"
+      ++ optional vpxSupport "--enable-libvpx"
+      ++ optional x264Support "--enable-libx264"
+      ++ optional xvidSupport "--enable-libxvid"
+      ++ optional faacSupport "--enable-libfaac --enable-nonfree"
+      ++ optional vaapiSupport "--enable-vaapi"
+      ++ optional vdpauSupport "--enable-vdpau"
+      ++ optional freetypeSupport "--enable-libfreetype"
+      ;
 
-  crossAttrs = {
-    dontSetConfigureCross = true;
-    configureFlags = configureFlags ++ [
-      "--cross-prefix=${stdenv.cross.config}-"
-      "--enable-cross-compile"
-      "--target_os=linux"
-      "--arch=${stdenv.cross.arch}"
-      ];
-  };
+    buildInputs = [ pkgconfig lame yasm zlib bzip2 SDL ]
+      ++ optional mp3Support lame
+      ++ optional speexSupport speex
+      ++ optional theoraSupport libtheora
+      ++ optional vorbisSupport libvorbis
+      ++ optional vpxSupport libvpx
+      ++ optional x264Support x264
+      ++ optional xvidSupport xvidcore
+      ++ optional faacSupport faac
+      ++ optional vaapiSupport libva
+      ++ optional vdpauSupport libvdpau
+      ++ optional freetypeSupport freetype
+      ;
+
+    enableParallelBuilding = true;
+
+    outputs = [ "out" "tools" ];
+
+    postInstall = ''
+      mkdir -p "$tools/bin"
+      mv "$out/bin/avplay" "$tools/bin"
+      cp -s "$out"/bin/* "$tools/bin/"
+    '';
+
+    doInstallCheck = true;
+    installCheckTarget = "check"; # tests need to be run *after* installation
+
+    crossAttrs = {
+      dontSetConfigureCross = true;
+      configureFlags = configureFlags ++ [
+        "--cross-prefix=${stdenv.cross.config}-"
+        "--enable-cross-compile"
+        "--target_os=linux"
+        "--arch=${stdenv.cross.arch}"
+        ];
+    };
+
+    passthru = { inherit vdpauSupport; };
+
+    meta = with stdenv.lib; {
+      homepage = http://libav.org/;
+      description = "A complete, cross-platform solution to record, convert and stream audio and video (fork of ffmpeg)";
+      license = with licenses; if enableUnfree then unfree #ToDo: redistributable or not?
+        else if enableGPL then gpl2Plus else lgpl21Plus;
+      platforms = platforms.all;
+    };
+  }; # libavFun
+
+in result
 
-  meta = {
-    homepage = http://libav.org/;
-    description = "A complete, cross-platform solution to record, convert and stream audio and video (fork of ffmpeg)";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 74623b9c61b..3db0c3bd43c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4484,7 +4484,9 @@ let
 
   libassuan2_1 = callPackage ../development/libraries/libassuan/git.nix { };
 
-  libav = callPackage ../development/libraries/libav { };
+  libav = libav_9;
+  libav_all = callPackage ../development/libraries/libav { };
+  inherit (libav_all) libav_9 libav_0_8;
 
   libavc1394 = callPackage ../development/libraries/libavc1394 { };
 

From de9a2c342e4c235a79357cc730307529b167e51a Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 26 Aug 2013 21:55:48 +0200
Subject: [PATCH 135/452] Make generated node expression overridable in
 nodePackages.

---
 pkgs/top-level/node-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix
index 2c663c99dd0..2b050b1319a 100644
--- a/pkgs/top-level/node-packages.nix
+++ b/pkgs/top-level/node-packages.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, nodejs, fetchurl, neededNatives, self }:
+{ pkgs, stdenv, nodejs, fetchurl, neededNatives, self, generated ? ./node-packages-generated.nix }:
 
 {
   nativeDeps = {
@@ -23,4 +23,4 @@
     '';
 
   /* Put manual packages below here (ideally eventually managed by npm2nix */
-} // import ./node-packages-generated.nix { inherit self fetchurl; inherit (pkgs) lib; }
+} // import generated { inherit self fetchurl; inherit (pkgs) lib; }

From 97b822b3bb84c0d67d31359143233b8d46ae65be Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 26 Aug 2013 22:55:14 +0200
Subject: [PATCH 136/452] nvidia-x11: Update to 319.49

---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 268cdac8505..a1a16d74cfa 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -10,7 +10,8 @@ with stdenv.lib;
 
 let
 
-  versionNumber = "319.32";
+  versionNumber = "319.49";
+
   kernel310patch = fetchurl {
     url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/nvidia-linux-3.10.patch?h=packages/nvidia&id=415c1daa9ccb1ec46c172b304f40929239d87af8";
     name = "nvidia-linux-3.10.patch";
@@ -32,12 +33,12 @@ stdenv.mkDerivation {
     if stdenv.system == "i686-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
-        sha256 = "02rjiizgb9mgal0qrklzjvfzybv139yv6za8xp045k7qdyqvsqzf";
+        sha256 = "1ngss9zw109a5xfr3vvhf1ajqjvvqc7j3dzw9h56vddck6kpbc22";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
-        sha256 = "18268q3pa6v4ygfnlm888jmp84dmg1w9c323cr51pn5jg54vygcm";
+        sha256 = "1i68jfms8033p2x0r3z4fdjcmkkhbi6yizzc0ck9ydagdgg3liwp";
       }
     else throw "nvidia-x11 does not support platform ${stdenv.system}";
 

From a1c74c5603bfae0f91803e31c04062fef5346d1b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 26 Aug 2013 22:55:28 +0200
Subject: [PATCH 137/452] linux: Update to 3.4.59

---
 pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix
index 74304f5239c..8dc4b0e4ddc 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.4.58";
+  version = "3.4.59";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "11kcxlchiz7ks61yqj29dy2mnncfxcc7qr563wby1k58rvwf8g74";
+    sha256 = "19ylh9k9qykr8x29jcqv1q6agmyvzx7q5md2yxph4sykjsccqzj7";
   };
 
   features.iwlwifi = true;

From efa748a1667322f5d71140cf8e1674e4f5adae7c Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 26 Aug 2013 16:47:23 +0200
Subject: [PATCH 138/452] git-and-tools/hub: Update to version 1.10.6.

This now uses fetchurl instead of fetchgit to speed up fetching.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../version-management/git-and-tools/default.nix      |  2 +-
 .../version-management/git-and-tools/hub/default.nix  | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index b5b3d4044c5..d53ca7a0135 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -71,7 +71,7 @@ rec {
 
   hub = import ./hub {
     inherit (rubyLibs) rake;
-    inherit stdenv fetchgit groff makeWrapper;
+    inherit stdenv fetchurl groff makeWrapper;
   };
 
   gitFastExport = import ./fast-export {
diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix
index e545d2bc6f4..b9a053211fa 100644
--- a/pkgs/applications/version-management/git-and-tools/hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix
@@ -1,13 +1,12 @@
-{ stdenv, fetchgit, groff, rake, makeWrapper }:
+{ stdenv, fetchurl, groff, rake, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "hub-${version}";
-  version = "1.10.3";
+  version = "1.10.6";
 
-  src = fetchgit {
-    url = "git://github.com/defunkt/hub.git";
-    rev = "refs/tags/v${version}";
-    sha256 = "0j0krmf0sf09hhw3nsn0w1y97d67762g4qrc8080bwcx38lbyvbg";
+  src = fetchurl {
+    url = "https://github.com/github/hub/archive/v${version}.tar.gz";
+    sha256 = "0vfl1iq1927in81vd7zvp7yqqzay7pciyj87s83qfxrqyjpxn609";
   };
 
   buildInputs = [ rake makeWrapper ];

From 35229f0cf4a98921c28d918646c0f6311bdcfafc Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 26 Aug 2013 22:34:25 +0200
Subject: [PATCH 139/452] boomerang: Refactor and fix build.

Thanks to @phreedom for reporting the broken URL used fetchgit, which
was because I deleted my fork repository. Fortunately, in the meantime
other forks got to a more "working" state and being more actively
maintained than my fork. So that's why I switched using @nemerle's fork
now, as it is the the most usable one out there, at least in our case.

One stupid thing I've done in the first place was to use "1.0pre" as the
version and the fork uses "alpha 0.3.2", so it essentially is some kind
of a "downgrade" if you just look at the version.

Fortunately, peer-unreviewed research based on guesswork has shown that
I'm the only one using Boomerang on NixOS, so this shouldn't have a big
impact on the other non-existent users.

Also, this drops dependencies on boehmgc and cppunit, because building
with either one or both will fail at the moment.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/tools/boomerang/default.nix | 60 +++++++++++++-------
 pkgs/top-level/all-packages.nix              |  4 +-
 2 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/tools/boomerang/default.nix b/pkgs/development/tools/boomerang/default.nix
index eadeb51d1b3..a17529c2837 100644
--- a/pkgs/development/tools/boomerang/default.nix
+++ b/pkgs/development/tools/boomerang/default.nix
@@ -1,29 +1,49 @@
-{ stdenv, fetchgit, cmake, boehmgc, expat, cppunit }:
+{ stdenv, fetchgit, cmake, expat }:
 
-stdenv.mkDerivation {
-  name = "boomerang-1.0pre";
-
-  buildInputs = [ cmake boehmgc expat cppunit ];
-
-  installPhase = ''
-    for loaderfile in loader/*.so
-    do
-      install -vD "$loaderfile" "$out/lib/$(basename "$loaderfile")"
-    done
-
-    install -vD boomerang "$out/bin/boomerang"
-  '';
-
-  patches = [ ./dlopen_path.patch ];
+stdenv.mkDerivation rec {
+  name = "boomerang-${version}";
+  version = "0.3.2alpha";
 
   src = fetchgit {
-    url = "git://github.com/aszlig/boomerang.git";
-    rev = "d0b147a5dfc915a5fa8fe6c517e66a049a37bf22";
-    sha256 = "6cfd95a3539ff45c18b17de76407568b0d0c17fde4e45dda54486c7eac113969";
+    url = "https://github.com/nemerle/boomerang.git";
+    rev = "78c6b9dd33790be43dcb07edc549161398904006";
+    sha256 = "1hh8v0kcnipwrfz4d45d6pm5bzbm9wgbrdgg0ir2l7wyshbkff6i";
   };
 
+  buildInputs = [ cmake expat ];
+
+  postPatch = ''
+    sed -i -e 's/-std=c++0x/-std=c++11 -fpermissive/' CMakeLists.txt
+
+    # Hardcode library base path ("lib/" is appended elsewhere)
+    sed -i -e 's|::m_base_path = "|&'"$out"'/|' loader/BinaryFileFactory.cpp
+    # Deactivate setting base path at runtime
+    sed -i -e 's/m_base_path *=[^}]*//' include/BinaryFile.h
+
+    # Fix up shared directory locations
+    shared="$out/share/boomerang/"
+    find frontend -name '*.cpp' -print | xargs sed -i -e \
+      's|Boomerang::get()->getProgPath()|std::string("'"$shared"'")|'
+
+    cat >> loader/CMakeLists.txt <<CMAKE
+    INSTALL(TARGETS bffDump BinaryFile
+            ElfBinaryFile Win32BinaryFile ExeBinaryFile HpSomBinaryFile
+            PalmBinaryFile DOS4GWBinaryFile MachOBinaryFile
+            RUNTIME DESTINATION bin
+            LIBRARY DESTINATION lib)
+    CMAKE
+
+    cat >> CMakeLists.txt <<CMAKE
+    INSTALL(TARGETS boomerang DESTINATION bin)
+    INSTALL(DIRECTORY signatures DESTINATION share/boomerang)
+    INSTALL(DIRECTORY frontend/machine DESTINATION share/boomerang/frontend)
+    CMAKE
+  '';
+
+  enableParallelBuilding = true;
+
   meta = {
-    homepage = http://boomerang.sourceforge.net/;
+    homepage = "http://boomerang.sourceforge.net/";
     license = stdenv.lib.licenses.bsd3;
     description = "A general, open source, retargetable decompiler";
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3db0c3bd43c..9c4d481d47b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -515,7 +515,9 @@ let
 
   bmon = callPackage ../tools/misc/bmon { };
 
-  boomerang = callPackage ../development/tools/boomerang { };
+  boomerang = callPackage ../development/tools/boomerang {
+    stdenv = overrideGCC stdenv gcc47;
+  };
 
   bootchart = callPackage ../tools/system/bootchart { };
 

From eba178ad5264b2ce5722ddd841ece2bd233bb002 Mon Sep 17 00:00:00 2001
From: Arseniy Alekseyev <rotsor@gmail.com>
Date: Tue, 27 Aug 2013 03:56:31 +0100
Subject: [PATCH 140/452] Updated id3lib to avoid building its own zlib, fixes
 #867

---
 pkgs/development/libraries/id3lib/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/id3lib/default.nix b/pkgs/development/libraries/id3lib/default.nix
index df8add774a1..4d94624ce78 100644
--- a/pkgs/development/libraries/id3lib/default.nix
+++ b/pkgs/development/libraries/id3lib/default.nix
@@ -1,9 +1,11 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, zlib}:
 
 stdenv.mkDerivation {
   name = "id3lib-3.8.3";
 
   patches = [ ./id3lib-3.8.3-gcc43-1.patch ];
+
+  buildInputs = [ zlib ];
   
   src = fetchurl {
     url = mirror://sourceforge/id3lib/id3lib-3.8.3.tar.gz;

From d0f40f17b8a531f9aad8c44ec601284b6a9c2986 Mon Sep 17 00:00:00 2001
From: Jean-Alexandre Peyroux <m@j4.pe>
Date: Tue, 27 Aug 2013 09:28:36 +0200
Subject: [PATCH 141/452] Add The Little Brother's Database (lbdb) package

---
 pkgs/tools/misc/lbdb/default.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/tools/misc/lbdb/default.nix

diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix
new file mode 100644
index 00000000000..8775a7dc837
--- /dev/null
+++ b/pkgs/tools/misc/lbdb/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, perl, finger_bsd }:
+
+let
+	version = "0.38";
+in
+
+stdenv.mkDerivation {
+	name = "lbdb-${version}";
+	src = fetchurl {
+		url = "http://www.spinnaker.de/debian/lbdb_${version}.tar.gz";
+		md5 = "a8e65f1400c90818ff324dc4fd67eba2";
+	};
+
+  	buildInputs = [ perl finger_bsd ];
+
+	meta = {
+	    homepage = "http://www.spinnaker.de/lbdb/";
+	    description = "The Little Brother's Database (lbdb)";
+	};
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c4d481d47b..dca9685e49b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8114,6 +8114,7 @@ let
   };
 
   mutt = callPackage ../applications/networking/mailreaders/mutt { };
+  lbdb = callPackage ../tools/misc/lbdb { };
 
   ruby_gpgme = callPackage ../development/libraries/ruby_gpgme {
     ruby = ruby19;

From 86f39c218f7728363875db0aa13bb6c3b0209e12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 26 Aug 2013 22:42:46 +0200
Subject: [PATCH 142/452] xmlrpc-c: update old svn -> latest stable (v1.25.25)

Also:
 - install the "xmlrpc" tool, similar to the Debian/Ubuntu package
 - add meta.* attributes
---
 .../libraries/xmlrpc-c/default.nix            | 29 +++++++++++++------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/xmlrpc-c/default.nix b/pkgs/development/libraries/xmlrpc-c/default.nix
index cd0eb3fcdcb..4a208dbc64e 100644
--- a/pkgs/development/libraries/xmlrpc-c/default.nix
+++ b/pkgs/development/libraries/xmlrpc-c/default.nix
@@ -1,16 +1,27 @@
-{ stdenv, fetchsvn, curl }:
+{ stdenv, fetchurl, curl }:
 
-let rev = "2262"; in
-stdenv.mkDerivation {
-  name = "xmlrpc-c-r${rev}";
+stdenv.mkDerivation rec {
+  name = "xmlrpc-c-1.25.25";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/xmlrpc-c/${name}.tgz";
+    sha256 = "1sk33q4c6liza920rp4w803cfq0a79saq7fg1yjsp8hks7q011ml";
+  };
 
   buildInputs = [ curl ];
 
-  preInstall = "export datarootdir=$out/share";
+  # Build and install the "xmlrpc" tool (like the Debian package)
+  postInstall = ''
+    (cd tools/xmlrpc && make && make install)
+  '';
 
-  src = fetchsvn {
-    url = http://xmlrpc-c.svn.sourceforge.net/svnroot/xmlrpc-c/advanced;
-    rev = "2262";
-    sha256 = "1grwnczp5dq3w20rbz8bgpwl6jmw0w7cm7nbinlasf3ap5sc5ahb";
+  meta = with stdenv.lib; {
+    description = "A lightweight RPC library based on XML and HTTP";
+    homepage = http://xmlrpc-c.sourceforge.net/;
+    # <xmlrpc-c>/doc/COPYING also lists "Expat license",
+    # "ABYSS Web Server License" and "Python 1.5.2 License"
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
   };
 }

From 741daef79b6d26236ac712d737933e50a1105d6d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Aug 2013 10:37:12 +0200
Subject: [PATCH 143/452] haskell-network-multicast: update to version 0.0.8

---
 .../libraries/haskell/network-multicast/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/network-multicast/default.nix b/pkgs/development/libraries/haskell/network-multicast/default.nix
index 3a461a51f53..59a0d77d67c 100644
--- a/pkgs/development/libraries/haskell/network-multicast/default.nix
+++ b/pkgs/development/libraries/haskell/network-multicast/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "network-multicast";
-  version = "0.0.7";
-  sha256 = "18qlg4cg7ci1z3mbqh5z16mxkjir0079a0rgm4qk6jbmsnvfsq43";
+  version = "0.0.8";
+  sha256 = "0jsbp8z2a69x5h6dc3b16wdxs0shv6438mnf5mg0jxq7xddbhph8";
   buildDepends = [ network ];
   meta = {
     description = "Simple multicast library";

From 527b448ab939eb7b0bd3d671ed22e7f10a01c56a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Aug 2013 10:37:12 +0200
Subject: [PATCH 144/452] haskell-texmath: update to version 0.6.4

---
 pkgs/development/libraries/haskell/texmath/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix
index ec8ccd01054..cb346ac7d27 100644
--- a/pkgs/development/libraries/haskell/texmath/default.nix
+++ b/pkgs/development/libraries/haskell/texmath/default.nix
@@ -1,12 +1,12 @@
-{ cabal, parsec, syb, xml }:
+{ cabal, pandocTypes, parsec, syb, xml }:
 
 cabal.mkDerivation (self: {
   pname = "texmath";
-  version = "0.6.3";
-  sha256 = "1ajza3p4rj318l03rffscqs6rbk635drmdciv7hhl4nljc4qmnpz";
+  version = "0.6.4";
+  sha256 = "090xqs14ap3c6pljqzyva46phxb1lhqayi4g098f6d77d1ygvshf";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ parsec syb xml ];
+  buildDepends = [ pandocTypes parsec syb xml ];
   meta = {
     homepage = "http://github.com/jgm/texmath";
     description = "Conversion of LaTeX math formulas to MathML or OMML";

From b0688a69fe53a3f785cdeb0af781ea27296e3690 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Aug 2013 10:52:07 +0200
Subject: [PATCH 145/452] haskell-hoogle: update to version 4.2.20

---
 pkgs/development/libraries/haskell/hoogle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix
index c4039458d76..38ee62dd5af 100644
--- a/pkgs/development/libraries/haskell/hoogle/default.nix
+++ b/pkgs/development/libraries/haskell/hoogle/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hoogle";
-  version = "4.2.19";
-  sha256 = "0mfmb3ky93gicwd1i4n3xfhlr3y6zgc4dv2nrilrr9l0kfka37f8";
+  version = "4.2.20";
+  sha256 = "0sff230qc9lk3kqr9azg399fsaybwqpic9pj52jyw61ffasnl2dd";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From ed522b59c64cf9cd9055c81466d819c92d6cba3e Mon Sep 17 00:00:00 2001
From: Jean-Alexandre Peyroux <m@j4.pe>
Date: Tue, 27 Aug 2013 11:08:11 +0200
Subject: [PATCH 146/452] Modif lbdb package. Following the remarks after the
 1st commit. * add in all-packages.nix sorted alphabetically * add platforms
 and license in default.nix

---
 pkgs/tools/misc/lbdb/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix  | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix
index 8775a7dc837..1974935342b 100644
--- a/pkgs/tools/misc/lbdb/default.nix
+++ b/pkgs/tools/misc/lbdb/default.nix
@@ -14,7 +14,9 @@ stdenv.mkDerivation {
   	buildInputs = [ perl finger_bsd ];
 
 	meta = {
-	    homepage = "http://www.spinnaker.de/lbdb/";
-	    description = "The Little Brother's Database (lbdb)";
+		homepage = "http://www.spinnaker.de/lbdb/";
+		license = stdenv.lib.licenses.gpl2;
+      		platforms = stdenv.lib.platforms.all;
+		description = "The Little Brother's Database (lbdb)";
 	};
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dca9685e49b..618cde136a8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7927,6 +7927,8 @@ let
 
   lastwatch = callPackage ../applications/audio/lastwatch { };
 
+  lbdb = callPackage ../tools/misc/lbdb { };
+
   lci = callPackage ../applications/science/logic/lci {};
 
   ldcpp = callPackage ../applications/networking/p2p/ldcpp {
@@ -8114,7 +8116,6 @@ let
   };
 
   mutt = callPackage ../applications/networking/mailreaders/mutt { };
-  lbdb = callPackage ../tools/misc/lbdb { };
 
   ruby_gpgme = callPackage ../development/libraries/ruby_gpgme {
     ruby = ruby19;

From 991a61702567e4c621a4db7a67f787cbed9acd93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 27 Aug 2013 12:06:47 +0200
Subject: [PATCH 147/452] wesnoth: fix build, minor update, parallel builds

Yes, games are the most important things in nixpkgs...
not that I actually plan to play it anytime soon ;-)
---
 pkgs/games/wesnoth/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index b8e53b0cefb..f279127b62b 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -4,20 +4,21 @@
 
 stdenv.mkDerivation rec {
   pname = "wesnoth";
-  version = "1.10.5";
+  version = "1.10.7";
 
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";
-    sha256 = "1rvlr8c3vzhgd33vzc1hfhiil6d7hc3px8r8p79vmp3kwi3d49zn";
+    sha256 = "0gi5fzij48hmhhqxc370jxvxig5q3d70jiz56rjn8yx514s5lfwa";
   };
 
   buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext zlib boost fribidi
                   cmake freetype libpng pkgconfig lua dbus fontconfig libtool ];
 
-  # Make the package build with the gcc currently available in Nixpkgs.
-  NIX_CFLAGS_COMPILE = "-Wno-ignored-qualifiers";
+  cmakeFlags = [ "-DENABLE_STRICT_COMPILATION=FALSE" ]; # newer gcc problems http://gna.org/bugs/?21030
+
+  enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     description = "The Battle for Wesnoth, a free, turn-based strategy game with a fantasy theme";

From 38ba397afd80be7220317f89664af3826df2deb4 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 27 Aug 2013 12:03:19 +0200
Subject: [PATCH 148/452] raspberrypi-firmware: Update to latest version as of
 20130826 (rev 3ab17ac25e)

---
 .../linux/firmware/raspberrypi/default.nix           | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
index 02d7194b500..c9893031495 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
+++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
@@ -1,11 +1,15 @@
 {stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "raspberrypi-firmware-20160106";
+let
+
+  rev = "3ab17ac25e";
+
+in stdenv.mkDerivation {
+  name = "raspberrypi-firmware-${rev}";
 
   src = fetchurl {
-    url = "https://github.com/raspberrypi/firmware/archive/4ade27942e.tar.gz";
-    sha256 = "0f4p920vr7dcj4hprgil8baqqbnsjx1jykz0pkdx29mqy0n0xanl";
+    url = "https://github.com/raspberrypi/firmware/archive/${rev}.tar.gz";
+    sha256 = "080va4zz858bwwgxam8zy58gpwjpxfg7v5h1q5b4cpbzjihsxcx9";
   };
 
   installPhase = ''

From c44d8970ea61f898d59d44ed0c78bd8b3a049daa Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 27 Aug 2013 12:05:13 +0200
Subject: [PATCH 149/452] raspberrypi-kernel: Updated to latest version as of
 20130826 (rev 7849605f5a)

---
 pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix b/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix
index 319c2ba42b4..fdf2f139c33 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix
@@ -1,14 +1,16 @@
 { stdenv, fetchurl, ... } @ args:
 
-let rev = "91a3be5b2b"; in
+let
 
-import ./generic.nix (args // rec {
+  rev = "7849605f5a";
+
+in import ./generic.nix (args // rec {
   version = "3.6.y-${rev}";
 
   src = fetchurl {
     url = "https://api.github.com/repos/raspberrypi/linux/tarball/${rev}";
     name = "linux-raspberrypi-${version}.tar.gz";
-    sha256 = "04370b1da7610622372940decdc13ddbba2a58c9da3c3bd3e7df930a399f140d";
+    sha256 = "1diwc5p6az6ipcldwmkq7hb5f15nvdgwzmypixc2vmzmc4ylarxl";
   };
 
   features.iwlwifi = true;

From 757568b8fea6a3047c3d5e8ebdada171119b84f3 Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Tue, 27 Aug 2013 18:57:19 +0800
Subject: [PATCH 150/452] add gtk-engine-murrine 0.98.2

---
 .../themes/gtk2/gtk-engine-murrine/default.nix | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix                |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix

diff --git a/pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix b/pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix
new file mode 100644
index 00000000000..81609eff55a
--- /dev/null
+++ b/pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }:
+
+stdenv.mkDerivation {
+  name = "gtk-engine-murrine-0.98.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/murrine/0.98/murrine-0.98.2.tar.xz";
+    sha256 = "129cs5bqw23i76h3nmc29c9mqkm9460iwc8vkl7hs4xr07h8mip9";
+  };
+
+  buildInputs = [ pkgconfig intltool gtk2 ];
+
+  meta = {
+    description = "A very flexible theme engine";
+    license = stdenv.lib.licenses.lgpl3;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c4d481d47b..f79b804d3a4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9327,6 +9327,8 @@ let
 
   gtk_engines = callPackage ../misc/themes/gtk2/gtk-engines { };
 
+  gtk-engine-murrine = callPackage ../misc/themes/gtk2/gtk-engine-murrine { };
+
   gnome_themes_standard = callPackage ../misc/themes/gnome-themes-standard { };
 
   xfce = xfce4_10;

From 95491128cf6d8fdf54dd245a33eb588483fe0124 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 27 Aug 2013 13:03:37 +0200
Subject: [PATCH 151/452] gprolog: update to version 1.4.4, clean up
 installation layout, update license information

---
 .../development/compilers/gprolog/default.nix | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/gprolog/default.nix b/pkgs/development/compilers/gprolog/default.nix
index bbc273365b9..00c5ef36a38 100644
--- a/pkgs/development/compilers/gprolog/default.nix
+++ b/pkgs/development/compilers/gprolog/default.nix
@@ -1,25 +1,28 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "gprolog-1.4.1";
+  name = "gprolog-1.4.4";
 
   src = fetchurl {
     urls = [
       "mirror://gnu/gprolog/${name}.tar.gz"
       "http://www.gprolog.org/${name}.tar.gz"
     ];
-    sha256 = "e2819ed9c426138d3191e4d97ae5121cf97e132eecf102400f87f1e372a05b72";
+    sha256 = "13miyas47bmijmadm68cbvb21n4s156gjafz7kfx9brk9djfkh0q";
   };
 
-  configurePhase = "cd src ;"
-    + "./configure --prefix=$out "
-    + "--with-install-dir=$out/share/${name} "
-    + "--with-examples-dir=$out/share/doc/${name}/examples "
-    + "--with-doc-dir=$out/share/doc/${name}";
+  preConfigure = ''
+    cd src
+    configureFlagsArray=(
+      "--with-install-dir=$out"
+      "--without-links-dir"
+      "--with-examples-dir=$out/share/${name}/examples"
+      "--with-doc-dir=$out/share/${name}/doc"
+    )
+  '';
 
   postInstall = ''
-    ln -vs "$out/share/${name}/include" "$out/include"
-    ln -vs "$out/share/${name}/lib" "$out/lib"
+    mv -v $out/[A-Z]* $out/gprolog.ico $out/share/${name}/
   '';
 
   doCheck = true;
@@ -27,7 +30,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://www.gnu.org/software/gprolog/";
     description = "GNU Prolog, a free Prolog compiler with constraint solving over finite domains";
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.lgpl3Plus;
 
     longDescription = ''
       GNU Prolog is a free Prolog compiler with constraint solving

From 6c2985e8d7728ba6144f9cc48696d3f16d648120 Mon Sep 17 00:00:00 2001
From: Justin Bedo <cu@cua0.org>
Date: Tue, 27 Aug 2013 20:23:49 +1000
Subject: [PATCH 152/452] Update CUDA Toolkit to 5.5

---
 pkgs/development/compilers/cudatoolkit/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index fdb40be320c..e3f3aeb8f77 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -3,7 +3,7 @@
 } :
 
 stdenv.mkDerivation rec {
-  name = "cudatoolkit-4.2.9";
+  name = "cudatoolkit-5.5.22";
 
   dontPatchELF = true;
   dontStrip = true;
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
   src =
     if stdenv.system == "x86_64-linux" then
       fetchurl {
-        url = http://developer.download.nvidia.com/compute/cuda/4_2/rel/toolkit/cudatoolkit_4.2.9_linux_64_suse11.2.run;
-        sha256 = "1inngzwq520bhpdfrh5bm4cxfyf3hxj94jialjxgviri5bj9hz60";
+        url = http://developer.download.nvidia.com/compute/cuda/5_5/rel/installers/cuda_5.5.22_linux_64.run;
+        sha256 = "b997e1dbe95704e0e806e0cedc5fd370a385351fef565c7bae0917baf3a29aa4";
       }
     else throw "cudatoolkit does not support platform ${stdenv.system}";
 
@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
 
   unpackPhase = ''
     sh $src --keep --noexec
+    cd pkg/run_files
+    sh cuda-linux64-rel-5.5.22-16488124.run --keep --noexec
     cd pkg
   '';
 
@@ -36,7 +38,7 @@ stdenv.mkDerivation rec {
       --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
       '{}' \; || true
     find . -type f -exec patchelf \
-      --set-rpath $rpath:$out/lib:$out/lib64:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \
+      --set-rpath $rpath:$out/lib:$out/lib64::$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \
       --force-rpath \
       '{}' \; || true
   '';

From a74ab8c0a1a83b4f9e204acb1be9b544c4d9b27b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 27 Aug 2013 14:11:23 +0200
Subject: [PATCH 153/452] cudatoolkit: fix missing dependencies

Some of the java tools failed to run (notably nsight) because of missing
libraries. This fixes it.
---
 pkgs/development/compilers/cudatoolkit/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index e3f3aeb8f77..f68f918d585 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib
-, xlibs, fontconfig, freetype, unixODBC, alsaLib
+, xlibs, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib
 } :
 
 stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   runtimeDependencies = [
     ncurses expat python zlib
     xlibs.libX11 xlibs.libXext xlibs.libXrender xlibs.libXt xlibs.libXtst xlibs.libXi xlibs.libXext
-    fontconfig freetype unixODBC alsaLib
+    gtk2 glib fontconfig freetype unixODBC alsaLib
   ];
 
   rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.gcc.gcc}/lib64";
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
       --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
       '{}' \; || true
     find . -type f -exec patchelf \
-      --set-rpath $rpath:$out/lib:$out/lib64::$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \
+      --set-rpath $rpath:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \
       --force-rpath \
       '{}' \; || true
   '';

From 1ffc963383decd422c095b950431dcb5a86bab58 Mon Sep 17 00:00:00 2001
From: Jean-Alexandre Peyroux <m@j4.pe>
Date: Tue, 27 Aug 2013 14:39:38 +0200
Subject: [PATCH 154/452] correct indent platforms line in default.nix

---
 pkgs/tools/misc/lbdb/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix
index 1974935342b..a09c270c19b 100644
--- a/pkgs/tools/misc/lbdb/default.nix
+++ b/pkgs/tools/misc/lbdb/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 	meta = {
 		homepage = "http://www.spinnaker.de/lbdb/";
 		license = stdenv.lib.licenses.gpl2;
-      		platforms = stdenv.lib.platforms.all;
+		platforms = stdenv.lib.platforms.all;
 		description = "The Little Brother's Database (lbdb)";
 	};
 }

From 6863b3053ca044de49f484edcca71f02751a11d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 27 Aug 2013 16:20:45 +0200
Subject: [PATCH 155/452] spice: update 0.12.3 -> 0.12.14 (latest stable)

---
 pkgs/development/libraries/spice/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix
index dd16d6ef94e..2af9565e0b4 100644
--- a/pkgs/development/libraries/spice/default.nix
+++ b/pkgs/development/libraries/spice/default.nix
@@ -5,11 +5,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "spice-0.12.3";
+  name = "spice-0.12.4";
 
   src = fetchurl {
     url = "http://www.spice-space.org/download/releases/${name}.tar.bz2";
-    sha256 = "0il50hcw87mzs3dw80a9gkidmhgf9s8691xmki3gj9358qf5xmmz";
+    sha256 = "11xkdz26b39syynxm3iyjsr8q7x0v09zdli9an1ilcrfyiykw1ng";
   };
 
   buildInputs = [ pixman celt alsaLib openssl libjpeg zlib

From d80e7b37992a4c60d8203d38dfe5afedc8ceaf17 Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Tue, 27 Aug 2013 21:01:24 +0800
Subject: [PATCH 156/452] add mate-icon-theme 1.6.1

---
 pkgs/misc/themes/mate-icon-theme/default.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/misc/themes/mate-icon-theme/default.nix

diff --git a/pkgs/misc/themes/mate-icon-theme/default.nix b/pkgs/misc/themes/mate-icon-theme/default.nix
new file mode 100644
index 00000000000..65965e46b32
--- /dev/null
+++ b/pkgs/misc/themes/mate-icon-theme/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk2, iconnamingutils }:
+
+stdenv.mkDerivation {
+  name = "mate-icon-theme-1.6.1";
+
+  src = fetchurl {
+    url = "http://pub.mate-desktop.org/releases/1.6/mate-icon-theme-1.6.1.tar.xz";
+    sha256 = "154x0mcsvjmz84vi94kjh8hpydny3ab9lbg58wxh1lskmbc2473x";
+  };
+
+  buildInputs = [ pkgconfig intltool gtk2 iconnamingutils ];
+
+  meta = {
+    description = "Icon themes from MATE";
+    homepage = "http://mate-desktop.org";
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ iyzsong ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f79b804d3a4..afc11289c71 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9331,6 +9331,8 @@ let
 
   gnome_themes_standard = callPackage ../misc/themes/gnome-themes-standard { };
 
+  mate-icon-theme = callPackage ../misc/themes/mate-icon-theme { };
+
   xfce = xfce4_10;
   xfce4_10 = recurseIntoAttrs (import ../desktops/xfce { inherit pkgs newScope; });
 

From eb0aafd4c96a82fcd174f24968a670076f419214 Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Tue, 27 Aug 2013 21:02:46 +0800
Subject: [PATCH 157/452] add mate-themes 1.6.1

---
 pkgs/misc/themes/mate-themes/default.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/misc/themes/mate-themes/default.nix

diff --git a/pkgs/misc/themes/mate-themes/default.nix b/pkgs/misc/themes/mate-themes/default.nix
new file mode 100644
index 00000000000..0f0f41af638
--- /dev/null
+++ b/pkgs/misc/themes/mate-themes/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk2 }:
+
+stdenv.mkDerivation {
+  name = "mate-themes-1.6.1";
+
+  src = fetchurl {
+    url = "http://pub.mate-desktop.org/releases/1.6/mate-themes-1.6.1.tar.xz";
+    sha256 = "0lm2kvlwj0rpznb0n2g1sh1r6nz0p45i7flbnxivl9gi632wdmfp";
+  };
+
+  buildInputs = [ pkgconfig intltool iconnamingutils gtk2 ];
+
+  meta = {
+    description = "A set of themes from MATE";
+    homepage = "http://mate-desktop.org";
+    license = stdenv.lib.licenses.lgpl21;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ iyzsong ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index afc11289c71..48fc5f68721 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9333,6 +9333,8 @@ let
 
   mate-icon-theme = callPackage ../misc/themes/mate-icon-theme { };
 
+  mate-themes = callPackage ../misc/themes/mate-themes { };
+
   xfce = xfce4_10;
   xfce4_10 = recurseIntoAttrs (import ../desktops/xfce { inherit pkgs newScope; });
 

From 9cb6a1094966176feb04bfbe6c3ae536d536c0ac Mon Sep 17 00:00:00 2001
From: Gergely Risko <gergely@risko.hu>
Date: Tue, 27 Aug 2013 17:11:33 +0200
Subject: [PATCH 158/452] Add linear haskell library

---
 .../libraries/haskell/linear/default.nix      | 21 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/linear/default.nix

diff --git a/pkgs/development/libraries/haskell/linear/default.nix b/pkgs/development/libraries/haskell/linear/default.nix
new file mode 100644
index 00000000000..ba0f2ce1a3a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/linear/default.nix
@@ -0,0 +1,21 @@
+{ cabal, distributive, doctest, filepath, hashable, lens
+, reflection, semigroupoids, semigroups, simpleReflect, tagged
+, transformers, unorderedContainers, vector
+}:
+
+cabal.mkDerivation (self: {
+  pname = "linear";
+  version = "1.2";
+  sha256 = "0mna8k6plq0akki5j5zjk1xk1hgks1076q1h5s14v87d0h45wlrh";
+  buildDepends = [
+    distributive hashable reflection semigroupoids semigroups tagged
+    transformers unorderedContainers vector
+  ];
+  testDepends = [ doctest filepath lens simpleReflect ];
+  meta = {
+    homepage = "http://github.com/ekmett/linear/";
+    description = "Linear Algebra";
+    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 94f34bfd1fe..e69c260c704 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1350,6 +1350,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   liftedBase = callPackage ../development/libraries/haskell/lifted-base {};
 
+  linear = callPackage ../development/libraries/haskell/linear {};
+
   List = callPackage ../development/libraries/haskell/List {};
 
   ListLike = callPackage ../development/libraries/haskell/ListLike {};

From f082abfd553ff45ad26c05dee3e298177afdfcac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 27 Aug 2013 17:44:21 +0200
Subject: [PATCH 159/452] cairo: bugfix update

Released less than a day ago :-)
---
 pkgs/development/libraries/cairo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 59a0a131585..68ba7d1a9b2 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -11,11 +11,11 @@ assert glSupport -> mesa_noglu != null;
 with { inherit (stdenv.lib) optional optionals; };
 
 stdenv.mkDerivation rec {
-  name = "cairo-1.12.14";
+  name = "cairo-1.12.16";
 
   src = fetchurl {
     url = "http://cairographics.org/releases/${name}.tar.xz";
-    sha256 = "04xcykglff58ygs0dkrmmnqljmpjwp2qgwcz8sijqkdpz7ix3l4n";
+    sha256 = "0inqwsylqkrzcjivdirkjx5nhdgxbdc62fq284c3xppinfg9a195";
   };
 
   nativeBuildInputs = [ pkgconfig ] ++ libintlOrEmpty ++ libiconvOrEmpty;

From 4233d989250d252a9289040ffe986667db07ba25 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Tue, 27 Aug 2013 18:23:24 +0200
Subject: [PATCH 160/452] id3v2 now also requires zlib (presumably because
 id3lib no longer ships it)

---
 pkgs/applications/audio/id3v2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/id3v2/default.nix b/pkgs/applications/audio/id3v2/default.nix
index 8a025ac6843..a7835f020d1 100644
--- a/pkgs/applications/audio/id3v2/default.nix
+++ b/pkgs/applications/audio/id3v2/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, id3lib, groff}:
+{stdenv, fetchurl, id3lib, groff, zlib}:
 
 stdenv.mkDerivation rec {
   name = "id3v2-0.1.11";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   patches = [ ./id3v2-0.1.11-track-bad-free.patch ];
 
   nativeBuildInputs = [ groff ];
-  buildInputs = [ id3lib ];
+  buildInputs = [ id3lib zlib ];
 
   configurePhase = ''
     export makeFlags=PREFIX=$out

From 53866352c295f401c0b7877aac44120505d3cbd0 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Tue, 27 Aug 2013 19:07:16 +0200
Subject: [PATCH 161/452] nvidia driver no longer requires kernel 3.10 patch

---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index a1a16d74cfa..455a763c7f0 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -12,12 +12,6 @@ let
 
   versionNumber = "319.49";
 
-  kernel310patch = fetchurl {
-    url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/nvidia-linux-3.10.patch?h=packages/nvidia&id=415c1daa9ccb1ec46c172b304f40929239d87af8";
-    name = "nvidia-linux-3.10.patch";
-    sha256 = "0nhzg6jdk9sf1vzj519gqi8a2n9xydhz2bcz472pss2cfgbc1ahb";
-  };
-
 in
 
 stdenv.mkDerivation {
@@ -27,7 +21,7 @@ stdenv.mkDerivation {
 
   patches =
     [ ./version-test.patch ]
-    ++ optional (!libsOnly && versionAtLeast kernelDev.version "3.10") kernel310patch;
+    ;
 
   src =
     if stdenv.system == "i686-linux" then

From bed5514a6e8f1ae9776dfff71001e8d09a8ea36a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 27 Aug 2013 20:18:57 +0200
Subject: [PATCH 162/452] bittorrentsync: 1.1.42 -> 1.1.70

---
 pkgs/applications/networking/bittorrentsync/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/bittorrentsync/default.nix b/pkgs/applications/networking/bittorrentsync/default.nix
index a8c4a535258..25a23b019d8 100644
--- a/pkgs/applications/networking/bittorrentsync/default.nix
+++ b/pkgs/applications/networking/bittorrentsync/default.nix
@@ -14,9 +14,9 @@ let
     else if stdenv.system == "i686-linux" then "ld-linux.so.2"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
-  version = "1.1.42";
-  sha256 = if stdenv.system == "x86_64-linux" then "07gcjzhhr8simkjjxhyzkvh3748ll81d742fz7j31nwdi34my8ri"
-    else if stdenv.system == "i686-linux" then "0awf5bfhb4dp4aydzrgdp3wqv1mz6ys1z45i0r1hbqszvf44xj7c"
+  version = "1.1.70";
+  sha256 = if stdenv.system == "x86_64-linux" then "1hnyncq5439fxn1q8dkzcg2alxjkanr4q4pgqqf3nngz4cdar5vi"
+    else if stdenv.system == "i686-linux" then "1ijdmzl8bnb4k99vrjn5gd31hy64p9wiyxw5wc5gbpgap191h5i5"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
 in stdenv.mkDerivation {

From c20235604922b513e81138895e68544de83339be Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Tue, 27 Aug 2013 17:58:46 +0200
Subject: [PATCH 163/452] elasticsearch: update to 0.90.3

---
 pkgs/servers/search/elasticsearch/default.nix | 19 +++++--
 .../search/elasticsearch/es-home.patch        | 49 +++++++++++++++++--
 2 files changed, 60 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix
index 9afbc62ce8c..f99ecded098 100644
--- a/pkgs/servers/search/elasticsearch/default.nix
+++ b/pkgs/servers/search/elasticsearch/default.nix
@@ -1,17 +1,30 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, makeWrapper, jre, utillinux }:
 stdenv.mkDerivation rec {
-  name = "elasticsearch-0.20.5";
+  name = "elasticsearch-0.90.3";
 
   src = fetchurl {
     url = "https://download.elasticsearch.org/elasticsearch/elasticsearch/${name}.tar.gz";
-    sha256 = "0r0h9znyflajps1k8hl9naixhg1gqmhz7glc009pzzv94ncdzrq1";
+    sha256 = "1l6rnp4yvlz4z6z4v3af08yd4sl91c4zz20a8yyif2p234lh3n2s";
   };
 
   patches = [ ./es-home.patch ];
 
+  buildInputs = [ makeWrapper jre utillinux ];
+
   installPhase = ''
     mkdir -p $out
     cp -R bin config lib $out
+
+    # don't want to have binary with name plugin
+    mv $out/bin/plugin $out/bin/elasticsearch-plugin
+
+    # set ES_CLASSPATH and JAVA_HOME
+    wrapProgram $out/bin/elasticsearch \
+      --prefix ES_CLASSPATH : "$out/lib/${name}.jar":"$out/lib/*":"$out/lib/sigar/*" \
+      --prefix PATH : "${utillinux}/bin/" \
+      --set JAVA_HOME "${jre}"
+    wrapProgram $out/bin/elasticsearch-plugin \
+      --prefix ES_CLASSPATH : "$out/lib/${name}.jar":"$out/lib/*":"$out/lib/sigar/*" --set JAVA_HOME "${jre}"
   '';
 
   meta = {
diff --git a/pkgs/servers/search/elasticsearch/es-home.patch b/pkgs/servers/search/elasticsearch/es-home.patch
index f9e460198a9..d75a5a8c052 100644
--- a/pkgs/servers/search/elasticsearch/es-home.patch
+++ b/pkgs/servers/search/elasticsearch/es-home.patch
@@ -1,6 +1,6 @@
-diff -rc elasticsearch-0.20.5/bin/elasticsearch elasticsearch-0.20.5-new/bin/elasticsearch
-*** elasticsearch-0.20.5/bin/elasticsearch	2013-03-07 12:16:31.152494626 +0100
---- elasticsearch-0.20.5-new/bin/elasticsearch	2013-03-07 12:24:41.076081272 +0100
+diff -rc elasticsearch-0.90.3/bin/elasticsearch elasticsearch-0.90.3-new/bin/elasticsearch
+*** elasticsearch-0.90.3/bin/elasticsearch	2013-08-06 15:19:22.000000000 +0200
+--- elasticsearch-0.90.3-new/bin/elasticsearch	2013-08-27 16:42:00.935880011 +0200
 ***************
 *** 62,68 ****
   done
@@ -10,11 +10,50 @@ diff -rc elasticsearch-0.20.5/bin/elasticsearch elasticsearch-0.20.5-new/bin/ela
   
   # make ELASTICSEARCH_HOME absolute
   ES_HOME=`cd "$ES_HOME"; pwd`
---- 62,68 ----
+--- 62,71 ----
   done
   
   # determine elasticsearch home
-! ES_HOME=${ES_HOME:=`dirname "$SCRIPT"`/..}
+! if [ -z "$ES_HOME" ]; then
+!     echo "You must set the ES_HOME var" >&2
+!     exit 1
+! fi
   
   # make ELASTICSEARCH_HOME absolute
   ES_HOME=`cd "$ES_HOME"; pwd`
+diff -rc elasticsearch-0.90.3/bin/plugin elasticsearch-0.90.3-new/bin/plugin
+*** elasticsearch-0.90.3/bin/plugin	2013-08-06 15:19:22.000000000 +0200
+--- elasticsearch-0.90.3-new/bin/plugin	2013-08-27 16:49:01.024160295 +0200
+***************
+*** 16,22 ****
+  done
+  
+  # determine elasticsearch home
+! ES_HOME=`dirname "$SCRIPT"`/..
+  
+  # make ELASTICSEARCH_HOME absolute
+  ES_HOME=`cd "$ES_HOME"; pwd`
+--- 16,25 ----
+  done
+  
+  # determine elasticsearch home
+! if [ -z "$ES_HOME" ]; then
+!     echo "You must set the ES_HOME var" >&2
+!     exit 1
+! fi
+  
+  # make ELASTICSEARCH_HOME absolute
+  ES_HOME=`cd "$ES_HOME"; pwd`
+***************
+*** 46,50 ****
+    shift
+  done
+  
+! exec $JAVA $JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home="$ES_HOME" $properties -cp "$ES_HOME/lib/*" org.elasticsearch.plugins.PluginManager $args
+  
+--- 49,53 ----
+    shift
+  done
+  
+! exec $JAVA $JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home="$ES_HOME" $properties -cp "$ES_CLASSPATH/lib/*" org.elasticsearch.plugins.PluginManager $args
+  

From f0c59e322d10eaace832da291d9d80d2e93677b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 22 Aug 2013 22:36:31 +0200
Subject: [PATCH 164/452] libdrm: minor update

Builds. I found no kind of news/changelog docs, hopefully nothing important.
---
 pkgs/development/libraries/libdrm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index e411e599dc5..cf3febfc455 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev }:
 
 stdenv.mkDerivation rec {
-  name = "libdrm-2.4.42";
+  name = "libdrm-2.4.46";
 
   src = fetchurl {
     url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
-    sha256 = "1qbnpi64hyqzd650hj6jki1d50pzypdhj3rw9m3whwbqly110rz0";
+    sha256 = "1wah4qmrrcv0gnx65lhrlxb6gprxch92wy8lhxv6102fml6k5krk";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 65e5dd8f992bb3f3de38e2d22e548571ada6af29 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Tue, 27 Aug 2013 22:22:57 +0200
Subject: [PATCH 165/452] Fcron: Disable checks for root{name,group} and
 others.

This fixes building fcron. It was complaining it couldn't check root's
user name and the suggested flag (--with-rootname) didn't do anything.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
---
 pkgs/tools/system/fcron/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/system/fcron/default.nix b/pkgs/tools/system/fcron/default.nix
index 58719c682cb..5a70843ff6b 100644
--- a/pkgs/tools/system/fcron/default.nix
+++ b/pkgs/tools/system/fcron/default.nix
@@ -22,6 +22,9 @@ stdenv.mkDerivation rec {
       # fcron would have been default user/grp
       "--with-username=root"
       "--with-groupname=root"
+      "--with-rootname=root"
+      "--with-rootgroup=root"
+      "--disable-checks"
     ];
     
   installTargets = "install-staged"; # install does also try to change permissions of /etc/* files

From 01cc4301f36d439b4f918dbb521937c09f097e7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Wed, 28 Aug 2013 00:26:06 +0200
Subject: [PATCH 166/452] Add a patched version of buildout 2.2.0 for
 development with nix

Without this patch buildout will copy eggs from the nix store into the
./eggs directory and then try to compile them. This fails because they
are read only. This patch changes the behaviour to create symlinks to
eggs available in the nix store instead of copying them, and not to
try to compile the eggs in the store. To differentiate this from the
default buildout (which may be provided otherwise e.g. as a
dependency) the executable is renamed to buildout-nix.

This can be used in conjuntion with myEnvFun to create development
environments which make use of the python modules available in the
store while downloading any additional required eggs. A pleasant side
effect is that you can conveniently replace the symlink with a copy
for debugging purposes.
---
 .../python-modules/buildout-nix/default.nix   | 21 +++++++++++++++++
 .../python-modules/buildout-nix/nix.patch     | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  3 +++
 3 files changed, 47 insertions(+)
 create mode 100644 pkgs/development/python-modules/buildout-nix/default.nix
 create mode 100644 pkgs/development/python-modules/buildout-nix/nix.patch

diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix
new file mode 100644
index 00000000000..26b6fb0cfcd
--- /dev/null
+++ b/pkgs/development/python-modules/buildout-nix/default.nix
@@ -0,0 +1,21 @@
+{ fetchurl, stdenv, buildPythonPackage }:
+
+buildPythonPackage {
+  name = "zc.buildout-nix-2.2.0";
+
+  src = fetchurl {
+    url = "https://pypi.python.org/packages/source/z/zc.buildout/zc.buildout-2.2.0.tar.gz";
+    md5 = "771dd9807da7d5ef5bb998991c5fdae1";
+  };
+
+  patches = [ ./nix.patch ];
+
+  postInstall = "mv $out/bin/buildout{,-nix}";
+
+  meta = {
+    homepage = "http://www.buildout.org";
+    description = "A software build and configuration system";
+    license = stdenv.lib.licenses.zpt21;
+    maintainers = [ stdenv.lib.maintainers.goibhniu ];
+  };
+}
diff --git a/pkgs/development/python-modules/buildout-nix/nix.patch b/pkgs/development/python-modules/buildout-nix/nix.patch
new file mode 100644
index 00000000000..a09163518a9
--- /dev/null
+++ b/pkgs/development/python-modules/buildout-nix/nix.patch
@@ -0,0 +1,23 @@
+--- a/src/zc/buildout/easy_install.py	2013-08-27 22:28:40.233718116 +0200
++++ b/src/zc/buildout/easy_install.py	2013-08-27 22:31:07.967871186 +0200
+@@ -508,16 +508,15 @@
+                         self._dest, os.path.basename(dist.location))
+ 
+                     if os.path.isdir(dist.location):
+-                        # we got a directory. It must have been
+-                        # obtained locally.  Just copy it.
+-                        shutil.copytree(dist.location, newloc)
++                        # Symlink to dists in /nix/store
++                        if not os.path.exists(newloc):
++                            os.symlink(dist.location, newloc)
+                     else:
+ 
+ 
+                         setuptools.archive_util.unpack_archive(
+                             dist.location, newloc)
+-
+-                    redo_pyc(newloc)
++                        redo_pyc(newloc)
+ 
+                     # Getting the dist from the environment causes the
+                     # distribution meta data to be read.  Cloning isn't
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 59707c58de8..3cd30b715f0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -126,6 +126,9 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     inherit python buildPythonPackage pygobject pycairo;
   };
 
+  # A patched version of buildout, useful for buildout based development on Nix
+  zc_buildout_nix = callPackage ../development/python-modules/buildout-nix { };
+
   # packages defined here
 
   afew = buildPythonPackage rec {

From 0d689828a204be47caa921068247335d392b0727 Mon Sep 17 00:00:00 2001
From: Matej Cotman <cotman.matej@gmail.com>
Date: Wed, 28 Aug 2013 06:06:07 +0200
Subject: [PATCH 167/452] tarman: switch to newer version 0.1.3

---
 pkgs/top-level/python-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2a8bc3038e9..90600e6954f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6590,18 +6590,18 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
 
   tarman = buildPythonPackage rec {
-    version = "0.1.1";
+    version = "0.1.3";
     name = "tarman-${version}";
 
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/t/tarman/tarman-${version}.zip";
-      sha256 = "0ppd2365hf841b58fss5pgaja0y0mwx5n0gk1p3rxx9y3r0kyfas";
+      sha256 = "0ri6gj883k042xaxa2d5ymmhbw2bfcxdzhh4bz7700ibxwxxj62h";
     };
 
     buildInputs = [ pkgs.unzip unittest2 nose mock ];
     propagatedBuildInputs = [ modules.curses libarchive ];
 
-    # two tests fail
+    # tests are still failing
     doCheck = false;
   };
 

From ce57c3e917971a9241e6309e7cb8aaa7f04b319b Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 28 Aug 2013 10:56:08 +0300
Subject: [PATCH 168/452] lbdb: fix formatting

---
 pkgs/tools/misc/lbdb/default.nix | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix
index a09c270c19b..a26348f8f0f 100644
--- a/pkgs/tools/misc/lbdb/default.nix
+++ b/pkgs/tools/misc/lbdb/default.nix
@@ -1,22 +1,22 @@
 { stdenv, fetchurl, perl, finger_bsd }:
 
 let
-	version = "0.38";
+  version = "0.38";
 in
 
 stdenv.mkDerivation {
-	name = "lbdb-${version}";
-	src = fetchurl {
-		url = "http://www.spinnaker.de/debian/lbdb_${version}.tar.gz";
-		md5 = "a8e65f1400c90818ff324dc4fd67eba2";
-	};
+  name = "lbdb-${version}";
+  src = fetchurl {
+    url = "http://www.spinnaker.de/debian/lbdb_${version}.tar.gz";
+    md5 = "a8e65f1400c90818ff324dc4fd67eba2";
+  };
 
-  	buildInputs = [ perl finger_bsd ];
+  buildInputs = [ perl finger_bsd ];
 
-	meta = {
-		homepage = "http://www.spinnaker.de/lbdb/";
-		license = stdenv.lib.licenses.gpl2;
-		platforms = stdenv.lib.platforms.all;
-		description = "The Little Brother's Database (lbdb)";
-	};
+  meta = {
+    homepage = "http://www.spinnaker.de/lbdb/";
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.all;
+    description = "The Little Brother's Database (lbdb)";
+  };
 }

From 0fc3e2817a1d4d20aed4617f41cdb84f93d1e021 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 28 Aug 2013 11:05:35 +0200
Subject: [PATCH 169/452] poppler: bugfix update to 0.24.1

---
 pkgs/development/libraries/poppler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 95d34520802..6b8fb898d90 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -4,8 +4,8 @@
 }:
 
 let
-  version = "0.24.0"; # even major numbers are stable
-  sha256 = "088cdl6gb724aihibmj7yqp7x6mzdkxpjnklw35qwgwackm1gidx";
+  version = "0.24.1"; # even major numbers are stable
+  sha256 = "1ipzirrh5ppkq99zb59xpfg5j2fgc8mr569r1cmxjjqql0dc1vsw";
 
   qtcairo_patches =
     let qtcairo = fetchgit { # the version for poppler-0.22

From dce544ee6e8f26566076fb5330bdd63e5f2c83a9 Mon Sep 17 00:00:00 2001
From: Vladimir Still <xstill@fi.muni.cz>
Date: Wed, 28 Aug 2013 11:09:31 +0200
Subject: [PATCH 170/452] aspell: Add Czech dictionary (pkgs.aspellDicts.cs).

---
 pkgs/development/libraries/aspell/dictionaries.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix
index 131da4112e8..f1be1f551a9 100644
--- a/pkgs/development/libraries/aspell/dictionaries.nix
+++ b/pkgs/development/libraries/aspell/dictionaries.nix
@@ -28,6 +28,15 @@ let
 
 in {
 
+  cs = buildDict {
+    shortName = "cs-20040614-1";
+    fullName = "Czech";
+    src = fetchurl {
+      url = mirror://gnu/aspell/dict/cs/aspell6-cs-20040614-1.tar.bz2;
+      sha256 = "0rihj4hsw96pd9casvmpvw3r8040pfa28p1h73x4vyn20zwr3h01";
+    };
+  };
+
   de = buildDict {
     shortName = "de-20030222-1";
     fullName = "German";

From 5fc7590886d9f66404a503d9f64f282ff7b07a89 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 28 Aug 2013 16:21:29 +0200
Subject: [PATCH 171/452] maxima: update to version 5.30.0

---
 pkgs/applications/science/math/maxima/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix
index d644a1633cb..61742a58094 100644
--- a/pkgs/applications/science/math/maxima/default.nix
+++ b/pkgs/applications/science/math/maxima/default.nix
@@ -2,7 +2,7 @@
 
 let
   name    = "maxima";
-  version = "5.29.1";
+  version = "5.30.0";
 
   searchPath =
     stdenv.lib.makeSearchPath "bin"
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz";
-    sha256 = "1p94l28adcn0826nah460r9pz71h7wd5klsg885sl2gzds75bn74";
+    sha256 = "1mhx7g0kzpiagg97s2zhaplsq1li9ya2764mhwl7jgfw2vp3jlm0";
   };
 
   buildInputs = [sbcl texinfo perl makeWrapper];

From dc5843399d6e0362598c9afa1fcb70c5436188a0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 28 Aug 2013 16:33:33 +0200
Subject: [PATCH 172/452] maxima: add $out/bin to $PATH in the maxima wrapper
 scripts

This ensures that Maxima's wrapper scripts (such as rmaxima) find the
correct maxima binary.
---
 pkgs/applications/science/math/maxima/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix
index 61742a58094..f5fec36756d 100644
--- a/pkgs/applications/science/math/maxima/default.nix
+++ b/pkgs/applications/science/math/maxima/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   postInstall = ''
     # Make sure that maxima can find its runtime dependencies.
     for prog in "$out/bin/"*; do
-      wrapProgram "$prog" --prefix PATH ":" "${searchPath}"
+      wrapProgram "$prog" --prefix PATH ":" "$out/bin:${searchPath}"
     done
     # Move emacs modules and documentation into the right place.
     mkdir -p $out/share/emacs $out/share/doc

From 4f6b248e16ea33287bfc337bc6486a72189066d1 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 28 Aug 2013 16:57:52 +0200
Subject: [PATCH 173/452] smartmontools: Update driverdb to r3849, and fix
 broken url

---
 pkgs/tools/system/smartmontools/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix
index be34fc52c7a..0290d1961ce 100644
--- a/pkgs/tools/system/smartmontools/default.nix
+++ b/pkgs/tools/system/smartmontools/default.nix
@@ -1,9 +1,10 @@
 { stdenv, fetchurl }:
 
 let
+  dbrev = "3849";
   driverdb = fetchurl {
-    url = "http://smartmontools.svn.sourceforge.net/viewvc/smartmontools/trunk/smartmontools/drivedb.h?revision=3812";
-    sha256 = "1x22ammjwlb7p3cmd13shqq1payb7nr9pgfa9xifs19qyr77mrwp";
+    url = "http://sourceforge.net/p/smartmontools/code/${dbrev}/tree/trunk/smartmontools/drivedb.h?format=raw";
+    sha256 = "06c1cl0x4sq64l3rmd5rk8wsbggjixphpgj0kf4awqhjgsi102xz";
     name = "smartmontools-drivedb.h";
   };
 in

From 6f9c01cfbc3fe7f520497fa939cbf1f945d7a557 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 28 Aug 2013 17:38:54 +0200
Subject: [PATCH 174/452] vessel: Don't build on Hydra

http://hydra-test.nixos.org/build/5822528
---
 pkgs/games/vessel/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/games/vessel/default.nix b/pkgs/games/vessel/default.nix
index e6f3523fa24..9b9dd6c1f43 100644
--- a/pkgs/games/vessel/default.nix
+++ b/pkgs/games/vessel/default.nix
@@ -78,7 +78,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.strangeloopgames.com;
     license = [ "unfree" ];
     maintainers = with stdenv.lib.maintainers; [ jcumming ];
-    platforms = [ "i686-linux"] ;
   };
 
 }

From 8bcfcac0c1b203de5d3c4fd66c38e3a5d017a2a7 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 28 Aug 2013 13:28:56 -0400
Subject: [PATCH 175/452] Add Dist::Zilla and its many deps

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/top-level/perl-packages.nix | 491 +++++++++++++++++++++++++++++--
 1 file changed, 467 insertions(+), 24 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f7d316a7514..80904ddf23a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -231,13 +231,19 @@ rec {
     propagatedBuildInputs = [DigestHMAC];
   };
 
-  Autobox = buildPerlPackage rec {
-    name = "autobox-2.55";
+  autobox = pkgs.perlPackages.Autobox;
+
+  Autobox = buildPerlPackage {
+    name = "autobox-2.79";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/C/CH/CHOCOLATE/${name}.tar.gz";
-      sha256 = "1kfn8zqbv9rjri39hh0xvqx74h35iwhix7w6ncajw06br8m9pizh";
+      url = mirror://cpan/authors/id/C/CH/CHOCOLATE/autobox-2.79.tar.gz;
+      sha256 = "8acc8c4a69e1bbb05304d0832d483a07258597529072d869b5960193a2ab950f";
+    };
+    propagatedBuildInputs = [ ScopeGuard ];
+    meta = {
+      description = "Call methods on native types";
+      license = "perl";
     };
-    propagatedBuildInputs = [ScopeGuard];
   };
 
   Autodia = buildPerlPackage rec {
@@ -1309,6 +1315,49 @@ rec {
     };
   };
 
+  ConfigINI = buildPerlPackage {
+    name = "Config-INI-0.020";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Config-INI-0.020.tar.gz;
+      sha256 = "0ef298da75e3a7becd1f358422cea621c5cf0420278aa6a1bdd2dd14efe07bc9";
+    };
+    propagatedBuildInputs = [ IOString MixinLinewise ];
+    meta = {
+      homepage = https://github.com/rjbs/Config-INI;
+      description = "Simple .ini-file format";
+      license = "perl";
+    };
+  };
+
+  ConfigMVP = buildPerlPackage {
+    name = "Config-MVP-2.200004";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-2.200004.tar.gz;
+      sha256 = "dbe473f4b0fc649b82574aa71b0c5da3359058e181928d5e9197fc0ef247c3ec";
+    };
+    buildInputs = [ TestFatal ];
+    propagatedBuildInputs = [ ClassLoad Moose MooseXOneArgNew ParamsUtil RoleHasMessage RoleIdentifiable Throwable TieIxHash TryTiny ];
+    meta = {
+      homepage = https://github.com/rjbs/config-mvp;
+      description = "Multivalue-property package-oriented configuration";
+      license = "perl";
+    };
+  };
+
+  ConfigMVPReaderINI = buildPerlPackage {
+    name = "Config-MVP-Reader-INI-2.101462";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-Reader-INI-2.101462.tar.gz;
+      sha256 = "cd113c3361cfb468655cfcd7b4747b50f990db2cb9452f5d8ffa409422d7df9f";
+    };
+    propagatedBuildInputs = [ ConfigINI ConfigMVP Moose ];
+    meta = {
+      homepage = https://github.com/rjbs/Config-MVP-Reader-INI;
+      description = "An MVP config reader for .ini files";
+      license = "perl";
+    };
+  };
+
   ConfigTiny = buildPerlPackage rec {
     name = "Config-Tiny-2.12";
     src = fetchurl {
@@ -1434,6 +1483,20 @@ rec {
     };
   };
 
+  CPANUploader = buildPerlPackage {
+    name = "CPAN-Uploader-0.103004";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Uploader-0.103004.tar.gz;
+      sha256 = "cfaf6d4ad32a92cdefabb3abaf1f43c7c11aca5afd5561ea6f691065ac396e97";
+    };
+    propagatedBuildInputs = [ FileHomeDir GetoptLongDescriptive HTTPMessage LWP LWPProtocolhttps TermReadKey ];
+    meta = {
+      homepage = https://github.com/rjbs/cpan-uploader;
+      description = "Upload things to the CPAN";
+      license = "perl";
+    };
+  };
+
   CryptCBC = buildPerlPackage rec {
     name = "Crypt-CBC-2.30";
     src = fetchurl {
@@ -1672,6 +1735,20 @@ rec {
     propagatedBuildInputs = [TestException ClassAccessorChained];
   };
 
+  DataSection = buildPerlPackage {
+    name = "Data-Section-0.101622";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Data-Section-0.101622.tar.gz;
+      sha256 = "33613e5daf0791fc2c5878fd82ef260e944b1e1fa205bcc753c31c62f5b7c7d3";
+    };
+    propagatedBuildInputs = [ MROCompat SubExporter ];
+    meta = {
+      homepage = https://github.com/rjbs/data-section;
+      description = "Read multiple hunks of data out of your DATA section";
+      license = "perl";
+    };
+  };
+
   DataSerializer = buildPerlPackage {
     name = "Data-Serializer-0.59";
     src = fetchurl {
@@ -2166,6 +2243,20 @@ rec {
     };
   };
 
+  DevelFindPerl = buildPerlPackage {
+    name = "Devel-FindPerl-0.006";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/L/LE/LEONT/Devel-FindPerl-0.006.tar.gz;
+      sha256 = "60d5a0fd6880e5cfda381159acd3dbbc21c1121dc44c94ecd323ad5a148e03ff";
+    };
+    buildInputs = [ CaptureTiny ];
+    propagatedBuildInputs = [ ExtUtilsConfig ];
+    meta = {
+      description = "Find the path to your perl";
+      license = "perl";
+    };
+  };
+
   DevelGlobalDestruction = buildPerlPackage {
     name = "Devel-GlobalDestruction-0.09";
     src = fetchurl {
@@ -2314,6 +2405,22 @@ rec {
     };
   };
 
+  DistZilla = buildPerlPackage {
+    name = "Dist-Zilla-4.300036";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-4.300036.tar.gz;
+      sha256 = "d78c1425d51571d9bc61ed3b20c5aaec1eb59e756ceda3ac40ed727e6c93bf21";
+    };
+    buildInputs = [ FileShareDirInstall SoftwareLicense TestFatal TestFileShareDir TestScript ];
+    propagatedBuildInputs = [ AppCmd CPANUploader ClassLoad ConfigINI ConfigMVP ConfigMVPReaderINI DataSection DateTime FileCopyRecursive FileFindRule FileHomeDir FileShareDir FileShareDirInstall Filepushd HashMergeSimple JSON ListAllUtils ListMoreUtils LogDispatchouli Moose MooseAutobox MooseXLazyRequire MooseXRoleParameterized MooseXSetOnce MooseXTypes MooseXTypesPathClass MooseXTypesPerl PPI ParamsUtil PathClass PerlPrereqScanner PerlVersion PodEventual SoftwareLicense StringFormatter StringRewritePrefix SubExporter SubExporterForMethods TermReadKey TestDeep TextGlob TextTemplate TryTiny YAMLTiny autobox namespaceautoclean CPANMetaRequirements ];
+    meta = {
+      homepage = http://dzil.org/;
+      description = "Distribution builder; installer not included!";
+      license = "perl";
+    };
+    doCheck = false;
+  };
+
   EmailAbstract = buildPerlPackage {
     name = "Email-Abstract-3.004";
     src = fetchurl {
@@ -2797,6 +2904,20 @@ rec {
     propagatedBuildInputs = [ NumberCompare TextGlob ];
   };
 
+  FileHomeDir = buildPerlPackage {
+    name = "File-HomeDir-1.00";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/A/AD/ADAMK/File-HomeDir-1.00.tar.gz;
+      sha256 = "85b94f3513093ec0a25b91f9f2571918519ae6f2b7a1e8546f8f78d09a877143";
+    };
+    propagatedBuildInputs = [ FileWhich ];
+    meta = {
+      description = "Find your home and other directories on any platform";
+      license = "perl";
+    };
+    preCheck = "export HOME=$TMPDIR";
+  };
+
   FileListing = buildPerlPackage rec {
     name = "File-Listing-6.04";
     src = fetchurl {
@@ -3114,6 +3235,20 @@ rec {
     };
   };
 
+  HashMergeSimple = buildPerlPackage {
+    name = "Hash-Merge-Simple-0.051";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RO/ROKR/Hash-Merge-Simple-0.051.tar.gz;
+      sha256 = "1c56327873d2f04d5722777f044863d968910466997740d55a754071c6287b73";
+    };
+    buildInputs = [ TestMost ];
+    propagatedBuildInputs = [ Clone ];
+    meta = {
+      description = "Recursively merge two or more hashes, simply";
+      license = "perl";
+    };
+  };
+
   HashMultiValue = buildPerlPackage {
     name = "Hash-MultiValue-0.13";
     src = fetchurl {
@@ -3979,6 +4114,36 @@ rec {
     };
   };
 
+  LogDispatchArray = buildPerlPackage {
+    name = "Log-Dispatch-Array-1.002";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Log-Dispatch-Array-1.002.tar.gz;
+      sha256 = "268ec720eec3651d3dadcad7d16f033b47f883c72d6f2547c4ccbe7fb22a4940";
+    };
+    buildInputs = [ TestDeep ];
+    propagatedBuildInputs = [ LogDispatch ];
+    meta = {
+      homepage = https://github.com/rjbs/log-dispatch-array;
+      description = "Log events to an array (reference)";
+      license = "perl";
+    };
+  };
+
+  LogDispatchouli = buildPerlPackage {
+    name = "Log-Dispatchouli-2.006";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Log-Dispatchouli-2.006.tar.gz;
+      sha256 = "bd33b4fcf88ccfb694593ea6d7b330f053e6afee40f27acdf690c24547365354";
+    };
+    buildInputs = [ TestDeep TestFatal ];
+    propagatedBuildInputs = [ LogDispatch LogDispatchArray ParamsUtil StringFlogger SubExporter SubExporterGlobExporter TryTiny ];
+    meta = {
+      homepage = https://github.com/rjbs/log-dispatchouli;
+      description = "A simple wrapper around Log::Dispatch";
+      license = "perl";
+    };
+  };
+
   LWP = buildPerlPackage {
     name = "libwww-perl-6.05";
     src = fetchurl {
@@ -4005,6 +4170,8 @@ rec {
     };
   };
 
+  LWPProtocolhttps = pkgs.perlPackages.LWPProtocolHttps;
+
   LWPProtocolHttps = buildPerlPackage rec {
     name = "LWP-Protocol-https-6.04";
     src = fetchurl {
@@ -4244,6 +4411,20 @@ rec {
     };
   };
 
+  MixinLinewise = buildPerlPackage {
+    name = "Mixin-Linewise-0.004";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Mixin-Linewise-0.004.tar.gz;
+      sha256 = "7a50d171850d3e0dde51e041eecd40abc68396ea822baa4381951a7710833dd9";
+    };
+    propagatedBuildInputs = [ IOString SubExporter ];
+    meta = {
+      homepage = https://github.com/rjbs/mixin-linewise;
+      description = "Write your linewise code for handles; this does the rest";
+      license = "perl";
+    };
+  };
+
   ModuleBuild = buildPerlPackage {
     name = "Module-Build-0.4005";
     src = fetchurl {
@@ -4356,6 +4537,19 @@ rec {
     propagatedBuildInputs = [ version ];
   };
 
+  ModulePath = buildPerlPackage {
+    name = "Module-Path-0.09";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/N/NE/NEILB/Module-Path-0.09.tar.gz;
+      sha256 = "5330a76ff56800778d825548b4d631510a1a6b4f04725dddca95e68c4ed3ac18";
+    };
+    buildInputs = [ DevelFindPerl ];
+    meta = {
+      description = "Get the full path to a locally installed module";
+      license = "perl";
+    };
+  };
+
   ModulePluggable = buildPerlPackage {
     name = "Module-Pluggable-4.8";
     src = fetchurl {
@@ -4457,13 +4651,18 @@ rec {
     };
   };
 
-  MooseAutobox = buildPerlPackage rec {
-    name = "Moose-Autobox-0.09";
+  MooseAutobox = buildPerlPackage {
+    name = "Moose-Autobox-0.13";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
-      sha256 = "12wsm576mc5sdqc1bhim9iazdx4fy336gz10zwwalygri3arlvgh";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Moose-Autobox-0.13.tar.gz;
+      sha256 = "3474b3e6dfe099fcca34089375ace6612cca35d4d8f9a0b8b4e48fbf88541b21";
+    };
+    buildInputs = [ TestException ];
+    propagatedBuildInputs = [ Moose SyntaxKeywordJunction autobox ];
+    meta = {
+      description = "Autoboxed wrappers for Native Perl datatypes";
+      license = "perl";
     };
-    propagatedBuildInputs = [Moose TestException Autobox Perl6Junction];
   };
 
   MooseXABC = buildPerlPackage {
@@ -4610,6 +4809,21 @@ rec {
     };
   };
 
+  MooseXLazyRequire = buildPerlPackage {
+    name = "MooseX-LazyRequire-0.10";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-LazyRequire-0.10.tar.gz;
+      sha256 = "a555f80c0e91bc428f040015f00dd98f3c022704ec089516b9b3507f3d437090";
+    };
+    buildInputs = [ TestCheckDeps TestFatal ];
+    propagatedBuildInputs = [ Moose aliased namespaceautoclean ];
+    meta = {
+      homepage = https://github.com/karenetheridge/moosex-lazyrequire;
+      description = "Required attributes which fail only when trying to use them";
+      license = "perl";
+    };
+  };
+
   MooseXMarkAsMethods = buildPerlPackage {
     name = "MooseX-MarkAsMethods-0.15";
     src = fetchurl {
@@ -4654,6 +4868,21 @@ rec {
     };
   };
 
+  MooseXOneArgNew = buildPerlPackage {
+    name = "MooseX-OneArgNew-0.003";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/MooseX-OneArgNew-0.003.tar.gz;
+      sha256 = "bd1879192f542dbc0741dbd1ba71f29bd22a0fce372d7a6ae04dbded51d71123";
+    };
+    buildInputs = [ Moose ];
+    propagatedBuildInputs = [ Moose MooseXRoleParameterized namespaceautoclean ];
+    meta = {
+      homepage = https://github.com/rjbs/moosex-oneargnew;
+      description = "Teach ->new to accept single, non-hashref arguments";
+      license = "perl";
+    };
+  };
+
   MooseXRelatedClassRoles = buildPerlPackage rec {
     name = "MooseX-RelatedClassRoles-0.004";
     src = fetchurl {
@@ -4866,6 +5095,19 @@ rec {
     };
   };
 
+  MooseXTypesPerl = buildPerlPackage {
+    name = "MooseX-Types-Perl-0.101341";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/MooseX-Types-Perl-0.101341.tar.gz;
+      sha256 = "d1081a734d62121f3262b18170022de2f51ebcc0a8b8afe1b1273d7cb3e58c97";
+    };
+    propagatedBuildInputs = [ MooseXTypes ParamsUtil ];
+    meta = {
+      description = "Moose types that check against Perl syntax";
+      license = "perl";
+    };
+  };
+
   MooseXTypesStringlike = buildPerlPackage {
     name = "MooseX-Types-Stringlike-0.001";
     src = fetchurl {
@@ -5610,22 +5852,18 @@ rec {
     };
   };
 
-  PPI = buildPerlPackage rec {
-    name = "PPI-1.210";
+  PPI = buildPerlPackage {
+    name = "PPI-1.215";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz";
-      sha256 = "6c851e86475242fa0def2f02565743d41ab703ff6df3e826166ee9df5b961c7a";
+      url = mirror://cpan/authors/id/A/AD/ADAMK/PPI-1.215.tar.gz;
+      sha256 = "db238e84da705b952b69f25554019ce70124079a0ad43713d0638aa14ba54878";
+    };
+    buildInputs = [ ClassInspector FileRemove TestNoWarnings TestObject TestSubCalls ];
+    propagatedBuildInputs = [ Clone IOString ListMoreUtils ParamsUtil TaskWeaken ];
+    meta = {
+      description = "Parse, Analyze and Manipulate Perl (without perl)";
+      license = "perl";
     };
-    propagatedBuildInputs = [
-      ClassInspector
-      Clone
-      FileRemove
-      IOString
-      ListMoreUtils
-      ParamsUtil
-      TaskWeaken
-      TestNoWarnings TestObject TestSubCalls
-    ];
     doCheck = false;
   };
 
@@ -5664,6 +5902,34 @@ rec {
     };
   };
 
+  PerlPrereqScanner = buildPerlPackage {
+    name = "Perl-PrereqScanner-1.016";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Perl-PrereqScanner-1.016.tar.gz;
+      sha256 = "1ab70723f3d036ef91684572beacab40bf99f5ed69922769aa077664c778c474";
+    };
+    buildInputs = [ PPI TryTiny ];
+    propagatedBuildInputs = [ GetoptLongDescriptive ListMoreUtils ModulePath Moose PPI ParamsUtil StringRewritePrefix namespaceautoclean ];
+    meta = {
+      homepage = https://github.com/rjbs/perl-prereqscanner;
+      description = "A tool to scan your Perl code for its prerequisites";
+      license = "perl";
+    };
+  };
+
+  PerlVersion = buildPerlPackage {
+    name = "Perl-Version-1.011";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/A/AN/ANDYA/Perl-Version-1.011.tar.gz;
+      sha256 = "12ede8a87a12574fcd525c1d23d8a5b2fa2918ff5b78eb56cf701251a81af19b";
+    };
+    propagatedBuildInputs = [ FileSlurp ];
+    meta = {
+      description = "Parse and manipulate Perl version strings";
+      license = "perl";
+    };
+  };
+
   PodCoverage = buildPerlPackage rec {
     name = "Pod-Coverage-0.19";
     src = fetchurl {
@@ -5681,6 +5947,19 @@ rec {
     };
   };
 
+  PodEventual = buildPerlPackage {
+    name = "Pod-Eventual-0.093330";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Eventual-0.093330.tar.gz;
+      sha256 = "29de14a69df8a26f7e8ff73daca5afa7acc84cc9b7ae28093a5b1af09a4830b6";
+    };
+    propagatedBuildInputs = [ MixinLinewise TestDeep ];
+    meta = {
+      description = "Read a POD document as a series of trivial events";
+      license = "perl";
+    };
+  };
+
   PodSimple = buildPerlPackage {
     name = "Pod-Simple-3.05";
     src = fetchurl {
@@ -5801,6 +6080,34 @@ rec {
     };
   };
 
+  RoleHasMessage = buildPerlPackage {
+    name = "Role-HasMessage-0.005";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Role-HasMessage-0.005.tar.gz;
+      sha256 = "bc6cecf3022159dc415fb931e38291425d6aa8a9542d980b14ea692141337ca9";
+    };
+    buildInputs = [ Moose ];
+    propagatedBuildInputs = [ Moose MooseXRoleParameterized StringErrf TryTiny namespaceclean ];
+    meta = {
+      description = "A thing with a message method";
+      license = "perl";
+    };
+  };
+
+  RoleIdentifiable = buildPerlPackage {
+    name = "Role-Identifiable-0.005";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Role-Identifiable-0.005.tar.gz;
+      sha256 = "86910b6052d50bc64d1613bc1274f2ae17d553bfc3f0247a3fe3f7bb2cdd3aee";
+    };
+    buildInputs = [ Moose ];
+    propagatedBuildInputs = [ Moose ];
+    meta = {
+      description = "A thing with a list of tags";
+      license = "perl";
+    };
+  };
+
   RoleTiny = buildPerlPackage {
     name = "Role-Tiny-1.002004";
     src = fetchurl {
@@ -5929,6 +6236,20 @@ rec {
     buildInputs = [ pkgs.which ];
   };
 
+  SoftwareLicense = buildPerlPackage {
+    name = "Software-License-0.103005";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Software-License-0.103005.tar.gz;
+      sha256 = "050a14e0b3fb15763fd267fdd8ccc7ec8c459d8cc830b0bdc39ce09f5910f88c";
+    };
+    propagatedBuildInputs = [ DataSection SubInstall TextTemplate ];
+    meta = {
+      homepage = https://github.com/rjbs/software-license;
+      description = "Packages that provide templated software licenses";
+      license = "perl";
+    };
+  };
+
   SortVersions = buildPerlPackage rec {
     name = "Sort-Versions-1.5";
     src = fetchurl {
@@ -6113,6 +6434,20 @@ rec {
       };
   };
 
+  StringErrf = buildPerlPackage {
+    name = "String-Errf-0.006";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/String-Errf-0.006.tar.gz;
+      sha256 = "2c09631fbece8e85a94785abede882f5d29e0f21f72239d01332b3bafd9c53ac";
+    };
+    buildInputs = [ JSON TimeDate ];
+    propagatedBuildInputs = [ ParamsUtil StringFormatter SubExporter ];
+    meta = {
+      description = "A simple sprintf-like dialect";
+      license = "perl";
+    };
+  };
+
   StringEscape = buildPerlPackage rec {
     name = "String-Escape-2010.002";
     src = fetchurl {
@@ -6121,6 +6456,20 @@ rec {
     };
   };
 
+  StringFlogger = buildPerlPackage {
+    name = "String-Flogger-1.101243";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/String-Flogger-1.101243.tar.gz;
+      sha256 = "05e3f55198e96d56d27867b81c244d801a5d85e5b19b7acc3352993aefbd29fd";
+    };
+    propagatedBuildInputs = [ JSON ParamsUtil SubExporter ];
+    meta = {
+      homepage = https://github.com/rjbs/string-flogger;
+      description = "String munging for loggers";
+      license = "perl";
+    };
+  };
+
   StringFormat = buildPerlPackage rec {
     name = "String-Format-1.16";
     src = fetchurl {
@@ -6129,6 +6478,19 @@ rec {
     };
   };
 
+  StringFormatter = buildPerlPackage {
+    name = "String-Formatter-0.102082";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/String-Formatter-0.102082.tar.gz;
+      sha256 = "93d787dd8f13832a3683d219e086eaf4eb6c5391e396bfcc364c414423b0051a";
+    };
+    propagatedBuildInputs = [ ParamsUtil SubExporter ];
+    meta = {
+      description = "Build sprintf-like functions of your own";
+      license = "gpl";
+    };
+  };
+
   StringMkPasswd = buildPerlPackage {
     name = "String-MkPasswd-0.02";
     src = fetchurl {
@@ -6209,6 +6571,33 @@ rec {
     };
   };
 
+  SubExporterForMethods = buildPerlPackage {
+    name = "Sub-Exporter-ForMethods-0.100050";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-ForMethods-0.100050.tar.gz;
+      sha256 = "67dfaa39c58995ed1d341d7f2e785a68b7ba4ade72608f491459b8d2dee6df33";
+    };
+    propagatedBuildInputs = [ SubExporter SubName ];
+    meta = {
+      description = "Helper routines for using Sub::Exporter to build methods";
+      license = "perl";
+    };
+  };
+
+  SubExporterGlobExporter = buildPerlPackage {
+    name = "Sub-Exporter-GlobExporter-0.003";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-GlobExporter-0.003.tar.gz;
+      sha256 = "4cb082331151360756f3b2f8122fdd44597a207d62bd3f2ecb13578005116ab1";
+    };
+    propagatedBuildInputs = [ SubExporter ];
+    meta = {
+      homepage = https://github.com/rjbs/sub-exporter-globexporter;
+      description = "Export shared globs with Sub::Exporter collectors";
+      license = "perl";
+    };
+  };
+
   SubExporterProgressive = buildPerlPackage {
     name = "Sub-Exporter-Progressive-0.001006";
     src = fetchurl {
@@ -6345,6 +6734,33 @@ rec {
     };
   };
 
+  syntax = buildPerlPackage {
+    name = "syntax-0.004";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/P/PH/PHAYLON/syntax-0.004.tar.gz;
+      sha256 = "fe19b6da8a8f43a5aa2ee571441bc0e339fb156d0081c157a1a24e9812c7d365";
+    };
+    propagatedBuildInputs = [ DataOptList namespaceclean ];
+    meta = {
+      homepage = https://github.com/phaylon/syntax/wiki;
+      description = "Activate syntax extensions";
+      license = "perl";
+    };
+  };
+
+  SyntaxKeywordJunction = buildPerlPackage {
+    name = "Syntax-Keyword-Junction-0.003006";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/F/FR/FREW/Syntax-Keyword-Junction-0.003006.tar.gz;
+      sha256 = "182ab56d86bf3acf292d4ed5893ae0134f43843cdadba3e18f9885e6f86035ec";
+    };
+    propagatedBuildInputs = [ SubExporterProgressive TestRequires syntax ];
+    meta = {
+      description = "Perl6 style Junction operators in Perl5";
+      license = "perl";
+    };
+  };
+
   SysHostnameLong = buildPerlPackage rec {
     name = "Sys-Hostname-Long-1.4";
     src = fetchurl {
@@ -6661,6 +7077,21 @@ rec {
     };
   };
 
+  TestFileShareDir = buildPerlModule {
+    name = "Test-File-ShareDir-0.3.3";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/K/KE/KENTNL/Test-File-ShareDir-0.3.3.tar.gz;
+      sha256 = "877e14afb6f432bd888ef730c0afd776dd149b14bc520bc2ce842d114e5886a2";
+    };
+    buildInputs = [ TestFatal ];
+    propagatedBuildInputs = [ FileCopyRecursive FileShareDir PathTiny ];
+    meta = {
+      homepage = https://github.com/kentfredric/Test-File-ShareDir;
+      description = "Create a Fake ShareDir for your modules for testing";
+      license = "perl";
+    };
+  };
+
   TestHarness = buildPerlPackage rec {
     name = "Test-Harness-3.17";
     src = fetchurl {
@@ -7187,6 +7618,18 @@ rec {
     propagatedBuildInputs = [TextAligner];
   };
 
+  TextTemplate = buildPerlPackage {
+    name = "Text-Template-1.46";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MJ/MJD/Text-Template-1.46.tar.gz;
+      sha256 = "77d812cb86e48091bcd59aa8522ef887b33a0ff758f8a269da8c2b733889d580";
+    };
+    meta = {
+      description = "Unknown";
+      license = "unknown";
+    };
+  };
+
   TestTrap = buildPerlPackage {
     name = "Test-Trap-v0.2.2";
     src = fetchurl {

From a8a197587af4ab9260803b9a49186a041e60448c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 28 Aug 2013 15:16:52 -0400
Subject: [PATCH 176/452] Add some Dist::Zilla plugins and their many deps

Definitely need to write a more complete cpan2nix

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/top-level/perl-packages.nix | 748 +++++++++++++++++++++++++++++--
 1 file changed, 723 insertions(+), 25 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 80904ddf23a..c1bcb3a3496 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -329,11 +329,15 @@ rec {
     propagatedBuildInputs = [CarpClan];
   };
 
-  BKeywords = buildPerlPackage rec {
-    name = "B-Keywords-1.09";
+  BKeywords = buildPerlPackage {
+    name = "B-Keywords-1.13";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/J/JJ/JJORE/${name}.tar.gz";
-      sha256 = "9a231f54a01a705c574a38702cb3fe8bbb301ea7357a09797e3da876a265d395";
+      url = mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-1.13.tar.gz;
+      sha256 = "073eb916f69bd337261de6cb6cab8ccdb06f67415d8c7291453ebdfdfe0be405";
+    };
+    meta = {
+      description = "Lists of reserved barewords and symbol names";
+      license = "unknown";
     };
   };
 
@@ -1112,6 +1116,16 @@ rec {
     };
   };
 
+  ClassIterator = buildPerlPackage {
+    name = "Class-Iterator-0.3";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/T/TE/TEXMEC/Class-Iterator-0.3.tar.gz;
+      sha256 = "db1ba87ca9107f161fe9c1e9e7e267c0026defc26fe3e73bcad8ab8ffc18ef9d";
+    };
+    meta = {
+    };
+  };
+
   ClassMakeMethods = buildPerlPackage rec {
     name = "Class-MakeMethods-1.009";
     src = fetchurl {
@@ -1391,6 +1405,8 @@ rec {
     propagatedBuildInputs = [ SymbolUtil ];
   };
 
+  constantdefer = pkgs.perlPackages.constant-defer;
+
   constant-defer = buildPerlPackage rec {
     name = "constant-defer-5";
     src = fetchurl {
@@ -1427,6 +1443,18 @@ rec {
     propagatedBuildInputs = [ AnyEvent Guard CommonSense ];
   };
 
+  CPANChanges = buildPerlPackage {
+    name = "CPAN-Changes-0.23";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/B/BR/BRICAS/CPAN-Changes-0.23.tar.gz;
+      sha256 = "445a5c751d047c2a2e20680aa86d8bdab25e52891bac24681e9b4f24e98a347c";
+    };
+    meta = {
+      description = "Read and write Changes files";
+      license = "perl";
+    };
+  };
+
   CPANMeta = buildPerlPackage {
     name = "CPAN-Meta-2.120921";
     src = fetchurl {
@@ -2421,6 +2449,301 @@ rec {
     doCheck = false;
   };
 
+  DistZillaPluginBundleTestingMania = buildPerlPackage {
+    name = "Dist-Zilla-PluginBundle-TestingMania-0.20";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-PluginBundle-TestingMania-0.20.tar.gz;
+      sha256 = "073e17a98b0f88a1b60ce45a325d7447a19db394fcc6f01472bacb1956106da8";
+    };
+    buildInputs = [ CaptureTiny DistZilla MooseAutobox perl ];
+    propagatedBuildInputs = [ DistZilla DistZillaPluginMojibakeTests DistZillaPluginNoTabsTests DistZillaPluginTestCPANChanges DistZillaPluginTestCPANMetaJSON DistZillaPluginTestCompile DistZillaPluginTestDistManifest DistZillaPluginTestEOL DistZillaPluginTestKwalitee DistZillaPluginTestMinimumVersion DistZillaPluginTestPerlCritic DistZillaPluginTestPodLinkCheck DistZillaPluginTestPortability DistZillaPluginTestSynopsis DistZillaPluginTestUnusedVars DistZillaPluginTestVersion JSONPP ListMoreUtils Moose PodCoverageTrustPod TestCPANMeta TestPerlCritic TestVersion namespaceautoclean ];
+    meta = {
+      homepage = http://metacpan.org/release/Dist-Zilla-PluginBundle-TestingMania/;
+      description = "Test your dist with every testing plugin conceivable";
+      license = "perl";
+    };
+  };
+
+  DistZillaPluginCheckChangeLog = buildPerlPackage {
+    name = "Dist-Zilla-Plugin-CheckChangeLog-0.01";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/F/FA/FAYLAND/Dist-Zilla-Plugin-CheckChangeLog-0.01.tar.gz;
+      sha256 = "153dbe5ff8cb3c060901e003237a0515d7b9b5cc870eebfd417a6c91e28edec2";
+    };
+    propagatedBuildInputs = [ DistZilla ];
+    meta = {
+      description = "Dist::Zilla with Changes check";
+      license = "perl";
+    };
+  };
+
+  DistZillaPluginMojibakeTests = buildPerlPackage {
+    name = "Dist-Zilla-Plugin-MojibakeTests-0.5";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SY/SYP/Dist-Zilla-Plugin-MojibakeTests-0.5.tar.gz;
+      sha256 = "0630acc9bcb415feba49b55a1b70da6e49a740673b4a483fc8058d03c6a21676";
+    };
+    propagatedBuildInputs = [ DistZilla Moose TestMojibake UnicodeCheckUTF8 ];
+    meta = {
+      homepage = https://github.com/creaktive/Dist-Zilla-Plugin-MojibakeTests;
+      description = "Release tests for source encoding";
+      license = "perl";
+    };
+  };
+
+  DistZillaPluginNoTabsTests = buildPerlPackage {
+    name = "Dist-Zilla-Plugin-NoTabsTests-0.01";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/F/FL/FLORA/Dist-Zilla-Plugin-NoTabsTests-0.01.tar.gz;
+      sha256 = "fd4ed380de4fc2bad61db377cc50ab26b567e53b3a1efd0b8d8baab80256ef9e";
+    };
+    propagatedBuildInputs = [ DistZilla Moose TestNoTabs namespaceautoclean ];
+    meta = {
+      homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-NoTabsTests;
+      description = "Release tests making sure hard tabs aren't used";
+      license = "perl";
+    };
+  };
+
+  DistZillaPluginPodWeaver = buildPerlPackage {
+    name = "Dist-Zilla-Plugin-PodWeaver-3.101642";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-Plugin-PodWeaver-3.101642.tar.gz;
+      sha256 = "66066a236be7bd0a3e0ae764a4b9ac10408d40693a1c800c5fdd7e03c3542e00";
+    };
+    buildInputs = [ FileFindRule ];
+    propagatedBuildInputs = [ DistZilla ListMoreUtils Moose PPI PodElementalPerlMunger PodWeaver namespaceautoclean ];
+    meta = {
+      homepage = https://github.com/rjbs/Dist-Zilla-Plugin-PodWeaver;
+      description = "Weave your Pod together from configuration and Dist::Zilla";
+      license = "perl";
+    };
+  };
+
+  DistZillaPluginReadmeAnyFromPod = buildPerlPackage {
+    name = "Dist-Zilla-Plugin-ReadmeAnyFromPod-0.131500";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RT/RTHOMPSON/Dist-Zilla-Plugin-ReadmeAnyFromPod-0.131500.tar.gz;
+      sha256 = "4d02ce5f185e0d9061019c1925a410931d0c1848db7e5ba5f8e676f04634b06e";
+    };
+    buildInputs = [ DistZilla TestMost ];
+    propagatedBuildInputs = [ DistZilla FileSlurp IOstringy Moose MooseAutobox MooseXHasSugar PodMarkdown ];
+    meta = {
+      homepage = https://github.com/DarwinAwardWinner/Dist-Zilla-Plugin-ReadmeAnyFromPod;
+      description = "Automatically convert POD to a README in any format for Dist::Zilla";
+      license = "perl";
+    };
+  };
+
+  DistZillaPluginReadmeMarkdownFromPod = buildPerlPackage {
+    name = "Dist-Zilla-Plugin-ReadmeMarkdownFromPod-0.120120";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RT/RTHOMPSON/Dist-Zilla-Plugin-ReadmeMarkdownFromPod-0.120120.tar.gz;
+      sha256 = "5a3346daab4e2bba850ee4a7898467da9f80bc93cc10d2d625f9880a46092160";
+    };
+    buildInputs = [ DistZilla TestMost ];
+    propagatedBuildInputs = [ DistZillaPluginReadmeAnyFromPod Moose ];
+    meta = {
+      homepage = https://github.com/DarwinAwardWinner/Dist-Zilla-Plugin-ReadmeMarkdownFromPod;
+      description = "Automatically convert POD to a README.mkdn for Dist::Zilla";
+      license = "perl";
+    };
+  };
+
+  DistZillaPluginTestCPANChanges = buildPerlPackage {
+    name = "Dist-Zilla-Plugin-Test-CPAN-Changes-0.008";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-CPAN-Changes-0.008.tar.gz;
+      sha256 = "e8e49a23fb6fa021dec4fc4ab0a05a2ad50ac26195536c109a96b681ba4decd2";
+    };
+    buildInputs = [ CPANChanges DistZilla MooseAutobox ];
+    propagatedBuildInputs = [ CPANChanges DataSection DistZilla Moose ];
+    meta = {
+      homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-CPAN-Changes/;
+      description = "Release tests for your changelog";
+      license = "perl";
+    };
+  };
+
+  DistZillaPluginTestCPANMetaJSON = buildPerlPackage {
+    name = "Dist-Zilla-Plugin-Test-CPAN-Meta-JSON-0.003";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-CPAN-Meta-JSON-0.003.tar.gz;
+      sha256 = "c76b9f5745f4626969bb9c60e1330ebd0d8b197f8dd33f9a6e6fce63877b4883";
+    };
+    buildInputs = [ DistZilla ];
+    propagatedBuildInputs = [ DistZilla Moose MooseAutobox ];
+    meta = {
+      homepage = http://p3rl.org/Dist::Zilla::Plugin::Test::CPAN::Meta::JSON;
+      description = "Release tests for your META.json";
+      license = "perl";
+    };
+  };
+
+  DistZillaPluginTestCompile = buildPerlModule {
+    name = "Dist-Zilla-Plugin-Test-Compile-2.021";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-Compile-2.021.tar.gz;
+      sha256 = "665c48de1c7c33e9b00e8ddc0204d02b45009e60b9b65033fa4a832dfe9fc808";
+    };
+    buildInputs = [ DistCheckConflicts DistZilla JSON ModuleBuildTiny PathClass TestCheckDeps TestWarnings ];
+    propagatedBuildInputs = [ DataSection DistCheckConflicts DistZilla Moose PathTiny SubExporterForMethods namespaceautoclean ModuleCoreList ];
+    meta = {
+      homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-Test-Compile/;
+      description = "Common tests to check syntax of your modules";
+      license = "perl";
+    };
+  };
+
+  DistZillaPluginTestDistManifest = buildPerlPackage {
+    name = "Dist-Zilla-Plugin-Test-DistManifest-2.000004";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-DistManifest-2.000004.tar.gz;
+      sha256 = "a832d9d04f85e9dd09f30af67c5d636efe79847ec3790939de081ee5e412fb68";
+    };
+    buildInputs = [ CaptureTiny DistZilla MooseAutobox TestOutput ];
+    propagatedBuildInputs = [ DistZilla Moose TestDistManifest ];
+    meta = {
+      homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-DistManifest/;
+      description = "Release tests for the manifest";
+      license = "perl";
+    };
+  };
+
+  DistZillaPluginTestEOL = buildPerlPackage {
+    name = "Dist-Zilla-Plugin-Test-EOL-0.07";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/X/XE/XENO/Dist-Zilla-Plugin-Test-EOL-0.07.tar.gz;
+      sha256 = "c010ef618478e82fbc601abfc241c74fed1fdafe954d8b3ebcb7abe0e09967a8";
+    };
+    buildInputs = [ DistZilla TestScript ];
+    propagatedBuildInputs = [ DistZilla Moose TestEOL namespaceautoclean ];
+    meta = {
+      homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-Test-EOL/;
+      description = "Author tests making sure correct line endings are used";
+      license = "artistic_2";
+    };
+  };
+
+  DistZillaPluginTestKwalitee = buildPerlPackage {
+    name = "Dist-Zilla-Plugin-Test-Kwalitee-2.06";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-Kwalitee-2.06.tar.gz;
+      sha256 = "1723beb96d4048fd4fb0fea2ed36c0c6f3ea4648ce7f93d4cb73e5d49e274bf6";
+    };
+    buildInputs = [ CaptureTiny DistZilla PathClass perl ];
+    propagatedBuildInputs = [ DataSection DistZilla Moose SubExporterForMethods namespaceautoclean ];
+    meta = {
+      homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-Kwalitee;
+      description = "Release tests for kwalitee";
+      license = "perl";
+    };
+  };
+
+  DistZillaPluginTestMinimumVersion = buildPerlPackage {
+    name = "Dist-Zilla-Plugin-Test-MinimumVersion-2.000005";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-MinimumVersion-2.000005.tar.gz;
+      sha256 = "988c71a3158e94e7a0b23f346f19af4a0ed67e101a2653c3185c5ae49981132b";
+    };
+    buildInputs = [ DistZilla MooseAutobox TestOutput ];
+    propagatedBuildInputs = [ DistZilla Moose TestMinimumVersion ];
+    meta = {
+      homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-MinimumVersion/;
+      description = "Release tests for minimum required versions";
+      license = "perl";
+    };
+  };
+
+  DistZillaPluginTestPerlCritic = buildPerlModule {
+    name = "Dist-Zilla-Plugin-Test-Perl-Critic-2.112410";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/J/JQ/JQUELIN/Dist-Zilla-Plugin-Test-Perl-Critic-2.112410.tar.gz;
+      sha256 = "3ce59ce3ef6cf56d7de0debb33c26f899492d9742c8b82073e257787fd85630f";
+    };
+    buildInputs = [ DistZilla MooseAutobox ];
+    propagatedBuildInputs = [ DataSection DistZilla Moose namespaceautoclean ];
+    meta = {
+      homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-Test-Perl-Critic/;
+      description = "Tests to check your code against best practices";
+      license = "perl";
+    };
+  };
+
+  DistZillaPluginTestPodLinkCheck = buildPerlPackage {
+    name = "Dist-Zilla-Plugin-Test-Pod-LinkCheck-1.001";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RW/RWSTAUNER/Dist-Zilla-Plugin-Test-Pod-LinkCheck-1.001.tar.gz;
+      sha256 = "d75682175dff1f79928794ba30ea29389a4666f781a50cba281c25cfd3c95bbd";
+    };
+    propagatedBuildInputs = [ DistZilla Moose TestPodLinkCheck ];
+    meta = {
+      homepage = http://github.com/rwstauner/Dist-Zilla-Plugin-Test-Pod-LinkCheck;
+      description = "Add release tests for POD links";
+      license = "perl";
+    };
+  };
+
+  DistZillaPluginTestPortability = buildPerlPackage {
+    name = "Dist-Zilla-Plugin-Test-Portability-2.000005";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-Portability-2.000005.tar.gz;
+      sha256 = "b32d0a4b1d78ba76fabedd299c1a11efed05c3ce9752d7da6babe06d3515242b";
+    };
+    buildInputs = [ CaptureTiny DistZilla MooseAutobox TestOutput ];
+    propagatedBuildInputs = [ DistZilla Moose TestPortabilityFiles ];
+    meta = {
+      homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-Portability/;
+      description = "Release tests for portability";
+      license = "perl";
+    };
+  };
+
+  DistZillaPluginTestSynopsis = buildPerlPackage {
+    name = "Dist-Zilla-Plugin-Test-Synopsis-2.000004";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-Synopsis-2.000004.tar.gz;
+      sha256 = "d073de3206c5e588f60f55e4be64fab4c2595f5bc3013cd91307993691598d59";
+    };
+    buildInputs = [ CaptureTiny DistZilla MooseAutobox TestOutput ];
+    propagatedBuildInputs = [ DistZilla Moose TestSynopsis ];
+    meta = {
+      homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-Synopsis/;
+      description = "Release tests for synopses";
+      license = "perl";
+    };
+  };
+
+  DistZillaPluginTestUnusedVars = buildPerlPackage {
+    name = "Dist-Zilla-Plugin-Test-UnusedVars-2.000005";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-UnusedVars-2.000005.tar.gz;
+      sha256 = "37ec462dc82f45cfd9d6d92ee59b8fd215a9a14b18d179b05912baee77359804";
+    };
+    buildInputs = [ CaptureTiny DistZilla MooseAutobox TestOutput ];
+    propagatedBuildInputs = [ DistZilla Moose TestVars namespaceautoclean ];
+    meta = {
+      homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-UnusedVars/;
+      description = "Release tests for unused variables";
+      license = "perl";
+    };
+  };
+
+  DistZillaPluginTestVersion = buildPerlPackage {
+    name = "Dist-Zilla-Plugin-Test-Version-0.002004";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/X/XE/XENO/Dist-Zilla-Plugin-Test-Version-0.002004.tar.gz;
+      sha256 = "4ae5055071e07442223d07d818e9484430368b59c15966b90b18c8abc06f8e36";
+    };
+    buildInputs = [ DistZilla TestNoTabs TestScript ];
+    propagatedBuildInputs = [ DistZilla Moose TestVersion namespaceautoclean ];
+    meta = {
+      homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-Test-Version/;
+      description = "Release Test::Version tests";
+      license = "artistic_2";
+    };
+  };
+
   EmailAbstract = buildPerlPackage {
     name = "Email-Abstract-3.004";
     src = fetchurl {
@@ -2895,6 +3218,17 @@ rec {
     propagatedBuildInputs = [ FileBaseDir ];
   };
 
+  FileFindIterator = buildPerlPackage {
+    name = "File-Find-Iterator-0.4";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/T/TE/TEXMEC/File-Find-Iterator-0.4.tar.gz;
+      sha256 = "a2b87ab9756a2e5bb674adbd39937663ed20c28c716bf5a1095a3ca44d54ab2c";
+    };
+    propagatedBuildInputs = [ ClassIterator ];
+    meta = {
+    };
+  };
+
   FileFindRule = buildPerlPackage rec {
     name = "File-Find-Rule-0.32";
     src = fetchurl {
@@ -2904,6 +3238,19 @@ rec {
     propagatedBuildInputs = [ NumberCompare TextGlob ];
   };
 
+  FileFindRulePerl = buildPerlPackage {
+    name = "File-Find-Rule-Perl-1.13";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/A/AD/ADAMK/File-Find-Rule-Perl-1.13.tar.gz;
+      sha256 = "d2ecb270778ddf54c536a78d02fe6ee7a675f7dcb7f3497ba1a76493f1bd2476";
+    };
+    propagatedBuildInputs = [ FileFindRule ParamsUtil ];
+    meta = {
+      description = "Common rules for searching for Perl things";
+      license = "perl";
+    };
+  };
+
   FileHomeDir = buildPerlPackage {
     name = "File-HomeDir-1.00";
     src = fetchurl {
@@ -3594,6 +3941,16 @@ rec {
     };
   };
 
+  "if" = buildPerlPackage {
+    name = "if-0.0601";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/I/IL/ILYAZ/modules/if-0.0601.tar.gz;
+      sha256 = "fb2b7329aa111a673cd22dc2889167e52058aead0de2fe0855b32dd658d5c1b7";
+    };
+    meta = {
+    };
+  };
+
   IOAll = buildPerlPackage {
     name = "IO-All-0.46";
     src = fetchurl {
@@ -3712,6 +4069,8 @@ rec {
     };
   };
 
+  IOstringy = pkgs.perlPackages.IOStringy;
+
   IOStringy = buildPerlPackage rec {
     name = "IO-stringy-2.110";
     src = fetchurl {
@@ -3917,6 +4276,8 @@ rec {
     };
   };
 
+  libintlperl = pkgs.perlPackages.libintl_perl;
+
   libintl_perl = buildPerlPackage rec {
     name = "libintl-perl-1.23";
     src = fetchurl {
@@ -4439,10 +4800,10 @@ rec {
   };
 
   ModuleBuildTiny = buildPerlModule {
-    name = "Module-Build-Tiny-0.023";
+    name = "Module-Build-Tiny-0.026";
     src = fetchurl {
-      url = mirror://cpan/authors/id/L/LE/LEONT/Module-Build-Tiny-0.023.tar.gz;
-      sha256 = "eba7fbfea2dd84310ab00f22fd29bbf774b10a465df3f6133ca7da88c0bd6ac4";
+      url = mirror://cpan/authors/id/L/LE/LEONT/Module-Build-Tiny-0.026.tar.gz;
+      sha256 = "9a1860325404c4ea20e2a79e7236c5ad9203ab71bacab9667044e3fad1eb31ad";
     };
     buildInputs = [ ExtUtilsConfig ExtUtilsHelpers ExtUtilsInstallPaths JSONPP perl ];
     propagatedBuildInputs = [ ExtUtilsConfig ExtUtilsHelpers ExtUtilsInstallPaths JSONPP ];
@@ -4461,6 +4822,19 @@ rec {
     propagatedBuildInputs = [ ExtUtilsXSpp ExtUtilsCppGuess ];
   };
 
+  ModuleCoreList = buildPerlPackage {
+    name = "Module-CoreList-2.97";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-2.97.tar.gz;
+      sha256 = "fa39c487d43088e7010467621f57d8e3f57b72d2bbf711fc509e87a501f35e09";
+    };
+    meta = {
+      homepage = http://dev.perl.org/;
+      description = "What modules shipped with versions of perl";
+      license = "perl";
+    };
+  };
+
   ModuleFind = buildPerlPackage {
     name = "Module-Find-0.11";
     src = fetchurl {
@@ -4528,6 +4902,20 @@ rec {
     };
   };
 
+  ModuleManifest = buildPerlPackage {
+    name = "Module-Manifest-1.08";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/A/AD/ADAMK/Module-Manifest-1.08.tar.gz;
+      sha256 = "722ed428afcbe5b5b441b0165cbafbd8534fa63d7856d4089e6e25ac21e6445d";
+    };
+    buildInputs = [ TestException TestWarn ];
+    propagatedBuildInputs = [ ParamsUtil ];
+    meta = {
+      description = "Parse and examine a Perl distribution MANIFEST file";
+      license = "perl";
+    };
+  };
+
   ModuleMetadata = buildPerlPackage rec {
     name = "Module-Metadata-1.000005";
     src = fetchurl {
@@ -4809,6 +5197,21 @@ rec {
     };
   };
 
+  MooseXHasSugar = buildPerlModule {
+    name = "MooseX-Has-Sugar-0.05070421";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/K/KE/KENTNL/MooseX-Has-Sugar-0.05070421.tar.gz;
+      sha256 = "5acf92a6dcac50a6edfcbdb2c38802f8c1f9dc7194a79d0b85a3d4105ebba7df";
+    };
+    buildInputs = [ Moose MooseXTypes TestFatal namespaceautoclean ];
+    propagatedBuildInputs = [ SubExporter ];
+    meta = {
+      homepage = https://github.com/kentfredric/MooseX-Has-Sugar;
+      description = "Sugar Syntax for moose 'has' fields";
+      license = "perl";
+    };
+  };
+
   MooseXLazyRequire = buildPerlPackage {
     name = "MooseX-LazyRequire-0.10";
     src = fetchurl {
@@ -5719,16 +6122,19 @@ rec {
     };
   };
 
-  PerlCritic = buildPerlPackage rec {
-    name = "Perl-Critic-1.105";
+  PerlCritic = buildPerlPackage {
+    name = "Perl-Critic-1.118";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/E/EL/ELLIOTJS/${name}.tar.gz";
-      sha256 = "3e1bd5ab4912ebe20cd3cb81b36ee28dbdd8d410374a31025dc9fb289921ff27";
+      url = mirror://cpan/authors/id/T/TH/THALJEF/Perl-Critic-1.118.tar.gz;
+      sha256 = "666d2bef3ac924598c06a05277680da5910e10d94c5ec161336f6509c11155e8";
+    };
+    buildInputs = [ TestDeep ];
+    propagatedBuildInputs = [ BKeywords ConfigTiny EmailAddress ExceptionClass IOString ListMoreUtils PPI PPIxRegexp PPIxUtilities PerlTidy PodSpell Readonly StringFormat TaskWeaken ];
+    meta = {
+      homepage = http://perlcritic.com;
+      description = "Critique Perl source code for best-practices";
+      license = "perl";
     };
-    propagatedBuildInputs = [
-      PPI BKeywords ConfigTiny ExceptionClass Readonly StringFormat
-      EmailAddress FileWhich PerlTidy PodSpell ReadonlyXS RegexpParser
-    ];
   };
 
   PerlIOeol = buildPerlPackage {
@@ -5867,6 +6273,33 @@ rec {
     doCheck = false;
   };
 
+  PPIxRegexp = buildPerlPackage {
+    name = "PPIx-Regexp-0.034";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/W/WY/WYANT/PPIx-Regexp-0.034.tar.gz;
+      sha256 = "512a358f4bd6196df0601ff36f7831e0ba142fb8ef2bc3995e19bceabd0b5ae7";
+    };
+    propagatedBuildInputs = [ ListMoreUtils PPI TaskWeaken ];
+    meta = {
+      description = "Parse regular expressions";
+      license = "perl";
+    };
+  };
+
+  PPIxUtilities = buildPerlPackage {
+    name = "PPIx-Utilities-1.001000";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/E/EL/ELLIOTJS/PPIx-Utilities-1.001000.tar.gz;
+      sha256 = "03a483386fd6a2c808f09778d44db06b02c3140fb24ba4bf12f851f46d3bcb9b";
+    };
+    buildInputs = [ PPI TestDeep ];
+    propagatedBuildInputs = [ ExceptionClass PPI Readonly TaskWeaken ];
+    meta = {
+      description = "Extensions to L<PPI|PPI>";
+      license = "perl";
+    };
+  };
+
   ProcWaitStat = buildPerlPackage rec {
     name = "Proc-WaitStat-1.00";
     src = fetchurl {
@@ -5902,6 +6335,20 @@ rec {
     };
   };
 
+  PerlMinimumVersion = buildPerlPackage {
+    name = "Perl-MinimumVersion-1.32";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/C/CH/CHORNY/Perl-MinimumVersion-1.32.tar.gz;
+      sha256 = "fa9884abee80c7afc260a28a4e6a6804a0335f5f582e3931c3a53b8504f1a27a";
+    };
+    buildInputs = [ TestScript ];
+    propagatedBuildInputs = [ FileFindRule FileFindRulePerl PPI PPIxRegexp ParamsUtil PerlCritic ];
+    meta = {
+      description = "Find a minimum required version of perl for Perl code";
+      license = "perl";
+    };
+  };
+
   PerlPrereqScanner = buildPerlPackage {
     name = "Perl-PrereqScanner-1.016";
     src = fetchurl {
@@ -5939,6 +6386,50 @@ rec {
     propagatedBuildInputs = [DevelSymdump];
   };
 
+  PodCoverageTrustPod = buildPerlPackage {
+    name = "Pod-Coverage-TrustPod-0.100002";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Coverage-TrustPod-0.100002.tar.gz;
+      sha256 = "2389f8085c16087b10f59f1bd1b9de5d83cca5eb203778a2af1cee897b89bb6e";
+    };
+    propagatedBuildInputs = [ PodCoverage PodEventual ];
+    meta = {
+      homepage = https://github.com/rjbs/pod-coverage-trustpod;
+      description = "Allow a module's pod to contain Pod::Coverage hints";
+      license = "perl";
+    };
+  };
+
+  PodElemental = buildPerlPackage {
+    name = "Pod-Elemental-0.102362";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Elemental-0.102362.tar.gz;
+      sha256 = "2b56a2783650f170bc7131bb36de65e4e3372a54bab596a798debebbf2af8732";
+    };
+    buildInputs = [ TestDeep TestDifferences ];
+    propagatedBuildInputs = [ MixinLinewise Moose MooseAutobox MooseXTypes PodEventual StringRewritePrefix StringTruncate SubExporter SubExporterForMethods TestDeep TestDifferences namespaceautoclean ];
+    meta = {
+      homepage = https://github.com/rjbs/pod-elemental;
+      description = "Work with nestable Pod elements";
+      license = "perl";
+    };
+  };
+
+  PodElementalPerlMunger = buildPerlPackage {
+    name = "Pod-Elemental-PerlMunger-0.093332";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Elemental-PerlMunger-0.093332.tar.gz;
+      sha256 = "fc4c4ef76d2b557c590b998d08393b189a2af969d4d195439f37e7d7d466d062";
+    };
+    buildInputs = [ Moose PodElemental ];
+    propagatedBuildInputs = [ ListMoreUtils Moose PPI PodElemental namespaceautoclean ];
+    meta = {
+      homepage = https://github.com/rjbs/pod-elemental-perlmunger;
+      description = "A thing that takes a string of Perl and rewrites its documentation";
+      license = "perl";
+    };
+  };
+
   PodEscapes = buildPerlPackage {
     name = "Pod-Escapes-1.04";
     src = fetchurl {
@@ -5960,6 +6451,34 @@ rec {
     };
   };
 
+  podlinkcheck = buildPerlPackage {
+    name = "podlinkcheck-12";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/K/KR/KRYDE/podlinkcheck-12.tar.gz;
+      sha256 = "c5da0e390b58655934e1df57937d29d7de13b99f5638fe44833832a5b39c8aa5";
+    };
+    propagatedBuildInputs = [ FileFindIterator IPCRun constantdefer libintlperl ];
+    meta = {
+      homepage = http://user42.tuxfamily.org/podlinkcheck/index.html;
+      description = "Check POD L<> link references";
+      license = "gpl";
+    };
+  };
+
+  PodMarkdown = buildPerlPackage {
+    name = "Pod-Markdown-1.322";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RW/RWSTAUNER/Pod-Markdown-1.322.tar.gz;
+      sha256 = "375091d89d9662b0c41bedad391927d6904d05f740e1bb689b494b4b35e979f7";
+    };
+    buildInputs = [ TestDifferences ];
+    meta = {
+      homepage = https://github.com/rwstauner/Pod-Markdown;
+      description = "Convert POD to Markdown";
+      license = "perl";
+    };
+  };
+
   PodSimple = buildPerlPackage {
     name = "Pod-Simple-3.05";
     src = fetchurl {
@@ -5977,6 +6496,21 @@ rec {
     };
   };
 
+  PodWeaver = buildPerlPackage {
+    name = "Pod-Weaver-3.101638";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Weaver-3.101638.tar.gz;
+      sha256 = "1232b761016221e331a266a42661fa352447d0da075ebdb41dc4c4d71e60629c";
+    };
+    buildInputs = [ PPI SoftwareLicense TestDifferences ];
+    propagatedBuildInputs = [ ConfigMVP ConfigMVPReaderINI DateTime ListMoreUtils LogDispatchouli Moose MooseAutobox ParamsUtil PodElemental StringFlogger StringFormatter StringRewritePrefix namespaceautoclean ];
+    meta = {
+      homepage = https://github.com/rjbs/pod-weaver;
+      description = "Weave together a Pod document from an outline";
+      license = "perl";
+    };
+  };
+
   ProbePerl = buildPerlPackage rec {
     name = "Probe-Perl-0.01";
     src = fetchurl {
@@ -6040,11 +6574,16 @@ rec {
     };
   };
 
-  RegexpParser = buildPerlPackage rec {
-    name = "Regexp-Parser-0.20";
+  RegexpParser = buildPerlPackage {
+    name = "Regexp-Parser-0.21";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/P/PI/PINYAN/${name}.tar.gz";
-      sha256 = "0dfdbe060724396697303c5522e697679ab6e74151f3c3ef8df49f3bda30a2a5";
+      url = mirror://cpan/authors/id/T/TO/TODDR/Regexp-Parser-0.21.tar.gz;
+      sha256 = "d70cb66821f1f67a9b1ff53f0fa33c06aec8693791e0a5943be6760c25d2768d";
+    };
+    meta = {
+      homepage = http://wiki.github.com/toddr/Regexp-Parser;
+      description = "Base class for parsing regexes";
+      license = "unknown";
     };
   };
 
@@ -6531,6 +7070,19 @@ rec {
       [ LinguaENInflectPhrase TextUnidecode namespaceclean ];
   };
 
+  StringTruncate = buildPerlPackage {
+    name = "String-Truncate-1.100600";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/String-Truncate-1.100600.tar.gz;
+      sha256 = "e2665f82254a05b2a43c51bb8244661130ad9e052d4d8423b2ce2e9549c0bb5c";
+    };
+    propagatedBuildInputs = [ SubExporter SubInstall ];
+    meta = {
+      description = "A module for when strings are too long to be displayed in..";
+      license = "perl";
+    };
+  };
+
   StringTT = buildPerlPackage {
     name = "String-TT-0.03";
     src = fetchurl {
@@ -6988,17 +7540,29 @@ rec {
     propagatedBuildInputs = [ Spiffy ];
   };
 
-  TestCheckDeps = buildPerlPackage {
-    name = "Test-CheckDeps-0.002";
+  TestCheckDeps = buildPerlModule {
+    name = "Test-CheckDeps-0.006";
     src = fetchurl {
-      url = mirror://cpan/authors/id/L/LE/LEONT/Test-CheckDeps-0.002.tar.gz;
-      sha256 = "0fmm9xsgial599bqb6rcrc6xp0627rcdp0ivx8wsy807py5jk5i6";
+      url = mirror://cpan/authors/id/L/LE/LEONT/Test-CheckDeps-0.006.tar.gz;
+      sha256 = "774c1455566d11746118fd95305d1dbd111af86eac78058918e72468c43d9bcb";
     };
+    buildInputs = [ ModuleBuildTiny ];
     propagatedBuildInputs = [ CPANMetaCheck ];
     meta = {
-      homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
       description = "Check for presence of dependencies";
-      license = "perl5";
+      license = "perl";
+    };
+  };
+
+  TestCPANMeta = buildPerlPackage {
+    name = "Test-CPAN-Meta-0.23";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/B/BA/BARBIE/Test-CPAN-Meta-0.23.tar.gz;
+      sha256 = "dda70c5cb61eddc6d3148cb66b6ff5eb4546a065257f4c104112a8a8a3575116";
+    };
+    meta = {
+      description = "Validate your CPAN META.yml files";
+      license = "artistic_2";
     };
   };
 
@@ -7027,6 +7591,21 @@ rec {
     };
   };
 
+  TestDistManifest = buildPerlPackage {
+    name = "Test-DistManifest-1.012";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/E/ET/ETHER/Test-DistManifest-1.012.tar.gz;
+      sha256 = "4b128bef9beea2f03bdca037ceb722de43b4a2c516c3f50c2a26421548a72208";
+    };
+    buildInputs = [ TestNoWarnings ];
+    propagatedBuildInputs = [ ModuleManifest ];
+    meta = {
+      homepage = http://search.cpan.org/dist/Test-DistManifest;
+      description = "Author test that validates a package MANIFEST";
+      license = "perl";
+    };
+  };
+
   TestEOL = buildPerlPackage {
     name = "Test-EOL-1.5";
     src = fetchurl {
@@ -7183,6 +7762,19 @@ rec {
     };
   };
 
+  TestMojibake = buildPerlPackage {
+    name = "Test-Mojibake-0.8";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SY/SYP/Test-Mojibake-0.8.tar.gz;
+      sha256 = "66d82ca4fe539bb69ee8179d96370e50777a9547176428baf4dbe190ef78b4cb";
+    };
+    meta = {
+      homepage = https://github.com/creaktive/Test-Mojibake;
+      description = "Check your source for encoding misbehavior";
+      license = "perl";
+    };
+  };
+
   TestMore = TestSimple;
 
   TestMost = buildPerlPackage {
@@ -7273,6 +7865,33 @@ rec {
     propagatedBuildInputs = [PodCoverage];
   };
 
+  TestPodLinkCheck = buildPerlPackage {
+    name = "Test-Pod-LinkCheck-0.007";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/A/AP/APOCAL/Test-Pod-LinkCheck-0.007.tar.gz;
+      sha256 = "de2992e756fca96824411bb3ab2b94b05567cb3f2c5e3ffd8162ffdfd1f77c88";
+    };
+    buildInputs = [ TestTester ];
+    propagatedBuildInputs = [ CaptureTiny Moose TestPod podlinkcheck ];
+    meta = {
+      homepage = http://search.cpan.org/dist/Test-Pod-LinkCheck/;
+      description = "Tests POD for invalid links";
+      license = "perl";
+    };
+  };
+
+  TestPortabilityFiles = buildPerlPackage {
+    name = "Test-Portability-Files-0.06";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/A/AB/ABRAXXA/Test-Portability-Files-0.06.tar.gz;
+      sha256 = "3e0fd033387ab82df8aedd42a14a8e64200aebd59447ad62a3bc411ff4a808a8";
+    };
+    meta = {
+      description = "Check file names portability";
+      license = "perl";
+    };
+  };
+
   TestRequires = buildPerlPackage {
     name = "Test-Requires-0.06";
     src = fetchurl {
@@ -7328,6 +7947,18 @@ rec {
     propagatedBuildInputs = [ HookLexWrap ];
   };
 
+  TestSynopsis = buildPerlPackage {
+    name = "Test-Synopsis-0.06";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Test-Synopsis-0.06.tar.gz;
+      sha256 = "fb3eed184eaf8a3c2338ec14b7235fa75fc43cf5f3774d927a4c947a5141db1b";
+    };
+    meta = {
+      description = "Test your SYNOPSIS code";
+      license = "perl";
+    };
+  };
+
   TestTableDriven = buildPerlPackage {
     name = "Test-TableDriven-0.02";
     src = fetchurl {
@@ -7400,6 +8031,20 @@ rec {
     };
   };
 
+  TestWarnings = buildPerlModule {
+    name = "Test-Warnings-0.008";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/E/ET/ETHER/Test-Warnings-0.008.tar.gz;
+      sha256 = "119f2a279fe7d0681dcf4517f1bcb056e4596cfbae7b9ee447118f036cf089e4";
+    };
+    buildInputs = [ CaptureTiny ModuleBuildTiny TestCheckDeps TestDeep TestTester pkgs.perlPackages."if" ];
+    meta = {
+      homepage = https://github.com/karenetheridge/Test-Warnings;
+      description = "Test for warnings and the lack of them";
+      license = "perl";
+    };
+  };
+
   TestWithoutModule = buildPerlPackage {
     name = "Test-Without-Module-0.17";
     src = fetchurl {
@@ -7547,6 +8192,20 @@ rec {
     };
   };
 
+  TestMinimumVersion = buildPerlPackage {
+    name = "Test-MinimumVersion-0.101080";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Test-MinimumVersion-0.101080.tar.gz;
+      sha256 = "51fc0bd73ece9d41887f8d0a57ee27fbc205c271c5b5246111efe7d3247ddfb0";
+    };
+    buildInputs = [ TestTester ];
+    propagatedBuildInputs = [ FileFindRule FileFindRulePerl PerlMinimumVersion YAMLTiny ];
+    meta = {
+      description = "Does your code require newer perl than you think?";
+      license = "perl";
+    };
+  };
+
   TextMicroTemplate = buildPerlPackage {
     name = "Text-MicroTemplate-0.19";
     src = fetchurl {
@@ -7644,6 +8303,34 @@ rec {
     };
   };
 
+  TestVars = buildPerlModule {
+    name = "Test-Vars-0.005";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/G/GF/GFUJI/Test-Vars-0.005.tar.gz;
+      sha256 = "2aec9787332dd2f12bd7b07e18530ff9c07954116bbaae8ae902a8befff57ae7";
+    };
+    meta = {
+      homepage = https://github.com/gfx/p5-Test-Vars;
+      description = "Detects unused variables";
+      license = "perl";
+    };
+  };
+
+  TestVersion = buildPerlPackage {
+    name = "Test-Version-1.002001";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/X/XE/XENO/Test-Version-1.002001.tar.gz;
+      sha256 = "84e741a1b9196b41130a7ec3f07b94e0e97e7e3f8abfb65e599f2760e01202ad";
+    };
+    buildInputs = [ TestException TestRequires TestTester ];
+    propagatedBuildInputs = [ FileFindRulePerl ];
+    meta = {
+      homepage = http://search.cpan.org/dist/Test-Version/;
+      description = "Check to see that version's in modules are sane";
+      license = "artistic_2";
+    };
+  };
+
   TextTrim = buildPerlPackage {
     name = "Text-Trim-1.02";
     src = fetchurl {
@@ -7831,6 +8518,17 @@ rec {
     };
   };
 
+  UnicodeCheckUTF8 = buildPerlPackage {
+    name = "Unicode-CheckUTF8-1.03";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/B/BR/BRADFITZ/Unicode-CheckUTF8-1.03.tar.gz;
+      sha256 = "97f84daf033eb9b49cd8fe31db221fef035a5c2ee1d757f3122c88cf9762414c";
+    };
+    meta = {
+      license = "unknown";
+    };
+  };
+
   UnicodeICUCollator = buildPerlPackage {
     name = "Unicode-ICU-Collator-0.002";
     src = fetchurl {

From 8b4fef8840f59e1017d6a3014defac2eab4000e7 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Tue, 27 Aug 2013 21:16:03 +0200
Subject: [PATCH 177/452] openobex-1.7.1 (1.5 could no longer be downloaded
 from kernel repositories)

---
 pkgs/tools/bluetooth/openobex/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/bluetooth/openobex/default.nix b/pkgs/tools/bluetooth/openobex/default.nix
index 97ed96371c8..fc4d8611f87 100644
--- a/pkgs/tools/bluetooth/openobex/default.nix
+++ b/pkgs/tools/bluetooth/openobex/default.nix
@@ -1,17 +1,21 @@
-{stdenv, fetchurl, pkgconfig, bluez, libusb}:
+{stdenv, fetchurl, pkgconfig, bluez, libusb, cmake}:
    
 stdenv.mkDerivation rec {
-  name = "openobex-1.5";
+  name = "openobex-1.7.1";
    
   src = fetchurl {
-    url = "mirror://kernel/linux/bluetooth/${name}.tar.gz";
-    sha256 = "0rayjci99ahhvs2d16as1qql3vrcizd0nhi8n3n4g6krf1sh80p6";
+    url = "mirror://sourceforge/openobex/${name}-Source.tar.gz";
+    sha256 = "0mza0mrdrbcw4yix6qvl31kqy7bdkgxjycr0yx7yl089v5jlc9iv";
   };
 
-  buildInputs = [pkgconfig bluez libusb];
+  buildInputs = [pkgconfig bluez libusb cmake];
 
   configureFlags = "--enable-apps";
 
+  patchPhase = ''
+    sed -i "s!/lib/udev!$out/lib/udev!" udev/CMakeLists.txt
+    '';
+
   meta = {
     homepage = http://dev.zuckschwerdt.org/openobex/;
     description = "An open source implementation of the Object Exchange (OBEX) protocol";

From eb6edc1cb1fde69ffa7550a6c1ed68b43eb8dc5c Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Tue, 27 Aug 2013 21:36:36 +0200
Subject: [PATCH 178/452] update obexftp, required for new openobex

---
 pkgs/tools/bluetooth/obexftp/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/bluetooth/obexftp/default.nix b/pkgs/tools/bluetooth/obexftp/default.nix
index 7326b1b4075..4a40b4393c3 100644
--- a/pkgs/tools/bluetooth/obexftp/default.nix
+++ b/pkgs/tools/bluetooth/obexftp/default.nix
@@ -1,14 +1,14 @@
-{stdenv, fetchurl, pkgconfig, openobex, bluez}:
+{stdenv, fetchurl, pkgconfig, openobex, bluez, cmake}:
    
 stdenv.mkDerivation rec {
-  name = "obexftp-0.23";
+  name = "obexftp-0.24";
    
   src = fetchurl {
-    url = "mirror://sourceforge/openobex/${name}.tar.bz2";
-    sha256 = "0djv239b14p221xjxzza280w3pnnwzpw4ssd6mshz36ki3r4z9s4";
+    url = "mirror://sourceforge/openobex/${name}-Source.tar.gz";
+    sha256 = "0szy7p3y75bd5h4af0j5kf0fpzx2w560fpy4kg3603mz11b9c1xr";
   };
 
-  buildInputs = [pkgconfig bluez];
+  buildInputs = [pkgconfig bluez cmake];
 
   propagatedBuildInputs = [openobex];
 

From 69c57b92e8a0d33baf1b932b7060789ebd90c0c3 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Tue, 27 Aug 2013 21:49:54 +0200
Subject: [PATCH 179/452] update bluez to 5.8

---
 pkgs/os-specific/linux/bluez/bluez5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix
index 561f2d8e1e7..8a0a42f1009 100644
--- a/pkgs/os-specific/linux/bluez/bluez5.nix
+++ b/pkgs/os-specific/linux/bluez/bluez5.nix
@@ -9,11 +9,11 @@ let
 in
    
 stdenv.mkDerivation rec {
-  name = "bluez-5.3";
+  name = "bluez-5.8";
    
   src = fetchurl {
     url = "mirror://kernel/linux/bluetooth/${name}.tar.xz";
-    sha256 = "41b0559e3a8436a739eb7cc79156ca91daf8c115f57971b6bcb422ee0213db42";
+    sha256 = "1l33lq1lpg7hy26138ir5dj4gl3mql2qxpj20rjnnwyckc3jk700";
   };
 
   buildInputs =

From 319629355ce16fcfae865385b0d1190ac37534fe Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Tue, 27 Aug 2013 23:10:39 +0200
Subject: [PATCH 180/452] bluez5: fix python programs

---
 pkgs/os-specific/linux/bluez/bluez5.nix | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix
index 8a0a42f1009..c0c87b49472 100644
--- a/pkgs/os-specific/linux/bluez/bluez5.nix
+++ b/pkgs/os-specific/linux/bluez/bluez5.nix
@@ -1,13 +1,9 @@
-{ stdenv, fetchurl, pkgconfig, dbus, glib, libusb, alsaLib, python, makeWrapper
-, pythonDBus, pygobject, readline, libsndfile, udev, libical, systemd }:
+{ stdenv, fetchurl, pkgconfig, dbus, glib, libusb, alsaLib, python,
+  pythonPackages, pythonDBus, readline, libsndfile, udev, libical,
+  systemd }:
 
 assert stdenv.isLinux;
 
-let
-  pythonpath = "${pythonDBus}/lib/${python.libPrefix}/site-packages:"
-    + "${pygobject}/lib/${python.libPrefix}/site-packages";
-in
-   
 stdenv.mkDerivation rec {
   name = "bluez-5.8";
    
@@ -16,8 +12,11 @@ stdenv.mkDerivation rec {
     sha256 = "1l33lq1lpg7hy26138ir5dj4gl3mql2qxpj20rjnnwyckc3jk700";
   };
 
+  pythonPath = with pythonPackages;
+    [ pythonDBus pygobject3 recursivePthLoader ];
+
   buildInputs =
-    [ pkgconfig dbus.libs glib libusb alsaLib python makeWrapper
+    [ pkgconfig dbus.libs glib libusb alsaLib python pythonPackages.wrapPython
       readline libsndfile udev libical
       # Disables GStreamer; not clear what it gains us other than a
       # zillion extra dependencies.
@@ -49,7 +48,9 @@ stdenv.mkDerivation rec {
   # FIXME: Move these into a separate package to prevent Bluez from
   # depending on Python etc.
   postInstall = ''
-    pushd test
+    mkdir $out/test
+    cp -a test $out
+    pushd $out/test
     for a in \
             simple-agent \
             test-adapter \
@@ -58,10 +59,10 @@ stdenv.mkDerivation rec {
             list-devices \
             monitor-bluetooth \
             ; do
-      cp $a $out/bin/bluez-$a
-      wrapProgram $out/bin/bluez-$a --prefix PYTHONPATH : ${pythonpath}
+      ln -s ../test/$a $out/bin/bluez-$a
     done
     popd
+    wrapPythonProgramsIn $out/test "$out/test $pythonPath"
   '';
 
   meta = {

From 6eeec159b2bb64fb9ada9dc71394d49fea54eef5 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Wed, 28 Aug 2013 19:07:24 +0200
Subject: [PATCH 181/452] make bluetoothd path compatible between bluez4 and
 bluez5

---
 pkgs/os-specific/linux/bluez/bluez5.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix
index c0c87b49472..cc70f34d839 100644
--- a/pkgs/os-specific/linux/bluez/bluez5.nix
+++ b/pkgs/os-specific/linux/bluez/bluez5.nix
@@ -63,6 +63,10 @@ stdenv.mkDerivation rec {
     done
     popd
     wrapPythonProgramsIn $out/test "$out/test $pythonPath"
+
+    # for bluez4 compatibility for NixOS
+    mkdir $out/sbin
+    ln -s ../libexec/bluetooth/bluetoothd $out/sbin/bluetoothd
   '';
 
   meta = {

From 47b53fd084dc503d8d513c01b4dbcc40b51e60ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 28 Aug 2013 20:44:26 +0200
Subject: [PATCH 182/452] bluez5: set meta.platforms attribute

---
 pkgs/os-specific/linux/bluez/bluez5.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix
index cc70f34d839..6bc0759c1a2 100644
--- a/pkgs/os-specific/linux/bluez/bluez5.nix
+++ b/pkgs/os-specific/linux/bluez/bluez5.nix
@@ -69,8 +69,9 @@ stdenv.mkDerivation rec {
     ln -s ../libexec/bluetooth/bluetoothd $out/sbin/bluetoothd
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.bluez.org/;
     description = "Bluetooth support for Linux";
+    platforms = platforms.linux;
   };
 }

From b43347342b1f5852a1a15a837e6979dc7cc13072 Mon Sep 17 00:00:00 2001
From: Gergely Risko <gergely@risko.hu>
Date: Wed, 28 Aug 2013 21:35:07 +0200
Subject: [PATCH 183/452] Add platforms to coq, so it's built on Hydra

---
 pkgs/applications/science/logic/coq/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index 85c69413bfb..b4a7a203a3c 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -55,5 +55,6 @@ stdenv.mkDerivation {
     homepage = "http://coq.inria.fr";
     license = "LGPL";
     maintainers = [ stdenv.lib.maintainers.roconnor ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From 14912ca0b1814c71568d882601eaf51a47d1c1d6 Mon Sep 17 00:00:00 2001
From: Gergely Risko <gergely@risko.hu>
Date: Wed, 28 Aug 2013 21:52:07 +0200
Subject: [PATCH 184/452] vboot_reference: add meta attributes and cleanups

---
 pkgs/tools/system/vboot_reference/default.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix
index 4c3c58b35cd..ed48a9976d4 100644
--- a/pkgs/tools/system/vboot_reference/default.nix
+++ b/pkgs/tools/system/vboot_reference/default.nix
@@ -1,13 +1,9 @@
 { stdenv, fetchgit, pkgconfig, libuuid, openssl }:
 
-let
-  arch = if stdenv.system == "x86_64-linux" then "x86_64"
-    else if stdenv.system == "i686-linux" then "x86"
-    else throw "vboot_reference for: ${stdenv.system} not supported!";
-
+stdenv.mkDerivation rec {
   version = "20130507";
   checkout = "25/50225/2";
-in stdenv.mkDerivation {
+
   name = "vboot_reference-${version}";
 
   src = fetchgit {
@@ -22,6 +18,10 @@ in stdenv.mkDerivation {
                  else [ (stdenv.lib.overrideDerivation libuuid
                           (args: { configureFlags = args.configureFlags + " --enable-static"; })) ]);
 
+  arch = if stdenv.system == "x86_64-linux" then "x86_64"
+    else if stdenv.system == "i686-linux" then "x86"
+    else throw "vboot_reference for: ${stdenv.system} not supported!";
+
   buildPhase = ''
     make ARCH=${arch} `pwd`/build/cgpt/cgpt
     make ARCH=${arch} `pwd`/build/utility/vbutil_kernel
@@ -38,4 +38,10 @@ in stdenv.mkDerivation {
     cp build/utility/vbutil_keyblock $out/bin
     cp build/utility/vbutil_firmware $out/bin
   '';
+
+  meta = {
+    description = "Chrome OS partitioning and kernel signing tools.";
+    license = stdenv.lib.licenses.bsd3;
+    platforms = stdenv.lib.platforms.linux;
+  };
 }

From d89b4045d73c3b8cd0473fb9a6135fcb1eb544e4 Mon Sep 17 00:00:00 2001
From: Gergely Risko <gergely@risko.hu>
Date: Wed, 28 Aug 2013 22:09:13 +0200
Subject: [PATCH 185/452] Add platform meta attribute for perlPackages.ack

---
 pkgs/top-level/perl-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c1bcb3a3496..1b66e7a28e5 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -35,6 +35,7 @@ rec {
       description = "A grep-like tool tailored to working with large trees of source code";
       homepage = http://betterthangrep.com/;
       license = "free";  # Artistic 2.0
+      platforms = stdenv.lib.platforms.unix;
     };
     # t/swamp/{0,perl-without-extension} are datafiles for the test
     # t/ack-show-types.t, but the perl generic builder confuses them

From 354746527d4b282b41ad1e91b89ed16ab065e0bf Mon Sep 17 00:00:00 2001
From: Gergely Risko <gergely@risko.hu>
Date: Wed, 28 Aug 2013 22:09:13 +0200
Subject: [PATCH 186/452] Add platform meta attribute for perlPackages.ack

---
 pkgs/top-level/perl-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c1bcb3a3496..1b66e7a28e5 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -35,6 +35,7 @@ rec {
       description = "A grep-like tool tailored to working with large trees of source code";
       homepage = http://betterthangrep.com/;
       license = "free";  # Artistic 2.0
+      platforms = stdenv.lib.platforms.unix;
     };
     # t/swamp/{0,perl-without-extension} are datafiles for the test
     # t/ack-show-types.t, but the perl generic builder confuses them

From 41a52417feb4353cafcc79626ae6e18a403517f5 Mon Sep 17 00:00:00 2001
From: Gergely Risko <gergely@risko.hu>
Date: Wed, 28 Aug 2013 22:07:20 +0200
Subject: [PATCH 187/452] Add meta attributes for jbig2enc

---
 pkgs/tools/graphics/jbig2enc/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/tools/graphics/jbig2enc/default.nix b/pkgs/tools/graphics/jbig2enc/default.nix
index 60704d6300c..71f0789286a 100644
--- a/pkgs/tools/graphics/jbig2enc/default.nix
+++ b/pkgs/tools/graphics/jbig2enc/default.nix
@@ -16,4 +16,10 @@
   preFixup = ''
     make clean
   '';
+
+  meta = {
+    description = "Encoder for the JBIG2 image compression format";
+    license = stdenv.lib.licenses.asl20;
+    platforms = stdenv.lib.platforms.all;
+  };
 }

From 74d6995f449b757df79508205e93ec0a55f9e9e2 Mon Sep 17 00:00:00 2001
From: Gergely Risko <gergely@risko.hu>
Date: Wed, 28 Aug 2013 21:59:27 +0200
Subject: [PATCH 188/452] Add platforms meta attribute to vanitygen

---
 pkgs/applications/misc/vanitygen/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/vanitygen/default.nix b/pkgs/applications/misc/vanitygen/default.nix
index c68767290ee..e16767d4c26 100644
--- a/pkgs/applications/misc/vanitygen/default.nix
+++ b/pkgs/applications/misc/vanitygen/default.nix
@@ -34,5 +34,6 @@ stdenv.mkDerivation rec {
       '';
       homepage = "https://github.com/samr7/vanitygen";
       license = "AGPLv3";
+      platforms = stdenv.lib.platforms.all;
   };
 }

From 39a7470c7317e71c6c6cff8dcf5ef644913c5162 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 29 Aug 2013 07:28:33 -0400
Subject: [PATCH 189/452] Add patch to Net::Amazon::S3 to enable credentials
 from the environment/instance roles

See https://github.com/pfig/net-amazon-s3/pull/25

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 .../net-amazon-s3-credentials-provider.patch  | 291 ++++++++++++++++++
 pkgs/top-level/perl-packages.nix              |   5 +-
 2 files changed, 295 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/perl-modules/net-amazon-s3-credentials-provider.patch

diff --git a/pkgs/development/perl-modules/net-amazon-s3-credentials-provider.patch b/pkgs/development/perl-modules/net-amazon-s3-credentials-provider.patch
new file mode 100644
index 00000000000..e24c44d7e15
--- /dev/null
+++ b/pkgs/development/perl-modules/net-amazon-s3-credentials-provider.patch
@@ -0,0 +1,291 @@
+commit 4afa16864ac8ae23a450abf95db023b0c8bea698
+Author: Shea Levy <shea@shealevy.com>
+Date:   Thu Aug 29 07:09:34 2013 -0400
+
+    Use CredentialsProviders à la the Java API
+    
+    Signed-off-by: Shea Levy <shea@shealevy.com>
+
+diff --git a/lib/Net/Amazon/Auth/CredentialsProvider.pm b/lib/Net/Amazon/Auth/CredentialsProvider.pm
+new file mode 100755
+index 0000000..527acae
+--- /dev/null
++++ b/lib/Net/Amazon/Auth/CredentialsProvider.pm
+@@ -0,0 +1,9 @@
++package Net::Amazon::Auth::CredentialsProvider;
++
++use Moose::Role 0.85;
++
++requires 'get_credentials';
++
++sub refresh { }
++
++1;
+diff --git a/lib/Net/Amazon/Auth/CredentialsProviderChain.pm b/lib/Net/Amazon/Auth/CredentialsProviderChain.pm
+new file mode 100755
+index 0000000..85cd8e0
+--- /dev/null
++++ b/lib/Net/Amazon/Auth/CredentialsProviderChain.pm
+@@ -0,0 +1,41 @@
++package Net::Amazon::Auth::CredentialsProviderChain;
++
++use Moose 0.85;
++use MooseX::StrictConstructor 0.16;
++use Net::Amazon::Auth::EnvironmentVariableCredentialsProvider;
++use Net::Amazon::Auth::InstanceProfileCredentialsProvider;
++
++with 'Net::Amazon::Auth::CredentialsProvider';
++
++has 'providers' => ( is => 'ro', isa => 'ArrayRef[Net::Amazon::Auth::CredentialsProvider]', required => 1 );
++
++sub refresh {
++    my $self = shift;
++
++    map { $_->refresh } @{$self->providers};
++}
++
++sub get_credentials {
++    my $self = shift;
++
++    foreach my $provider (@{$self->providers}) {
++        my $res = $provider->get_credentials;
++        if (defined $res->{access_key_id}) {
++            return $res;
++        }
++    }
++
++    return {};
++}
++
++sub default_chain {
++    my $class = shift;
++    return $class->new(providers => [
++            Net::Amazon::Auth::EnvironmentVariableCredentialsProvider->new,
++            Net::Amazon::Auth::InstanceProfileCredentialsProvider->new
++        ]);
++}
++
++__PACKAGE__->meta->make_immutable;
++
++1;
+diff --git a/lib/Net/Amazon/Auth/EnvironmentVariableCredentialsProvider.pm b/lib/Net/Amazon/Auth/EnvironmentVariableCredentialsProvider.pm
+new file mode 100755
+index 0000000..ac38a84
+--- /dev/null
++++ b/lib/Net/Amazon/Auth/EnvironmentVariableCredentialsProvider.pm
+@@ -0,0 +1,26 @@
++package Net::Amazon::Auth::EnvironmentVariableCredentialsProvider;
++
++use Moose 0.85;
++use MooseX::StrictConstructor 0.16;
++
++extends 'Net::Amazon::Auth::FixedCredentialsProvider';
++
++around BUILDARGS => sub {
++    my $orig = shift;
++    my $class = shift;
++
++    my %args = (
++        access_key_id => $ENV{AWS_ACCESS_KEY_ID},
++        secret_access_key => $ENV{AWS_SECRET_ACCESS_KEY}
++    );
++
++    if (exists $ENV{AWS_SESSION_TOKEN}) {
++        $args{session_token} = $ENV{AWS_SESSION_TOKEN};
++    }
++
++    return $class->$orig(\%args);
++};
++
++__PACKAGE__->meta->make_immutable;
++
++1;
+diff --git a/lib/Net/Amazon/Auth/FixedCredentialsProvider.pm b/lib/Net/Amazon/Auth/FixedCredentialsProvider.pm
+new file mode 100755
+index 0000000..21d56c7
+--- /dev/null
++++ b/lib/Net/Amazon/Auth/FixedCredentialsProvider.pm
+@@ -0,0 +1,23 @@
++package Net::Amazon::Auth::FixedCredentialsProvider;
++
++use Moose 0.85;
++use MooseX::StrictConstructor 0.16;
++
++with 'Net::Amazon::Auth::CredentialsProvider';
++
++has 'access_key_id'     => ( is => 'ro', isa => 'Maybe[Str]', required => 1 );
++has 'secret_access_key' => ( is => 'ro', isa => 'Maybe[Str]', required => 1 );
++has 'session_token' => ( is => 'ro', isa => 'Maybe[Str]', required => 0 );
++
++sub get_credentials {
++    my $self = shift;
++    return {
++        access_key_id => $self->access_key_id,
++        secret_access_key => $self->secret_access_key,
++        session_token => $self->session_token
++    };
++}
++
++__PACKAGE__->meta->make_immutable;
++
++1;
+diff --git a/lib/Net/Amazon/Auth/InstanceProfileCredentialsProvider.pm b/lib/Net/Amazon/Auth/InstanceProfileCredentialsProvider.pm
+new file mode 100755
+index 0000000..b9f826a
+--- /dev/null
++++ b/lib/Net/Amazon/Auth/InstanceProfileCredentialsProvider.pm
+@@ -0,0 +1,57 @@
++package Net::Amazon::Auth::InstanceProfileCredentialsProvider;
++
++use Moose 0.85;
++use MooseX::StrictConstructor 0.16;
++use HTTP::Date;
++use JSON;
++
++with 'Net::Amazon::Auth::CredentialsProvider';
++
++has '_ua' => ( is => 'rw', isa => 'LWP::UserAgent', required => 0 );
++has '_access_key_id'     => ( is => 'rw', isa => 'Str', required => 0 );
++has '_secret_access_key' => ( is => 'rw', isa => 'Str', required => 0 );
++has '_session_token' => ( is => 'rw', isa => 'Str', required => 0 );
++has '_expiration_date' => ( is => 'rw', isa => 'Int', required => 0, default => 0 );
++
++sub BUILD {
++    my $self = shift;
++    my $ua = LWP::UserAgent->new;
++    $ua->timeout(10);
++    $self->_ua($ua);
++}
++
++sub refresh {
++    my $self = shift;
++
++    my $role_name_response =
++        $self->_ua->get("http://169.254.169.254/latest/meta-data/iam/security-credentials/");
++    if ($role_name_response->code == 200) {
++        my $credentials_response = $self->_ua->get("http://169.254.169.254/latest/meta-data/iam/security-credentials/" . $role_name_response->content);
++
++        if ($credentials_response->code == 200) {
++            my $credentials = decode_json($credentials_response->content);
++            $self->_expiration_date(str2time($credentials->{Expiration}));
++            $self->_access_key_id($credentials->{AccessKeyId});
++            $self->_secret_access_key($credentials->{SecretAccessKey});
++            $self->_session_token($credentials->{Token});
++        }
++    }
++}
++
++sub get_credentials {
++    my $self = shift;
++
++    if (time() - $self->_expiration_date > -5 * 60) { #Credentials available 5 minutes before expiry
++        $self->refresh;
++    }
++
++    return {
++        access_key_id => $self->_access_key_id,
++        secret_access_key => $self->_secret_access_key,
++        session_token => $self->_session_token
++    };
++}
++
++__PACKAGE__->meta->make_immutable;
++
++1;
+diff --git a/lib/Net/Amazon/S3.pm b/lib/Net/Amazon/S3.pm
+index 907113e..a369e4b 100755
+--- a/lib/Net/Amazon/S3.pm
++++ b/lib/Net/Amazon/S3.pm
+@@ -133,9 +133,10 @@ use LWP::UserAgent::Determined;
+ use URI::Escape qw(uri_escape_utf8);
+ use XML::LibXML;
+ use XML::LibXML::XPathContext;
++use Net::Amazon::Auth::FixedCredentialsProvider;
++use Net::Amazon::Auth::CredentialsProviderChain;
+ 
+-has 'aws_access_key_id'     => ( is => 'ro', isa => 'Str', required => 1 );
+-has 'aws_secret_access_key' => ( is => 'ro', isa => 'Str', required => 1 );
++has 'credentials_provider' => ( is => 'ro', isa => 'Net::Amazon::Auth::CredentialsProvider', required => 0, default => sub { return Net::Amazon::Auth::CredentialsProviderChain->default_chain; } );
+ has 'secure' => ( is => 'ro', isa => 'Bool', required => 0, default => 0 );
+ has 'timeout' => ( is => 'ro', isa => 'Num',  required => 0, default => 30 );
+ has 'retry'   => ( is => 'ro', isa => 'Bool', required => 0, default => 0 );
+@@ -144,7 +145,23 @@ has 'libxml' => ( is => 'rw', isa => 'XML::LibXML',    required => 0 );
+ has 'ua'     => ( is => 'rw', isa => 'LWP::UserAgent', required => 0 );
+ has 'err'    => ( is => 'rw', isa => 'Maybe[Str]',     required => 0 );
+ has 'errstr' => ( is => 'rw', isa => 'Maybe[Str]',     required => 0 );
+-has 'aws_session_token' => ( is => 'ro', isa => 'Str', required => 0 );
++
++around BUILDARGS => sub {
++    my $orig = shift;
++    my $class = shift;
++
++    my $args = $class->$orig(@_);
++
++    if (exists $args->{aws_access_key_id}) {
++        $args->{credentials_provider} = Net::Amazon::Auth::FixedCredentialsProvider->new({
++                access_key_id => $args->{aws_access_key_id},
++                secret_access_key => $args->{aws_secret_access_key},
++                session_token => $args->{aws_session_token}
++            });
++        delete @{$args}{qw(aws_access_key_id aws_secret_access_key aws_session_token)};
++    }
++    return $args;
++};
+ 
+ __PACKAGE__->meta->make_immutable;
+ 
+@@ -223,6 +240,24 @@ sub BUILD {
+ 
+     $self->ua($ua);
+     $self->libxml( XML::LibXML->new );
++
++    die "No AWS credentials found!" unless defined $self->credentials_provider->get_credentials->{access_key_id};
++}
++
++# Backwards compatibility
++sub aws_access_key_id {
++    my $self = shift;
++    return $self->credentials_provider->get_credentials->{access_key_id};
++}
++
++sub aws_secret_access_key {
++    my $self = shift;
++    return $self->credentials_provider->get_credentials->{secret_access_key};
++}
++
++sub aws_session_token {
++    my $self = shift;
++    return $self->credentials_provider->get_credentials->{session_token};
+ }
+ 
+ =head2 buckets
+diff --git a/lib/Net/Amazon/S3/HTTPRequest.pm b/lib/Net/Amazon/S3/HTTPRequest.pm
+index 69c6327..d49e95b 100755
+--- a/lib/Net/Amazon/S3/HTTPRequest.pm
++++ b/lib/Net/Amazon/S3/HTTPRequest.pm
+@@ -63,8 +63,9 @@ sub query_string_authentication_uri {
+     my $path    = $self->path;
+     my $headers = $self->headers;
+ 
+-    my $aws_access_key_id     = $self->s3->aws_access_key_id;
+-    my $aws_secret_access_key = $self->s3->aws_secret_access_key;
++    my $creds = $self->s3->credentials_provider->get_credentials;
++    my $aws_access_key_id     = $creds->{access_key_id};
++    my $aws_secret_access_key = $creds->{secret_access_key};
+     my $canonical_string
+         = $self->_canonical_string( $method, $path, $headers, $expires );
+     my $encoded_canonical
+@@ -86,9 +87,10 @@ sub query_string_authentication_uri {
+ 
+ sub _add_auth_header {
+     my ( $self, $headers, $method, $path ) = @_;
+-    my $aws_access_key_id     = $self->s3->aws_access_key_id;
+-    my $aws_secret_access_key = $self->s3->aws_secret_access_key;
+-    my $aws_session_token     = $self->s3->aws_session_token;
++    my $creds = $self->s3->credentials_provider->get_credentials;
++    my $aws_access_key_id     = $creds->{access_key_id};
++    my $aws_secret_access_key = $creds->{secret_access_key};
++    my $aws_session_token     = $creds->{session_token};
+ 
+     if ( not $headers->header('Date') ) {
+         $headers->header( Date => time2str(time) );
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 1b66e7a28e5..0d4d7b82ce3 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5687,7 +5687,10 @@ rec {
       sha256 = "94f2bd6b317a9142e400d7d17bd573dc9d22284c3ceaa4864474ba674e0e2e9f";
     };
     buildInputs = [ LWP TestException ];
-    propagatedBuildInputs = [ DataStreamBulk DateTimeFormatHTTP DigestHMAC DigestMD5File FileFindRule HTTPDate HTTPMessage LWPUserAgentDetermined MIMETypes Moose MooseXStrictConstructor MooseXTypesDateTimeMoreCoercions PathClass RegexpCommon TermEncoding TermProgressBarSimple URI XMLLibXML ];
+    propagatedBuildInputs = [ DataStreamBulk DateTimeFormatHTTP DigestHMAC DigestMD5File FileFindRule HTTPDate HTTPMessage LWPUserAgentDetermined MIMETypes Moose MooseXStrictConstructor MooseXTypesDateTimeMoreCoercions PathClass RegexpCommon TermEncoding TermProgressBarSimple URI XMLLibXML JSON ];
+    # See https://github.com/pfig/net-amazon-s3/pull/25
+    patches =
+      [ ../development/perl-modules/net-amazon-s3-credentials-provider.patch ];
     meta = {
       description = "Use the Amazon S3 - Simple Storage Service";
       license = "perl";

From d8af53a28ca8a5048778e946aed1affa83cfee05 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 29 Aug 2013 14:23:46 +0200
Subject: [PATCH 190/452] chromium: Update stable version to v29.0.1547.62.

Build works fine and tested on my machine as well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/networking/browsers/chromium/sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix
index bfdcef1373d..f7adfa04697 100644
--- a/pkgs/applications/networking/browsers/chromium/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/sources.nix
@@ -11,8 +11,8 @@
     sha256 = "0xl595fng7qzlc8vh73lslzchr6ayd4vlmz2mpqppb8pai520xxf";
   };
   stable = {
-    version = "29.0.1547.57";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1547.57.tar.xz";
-    sha256 = "0xl595fng7qzlc8vh73lslzchr6ayd4vlmz2mpqppb8pai520xxf";
+    version = "29.0.1547.62";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1547.62.tar.xz";
+    sha256 = "0ld7cm287k2lkq3rfnhwgvvnjbm9345wvjbwfn4yzwy7gxzyfld6";
   };
 }

From 9488570fbb11736af94e792053745903be635152 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 29 Aug 2013 13:56:06 +0200
Subject: [PATCH 191/452] ctemplate: minor update to fix build with gcc>=4.7

---
 pkgs/development/libraries/libctemplate/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libctemplate/default.nix b/pkgs/development/libraries/libctemplate/default.nix
index 3af7e7e4387..36652f7abc7 100644
--- a/pkgs/development/libraries/libctemplate/default.nix
+++ b/pkgs/development/libraries/libctemplate/default.nix
@@ -12,11 +12,11 @@ stdenv.mkDerivation rec {
   };
 
   pname = "ctemplate";
-  version = "2.0";
+  version = "2.2";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://ctemplate.googlecode.com/files/${name}.tar.gz";
-    sha256 = "0scdqqbp8fy9jiak60dj1051gbyb8xmlm4rdz4h1myxifjagwbfa";
+    sha256 = "0vv8gvyndppm9m5s1i5k0jvwcz41l1vfgg04r7nssdpzyz0cpwq4";
   };
 }

From 781f13752bd10956fdf3002f7928feae84059e10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 29 Aug 2013 14:15:07 +0200
Subject: [PATCH 192/452] krb5: update to higher branch, including
 CVE-2002-2443

Conflicts (simple):
	pkgs/development/libraries/kerberos/krb5.nix
---
 pkgs/development/libraries/kerberos/krb5.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index a903a600da3..5c408e9a76c 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -2,7 +2,7 @@
 
 let
   pname = "krb5";
-  version = "1.10.5";
+  version = "1.11.3";
   name = "${pname}-${version}";
   webpage = http://web.mit.edu/kerberos/;
 in
@@ -11,8 +11,8 @@ stdenv.mkDerivation (rec {
   inherit name;
 
   src = fetchurl {
-    url = "${webpage}/dist/krb5/1.10/${name}-signed.tar";
-    sha256 = "1nf195j9s8g55sh5dzbhy2l21kcdwgpn4acxrbwkvngdz9mv7g4k";
+    url = "${webpage}/dist/krb5/1.11/${name}-signed.tar";
+    sha256 = "1daiaxgkxcryqs37w28v4x1vajqmay4l144d1zd9c2d7jjxr9gcs";
   };
 
   buildInputs = [ perl ncurses yacc ];

From f90bdd6a09d673a0c16b81aec3035ce3c1b58cd1 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Thu, 29 Aug 2013 19:29:22 +0200
Subject: [PATCH 193/452] mupdf: Update to 1.3, and add mupdf.desktop file

---
 pkgs/applications/misc/mupdf/default.nix | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index eccd11f6041..220309a8e22 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, zlib, freetype, libjpeg, jbig2dec, openjpeg
 , libX11, libXext }:
 stdenv.mkDerivation rec {
-  name = "mupdf-1.1";
+  name = "mupdf-1.3";
 
   src = fetchurl {
     url = "http://mupdf.com/download/archive/${name}-source.tar.gz";
-    sha256 = "e54666bbe1d9f0a5464349bfbeffcf676c4a0fcad3efb89eba1f20d4ac991f34";
+    sha256 = "0y247nka5gkr1ajn47jrlp5rcnf6h4ff7dfsprma3h4wxqdv7a5b";
   };
 
   buildInputs = [ pkgconfig zlib freetype libjpeg jbig2dec openjpeg libX11 libXext ];
@@ -15,6 +15,19 @@ stdenv.mkDerivation rec {
     export NIX_CFLAGS_COMPILE=" $NIX_CFLAGS_COMPILE -I$(echo ${openjpeg}/include/openjpeg-*) "
   '';
 
+  postInstall = ''
+    mkdir -p $out/share/applications
+    cat > $out/share/applications/mupdf.desktop <<EOF
+    [Desktop Entry]
+    Type=Application
+    Version=1.0
+    Name=mupdf
+    Comment=PDF viewer
+    Exec=$out/bin/mupdf-x11
+    Terminal=false
+    EOF
+  '';
+
   meta = {
     homepage = http://mupdf.com/;
     description = "Lightweight PDF viewer and toolkit written in portable C";

From 532cf20cbc4c40263ce99db6bd94509b162626ab Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 29 Aug 2013 10:48:45 +0200
Subject: [PATCH 194/452] haskell-git-annex: update to version 4.20130827

---
 .../version-management/git-and-tools/git-annex/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index d45e6e210f0..38d972aa243 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
@@ -14,8 +14,8 @@
 
 cabal.mkDerivation (self: {
   pname = "git-annex";
-  version = "4.20130815";
-  sha256 = "0c4fvqmnvyrncmiz0dxwax2rnb4yrqw1y54q2zkqiifzrihcyi71";
+  version = "4.20130827";
+  sha256 = "07kfp0d2wg3p8s0v2100r4giw5ay1il5j15lrah43fk2rrszgm5z";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

From f497ef9689f45f53435aa8b5eb3802316f096e31 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 29 Aug 2013 10:48:45 +0200
Subject: [PATCH 195/452] haskell-xmonad-extras: update to version 0.12

---
 pkgs/applications/window-managers/xmonad/xmonad-extras.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
index f4aed5a1850..1976e393baa 100644
--- a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
+++ b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xmonad-extras";
-  version = "0.11";
-  sha256 = "09r64z09mfdz86k7v5c6zds9ng0fjcp44kd8f5qg1sz40yblrny5";
+  version = "0.12";
+  sha256 = "1gyj9j6x21rvs6kg6g74wr0jdd36c5ml63a670456fhjr96s8y0g";
   buildDepends = [
     hint libmpd mtl network parsec random regexPosix split X11 xmonad
     xmonadContrib

From b58b137b874f1f2d0721710edd7bbae469e2f8c0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 29 Aug 2013 10:48:45 +0200
Subject: [PATCH 196/452] haskell-Chart-gtk: update to version 1.0

---
 .../libraries/haskell/Chart-gtk/default.nix          | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/haskell/Chart-gtk/default.nix b/pkgs/development/libraries/haskell/Chart-gtk/default.nix
index dd6c54cf6b8..d97fdc21f03 100644
--- a/pkgs/development/libraries/haskell/Chart-gtk/default.nix
+++ b/pkgs/development/libraries/haskell/Chart-gtk/default.nix
@@ -1,14 +1,10 @@
-{ cabal, cairo, Chart, colour, dataAccessor, dataAccessorTemplate
-, gtk, mtl, time
-}:
+{ cabal, cairo, Chart, ChartCairo, colour, gtk, mtl, time }:
 
 cabal.mkDerivation (self: {
   pname = "Chart-gtk";
-  version = "0.17";
-  sha256 = "1i411kdpz75azyhfaryazr0bpij5xcl0y82m9a7k23w8mhybqwc7";
-  buildDepends = [
-    cairo Chart colour dataAccessor dataAccessorTemplate gtk mtl time
-  ];
+  version = "1.0";
+  sha256 = "06i53922hdc7dvh2a76ccvwrwfhvhji0ya8j4f2lddg5zckvp3yj";
+  buildDepends = [ cairo Chart ChartCairo colour gtk mtl time ];
   meta = {
     homepage = "https://github.com/timbod7/haskell-chart/wiki";
     description = "Utility functions for using the chart library with GTK";

From eec396fb7c1f0de2a1c1dd6fac65df313ee76a97 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 29 Aug 2013 10:48:45 +0200
Subject: [PATCH 197/452] haskell-Chart: update to version 1.0

---
 pkgs/development/libraries/haskell/Chart/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/Chart/default.nix b/pkgs/development/libraries/haskell/Chart/default.nix
index dafa834e4d4..0d9dd690758 100644
--- a/pkgs/development/libraries/haskell/Chart/default.nix
+++ b/pkgs/development/libraries/haskell/Chart/default.nix
@@ -1,13 +1,11 @@
-{ cabal, cairo, colour, dataAccessor, dataAccessorTemplate, mtl
-, time
-}:
+{ cabal, colour, dataDefaultClass, lens, mtl, operational, time }:
 
 cabal.mkDerivation (self: {
   pname = "Chart";
-  version = "0.17";
-  sha256 = "1ip1a61ryypwfzj6dc6n6pl92rflf7lqf1760ppjyg05q5pn6qxg";
+  version = "1.0";
+  sha256 = "137njda84vxrj3pk12bmkf11wh8fj89nxpz067wrycrgw9xy5rd3";
   buildDepends = [
-    cairo colour dataAccessor dataAccessorTemplate mtl time
+    colour dataDefaultClass lens mtl operational time
   ];
   meta = {
     homepage = "https://github.com/timbod7/haskell-chart/wiki";

From 96628bff7a0fd4c34e939c6bcae609964848fc02 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 29 Aug 2013 10:48:45 +0200
Subject: [PATCH 198/452] haskell-bindings-DSL: update to version 1.0.17

---
 pkgs/development/libraries/haskell/bindings-DSL/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/bindings-DSL/default.nix b/pkgs/development/libraries/haskell/bindings-DSL/default.nix
index 9d6e8d1a04d..d333a287749 100644
--- a/pkgs/development/libraries/haskell/bindings-DSL/default.nix
+++ b/pkgs/development/libraries/haskell/bindings-DSL/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "bindings-DSL";
-  version = "1.0.16";
-  sha256 = "1sly88585f94dsnhyw6nagnr4jfjixnn61my85x05987flf325px";
+  version = "1.0.17";
+  sha256 = "1203n6wzdp21hd7zdhvhppxhkz4xr3qykwkb8j5mb2s4kijx01bn";
   meta = {
     homepage = "http://bitbucket.org/mauricio/bindings-dsl";
     description = "FFI domain specific language, on top of hsc2hs";

From 018efe1139d23deba11c777d20d6892d53130daf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 29 Aug 2013 10:48:45 +0200
Subject: [PATCH 199/452] haskell-http-conduit: update to version 1.9.4.4

---
 pkgs/development/libraries/haskell/http-conduit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
index eb7f1a0d468..dab65b11ad4 100644
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-conduit";
-  version = "1.9.4.3";
-  sha256 = "0lmshqv1ybim4201nb9wskyhg4fnslbm4ymvlmhn5zx0nwd777p9";
+  version = "1.9.4.4";
+  sha256 = "0awmifa3l7nq28bhp00x4qdhjxddpsybnwl0n569d9sajva53afj";
   buildDepends = [
     asn1Data base64Bytestring blazeBuilder blazeBuilderConduit
     caseInsensitive certificate conduit cookie cprngAes dataDefault

From 9d32efd9fb7b31b95d2858de65c02b333e55cf2e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 29 Aug 2013 10:48:45 +0200
Subject: [PATCH 200/452] haskell-http-reverse-proxy: update to version 0.2.1

---
 .../libraries/haskell/http-reverse-proxy/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
index 9be23188db4..c44e489519c 100644
--- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
+++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-reverse-proxy";
-  version = "0.2.0";
-  sha256 = "01kqf9c2yr3x5jwzyn44gs76fbffpacxs2j89aa902l0rz6l8ral";
+  version = "0.2.1";
+  sha256 = "1f1087igr4kisb3z3lxznb85sfhzr2s08am1za3jg8cgffmrais8";
   buildDepends = [
     blazeBuilder caseInsensitive classyPrelude conduit dataDefault
     httpConduit httpTypes liftedBase monadControl network

From 325cc275ca566261f9dfa0aaf59d4b13b38d0976 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 29 Aug 2013 10:48:45 +0200
Subject: [PATCH 201/452] haskell-postgresql-libpq: update to version 0.8.2.4

---
 .../libraries/haskell/postgresql-libpq/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix
index a3ffd276c2c..53e6066f968 100644
--- a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix
+++ b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "postgresql-libpq";
-  version = "0.8.2.3";
-  sha256 = "08l3va5v8ppajgl8ywmzjdvd6v2vhqfj0y55mb1jxkdpvkd5hckl";
+  version = "0.8.2.4";
+  sha256 = "1dqb4pnsvd6378rhmlhi151sin06wfm9sx12m3ir9x0j5ppb5sx6";
   extraLibraries = [ postgresql ];
   meta = {
     homepage = "http://github.com/lpsmith/postgresql-libpq";

From 6ac5f660650d8f488d26cef2363a715f2a7d4517 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 29 Aug 2013 10:48:45 +0200
Subject: [PATCH 202/452] haskell-skein: update to version 1.0.6

---
 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 4a89019906f..6b8fc7eda28 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 = "1.0.3";
-  sha256 = "15vzydywhwjdgybabvv6lfk1vjs7blvs3k2apwxjdjh2q7jmgkam";
+  version = "1.0.6";
+  sha256 = "0jdh618k66bhiwrxb9i2yckxz0w3cpc7q15ilz49lqjjpl86bndk";
   buildDepends = [ cereal cryptoApi tagged ];
   testDepends = [ cereal cryptoApi filepath hspec tagged ];
   jailbreak = true;

From 3f15cf7cc9170d935094eb8238a64ffa592115d3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 29 Aug 2013 10:48:45 +0200
Subject: [PATCH 203/452] haskell-xmlhtml: update to version 0.2.3

---
 pkgs/development/libraries/haskell/xmlhtml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/xmlhtml/default.nix b/pkgs/development/libraries/haskell/xmlhtml/default.nix
index 66c1f645267..80f092ce2fd 100644
--- a/pkgs/development/libraries/haskell/xmlhtml/default.nix
+++ b/pkgs/development/libraries/haskell/xmlhtml/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xmlhtml";
-  version = "0.2.1";
-  sha256 = "1nqkjbhpzr7zxpjvlxy6pync6zyarvjblcxg8igq75dyzk7qhafg";
+  version = "0.2.3";
+  sha256 = "0yg56rj8ylnaawqx3h54g0dlayql87h40anbp7lccnl70pzbk6c7";
   buildDepends = [
     blazeBuilder blazeHtml blazeMarkup parsec text unorderedContainers
   ];

From 85a6660d080a548306bd2b06170641a8e492783b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 29 Aug 2013 10:48:45 +0200
Subject: [PATCH 204/452] haskell-hslogger: update to version 1.2.3

---
 pkgs/development/tools/haskell/hslogger/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/haskell/hslogger/default.nix b/pkgs/development/tools/haskell/hslogger/default.nix
index f99a4585ec6..a851b8912c7 100644
--- a/pkgs/development/tools/haskell/hslogger/default.nix
+++ b/pkgs/development/tools/haskell/hslogger/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hslogger";
-  version = "1.2.2";
-  sha256 = "0j15nma6yf3cxb9j232kif1a836zmncfyklz9wp1mx064nblr5jf";
+  version = "1.2.3";
+  sha256 = "0rmijkrf24srcg8zgizf5vidpsgr4171wbzbwgrg66l704mkkb7m";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ mtl network time ];

From 4cb183dd8813f95b7d0073838e9b6ab9e2525e9f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 29 Aug 2013 10:48:46 +0200
Subject: [PATCH 205/452] haskell-uuagc: update to version 0.9.50

---
 pkgs/development/tools/haskell/uuagc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/haskell/uuagc/default.nix b/pkgs/development/tools/haskell/uuagc/default.nix
index 69c956ef1de..165ea131dd9 100644
--- a/pkgs/development/tools/haskell/uuagc/default.nix
+++ b/pkgs/development/tools/haskell/uuagc/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "uuagc";
-  version = "0.9.42.3";
-  sha256 = "0rn0wqccg2v4akh3wj16s5y60fscdfjpvrpsmvbc2vfq2v33y53n";
+  version = "0.9.50";
+  sha256 = "0vyydqgmyl590ry63ibwshfpj2w9dd2v0nmr4jqlfw0m0d9ff50j";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ filepath haskellSrcExts mtl uuagcCabal uulib ];

From 44801bf4fe47a2c3ca2d3bf78e5bf414138c7852 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 30 Aug 2013 11:04:45 +0200
Subject: [PATCH 206/452] haskell-operational: add version 0.2.2.1

---
 .../libraries/haskell/operational/default.nix    | 16 ++++++++++++++++
 pkgs/top-level/haskell-packages.nix              |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/operational/default.nix

diff --git a/pkgs/development/libraries/haskell/operational/default.nix b/pkgs/development/libraries/haskell/operational/default.nix
new file mode 100644
index 00000000000..f059f86d68f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/operational/default.nix
@@ -0,0 +1,16 @@
+{ cabal, mtl, random }:
+
+cabal.mkDerivation (self: {
+  pname = "operational";
+  version = "0.2.2.1";
+  sha256 = "1w4bln8mj4hw5i40amah570p77wimxfpn7l2mmjk9z07zavx1rv2";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ mtl random ];
+  meta = {
+    homepage = "http://haskell.org/haskellwiki/Operational";
+    description = "Implementation of difficult monads made easy with operational semantics";
+    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 e69c260c704..d104329076f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1544,6 +1544,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   OpenGLRaw_1_3_0_0 = callPackage ../development/libraries/haskell/OpenGLRaw/1.3.0.0.nix {};
   OpenGLRaw = self.OpenGLRaw_1_3_0_0;
 
+  operational = callPackage ../development/libraries/haskell/operational {};
+
   optparseApplicative = callPackage ../development/libraries/haskell/optparse-applicative {};
 
   pathPieces = callPackage ../development/libraries/haskell/path-pieces {};

From 539304754fc145355fb603f941b9a3390ec7e118 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 30 Aug 2013 11:04:59 +0200
Subject: [PATCH 207/452] haskell-Chart-cairo: add version 1.0

---
 .../libraries/haskell/Chart-cairo/default.nix  | 18 ++++++++++++++++++
 pkgs/top-level/haskell-packages.nix            |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/haskell/Chart-cairo/default.nix

diff --git a/pkgs/development/libraries/haskell/Chart-cairo/default.nix b/pkgs/development/libraries/haskell/Chart-cairo/default.nix
new file mode 100644
index 00000000000..99ab741be49
--- /dev/null
+++ b/pkgs/development/libraries/haskell/Chart-cairo/default.nix
@@ -0,0 +1,18 @@
+{ cabal, cairo, Chart, colour, dataDefaultClass, mtl, operational
+, time
+}:
+
+cabal.mkDerivation (self: {
+  pname = "Chart-cairo";
+  version = "1.0";
+  sha256 = "0z5qhsq9v5sd32d18gl09svxic8n6s65v4nyq04zcp76219mhp55";
+  buildDepends = [
+    cairo Chart colour dataDefaultClass mtl operational time
+  ];
+  meta = {
+    homepage = "https://github.com/timbod7/haskell-chart/wiki";
+    description = "Cairo backend for Charts";
+    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 d104329076f..f9bf4f5b301 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -685,7 +685,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   cgi = self.cgi_3001_1_8_4;
 
   Chart = callPackage ../development/libraries/haskell/Chart {};
-
+  ChartCairo = callPackage ../development/libraries/haskell/Chart-cairo {};
   ChartGtk = callPackage ../development/libraries/haskell/Chart-gtk {};
 
   ChasingBottoms = callPackage ../development/libraries/haskell/ChasingBottoms {};

From bd6eba997f4531920fdf3706bce24c4f4a2814fd Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 30 Aug 2013 11:58:02 +0200
Subject: [PATCH 208/452] Add collectd 5.4.0

---
 pkgs/tools/system/collectd/default.nix | 17 +++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/tools/system/collectd/default.nix

diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix
new file mode 100644
index 00000000000..7da45c596ef
--- /dev/null
+++ b/pkgs/tools/system/collectd/default.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "collectd-5.4.0";
+  
+  src = fetchurl {
+    url = "http://collectd.org/files/${name}.tar.bz2";
+    sha256 = "0gljf5c60q6i0nrii6addxy1p76qqixww8zy17a7a1zil6a3i5wh";
+  };
+
+  meta = {
+    homepage = http://collectd.org;
+    description = "collectd is a daemon which collects system performance statistics periodically";
+    platforms = stdenv.lib.platforms.linux;
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 191a91b5cbb..1ab78b6f9f1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -631,6 +631,8 @@ let
 
   convertlit = callPackage ../tools/text/convertlit { };
 
+  collectd = callPackage ../tools/system/collectd { };
+
   colormake = callPackage ../development/tools/build-managers/colormake { };
 
   cowsay = callPackage ../tools/misc/cowsay { };

From ce47f92b19422f6ae2f80180e5faac93a95d9fb5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 30 Aug 2013 12:31:18 +0200
Subject: [PATCH 209/452] haskell-hsemail: update to version 1.7.7

---
 pkgs/development/libraries/haskell/hsemail/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hsemail/default.nix b/pkgs/development/libraries/haskell/hsemail/default.nix
index 1d823d6f840..e9822f75829 100644
--- a/pkgs/development/libraries/haskell/hsemail/default.nix
+++ b/pkgs/development/libraries/haskell/hsemail/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hsemail";
-  version = "1.7.6";
-  sha256 = "0v4c6ljrzc7680i85wyxq7fkfs2j00941ps3rn8r16x3x2r8di04";
+  version = "1.7.7";
+  sha256 = "16wqrpzi5njv26za1rckn74jsqmyswndb6k38yz1567h1y4w7ai5";
   buildDepends = [ mtl parsec ];
   testDepends = [ doctest hspec parsec ];
   meta = {

From b8872549b74b26a3cf7136888a0b619a7924d3f3 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 30 Aug 2013 09:02:44 -0400
Subject: [PATCH 210/452] Fix peerDependency handling in buildNodePackage

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/development/web/nodejs/build-node-package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix
index 975ec896fe2..217c81d4317 100644
--- a/pkgs/development/web/nodejs/build-node-package.nix
+++ b/pkgs/development/web/nodejs/build-node-package.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation ({
       fi
     '') args.passthru.names)}
     ${concatStrings (concatMap (dep: map (name: ''
-      mv node_modules/${dep.name} $out/lib/node_modules
+      mv node_modules/${name} $out/lib/node_modules
     '') dep.names) peerDependencies)}
     mv node_modules/.bin $out/lib/node_modules 2>/dev/null || true
     mv node_modules $out/.dependent-node-modules

From e8e76ac12e30dac1d029d5d97743e49919821633 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 30 Aug 2013 18:43:54 +0200
Subject: [PATCH 211/452] dstat: enable color output

Give dstat access to the "curses" module in the Python standard library
so that it can color its output. This is similar to how other distros
package it (e.g. Fedora, Ubuntu).
---
 pkgs/top-level/all-packages.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ab78b6f9f1..07fc7778922 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6285,7 +6285,11 @@ let
 
   drbd = callPackage ../os-specific/linux/drbd { };
 
-  dstat = callPackage ../os-specific/linux/dstat { };
+  dstat = callPackage ../os-specific/linux/dstat {
+    # pythonFull includes the "curses" standard library module, for pretty
+    # dstat color output
+    python = pythonFull;
+  };
 
   libuuid =
     if crossSystem != null && crossSystem.config == "i586-pc-gnu"

From 0c4185d37a6209acfe93b43bb669de1e76e93c34 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Fri, 30 Aug 2013 19:45:51 +0000
Subject: [PATCH 212/452] haskell: export callPackage to be able to create
 packages outside haskell-packages.nix

---
 pkgs/top-level/haskell-packages.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index f9bf4f5b301..f4f5e1810ca 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -74,6 +74,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   final = self;
 
+  callPackage = callPackage;
+
   # GHC and its wrapper
   #
   # We use a wrapped version of GHC for nearly everything. The wrapped version

From 36564b72fe9a541a7359ad52497c82e5e5561f46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 31 Aug 2013 09:42:20 +0200
Subject: [PATCH 213/452] uncrustify: new package

Uncrustify is a source code beautifier for C, C++, C#, ObjectiveC, D,
Java, Pawn and VALA.

Homepage: http://uncrustify.sourceforge.net/
---
 .../tools/misc/uncrustify/default.nix          | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix                |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/development/tools/misc/uncrustify/default.nix

diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix
new file mode 100644
index 00000000000..cf1ec5edbcd
--- /dev/null
+++ b/pkgs/development/tools/misc/uncrustify/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "uncrustify-0.60";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/uncrustify/${name}.tar.gz";
+    sha256 = "1v3wlkh669mfzbyg68xz7c1hj3kj7l6cavbvbj3jr47ickc3wzsa";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA";
+    homepage = http://uncrustify.sourceforge.net/;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 07fc7778922..16ecbdef54c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3687,6 +3687,8 @@ let
 
   uisp = callPackage ../development/tools/misc/uisp { };
 
+  uncrustify = callPackage ../development/tools/misc/uncrustify { };
+
   gdb = callPackage ../development/tools/misc/gdb {
     hurd = gnu.hurdCross;
     inherit (gnu) mig;

From 17237cf8e4709c409b54d3db5e0a687aa716213c Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Thu, 29 Aug 2013 09:03:13 +0200
Subject: [PATCH 214/452] firefox: upgrade to 23.0.1

---
 pkgs/applications/networking/browsers/firefox/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index b780152905d..fe436046339 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -19,9 +19,9 @@ assert useSystemCairo -> cairo != null;
 let optional = stdenv.lib.optional;
 in rec {
 
-  firefoxVersion = "23.0";
+  firefoxVersion = "23.0.1";
 
-  xulVersion = "23.0"; # this attribute is used by other packages
+  xulVersion = "23.0.1"; # this attribute is used by other packages
 
 
   src = fetchurl {
@@ -31,7 +31,7 @@ in rec {
         # Fall back to this url for versions not available at releases.mozilla.org.
         "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
     ];
-    sha1 = "31936d2ddb727640c96a3ae697bf145c42a2a20e";
+    sha1 = "66361fcvyl9liyh41gvgysiim90wsywk";
   };
 
   commonConfigureFlags =

From 927f32e87ce4d32168474ff05cca686b67966666 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 31 Aug 2013 11:31:41 +0200
Subject: [PATCH 215/452] linux-3.10: upgrade to 3.10.10

---
 pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index e054e5e16f5..fa57fdd93dd 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.10.9";
+  version = "3.10.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1kwi5v4rw06rmb548wjkgi27amsfvpfd2n07bmyjvjqnqrldm5bk";
+    sha256 = "01cpg6j1jsjh4vgvmia12y6rci4gqb967gc0gqpz5gcimzg4bb5p";
   };
 
   features.iwlwifi = true;

From 05264034618371be98cb333f9e28cd8922100dd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 31 Aug 2013 14:27:40 +0200
Subject: [PATCH 216/452] basex: new package

BaseX is a very fast and light-weight, yet powerful XML database and
XPath/XQuery processor, including support for the latest W3C Full Text
and Update Recommendations. It supports large XML instances and offers a
highly interactive front-end (basexgui). Apart from two local standalone
modes, BaseX offers a client/server architecture.

Homepage: http://basex.org/

Implementation notes:
 - I'm using the pre-built java package (because it's simple)
 - I copied the basex.svg icon file from the Ubuntu package because I
   couldn't find it anywhere else. It's 9.3 KiB.
---
 pkgs/tools/text/xml/basex/basex.svg   | 81 +++++++++++++++++++++++++++
 pkgs/tools/text/xml/basex/default.nix | 73 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 +
 3 files changed, 156 insertions(+)
 create mode 100644 pkgs/tools/text/xml/basex/basex.svg
 create mode 100644 pkgs/tools/text/xml/basex/default.nix

diff --git a/pkgs/tools/text/xml/basex/basex.svg b/pkgs/tools/text/xml/basex/basex.svg
new file mode 100644
index 00000000000..9d476cec2ca
--- /dev/null
+++ b/pkgs/tools/text/xml/basex/basex.svg
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2178"
+   sodipodi:version="0.32"
+   inkscape:version="0.45"
+   width="1568"
+   height="1164"
+   version="1.0"
+   sodipodi:docbase="F:\Uni\Scholl\Research\Conferences\BTW2007\Poster"
+   sodipodi:docname="Logo.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:modified="true">
+  <metadata
+     id="metadata2183">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs2181" />
+  <sodipodi:namedview
+     inkscape:window-height="1150"
+     inkscape:window-width="1143"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:zoom="0.64948454"
+     inkscape:cx="784"
+     inkscape:cy="584.00852"
+     inkscape:window-x="412"
+     inkscape:window-y="20"
+     inkscape:current-layer="layer2"
+     showgrid="false"
+     inkscape:object-bbox="true"
+     inkscape:object-points="true"
+     gridempspacing="10" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     style="opacity:1">
+    <path
+       style="font-size:1470px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:19.98425102;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;font-family:Clarendo"
+       d="M 628.08008,847.55762 C 613.24569,864.30587 601.88095,879.3791 593.98584,892.77734 C 586.08995,906.17595 582.1422,916.94254 582.14258,925.07715 C 582.1422,937.9972 586.92735,947.08899 596.49805,952.35254 C 606.06796,957.61633 624.49079,960.24816 651.7666,960.24805 L 720.67285,960.24805 L 720.67285,1072.2207 L 207.46484,1072.2207 L 207.46484,960.24805 L 256.27344,960.24805 C 284.9843,960.24816 308.07265,955.94152 325.53857,947.32813 C 343.00426,938.71498 364.89633,919.09586 391.21484,888.4707 L 673.2998,568.34375 L 441.45898,276.92773 C 416.57596,245.82505 393.60723,224.77038 372.55273,213.76367 C 351.4979,202.75868 325.89734,197.25576 295.75098,197.25488 L 245.50684,197.25488 L 245.50684,86 L 767.32813,86 L 767.32813,197.25488 L 699.85742,197.25488 C 685.97999,197.25576 675.45266,199.76796 668.27539,204.7915 C 661.0972,209.81678 657.50834,217.11414 657.50879,226.68359 C 657.50834,233.38365 659.30277,240.20249 662.89209,247.14014 C 666.4805,254.07943 672.58156,262.57308 681.19531,272.62109 L 810.39453,429.81348 L 967.58691,265.44336 C 974.76388,258.26644 980.50606,250.84945 984.81348,243.19238 C 989.11933,235.53697 991.27265,229.07702 991.27344,223.8125 C 991.27265,215.20008 985.88936,208.62049 975.12354,204.07373 C 964.35618,199.5287 948.20629,197.25576 926.67383,197.25488 L 869.25195,197.25488 L 869.25195,86 L 1332.2158,86 L 1332.2158,197.25488 L 1279.1006,197.25488 C 1241.2968,197.25576 1189.8564,233.14439 1124.7793,304.9209 L 1123.3438,306.35645 L 905.8584,544.65723 L 1155.6436,856.1709 C 1194.8808,904.97966 1224.6684,934.52797 1245.0063,944.81592 C 1265.3422,955.10412 1294.412,960.24816 1332.2158,960.24805 L 1376,960.24805 L 1376,1072.2207 L 810.39453,1072.2207 L 810.39453,960.24805 L 877.86523,960.24805 C 901.79032,960.24816 919.25612,958.21447 930.2627,954.14697 C 941.26782,950.07971 946.77074,943.26087 946.77148,933.69043 C 946.77074,926.51284 945.3352,918.97623 942.46484,911.08057 C 939.59302,903.18523 935.28638,895.64861 929.54492,888.4707 L 768.76367,685.34082 L 628.08008,847.55762 z "
+       id="text2175" />
+    <path
+       style="font-size:500px;font-style:normal;font-variant:normal;font-weight:800;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#e00000;fill-opacity:1;stroke:#ffffff;stroke-width:20;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;font-family:Arial Black"
+       d="M 146.16714,395.52869 L 353.19839,395.52869 C 387.70332,395.52904 414.19255,404.07396 432.66616,421.16345 C 451.13913,438.25361 460.37577,459.41244 460.37612,484.64001 C 460.37577,505.79912 453.78398,523.94688 440.60073,539.08337 C 431.81135,549.17472 418.95329,557.14998 402.02651,563.00916 C 427.74234,569.19424 446.66322,579.81434 458.78921,594.86951 C 470.9145,609.92499 476.97732,628.84587 476.97768,651.6322 C 476.97732,670.18697 472.66417,686.8699 464.03823,701.68103 C 455.41158,716.49227 443.61146,728.211 428.63784,736.83728 C 419.36019,742.20839 405.3628,746.11463 386.64565,748.55603 C 361.74306,751.81124 345.22289,753.43884 337.08511,753.43884 L 146.16714,753.43884 L 146.16714,395.52869 z M 257.7394,535.90955 L 305.83511,535.90955 C 323.0875,535.90976 335.09107,532.93939 341.84585,526.99841 C 348.60017,521.05789 351.97744,512.47229 351.97768,501.24158 C 351.97744,490.82517 348.60017,482.68716 341.84585,476.82751 C 335.09107,470.96842 323.33164,468.03874 306.56753,468.03845 L 257.7394,468.03845 L 257.7394,535.90955 z M 257.7394,676.53455 L 314.13589,676.53455 C 333.17863,676.53462 346.60635,673.15735 354.41909,666.40271 C 362.23134,659.64825 366.13758,650.57436 366.13784,639.18103 C 366.13758,628.60173 362.27203,620.0975 354.54116,613.66833 C 346.8098,607.23944 333.26001,604.02493 313.89175,604.02478 L 257.7394,604.02478 L 257.7394,676.53455 z "
+       id="text2205" />
+    <path
+       style="font-size:500px;font-style:normal;font-variant:normal;font-weight:800;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#e00000;fill-opacity:1;stroke:#ffffff;stroke-width:20;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;font-family:Arial Black"
+       d="M 703.69272,694.35681 L 577.71616,694.35681 L 560.38217,753.43884 L 447.34506,753.43884 L 581.86655,395.52869 L 702.47202,395.52869 L 836.9935,753.43884 L 721.27084,753.43884 L 703.69272,694.35681 z M 680.49936,616.96423 L 640.94858,488.30212 L 601.64194,616.96423 L 680.49936,616.96423 z "
+       id="text3180" />
+    <path
+       style="font-size:500px;font-style:normal;font-variant:normal;font-weight:800;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#e00000;fill-opacity:1;stroke:#ffffff;stroke-width:20;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;font-family:Arial Black"
+       d="M 810.90509,641.13416 L 916.1297,634.54236 C 918.40822,651.63231 923.04689,664.65313 930.04572,673.60486 C 941.4388,688.09061 957.71482,695.33344 978.87384,695.33337 C 994.6614,695.33344 1006.8277,691.63064 1015.3729,684.22498 C 1023.9176,676.81946 1028.19,668.23386 1028.1902,658.46814 C 1028.19,649.19091 1024.121,640.89013 1015.9832,633.5658 C 1007.845,626.24171 988.96479,619.3244 959.34259,612.81384 C 910.83987,601.90905 876.25331,587.42339 855.58282,569.35681 C 834.74945,551.29061 824.33279,528.26004 824.33282,500.26501 C 824.33279,481.87337 829.66319,464.49871 840.32404,448.14099 C 850.98479,431.7839 867.01667,418.92584 888.41974,409.56677 C 909.82262,400.20841 939.16015,395.52905 976.43243,395.52869 C 1022.1679,395.52905 1057.0393,404.03327 1081.0467,421.04138 C 1105.0535,438.05017 1119.3358,465.10906 1123.8934,502.21814 L 1019.6453,508.32166 C 1016.8782,492.20864 1011.0595,480.4899 1002.1893,473.16541 C 993.31863,465.84148 981.07092,462.17937 965.44611,462.17908 C 952.58787,462.17937 942.90364,464.90561 936.39337,470.35779 C 929.88282,475.81055 926.62761,482.44303 926.62775,490.25525 C 926.62761,495.95213 929.31316,501.07908 934.68439,505.63611 C 939.89257,510.35641 952.26235,514.75094 971.79376,518.8197 C 1020.1334,529.2366 1054.7606,539.77533 1075.6756,550.43591 C 1096.59,561.09692 1111.8081,574.32119 1121.3299,590.10876 C 1130.851,605.89668 1135.6118,623.55617 1135.6121,643.08728 C 1135.6118,666.03659 1129.2641,687.19543 1116.5692,706.56384 C 1103.8735,725.93237 1086.1327,740.62148 1063.3465,750.63123 C 1040.5598,760.64099 1011.8326,765.64587 977.16486,765.64587 C 916.29234,765.64587 874.13743,753.92713 850.70001,730.48962 C 827.26248,707.05218 813.99752,677.26705 810.90509,641.13416 L 810.90509,641.13416 z "
+       id="text3184" />
+    <path
+       style="font-size:500px;font-style:normal;font-variant:normal;font-weight:800;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#e00000;fill-opacity:1;stroke:#ffffff;stroke-width:20;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;font-family:Arial Black"
+       d="M 1139.0592,395.52869 L 1435.4459,395.52869 L 1435.4459,471.9447 L 1249.899,471.9447 L 1249.899,528.82947 L 1422.0182,528.82947 L 1422.0182,601.82751 L 1249.899,601.82751 L 1249.899,672.38416 L 1440.817,672.38416 L 1440.817,753.43884 L 1139.0592,753.43884 L 1139.0592,395.52869 z "
+       id="text3188" />
+  </g>
+</svg>
diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix
new file mode 100644
index 00000000000..4f120601c8e
--- /dev/null
+++ b/pkgs/tools/text/xml/basex/default.nix
@@ -0,0 +1,73 @@
+{ stdenv, fetchurl, unzip, jre, coreutils, makeDesktopItem }:
+
+stdenv.mkDerivation rec {
+  name = "basex-7.7";
+
+  src = fetchurl {
+    url = "http://files.basex.org/releases/7.7/BaseX77.zip";
+    sha256 = "1wnndq8lcnfx29bc3j2sgswk6dxgv2nln2chmwbf7h4a05fcavdj";
+  };
+
+  buildInputs = [ unzip jre ];
+
+  desktopItem = makeDesktopItem {
+    name = "basex";
+    exec = "basexgui %f";
+    icon = "${./basex.svg}"; # icon copied from Ubuntu basex package
+    comment = "Visually query and analyse your XML data";
+    desktopName = "BaseX XML Database";
+    genericName = "XML database tool";
+    categories = "Development;Utility;Database";
+    mimeType = "text/xml";
+  };
+
+  # We're using a pre-built package
+  configurePhase = "true";
+  buildPhase = "true";
+  installPhase = ''
+    mkdir -p "$out"
+    cp -r * "$out"
+
+    # Remove Windows batch files (unclutter $out/bin)
+    rm -f "$out"/bin/*.bat
+
+    # Move some top-level stuff to $out/share/basex (unclutter $out)
+    mkdir -p "$out/share/basex"
+    mv "$out"/*.txt "$out/share/basex/"
+    mv "$out"/webapp "$out/share/basex/"
+
+    # Remove empty directories
+    rmdir "$out/repo"
+    rmdir "$out/data"
+
+    # Install desktop file
+    mkdir -p "$out/share/applications"
+    cp "$desktopItem"/share/applications/* "$out/share/applications/"
+
+    # Use substitutions instead of wrapper scripts
+    for file in "$out"/bin/*; do
+        sed -i -e "s|/usr/bin/env bash|${stdenv.shell}|" \
+               -e "s|java|${jre}/bin/java|" \
+               -e "s|readlink|${coreutils}/bin/readlink|" \
+               -e "s|dirname|${coreutils}/bin/dirname|" \
+               -e "s|basename|${coreutils}/bin/basename|" \
+               -e "s|echo|${coreutils}/bin/echo|" \
+            "$file"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "XML database and XPath/XQuery processor";
+    longDescription = ''
+      BaseX is a very fast and light-weight, yet powerful XML database and
+      XPath/XQuery processor, including support for the latest W3C Full Text
+      and Update Recommendations. It supports large XML instances and offers a
+      highly interactive front-end (basexgui). Apart from two local standalone
+      modes, BaseX offers a client/server architecture.
+    '';
+    homepage = http://basex.org/;
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 16ecbdef54c..256a2b5cb4d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -501,6 +501,8 @@ let
 
   azureus = callPackage ../tools/networking/p2p/azureus { };
 
+  basex = callPackage ../tools/text/xml/basex { };
+
   babeld = callPackage ../tools/networking/babeld { };
 
   banner = callPackage ../games/banner {};

From 8dac1a5d0f7d75517ac0086ac80045f0235cce06 Mon Sep 17 00:00:00 2001
From: Gergely Risko <gergely@risko.hu>
Date: Sat, 31 Aug 2013 16:10:09 +0200
Subject: [PATCH 217/452] Add final haskell library

---
 .../libraries/haskell/final/default.nix            | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  8 +++++---
 2 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/final/default.nix

diff --git a/pkgs/development/libraries/haskell/final/default.nix b/pkgs/development/libraries/haskell/final/default.nix
new file mode 100644
index 00000000000..63226174118
--- /dev/null
+++ b/pkgs/development/libraries/haskell/final/default.nix
@@ -0,0 +1,14 @@
+{ cabal, stm, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "final";
+  version = "0.1";
+  sha256 = "189vby5ym6hcjpz6y9chlgkyzl8wnndqkhzk7s7qy8mksr3g66f9";
+  buildDepends = [ stm transformers ];
+  meta = {
+    homepage = "http://github.com/errge/final";
+    description = "utility to add extra safety to monadic returns";
+    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 f4f5e1810ca..42107fdfb0b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -64,7 +64,7 @@
 # modifyPrio argument can be set to lowPrio to make all Haskell packages have
 # low priority.
 
-let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
+let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x y);
                  self = (prefFun result) result; in
 
 # Indentation deliberately broken at this point to keep the bulk
@@ -72,7 +72,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
 {
 
-  final = self;
+  finalReturn = self;
 
   callPackage = callPackage;
 
@@ -962,6 +962,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   filesystemConduit = callPackage ../development/libraries/haskell/filesystem-conduit {};
 
+  final = callPackage ../development/libraries/haskell/final {};
+
   fgl_5_4_2_2 = callPackage ../development/libraries/haskell/fgl/5.4.2.2.nix {};
   fgl_5_4_2_3 = callPackage ../development/libraries/haskell/fgl/5.4.2.3.nix {};
   fgl_5_4_2_4 = callPackage ../development/libraries/haskell/fgl/5.4.2.4.nix {};
@@ -2383,4 +2385,4 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
 };
 
-in result.final
+in result.finalReturn

From 07e2763f003d4d2500d43a6e508bf2cc1dbf3e25 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sat, 31 Aug 2013 18:39:58 +0200
Subject: [PATCH 218/452] add travis ruby gem

---
 .../interpreters/ruby/generated.nix           | 303 +++++++++++++++---
 .../development/interpreters/ruby/patches.nix |   1 +
 2 files changed, 257 insertions(+), 47 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix
index da0de976824..7c062a44ca1 100644
--- a/pkgs/development/interpreters/ruby/generated.nix
+++ b/pkgs/development/interpreters/ruby/generated.nix
@@ -15,29 +15,33 @@ g: # Get dependencies from patched gems
     atomic = g.atomic_1_1_13;
     atoulme_Antwrap = g.atoulme_Antwrap_0_7_4;
     autotest_rails = g.autotest_rails_4_1_2;
-    aws_sdk = g.aws_sdk_1_15_0;
-    bitbucket_backup = g.bitbucket_backup_0_2_2;
+    aws_sdk = g.aws_sdk_1_16_1;
+    backports = g.backports_3_3_3;
+    bitbucket_backup = g.bitbucket_backup_0_3_0;
     builder = g.builder_3_2_2;
     buildr = g.buildr_1_4_12;
     bundler = g.bundler_1_3_5;
     childprocess = g.childprocess_0_3_9;
-    chronic = g.chronic_0_9_1;
+    chronic = g.chronic_0_10_1;
+    coderay = g.coderay_1_0_9;
     daemons = g.daemons_1_1_9;
     diff_lcs = g.diff_lcs_1_1_3;
     dimensions = g.dimensions_1_2_0;
     domain_name = g.domain_name_0_5_13;
-    dotenv = g.dotenv_0_8_0;
+    dotenv = g.dotenv_0_9_0;
     em_resolv_replace = g.em_resolv_replace_1_1_3;
     erubis = g.erubis_2_7_0;
+    ethon = g.ethon_0_6_1;
     eventmachine = g.eventmachine_1_0_3;
     eventmachine_tail = g.eventmachine_tail_0_6_4;
     fakes3 = g.fakes3_0_1_5;
     faraday = g.faraday_0_8_8;
-    faraday_middleware = g.faraday_middleware_0_8_8;
+    faraday_middleware = g.faraday_middleware_0_9_0;
     ffi = g.ffi_1_9_0;
     file_tail = g.file_tail_1_0_12;
     foreman = g.foreman_0_63_0;
-    gettext = g.gettext_2_3_9;
+    gettext = g.gettext_3_0_0;
+    gh = g.gh_0_12_0;
     highline = g.highline_1_6_19;
     hike = g.hike_1_2_3;
     hoe = g.hoe_3_1_0;
@@ -48,12 +52,14 @@ g: # Get dependencies from patched gems
     jsduck = g.jsduck_5_1_0;
     json = g.json_1_8_0;
     json_pure = g.json_pure_1_8_0;
+    launchy = g.launchy_2_3_0;
     locale = g.locale_2_0_8;
     lockfile = g.lockfile_2_1_0;
     macaddr = g.macaddr_1_6_1;
     mail = g.mail_2_5_4;
     mechanize = g.mechanize_2_7_2;
-    mime_types = g.mime_types_1_24;
+    method_source = g.method_source_0_8_2;
+    mime_types = g.mime_types_1_25;
     mini_portile = g.mini_portile_0_5_1;
     minitar = g.minitar_0_5_3;
     minitest = g.minitest_4_7_5;
@@ -61,8 +67,10 @@ g: # Get dependencies from patched gems
     multipart_post = g.multipart_post_1_2_0;
     net_http_digest_auth = g.net_http_digest_auth_1_4;
     net_http_persistent = g.net_http_persistent_2_9;
+    net_http_pipeline = g.net_http_pipeline_1_0_1;
     net_sftp = g.net_sftp_2_0_5;
     net_ssh = g.net_ssh_2_6_8;
+    netrc = g.netrc_0_7_7;
     nix = g.nix_0_1_1;
     nokogiri = g.nokogiri_1_6_0;
     ntlm_http = g.ntlm_http_0_1_1;
@@ -70,6 +78,8 @@ g: # Get dependencies from patched gems
     papertrail_cli = g.papertrail_cli_0_9_3;
     parallel = g.parallel_0_7_1;
     polyglot = g.polyglot_0_3_3;
+    pry = g.pry_0_9_12_2;
+    pusher_client = g.pusher_client_0_3_1;
     rack = g.rack_1_5_2;
     rack_protection = g.rack_protection_1_5_0;
     rack_test = g.rack_test_0_6_2;
@@ -88,26 +98,30 @@ g: # Get dependencies from patched gems
     rspec_core = g.rspec_core_2_11_1;
     rspec_expectations = g.rspec_expectations_2_11_3;
     rspec_mocks = g.rspec_mocks_2_11_3;
+    ruby_hmac = g.ruby_hmac_0_4_0;
     rubyforge = g.rubyforge_2_0_4;
     rubyzip = g.rubyzip_0_9_9;
     sass = g.sass_3_2_10;
-    selenium_webdriver = g.selenium_webdriver_2_35_0;
+    selenium_webdriver = g.selenium_webdriver_2_35_1;
     servolux = g.servolux_0_10_0;
     sinatra = g.sinatra_1_3_2;
+    slop = g.slop_3_4_6;
     sprockets = g.sprockets_2_10_0;
     sprockets_rails = g.sprockets_rails_2_0_0;
     syslog_protocol = g.syslog_protocol_0_9_2;
     systemu = g.systemu_2_5_2;
     taskjuggler = g.taskjuggler_3_5_0;
     term_ansicolor = g.term_ansicolor_1_2_2;
-    text = g.text_1_2_1;
+    text = g.text_1_2_3;
     thin = g.thin_1_5_1;
     thor = g.thor_0_18_1;
     thread_safe = g.thread_safe_0_1_2;
     tilt = g.tilt_1_4_1;
-    tins = g.tins_0_8_4;
+    tins = g.tins_0_9_0;
+    travis = g.travis_1_5_3;
     treetop = g.treetop_1_4_15;
     trollop = g.trollop_2_0;
+    typhoeus = g.typhoeus_0_6_5;
     tzinfo = g.tzinfo_0_3_37;
     unf = g.unf_0_1_2;
     unf_ext = g.unf_ext_0_0_6;
@@ -120,7 +134,7 @@ g: # Get dependencies from patched gems
     xml_simple = g.xml_simple_1_1_1;
     yajl_ruby = g.yajl_ruby_1_1_0;
   };
-  gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''fakes3'' ''foreman'' ''gettext'' ''iconv'' ''jsduck'' ''lockfile'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''right_aws'' ''rmail'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''taskjuggler'' ''thin'' ''trollop'' ''uuid'' ''xapian-full'' ''xapian-ruby'' ];
+  gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''fakes3'' ''foreman'' ''gettext'' ''iconv'' ''jsduck'' ''lockfile'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''right_aws'' ''rmail'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''taskjuggler'' ''thin'' ''travis'' ''trollop'' ''uuid'' ''xapian-full'' ''xapian-ruby'' ];
   gems = {
     ZenTest_4_9_3 = {
       basename = ''ZenTest'';
@@ -296,27 +310,38 @@ rails support and extra plugins for migrations and fixtures.'';
       requiredGems = [ g.ZenTest_4_9_3 ];
       sha256 = ''1wkb5jayb39yx0i8ly7sibygf9f9c3w24jg2z1qgm135zlb070v4'';
     };
-    aws_sdk_1_15_0 = {
+    aws_sdk_1_16_1 = {
       basename = ''aws_sdk'';
       meta = {
         description = ''AWS SDK for Ruby'';
         homepage = ''http://aws.amazon.com/sdkforruby'';
         longDescription = ''AWS SDK for Ruby'';
       };
-      name = ''aws-sdk-1.15.0'';
+      name = ''aws-sdk-1.16.1'';
       requiredGems = [ g.uuidtools_2_1_4 g.nokogiri_1_5_10 g.json_1_8_0 ];
-      sha256 = ''1lan7sgp7n5r2x2amcqswckdmkymrp89pj92arxdalis9jamma7q'';
+      sha256 = ''1i6njmzfcmjb9xdaqw727pdqr17w3gad1nl5zln4mv6i4x0nbc3n'';
     };
-    bitbucket_backup_0_2_2 = {
+    backports_3_3_3 = {
+      basename = ''backports'';
+      meta = {
+        description = ''Backports of Ruby features for older Ruby.'';
+        homepage = ''http://github.com/marcandre/backports'';
+        longDescription = ''Essential backports that enable many of the nice features of Ruby 1.8.7 up to 2.0.0 for earlier versions.'';
+      };
+      name = ''backports-3.3.3'';
+      requiredGems = [  ];
+      sha256 = ''0y1la483wlv7gam1470shskc0bjsif9hld6qikx165yw9gmbgxsy'';
+    };
+    bitbucket_backup_0_3_0 = {
       basename = ''bitbucket_backup'';
       meta = {
         description = ''A tool to backup Bitbucket repos.'';
         homepage = ''https://bitbucket.org/seth/bitbucket-backup'';
         longDescription = ''A tool to backup Bitbucket repos.'';
       };
-      name = ''bitbucket-backup-0.2.2'';
+      name = ''bitbucket-backup-0.3.0'';
       requiredGems = [ g.highline_1_6_19 g.json_1_8_0 ];
-      sha256 = ''1kzg6pkzw04n96i6mhb74gpg4c899wly5fc2m1y6m2xvn71qksys'';
+      sha256 = ''075bz4bhxim2kh5191qc9kpq7z81aa2smgqq5bfldjqvk70hr87y'';
     };
     builder_3_1_3 = {
       basename = ''builder'';
@@ -404,16 +429,27 @@ for those one-off tasks, with a language that's a joy to use.
       requiredGems = [ g.ffi_1_9_0 ];
       sha256 = ''0jbz2ix7ff9ry8717lhcq9w8j8yd45akw48giwgdqccay5mlph7d'';
     };
-    chronic_0_9_1 = {
+    chronic_0_10_1 = {
       basename = ''chronic'';
       meta = {
         description = ''Natural language date/time parsing.'';
         homepage = ''http://github.com/mojombo/chronic'';
         longDescription = ''Chronic is a natural language date/time parser written in pure Ruby.'';
       };
-      name = ''chronic-0.9.1'';
+      name = ''chronic-0.10.1'';
       requiredGems = [  ];
-      sha256 = ''0kspaxpfy7yvyk1lvpx31w852qfj8wb9z04mcj5bzi70ljb9awqk'';
+      sha256 = ''0p822hry4njncxpf59nrvjayg2pxk1zh8gykjgsmqrphdkqqmp1w'';
+    };
+    coderay_1_0_9 = {
+      basename = ''coderay'';
+      meta = {
+        description = ''Fast syntax highlighting for selected languages.'';
+        homepage = ''http://coderay.rubychan.de'';
+        longDescription = ''Fast and easy syntax highlighting for selected languages, written in Ruby. Comes with RedCloth integration and LOC counter.'';
+      };
+      name = ''coderay-1.0.9'';
+      requiredGems = [  ];
+      sha256 = ''1pbjsvd6r2daxd6aicp19fnb1j5z7fxadflsm1h0r33cy3vi7iy8'';
     };
     daemons_1_1_9 = {
       basename = ''daemons'';
@@ -477,16 +513,16 @@ Suffix List.
       requiredGems = [ g.unf_0_1_2 ];
       sha256 = ''0m57vacj2bmdfp094gjylfzz5gqdpn95pcypk5friab3svrambxv'';
     };
-    dotenv_0_8_0 = {
+    dotenv_0_9_0 = {
       basename = ''dotenv'';
       meta = {
         description = ''Loads environment variables from `.env`.'';
         homepage = ''https://github.com/bkeepers/dotenv'';
         longDescription = ''Loads environment variables from `.env`.'';
       };
-      name = ''dotenv-0.8.0'';
+      name = ''dotenv-0.9.0'';
       requiredGems = [  ];
-      sha256 = ''1l93ksw6szh77yzrsl4pzsg0ryry3j5n9k0xf8614gyl07p9rh51'';
+      sha256 = ''1gl0m6s8d6m72wcm4p86kzzjdihyryi5mh6v70qkqd0dl1gj73l3'';
     };
     em_resolv_replace_1_1_3 = {
       basename = ''em_resolv_replace'';
@@ -521,6 +557,17 @@ Suffix List.
       requiredGems = [  ];
       sha256 = ''1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3'';
     };
+    ethon_0_6_1 = {
+      basename = ''ethon'';
+      meta = {
+        description = ''Libcurl wrapper.'';
+        homepage = ''https://github.com/typhoeus/ethon'';
+        longDescription = ''Very lightweight libcurl wrapper.'';
+      };
+      name = ''ethon-0.6.1'';
+      requiredGems = [ g.ffi_1_9_0 g.mime_types_1_25 ];
+      sha256 = ''05mw10bh4pif0j6pjzyhcsm8kzv7xn94dcjcb15dmbjx2za0daa7'';
+    };
     eventmachine_1_0_3 = {
       basename = ''eventmachine'';
       meta = {
@@ -583,6 +630,17 @@ using TCP/IP, especially if custom protocols are required.'';
       requiredGems = [ g.faraday_0_8_8 ];
       sha256 = ''1n0g8pm7ynx6ffyqhscc1cqw97zhvd8isr31yfyj15335j1jsncz'';
     };
+    faraday_middleware_0_9_0 = {
+      basename = ''faraday_middleware'';
+      meta = {
+        description = ''Various middleware for Faraday'';
+        homepage = ''https://github.com/pengwynn/faraday_middleware'';
+        longDescription = ''Various middleware for Faraday'';
+      };
+      name = ''faraday_middleware-0.9.0'';
+      requiredGems = [ g.faraday_0_8_8 ];
+      sha256 = ''1kwvi2sdxd6j764a7q5iir73dw2v6816zx3l8cgfv0wr2m47icq2'';
+    };
     ffi_1_9_0 = {
       basename = ''ffi'';
       meta = {
@@ -602,7 +660,7 @@ using TCP/IP, especially if custom protocols are required.'';
         longDescription = ''Library to tail files in Ruby'';
       };
       name = ''file-tail-1.0.12'';
-      requiredGems = [ g.tins_0_8_4 ];
+      requiredGems = [ g.tins_0_9_0 ];
       sha256 = ''0mzxxnwj7k5pwxs0rdbmb3b41zgvzw7x40sf3qlkch4zdfx91i1j'';
     };
     foreman_0_63_0 = {
@@ -613,10 +671,10 @@ using TCP/IP, especially if custom protocols are required.'';
         longDescription = ''Process manager for applications with multiple components'';
       };
       name = ''foreman-0.63.0'';
-      requiredGems = [ g.thor_0_18_1 g.dotenv_0_8_0 ];
+      requiredGems = [ g.thor_0_18_1 g.dotenv_0_9_0 ];
       sha256 = ''0yqyjix9jm4iwyc4f3wc32vxr28rpjcw1c9ni5brs4s2a24inzlk'';
     };
-    gettext_2_3_9 = {
+    gettext_3_0_0 = {
       basename = ''gettext'';
       meta = {
         description = ''Gettext is a pure Ruby libary and tools to localize messages.'';
@@ -626,9 +684,20 @@ The catalog file(po-file) is same format with GNU gettext.
 So you can use GNU gettext tools for maintaining.
 '';
       };
-      name = ''gettext-2.3.9'';
-      requiredGems = [ g.locale_2_0_8 g.text_1_2_1 ];
-      sha256 = ''1i4kzkan7mnyr1ihphx0sqs3k4qj9i1ldg4a1cwf5h2fz657wvjj'';
+      name = ''gettext-3.0.0'';
+      requiredGems = [ g.locale_2_0_8 g.text_1_2_3 ];
+      sha256 = ''1qlqd6c39bjn930qh93i40gbz1bs20gzpwvw3d8rxnkls5a6pl1y'';
+    };
+    gh_0_12_0 = {
+      basename = ''gh'';
+      meta = {
+        description = ''layered github client'';
+        homepage = ''http://gh.rkh.im/'';
+        longDescription = ''multi-layer client for the github api v3'';
+      };
+      name = ''gh-0.12.0'';
+      requiredGems = [ g.faraday_0_8_8 g.backports_3_3_3 g.multi_json_1_7_9 g.addressable_2_3_5 g.net_http_persistent_2_9 g.net_http_pipeline_1_0_1 ];
+      sha256 = ''180jmg6rwilzcbzvyg74q27zpr09pv6pw3cfcjxr0bcklv203q3n'';
     };
     highline_1_6_19 = {
       basename = ''highline'';
@@ -779,6 +848,17 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
       requiredGems = [  ];
       sha256 = ''0kkn5zhiffav2cffj43wwvzj07825r4j463ilfjgik034vnbjs83'';
     };
+    launchy_2_3_0 = {
+      basename = ''launchy'';
+      meta = {
+        description = ''Launchy is helper class for launching cross-platform applications in a fire and forget manner.'';
+        homepage = ''http://github.com/copiousfreetime/launchy'';
+        longDescription = ''Launchy is helper class for launching cross-platform applications in a fire and forget manner. There are application concepts (browser, email client, etc) that are common across all platforms, and they may be launched differently on each platform. Launchy is here to make a common approach to launching external application from within ruby programs.'';
+      };
+      name = ''launchy-2.3.0'';
+      requiredGems = [ g.addressable_2_3_5 ];
+      sha256 = ''0ckvs40f29ancs0ki12pqb94k380cz41b4gbjplm85ly6kd57sph'';
+    };
     locale_2_0_8 = {
       basename = ''locale'';
       meta = {
@@ -821,7 +901,7 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
         longDescription = ''A really Ruby Mail handler.'';
       };
       name = ''mail-2.5.4'';
-      requiredGems = [ g.mime_types_1_24 g.treetop_1_4_15 ];
+      requiredGems = [ g.mime_types_1_25 g.treetop_1_4_15 ];
       sha256 = ''0z15ksb8blcppchv03g34844f7xgf36ckp484qjj2886ig1qara4'';
     };
     mechanize_2_7_2 = {
@@ -836,17 +916,54 @@ submitted.  Mechanize also keeps track of the sites that you have visited as
 a history.'';
       };
       name = ''mechanize-2.7.2'';
-      requiredGems = [ g.net_http_digest_auth_1_4 g.net_http_persistent_2_9 g.mime_types_1_24 g.http_cookie_1_0_1 g.nokogiri_1_6_0 g.ntlm_http_0_1_1 g.webrobots_0_1_1 g.domain_name_0_5_13 ];
+      requiredGems = [ g.net_http_digest_auth_1_4 g.net_http_persistent_2_9 g.mime_types_1_25 g.http_cookie_1_0_1 g.nokogiri_1_6_0 g.ntlm_http_0_1_1 g.webrobots_0_1_1 g.domain_name_0_5_13 ];
       sha256 = ''1w1rnn6jps1393gywi38saw5iqrvyai3vmvbv2kbc9j0zj5csyrl'';
     };
-    mime_types_1_24 = {
+    method_source_0_8_2 = {
+      basename = ''method_source'';
+      meta = {
+        description = ''retrieve the sourcecode for a method'';
+        homepage = ''http://banisterfiend.wordpress.com'';
+        longDescription = ''retrieve the sourcecode for a method'';
+      };
+      name = ''method_source-0.8.2'';
+      requiredGems = [  ];
+      sha256 = ''1g5i4w0dmlhzd18dijlqw5gk27bv6dj2kziqzrzb7mpgxgsd1sf2'';
+    };
+    mime_types_1_25 = {
       basename = ''mime_types'';
       meta = {
         description = ''This library allows for the identification of a file's likely MIME content type'';
         homepage = ''http://mime-types.rubyforge.org/'';
         longDescription = ''This library allows for the identification of a file's likely MIME content
-type. This is release 1.24, adding and updating a few MIME types and fixing
-some issues with documentation.
+type. This is release 1.25, adding experimental caching and lazy loading
+functionality.
+
+The caching and lazy loading features were initially implemented by Greg
+Brockman (gdb). As these features are experimental, they are disabled by
+default and must be enabled through the use of environment variables. The cache
+is invalidated on a per-version basis; the cache for version 1.25 will not be
+reused for version 1.26.
+
+To use lazy loading, set the environment variable +RUBY_MIME_TYPES_LAZY_LOAD+
+to any value other than 'false'. When using lazy loading, the initial startup
+of MIME::Types is around 12–25× faster than normal startup (on my system,
+normal startup is about 90 ms; lazy startup is about 4 ms). This isn't
+generally useful, however, as the MIME::Types database has not been loaded.
+Lazy startup and load is just *slightly* faster—around 1 ms. The real advantage
+comes from using the cache.
+
+To enable the cache, set the environment variable +RUBY_MIME_TYPES_CACHE+ to a
+filename where MIME::Types will have read-write access. The first time a new
+version of MIME::Types is run using this file, it will be created, taking a
+little longer than normal. Subsequent loads using the same cache file will be
+approximately 3½× faster (25 ms) than normal loads. This can be combined with
++RUBY_MIME_TYPES_LAZY_LOAD+, but this is *not* recommended in a multithreaded
+or multiprocess environment where all threads or processes will be using the
+same cache file.
+
+As the caching interface is still experimental, the only values cached are the
+default MIME::Types database, not any custom MIME::Types added by users.
 
 MIME types are used in MIME-compliant communications, as in e-mail or HTTP
 traffic, to indicate the type of content which is transmitted. MIME::Types
@@ -866,9 +983,9 @@ tracks the {IANA registry}[http://www.iana.org/assignments/media-types/]
 added from the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp]
 and added by the users of MIME::Types.'';
       };
-      name = ''mime-types-1.24'';
+      name = ''mime-types-1.25'';
       requiredGems = [  ];
-      sha256 = ''1g9wmcimvighiyc2pq1qyl3v9420aai86qplyndvvkh7qw78xl9a'';
+      sha256 = ''0hd6hpl05jyx3siznk70z46bmrzwmcyrr24yfaqg6nar35zw8bgf'';
     };
     mini_portile_0_5_1 = {
       basename = ''mini_portile'';
@@ -1014,6 +1131,19 @@ and retry according to RFC 2616.'';
       requiredGems = [  ];
       sha256 = ''0k9bp7q5fsh908jnkwfj71ky04i4ih0ky6sqi5vl6zcpjsczgfcb'';
     };
+    net_http_pipeline_1_0_1 = {
+      basename = ''net_http_pipeline'';
+      meta = {
+        description = ''An HTTP/1.1 pipelining implementation atop Net::HTTP'';
+        homepage = ''http://docs.seattlerb.org/net-http-pipeline'';
+        longDescription = ''An HTTP/1.1 pipelining implementation atop Net::HTTP.  A pipelined connection
+sends multiple requests to the HTTP server without waiting for the responses.
+The server will respond in-order.'';
+      };
+      name = ''net-http-pipeline-1.0.1'';
+      requiredGems = [  ];
+      sha256 = ''0bxjy33yhxwsbnld8xj3zv64ibgfjn9rjpiqkyd5ipmz50pww8v9'';
+    };
     net_sftp_2_0_5 = {
       basename = ''net_sftp'';
       meta = {
@@ -1047,6 +1177,17 @@ and retry according to RFC 2616.'';
       requiredGems = [  ];
       sha256 = ''0vf9w8b9f5ha94nwhvwxyqk4lfpy42ihl1g0qib8dfvswlkqw3mx'';
     };
+    netrc_0_7_7 = {
+      basename = ''netrc'';
+      meta = {
+        description = ''Library to read and write netrc files.'';
+        homepage = ''https://github.com/geemus/netrc'';
+        longDescription = ''This library can read and update netrc files, preserving formatting including comments and whitespace.'';
+      };
+      name = ''netrc-0.7.7'';
+      requiredGems = [  ];
+      sha256 = ''1y64v93hsxdwgx3dfkyzdki3zqd1slm42dmi23v0zy3kap4vpard'';
+    };
     nix_0_1_1 = {
       basename = ''nix'';
       meta = {
@@ -1107,7 +1248,7 @@ enough of it.'';
         longDescription = ''Command-line client for Papertrail hosted log management service. Tails and searches app server logs and system syslog. Supports Boolean search and works with grep and pipe output (Unix).'';
       };
       name = ''papertrail-0.9.7'';
-      requiredGems = [ g.addressable_2_3_5 g.yajl_ruby_1_1_0 g.chronic_0_9_1 g.faraday_0_8_8 g.faraday_middleware_0_8_8 ];
+      requiredGems = [ g.addressable_2_3_5 g.yajl_ruby_1_1_0 g.chronic_0_10_1 g.faraday_0_8_8 g.faraday_middleware_0_8_8 ];
       sha256 = ''0v0m1v0qabbr9pmyl77znz39qy1m7p0xwvf3lf9hyq6n524f2dwr'';
     };
     papertrail_cli_0_9_3 = {
@@ -1145,6 +1286,28 @@ augments 'require' to find and load matching files.'';
       requiredGems = [  ];
       sha256 = ''082zmail2h3cxd9z1wnibhk6aj4sb1f3zzwra6kg9bp51kx2c00v'';
     };
+    pry_0_9_12_2 = {
+      basename = ''pry'';
+      meta = {
+        description = ''An IRB alternative and runtime developer console'';
+        homepage = ''http://pry.github.com'';
+        longDescription = ''An IRB alternative and runtime developer console'';
+      };
+      name = ''pry-0.9.12.2'';
+      requiredGems = [ g.coderay_1_0_9 g.slop_3_4_6 g.method_source_0_8_2 ];
+      sha256 = ''141slzb62zfzdhrygqjmrzh68s3vzrb4mwyipy2lhps5q4b46y9s'';
+    };
+    pusher_client_0_3_1 = {
+      basename = ''pusher_client'';
+      meta = {
+        description = ''Client for consuming WebSockets from http://pusher.com'';
+        homepage = ''http://github.com/pusher/pusher-ruby-client'';
+        longDescription = ''Client for consuming WebSockets from http://pusher.com'';
+      };
+      name = ''pusher-client-0.3.1'';
+      requiredGems = [ g.websocket_1_0_7 g.ruby_hmac_0_4_0 ];
+      sha256 = ''1mxqy960iln065fypk1ww3xgv7q396fpl6v0rp7ipls6aj86j970'';
+    };
     rack_1_5_2 = {
       basename = ''rack'';
       meta = {
@@ -1434,6 +1597,19 @@ in JSDuck.
       requiredGems = [  ];
       sha256 = ''1rna3ii52rlhhca49zigk692hdcmz7qib42i4hhny478k04wx0qg'';
     };
+    ruby_hmac_0_4_0 = {
+      basename = ''ruby_hmac'';
+      meta = {
+        description = ''This module provides common interface to HMAC functionality'';
+        homepage = ''http://ruby-hmac.rubyforge.org'';
+        longDescription = ''This module provides common interface to HMAC functionality. HMAC is a kind of "Message Authentication Code" (MAC) algorithm whose standard is documented in RFC2104. Namely, a MAC provides a way to check the integrity of information transmitted over or stored in an unreliable medium, based on a secret key.
+
+Originally written by Daiki Ueno. Converted to a RubyGem by Geoffrey Grosenbach'';
+      };
+      name = ''ruby-hmac-0.4.0'';
+      requiredGems = [  ];
+      sha256 = ''01zym41f8fqbmxfz8zv19627swi62ka3gp33bfbkc87v5k7mw954'';
+    };
     rubyforge_2_0_4 = {
       basename = ''rubyforge'';
       meta = {
@@ -1477,16 +1653,16 @@ in JSDuck.
       requiredGems = [  ];
       sha256 = ''0anfff4hz8fz1wbimmp9vv4mjfl1swg7ww74j549788x41l4x283'';
     };
-    selenium_webdriver_2_35_0 = {
+    selenium_webdriver_2_35_1 = {
       basename = ''selenium_webdriver'';
       meta = {
         description = ''The next generation developer focused tool for automated testing of webapps'';
         homepage = ''http://selenium.googlecode.com'';
         longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.'';
       };
-      name = ''selenium-webdriver-2.35.0'';
+      name = ''selenium-webdriver-2.35.1'';
       requiredGems = [ g.multi_json_1_7_9 g.rubyzip_0_9_9 g.childprocess_0_3_9 g.websocket_1_0_7 ];
-      sha256 = ''1y9p7njw26j571mhnvqrh0hvszx78kfci4d7qps38l32zid5qa7m'';
+      sha256 = ''0251nbh6kbb96dv21n6fgbnw31p5gqr7anvhl8phrar5ylircqj6'';
     };
     servolux_0_10_0 = {
       basename = ''servolux'';
@@ -1513,6 +1689,17 @@ interpreters.'';
       requiredGems = [ g.rack_1_5_2 g.rack_protection_1_5_0 g.tilt_1_4_1 ];
       sha256 = ''05blf915zpiwyz7agcn9rwdmddwxz0z4l3gd4qlqmrgd2vkw4sxc'';
     };
+    slop_3_4_6 = {
+      basename = ''slop'';
+      meta = {
+        description = ''Simple Lightweight Option Parsing'';
+        homepage = ''http://github.com/injekt/slop'';
+        longDescription = ''A simple DSL for gathering options and parsing the command line'';
+      };
+      name = ''slop-3.4.6'';
+      requiredGems = [  ];
+      sha256 = ''0fdp3nkljjs2d5yhgjzcqi0f6xq67byfbrayg5aj7r76rsw0hmal'';
+    };
     sprockets_2_10_0 = {
       basename = ''sprockets'';
       meta = {
@@ -1584,19 +1771,19 @@ management.
         longDescription = ''This library uses ANSI escape sequences to control the attributes of terminal output'';
       };
       name = ''term-ansicolor-1.2.2'';
-      requiredGems = [ g.tins_0_8_4 ];
+      requiredGems = [ g.tins_0_9_0 ];
       sha256 = ''1b41q1q6mqcgzq9fhzhmjvfg5sfs5v7gkb8z57r4hajcp89lflxr'';
     };
-    text_1_2_1 = {
+    text_1_2_3 = {
       basename = ''text'';
       meta = {
         description = ''A collection of text algorithms'';
         homepage = ''http://github.com/threedaymonk/text'';
         longDescription = ''A collection of text algorithms: Levenshtein, Soundex, Metaphone, Double Metaphone, Porter Stemming'';
       };
-      name = ''text-1.2.1'';
+      name = ''text-1.2.3'';
       requiredGems = [  ];
-      sha256 = ''0s186kh125imdr7dahr10payc1gmxgk6wjy1v3agdyvl53yn5z3z'';
+      sha256 = ''14p1b3m7sxjs4ckjnd1whz82hkv0cj08j3rpkvcbavwbm07zpsd0'';
     };
     thin_1_5_1 = {
       basename = ''thin'';
@@ -1642,16 +1829,27 @@ management.
       requiredGems = [  ];
       sha256 = ''00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir'';
     };
-    tins_0_8_4 = {
+    tins_0_9_0 = {
       basename = ''tins'';
       meta = {
         description = ''Useful stuff.'';
         homepage = ''http://flori.github.com/tins'';
         longDescription = ''All the stuff that isn't good/big enough for a real library.'';
       };
-      name = ''tins-0.8.4'';
+      name = ''tins-0.9.0'';
       requiredGems = [  ];
-      sha256 = ''1j1mkxh9m4qkhgyl9naxd2gxv03c6svbwcm7vl8c2s9p4gfg0x7s'';
+      sha256 = ''17147yzxhbcby9ycswai6sgc9cxdlbfa897amjsimkyqv1lh9pbc'';
+    };
+    travis_1_5_3 = {
+      basename = ''travis'';
+      meta = {
+        description = ''Travis CI client'';
+        homepage = ''https://github.com/travis-ci/travis'';
+        longDescription = ''CLI and Ruby client library for Travis CI'';
+      };
+      name = ''travis-1.5.3'';
+      requiredGems = [ g.faraday_0_8_8 g.faraday_middleware_0_9_0 g.highline_1_6_19 g.netrc_0_7_7 g.backports_3_3_3 g.gh_0_12_0 g.launchy_2_3_0 g.pry_0_9_12_2 g.typhoeus_0_6_5 g.pusher_client_0_3_1 ];
+      sha256 = ''052kqfd0280ar9ci9vplihbc4a69l06m8chfrriygvjxc14npx97'';
     };
     treetop_1_4_15 = {
       basename = ''treetop'';
@@ -1678,6 +1876,17 @@ specify.'';
       requiredGems = [  ];
       sha256 = ''0iz5k7ax7a5jm9x6p81k6f4mgp48wxxb0j55ypnwxnznih8fsghz'';
     };
+    typhoeus_0_6_5 = {
+      basename = ''typhoeus'';
+      meta = {
+        description = ''Parallel HTTP library on top of libcurl multi.'';
+        homepage = ''https://github.com/typhoeus/typhoeus'';
+        longDescription = ''Like a modern code version of the mythical beast with 100 serpent heads, Typhoeus runs HTTP requests in parallel while cleanly encapsulating handling logic.'';
+      };
+      name = ''typhoeus-0.6.5'';
+      requiredGems = [ g.ethon_0_6_1 ];
+      sha256 = ''13xwy86iv98ypagrb6d95k1xf6yllnfqnh4ipfqix87npirjaxji'';
+    };
     tzinfo_0_3_37 = {
       basename = ''tzinfo'';
       meta = {
diff --git a/pkgs/development/interpreters/ruby/patches.nix b/pkgs/development/interpreters/ruby/patches.nix
index e236a71b554..2ac65dbb7e1 100644
--- a/pkgs/development/interpreters/ruby/patches.nix
+++ b/pkgs/development/interpreters/ruby/patches.nix
@@ -116,4 +116,5 @@ in
     extraWrapperFlags = "--prefix RUBYLIB : .";
   };
   
+  pry = { gemFlags = "--no-ri --no-rdoc"; };
 }

From 2a798997a3189f86f13e60a057381e54e7c02250 Mon Sep 17 00:00:00 2001
From: danbst <abcz2.uprola@gmail.com>
Date: Sat, 31 Aug 2013 21:57:19 +0200
Subject: [PATCH 219/452] Add mirror url for AMD microcode

www.amd64.org is often down, so provide a 2nd url to download from.
---
 pkgs/os-specific/linux/microcode/amd.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/microcode/amd.nix b/pkgs/os-specific/linux/microcode/amd.nix
index dc5959d400d..d54f93a7bd1 100644
--- a/pkgs/os-specific/linux/microcode/amd.nix
+++ b/pkgs/os-specific/linux/microcode/amd.nix
@@ -5,7 +5,10 @@ stdenv.mkDerivation rec {
   name = "amd-ucode-2012-09-10";
 
   src = fetchurl {
-    url = "http://www.amd64.org/pub/microcode/${name}.tar";
+    urls =
+      [ "http://www.amd64.org/pub/microcode/${name}.tar"
+        "http://pkgs.fedoraproject.org/repo/pkgs/microcode_ctl/${name}.tar/559bc355d3799538584add80df2996f0/${name}.tar"
+      ];
     sha256 = "065phvhx5hx5ssdd1x2p5m1yv26ak7l5aaw6yk6h95x9mxn5r111";
   };
 

From cf762c8f58529849d373b5007d9b5ff73ae16172 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 30 Jul 2013 16:33:46 +0200
Subject: [PATCH 220/452] firebirdSuper settings

document why its better to not use --with-system-icu

See patch for nixos adding firebird service

Signed-off-by: Marc Weber <marco-oweber@gmx.de>
---
 pkgs/development/libraries/icu/default.nix |  1 +
 pkgs/servers/firebird/default.nix          | 49 ++++++++++++++++++----
 pkgs/top-level/all-packages.nix            |  3 +-
 3 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix
index 3d37db20edc..838d6f7b75f 100644
--- a/pkgs/development/libraries/icu/default.nix
+++ b/pkgs/development/libraries/icu/default.nix
@@ -1,6 +1,7 @@
 {stdenv, fetchurl}:
 
 let
+
   pname = "icu4c";
   version = "51.1";
 in
diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix
index 8ad16a3df2e..365af29595c 100644
--- a/pkgs/servers/firebird/default.nix
+++ b/pkgs/servers/firebird/default.nix
@@ -1,4 +1,20 @@
-{stdenv, fetchurl, libedit, icu
+{stdenv, fetchurl, libedit, ncurses, automake, autoconf, libtool
+, 
+  # icu = null: use icu which comes with firebird
+
+  # icu = pkgs.icu => you may have trouble sharing database files with windows
+  # users if "Collation unicode" columns are being used
+  # windows icu version is *30.dll, however neither the icu 3.0 nor the 3.6
+  # sources look close to what ships with this package.
+  # Thus I think its best to trust firebird devs and use their version
+
+  # icu version missmatch may cause such error when selecting from a table:
+  # "Collation unicode for character set utf8 is not installed"
+
+  # icu 3.0 can still be build easily by nix (by dropping the #elif case and
+  # make | make)
+  icu ? null
+
 , superServer ? false
 , port ? 3050
 , serviceName ? "gds_db"
@@ -6,9 +22,9 @@
 
 /*
    there are 3 ways to use firebird:
-   a) superserver 
+   a) superserver
     - one process, one thread for each connection
-   b) classic 
+   b) classic
     - is built by default
     - one process for each connection
     - on linux direct io operations (?)
@@ -22,23 +38,38 @@
 */
 
 stdenv.mkDerivation rec {
-  version = "2.5.2.26539-0";
+  version = "2.5.2.26540-0";
   name = "firebird-${version}";
 
+  # enableParallelBuilding = false; build fails
+
+  # http://tracker.firebirdsql.org/browse/CORE-3246
+  preConfigure = ''
+    makeFlags="$makeFlags CPU=$NIX_BUILD_CORES"
+  '';
+
   configureFlags =
     [ "--with-serivec-port=${builtins.toString port}"
       "--with-service-name=${serviceName}"
-      # "--with-system-icu"
-      # "--with-system-editline"
+      # "--disable-static"
+      "--with-system-editline"
+      "--with-fblog=/var/log/firebird"
+      "--with-fbconf=/etc/firebird"
+      "--with-fbsecure-db=/var/db/firebird/system"
     ]
-    ++ (stdenv.lib.optional superServer "--enable-superserver=true");
+    ++ (stdenv.lib.optional  (icu != null) "--with-system-icu")
+    ++ (stdenv.lib.optional superServer "--enable-superserver");
 
   src = fetchurl {
     url = "mirror://sourceforge/firebird/Firebird-${version}.tar.bz2";
-    sha256 = "1j5bcfl35hr6i4lcd08zls19bal2js3ar16gnwkzbhwxkxbyb43b";
+    sha256 = "0887a813wffp44hnc2gmwbc4ylpqw3fh3hz3bf6q3648344a9fdv";
   };
 
-  buildInputs = [libedit icu];
+  # configurePhase = ''
+  #   sed -i 's@cp /usr/share/automake-.*@@' autogen.sh
+  #   sh autogen.sh $configureFlags --prefix=$out
+  # '';
+  buildInputs = [libedit icu automake autoconf libtool];
 
   # TODO: Probably this hase to be tidied up..
   # make install requires beeing. disabling the root checks
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 256a2b5cb4d..0f1dc340c08 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5970,7 +5970,8 @@ let
 
   fingerd_bsd = callPackage ../servers/fingerd/bsd-fingerd { };
 
-  firebird = callPackage ../servers/firebird { };
+  firebird = callPackage ../servers/firebird { icu = null; };
+  firebirdSuper = callPackage ../servers/firebird { superServer = true; };
 
   freepops = callPackage ../servers/mail/freepops { };
 

From 6f6bc030f9e8481220ea908ac9e68da174c225dd Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sat, 31 Aug 2013 22:16:22 +0200
Subject: [PATCH 221/452] adding store-backup

---
 pkgs/tools/backup/store-backup/default.nix | 109 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |   2 +
 2 files changed, 111 insertions(+)
 create mode 100644 pkgs/tools/backup/store-backup/default.nix

diff --git a/pkgs/tools/backup/store-backup/default.nix b/pkgs/tools/backup/store-backup/default.nix
new file mode 100644
index 00000000000..e9b98fec710
--- /dev/null
+++ b/pkgs/tools/backup/store-backup/default.nix
@@ -0,0 +1,109 @@
+{stdenv, which, coreutils, perl, fetchurl, perlPackages, makeWrapper, diffutils , writeScriptBin, bzip2}:
+
+# quick usage:
+# storeBackup.pl --sourceDir /home/user --backupDir /tmp/my_backup_destination
+# Its slow the first time because it compresses all files bigger than 1k (default setting)
+# The backup tool is bookkeeping which files got compressed
+
+# btrfs warning: you may run out of hardlinks soon
+
+# known impurity: test cases seem to bu using /tmp/storeBackup.lock ..
+
+let dummyMount = writeScriptBin "mount" "#!/bin/sh";
+in
+
+stdenv.mkDerivation {
+
+  name = "store-backup-3.4";
+
+  enableParallelBuilding = true;
+
+  buildInputs = [ perl makeWrapper ];
+
+  src = fetchurl {
+    url = http://download.savannah.gnu.org/releases/storebackup/storeBackup-3.4.tar.bz2;
+    sha256 = "101k3nhyfjj8y8hg0v0xqxsr4vlcfkmlczgbihvlv722fb7n5gi3";
+  };
+
+  installPhase = ''
+    ensureDir $out/scripts
+    mv * $out
+    mv $out/_ATTENTION_ $out/doc
+    mv $out/{correct.sh,cron-storebackup} $out/scripts
+
+    find $out -name "*.pl" | xargs sed -i \
+      -e 's@/bin/pwd@${coreutils}/bin/pwd@' \
+      -e 's@/bin/sync@${coreutils}/bin/sync@' \
+      -e '1 s@/usr/bin/env perl@${perl}/bin/perl@'
+
+    for p in $out/bin/*
+      do wrapProgram "$p" \
+      --prefix PERL5LIB ":" "${perlPackages.DBFile}/lib/perl5/site_perl" \
+      --prefix PATH ":" "${which}/bin:${bzip2}/bin"
+    done
+
+    patchShebangs $out
+    # do a dummy test ensuring this works
+
+    PATH=$PATH:${dummyMount}/bin
+
+
+    { # simple sanity test, test backup/restore of simple store paths
+
+      mkdir backup
+
+      backupRestore(){
+        source="$2"
+        echo =========
+        echo RUNNING TEST "$1" source: "$source"
+        mkdir restored
+
+        $out/bin/storeBackup.pl --sourceDir "$source" --backupDir backup
+        latestBackup=backup/default/$(ls -1 backup/default | sort | tail -n 1)
+        $out/bin/storeBackupRecover.pl -b "$latestBackup" -t restored -r /
+        ${diffutils}/bin/diff -r "$source" restored
+
+        # storeBackupCheckSource should return 0
+        $out/bin/storeBackupCheckSource.pl -s "$source" -b "$latestBackup"
+        # storeBackupCheckSource should return not 0 when using different source
+        ! $out/bin/storeBackupCheckSource.pl -s $TMP -b "$latestBackup"
+
+        # storeBackupCheckBackup should return 0
+        $out/bin/storeBackupCheckBackup.pl -c "$latestBackup"
+
+        chmod -R +w restored
+        rm -fr restored
+      }
+
+      testDir=$TMP/testDir
+
+      mkdir $testDir
+      echo X > $testDir/X
+      ln -s ./X $testDir/Y
+
+      backupRestore 'test 1: backup, restore' $testDir
+
+      # test huge blocks, according to docs files bigger than 100MB get split
+      # into pieces
+      dd if=/dev/urandom bs=100M of=block-1 count=1
+      dd if=/dev/urandom bs=100M of=block-2 count=1
+      cat block-1 block-2 > $testDir/block
+      backupRestore 'test 1 with huge block' $testDir
+
+      cat block-2 block-1 > $testDir/block
+      backupRestore 'test 1 with huge block reversed' $testDir
+
+      backupRestore 'test 2: backup, restore' $out
+      backupRestore 'test 3: backup, restore' $out
+      backupRestore 'test 4: backup diffutils to same backup locations, restore' ${diffutils}
+    }
+  '';
+
+  meta = {
+    description = "Storebackup is a backup suite that stores files on other disks";
+    homepage = http://savannah.nongnu.org/projects/storebackup;
+    license = stdenv.lib.licenses.gpl3Plus;
+    maintainers = [stdenv.lib.maintainers.marcweber];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4694040bf24..6417fea7a60 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1744,6 +1744,8 @@ let
 
   ssss = callPackage ../tools/security/ssss { };
 
+  storeBackup = callPackage ../tools/backup/store-backup { };
+
   stun = callPackage ../tools/networking/stun { };
 
   stunnel = callPackage ../tools/networking/stunnel { };

From ef8a149b6ff56a8dcfba9a79774ba805c90bb545 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 1 Sep 2013 01:57:33 +0200
Subject: [PATCH 222/452] libreoffice: 3.6.6.2 -> 4.0.5.2

---
 .../office/libreoffice/default.nix            | 121 +++--
 .../libreoffice/generate-libreoffice-srcs.sh  |   2 +-
 .../office/libreoffice/libreoffice-srcs.nix   | 420 ++++--------------
 .../libraries/libvisio/default.nix            |   4 +-
 pkgs/development/libraries/libwpd/default.nix |   8 +-
 pkgs/development/libraries/libwpg/default.nix |   4 +-
 pkgs/development/libraries/mdds/default.nix   |   7 +-
 .../libraries/unixODBC/default.nix            |   8 +-
 8 files changed, 186 insertions(+), 388 deletions(-)
 mode change 100644 => 100755 pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index ebc65394081..fe4c7dccfe1 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -1,4 +1,10 @@
-{ stdenv, fetchurl, pam, python, tcsh, libxslt, perl, ArchiveZip
+# when updating version, wait for the build to fail
+# run make without sourcing the environment and let libreoffice
+# download all extra files
+# then list extra files separated by newline and pipe them to
+# generate-libreoffice-srcs.sh and copy output to libreoffice-srcs.nix
+
+{ stdenv, fetchurl, pam, python3, tcsh, libxslt, perl, ArchiveZip
 , CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd
 , libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon
 , bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which
@@ -6,54 +12,89 @@
 , libXinerama, openssl, gperf, cppunit, GConf, ORBit2, poppler
 , librsvg, gnome_vfs, gstreamer, gst_plugins_base, mesa
 , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
-, libwpg, dbus_glib, qt4, kde4, clucene_core, libcdr, lcms, vigra
-, libiodbc, mdds, saneBackends, mythes, libexttextcat, libvisio
-, fontsConf
-, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" ]
+, libwpg, dbus_glib, glibc, qt4, kde4, clucene_core, libcdr, lcms, vigra
+, unixODBC, mdds, saneBackends, mythes, libexttextcat, libvisio
+, fontsConf, pkgconfig, libzip, bluez5, libtool, maven
+, langs ? [ "ALL" ]
 }:
 
 let
   langsSpaces = stdenv.lib.concatStringsSep " " langs;
-  major = "3";
-  minor = "6";
-  patch = "6";
+  major = "4";
+  minor = "0";
+  patch = "5";
   tweak = "2";
   subdir = "${major}.${minor}.${patch}";
   version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
+  
+  # doesn't work with srcs versioning
+  libmspub = stdenv.mkDerivation rec {
+     version = "0.0.6";
+     name = "libmspub-${version}";
+
+     src = fetchurl {
+       url = "http://dev-www.libreoffice.org/src/${name}.tar.gz";
+       sha256 = "1zdcvnm0dpac5yqdv34hq9j38cnhyqzyjgb19iyp54ajnwfjhmcq";
+     };
+
+     configureFlags = "--disable-werror";
+ 
+     buildInputs = [ zlib libwpd libwpg pkgconfig boost icu ];  
+  };
+
+  # doesn't exist in srcs
+  libixion = stdenv.mkDerivation rec {
+     version = "0.5.0";
+     name = "libixion-${version}";
+
+     src = fetchurl {
+       url = "http://kohei.us/files/ixion/src/${name}.tar.bz2";
+       sha256 = "010k33bfkckx28r4rdk5mkd0mmayy5ng9ja0j0zg0z237gcfgrzb";
+     };
+
+     configureFlags = "--with-boost=${boost}";
+
+     buildInputs = [ boost mdds pkgconfig ];  
+  };
+
   fetchThirdParty = {name, md5}: fetchurl {
     inherit name md5;
     url = "http://dev-www.libreoffice.org/src/${md5}-${name}";
   };
+
   fetchSrc = {name, sha256}: fetchurl {
     url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz";
     inherit sha256;
   };
+
   srcs = {
     third_party = [ (fetchurl rec {
         url = "http://dev-www.libreoffice.org/extern/${md5}-${name}";
         md5 = "185d60944ea767075d27247c3162b3bc";
         name = "unowinreg.dll";
       }) ] ++ (map fetchThirdParty (import ./libreoffice-srcs.nix));
+
     translations = fetchSrc {
       name = "translations";
-      sha256 = "1n3yk2077adyxrhs0jpkbm8dg3lxpn3sy63f0dl87ifv7ha1rfpn";
+      sha256 = "0x96wlwr5m7w4k3ygydzak3ycq35hjq60vfi6nfxczlr8pfjyjxv";
     };
 
+    # TODO: dictionaries
+
     help = fetchSrc {
       name = "help";
-      sha256 = "12rb5mw6sbi41w1zaxrj4qffiis9qcx8ibp5cpmwsz07nsdv5sxk";
+      sha256 = "0nab5jcgrrgn0v1yrm18nl9avp4vifbas48l1absz3jmzf9wka7b";
     };
 
-    core = fetchSrc {
-      name = "core";
-      sha256 = "0xw36sa73cgk3k3fv1spv5pavm95bc02lszn8415ay36lcc098pn";
-    };
   };
 in
 stdenv.mkDerivation rec {
   name = "libreoffice-${version}";
 
-  src = srcs.core;
+  src = fetchurl {
+    url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
+    sha256 = "195g1iab7j2x7sl326xbq7vya412ns57xrwpv9hqdrb7iiz2n8la";
+  };
 
   # Openoffice will open libcups dynamically, so we link it directly
   # to make its dlopen work.
@@ -69,31 +110,31 @@ stdenv.mkDerivation rec {
   '' + (stdenv.lib.concatMapStrings (f: "ln -sv ${f} $sourceRoot/src/${f.outputHash}-${f.name}\n") srcs.third_party)
   + ''
     ln -sv ${srcs.help} $sourceRoot/src/${srcs.help.name}
+    tar xf $sourceRoot/src/${srcs.help.name} -C $sourceRoot/../
     ln -sv ${srcs.translations} $sourceRoot/src/${srcs.translations.name}
+    tar xf $sourceRoot/src/${srcs.translations.name} -C $sourceRoot/../
   '';
 
   patchPhase = ''
     find . -type f -print0 | xargs -0 sed -i \
       -e 's,! */bin/bash,!${bash}/bin/bash,' -e 's,\(!\|SHELL=\) */usr/bin/env bash,\1${bash}/bin/bash,' \
       -e 's,! */usr/bin/perl,!${perl}/bin/perl,' -e 's,! */usr/bin/env perl,!${perl}/bin/perl,' \
-      -e 's,! */usr/bin/python,!${python}/bin/python,' -e 's,! */usr/bin/env python,!${python}/bin/python,'
-    sed -i 's,ANT_OPTS+="\(.*\)",ANT_OPTS+=\1,' apache-commons/java/*/makefile.mk
+      -e 's,! */usr/bin/python,!${python3}/bin/python,' -e 's,! */usr/bin/env python,!${python3}/bin/python,'
+    #sed -i 's,ANT_OPTS+="\(.*\)",ANT_OPTS+=\1,' apache-commons/java/*/makefile.mk
   '';
 
   QT4DIR = qt4;
   KDE4DIR = kde4.kdelibs;
 
-  # I set --with-num-cpus=$NIX_BUILD_CORES, as it's the equivalent of
-  # enableParallelBuilding=true in this build system.
   preConfigure = ''
     # Needed to find genccode
     PATH=$PATH:${icu}/sbin
-
-    configureFlagsArray=("--with-lang=${langsSpaces}" "--with-num-cpus=$NIX_BUILD_CORES")
   '';
 
   makeFlags = "SHELL=${bash}/bin/bash";
 
+  enableParallelBuilding = true;
+
   buildPhase = ''
     # This is required as some cppunittests require fontconfig configured
     export FONTCONFIG_FILE=${fontsConf}
@@ -119,7 +160,10 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [
-    #"--enable-verbose"
+    "--with-lang=${langsSpaces}"
+    "--with-vender=NixOS"
+    "--with-parallelism=1"
+    "--enable-verbose="
 
     # Without these, configure does not finish
     "--without-junit"
@@ -131,16 +175,16 @@ stdenv.mkDerivation rec {
     "--disable-odk"
     "--with-system-cairo"
     "--with-system-libs"
+    "--with-system-headers"
+    "--with-system-openssl"
+    "--with-system-openldap"
     "--with-boost-libdir=${boost}/lib"
-    "--with-system-db"
-    "--with-openldap" "--enable-ldap"
-    "--without-system-libwps"
+    "--without-system-libwps"  # TODO
     "--without-doxygen"
 
     # I imagine this helps. Copied from go-oo.
     "--disable-epm"
     "--disable-mathmldtd"
-    "--disable-mozilla"
     "--disable-kde"
     "--disable-postgresql-sdbc"
     "--with-package-format=native"
@@ -156,28 +200,33 @@ stdenv.mkDerivation rec {
     "--without-system-altlinuxhyph"
     "--without-system-lpsolve"
     "--without-system-graphite"
-    "--without-system-mozilla-headers"
+    "--without-system-npapi-headers"
     "--without-system-libcmis"
-
-    "--with-java-target-version=1.6" # The default 1.7 not supported
+    "--without-system-mozilla"
   ];
 
+  checkPhase = ''
+    make unitcheck
+    make slowcheck
+  '';
+
   buildInputs =
     [ ant ArchiveZip autoconf automake bison boost cairo clucene_core
       CompressZlib cppunit cups curl db4 dbus_glib expat file flex fontconfig
       freetype GConf getopt gnome_vfs gperf gst_plugins_base gstreamer gtk
-      hunspell icu jdk kde4.kdelibs lcms libcdr libexttextcat libiodbc libjpeg
+      hunspell icu jdk kde4.kdelibs lcms libcdr libexttextcat unixODBC libjpeg
       libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
       libXaw libXext libXi libXinerama libxml2 libxslt libXtst mdds mesa mythes
       neon nspr nss openldap openssl ORBit2 pam perl pkgconfigUpstream poppler
-      python sablotron saneBackends tcsh unzip vigra which zip zlib
+      python3 sablotron saneBackends tcsh unzip vigra which zip zlib libmspub
+      mdds liborcus bluez5 liblangtag glibc
     ];
 
-  meta = {
-    description = "Libre-office, variant of openoffice.org";
+  meta = with stdenv.lib; {
+    description = "LibreOffice is a comprehensive, professional-quality productivity suite, a variant of openoffice.org";
     homepage = http://libreoffice.org/;
-    license = "LGPL";
-    maintainers = [ stdenv.lib.maintainers.viric ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.lgpl3;
+    maintainers = [ maintainers.viric ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh
old mode 100644
new mode 100755
index fb8cc816114..ab6c4e3fb07
--- a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh
+++ b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh
@@ -1,4 +1,4 @@
-#!/var/run/current-system/bin/bash
+#!/run/current-system/sw/bin/bash
 
 # Take the list of files from the main package, ooo.lst.in
 
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
index 7f8f2c089f3..8d8b46b6bd9 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
@@ -1,374 +1,122 @@
 [
 {
-  name = "hyphen-2.8.3.tar.gz";
-  md5 = "86261f06c097d3e425a2f6d0b0635380";
+  name = "glibc-2.1.3-stub.tar.gz";
+  md5 = "4a660ce8466c9df01f19036435425c3a";
 }
 {
-  name = "openssl-0.9.8v.tar.gz";
-  md5 = "51a40a81b3b7abe8a5c33670bd3da0ce";
-}
-{
-  name = "pixman-0.24.4.tar.bz2";
-  md5 = "c63f411b3ad147db2bcce1bf262a0e02";
-}
-{
-  name = "README_apache-commons.txt";
-  md5 = "0b49ede71c21c0599b0cc19b353a6cb3";
-}
-{
-  name = "libexttextcat-3.3.1.tar.bz2";
-  md5 = "6097739c841f671cb21332b9cc593ae7";
-}
-{
-  name = "hsqldb_1_8_0.zip";
-  md5 = "17410483b5b5f267aa18b7e00b65e6e0";
-}
-{
-  name = "Adobe-Core35_AFMs-314.tar.gz";
-  md5 = "1756c4fa6c616ae15973c104cd8cb256";
-}
-{
-  name = "STLport-4.5.tar.gz";
-  md5 = "18f577b374d60b3c760a3a3350407632";
-}
-{
-  name = "xmlsec1-1.2.14.tar.gz";
-  md5 = "1f24ab1d39f4a51faf22244c94a6203f";
-}
-{
-  name = "LICENSE_source-9.0.0.7-bj.html";
-  md5 = "24be19595acad0a2cae931af77a0148a";
-}
-{
-  name = "lp_solve_5.5.tar.gz";
-  md5 = "26b3e95ddf3d9c077c480ea45874b3b8";
-}
-{
-  name = "raptor-1.4.18.tar.gz";
-  md5 = "284e768eeda0e2898b0d5bf7e26a016e";
-}
-{
-  name = "jakarta-tomcat-5.0.30-src.tar.gz";
-  md5 = "2a177023f9ea8ec8bd00837605c5df1b";
-}
-{
-  name = "commons-lang-2.3-src.tar.gz";
-  md5 = "2ae988b339daec234019a7066f96733e";
-}
-{
-  name = "commons-httpclient-3.1-src.tar.gz";
-  md5 = "2c9b0f83ed5890af02c0df1c1776f39b";
-}
-{
-  name = "liberation-fonts-ttf-1.07.1.tar.gz";
-  md5 = "0be45d54cc5e1c2e3102e32b8c190346";
-}
-{
-  name = "liberation-fonts-ttf-2.00.0.tar.gz";
-  md5 = "cfbf1ac6f61bf6cf45342a0cc9381be5";
-}
-{
-  name = "swingExSrc.zip";
-  md5 = "35c94d2df8893241173de1d16b6034c0";
-}
-{
-  name = "gentiumbasic-fonts-1.10.zip";
-  md5 = "35efabc239af896dfb79be7ebdd6e6b9";
-}
-{
-  name = "sacjava-1.3.zip";
-  md5 = "39bb3fcea1514f1369fcfc87542390fd";
-}
-{
-  name = "epm-3.7.tar.gz";
-  md5 = "3ade8cfe7e59ca8e65052644fed9fca4";
+  name = "ucpp-1.3.2.tar.gz";
+  md5 = "0168229624cfac409e766913506961a8";
 }
 {
   name = "commons-logging-1.1.1-src.tar.gz";
   md5 = "3c219630e4302863a9a83d0efde889db";
 }
 {
-  name = "README_source-9.0.0.7-bj.txt";
-  md5 = "48470d662650c3c074e1c3fabbc67bbd";
-}
-{
-  name = "clucene-core-2.3.3.4.tar.gz";
-  md5 = "48d647fbd8ef8889e5a7f422c1bfda94";
-}
-{
-  name = "glibc-2.1.3-stub.tar.gz";
-  md5 = "4a660ce8466c9df01f19036435425c3a";
-}
-{
-  name = "cairo-1.10.2.tar.gz";
-  md5 = "f101a9e88b783337b20b2e26dfd26d5f";
-}
-{
-  name = "xpdf-3.02.tar.gz";
-  md5 = "599dc4cc65a07ee868cf92a667a913d2";
-}
-{
-  name = "libxml2-2.7.6.tar.gz";
-  md5 = "7740a8ec23878a2f50120e1faa2730f2";
-}
-{
-  name = "STLport-4.5-0119.tar.gz";
-  md5 = "7376930b0d3f3d77a685d94c4a3acda8";
-}
-{
-  name = "rhino1_5R5.zip";
-  md5 = "798b2ffdc8bcfe7bca2cf92b62caf685";
-}
-{
-  name = "curl-7.19.7.tar.gz";
-  md5 = "ecb2e37e45c9933e2a963cabe03670ab";
-}
-{
-  name = "stax-api-1.0-2-sources.jar";
-  md5 = "8294d6c42e3553229af9934c5c0ed997";
-}
-{
-  name = "cppunit-1.12.1.tar.gz";
-  md5 = "bd30e9cf5523cdfc019b94f5e1d7fd19";
-}
-{
-  name = "seamonkey-1.1.14.source.tar.gz";
-  md5 = "a169ab152209200a7bad29a275cb0333";
-}
-{
-  name = "LICENSE_stax-api-1.0-2-sources.html";
-  md5 = "a4d9b30810a434a3ed39fc0003bbd637";
-}
-{
-  name = "xsltml_2.1.2.zip";
-  md5 = "a7983f859eafb2677d7ff386a023bc40";
-}
-{
-  name = "source-9.0.0.7-bj.zip";
-  md5 = "ada24d37d8d638b3d8a9985e80bc2978";
-}
-{
-  name = "commons-codec-1.3-src.tar.gz";
-  md5 = "af3c3acf618de6108d65fcdc92b492e1";
-}
-{
-  name = "LICENSE_Python-2.6.1";
-  md5 = "bc702168a2af16869201dbe91e46ae48";
-}
-{
-  name = "STLport-4.0.tar.gz";
-  md5 = "c441926f3a552ed3e5b274b62e86af16";
-}
-{
-  name = "redland-1.0.8.tar.gz";
-  md5 = "ca66e26082cab8bb817185a116db809b";
-}
-{
-  name = "core.zip";
-  md5 = "d4c4d91ab3a8e52a2e69d48d34ef4df4";
-}
-{
-  name = "db-4.7.25.NC-custom.tar.gz";
-  md5 = "d70951c80dabecc2892c919ff5d07172";
-}
-{
-  name = "README_db-4.7.25.NC-custom.txt";
-  md5 = "e0707ff896045731ff99e99799606441";
-}
-{
-  name = "Python-2.6.1.tar.bz2";
-  md5 = "e81c2f0953aa60f8062c05a4673f2be0";
-}
-{
-  name = "libxslt-1.1.26.tar.gz";
-  md5 = "e61d0364a30146aaa3001296f853b2b9";
-}
-{
-  name = "bsh-2.0b1-src.tar.gz";
-  md5 = "ea570af93c284aa9e5621cd563f54f4d";
-}
-{
-  name = "vigra1.4.0.tar.gz";
-  md5 = "ea91f2fb4212a21d708aced277e6e85a";
-}
-{
-  name = "expat-2.1.0.tar.gz";
-  md5 = "dd7dab7a5fea97d2a6a43f511449b7cd";
-}
-{
-  name = "README_stax-api-1.0-2-sources.txt";
-  md5 = "fb7ba5c2182be4e73748859967455455";
-}
-{
-  name = "rasqal-0.9.16.tar.gz";
-  md5 = "fca8706f2c4619e2fa3f8f42f8fc1e9d";
-}
-{
-  name = "dejavu-fonts-ttf-2.33.zip";
-  md5 = "f872f4ac066433d8ff92f5e316b36ff9";
-}
-{
-  name = "mysql-connector-c++-1.1.0.tar.gz";
-  md5 = "0981bda6548a8c8233ffce2b6e4b2a23";
-}
-{
-  name = "postgresql-9.1.1.tar.bz2";
-  md5 = "061a9f17323117c9358ed60f33ecff78";
-}
-{
-  name = "mythes-1.2.2.tar.gz";
-  md5 = "e1e255dc43dbcbb34cb19e8a0eba90ae";
-}
-{
-  name = "libformula-1.1.7.zip";
-  md5 = "3404ab6b1792ae5f16bbd603bd1e1d03";
-}
-{
-  name = "libfonts-1.1.6.zip";
-  md5 = "3bdf40c0d199af31923e900d082ca2dd";
-}
-{
-  name = "librepository-1.1.6.zip";
-  md5 = "8ce2fcd72becf06c41f7201d15373ed9";
-}
-{
-  name = "libloader-1.1.6.zip";
-  md5 = "97b2d4dba862397f446b217e2b623e71";
-}
-{
-  name = "libxml-1.1.7.zip";
-  md5 = "ace6ab49184e329db254e454a010f56d";
-}
-{
-  name = "flute-1.1.6.zip";
-  md5 = "d8bd5eed178db6e2b18eeed243f85aa8";
+  name = "liborcus_0.3.0.tar.bz2";
+  md5 = "8755aac23317494a9028569374dc87b2";
 }
 {
   name = "liblayout-0.2.10.zip";
   md5 = "db60e4fde8dd6d6807523deb71ee34dc";
 }
+{
+  name = "hsqldb_1_8_0.zip";
+  md5 = "17410483b5b5f267aa18b7e00b65e6e0";
+}
+{
+  name = "liblangtag-0.4.0.tar.bz2";
+  md5 = "54e578c91b1b68e69c72be22adcb2195";
+}
+{
+  name = "rhino1_5R5.zip";
+  md5 = "798b2ffdc8bcfe7bca2cf92b62caf685";
+}
+{
+  name = "bsh-2.0b1-src.tar.gz";
+  md5 = "ea570af93c284aa9e5621cd563f54f4d";
+}
+{
+  name = "xmlsec1-1.2.14.tar.gz";
+  md5 = "1f24ab1d39f4a51faf22244c94a6203f";
+}
+{
+  name = "librepository-1.1.6.zip";
+  md5 = "8ce2fcd72becf06c41f7201d15373ed9";
+}
 {
   name = "libbase-1.1.6.zip";
   md5 = "eeb2c7ddf0d302fba4bfc6e97eac9624";
 }
+{
+  name = "lp_solve_5.5.tar.gz";
+  md5 = "26b3e95ddf3d9c077c480ea45874b3b8";
+}
+{
+  name = "libloader-1.1.6.zip";
+  md5 = "97b2d4dba862397f446b217e2b623e71";
+}
+{
+  name = "graphite2-1.2.0.tgz";
+  md5 = "f5ef3f7f10fa8c3542c6a085a233080b";
+}
+{
+  name = "jakarta-tomcat-5.0.30-src.tar.gz";
+  md5 = "2a177023f9ea8ec8bd00837605c5df1b";
+}
+{
+  name = "hyphen-2.8.4.tar.gz";
+  md5 = "a2f6010987e1c601274ab5d63b72c944";
+}
 {
   name = "libserializer-1.1.6.zip";
   md5 = "f94d9870737518e3b597f9265f4e9803";
 }
+{
+  name = "commons-lang-2.3-src.tar.gz";
+  md5 = "2ae988b339daec234019a7066f96733e";
+}
+{
+  name = "libxml-1.1.7.zip";
+  md5 = "ace6ab49184e329db254e454a010f56d";
+}
+{
+  name = "commons-httpclient-3.1-src.tar.gz";
+  md5 = "2c9b0f83ed5890af02c0df1c1776f39b";
+}
+{
+  name = "commons-codec-1.3-src.tar.gz";
+  md5 = "af3c3acf618de6108d65fcdc92b492e1";
+}
+{
+  name = "libformula-1.1.7.zip";
+  md5 = "3404ab6b1792ae5f16bbd603bd1e1d03";
+}
+{
+  name = "libcmis-0.3.0.tar.gz";
+  md5 = "b2371dc7cf4811c9d32146eec913d296";
+}
+{
+  name = "swingExSrc.zip";
+  md5 = "35c94d2df8893241173de1d16b6034c0";
+}
 {
   name = "flow-engine-0.9.4.zip";
   md5 = "ba2930200c9f019c2d93a8c88c651a0f";
 }
 {
-  name = "neon-0.29.5.tar.gz";
-  md5 = "ff369e69ef0f0143beb5626164e87ae2";
-}
-{
-  name = "gettext-0.18.1.1.tar.gz";
-  md5 = "3dd55b952826d2b32f51308f2f91aa89";
-}
-{
-  name = "glib-2.28.1.tar.gz";
-  md5 = "9f6e85e1e38490c3956f4415bcd33e6e";
-}
-{
-  name = "gdk-pixbuf-2.23.0.tar.gz";
-  md5 = "a7d6c5f2fe2d481149ed3ba807b5c043";
-}
-{
-  name = "libgsf-1.14.19.tar.gz";
-  md5 = "3a84ac2da37cae5bf7ce616228c6fbde";
-}
-{
-  name = "pango-1.28.3.tar.gz";
-  md5 = "22ad1c8d3fda7e73b0798035f3dd96bc";
-}
-{
-  name = "libcroco-0.6.2.tar.gz";
-  md5 = "0611e099e807210cf738dcb41425d104";
-}
-{
-  name = "librsvg-2.32.1.tar.gz";
-  md5 = "d7a242ca43e33e1b63d3073f9d46a6a8";
-}
-{
-  name = "libpng-1.5.10.tar.gz";
-  md5 = "9e5d864bce8f06751bbd99962ecf4aad";
-}
-{
-  name = "jpeg-8c.tar.gz";
-  md5 = "a2c10c04f396a9ce72894beb18b4e1f9";
-}
-{
-  name = "zlib-1.2.7.tar.bz2";
-  md5 = "2ab442d169156f34c379c968f3f482dd";
-}
-{
-  name = "icu4c-49_1_1-src.tgz";
-  md5 = "7c53f83e0327343f4060c0eb83842daf";
-}
-{
-  name = "ConvertTextToNumber-1.3.2.oxt";
-  md5 = "451ccf439a36a568653b024534669971";
-}
-{
-  name = "JLanguageTool-1.7.0.tar.bz2";
-  md5 = "b63e6340a02ff1cacfeadb2c42286161";
-}
-{
-  name = "ixion-0.2.0.tar.gz";
-  md5 = "0f63ee487fda8f21fafa767b3c447ac9";
-}
-{
-  name = "nss-3.13.5-with-nspr-4.9.1.tar.gz";
-  md5 = "a0a861f539f0e7a91d05e6b9457e4db1";
-}
-{
-  name = "libwpg-0.2.1.tar.bz2";
-  md5 = "9d283e02441d8cebdcd1e5d9df227d67";
-}
-{
-  name = "libwpd-0.9.4.tar.bz2";
-  md5 = "c01351d7db2b205de755d58769288224";
+  name = "sacjava-1.3.zip";
+  md5 = "39bb3fcea1514f1369fcfc87542390fd";
 }
 {
   name = "libwps-0.2.7.tar.bz2";
   md5 = "d197bd6211669a2fa4ca648faf04bcb1";
 }
 {
-  name = "mdds_0.6.1.tar.bz2";
-  md5 = "9f9e15966b5624834157fe3d748312bc";
+  name = "libfonts-1.1.6.zip";
+  md5 = "3bdf40c0d199af31923e900d082ca2dd";
 }
 {
-  name = "boost_1_44_0.tar.bz2";
-  md5 = "f02578f5218f217a9f20e9c30e119c6a";
-}
-{
-  name = "hunspell-1.3.2.tar.gz";
-  md5 = "3121aaf3e13e5d88dfff13fb4a5f1ab8";
-}
-{
-  name = "graphite2-1.0.3.tgz";
-  md5 = "3bf481ca95109b14435125c0dd1f2217";
-}
-{
-  name = "libvisio-0.0.19.tar.bz2";
-  md5 = "94e7f271e38c976462558b4278590178";
-}
-{
-  name = "LinLibertineG-20120116.zip";
-  md5 = "e7a384790b13c29113e22e596ade9687";
-}
-{
-  name = "libcmis-0.2.3.tar.gz";
-  md5 = "0d2dcdfbf28d6208751b33057f5361f0";
-}
-{
-  name = "libcdr-0.0.9.tar.bz2";
-  md5 = "3c0037fb07dea2f0bbae8386fa7c6a9a";
-}
-{
-  name = "lcms2-2.3.tar.gz";
-  md5 = "327348d67c979c88c2dec59a23a17d85";
+  name = "flute-1.1.6.zip";
+  md5 = "d8bd5eed178db6e2b18eeed243f85aa8";
 }
 ]
diff --git a/pkgs/development/libraries/libvisio/default.nix b/pkgs/development/libraries/libvisio/default.nix
index 77e7e0a56f6..7d24fc9a8a6 100644
--- a/pkgs/development/libraries/libvisio/default.nix
+++ b/pkgs/development/libraries/libvisio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, libwpd, libwpg, pkgconfig }:
+{ stdenv, fetchurl, boost, libwpd, libwpg, pkgconfig, zlib }:
 
 stdenv.mkDerivation rec {
   name = "libvisio-0.0.19";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ boost libwpd libwpg ];
+  buildInputs = [ boost libwpd libwpg zlib ];
 
   configureFlags = "--disable-werror";
 
diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix
index 1c56022de58..3df58615aa6 100644
--- a/pkgs/development/libraries/libwpd/default.nix
+++ b/pkgs/development/libraries/libwpd/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, pkgconfig, glib, libgsf, libxml2 }:
+{ stdenv, fetchurl, zlib, pkgconfig, glib, libgsf, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "libwpd-0.9.4";
+  name = "libwpd-0.9.5";
   
   src = fetchurl {
     url = "mirror://sourceforge/libwpd/${name}.tar.xz";
-    sha256 = "0qba429cqd72nwn1mzpj7llyi3kwykb2lplcfxffvq8svzxyzkxy";
+    sha256 = "1qvmnszql8c900py83wrxnj2pyyy4107scdhvmhapp4gpmccmg7f";
   };
   
-  buildInputs = [ glib libgsf libxml2 ];
+  buildInputs = [ glib libgsf libxml2 zlib ];
 
   nativeBuildInputs = [ pkgconfig ];
 }
diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix
index a97b8fc2fd8..18a8e49beea 100644
--- a/pkgs/development/libraries/libwpg/default.nix
+++ b/pkgs/development/libraries/libwpg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libwpd }:
+{ stdenv, fetchurl, pkgconfig, libwpd, zlib }:
 
 stdenv.mkDerivation rec {
   name = "libwpg-0.2.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0d83nx4rxkrq2sbfbbqpddni56h1328dzmraxyl6vh9p4f19rh5d";
   };
 
-  buildInputs = [ libwpd ];
+  buildInputs = [ libwpd zlib ];
   nativeBuildInputs = [ pkgconfig ];
 
   meta = {
diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix
index 484f878a55e..9c6c8e5e334 100644
--- a/pkgs/development/libraries/mdds/default.nix
+++ b/pkgs/development/libraries/mdds/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mdds-0.6.0";
+  version = "0.7.1";
+  name = "mdds-${version}";
 
   src = fetchurl {
-    url = http://multidimalgorithm.googlecode.com/files/mdds_0.6.0.tar.bz2;
-    sha256 = "0yx6cx2cxk9wpmfpv6k3agkr1sjzxdgxrm3zfj34zwyxr3sh0ql4";
+    url = "http://multidimalgorithm.googlecode.com/files/mdds_${version}.tar.bz2";
+    sha256 = "0zhrx7m04pknc8i2cialmbna1hmwa0fzs8qphan4rdxibf0c4yzy";
   };
 
   meta = {
diff --git a/pkgs/development/libraries/unixODBC/default.nix b/pkgs/development/libraries/unixODBC/default.nix
index 932873ffe94..74c822e2885 100644
--- a/pkgs/development/libraries/unixODBC/default.nix
+++ b/pkgs/development/libraries/unixODBC/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "unixODBC-2.2.11";
+stdenv.mkDerivation rec {
+  name = "unixODBC-2.3.1";
   src = fetchurl {
-    url = mirror://sourceforge/unixodbc/unixODBC-2.2.11.tar.gz;
-    md5 = "9ae806396844e38244cf65ad26ba0f23";
+    url = "ftp://ftp.unixodbc.org/pub/unixODBC/${name}.tar.gz";
+    md5 = "86788d4006620fa1f171c13d07fdcaab";
   };
   configureFlags = "--disable-gui --sysconfdir=/etc";
 }

From c823bc37d6b50dcd4e183963922da829a193f0d7 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sun, 1 Sep 2013 02:22:01 +0200
Subject: [PATCH 223/452] backup tools bup, storeBackup: implement sanity check

bup:
- update
- run make test (all tests seem to pass :-)
- add python.modules.readline
- add comment that there is no way to prune old revisions (yet)
---
 pkgs/tools/backup/bup/default.nix          |  45 ++++++++-
 pkgs/tools/backup/store-backup/default.nix |  73 +++++---------
 pkgs/tools/backup/test-case.nix            | 105 +++++++++++++++++++++
 3 files changed, 170 insertions(+), 53 deletions(-)
 create mode 100644 pkgs/tools/backup/test-case.nix

diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix
index e683df5a7fe..63356e5f7c1 100644
--- a/pkgs/tools/backup/bup/default.nix
+++ b/pkgs/tools/backup/bup/default.nix
@@ -1,6 +1,9 @@
 { stdenv, fetchgit, python, pyxattr, pylibacl, setuptools, fuse, git, perl, pandoc, makeWrapper
+, diffutils, writeTextFile, rsync
 , par2cmdline, par2Support ? false }:
 
+# keep in mind you cannot prune older revisions yet! (2013-06)
+
 assert par2Support -> par2cmdline != null;
 
 with stdenv.lib;
@@ -10,12 +13,14 @@ stdenv.mkDerivation {
 
   src = fetchgit {
     url = "https://github.com/bup/bup.git";
-    rev = "96c6fa2a70425fff1e73d2e0945f8e242411ab58";
-    sha256 = "0d9hgyh1g5qcpdvnqv3a5zy67x79yx9qx557rxrnxyzqckp9v75n";
+    rev = "98a8e2ebb775386cb7e66b1953df46cdbd4b4bd3";
+    sha256 = "ab01c70f0caf993c0c05ec3a1008b5940b433bf2f7bd4e9b995d85e81958c1b7";
   };
 
   buildInputs = [ python git ];
-  nativeBuildInputs = [ pandoc perl makeWrapper ];
+  nativeBuildInputs = [ pandoc perl makeWrapper rsync ];
+
+  enableParallelBuilding = true;
 
   patchPhase = ''
     substituteInPlace Makefile --replace "-Werror" ""
@@ -24,6 +29,12 @@ stdenv.mkDerivation {
       substituteInPlace $f --replace "/usr/bin/env python" "${python}/bin/python"
     done
     substituteInPlace Makefile --replace "./format-subst.pl" "perl ./format-subst.pl"
+    for t in t/*.sh t/configure-sampledata t/compare-trees; do
+      substituteInPlace $t --replace "/usr/bin/env bash" "$(type -p bash)"
+    done
+    substituteInPlace wvtestrun --replace "/usr/bin/env perl" "${perl}/bin/perl"
+
+    substituteInPlace t/test.sh --replace "/bin/pwd" "$(type -P pwd)"
   '' + optionalString par2Support ''
     substituteInPlace cmd/fsck-cmd.py --replace "['par2'" "['${par2cmdline}/bin/par2'"
   '';
@@ -40,7 +51,33 @@ stdenv.mkDerivation {
   postInstall = optionalString (elem stdenv.system platforms.linux) ''
     wrapProgram $out/bin/bup --prefix PYTHONPATH : \
       ${stdenv.lib.concatStringsSep ":"
-          (map (path: "$(toPythonPath ${path})") [ pyxattr pylibacl setuptools fuse ])}
+          (map (path: "$(toPythonPath ${path})") [ pyxattr pylibacl setuptools fuse python.modules.readline ])}
+
+    ## test it
+    make test
+
+    # if make test passes the following probably passes, too
+    backup_init(){
+      export BUP_DIR=$TMP/bup
+      PATH=$out/bin:$PATH
+      bup init
+    }
+    backup_make(){
+      ( cd "$1"; tar -cvf - .) | bup split -n backup
+    }
+    backup_restore_latest(){
+      bup join backup | ( cd "$1"; tar -xf - )
+    }
+    backup_verify_integrity_latest(){
+      bup fsck
+    }
+    backup_verify_latest(){
+      # maybe closest would be to mount or use the FTP like server ..
+      true
+    }
+
+    . ${import ../test-case.nix { inherit diffutils writeTextFile; }}
+    backup_test backup 100M
   '';
 
   meta = {
diff --git a/pkgs/tools/backup/store-backup/default.nix b/pkgs/tools/backup/store-backup/default.nix
index e9b98fec710..94493760df8 100644
--- a/pkgs/tools/backup/store-backup/default.nix
+++ b/pkgs/tools/backup/store-backup/default.nix
@@ -1,4 +1,4 @@
-{stdenv, which, coreutils, perl, fetchurl, perlPackages, makeWrapper, diffutils , writeScriptBin, bzip2}:
+{stdenv, which, coreutils, perl, fetchurl, perlPackages, makeWrapper, diffutils , writeScriptBin, writeTextFile, bzip2}:
 
 # quick usage:
 # storeBackup.pl --sourceDir /home/user --backupDir /tmp/my_backup_destination
@@ -48,56 +48,31 @@ stdenv.mkDerivation {
     PATH=$PATH:${dummyMount}/bin
 
 
-    { # simple sanity test, test backup/restore of simple store paths
-
+    ## test it
+    backup_init(){
       mkdir backup
-
-      backupRestore(){
-        source="$2"
-        echo =========
-        echo RUNNING TEST "$1" source: "$source"
-        mkdir restored
-
-        $out/bin/storeBackup.pl --sourceDir "$source" --backupDir backup
-        latestBackup=backup/default/$(ls -1 backup/default | sort | tail -n 1)
-        $out/bin/storeBackupRecover.pl -b "$latestBackup" -t restored -r /
-        ${diffutils}/bin/diff -r "$source" restored
-
-        # storeBackupCheckSource should return 0
-        $out/bin/storeBackupCheckSource.pl -s "$source" -b "$latestBackup"
-        # storeBackupCheckSource should return not 0 when using different source
-        ! $out/bin/storeBackupCheckSource.pl -s $TMP -b "$latestBackup"
-
-        # storeBackupCheckBackup should return 0
-        $out/bin/storeBackupCheckBackup.pl -c "$latestBackup"
-
-        chmod -R +w restored
-        rm -fr restored
-      }
-
-      testDir=$TMP/testDir
-
-      mkdir $testDir
-      echo X > $testDir/X
-      ln -s ./X $testDir/Y
-
-      backupRestore 'test 1: backup, restore' $testDir
-
-      # test huge blocks, according to docs files bigger than 100MB get split
-      # into pieces
-      dd if=/dev/urandom bs=100M of=block-1 count=1
-      dd if=/dev/urandom bs=100M of=block-2 count=1
-      cat block-1 block-2 > $testDir/block
-      backupRestore 'test 1 with huge block' $testDir
-
-      cat block-2 block-1 > $testDir/block
-      backupRestore 'test 1 with huge block reversed' $testDir
-
-      backupRestore 'test 2: backup, restore' $out
-      backupRestore 'test 3: backup, restore' $out
-      backupRestore 'test 4: backup diffutils to same backup locations, restore' ${diffutils}
     }
-  '';
+    latestBackup(){
+      echo backup/default/$(ls -1 backup/default | sort | tail -n 1)
+    }
+    backup_make(){
+      # $1=source
+      $out/bin/storeBackup.pl --sourceDir "$1" --backupDir "backup"
+    }
+    backup_restore_latest(){
+      $out/bin/storeBackupRecover.pl -b "$(latestBackup)" -t "$1" -r /
+    }
+
+    backup_verify_integrity_latest(){
+      $out/bin/storeBackupCheckBackup.pl -c "$(latestBackup)"
+    }
+    backup_verify_latest(){
+      $out/bin/storeBackupCheckSource.pl -s "$1" -b "$(latestBackup)"
+    }
+
+    . ${import ../test-case.nix { inherit diffutils writeTextFile; }}
+    backup_test backup 100M
+'';
 
   meta = {
     description = "Storebackup is a backup suite that stores files on other disks";
diff --git a/pkgs/tools/backup/test-case.nix b/pkgs/tools/backup/test-case.nix
new file mode 100644
index 00000000000..8b2044b1723
--- /dev/null
+++ b/pkgs/tools/backup/test-case.nix
@@ -0,0 +1,105 @@
+# while this test suite is not perfect it will at least provide some guarantees
+# that basic features should be fine ..
+
+/*
+  In order to use the suite you have to define the following functions
+
+    backup_init
+    backup_make source
+    backup_restore_latest target
+    backup_verify_integrity_latest
+    backup_verify_latest source
+
+  use true if a backup system does not implement a feature
+
+  TODO: add test cases for all backup solutions shipping with nixpkgs
+
+  This does not replace the test suites shipping with the backup solutions!
+*/
+
+{diffutils, writeTextFile}:
+
+writeTextFile {
+  name = "backup-test-case";
+  text = ''
+  backup_run_tests_on_source(){
+    local test="$1"
+    local source="$2"
+    local backup="$3"
+    echo =========
+    echo RUNNING TEST "$test" source: "$source"
+    mkdir restored
+
+    backup_make "$source" backup
+
+    { # verify that restoring works
+      backup_restore_latest restored
+      ${diffutils}/bin/diff -r "$source" restored
+      # diff does not make a difference for symlinks, so list them and compare
+      # lists
+      ( cd "$source"; find /var/www/ -type l) | sort > 1
+      ( cd "$restored"; find /var/www/ -type l) | sort > 2
+      diff 1 2
+    }
+
+    { # verify that backup tool thinks so, too:
+      backup_verify_latest "$source" backup
+      # using different source verification must fail:
+      ! backup_verify_latest "$TMP" backup
+    }
+
+    backup_verify_integrity_latest backup
+
+    chmod -R +w restored
+    rm -fr restored
+  }
+
+  backup_test(){
+    set -x
+    # allow getting run time to compare backup solutions
+    echo "START $(date)"
+
+    local block_size="$2"
+
+    backup_init
+
+    if [ -z "$SKIP_SYMLINK_TEST" ]; then
+      { # create first test case directory contentents
+        testDir=$TMP/test-1a
+        mkdir $testDir
+        echo X > $testDir/X
+        ln -s ./X $testDir/Y
+      }
+
+      backup_run_tests_on_source 'test 1a: backup, restore' "$testDir" "$backup"
+    fi
+
+    if [ -z "$SKIP_EMPTY_DIR_TEST" ]; then
+      { # create first test case directory contentents
+        testDir=$TMP/test-1b
+        mkdir -p $testDir/empty-directory
+      }
+
+      backup_run_tests_on_source 'test 1b: backup, restore' "$testDir" "$backup"
+    fi
+
+    testDir=$TMP/test-huge-blocks
+    mkdir $testDir
+    # test huge blocks, according to docs files bigger than 100MB get split
+    # into pieces
+    dd if=/dev/urandom bs=1M of=block-0 count=20
+    dd if=/dev/urandom bs="$block_size" of=block-1 count=1
+    dd if=/dev/urandom bs="$block_size" of=block-2 count=1
+    cat block-0 block-0 block-0 block-1 block-2 block-0 block-0 block-0 > $testDir/block
+    backup_run_tests_on_source 'test 1 with huge block' $testDir
+
+    cat block-2 block-0 block-0 block-1 > $testDir/block
+    backup_run_tests_on_source 'test 1 with huge block reversed' $testDir
+
+    backup_run_tests_on_source 'test 2: backup, restore' $out
+    backup_run_tests_on_source 'test 3: backup, restore' $out
+    backup_run_tests_on_source 'test 4: backup diffutils to same backup locations, restore' ${diffutils}
+    echo "STOP $(date)"
+  }
+  '';
+}

From 0f061173493a73867404025f58aadb31cda57877 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 1 Sep 2013 09:59:51 +0200
Subject: [PATCH 224/452] libreoffice: fix eval

---
 pkgs/applications/office/libreoffice/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index fe4c7dccfe1..ba04df04a31 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -162,8 +162,6 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--with-lang=${langsSpaces}"
     "--with-vender=NixOS"
-    "--with-parallelism=1"
-    "--enable-verbose="
 
     # Without these, configure does not finish
     "--without-junit"
@@ -218,8 +216,8 @@ stdenv.mkDerivation rec {
       libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
       libXaw libXext libXi libXinerama libxml2 libxslt libXtst mdds mesa mythes
       neon nspr nss openldap openssl ORBit2 pam perl pkgconfigUpstream poppler
-      python3 sablotron saneBackends tcsh unzip vigra which zip zlib libmspub
-      mdds liborcus bluez5 liblangtag glibc
+      python3 sablotron saneBackends tcsh unzip vigra which zip zlib
+      mdds bluez5 glibc
     ];
 
   meta = with stdenv.lib; {

From 7caf3daafa4ce5257b4bc9a3251153a67a1ff29b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 1 Sep 2013 11:10:40 +0200
Subject: [PATCH 225/452] libreoffice: add missing deps

---
 pkgs/applications/office/libreoffice/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index ba04df04a31..f147d69b8bc 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -217,7 +217,7 @@ stdenv.mkDerivation rec {
       libXaw libXext libXi libXinerama libxml2 libxslt libXtst mdds mesa mythes
       neon nspr nss openldap openssl ORBit2 pam perl pkgconfigUpstream poppler
       python3 sablotron saneBackends tcsh unzip vigra which zip zlib
-      mdds bluez5 glibc
+      mdds bluez5 glibc libmspub libixion
     ];
 
   meta = with stdenv.lib; {

From 670be4c4bc52b6d203c6b9bd1a0c967292153600 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 1 Sep 2013 12:30:17 +0200
Subject: [PATCH 226/452] libreoffice: more configure phase dependencies

---
 .../office/libreoffice/default.nix            | 30 ++++++++++++++++++-
 .../office/libreoffice/libreoffice-srcs.nix   |  8 -----
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index f147d69b8bc..e1c9e2f0712 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -26,6 +26,34 @@ let
   tweak = "2";
   subdir = "${major}.${minor}.${patch}";
   version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
+
+  # configure phase dependency
+  liborcus = stdenv.mkDerivation rec {
+     version = "0.3.0";
+     name = "liborcus-${version}";
+
+     src = fetchurl {
+       url = "http://dev-www.libreoffice.org/src/8755aac23317494a9028569374dc87b2-liborcus_0.3.0.tar.bz2";
+       sha256 = "0xrw13s390mcpm50apclydl38sw2sdq27csrr1k0d39jna2990ih";
+     };
+
+     configureFlags = "--disable-werror";
+
+     buildInputs = [ zlib boost mdds pkgconfig libixion libzip ];
+  };
+
+  # configure phase dependency
+  liblangtag = stdenv.mkDerivation rec {
+     version = "0.4.0";
+     name = "liblangtag-${version}";
+
+     src = fetchurl {
+       url = "http://dev-www.libreoffice.org/src/54e578c91b1b68e69c72be22adcb2195-${name}.tar.bz2";
+       sha256 = "1bjb0fxjmvzxlhr5by9wgisf6w5yvy6wgfzfkjyw6igk39fivdyb";
+     };
+
+     buildInputs = [ libtool pkgconfig libxml2 ];
+  };
   
   # doesn't work with srcs versioning
   libmspub = stdenv.mkDerivation rec {
@@ -217,7 +245,7 @@ stdenv.mkDerivation rec {
       libXaw libXext libXi libXinerama libxml2 libxslt libXtst mdds mesa mythes
       neon nspr nss openldap openssl ORBit2 pam perl pkgconfigUpstream poppler
       python3 sablotron saneBackends tcsh unzip vigra which zip zlib
-      mdds bluez5 glibc libmspub libixion
+      mdds bluez5 glibc libmspub libixion liborcus liblangtag
     ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
index 8d8b46b6bd9..6ed1a5e2c63 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
@@ -11,10 +11,6 @@
   name = "commons-logging-1.1.1-src.tar.gz";
   md5 = "3c219630e4302863a9a83d0efde889db";
 }
-{
-  name = "liborcus_0.3.0.tar.bz2";
-  md5 = "8755aac23317494a9028569374dc87b2";
-}
 {
   name = "liblayout-0.2.10.zip";
   md5 = "db60e4fde8dd6d6807523deb71ee34dc";
@@ -23,10 +19,6 @@
   name = "hsqldb_1_8_0.zip";
   md5 = "17410483b5b5f267aa18b7e00b65e6e0";
 }
-{
-  name = "liblangtag-0.4.0.tar.bz2";
-  md5 = "54e578c91b1b68e69c72be22adcb2195";
-}
 {
   name = "rhino1_5R5.zip";
   md5 = "798b2ffdc8bcfe7bca2cf92b62caf685";

From 06f80c77e28a04416846badef28d17d8dafc3193 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Sun, 1 Sep 2013 14:23:56 +0200
Subject: [PATCH 227/452] Update ledger3 to latest HEAD.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
---
 pkgs/applications/office/ledger/3.0.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/office/ledger/3.0.nix b/pkgs/applications/office/ledger/3.0.nix
index b51fd6fe41e..a40a60650f4 100644
--- a/pkgs/applications/office/ledger/3.0.nix
+++ b/pkgs/applications/office/ledger/3.0.nix
@@ -1,23 +1,20 @@
 { stdenv, fetchgit, cmake, boost, gmp, mpfr, libedit, python, texinfo }:
 
 let
-  rev = "26d7197";
+  rev = "0ec4291013bae966df2f5ca504d2216e488cd7ec";
 in
 stdenv.mkDerivation {
-  name = "ledger3-2013.06.${rev}";
+  name = "ledger3-2013.08.${rev}";
 
   src = fetchgit {
     url = "https://github.com/ledger/ledger.git";
     inherit rev;
-    sha256 = "02nf4kdrd61q9rf5rrarwmx47y2ya5qix7n82cj9qi9p4v3k3m2g";
+    sha256 = "1y4rcbx8y2fxkdc7i06n1i5jf3cq05bvzpb8498mis2gwfmkw470";
   };
 
   buildInputs = [ cmake boost gmp mpfr libedit python texinfo ];
 
-  # Unit tests fail in the current git snapshot. Try enabling them again
-  # when updating this package!
-  doCheck = false;
-
+  doCheck = true;
   enableParallelBuilding = true;
 
   meta = {

From ddf4f3748ae055087f7e52f1d3040ed38edaf13e Mon Sep 17 00:00:00 2001
From: Anders Claesson <akc@akc.is>
Date: Sun, 1 Sep 2013 13:58:07 +0100
Subject: [PATCH 228/452] Add Swedish dictionary for aspell

---
 pkgs/development/libraries/aspell/dictionaries.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix
index f1be1f551a9..9b067d6e746 100644
--- a/pkgs/development/libraries/aspell/dictionaries.nix
+++ b/pkgs/development/libraries/aspell/dictionaries.nix
@@ -131,4 +131,13 @@ in {
     };
   };
 
+  sv = buildDict {
+    shortName = "sv-0.51-0";
+    fullName = "Swedish";
+    src = fetchurl {
+      url = mirror://gnu/aspell/dict/sv/aspell-sv-0.51-0.tar.bz2;
+      sha256 = "02jwkjhr32kvyibnyzgx3smbnm576jwdzg3avdf6zxwckhy5fw4v";
+    };
+  };
+
 }

From 8a9999e2bb37d06562e0fdd8fd73583a521b7e7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 1 Sep 2013 15:57:28 +0200
Subject: [PATCH 229/452] aspell: add Norwegian dictionaries (Bokmal and
 Nynorsk)

---
 .../libraries/aspell/dictionaries.nix          | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix
index 9b067d6e746..0f27705160f 100644
--- a/pkgs/development/libraries/aspell/dictionaries.nix
+++ b/pkgs/development/libraries/aspell/dictionaries.nix
@@ -100,6 +100,15 @@ in {
     };
   };
 
+  nb = buildDict {
+    shortName = "nb-0.50.1-0";
+    fullName = "Norwegian Bokmal";
+    src = fetchurl {
+      url = "mirror://gnu/aspell/dict/nb/aspell-nb-0.50.1-0.tar.bz2";
+      sha256 = "12i2bmgdnlkzfinb20j2a0j4a20q91a9j8qpq5vgabbvc65nwx77";
+    };
+  };
+
   nl = buildDict {
     shortName = "nl-0.50-2";
     fullName = "Dutch";
@@ -113,6 +122,15 @@ in {
     '';
   };
 
+  nn = buildDict {
+    shortName = "nn-0.50.1-0";
+    fullName = "Norwegian Nynorsk";
+    src = fetchurl {
+      url = "mirror://gnu/aspell/dict/nn/aspell-nn-0.50.1-1.tar.bz2";
+      sha256 = "0w2k5l5rbqpliripgqwiqixz5ghnjf7i9ggbrc4ly4vy1ia10rmc";
+    };
+  };
+
   pl = buildDict {
     shortName = "pl-6.0_20061121-0";
     fullName = "Polish";

From fcd9904be6626b641d7e4252c900a13749b05a41 Mon Sep 17 00:00:00 2001
From: Danie Roux <danie@danieroux.com>
Date: Sun, 1 Sep 2013 16:24:36 +0200
Subject: [PATCH 230/452] emacs24: Let -nox be a whole lot less X than it was

--with-x-toolkit=no still wants to -lX11 when checking for ncurses
---
 pkgs/applications/editors/emacs-24/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix
index fbb7d7a4b16..bdb7c2a565a 100644
--- a/pkgs/applications/editors/emacs-24/default.nix
+++ b/pkgs/applications/editors/emacs-24/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     (if withX then 
       [ "--with-x-toolkit=gtk" "--with-xft"]
     else
-      [ "--with-x-toolkit=no" ])
+      [ "--with-x=no --with-xpm=no --with-jpeg=no --with-png=no --with-gif=no --with-tiff=no" ])
     # On NixOS, help Emacs find `crt*.o'.
     ++ stdenv.lib.optional (stdenv ? glibc)
          [ "--with-crt-dir=${stdenv.glibc}/lib" ];

From 63a2b95c218b04bb1e1033ec830f6be5538a26c8 Mon Sep 17 00:00:00 2001
From: Danie Roux <danie@danieroux.com>
Date: Sun, 1 Sep 2013 16:32:19 +0200
Subject: [PATCH 231/452] zsh: Upgrade to 5.0.2

---
 pkgs/shells/zsh/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index 4fd717fa936..50a33700b3b 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -2,11 +2,11 @@
 
 let
 
-  version = "4.3.15";
+  version = "5.0.2";
 
   documentation = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.bz2";
-    sha256 = "73b7ee1a737fbaf9be77cf6b55b27cca96bac39bc5ef25efa9ceb427cd1b5ad4";
+    sha256 = "99ee08cfc91935af8714bd98db652f016d6c7a8a71ba7c6d6223910cd0b7fbf1";
   };
   
 in
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${version}.tar.bz2";
-    sha256 = "8708f485823fb7e51aa696776d0dfac7d3558485182672cf9311c12a50a95486";
+    sha256 = "eb220ae5a8076191ec6b4c6a5a2f18122d074a19f25b45f0320b44b8166c5a03";
   };
   
   buildInputs = [ ncurses coreutils ];

From 5e8fbb3dc4891257a5dc83a7300da4e85b423294 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 1 Sep 2013 19:55:25 +0200
Subject: [PATCH 232/452] libreoffice: correctly pick python executable

---
 pkgs/applications/office/libreoffice/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index e1c9e2f0712..b28ff848c4f 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -147,7 +147,7 @@ stdenv.mkDerivation rec {
     find . -type f -print0 | xargs -0 sed -i \
       -e 's,! */bin/bash,!${bash}/bin/bash,' -e 's,\(!\|SHELL=\) */usr/bin/env bash,\1${bash}/bin/bash,' \
       -e 's,! */usr/bin/perl,!${perl}/bin/perl,' -e 's,! */usr/bin/env perl,!${perl}/bin/perl,' \
-      -e 's,! */usr/bin/python,!${python3}/bin/python,' -e 's,! */usr/bin/env python,!${python3}/bin/python,'
+      -e 's,! */usr/bin/python,!${python3}/bin/${python.executable},' -e 's,! */usr/bin/env python,!${python3}/bin/${python.executable},'
     #sed -i 's,ANT_OPTS+="\(.*\)",ANT_OPTS+=\1,' apache-commons/java/*/makefile.mk
   '';
 

From 91e98c269f4b923e0fc4b4819afbe42d617ef30d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 1 Sep 2013 19:55:53 +0200
Subject: [PATCH 233/452] libreoffice: specify number of build cores

---
 pkgs/applications/office/libreoffice/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index b28ff848c4f..fe53d5ef914 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -157,6 +157,10 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     # Needed to find genccode
     PATH=$PATH:${icu}/sbin
+
+    configureFlagsArray=(
+      "--with-parallelism=$NIX_BUILD_CORES"
+    );
   '';
 
   makeFlags = "SHELL=${bash}/bin/bash";

From 43f965f50eea50932b79ecb1e8199646f384d84c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 1 Sep 2013 20:00:48 +0200
Subject: [PATCH 234/452] libreoffice: correct python version

---
 pkgs/applications/office/libreoffice/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index fe53d5ef914..9bda7b4f835 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -147,7 +147,7 @@ stdenv.mkDerivation rec {
     find . -type f -print0 | xargs -0 sed -i \
       -e 's,! */bin/bash,!${bash}/bin/bash,' -e 's,\(!\|SHELL=\) */usr/bin/env bash,\1${bash}/bin/bash,' \
       -e 's,! */usr/bin/perl,!${perl}/bin/perl,' -e 's,! */usr/bin/env perl,!${perl}/bin/perl,' \
-      -e 's,! */usr/bin/python,!${python3}/bin/${python.executable},' -e 's,! */usr/bin/env python,!${python3}/bin/${python.executable},'
+      -e 's,! */usr/bin/python,!${python3}/bin/${python3.executable},' -e 's,! */usr/bin/env python,!${python3}/bin/${python3.executable},'
     #sed -i 's,ANT_OPTS+="\(.*\)",ANT_OPTS+=\1,' apache-commons/java/*/makefile.mk
   '';
 

From fe273e896562404c22233fdfa7ca3ee70ea58727 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 1 Sep 2013 21:32:40 +0200
Subject: [PATCH 235/452] Revert "backup tools bup, storeBackup: implement
 sanity check" on behalf of Marc.

This reverts commit c823bc37d6b50dcd4e183963922da829a193f0d7. The
newly added test case needs more work to succeed on Hydra. See
<http://permalink.gmane.org/gmane.linux.distributions.nixos/11382>
for further details.
---
 pkgs/tools/backup/bup/default.nix          |  45 +--------
 pkgs/tools/backup/store-backup/default.nix |  71 +++++++++-----
 pkgs/tools/backup/test-case.nix            | 105 ---------------------
 3 files changed, 52 insertions(+), 169 deletions(-)
 delete mode 100644 pkgs/tools/backup/test-case.nix

diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix
index 63356e5f7c1..e683df5a7fe 100644
--- a/pkgs/tools/backup/bup/default.nix
+++ b/pkgs/tools/backup/bup/default.nix
@@ -1,9 +1,6 @@
 { stdenv, fetchgit, python, pyxattr, pylibacl, setuptools, fuse, git, perl, pandoc, makeWrapper
-, diffutils, writeTextFile, rsync
 , par2cmdline, par2Support ? false }:
 
-# keep in mind you cannot prune older revisions yet! (2013-06)
-
 assert par2Support -> par2cmdline != null;
 
 with stdenv.lib;
@@ -13,14 +10,12 @@ stdenv.mkDerivation {
 
   src = fetchgit {
     url = "https://github.com/bup/bup.git";
-    rev = "98a8e2ebb775386cb7e66b1953df46cdbd4b4bd3";
-    sha256 = "ab01c70f0caf993c0c05ec3a1008b5940b433bf2f7bd4e9b995d85e81958c1b7";
+    rev = "96c6fa2a70425fff1e73d2e0945f8e242411ab58";
+    sha256 = "0d9hgyh1g5qcpdvnqv3a5zy67x79yx9qx557rxrnxyzqckp9v75n";
   };
 
   buildInputs = [ python git ];
-  nativeBuildInputs = [ pandoc perl makeWrapper rsync ];
-
-  enableParallelBuilding = true;
+  nativeBuildInputs = [ pandoc perl makeWrapper ];
 
   patchPhase = ''
     substituteInPlace Makefile --replace "-Werror" ""
@@ -29,12 +24,6 @@ stdenv.mkDerivation {
       substituteInPlace $f --replace "/usr/bin/env python" "${python}/bin/python"
     done
     substituteInPlace Makefile --replace "./format-subst.pl" "perl ./format-subst.pl"
-    for t in t/*.sh t/configure-sampledata t/compare-trees; do
-      substituteInPlace $t --replace "/usr/bin/env bash" "$(type -p bash)"
-    done
-    substituteInPlace wvtestrun --replace "/usr/bin/env perl" "${perl}/bin/perl"
-
-    substituteInPlace t/test.sh --replace "/bin/pwd" "$(type -P pwd)"
   '' + optionalString par2Support ''
     substituteInPlace cmd/fsck-cmd.py --replace "['par2'" "['${par2cmdline}/bin/par2'"
   '';
@@ -51,33 +40,7 @@ stdenv.mkDerivation {
   postInstall = optionalString (elem stdenv.system platforms.linux) ''
     wrapProgram $out/bin/bup --prefix PYTHONPATH : \
       ${stdenv.lib.concatStringsSep ":"
-          (map (path: "$(toPythonPath ${path})") [ pyxattr pylibacl setuptools fuse python.modules.readline ])}
-
-    ## test it
-    make test
-
-    # if make test passes the following probably passes, too
-    backup_init(){
-      export BUP_DIR=$TMP/bup
-      PATH=$out/bin:$PATH
-      bup init
-    }
-    backup_make(){
-      ( cd "$1"; tar -cvf - .) | bup split -n backup
-    }
-    backup_restore_latest(){
-      bup join backup | ( cd "$1"; tar -xf - )
-    }
-    backup_verify_integrity_latest(){
-      bup fsck
-    }
-    backup_verify_latest(){
-      # maybe closest would be to mount or use the FTP like server ..
-      true
-    }
-
-    . ${import ../test-case.nix { inherit diffutils writeTextFile; }}
-    backup_test backup 100M
+          (map (path: "$(toPythonPath ${path})") [ pyxattr pylibacl setuptools fuse ])}
   '';
 
   meta = {
diff --git a/pkgs/tools/backup/store-backup/default.nix b/pkgs/tools/backup/store-backup/default.nix
index 94493760df8..e9b98fec710 100644
--- a/pkgs/tools/backup/store-backup/default.nix
+++ b/pkgs/tools/backup/store-backup/default.nix
@@ -1,4 +1,4 @@
-{stdenv, which, coreutils, perl, fetchurl, perlPackages, makeWrapper, diffutils , writeScriptBin, writeTextFile, bzip2}:
+{stdenv, which, coreutils, perl, fetchurl, perlPackages, makeWrapper, diffutils , writeScriptBin, bzip2}:
 
 # quick usage:
 # storeBackup.pl --sourceDir /home/user --backupDir /tmp/my_backup_destination
@@ -48,31 +48,56 @@ stdenv.mkDerivation {
     PATH=$PATH:${dummyMount}/bin
 
 
-    ## test it
-    backup_init(){
+    { # simple sanity test, test backup/restore of simple store paths
+
       mkdir backup
-    }
-    latestBackup(){
-      echo backup/default/$(ls -1 backup/default | sort | tail -n 1)
-    }
-    backup_make(){
-      # $1=source
-      $out/bin/storeBackup.pl --sourceDir "$1" --backupDir "backup"
-    }
-    backup_restore_latest(){
-      $out/bin/storeBackupRecover.pl -b "$(latestBackup)" -t "$1" -r /
-    }
 
-    backup_verify_integrity_latest(){
-      $out/bin/storeBackupCheckBackup.pl -c "$(latestBackup)"
-    }
-    backup_verify_latest(){
-      $out/bin/storeBackupCheckSource.pl -s "$1" -b "$(latestBackup)"
-    }
+      backupRestore(){
+        source="$2"
+        echo =========
+        echo RUNNING TEST "$1" source: "$source"
+        mkdir restored
 
-    . ${import ../test-case.nix { inherit diffutils writeTextFile; }}
-    backup_test backup 100M
-'';
+        $out/bin/storeBackup.pl --sourceDir "$source" --backupDir backup
+        latestBackup=backup/default/$(ls -1 backup/default | sort | tail -n 1)
+        $out/bin/storeBackupRecover.pl -b "$latestBackup" -t restored -r /
+        ${diffutils}/bin/diff -r "$source" restored
+
+        # storeBackupCheckSource should return 0
+        $out/bin/storeBackupCheckSource.pl -s "$source" -b "$latestBackup"
+        # storeBackupCheckSource should return not 0 when using different source
+        ! $out/bin/storeBackupCheckSource.pl -s $TMP -b "$latestBackup"
+
+        # storeBackupCheckBackup should return 0
+        $out/bin/storeBackupCheckBackup.pl -c "$latestBackup"
+
+        chmod -R +w restored
+        rm -fr restored
+      }
+
+      testDir=$TMP/testDir
+
+      mkdir $testDir
+      echo X > $testDir/X
+      ln -s ./X $testDir/Y
+
+      backupRestore 'test 1: backup, restore' $testDir
+
+      # test huge blocks, according to docs files bigger than 100MB get split
+      # into pieces
+      dd if=/dev/urandom bs=100M of=block-1 count=1
+      dd if=/dev/urandom bs=100M of=block-2 count=1
+      cat block-1 block-2 > $testDir/block
+      backupRestore 'test 1 with huge block' $testDir
+
+      cat block-2 block-1 > $testDir/block
+      backupRestore 'test 1 with huge block reversed' $testDir
+
+      backupRestore 'test 2: backup, restore' $out
+      backupRestore 'test 3: backup, restore' $out
+      backupRestore 'test 4: backup diffutils to same backup locations, restore' ${diffutils}
+    }
+  '';
 
   meta = {
     description = "Storebackup is a backup suite that stores files on other disks";
diff --git a/pkgs/tools/backup/test-case.nix b/pkgs/tools/backup/test-case.nix
deleted file mode 100644
index 8b2044b1723..00000000000
--- a/pkgs/tools/backup/test-case.nix
+++ /dev/null
@@ -1,105 +0,0 @@
-# while this test suite is not perfect it will at least provide some guarantees
-# that basic features should be fine ..
-
-/*
-  In order to use the suite you have to define the following functions
-
-    backup_init
-    backup_make source
-    backup_restore_latest target
-    backup_verify_integrity_latest
-    backup_verify_latest source
-
-  use true if a backup system does not implement a feature
-
-  TODO: add test cases for all backup solutions shipping with nixpkgs
-
-  This does not replace the test suites shipping with the backup solutions!
-*/
-
-{diffutils, writeTextFile}:
-
-writeTextFile {
-  name = "backup-test-case";
-  text = ''
-  backup_run_tests_on_source(){
-    local test="$1"
-    local source="$2"
-    local backup="$3"
-    echo =========
-    echo RUNNING TEST "$test" source: "$source"
-    mkdir restored
-
-    backup_make "$source" backup
-
-    { # verify that restoring works
-      backup_restore_latest restored
-      ${diffutils}/bin/diff -r "$source" restored
-      # diff does not make a difference for symlinks, so list them and compare
-      # lists
-      ( cd "$source"; find /var/www/ -type l) | sort > 1
-      ( cd "$restored"; find /var/www/ -type l) | sort > 2
-      diff 1 2
-    }
-
-    { # verify that backup tool thinks so, too:
-      backup_verify_latest "$source" backup
-      # using different source verification must fail:
-      ! backup_verify_latest "$TMP" backup
-    }
-
-    backup_verify_integrity_latest backup
-
-    chmod -R +w restored
-    rm -fr restored
-  }
-
-  backup_test(){
-    set -x
-    # allow getting run time to compare backup solutions
-    echo "START $(date)"
-
-    local block_size="$2"
-
-    backup_init
-
-    if [ -z "$SKIP_SYMLINK_TEST" ]; then
-      { # create first test case directory contentents
-        testDir=$TMP/test-1a
-        mkdir $testDir
-        echo X > $testDir/X
-        ln -s ./X $testDir/Y
-      }
-
-      backup_run_tests_on_source 'test 1a: backup, restore' "$testDir" "$backup"
-    fi
-
-    if [ -z "$SKIP_EMPTY_DIR_TEST" ]; then
-      { # create first test case directory contentents
-        testDir=$TMP/test-1b
-        mkdir -p $testDir/empty-directory
-      }
-
-      backup_run_tests_on_source 'test 1b: backup, restore' "$testDir" "$backup"
-    fi
-
-    testDir=$TMP/test-huge-blocks
-    mkdir $testDir
-    # test huge blocks, according to docs files bigger than 100MB get split
-    # into pieces
-    dd if=/dev/urandom bs=1M of=block-0 count=20
-    dd if=/dev/urandom bs="$block_size" of=block-1 count=1
-    dd if=/dev/urandom bs="$block_size" of=block-2 count=1
-    cat block-0 block-0 block-0 block-1 block-2 block-0 block-0 block-0 > $testDir/block
-    backup_run_tests_on_source 'test 1 with huge block' $testDir
-
-    cat block-2 block-0 block-0 block-1 > $testDir/block
-    backup_run_tests_on_source 'test 1 with huge block reversed' $testDir
-
-    backup_run_tests_on_source 'test 2: backup, restore' $out
-    backup_run_tests_on_source 'test 3: backup, restore' $out
-    backup_run_tests_on_source 'test 4: backup diffutils to same backup locations, restore' ${diffutils}
-    echo "STOP $(date)"
-  }
-  '';
-}

From b7d4c94d52c9f6b1381d7a34adea1e8f93f13360 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 1 Sep 2013 20:30:23 +0200
Subject: [PATCH 236/452] unoconv: new package

unoconv is a tool that converts between any document format supported by
LibreOffice/OpenOffice.

Example of how to convert an .odt file to .pdf:
  unoconv -f pdf some-file.odt

Homepage: http://dag.wieers.com/home-made/unoconv/

Implementation notes:
unoconv must use the same python version as libreoffice (unless it will
not be able to load the pyuno module from libreoffice). And because we
recently switched to libreoffice 4.x, which uses python3, I had to
include unoconv-python3.patch. The patch comes from upstream unoconv.git
repo, so it will be included in the next release.
---
 pkgs/tools/text/unoconv/default.nix           |  41 ++
 pkgs/tools/text/unoconv/unoconv-python3.patch | 374 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 3 files changed, 417 insertions(+)
 create mode 100644 pkgs/tools/text/unoconv/default.nix
 create mode 100644 pkgs/tools/text/unoconv/unoconv-python3.patch

diff --git a/pkgs/tools/text/unoconv/default.nix b/pkgs/tools/text/unoconv/default.nix
new file mode 100644
index 00000000000..ac90cb556f9
--- /dev/null
+++ b/pkgs/tools/text/unoconv/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, python3, libreoffice, asciidoc, makeWrapper
+# whether to install odt2pdf/odt2doc/... symlinks to unoconv
+, installSymlinks ? true
+}:
+
+# IMPORTANT: unoconv must use the same python version as libreoffice (unless it
+# will not be able to load the pyuno module from libreoffice).
+
+stdenv.mkDerivation rec {
+  name = "unoconv-0.6";
+
+  src = fetchurl {
+    url = "http://dag.wieers.com/home-made/unoconv/${name}.tar.gz";
+    sha256 = "1m3kv942zf5rzyrbkil0nhmyq9mm3007y64bb3s7w88mhr5n23kr";
+  };
+
+  buildInputs = [ asciidoc makeWrapper ];
+
+  # We need to use python3 because libreoffice 4.x uses it. This patch comes
+  # from unoconv.git, so it will be a part of the next release.
+  patches = [ ./unoconv-python3.patch ];
+
+  preBuild = ''
+    makeFlags=prefix="$out"
+  '';
+
+  postInstall = ''
+    sed -i "s|/usr/bin/env python.*|${python3}/bin/${python3.executable}|" "$out/bin/unoconv"
+    wrapProgram "$out/bin/unoconv" --set UNO_PATH "${libreoffice}/lib/libreoffice/program/"
+  '' + (if installSymlinks then ''
+    make install-links prefix="$out"
+  '' else "");
+
+  meta = with stdenv.lib; {
+    description = "Convert between any document format supported by LibreOffice/OpenOffice";
+    homepage = http://dag.wieers.com/home-made/unoconv/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/tools/text/unoconv/unoconv-python3.patch b/pkgs/tools/text/unoconv/unoconv-python3.patch
new file mode 100644
index 00000000000..b23f5d54c18
--- /dev/null
+++ b/pkgs/tools/text/unoconv/unoconv-python3.patch
@@ -0,0 +1,374 @@
+commit fc59dd90f03cf88f4cf16c07204809f2239284ee
+Author: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
+Date:   Thu Dec 20 00:02:53 2012 +0100
+
+    Add support for python3
+    
+    Libreoffice 4.0 will switch its internal python version to 3.3.0
+    so it's to support that.
+    
+    Porting done automatically 2to3 plus print_function import added
+    manually. Tested on both libreoffice master with internal python
+    and with libreoffince 3.6.4 on debian with system python 2.7.
+    
+    This bumps the minimal python version to 2.6 since 2.5 does not
+    have the print function.
+
+diff --git a/unoconv b/unoconv
+index 30e6706..f72cf08 100755
+--- a/unoconv
++++ b/unoconv
+@@ -14,6 +14,8 @@
+ ### Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ ### Copyright 2007-2010 Dag Wieers <dag@wieers.com>
+ 
++from __future__ import print_function
++
+ from distutils.version import LooseVersion
+ import getopt
+ import glob
+@@ -77,11 +79,11 @@ def find_offices():
+     else:
+ 
+         if os.name in ( 'nt', 'os2' ):
+-            if 'PROGRAMFILES' in os.environ.keys():
++            if 'PROGRAMFILES' in list(os.environ.keys()):
+                 extrapaths += glob.glob(os.environ['PROGRAMFILES']+'\\LibreOffice*') + \
+                               glob.glob(os.environ['PROGRAMFILES']+'\\OpenOffice.org*')
+ 
+-            if 'PROGRAMFILES(X86)' in os.environ.keys():
++            if 'PROGRAMFILES(X86)' in list(os.environ.keys()):
+                 extrapaths += glob.glob(os.environ['PROGRAMFILES(X86)']+'\\LibreOffice*') + \
+                               glob.glob(os.environ['PROGRAMFILES(X86)']+'\\OpenOffice.org*')
+ 
+@@ -233,18 +235,18 @@ def office_environ(office):
+ 
+ def debug_office():
+     if 'URE_BOOTSTRAP' in os.environ:
+-        print >>sys.stderr, 'URE_BOOTSTRAP=%s' % os.environ['URE_BOOTSTRAP']
++        print('URE_BOOTSTRAP=%s' % os.environ['URE_BOOTSTRAP'], file=sys.stderr)
+     if 'UNO_PATH' in os.environ:
+-        print >>sys.stderr, 'UNO_PATH=%s' % os.environ['UNO_PATH']
++        print('UNO_PATH=%s' % os.environ['UNO_PATH'], file=sys.stderr)
+     if 'UNO_TYPES' in os.environ:
+-        print >>sys.stderr, 'UNO_TYPES=%s' % os.environ['UNO_TYPES']
+-    print 'PATH=%s' % os.environ['PATH']
++        print('UNO_TYPES=%s' % os.environ['UNO_TYPES'], file=sys.stderr)
++    print('PATH=%s' % os.environ['PATH'])
+     if 'PYTHONHOME' in os.environ:
+-        print >>sys.stderr, 'PYTHONHOME=%s' % os.environ['PYTHONHOME']
++        print('PYTHONHOME=%s' % os.environ['PYTHONHOME'], file=sys.stderr)
+     if 'PYTHONPATH' in os.environ:
+-        print >>sys.stderr, 'PYTHONPATH=%s' % os.environ['PYTHONPATH']
++        print('PYTHONPATH=%s' % os.environ['PYTHONPATH'], file=sys.stderr)
+     if 'LD_LIBRARY_PATH' in os.environ:
+-        print >>sys.stderr, 'LD_LIBRARY_PATH=%s' % os.environ['LD_LIBRARY_PATH']
++        print('LD_LIBRARY_PATH=%s' % os.environ['LD_LIBRARY_PATH'], file=sys.stderr)
+ 
+ def python_switch(office):
+     if office.pythonhome:
+@@ -335,11 +337,11 @@ class FmtList:
+         return ret
+ 
+     def display(self, doctype):
+-        print >>sys.stderr, "The following list of %s formats are currently available:\n" % doctype
++        print("The following list of %s formats are currently available:\n" % doctype, file=sys.stderr)
+         for fmt in self.list:
+             if fmt.doctype == doctype:
+-                print >>sys.stderr, "  %-8s - %s" % (fmt.name, fmt)
+-        print >>sys.stderr
++                print("  %-8s - %s" % (fmt.name, fmt), file=sys.stderr)
++        print(file=sys.stderr)
+ 
+ fmts = FmtList()
+ 
+@@ -530,14 +532,14 @@ class Options:
+                  'outputpath', 'password=', 'pipe=', 'port=', 'server=',
+                  'timeout=', 'show', 'stdout', 'template', 'verbose',
+                  'version'] )
+-        except getopt.error, exc:
+-            print 'unoconv: %s, try unoconv -h for a list of all the options' % str(exc)
++        except getopt.error as exc:
++            print('unoconv: %s, try unoconv -h for a list of all the options' % str(exc))
+             sys.exit(255)
+ 
+         for opt, arg in opts:
+             if opt in ['-h', '--help']:
+                 self.usage()
+-                print
++                print()
+                 self.help()
+                 sys.exit(1)
+             elif opt in ['-c', '--connection']:
+@@ -562,7 +564,7 @@ class Options:
+                         except ValueError:
+                             self.exportfilter.append( PropertyValue( name, 0, value, 0 ) )
+                 else:
+-                    print >>sys.stderr, 'Warning: Option %s cannot be parsed, ignoring.' % arg
++                    print('Warning: Option %s cannot be parsed, ignoring.' % arg, file=sys.stderr)
+             elif opt in ['-f', '--format']:
+                 self.format = arg
+             elif opt in ['-i', '--import']:
+@@ -581,7 +583,7 @@ class Options:
+                         except ValueError:
+                             self.importfilter.append( PropertyValue( name, 0, value, 0 ) )
+                 else:
+-                    print >>sys.stderr, 'Warning: Option %s cannot be parsed, ignoring.' % arg
++                    print('Warning: Option %s cannot be parsed, ignoring.' % arg, file=sys.stderr)
+             elif opt in ['-l', '--listener']:
+                 self.listener = True
+             elif opt in ['-n', '--no-launch']:
+@@ -589,7 +591,7 @@ class Options:
+             elif opt in ['-o', '--output']:
+                 self.output = arg
+             elif opt in ['--outputpath']:
+-                print >>sys.stderr, 'Warning: This option is deprecated by --output.'
++                print('Warning: This option is deprecated by --output.', file=sys.stderr)
+                 self.output = arg
+             elif opt in ['--password']:
+                 self.password = arg
+@@ -615,13 +617,13 @@ class Options:
+ 
+         ### Enable verbosity
+         if self.verbose >= 2:
+-            print >>sys.stderr, 'Verbosity set to level %d' % self.verbose
++            print('Verbosity set to level %d' % self.verbose, file=sys.stderr)
+ 
+         self.filenames = args
+ 
+         if not self.listener and not self.showlist and self.doctype != 'list' and not self.filenames:
+-            print >>sys.stderr, 'unoconv: you have to provide a filename as argument'
+-            print >>sys.stderr, 'Try `unoconv -h\' for more information.'
++            print('unoconv: you have to provide a filename as argument', file=sys.stderr)
++            print('Try `unoconv -h\' for more information.', file=sys.stderr)
+             sys.exit(255)
+ 
+         ### Set connection string
+@@ -659,21 +661,21 @@ class Options:
+         ### Get office product information
+         product = uno.getComponentContext().ServiceManager.createInstance("com.sun.star.configuration.ConfigurationProvider").createInstanceWithArguments("com.sun.star.configuration.ConfigurationAccess", UnoProps(nodepath="/org.openoffice.Setup/Product"))
+ 
+-        print 'unoconv %s' % VERSION
+-        print 'Written by Dag Wieers <dag@wieers.com>'
+-        print 'Homepage at http://dag.wieers.com/home-made/unoconv/'
+-        print
+-        print 'platform %s/%s' % (os.name, sys.platform)
+-        print 'python %s' % sys.version
+-        print product.ooName, product.ooSetupVersion
++        print('unoconv %s' % VERSION)
++        print('Written by Dag Wieers <dag@wieers.com>')
++        print('Homepage at http://dag.wieers.com/home-made/unoconv/')
++        print()
++        print('platform %s/%s' % (os.name, sys.platform))
++        print('python %s' % sys.version)
++        print(product.ooName, product.ooSetupVersion)
+ #        print
+ #        print 'build revision $Rev$'
+ 
+     def usage(self):
+-        print >>sys.stderr, 'usage: unoconv [options] file [file2 ..]'
++        print('usage: unoconv [options] file [file2 ..]', file=sys.stderr)
+ 
+     def help(self):
+-        print >>sys.stderr, '''Convert from and to any format supported by LibreOffice
++        print('''Convert from and to any format supported by LibreOffice
+ 
+ unoconv options:
+   -c, --connection=string  use a custom connection string
+@@ -698,7 +700,7 @@ unoconv options:
+   -t, --template=file      import the styles from template (.ott)
+   -T, --timeout=secs       timeout after secs if connection to listener fails
+   -v, --verbose            be more and more verbose (-vvv for debugging)
+-'''
++''', file=sys.stderr)
+ 
+ class Convertor:
+     def __init__(self):
+@@ -714,7 +716,7 @@ class Convertor:
+         info(3, 'Connection type: %s' % op.connection)
+         try:
+             unocontext = resolver.resolve("uno:%s" % op.connection)
+-        except NoConnectException, e:
++        except NoConnectException as e:
+ #            info(3, "Existing listener not found.\n%s" % e)
+             info(3, "Existing listener not found.")
+ 
+@@ -749,7 +751,7 @@ class Convertor:
+                         raise
+                 else:
+                     error("Failed to connect to %s (pid=%s) in %d seconds.\n%s" % (office.binary, ooproc.pid, op.timeout, e))
+-            except Exception, e:
++            except Exception as e:
+                 raise
+                 error("Launch of %s failed.\n%s" % (office.binary, e))
+ 
+@@ -799,9 +801,9 @@ class Convertor:
+         ### No format found, throw error
+         if not outputfmt:
+             if doctype:
+-                print >>sys.stderr, 'unoconv: format [%s/%s] is not known to unoconv.' % (op.doctype, op.format)
++                print('unoconv: format [%s/%s] is not known to unoconv.' % (op.doctype, op.format), file=sys.stderr)
+             else:
+-                print >>sys.stderr, 'unoconv: format [%s] is not known to unoconv.' % op.format
++                print('unoconv: format [%s] is not known to unoconv.' % op.format, file=sys.stderr)
+             die(1)
+ 
+         return outputfmt
+@@ -813,10 +815,10 @@ class Convertor:
+         outputfmt = self.getformat(inputfn)
+ 
+         if op.verbose > 0:
+-            print >>sys.stderr, 'Input file:', inputfn
++            print('Input file:', inputfn, file=sys.stderr)
+ 
+         if not os.path.exists(inputfn):
+-            print >>sys.stderr, 'unoconv: file `%s\' does not exist.' % inputfn
++            print('unoconv: file `%s\' does not exist.' % inputfn, file=sys.stderr)
+             exitcode = 1
+ 
+         try:
+@@ -854,7 +856,7 @@ class Convertor:
+                     templateurl = unohelper.absolutize(self.cwd, unohelper.systemPathToFileUrl(op.template))
+                     document.StyleFamilies.loadStylesFromURL(templateurl, templateprops)
+                 else:
+-                    print >>sys.stderr, 'unoconv: template file `%s\' does not exist.' % op.template
++                    print('unoconv: template file `%s\' does not exist.' % op.template, file=sys.stderr)
+                     exitcode = 1
+ 
+             ### Update document links
+@@ -924,40 +926,40 @@ class Convertor:
+ 
+             try:
+                 document.storeToURL(outputurl, tuple(outputprops) )
+-            except IOException, e:
++            except IOException as e:
+                 raise UnoException("Unable to store document to %s (ErrCode %d)\n\nProperties: %s" % (outputurl, e.ErrCode, outputprops), None)
+ 
+             phase = "dispose"
+             document.dispose()
+             document.close(True)
+ 
+-        except SystemError, e:
++        except SystemError as e:
+             error("unoconv: SystemError during %s phase:\n%s" % (phase, e))
+             exitcode = 1
+ 
+-        except RuntimeException, e:
++        except RuntimeException as e:
+             error("unoconv: RuntimeException during %s phase:\nOffice probably died. %s" % (phase, e))
+             exitcode = 6
+ 
+-        except DisposedException, e:
++        except DisposedException as e:
+             error("unoconv: DisposedException during %s phase:\nOffice probably died. %s" % (phase, e))
+             exitcode = 7
+ 
+-        except IllegalArgumentException, e:
++        except IllegalArgumentException as e:
+             error("UNO IllegalArgument during %s phase:\nSource file cannot be read. %s" % (phase, e))
+             exitcode = 8
+ 
+-        except IOException, e:
++        except IOException as e:
+ #            for attr in dir(e): print '%s: %s', (attr, getattr(e, attr))
+             error("unoconv: IOException during %s phase:\n%s" % (phase, e.Message))
+             exitcode = 3
+ 
+-        except CannotConvertException, e:
++        except CannotConvertException as e:
+ #            for attr in dir(e): print '%s: %s', (attr, getattr(e, attr))
+             error("unoconv: CannotConvertException during %s phase:\n%s" % (phase, e.Message))
+             exitcode = 4
+ 
+-        except UnoException, e:
++        except UnoException as e:
+             if hasattr(e, 'ErrCode'):
+                 error("unoconv: UnoException during %s phase in %s (ErrCode %d)" % (phase, repr(e.__class__), e.ErrCode))
+                 exitcode = e.ErrCode
+@@ -982,7 +984,7 @@ class Listener:
+             product = self.svcmgr.createInstance("com.sun.star.configuration.ConfigurationProvider").createInstanceWithArguments("com.sun.star.configuration.ConfigurationAccess", UnoProps(nodepath="/org.openoffice.Setup/Product"))
+             try:
+                 unocontext = resolver.resolve("uno:%s" % op.connection)
+-            except NoConnectException, e:
++            except NoConnectException as e:
+                 pass
+             else:
+                 info(1, "Existing %s listener found, nothing to do." % product.ooName)
+@@ -991,25 +993,25 @@ class Listener:
+                 subprocess.call([office.binary, "-headless", "-invisible", "-nocrashreport", "-nodefault", "-nologo", "-nofirststartwizard", "-norestore", "-accept=%s" % op.connection], env=os.environ)
+             else:
+                 subprocess.call([office.binary, "--headless", "--invisible", "--nocrashreport", "--nodefault", "--nologo", "--nofirststartwizard", "--norestore", "--accept=%s" % op.connection], env=os.environ)
+-        except Exception, e:
++        except Exception as e:
+             error("Launch of %s failed.\n%s" % (office.binary, e))
+         else:
+             info(1, "Existing %s listener found, nothing to do." % product.ooName)
+ 
+ def error(msg):
+     "Output error message"
+-    print >>sys.stderr, msg
++    print(msg, file=sys.stderr)
+ 
+ def info(level, msg):
+     "Output info message"
+     if 'op' not in globals():
+         pass
+     elif op.verbose >= 3 and level >= 3:
+-        print >>sys.stderr, "DEBUG:", msg
++        print("DEBUG:", msg, file=sys.stderr)
+     elif not op.stdout and level <= op.verbose:
+-        print >>sys.stdout, msg
++        print(msg, file=sys.stdout)
+     elif level <= op.verbose:
+-        print >>sys.stderr, msg
++        print(msg, file=sys.stderr)
+ 
+ def die(ret, msg=None):
+     "Print optional error and exit with errorcode"
+@@ -1031,7 +1033,7 @@ def die(ret, msg=None):
+                     subprocess.Popen([office.binary, "--headless", "--invisible", "--nocrashreport", "--nodefault", "--nofirststartwizard", "--nologo", "--norestore", "--unaccept=%s" % op.connection], env=os.environ)
+                 ooproc.wait()
+                 info(2, '%s listener successfully disabled.' % product.ooName)
+-            except Exception, e:
++            except Exception as e:
+                 error("Terminate using %s failed.\n%s" % (office.binary, e))
+ 
+         ### If there is no GUI attached to the instance, terminate instance
+@@ -1080,7 +1082,7 @@ def main():
+             for inputfn in op.filenames:
+                 convertor.convert(inputfn)
+ 
+-    except NoConnectException, e:
++    except NoConnectException as e:
+         error("unoconv: could not find an existing connection to LibreOffice at %s:%s." % (op.server, op.port))
+         if op.connection:
+             info(0, "Please start an LibreOffice instance on server '%s' by doing:\n\n    unoconv --listener --server %s --port %s\n\nor alternatively:\n\n    soffice -nologo -nodefault -accept=\"%s\"" % (op.server, op.server, op.port, op.connection))
+@@ -1110,14 +1112,14 @@ if __name__ == '__main__':
+             break
+         except:
+ #            debug_office()
+-            print >>sys.stderr, "unoconv: Cannot find a suitable pyuno library and python binary combination in %s" % of
+-            print >>sys.stderr, "ERROR:", sys.exc_info()[1]
+-            print >>sys.stderr
++            print("unoconv: Cannot find a suitable pyuno library and python binary combination in %s" % of, file=sys.stderr)
++            print("ERROR:", sys.exc_info()[1], file=sys.stderr)
++            print(file=sys.stderr)
+     else:
+ #        debug_office()
+-        print >>sys.stderr, "unoconv: Cannot find a suitable office installation on your system."
+-        print >>sys.stderr, "ERROR: Please locate your office installation and send your feedback to:"
+-        print >>sys.stderr, "       http://github.com/dagwieers/unoconv/issues"
++        print("unoconv: Cannot find a suitable office installation on your system.", file=sys.stderr)
++        print("ERROR: Please locate your office installation and send your feedback to:", file=sys.stderr)
++        print("       http://github.com/dagwieers/unoconv/issues", file=sys.stderr)
+         sys.exit(1)
+ 
+     ### Now that we have found a working pyuno library, let's import some classes
+@@ -1160,6 +1162,6 @@ if __name__ == '__main__':
+ 
+     try:
+         main()
+-    except KeyboardInterrupt, e:
++    except KeyboardInterrupt as e:
+         die(6, 'Exiting on user request')
+     die(exitcode)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f8ad286f8c4..a0d79b1aefa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1834,6 +1834,8 @@ let
 
   unfs3 = callPackage ../servers/unfs3 { };
 
+  unoconv = callPackage ../tools/text/unoconv { };
+
   upx = callPackage ../tools/compression/upx { };
 
   usbmuxd = callPackage ../tools/misc/usbmuxd {};

From 05fd8db3796ac8d294a932f911edd53514bfe2de Mon Sep 17 00:00:00 2001
From: Gergely Risko <gergely@risko.hu>
Date: Mon, 2 Sep 2013 11:36:54 +0200
Subject: [PATCH 237/452] Update timeplot to 1.0.22 to fix building with
 Chart-1.0

---
 pkgs/development/tools/haskell/timeplot/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/haskell/timeplot/default.nix b/pkgs/development/tools/haskell/timeplot/default.nix
index b2f6316dd99..fd5f868d5bb 100644
--- a/pkgs/development/tools/haskell/timeplot/default.nix
+++ b/pkgs/development/tools/haskell/timeplot/default.nix
@@ -1,17 +1,17 @@
-{ cabal, bytestringLexing, cairo, Chart, colour, dataAccessor
-, dataAccessorTemplate, regexTdfa, strptime, time, transformers
+{ cabal, bytestringLexing, cairo, Chart, ChartCairo, colour
+, dataDefault, regexTdfa, strptime, time, transformers
 , vcsRevision
 }:
 
 cabal.mkDerivation (self: {
   pname = "timeplot";
-  version = "1.0.21";
-  sha256 = "0x9f95w235yijp98xx9nry0ibsxr0iyshk6cd89n51xrk1zpk41l";
+  version = "1.0.22";
+  sha256 = "1dp1prcx3d6a0fr3xrdj6flp27sy7qbng5bbdjgjbb7rq8497if9";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-    bytestringLexing cairo Chart colour dataAccessor
-    dataAccessorTemplate regexTdfa strptime time transformers
+    bytestringLexing cairo Chart ChartCairo colour
+    dataDefault regexTdfa strptime time transformers
     vcsRevision
   ];
   meta = {

From c5750ea3e9b5bb0f746f3a78d9d4ebdeb26f28ef Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@onlinetouch.nl>
Date: Wed, 6 Feb 2013 13:24:57 +0100
Subject: [PATCH 238/452] Add jzmq package.

---
 .../libraries/java/jzmq/default.nix           | 24 +++++++++++++++++++
 pkgs/lib/maintainers.nix                      |  1 +
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/libraries/java/jzmq/default.nix

diff --git a/pkgs/development/libraries/java/jzmq/default.nix b/pkgs/development/libraries/java/jzmq/default.nix
new file mode 100644
index 00000000000..9130e02e1d7
--- /dev/null
+++ b/pkgs/development/libraries/java/jzmq/default.nix
@@ -0,0 +1,24 @@
+{stdenv, fetchgit, automake, autoconf, libtool, pkgconfig, zeromq2, jdk}:
+
+stdenv.mkDerivation rec {
+  name = "jzmq-2.1.0";
+
+  src = fetchgit {
+    url = git://github.com/zeromq/jzmq.git;
+    rev = "946fd39780423b2df6e5efd9fa2cd863fd79c9db";
+  };
+
+  buildInputs = [ automake autoconf libtool pkgconfig zeromq2 jdk ];
+
+  preConfigurePhases = ["./autogen.sh"];
+  preConfigure = if stdenv.system == "x86_64-darwin" then ''
+    sed -i -e 's~/Headers~/include~' -e 's~_JNI_INC_SUBDIRS=\".*\"~_JNI_INC_SUBDIRS=\"darwin\"~' configure
+  '' else "";
+
+
+  maintainers = [ stdenv.lib.maintainers.blue ];
+  meta = {
+    homepage = "http://www.zeromq.org";
+    description = "Java bindings for ZeroMQ";
+  };
+}
diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix
index 78c77f61f4e..fa1cbe94799 100644
--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@@ -17,6 +17,7 @@
   bjornfor = "Bjørn Forsman <bjorn.forsman@gmail.com>";
   bluescreen303 = "Mathijs Kwik <mathijs@bluescreen303.nl>";
   bodil = "Bodil Stokke <nix@bodil.org>";
+  blue = "Danny Wilson <danny@prime.vc>";
   chaoflow = "Florian Friesdorf <flo@chaoflow.net>";
   coconnor = "Corey O'Connor <coreyoconnor@gmail.com>";
   eelco = "Eelco Dolstra <eelco.dolstra@logicblox.com>";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a0d79b1aefa..884caf161d9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5736,6 +5736,8 @@ let
 
   junit = callPackage ../development/libraries/java/junit { };
 
+  jzmq = callPackage ../development/libraries/java/jzmq { };
+
   lucene = callPackage ../development/libraries/java/lucene { };
 
   mockobjects = callPackage ../development/libraries/java/mockobjects { };

From 04a232f28b1f22b01da157f8d09e2f56fafa1cbc Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@onlinetouch.nl>
Date: Thu, 7 Feb 2013 15:32:10 +0100
Subject: [PATCH 239/452] Add storm package.

---
 pkgs/servers/computing/storm/default.nix | 35 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/servers/computing/storm/default.nix

diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix
new file mode 100644
index 00000000000..083ad5e6439
--- /dev/null
+++ b/pkgs/servers/computing/storm/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, unzip, jzmq, jdk, lib, python}:
+
+stdenv.mkDerivation {
+  name = "storm-0.8.2";
+  src = fetchurl {
+    url = https://dl.dropbox.com/u/133901206/storm-0.8.2.zip;
+    sha256 = "8761aea0b54e5bab4a68b259bbe6b5b2f8226204488b5559eba57a0c458b2bbc";
+  };
+
+  buildInputs = [ unzip jzmq ];
+
+  installPhase = ''
+    # Remove junk
+    rm -f lib/jzmq*
+    mkdir -p /var/log/storm
+    mv bin/storm $out/bin/
+    rm -R bin
+
+    # Fix shebang header for python scripts
+    sed -i -e "s|#!/usr/bin/.*python|#!${python}/bin/python|" bin/storm;
+
+    mkdir -p $out
+    cp -av * $out
+    ln -s /var/log/storm $out/logs
+  '';
+
+  dontStrip = true;
+
+  meta = {
+    homepage = "http://storm-project.net";
+    description = "Storm, free and open source distributed realtime computation system.";
+    license = "Eclipse Public License 1.0";
+    maintainers = [ lib.maintainers.blue ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 884caf161d9..2710098375a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6170,6 +6170,8 @@ let
 
   thttpd = callPackage ../servers/http/thttpd { };
 
+  storm = callPackage ../servers/computing/storm { };
+
   tomcat5 = callPackage ../servers/http/tomcat/5.0.nix { };
 
   tomcat6 = callPackage ../servers/http/tomcat/6.0.nix { };

From d6a812332ce42f34a39618d36cc85b96d5e70d08 Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@prime.vc>
Date: Fri, 8 Feb 2013 15:19:33 +0100
Subject: [PATCH 240/452] Make Storm conf and log path configurable via
 symlinks.   - The bin/storm script makes too many assumptions about file
 locations and java classpath that I couldn't figure out a better way.

Fix jzmq build on NixOS: java source was treated as ASCII.
---
 pkgs/development/libraries/java/jzmq/default.nix |  9 ++++++---
 pkgs/servers/computing/storm/default.nix         | 12 +++++++-----
 pkgs/top-level/all-packages.nix                  |  2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/java/jzmq/default.nix b/pkgs/development/libraries/java/jzmq/default.nix
index 9130e02e1d7..6208090ad51 100644
--- a/pkgs/development/libraries/java/jzmq/default.nix
+++ b/pkgs/development/libraries/java/jzmq/default.nix
@@ -11,9 +11,12 @@ stdenv.mkDerivation rec {
   buildInputs = [ automake autoconf libtool pkgconfig zeromq2 jdk ];
 
   preConfigurePhases = ["./autogen.sh"];
-  preConfigure = if stdenv.system == "x86_64-darwin" then ''
-    sed -i -e 's~/Headers~/include~' -e 's~_JNI_INC_SUBDIRS=\".*\"~_JNI_INC_SUBDIRS=\"darwin\"~' configure
-  '' else "";
+  preConfigure = ''
+    sed -i -e 's|(JAVAC)|(JAVAC) -encoding utf8|' src/Makefile.in
+    ${if stdenv.system == "x86_64-darwin" then
+      '' sed -i -e 's~/Headers~/include~' -e 's~_JNI_INC_SUBDIRS=\".*\"~_JNI_INC_SUBDIRS=\"darwin\"~' configure
+      '' else ""}
+  '';
 
 
   maintainers = [ stdenv.lib.maintainers.blue ];
diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix
index 083ad5e6439..b60d9fe62b2 100644
--- a/pkgs/servers/computing/storm/default.nix
+++ b/pkgs/servers/computing/storm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, jzmq, jdk, lib, python}:
+{ stdenv, fetchurl, unzip, jzmq, jdk, lib, python, logsDir, confDir }:
 
 stdenv.mkDerivation {
   name = "storm-0.8.2";
@@ -12,16 +12,18 @@ stdenv.mkDerivation {
   installPhase = ''
     # Remove junk
     rm -f lib/jzmq*
-    mkdir -p /var/log/storm
+    mkdir -p $out/bin
     mv bin/storm $out/bin/
-    rm -R bin
+    rm -R bin conf logs
 
     # Fix shebang header for python scripts
-    sed -i -e "s|#!/usr/bin/.*python|#!${python}/bin/python|" bin/storm;
+    sed -i -e "s|#!/usr/bin/.*python|#!${python}/bin/python|" $out/bin/storm;
 
     mkdir -p $out
     cp -av * $out
-    ln -s /var/log/storm $out/logs
+    cd $out;
+    ${if logsDir != "" then ''ln -s ${logsDir} logs'' else ""}
+    ${if confDir != "" then ''ln -s ${confDir} conf'' else ""}
   '';
 
   dontStrip = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2710098375a..09c498a14bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6170,7 +6170,7 @@ let
 
   thttpd = callPackage ../servers/http/thttpd { };
 
-  storm = callPackage ../servers/computing/storm { };
+  storm = callPackage ../servers/computing/storm { confDir = "/etc/storm"; logsDir = "/var/log"; };
 
   tomcat5 = callPackage ../servers/http/tomcat/5.0.nix { };
 

From c4b1bbc1c8f75a3378c32385c2c25c86300a1db8 Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@prime.vc>
Date: Thu, 14 Feb 2013 09:58:49 +0100
Subject: [PATCH 241/452] Improved Storm package.

- Add config to defaults.yaml, to allow topologies to include their own storm.yaml.
- Symlink extra jars in lib/ since it's nearly impossible to add a classpath to Storm's config.
- Include native jzmq library in java.library.path
- Use package default args.
---
 pkgs/servers/computing/storm/default.nix | 22 +++++++++++++++++-----
 pkgs/top-level/all-packages.nix          |  2 +-
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix
index b60d9fe62b2..2b7efff5210 100644
--- a/pkgs/servers/computing/storm/default.nix
+++ b/pkgs/servers/computing/storm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, jzmq, jdk, lib, python, logsDir, confDir }:
+{ stdenv, fetchurl, zip, unzip, jzmq, jdk, lib, python, logsDir ? "", confFile ? "", extraLibraryPaths ? [], extraJars ? [] }:
 
 stdenv.mkDerivation {
   name = "storm-0.8.2";
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
     sha256 = "8761aea0b54e5bab4a68b259bbe6b5b2f8226204488b5559eba57a0c458b2bbc";
   };
 
-  buildInputs = [ unzip jzmq ];
+  buildInputs = [ zip unzip jzmq ];
 
   installPhase = ''
     # Remove junk
@@ -19,11 +19,23 @@ stdenv.mkDerivation {
     # Fix shebang header for python scripts
     sed -i -e "s|#!/usr/bin/.*python|#!${python}/bin/python|" $out/bin/storm;
 
-    mkdir -p $out
+    mkdir -p $out/conf
     cp -av * $out
+    
     cd $out;
-    ${if logsDir != "" then ''ln -s ${logsDir} logs'' else ""}
-    ${if confDir != "" then ''ln -s ${confDir} conf'' else ""}
+    ${if logsDir  != "" then ''ln -s ${logsDir} logs'' else ""}
+    
+    # Extract, delete from zip; and optionally append to defaults.yaml
+    unzip  storm-*.jar defaults.yaml;
+    zip -d storm-*.jar defaults.yaml;
+    echo 'java.library.path: "${jzmq}/lib:${lib.concatStringsSep ":" extraLibraryPaths}"' >> defaults.yaml;
+    ${if confFile != "" then ''cat ${confFile} >> defaults.yaml'' else ""}
+    mv defaults.yaml conf;
+
+    # Link to jzmq jar and extra jars
+    cd lib;
+    ln ${jzmq}/share/java/*.jar;
+    ${lib.concatMapStrings (jar: "ln -s ${jar};\n") extraJars}
   '';
 
   dontStrip = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 09c498a14bd..2710098375a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6170,7 +6170,7 @@ let
 
   thttpd = callPackage ../servers/http/thttpd { };
 
-  storm = callPackage ../servers/computing/storm { confDir = "/etc/storm"; logsDir = "/var/log"; };
+  storm = callPackage ../servers/computing/storm { };
 
   tomcat5 = callPackage ../servers/http/tomcat/5.0.nix { };
 

From b3367cdfb9171669d69cbd284084e08f2d490bc5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Sep 2013 14:04:50 +0200
Subject: [PATCH 242/452] haskell-packages.nix: transformers is a core package
 starting with ghc 7.7

---
 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 42107fdfb0b..d5a4863f364 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -168,7 +168,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     stm          = self.stm_2_4_2;
     syb          = self.syb_0_4_1;
     text         = self.text_0_11_3_1;
-    transformers = self.transformers_0_3_0_0;
+    transformers = null;                        # this has become a core package in GHC 7.7
     unorderedContainers = self.unorderedContainers_0_2_3_0;
     vector       = self.vector_0_10_0_1;
     xhtml        = self.xhtml_3000_2_1;

From ffe90114bd349864ffa7fa8796c47c65a14f7eee Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Sep 2013 10:56:06 +0200
Subject: [PATCH 243/452] haskell-case-insensitive: add version 1.1

---
 .../libraries/haskell/case-insensitive/1.1.nix  | 17 +++++++++++++++++
 pkgs/top-level/haskell-packages.nix             |  6 +++---
 2 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/case-insensitive/1.1.nix

diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.1.nix b/pkgs/development/libraries/haskell/case-insensitive/1.1.nix
new file mode 100644
index 00000000000..fb3a9d27101
--- /dev/null
+++ b/pkgs/development/libraries/haskell/case-insensitive/1.1.nix
@@ -0,0 +1,17 @@
+{ cabal, deepseq, hashable, HUnit, testFramework
+, testFrameworkHunit, text
+}:
+
+cabal.mkDerivation (self: {
+  pname = "case-insensitive";
+  version = "1.1";
+  sha256 = "1likcqdlhbbk78s887n5g9a4jjxxyh46hj4wc7l7snf6f9ygd5lj";
+  buildDepends = [ deepseq hashable text ];
+  testDepends = [ HUnit testFramework testFrameworkHunit text ];
+  meta = {
+    homepage = "https://github.com/basvandijk/case-insensitive";
+    description = "Case insensitive string comparison";
+    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 d5a4863f364..3a62af9bf3c 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -143,7 +143,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     inherit (self) cabal ghc;
     async        = self.async_2_0_1_4;
     attoparsec   = self.attoparsec_0_10_4_0;
-    caseInsensitive = self.caseInsensitive_1_0_0_1;
+    caseInsensitive = self.caseInsensitive_1_1;
     cgi          = self.cgi_3001_1_7_5;
     fgl          = self.fgl_5_4_2_4;
     GLUT         = self.GLUT_2_4_0_0;
@@ -667,8 +667,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   carray = callPackage ../development/libraries/haskell/carray {};
 
   caseInsensitive_1_0_0_1 = callPackage ../development/libraries/haskell/case-insensitive/1.0.0.1.nix {};
-  caseInsensitive_1_0_0_2 = callPackage ../development/libraries/haskell/case-insensitive/1.0.0.2.nix {};
-  caseInsensitive = self.caseInsensitive_1_0_0_2;
+  caseInsensitive_1_1 = callPackage ../development/libraries/haskell/case-insensitive/1.1.nix {};
+  caseInsensitive = self.caseInsensitive_1_1;
 
   cautiousFile = callPackage ../development/libraries/haskell/cautious-file {};
 

From 748c44df6ff9507ca928684e3e95185664386df1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Sep 2013 10:59:16 +0200
Subject: [PATCH 244/452] haskell-crypto-random: add version 0.0.5

---
 .../libraries/haskell/crypto-random/default.nix    | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/crypto-random/default.nix

diff --git a/pkgs/development/libraries/haskell/crypto-random/default.nix b/pkgs/development/libraries/haskell/crypto-random/default.nix
new file mode 100644
index 00000000000..583e9e5805b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/crypto-random/default.nix
@@ -0,0 +1,14 @@
+{ cabal, securemem, vector }:
+
+cabal.mkDerivation (self: {
+  pname = "crypto-random";
+  version = "0.0.5";
+  sha256 = "1wvbbqqfqaylq9w8pyiz243d06ivh982mhb2ci5yhjl06vqv2gk3";
+  buildDepends = [ securemem vector ];
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-crypto-random";
+    description = "Simple cryptographic random related types";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 3a62af9bf3c..70ac6ad105c 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -772,6 +772,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   cryptoPubkey = callPackage ../development/libraries/haskell/crypto-pubkey {};
 
+  cryptoRandom = callPackage ../development/libraries/haskell/crypto-random {};
+
   cryptoRandomApi = callPackage ../development/libraries/haskell/crypto-random-api {};
 
   cuda = callPackage ../development/libraries/haskell/cuda {

From 0c5c9e31ff3dfdebb80205394cde57bcb73e8630 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Sep 2013 11:00:56 +0200
Subject: [PATCH 245/452] haskell-groups: add version 0.3.0.0

---
 .../development/libraries/haskell/groups/default.nix | 12 ++++++++++++
 pkgs/top-level/haskell-packages.nix                  |  2 ++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/groups/default.nix

diff --git a/pkgs/development/libraries/haskell/groups/default.nix b/pkgs/development/libraries/haskell/groups/default.nix
new file mode 100644
index 00000000000..a0309497070
--- /dev/null
+++ b/pkgs/development/libraries/haskell/groups/default.nix
@@ -0,0 +1,12 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "groups";
+  version = "0.3.0.0";
+  sha256 = "07swv09l98fxh563w1x8n8xzgh9q7n9dbx4gx3i77kwi72vmxl8x";
+  meta = {
+    description = "Haskell 98 groups";
+    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 70ac6ad105c..e66f82d32e9 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1083,6 +1083,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   graphviz = callPackage ../development/libraries/haskell/graphviz {};
 
+  groups = callPackage ../development/libraries/haskell/groups {};
+
   groupoids = callPackage ../development/libraries/haskell/groupoids {};
 
   hakyll = callPackage ../development/libraries/haskell/hakyll {};

From 3016b359d93b3d926ae873f86a9bbe8d52bae461 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Sep 2013 13:19:43 +0200
Subject: [PATCH 246/452] haskell-hakyll: jailbreak to fix the build

---
 pkgs/development/libraries/haskell/hakyll/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index f3f2562a073..ba174c39367 100644
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@@ -26,6 +26,7 @@ cabal.mkDerivation (self: {
     testFrameworkHunit testFrameworkQuickcheck2 text time
   ];
   doCheck = false;
+  jailbreak = true;
   meta = {
     homepage = "http://jaspervdj.be/hakyll";
     description = "A static website compiler library";

From ba896772560e25beb5805baef2a053716982198a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Sep 2013 13:20:16 +0200
Subject: [PATCH 247/452] haskell-accelerate-cuda: update to version 0.13.0.3

---
 pkgs/development/libraries/haskell/accelerate-cuda/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix
index 53f1514bcb6..bc428ab1dc4 100644
--- a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix
+++ b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix
@@ -12,6 +12,7 @@ cabal.mkDerivation (self: {
     hashtables languageCQuote mainlandPretty mtl SafeSemaphore srcloc
     text transformers unorderedContainers
   ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/AccelerateHS/accelerate-cuda/";
     description = "Accelerate backend for NVIDIA GPUs";

From 671fdd4e621c2584f39171ac96bc1a9ba57ee3ae Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Sep 2013 13:20:16 +0200
Subject: [PATCH 248/452] haskell-cipher-aes: update to version 0.2.4

---
 .../libraries/haskell/cipher-aes/default.nix         | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/cipher-aes/default.nix b/pkgs/development/libraries/haskell/cipher-aes/default.nix
index e27f203306e..f5098fc2c61 100644
--- a/pkgs/development/libraries/haskell/cipher-aes/default.nix
+++ b/pkgs/development/libraries/haskell/cipher-aes/default.nix
@@ -1,11 +1,15 @@
-{ cabal, QuickCheck, testFramework, testFrameworkQuickcheck2 }:
+{ cabal, byteable, cryptoCipherTests, cryptoCipherTypes, QuickCheck
+, securemem, testFramework, testFrameworkQuickcheck2
+}:
 
 cabal.mkDerivation (self: {
   pname = "cipher-aes";
-  version = "0.1.8";
-  sha256 = "171mj9abm0x9bg6mf225mhb25i7xh4v5la5866llb1qrrpvsk1xf";
+  version = "0.2.4";
+  sha256 = "13nxxgb55jmrq9m9jpbsdxpj2j2kvdjv8b1c0gp1pvkxhyfzk610";
+  buildDepends = [ byteable cryptoCipherTypes securemem ];
   testDepends = [
-    QuickCheck testFramework testFrameworkQuickcheck2
+    byteable cryptoCipherTests cryptoCipherTypes QuickCheck
+    testFramework testFrameworkQuickcheck2
   ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-cipher-aes";

From b7d2154431ef753782d907bc9651dbc5c38e847d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Sep 2013 13:20:16 +0200
Subject: [PATCH 249/452] haskell-clientsession: update to version 0.9.0.3

---
 .../libraries/haskell/clientsession/default.nix       | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix
index 6cb8d26bd39..00df46640e1 100644
--- a/pkgs/development/libraries/haskell/clientsession/default.nix
+++ b/pkgs/development/libraries/haskell/clientsession/default.nix
@@ -1,14 +1,15 @@
 { cabal, base64Bytestring, cereal, cipherAes, cprngAes, cryptoApi
-, entropy, hspec, HUnit, QuickCheck, skein, tagged, transformers
+, cryptoRandom, entropy, hspec, HUnit, QuickCheck, skein, tagged
+, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "clientsession";
-  version = "0.9.0.2";
-  sha256 = "0vl310nickavp8wkaad1wfnvm8gfsg9jcfw3rgjz7698avynv3ni";
+  version = "0.9.0.3";
+  sha256 = "0w7mkyrd8gx5d6mcqprn7ll05414vm2j5fbyi6pj9cxd2m4qc9b1";
   buildDepends = [
-    base64Bytestring cereal cipherAes cprngAes cryptoApi entropy skein
-    tagged
+    base64Bytestring cereal cipherAes cprngAes cryptoApi cryptoRandom
+    entropy skein tagged
   ];
   testDepends = [ cereal hspec HUnit QuickCheck transformers ];
   meta = {

From 554b7cd63738903417f18b176e8daa19c1c9e43c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Sep 2013 13:20:16 +0200
Subject: [PATCH 250/452] haskell-cprng-aes: update to version 0.5.1

---
 .../libraries/haskell/cprng-aes/default.nix            | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/cprng-aes/default.nix b/pkgs/development/libraries/haskell/cprng-aes/default.nix
index 4f2aa58b7d2..fb6d2ff456b 100644
--- a/pkgs/development/libraries/haskell/cprng-aes/default.nix
+++ b/pkgs/development/libraries/haskell/cprng-aes/default.nix
@@ -1,12 +1,10 @@
-{ cabal, cipherAes, cryptoApi, cryptoRandomApi, entropy, random }:
+{ cabal, byteable, cipherAes, cryptoRandom, random }:
 
 cabal.mkDerivation (self: {
   pname = "cprng-aes";
-  version = "0.3.4";
-  sha256 = "0k1zh4nw30qgdrkgn6x6zfbpp129f9cparzyqsdqfbf44j0mf2rw";
-  buildDepends = [
-    cipherAes cryptoApi cryptoRandomApi entropy random
-  ];
+  version = "0.5.1";
+  sha256 = "1bw76y2krcshimvwzph76d69bdfaxfi21w4dxfslmqm78knlls47";
+  buildDepends = [ byteable cipherAes cryptoRandom random ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-cprng-aes";
     description = "Crypto Pseudo Random Number Generator using AES in counter mode";

From 0b2ed44968523a32732a3272e01e6a5123ecb5e6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Sep 2013 13:20:16 +0200
Subject: [PATCH 251/452] haskell-crypto-numbers: update to version 0.2.0

---
 .../libraries/haskell/crypto-numbers/default.nix     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/crypto-numbers/default.nix b/pkgs/development/libraries/haskell/crypto-numbers/default.nix
index af6985cd9ed..eba1b906d5b 100644
--- a/pkgs/development/libraries/haskell/crypto-numbers/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-numbers/default.nix
@@ -1,15 +1,15 @@
-{ cabal, cryptoRandomApi, HUnit, QuickCheck, testFramework
+{ cabal, byteable, cryptoRandom, HUnit, QuickCheck, testFramework
 , testFrameworkHunit, testFrameworkQuickcheck2, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "crypto-numbers";
-  version = "0.1.3";
-  sha256 = "115lgnay3ly5r53flh3v5jygqks0rg1i8qmbvrqf9nkmnmw6a5x1";
-  buildDepends = [ cryptoRandomApi vector ];
+  version = "0.2.0";
+  sha256 = "1s4q9qqb7qb0shaxmhhxixsnhgwn2h6nxxblkfqqqvkdiwis278j";
+  buildDepends = [ cryptoRandom vector ];
   testDepends = [
-    cryptoRandomApi HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 vector
+    byteable cryptoRandom HUnit QuickCheck testFramework
+    testFrameworkHunit testFrameworkQuickcheck2 vector
   ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-crypto-numbers";

From 78d9fb8da9ce505e56ad78b5d44690e20ee9704b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Sep 2013 13:20:16 +0200
Subject: [PATCH 252/452] haskell-crypto-pubkey: update to version 0.2.1

---
 .../libraries/haskell/crypto-pubkey/default.nix      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix
index 47e8dc179ae..a4f98e5a2a1 100644
--- a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix
@@ -1,17 +1,17 @@
-{ cabal, cryptohash, cryptoNumbers, cryptoPubkeyTypes
-, cryptoRandomApi, HUnit, QuickCheck, testFramework
+{ cabal, byteable, cryptohash, cryptoNumbers, cryptoPubkeyTypes
+, cryptoRandom, HUnit, QuickCheck, testFramework
 , testFrameworkHunit, testFrameworkQuickcheck2
 }:
 
 cabal.mkDerivation (self: {
   pname = "crypto-pubkey";
-  version = "0.1.4";
-  sha256 = "13ah3ip6gdv7b1zz5qwi7515a3k8pp3l0jr1kq4q2a0vqy24gkn1";
+  version = "0.2.1";
+  sha256 = "06cb2h9c3r1ycgcw7scc191gbr86qi8pxil07207n5fccq3vpjys";
   buildDepends = [
-    cryptohash cryptoNumbers cryptoPubkeyTypes cryptoRandomApi
+    byteable cryptohash cryptoNumbers cryptoPubkeyTypes cryptoRandom
   ];
   testDepends = [
-    cryptohash cryptoNumbers cryptoRandomApi HUnit QuickCheck
+    byteable cryptohash cryptoNumbers cryptoRandom HUnit QuickCheck
     testFramework testFrameworkHunit testFrameworkQuickcheck2
   ];
   meta = {

From 5b291905ee6d2f88d3a1d6182a3a67a13dcac587 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Sep 2013 13:20:16 +0200
Subject: [PATCH 253/452] haskell-cryptohash: update to version 0.10.0

---
 .../libraries/haskell/cryptohash/default.nix           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix
index 03fee5bac92..d598b363933 100644
--- a/pkgs/development/libraries/haskell/cryptohash/default.nix
+++ b/pkgs/development/libraries/haskell/cryptohash/default.nix
@@ -1,12 +1,12 @@
-{ cabal, byteable, cereal, cryptoApi, HUnit, QuickCheck, tagged
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
+{ cabal, byteable, HUnit, QuickCheck, testFramework
+, testFrameworkHunit, testFrameworkQuickcheck2
 }:
 
 cabal.mkDerivation (self: {
   pname = "cryptohash";
-  version = "0.9.1";
-  sha256 = "164j43dja91k2cssh0s2dw9riibijl02bap9mn8jn1h6vjb6w9z0";
-  buildDepends = [ byteable cereal cryptoApi tagged ];
+  version = "0.10.0";
+  sha256 = "0szvx1dxf16chlksmp08g9qxy7f87w6hspigwbw78aygc3q9mzaq";
+  buildDepends = [ byteable ];
   testDepends = [
     HUnit QuickCheck testFramework testFrameworkHunit
     testFrameworkQuickcheck2

From 97f3b6a38a3e45580f40fbc6d7a48bf520af7adf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Sep 2013 13:20:16 +0200
Subject: [PATCH 254/452] haskell-hakyll: update to version 4.3.3.0

---
 pkgs/development/libraries/haskell/hakyll/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index ba174c39367..a594ce87880 100644
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@@ -26,7 +26,9 @@ cabal.mkDerivation (self: {
     testFrameworkHunit testFrameworkQuickcheck2 text time
   ];
   doCheck = false;
-  jailbreak = true;
+  patchPhase = ''
+    sed -i -e 's|cryptohash.*,|cryptohash,|' hakyll.cabal
+  '';
   meta = {
     homepage = "http://jaspervdj.be/hakyll";
     description = "A static website compiler library";

From bd8c82b76dafbd000d4c2b41e0fcad1b9f1e98c3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Sep 2013 13:20:16 +0200
Subject: [PATCH 255/452] haskell-hoogle: update to version 4.2.21

---
 pkgs/development/libraries/haskell/hoogle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix
index 38ee62dd5af..887d53eca54 100644
--- a/pkgs/development/libraries/haskell/hoogle/default.nix
+++ b/pkgs/development/libraries/haskell/hoogle/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hoogle";
-  version = "4.2.20";
-  sha256 = "0sff230qc9lk3kqr9azg399fsaybwqpic9pj52jyw61ffasnl2dd";
+  version = "4.2.21";
+  sha256 = "167iw0rp37c1bixmaa5l06c943h33b457symllh8rcbmf880z09i";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 8b938477c2b57f354d6b2d04ae1fda5d2eb6a204 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Sep 2013 13:20:16 +0200
Subject: [PATCH 256/452] haskell-hspec-expectations: update to version 0.3.3

---
 .../libraries/haskell/hspec-expectations/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hspec-expectations/default.nix b/pkgs/development/libraries/haskell/hspec-expectations/default.nix
index 4aaa5fe5e95..789ff5d7b2a 100644
--- a/pkgs/development/libraries/haskell/hspec-expectations/default.nix
+++ b/pkgs/development/libraries/haskell/hspec-expectations/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hspec-expectations";
-  version = "0.3.2";
-  sha256 = "0962wlngqck0wc7mcby9bzci1s8d9a91vsm39rnab5wifhc2c6xi";
+  version = "0.3.3";
+  sha256 = "0sg7wkgr9qmwv0bki1q8wvl5jrlsvn0c7sd2qpqp3cccdhwj9c5k";
   buildDepends = [ HUnit ];
   testDepends = [ hspec HUnit markdownUnlit silently ];
   doCheck = false;

From a1bb7f96c748c0527d4a10837e1fb538a00f4676 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Sep 2013 13:20:17 +0200
Subject: [PATCH 257/452] haskell-hspec-meta: update to version 1.7.1

---
 pkgs/development/libraries/haskell/hspec-meta/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix
index 374dd9eaf67..ff6c0f204d7 100644
--- a/pkgs/development/libraries/haskell/hspec-meta/default.nix
+++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hspec-meta";
-  version = "1.7.0";
-  sha256 = "0a1s7pkymn41kk8gp5i7v141vq5yx857rma1l2xffs9lh4qalnq8";
+  version = "1.7.1";
+  sha256 = "08g327jnv7alamabxafhsv7ssisgymgsf91khr73zja5x8idfkxc";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From dd3531c2b5b92fb723348118eb89ff71800c92ab Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Sep 2013 13:20:17 +0200
Subject: [PATCH 258/452] haskell-hspec: update to version 1.7.1

---
 pkgs/development/libraries/haskell/hspec/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix
index d7925b41816..0c9783c9a9c 100644
--- a/pkgs/development/libraries/haskell/hspec/default.nix
+++ b/pkgs/development/libraries/haskell/hspec/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hspec";
-  version = "1.7.0";
-  sha256 = "0cw24vmns06z5308wva9bb5czs9i5wm6qdhymgiyl2i47ibxp5bj";
+  version = "1.7.1";
+  sha256 = "0fc8phc36876f8qydc5iwz3i7nri0n6b4dlxv0w4rcxgv9hp7ls0";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From c4e1f8ee8a2b9a8efd3c09ee4a3a7409ee4ed586 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Sep 2013 13:20:17 +0200
Subject: [PATCH 259/452] haskell-http-types: update to version 0.8.1

---
 pkgs/development/libraries/haskell/http-types/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix
index c4c064fbf81..b0b68eec434 100644
--- a/pkgs/development/libraries/haskell/http-types/default.nix
+++ b/pkgs/development/libraries/haskell/http-types/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-types";
-  version = "0.8.0";
-  sha256 = "14d1gzgwhinkwx3lmc6hvqj6ivjrvy4m6fm2walnyk1zv24zli75";
+  version = "0.8.1";
+  sha256 = "07hxxlhgnwsvjr2dzqbswwwkjxwsc0pk6shpkvzgclrsyn3xrg7p";
   buildDepends = [ blazeBuilder caseInsensitive text ];
   testDepends = [ blazeBuilder hspec QuickCheck text ];
   meta = {

From 970a2ade2e7a02945f8582eea0228274f7d3e58d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Sep 2013 13:20:17 +0200
Subject: [PATCH 260/452] haskell-miniutter: update to version 0.4.2

---
 pkgs/development/libraries/haskell/miniutter/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/miniutter/default.nix b/pkgs/development/libraries/haskell/miniutter/default.nix
index 22018087226..346e1c6a428 100644
--- a/pkgs/development/libraries/haskell/miniutter/default.nix
+++ b/pkgs/development/libraries/haskell/miniutter/default.nix
@@ -1,11 +1,12 @@
-{ cabal, HUnit, minimorph, testFramework, testFrameworkHunit, text
+{ cabal, binary, HUnit, minimorph, testFramework
+, testFrameworkHunit, text
 }:
 
 cabal.mkDerivation (self: {
   pname = "miniutter";
-  version = "0.4.0";
-  sha256 = "1l275aad8svrqp22jv9s0mmlam7wbdlf6m4m97658rm8ks4j2mbx";
-  buildDepends = [ minimorph text ];
+  version = "0.4.2";
+  sha256 = "00027aqxa0631v3n1jsv4aj9kf39s5yivi3dl573s5nj0wibj008";
+  buildDepends = [ binary minimorph text ];
   testDepends = [ HUnit testFramework testFrameworkHunit text ];
   meta = {
     homepage = "https://github.com/Mikolaj/miniutter";

From 0180e2aa0a4e8d3da0c10c310a00be3af1904563 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Sep 2013 13:20:17 +0200
Subject: [PATCH 261/452] haskell-monoid-extras: update to version 0.3.2.0

---
 .../libraries/haskell/monoid-extras/default.nix           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/monoid-extras/default.nix b/pkgs/development/libraries/haskell/monoid-extras/default.nix
index 2025ceaffe5..a9a2b07e81b 100644
--- a/pkgs/development/libraries/haskell/monoid-extras/default.nix
+++ b/pkgs/development/libraries/haskell/monoid-extras/default.nix
@@ -1,10 +1,10 @@
-{ cabal, semigroupoids, semigroups }:
+{ cabal, groupoids, groups, semigroupoids, semigroups }:
 
 cabal.mkDerivation (self: {
   pname = "monoid-extras";
-  version = "0.3.1.0";
-  sha256 = "0nxdkx0j67nb41ingp1yl0appfx64ikf5709f48469qbaf3pgax3";
-  buildDepends = [ semigroupoids semigroups ];
+  version = "0.3.2.0";
+  sha256 = "0yhb55v0a2221xbpbm8jiqzqvps0lab5n8iakpq69ndr2l0d2r3x";
+  buildDepends = [ groupoids groups semigroupoids semigroups ];
   meta = {
     description = "Various extra monoid-related definitions and utilities";
     license = self.stdenv.lib.licenses.bsd3;

From ae6d2c6721e0ea37c956c6ef6af500c5f8e55aa0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Sep 2013 13:20:17 +0200
Subject: [PATCH 262/452] haskell-multiarg: update to version 0.22.0.0

---
 pkgs/development/libraries/haskell/multiarg/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/multiarg/default.nix b/pkgs/development/libraries/haskell/multiarg/default.nix
index 77c81362d24..555435d3c58 100644
--- a/pkgs/development/libraries/haskell/multiarg/default.nix
+++ b/pkgs/development/libraries/haskell/multiarg/default.nix
@@ -1,10 +1,10 @@
-{ cabal, explicitException, utf8String }:
+{ cabal, utf8String }:
 
 cabal.mkDerivation (self: {
   pname = "multiarg";
-  version = "0.18.0.0";
-  sha256 = "1wgnpsnzjsspjvg5srjrzr4mqxhyisidkjj26cangxlhmb88rlwi";
-  buildDepends = [ explicitException utf8String ];
+  version = "0.22.0.0";
+  sha256 = "1fswkgrn8mc92lrzmrxhv6hbgch2lqdvmjn88k4ajqc0gpmpb750";
+  buildDepends = [ utf8String ];
   meta = {
     homepage = "https://github.com/massysett/multiarg";
     description = "Combinators to build command line parsers";

From f35773bbdb25680a2d8b3bcaa49f71774762c668 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Sep 2013 13:20:17 +0200
Subject: [PATCH 263/452] haskell-network-conduit-tls: update to version
 1.0.1.1

---
 .../haskell/network-conduit-tls/default.nix        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
index 2b1a5694044..bfb96e30480 100644
--- a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
+++ b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
@@ -1,15 +1,15 @@
-{ cabal, aeson, certificate, conduit, cryptoApi, cryptoRandomApi
-, network, networkConduit, pem, systemFileio, systemFilepath, tls
-, tlsExtra, transformers
+{ cabal, aeson, certificate, conduit, cprngAes, cryptoApi
+, cryptoRandomApi, network, networkConduit, pem, systemFileio
+, systemFilepath, tls, tlsExtra, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "network-conduit-tls";
-  version = "1.0.1";
-  sha256 = "0h2svqllm85vambssq0j4ghx2b44cjg0kj04bamp72ly22mcg9d6";
+  version = "1.0.1.1";
+  sha256 = "0v5rspcjhd2vid5i74dy1sdcvci7dlr88sgr0v9vjp4gcyb29qlj";
   buildDepends = [
-    aeson certificate conduit cryptoApi cryptoRandomApi network
-    networkConduit pem systemFileio systemFilepath tls tlsExtra
+    aeson certificate conduit cprngAes cryptoApi cryptoRandomApi
+    network networkConduit pem systemFileio systemFilepath tls tlsExtra
     transformers
   ];
   meta = {

From 9704435606992f3fc191d51991e7eaa3c3ec5803 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Sep 2013 13:20:17 +0200
Subject: [PATCH 264/452] haskell-network-multicast: update to version 0.0.10

---
 .../libraries/haskell/network-multicast/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/network-multicast/default.nix b/pkgs/development/libraries/haskell/network-multicast/default.nix
index 59a0d77d67c..3a9531488bb 100644
--- a/pkgs/development/libraries/haskell/network-multicast/default.nix
+++ b/pkgs/development/libraries/haskell/network-multicast/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "network-multicast";
-  version = "0.0.8";
-  sha256 = "0jsbp8z2a69x5h6dc3b16wdxs0shv6438mnf5mg0jxq7xddbhph8";
+  version = "0.0.10";
+  sha256 = "092v4ba6mrl5ykx2fscclcsc5dbnq99hbn93sc2mjnnr8c9r0n5x";
   buildDepends = [ network ];
   meta = {
     description = "Simple multicast library";

From 1cc8009006e8bf60275d1c4c32d528700356051b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Sep 2013 13:20:17 +0200
Subject: [PATCH 265/452] haskell-snap-core: update to version 0.9.4.1

---
 pkgs/development/libraries/haskell/snap/core.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix
index f2440ef250f..52da653da3e 100644
--- a/pkgs/development/libraries/haskell/snap/core.nix
+++ b/pkgs/development/libraries/haskell/snap/core.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "snap-core";
-  version = "0.9.4.0";
-  sha256 = "08afaj4ln4nl7ymdixijzjx8hc7nnr70gz7avpzaanq5nrw0k054";
+  version = "0.9.4.1";
+  sha256 = "0yacbpd20y49jw1qkrm5r4qick0fhimgb07883bg1lp3ai4ysrk5";
   buildDepends = [
     attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator
     bytestringMmap caseInsensitive deepseq enumerator filepath hashable

From cb9ac73fba5c6e5541d1874a172a12c404375053 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Sep 2013 13:20:17 +0200
Subject: [PATCH 266/452] haskell-snap-server: update to version 0.9.3.4

---
 pkgs/development/libraries/haskell/snap/server.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix
index c11dfe4f398..7bf332811a9 100644
--- a/pkgs/development/libraries/haskell/snap/server.nix
+++ b/pkgs/development/libraries/haskell/snap/server.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "snap-server";
-  version = "0.9.3.3";
-  sha256 = "1n50xyhg4rva7ifv70825177606q87ip7f9p5kf94i9kci0kmlig";
+  version = "0.9.3.4";
+  sha256 = "0i95gf7wpf0gyns4rnl1wp2f53cwfmjg0qb8jxpynwklvsm6zf88";
   buildDepends = [
     attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator
     caseInsensitive enumerator MonadCatchIOTransformers mtl network

From 7e63d2825c345631ccff6d6b63b22918a1652ca3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Sep 2013 13:20:18 +0200
Subject: [PATCH 267/452] haskell-tasty: update to version 0.3

---
 pkgs/development/libraries/haskell/tasty/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix
index b9f403bcc3d..37030681e34 100644
--- a/pkgs/development/libraries/haskell/tasty/default.nix
+++ b/pkgs/development/libraries/haskell/tasty/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tasty";
-  version = "0.2";
-  sha256 = "1shd4bl0wb67abs7vv3cagvpinkz2348fh7fdh3rq8l5g1jflp8q";
+  version = "0.3";
+  sha256 = "0sgc0529sqhj0b75a4mkdw0bkx56ynyl4msmi8hd20jvv5wnzyi6";
   buildDepends = [
     ansiTerminal mtl optparseApplicative regexPosix stm tagged
   ];

From 456dd7d5c4fa77b75929ceda55da38ef278fb328 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Sep 2013 13:20:18 +0200
Subject: [PATCH 268/452] haskell-tls-extra: update to version 0.6.5

---
 pkgs/development/libraries/haskell/tls-extra/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix
index 55b2582017c..8c2a50255b1 100644
--- a/pkgs/development/libraries/haskell/tls-extra/default.nix
+++ b/pkgs/development/libraries/haskell/tls-extra/default.nix
@@ -1,17 +1,16 @@
 { cabal, certificate, cipherAes, cipherRc4, cryptohash
-, cryptoPubkey, cryptoRandomApi, mtl, network, pem, text, time, tls
-, vector
+, cryptoPubkey, cryptoRandom, mtl, network, pem, time, tls, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "tls-extra";
-  version = "0.6.4";
-  sha256 = "058ia1cabs7ribz287iqkkjvqpp2n7c219f3xc92fhm0qq00mh5n";
+  version = "0.6.5";
+  sha256 = "09b8wxg4k88gdzpbxhd2apf0x5y51zh2zbw2cvraffjnnfkgvzqc";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     certificate cipherAes cipherRc4 cryptohash cryptoPubkey
-    cryptoRandomApi mtl network pem text time tls vector
+    cryptoRandom mtl network pem time tls vector
   ];
   jailbreak = true;
   meta = {

From 507c93f4d28e10af918873316a851b2f0b9978ca Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Sep 2013 13:20:18 +0200
Subject: [PATCH 269/452] haskell-tls: update to version 1.1.4

---
 pkgs/development/libraries/haskell/tls/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix
index 72e0976ceaf..56999914989 100644
--- a/pkgs/development/libraries/haskell/tls/default.nix
+++ b/pkgs/development/libraries/haskell/tls/default.nix
@@ -1,18 +1,17 @@
 { cabal, cereal, certificate, cprngAes, cryptohash, cryptoPubkey
-, cryptoRandomApi, mtl, network, QuickCheck, testFramework
+, cryptoRandom, mtl, network, QuickCheck, testFramework
 , testFrameworkQuickcheck2, time
 }:
 
 cabal.mkDerivation (self: {
   pname = "tls";
-  version = "1.1.2";
-  sha256 = "1vg1mnz6cxxgs48pbpjp4hwyvsysxyzvjfy4p1vd23lwc32cdjqg";
+  version = "1.1.4";
+  sha256 = "0fq6hnc3j54kkzlvcvhskjrj740p44y65fggnj3m4kgfiwjphw5p";
   buildDepends = [
-    cereal certificate cryptohash cryptoPubkey cryptoRandomApi mtl
-    network
+    cereal certificate cryptohash cryptoPubkey cryptoRandom mtl network
   ];
   testDepends = [
-    cereal certificate cprngAes cryptoPubkey cryptoRandomApi mtl
+    cereal certificate cprngAes cryptoPubkey cryptoRandom mtl
     QuickCheck testFramework testFrameworkQuickcheck2 time
   ];
   doCheck = false;

From 91a8bfa5b2a75019260c40a73b9bee7a5f0ca68f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Sep 2013 13:20:18 +0200
Subject: [PATCH 270/452] haskell-uuid: update to version 1.2.14

---
 pkgs/development/libraries/haskell/uuid/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/uuid/default.nix b/pkgs/development/libraries/haskell/uuid/default.nix
index 2aa30d8823e..65115ef9a98 100644
--- a/pkgs/development/libraries/haskell/uuid/default.nix
+++ b/pkgs/development/libraries/haskell/uuid/default.nix
@@ -1,14 +1,16 @@
 { cabal, binary, criterion, cryptohash, deepseq, HUnit, maccatcher
-, mersenneRandomPure64, QuickCheck, random, time
+, mersenneRandomPure64, QuickCheck, random, testFramework
+, testFrameworkHunit, testFrameworkQuickcheck2, time
 }:
 
 cabal.mkDerivation (self: {
   pname = "uuid";
-  version = "1.2.13";
-  sha256 = "0y9r71iqvabmvyrglw42g37skgisyknkv3pkfih2qfrfkk75zw0s";
+  version = "1.2.14";
+  sha256 = "13r2yzhb9nj1h6wfy7w9k59d27z9iza5r4apmf72zby2fi9vdnwy";
   buildDepends = [ binary cryptohash maccatcher random time ];
   testDepends = [
     criterion deepseq HUnit mersenneRandomPure64 QuickCheck random
+    testFramework testFrameworkHunit testFrameworkQuickcheck2
   ];
   doCheck = false;
   meta = {

From d234ce0cdfe3fd6372c779d230056c5494abd760 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Sep 2013 13:20:18 +0200
Subject: [PATCH 271/452] haskell-vault: update to version 0.3.0.0

---
 pkgs/development/libraries/haskell/vault/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/vault/default.nix b/pkgs/development/libraries/haskell/vault/default.nix
index 6039e742477..f73633b4f24 100644
--- a/pkgs/development/libraries/haskell/vault/default.nix
+++ b/pkgs/development/libraries/haskell/vault/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "vault";
-  version = "0.2.0.4";
-  sha256 = "1a63rarksp4waj64b9kv8q77wbhdnsnxahkixl1klp25hkp8aan3";
+  version = "0.3.0.0";
+  sha256 = "1lvv2sw5j48jbxniw55bxq88dhn46l7lk0blv2cnaf1vw6wms4m8";
   buildDepends = [ hashable unorderedContainers ];
   meta = {
     homepage = "https://github.com/HeinrichApfelmus/vault";

From 5b17392e742c8a5450682cda43bba6481113a489 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Sep 2013 13:20:18 +0200
Subject: [PATCH 272/452] haskell-wai-app-static: update to version 1.3.1.4

---
 .../libraries/haskell/wai-app-static/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix
index 74ec00c58fd..ec0612ae117 100644
--- a/pkgs/development/libraries/haskell/wai-app-static/default.nix
+++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix
@@ -1,17 +1,19 @@
 { cabal, base64Bytestring, blazeBuilder, blazeHtml, blazeMarkup
-, cereal, cryptoConduit, cryptohash, fileEmbed, hspec, httpDate
-, httpTypes, mimeTypes, network, systemFileio, systemFilepath, text
-, time, transformers, unixCompat, wai, waiTest
+, cereal, cryptoApi, cryptoConduit, cryptohashCryptoapi, fileEmbed
+, hspec, httpDate, httpTypes, mimeTypes, network, systemFileio
+, systemFilepath, text, time, transformers, unixCompat, wai
+, waiTest
 }:
 
 cabal.mkDerivation (self: {
   pname = "wai-app-static";
-  version = "1.3.1.3";
-  sha256 = "0h6m1an3srkvyaz50w16v2mhjyfdqbqq2d7ng3yhrrmb1fyvhas1";
+  version = "1.3.1.4";
+  sha256 = "1457643xkigqnacg1fw25jp9kjqiy55d22ll8fml07bxs37hlr63";
   buildDepends = [
     base64Bytestring blazeBuilder blazeHtml blazeMarkup cereal
-    cryptoConduit cryptohash fileEmbed httpDate httpTypes mimeTypes
-    systemFileio systemFilepath text time transformers unixCompat wai
+    cryptoApi cryptoConduit cryptohashCryptoapi fileEmbed httpDate
+    httpTypes mimeTypes systemFileio systemFilepath text time
+    transformers unixCompat wai
   ];
   testDepends = [
     hspec httpDate httpTypes mimeTypes network text time transformers

From d59d296293c938c74d08ad2977915994a0a0593b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Sep 2013 13:20:18 +0200
Subject: [PATCH 273/452] haskell-wai-extra: update to version 1.3.4.4

---
 pkgs/development/libraries/haskell/wai-extra/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix
index 270ca004c49..917000364c3 100644
--- a/pkgs/development/libraries/haskell/wai-extra/default.nix
+++ b/pkgs/development/libraries/haskell/wai-extra/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-extra";
-  version = "1.3.4.3";
-  sha256 = "19vj47awkazn6h4kf37f4sp4g8lhm125wjqnp1wa1wa8zlndp8wy";
+  version = "1.3.4.4";
+  sha256 = "0x7nm3vrp1jhcdvcspdpgpgm12rcafng81f9kq9c01z5270myg2f";
   buildDepends = [
     ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit
     caseInsensitive conduit dataDefault dateCache fastLogger httpTypes

From 082cc0c62b46eb6d16f28ea675db1788cb666dcc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Sep 2013 13:20:19 +0200
Subject: [PATCH 274/452] haskell-wai: update to version 1.4.0.2

---
 pkgs/development/libraries/haskell/wai/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix
index 9b3b1083bc0..425d5237a71 100644
--- a/pkgs/development/libraries/haskell/wai/default.nix
+++ b/pkgs/development/libraries/haskell/wai/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai";
-  version = "1.4.0.1";
-  sha256 = "1d08mp7dpf8iw50yjysr5p7fc9jgdcwql943p9c11x35n2ks6z2n";
+  version = "1.4.0.2";
+  sha256 = "0mmnl2zn3jsa5yan58kf2d7cvc343cld0l8mydb9qnq4if2kq94q";
   buildDepends = [
     blazeBuilder conduit httpTypes network text transformers vault
   ];

From 835526e28e6174f30b47acea73edb0be8d3c7837 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Sep 2013 13:20:19 +0200
Subject: [PATCH 275/452] haskell-warp-tls: update to version 1.4.1.4

---
 pkgs/development/libraries/haskell/warp-tls/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/warp-tls/default.nix b/pkgs/development/libraries/haskell/warp-tls/default.nix
index 5655ed9d8a1..dd1404e02fd 100644
--- a/pkgs/development/libraries/haskell/warp-tls/default.nix
+++ b/pkgs/development/libraries/haskell/warp-tls/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "warp-tls";
-  version = "1.4.1.3";
-  sha256 = "0g26cw86kjg61agplqskhjb41ywcydyfzb46pjjc38g77xlcm2wx";
+  version = "1.4.1.4";
+  sha256 = "1w6i26r5xjjc594h53q07bad835ryg3k6vmbzf5d59xngfvm7b9k";
   buildDepends = [
     certificate conduit cprngAes cryptocipher cryptoRandomApi network
     networkConduit pem tls tlsExtra transformers wai warp

From 065dddbbd3b8e03d1543acd969ecd39de4340b62 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Sep 2013 13:20:19 +0200
Subject: [PATCH 276/452] haskell-warp: update to version 1.3.9.2

---
 pkgs/development/libraries/haskell/warp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
index 2134077e61a..c96e7bfd738 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "1.3.9.1";
-  sha256 = "0s8jrgn9pxqkjvdbgvrxd0bnclkhn3hix2mff66hqpx8x4znh0zv";
+  version = "1.3.9.2";
+  sha256 = "0l4iq7dl7iv9sf0bj52g577x9i84miscfr27b2vm8g8n6306jr77";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
     httpAttoparsec httpTypes liftedBase network networkConduit

From fa5d1b958f7c52e8bda9e4591c2769456f7b694f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Sep 2013 13:20:19 +0200
Subject: [PATCH 277/452] haskell-yesod-static: update to version 1.2.0.1

---
 .../libraries/haskell/yesod-static/default.nix         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix
index d341434345b..c4aba1ddfeb 100644
--- a/pkgs/development/libraries/haskell/yesod-static/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-static/default.nix
@@ -1,21 +1,21 @@
 { cabal, base64Bytestring, cereal, conduit, cryptoConduit
-, cryptohash, dataDefault, fileEmbed, hspec, httpTypes
+, cryptohashCryptoapi, dataDefault, fileEmbed, hspec, httpTypes
 , shakespeareCss, systemFileio, systemFilepath, text, transformers
 , unixCompat, wai, waiAppStatic, yesodCore
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-static";
-  version = "1.2.0";
-  sha256 = "18fkphk8qzshm5r0ivdvllmbmvl5q6m84zsf1g0fmridqz2xywjz";
+  version = "1.2.0.1";
+  sha256 = "1ij0j1m9j6l63rl4zdfik36a3sb3k0zpqjg85sgis6wdqr18gsi5";
   buildDepends = [
-    base64Bytestring cereal conduit cryptoConduit cryptohash
+    base64Bytestring cereal conduit cryptoConduit cryptohashCryptoapi
     dataDefault fileEmbed httpTypes shakespeareCss systemFileio
     systemFilepath text transformers unixCompat wai waiAppStatic
     yesodCore
   ];
   testDepends = [
-    base64Bytestring cereal conduit cryptoConduit cryptohash
+    base64Bytestring cereal conduit cryptoConduit cryptohashCryptoapi
     dataDefault fileEmbed hspec httpTypes shakespeareCss systemFileio
     systemFilepath text transformers unixCompat wai waiAppStatic
     yesodCore

From 3031968b0c9da8517b9e3acf9b9c520e4d08f5ee Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Sep 2013 13:20:19 +0200
Subject: [PATCH 278/452] haskell-timeplot: re-generate with cabal2nix

---
 pkgs/development/tools/haskell/timeplot/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/haskell/timeplot/default.nix b/pkgs/development/tools/haskell/timeplot/default.nix
index fd5f868d5bb..71a0835713c 100644
--- a/pkgs/development/tools/haskell/timeplot/default.nix
+++ b/pkgs/development/tools/haskell/timeplot/default.nix
@@ -1,5 +1,5 @@
 { cabal, bytestringLexing, cairo, Chart, ChartCairo, colour
-, dataDefault, regexTdfa, strptime, time, transformers
+, dataDefault, lens, regexTdfa, strptime, time, transformers
 , vcsRevision
 }:
 
@@ -10,9 +10,8 @@ cabal.mkDerivation (self: {
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-    bytestringLexing cairo Chart ChartCairo colour
-    dataDefault regexTdfa strptime time transformers
-    vcsRevision
+    bytestringLexing cairo Chart ChartCairo colour dataDefault lens
+    regexTdfa strptime time transformers vcsRevision
   ];
   meta = {
     homepage = "http://haskell.org/haskellwiki/Timeplot";

From 83c734cf38fcfd0583bce6ab6dbc6e67d5a12674 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 2 Sep 2013 17:14:49 +0200
Subject: [PATCH 279/452] ghostscript: maintenance update

---
 pkgs/misc/ghostscript/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 64cd8b9f6ac..ba136530593 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -41,10 +41,10 @@ let
   };
 
   mainlineSrc = rec {
-    name = "ghostscript-9.09";
+    name = "ghostscript-9.10";
     src = fetchurl {
       url = "http://downloads.ghostscript.com/public/${name}.tar.bz2";
-      sha256 = "1xwn4zlfb9jz0vrda0vd42qwfqddiav7rdkga0q94jc2q1qddzx6";
+      sha256 = "106mglk77dhdra1m0ddnmaq645xj1aj45qvlh8izv3xx4cdrv3bc";
     };
     meta = meta_common // {
       homepage = "http://www.ghostscript.com/";

From 2ff0b8dc149cb8ffbf14a1a05f0c85ae8d071b3f Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@onlinetouch.nl>
Date: Mon, 2 Sep 2013 18:48:29 +0200
Subject: [PATCH 280/452] I henceforth will maintain as my Github username.

---
 pkgs/lib/maintainers.nix                 | 2 +-
 pkgs/servers/computing/storm/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix
index fa1cbe94799..1b7d8a8e222 100644
--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@@ -17,7 +17,6 @@
   bjornfor = "Bjørn Forsman <bjorn.forsman@gmail.com>";
   bluescreen303 = "Mathijs Kwik <mathijs@bluescreen303.nl>";
   bodil = "Bodil Stokke <nix@bodil.org>";
-  blue = "Danny Wilson <danny@prime.vc>";
   chaoflow = "Florian Friesdorf <flo@chaoflow.net>";
   coconnor = "Corey O'Connor <coreyoconnor@gmail.com>";
   eelco = "Eelco Dolstra <eelco.dolstra@logicblox.com>";
@@ -54,6 +53,7 @@
   urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>";
   vcunat = "Vladimír Čunát <vcunat@gmail.com>";
   viric = "Lluís Batlle i Rossell <viric@viric.name>";
+  vizanto = "Danny Wilson <danny@prime.vc>";
   winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>";
   z77z = "Marco Maggesi <maggesi@math.unifi.it>";
 }
diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix
index 2b7efff5210..4fddeef643f 100644
--- a/pkgs/servers/computing/storm/default.nix
+++ b/pkgs/servers/computing/storm/default.nix
@@ -44,6 +44,6 @@ stdenv.mkDerivation {
     homepage = "http://storm-project.net";
     description = "Storm, free and open source distributed realtime computation system.";
     license = "Eclipse Public License 1.0";
-    maintainers = [ lib.maintainers.blue ];
+    maintainers = [ lib.maintainers.vizanto ];
   };
 }

From 3f3a7e9e435b735804cb5bf0a6842ce28f440fe5 Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@onlinetouch.nl>
Date: Mon, 2 Sep 2013 18:50:49 +0200
Subject: [PATCH 281/452] Yes.

---
 pkgs/development/libraries/java/jzmq/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/java/jzmq/default.nix b/pkgs/development/libraries/java/jzmq/default.nix
index 6208090ad51..508b188aef7 100644
--- a/pkgs/development/libraries/java/jzmq/default.nix
+++ b/pkgs/development/libraries/java/jzmq/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   '';
 
 
-  maintainers = [ stdenv.lib.maintainers.blue ];
+  maintainers = [ stdenv.lib.maintainers.vizanto ];
   meta = {
     homepage = "http://www.zeromq.org";
     description = "Java bindings for ZeroMQ";

From 691d143b290c2acc016cb8459b39c845e568f4e6 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 2 Sep 2013 20:26:25 +0200
Subject: [PATCH 282/452] Update sublime text to 2.0.2

---
 pkgs/applications/editors/sublime/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/sublime/default.nix b/pkgs/applications/editors/sublime/default.nix
index 22fc42c6c59..6aa0b34314a 100644
--- a/pkgs/applications/editors/sublime/default.nix
+++ b/pkgs/applications/editors/sublime/default.nix
@@ -5,19 +5,19 @@ in
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
 
 stdenv.mkDerivation rec {
-  name = "sublimetext-2.0.1";
+  name = "sublimetext-2.0.2";
   src = 
     if stdenv.system == "i686-linux" then
       fetchurl {
-        name = "sublimetext-2.0.1.tar.bz2";
-        url = http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.1.tar.bz2;
-        sha256 = "1x6vmlfn5mdbf23nyfr7dhhi6y60lnpcmqj59svl3bzvayijsxaf";
+        name = "sublimetext-2.0.2.tar.bz2";
+        url = http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.2.tar.bz2;
+        sha256 = "026g5mppk28lzzzn9ibykcqkrd5msfmg0sc0z8w8jd7v3h28wcq7";
       }
     else
       fetchurl {
-        name = "sublimetext-2.0.1.tar.bz2";
-        url = http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.1%20x64.tar.bz2;
-        sha256 = "0174dnp9zika5as25mcls5y0qzhh8mnc5ajxsxz7qjrk4lrzk3c5";
+        name = "sublimetext-2.0.2.tar.bz2";
+        url = http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.2%20x64.tar.bz2;
+        sha256 = "115b71nbv9mv8cz6bkjwpbdf2ywnjc1zy2d3080f6ck4sqqfvfh1";
       };
   buildCommand = ''
     tar xvf ${src}

From c8b246bda19e364e6b9f7ea3d581fcdf6269f11a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Sep 2013 21:28:32 +0200
Subject: [PATCH 283/452] haskell-hoogle: re-enable the test suite

---
 pkgs/development/libraries/haskell/hoogle/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix
index 887d53eca54..c0b05ea82e0 100644
--- a/pkgs/development/libraries/haskell/hoogle/default.nix
+++ b/pkgs/development/libraries/haskell/hoogle/default.nix
@@ -19,7 +19,6 @@ cabal.mkDerivation (self: {
   testDepends = [
     conduit hspec hspecExpectations HUnit systemFileio transformers
   ];
-  doCheck = false;
   meta = {
     homepage = "http://www.haskell.org/hoogle/";
     description = "Haskell API Search";

From bb440b3612bd228e8bc8f2a32b4d840a7e714be2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 2 Sep 2013 21:57:08 +0200
Subject: [PATCH 284/452] meld: set meta.platforms attribute

This makes Hydra build it and makes it available in the binary channel.
---
 pkgs/applications/version-management/meld/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index 9c547b2193d..73b21728e16 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -24,9 +24,10 @@ stdenv.mkDerivation {
     wrapProgram $out/bin/meld --prefix PYTHONPATH : $PYTHONPATH:${pygtk}/lib/${python.libPrefix}/site-packages/gtk-2.0
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Visual diff and merge tool";
     homepage = http://meld.sourceforge.net;
     license = "GPLv2+";
+    platforms = platforms.linux;
   };
 }

From ddd1f7b52b1ee8eeb3dd9427aa814e0e1615dbba Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Mon, 2 Sep 2013 23:50:19 +0300
Subject: [PATCH 285/452] Get rid of old rake derivation that doesn't build

---
 .../development/ruby-modules/rake/default.nix | 22 -------------------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 pkgs/development/ruby-modules/rake/default.nix

diff --git a/pkgs/development/ruby-modules/rake/default.nix b/pkgs/development/ruby-modules/rake/default.nix
deleted file mode 100644
index e1cec53aaa0..00000000000
--- a/pkgs/development/ruby-modules/rake/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{stdenv, fetchurl, ruby}:
-
-stdenv.mkDerivation {
-  name = "rake-0.8.1";
-  src = fetchurl {
-    url = "http://rubyforge.org/frs/download.php/29752/rake-0.8.1.tgz";
-    sha256 = "1kggvkkj609hj1xvpadzchki66i7ynz3qq4nc2hmfkf536fx8c03";
-  };
-  buildInputs = [ruby];
-  patchPhase = ''
-    sed -i install.rb \
-        -e 's/$bindir  = destdir + $bindir/prefix = CONFIG["prefix"];$bindir = $bindir.slice(prefix.length..$bindir.length);$bindir = destdir + $bindir/' \
-        -e 's/$sitedir = destdir + $sitedir/$sitedir = $sitedir.slice(prefix.length..$sitedir.length);$sitedir = destdir + $sitedir/'
-  '';
-  buildPhase = "true";
-  installPhase = ''
-    mkdir -p $out/lib
-    mkdir -p $out/bin
-    export DESTDIR=$out
-    ruby install.rb
-  '';
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a0d79b1aefa..999265a1249 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3206,7 +3206,7 @@ let
 
   rubyLibs = recurseIntoAttrs (callPackage ../development/interpreters/ruby/libs.nix { });
 
-  rake = callPackage ../development/ruby-modules/rake { };
+  rake = rubyLibs.rake;
 
   rubySqlite3 = callPackage ../development/ruby-modules/sqlite3 { };
 

From a1bb7c1cfa3553af8477c849b59f83981b952a38 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 3 Sep 2013 01:49:08 +0000
Subject: [PATCH 286/452] scrypt: New package

---
 pkgs/tools/security/scrypt/default.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/tools/security/scrypt/default.nix

diff --git a/pkgs/tools/security/scrypt/default.nix b/pkgs/tools/security/scrypt/default.nix
new file mode 100644
index 00000000000..ca2c9f43dfc
--- /dev/null
+++ b/pkgs/tools/security/scrypt/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, openssl }:
+
+stdenv.mkDerivation rec {
+  name = "scrypt-${version}";
+  version = "1.1.6";
+
+  src = fetchurl {
+    url = "https://www.tarsnap.com/scrypt/scrypt-1.1.6.tgz";
+    sha256 = "dfd0d1a544439265bbb9b58043ad3c8ce50a3987b44a61b1d39fd7a3ed5b7fb8";
+  };
+
+  buildInputs = [ openssl ];
+
+  meta = {
+    description = "The scrypt encryption utility";
+    homepage = https://www.tarsnap.com/scrypt.html;
+    license = "BSD";
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 999265a1249..fd98f5421b9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1680,6 +1680,8 @@ let
 
   scrot = callPackage ../tools/graphics/scrot { };
 
+  scrypt = callPackage ../tools/security/scrypt { };
+
   sdcv = callPackage ../applications/misc/sdcv { };
 
   seccure = callPackage ../tools/security/seccure/0.4.nix { };

From d5881add32601e63e3804ace11ce17e721980ea4 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 2 Sep 2013 09:04:32 +0200
Subject: [PATCH 287/452] libreoffice: Put .desktop-files in correct place

---
 pkgs/applications/office/libreoffice/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 9bda7b4f835..e07fe69b70c 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -184,11 +184,17 @@ stdenv.mkDerivation rec {
 
   # It installs only things to $out/lib/libreoffice
   postInstall = ''
-    mkdir -p $out/bin
+    mkdir -p $out/bin $out/share
     for a in sbase scalc sdraw smath swriter spadmin simpress soffice; do
       ln -s $out/lib/libreoffice/program/$a $out/bin/$a
     done
     ln -s $out/bin/soffice $out/bin/libreoffice
+
+    ln -s $out/lib/libreoffice/share/xdg $out/share/applications
+    for f in $out/share/applications/*.desktop; do
+      substituteInPlace "$f" --replace "Exec=libreoffice4.0" "$out/bin/soffice"
+      substituteInPlace "$f" --replace "Exec=libreoffice" "$out/bin/soffice"
+    done
   '';
 
   configureFlags = [

From 95b44f1adc7f77d7f7b2350751bfe85c7947bac8 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Tue, 3 Sep 2013 09:57:11 +0000
Subject: [PATCH 288/452] Update some perl packages

---
 pkgs/top-level/perl-packages.nix | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 0d4d7b82ce3..d75346e41ea 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3164,10 +3164,10 @@ rec {
   };
 
   FileChangeNotify = buildPerlModule rec {
-    name = "File-ChangeNotify-0.20";
+    name = "File-ChangeNotify-0.23";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/File/${name}.tar.gz";
-      sha256 = "000aiiijf16j5cf8gql4vr6l9y561famkfb5qv5d29xz2ad4mmd9";
+      url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
+      sha256 = "18aq6lcldniciw189ihmcji98y6zqa1gdl3mjqdg8f37i9amn4i3";
     };
     buildInputs = [ TestException ];
     propagatedBuildInputs =
@@ -3231,10 +3231,10 @@ rec {
   };
 
   FileFindRule = buildPerlPackage rec {
-    name = "File-Find-Rule-0.32";
+    name = "File-Find-Rule-0.33";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/File/${name}.tar.gz";
-      sha256 = "0fdci3k9j8x69p28jb793gni4y9qbgzpfnnj1avzf8nnib9w1wrd";
+      url = "mirror://cpan/authors/id/R/RC/RCLAMP/${name}.tar.gz";
+      sha256 = "0w73b4jr2fcrd74a1w3b2jryq3mqzc8z5mk7ia9p85xn3qmpa5r4";
     };
     propagatedBuildInputs = [ NumberCompare TextGlob ];
   };
@@ -3895,7 +3895,7 @@ rec {
   HTTPParserXS = buildPerlPackage rec {
     name = "HTTP-Parser-XS-0.14";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/HTTP/${name}.tar.gz";
+      url = "mirror://cpan/authors/id/K/KA/KAZUHO/${name}.tar.gz";
       sha256 = "06srbjc380kvvj76r8n5c2y282j5zfgn0s0zmb9h3shwrynfqj05";
     };
     buildInputs = [ TestMore ];
@@ -4319,7 +4319,7 @@ rec {
   LinguaENInflectPhrase = buildPerlPackage rec {
     name = "Lingua-EN-Inflect-Phrase-0.10";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/Lingua/${name}.tar.gz";
+      url = "mirror://cpan/authors/id/R/RK/RKITOVER/${name}.tar.gz";
       sha256 = "1l7sjnibnvgb7a73cjhysmrg4j2bfcn0x5yrqmh0v23laj9fsbbm";
     };
     buildInputs = [ TestMore ];
@@ -7935,7 +7935,7 @@ rec {
   TestSharedFork = buildPerlPackage rec {
     name = "Test-SharedFork-0.18";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz";
+      url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/${name}.tar.gz";
       sha256 = "1wc41jzi780w75m2ry1038mzxyz7386r8rmhbnmj3krcdxy676cc";
     };
   };
@@ -8876,10 +8876,10 @@ rec {
   };
 
   YAMLTiny = buildPerlPackage rec {
-    name = "YAML-Tiny-1.50";
+    name = "YAML-Tiny-1.53";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/YAML/${name}.tar.gz";
-      sha256 = "0ag1llgf0qn3sxy832xhvc1mq6s0bdv13ij7vh7df8nv0jnxyyd3";
+      url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
+      sha256 = "14p93i60x394ba6sdwpnckmv2vq7pfi9q7rzksp3nkxsz4484qmm";
     };
   };
 

From 1fb3110b84f5c016c87ae91e5d129bc688d77d94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 3 Sep 2013 22:08:59 +0200
Subject: [PATCH 289/452] libffi: produce portable library, enable doCheck

Thanks to #907.
---
 pkgs/development/libraries/libffi/default.nix | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix
index 27c3e9f66f3..f8ca40168ef 100644
--- a/pkgs/development/libraries/libffi/default.nix
+++ b/pkgs/development/libraries/libffi/default.nix
@@ -1,6 +1,6 @@
-{ fetchurl, stdenv }:
+{ fetchurl, stdenv, dejagnu }:
 
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
   name = "libffi-3.0.13";
 
   src = fetchurl {
@@ -8,15 +8,21 @@ stdenv.mkDerivation (rec {
     sha256 = "077ibkf84bvcd6rw1m6jb107br63i2pp301rkmsbgg6300adxp8x";
   };
 
+  buildInputs = stdenv.lib.optional doCheck dejagnu;
+
+  configureFlags = [ "--with-gcc-arch=generic" ]; # no detection of -march= or -mtune=
+
   doCheck = true;
 
+  dontStrip = stdenv ? cross; # Don't run the native `strip' when cross-compiling.
+
   postInstall =
     # Install headers in the right place.
-    '' ln -sv "$out/lib/"libffi*/include "$out/include"
+    '' ln -srv "$out/lib/"libffi*/include "$out/include"
     '';
 
   meta = {
-    description = "libffi, a foreign function call interface library";
+    description = "A foreign function call interface library";
 
     longDescription = ''
       The libffi library provides a portable, high level programming
@@ -33,7 +39,7 @@ stdenv.mkDerivation (rec {
       conversions for values passed between the two languages.
     '';
 
-    homepage = http://sources.redhat.com/libffi/;
+    homepage = http://sourceware.org/libffi/;
 
     # See http://github.com/atgreen/libffi/blob/master/LICENSE .
     license = "free, non-copyleft";
@@ -43,9 +49,3 @@ stdenv.mkDerivation (rec {
   };
 }
 
-//
-
-# Don't run the native `strip' when cross-compiling.
-(if (stdenv ? cross)
- then { dontStrip = true; }
- else { }))

From 8a1d0991b2aad41757f1bbd7d0d3c44ca1e257ab Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Sep 2013 13:57:26 +0200
Subject: [PATCH 290/452] haskell-ghc-mod: update to version 2.1.1

---
 pkgs/development/libraries/haskell/ghc-mod/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
index 93230af4411..bfefbfe9b7e 100644
--- a/pkgs/development/libraries/haskell/ghc-mod/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ghc-mod";
-  version = "2.0.3";
-  sha256 = "0f0n4cqpspad3ygw89rp8wj1gxb7mv5zrd8938zm1rn2mimihggr";
+  version = "2.1.1";
+  sha256 = "00m44pjfvzwy7926r48h6q38yg82la1ls0p5q9fmfjxsdg351wi1";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 5d66da2dbc815f4be37ff3edc1db0e8c9da178a4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Sep 2013 13:57:26 +0200
Subject: [PATCH 291/452] haskell-hint: update to version 0.3.3.7

---
 pkgs/development/libraries/haskell/hint/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hint/default.nix b/pkgs/development/libraries/haskell/hint/default.nix
index 8cf1accca9c..3512bce9611 100644
--- a/pkgs/development/libraries/haskell/hint/default.nix
+++ b/pkgs/development/libraries/haskell/hint/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hint";
-  version = "0.3.3.6";
-  sha256 = "080wnds99lg9p4n2h9d4bpgvk73yzc3im2ysn1r8f3nqai4b2can";
+  version = "0.3.3.7";
+  sha256 = "1aba9dfkxlpmvbvllw4qnlrd300vnr0ismkn3kva1pv1cay5pifk";
   buildDepends = [
     extensibleExceptions filepath ghcMtl ghcPaths haskellSrc
     MonadCatchIOMtl mtl random utf8String

From 509c58e59c2c7400672cc0994a68047c3b83810f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Sep 2013 13:57:26 +0200
Subject: [PATCH 292/452] haskell-mongoDB: update to version 1.4.1.1

---
 pkgs/development/libraries/haskell/mongoDB/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/mongoDB/default.nix b/pkgs/development/libraries/haskell/mongoDB/default.nix
index 12c65deb445..2d269fc7a92 100644
--- a/pkgs/development/libraries/haskell/mongoDB/default.nix
+++ b/pkgs/development/libraries/haskell/mongoDB/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "mongoDB";
-  version = "1.4.1";
-  sha256 = "1r1ywqy3igcmmwxjy4fjqdnf8m4zqbc8l0nj43h2xwrl86lhfym9";
+  version = "1.4.1.1";
+  sha256 = "1c9980x3i0jgacgz7mx65l5nyp3h83mqp9b52pzxq90lix6xnwhi";
   buildDepends = [
     binary bson cryptohash liftedBase monadControl mtl network parsec
     random randomShuffle text transformersBase

From 896d5317a32961362c53e7eb468607f47c54de54 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Sep 2013 13:57:26 +0200
Subject: [PATCH 293/452] haskell-test-framework-th-prime: update to version
 0.0.6

---
 .../libraries/haskell/test-framework-th-prime/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix b/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix
index ebcd608eb6a..43791413a7f 100644
--- a/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix
+++ b/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "test-framework-th-prime";
-  version = "0.0.5";
-  sha256 = "0lsxnbckh88cq38azml86szdcvx3rhs3is13ib4z0ryfqnv4hhpl";
+  version = "0.0.6";
+  sha256 = "11fk7sk644ky8f22imrfqk8yx07050vy9szha0pnkkjk9i3bqfcq";
   buildDepends = [ cpphs haskellSrcExts testFramework ];
   meta = {
     description = "Template Haskell for test framework";

From 590cee5d19b8e084f373ec420d86ec8b6e34d07b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 3 Sep 2013 23:57:51 +0200
Subject: [PATCH 294/452] expect: "minor" update, no longer depends on X/Tk

ANN: https://groups.google.com/forum/#!topic/comp.lang.tcl/lwZjtKOfaLE
I hope this solves a darwin -lXss linkage problem.
(broke most X stuff through dejagnu -> libffi -> llvm or mesa)
---
 pkgs/tools/misc/expect/default.nix | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix
index d9f9b09271b..ad348f1ed0f 100644
--- a/pkgs/tools/misc/expect/default.nix
+++ b/pkgs/tools/misc/expect/default.nix
@@ -1,14 +1,16 @@
-{stdenv, fetchurl, tcl, tk, xproto, libX11}:
+{ stdenv, fetchurl, tcl }:
 
+let version = "5.45";
+in
 stdenv.mkDerivation {
-  name = "expect-5.44.1";
+  name = "expect-${version}";
 
   src = fetchurl {
-    url = http://expect.nist.gov/old/expect-5.44.1.tar.gz;
-    sha256 = "13zxqiclzk1paxc0mr2vwp9nhfyr2mkwk9gs73fg0l3iss16n6p4";
+    url = "mirror://sourceforge/expect/Expect/${version}/expect${version}.tar.gz";
+    sha256 = "0h60bifxj876afz4im35rmnbnxjx4lbdqp2ja3k30fwa8a8cm3dj";
   };
 
-  buildInputs = [tcl tk xproto libX11];
+  buildInputs = [ tcl ];
 
   #NIX_CFLAGS_COMPILE = "-DHAVE_UNISTD_H";
 
@@ -23,14 +25,16 @@ stdenv.mkDerivation {
     export NIX_LDFLAGS="-rpath $out/lib $NIX_LDFLAGS"
   '';
 
-  configureFlags = ["--with-tcl=${tcl}/lib"
+  configureFlags = [
+    "--with-tcl=${tcl}/lib"
     "--with-tclinclude=${tcl}/include"
-    "--with-tk=${tk}/lib"
-    "--exec-prefix=$out"];
+    "--exec-prefix=$out"
+  ];
+
+  postInstall="cp expect $out/bin; mkdir -p $out/lib; cp *.so $out/lib";
 
   meta = {
     description = "A tool for automating interactive applications";
     homepage = http://expect.nist.gov/;
   };
-  postInstall="cp expect{,k} $out/bin; mkdir -p $out/lib; cp *.so $out/lib";
 }

From a7ba6d655dcc8c92f91e29e2ca345d602b780cda Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Wed, 4 Sep 2013 00:45:06 +0200
Subject: [PATCH 295/452] ledger3: Use short git rev.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
---
 pkgs/applications/office/ledger/3.0.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/office/ledger/3.0.nix b/pkgs/applications/office/ledger/3.0.nix
index a40a60650f4..b31cee7143b 100644
--- a/pkgs/applications/office/ledger/3.0.nix
+++ b/pkgs/applications/office/ledger/3.0.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, cmake, boost, gmp, mpfr, libedit, python, texinfo }:
 
 let
-  rev = "0ec4291013bae966df2f5ca504d2216e488cd7ec";
+  rev = "0ec4291";
 in
 stdenv.mkDerivation {
   name = "ledger3-2013.08.${rev}";

From b77be3f3fe561ca2b102750ee44bf94c279f4434 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Wed, 4 Sep 2013 00:46:08 +0200
Subject: [PATCH 296/452] ledger3: Install emacs-lisp files manually.

Build process is currently broken for emacs lisp files.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
---
 pkgs/applications/office/ledger/3.0.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/applications/office/ledger/3.0.nix b/pkgs/applications/office/ledger/3.0.nix
index b31cee7143b..6a49ede0857 100644
--- a/pkgs/applications/office/ledger/3.0.nix
+++ b/pkgs/applications/office/ledger/3.0.nix
@@ -17,6 +17,13 @@ stdenv.mkDerivation {
   doCheck = true;
   enableParallelBuilding = true;
 
+  # Skip byte-compiling of emacs-lisp files because this is currently
+  # broken in ledger...
+  postInstall = ''
+    mkdir -p $out/share/emacs/site-lisp/
+    cp -v $src/lisp/*.el $out/share/emacs/site-lisp/
+  '';
+
   meta = {
     homepage = "http://ledger-cli.org/";
     description = "A double-entry accounting system with a command-line reporting interface";

From 636ba8f4ad2171536dff5b9a6fbd45150e25128c Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 31 Aug 2013 16:36:47 +0200
Subject: [PATCH 297/452] heimdall: upgrade to 1.4.0

---
 pkgs/tools/misc/heimdall/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix
index 0b0120ab279..ab6102cf23c 100644
--- a/pkgs/tools/misc/heimdall/default.nix
+++ b/pkgs/tools/misc/heimdall/default.nix
@@ -3,12 +3,12 @@
 }:
 
 stdenv.mkDerivation {
-  name = "heimdall-1.3.0";
+  name = "heimdall-1.4.0";
 
   src = fetchgit {
     url = git://github.com/Benjamin-Dobell/Heimdall.git;
-    rev = "ed9b08e5d9e3db60d52bccf6cb6919fb4bd47602";
-    sha256 = "e65f18299a05699595548cb27393a01b4e1dbbced82d4add8d0d55ef6514a691";
+    rev = "refs/tags/v1.4.0";
+    sha256 = "285785d83fd4edbe98c0fa38c27772f72950a5887b255c00937a1f11c79ebf57";
   };
 
   buildInputs =
@@ -16,14 +16,14 @@ stdenv.mkDerivation {
     ++ stdenv.lib.optional enableGUI qt4 ;
 
   makeFlags = "udevrulesdir=$(out)/lib/udev/rules.d";
-  
+
   preConfigure =
     ''
       pushd libpit
       ./configure
       make
       popd
-    
+
       cd heimdall
       substituteInPlace Makefile.in --replace sudo true
 

From 97ac37f8fd245c5c1c4f5eeda09b64ce21357477 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 31 Aug 2013 20:07:14 +0200
Subject: [PATCH 298/452] calibre: upgrade to 1.1

---
 pkgs/applications/misc/calibre/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index c74795f52c4..f75fee9983f 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -4,12 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-1.0.0";
-  # 0.9.12+ versions won't build due to missing qt4 private headers: https://bugs.launchpad.net/calibre/+bug/1094719
+  name = "calibre-1.1.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/calibre/${name}.tar.xz";
-    sha256 = "0qz369n46ijk8jbbgwnvj3v0byp5npn2zdb4lvc6mwa143mr6d62";
+    sha256 = "1gb6h6jn2fj5b1xv5xkmsrdrid2k8zp496alnfi88x7dmahfb6f6";
   };
 
   inherit python;

From 8500581ac86c26d2f6f563917c850f69cd18c9a5 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 1 Sep 2013 03:52:34 +0200
Subject: [PATCH 299/452] libusb1: upgrade to 1.0.16

---
 pkgs/development/libraries/libusb1/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix
index 811909c659d..a39e33f4f27 100644
--- a/pkgs/development/libraries/libusb1/default.nix
+++ b/pkgs/development/libraries/libusb1/default.nix
@@ -1,14 +1,15 @@
-{ stdenv, fetchurl, pkgconfig }:
+{ stdenv, fetchurl, pkgconfig, udev }:
 
 stdenv.mkDerivation rec {
-  name = "libusb-1.0.9";
+  name = "libusb-1.0.16";
 
   src = fetchurl {
-    url = "mirror://sourceforge/libusb/${name}.tar.bz2";
-    sha256 = "16sz34ix6hw2wwl3kqx6rf26fg210iryr68wc439dc065pffw879";
+    url = "mirror://sourceforge/libusbx/libusbx-1.0.16.tar.bz2";
+    sha256 = "105m9jvjr3vrriyg0mwmyf7qla4l71iwwnymrsk3sy9dazwmqcsv";
   };
 
   buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ udev ];
 
   meta = {
     homepage = http://www.libusb.org;

From 03c9a1fb337c10fbf5a5e0287b5c6a340efd8b0a Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 4 Sep 2013 06:49:22 +0200
Subject: [PATCH 300/452] linux 3.11

works fine for me, but nvidia binary driver fails once again
---
 pkgs/os-specific/linux/kernel/common-config.nix |  4 +++-
 pkgs/os-specific/linux/kernel/linux-3.11.nix    | 17 +++++++++++++++++
 pkgs/top-level/all-packages.nix                 | 15 ++++++++++++++-
 3 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/os-specific/linux/kernel/linux-3.11.nix

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 90210b8d5eb..7f75c046ae5 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -103,7 +103,9 @@ with stdenv.lib;
   FB_SIS_300 y
   FB_SIS_315 y
   FB_3DFX_ACCEL y
-  FB_GEODE y
+  ${optionalString (versionOlder version "3.9" || stdenv.system == "i686-linux") ''
+    FB_GEODE y
+  ''}
 
   # Video configuration.
   # Enable KMS for devices whose X.org driver supports it.
diff --git a/pkgs/os-specific/linux/kernel/linux-3.11.nix b/pkgs/os-specific/linux/kernel/linux-3.11.nix
new file mode 100644
index 00000000000..34b2d488289
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-3.11.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, ... } @ args:
+
+import ./generic.nix (args // rec {
+  version = "3.11";
+  modDirVersion = "3.11.0";
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
+    sha256 = "1yfpa4fzhsn4r5dwkcf3azy0vqdms865jaikn3fdwbabmpqchgl0";
+  };
+
+  features.iwlwifi = true;
+  features.efiBootStub = true;
+  features.needsCifsUtils = true;
+  features.canDisableNetfilterConntrackHelpers = true;
+  features.netfilterRPFilter = true;
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fd98f5421b9..8396fd60c1a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6492,6 +6492,18 @@ let
       ];
   };
 
+  linux_3_11 = makeOverridable (import ../os-specific/linux/kernel/linux-3.11.nix) {
+    inherit fetchurl stdenv perl mktemp bc kmod ubootChooser;
+    kernelPatches =
+      [
+        kernelPatches.sec_perm_2_6_24
+      ] ++ lib.optionals (platform.kernelArch == "mips")
+      [ kernelPatches.mips_fpureg_emu
+        kernelPatches.mips_fpu_sigill
+        kernelPatches.mips_ext3_n32
+      ];
+  };
+
   /* Linux kernel modules are inherently tied to a specific kernel.  So
      rather than provide specific instances of those packages for a
      specific kernel, we have a function that builds those packages
@@ -6613,8 +6625,9 @@ let
   linuxPackages_3_6_rpi = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi);
   linuxPackages_3_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_9 linuxPackages_3_9);
   linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10);
+  linuxPackages_3_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_11 linuxPackages_3_11);
   # Update this when adding a new version!
-  linuxPackages_latest = pkgs.linuxPackages_3_10;
+  linuxPackages_latest = pkgs.linuxPackages_3_11;
 
   # The current default kernel / kernel modules.
   linux = linuxPackages.kernel;

From 27a810346a974f1f122e37e7be32c70bd3b02307 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 4 Sep 2013 06:45:36 +0200
Subject: [PATCH 301/452] Revert "linux: really provide /proc/config.gz"

This reverts commit 68ce9e91e12914f34e55ef16d8f4b6fbcdd9e92a.

/proc/config.gz is available after "modprobe configs"
and in
/run/booted-system/kernel-modules/config
---
 pkgs/os-specific/linux/kernel/common-config.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 7f75c046ae5..d4f7c4e6718 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -24,9 +24,7 @@ with stdenv.lib;
   # Support drivers that need external firmware.
   STANDALONE n
 
-  # Enable the complete Linux kernel ".config" file to be saved in the kernel.
-  # Also, make it available at runtime as /proc/config.gz.
-  IKCONFIG y
+  # Make /proc/config.gz available.
   IKCONFIG_PROC y
 
   # Optimize with -O2, not -Os.

From 90575ababbd6f38dd9d40a449dcec038cbbd8ea6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 4 Sep 2013 10:15:32 +0200
Subject: [PATCH 302/452] expect: fix postInstall library suffix on darwin

---
 pkgs/tools/misc/expect/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix
index ad348f1ed0f..885fd040e47 100644
--- a/pkgs/tools/misc/expect/default.nix
+++ b/pkgs/tools/misc/expect/default.nix
@@ -31,7 +31,8 @@ stdenv.mkDerivation {
     "--exec-prefix=$out"
   ];
 
-  postInstall="cp expect $out/bin; mkdir -p $out/lib; cp *.so $out/lib";
+  postInstall = let libSuff = if stdenv.isDarwin then "dylib" else "so";
+    in "cp expect $out/bin; mkdir -p $out/lib; cp *.${libSuff} $out/lib";
 
   meta = {
     description = "A tool for automating interactive applications";

From 117b0034c207ca3b551452c2eb24bbe737780bc6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 4 Sep 2013 11:00:02 +0200
Subject: [PATCH 303/452] thunderbird: Disable parallel building

Seems to cause random build failures.

http://hydra.nixos.org/build/5956789
---
 .../applications/networking/mailreaders/thunderbird/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 94d1d08b9e4..08758c55a4e 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
     sha1 = "4bcbb33f0b3ea050e805723680b5669d80438812";
   };
 
-  enableParallelBuilding = true;
+  #enableParallelBuilding = true;
 
   buildInputs =
     [ pkgconfig perl python zip unzip bzip2 gtk dbus_glib alsaLib libIDL nspr

From 62585a363f21d8101a7eba411d9957e7ac59b863 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 4 Sep 2013 11:49:56 +0200
Subject: [PATCH 304/452] Support "imports" in abbreviated modules

In abbreviated modules (those without a "config" attribute), you can
use "require", but it doesn't behave in the same way.  For consistency
we should use "imports" everywhere.
---
 pkgs/lib/modules.nix | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/lib/modules.nix b/pkgs/lib/modules.nix
index 9dda89b09f0..acd10e7bf57 100644
--- a/pkgs/lib/modules.nix
+++ b/pkgs/lib/modules.nix
@@ -46,25 +46,21 @@ rec {
   unifyModuleSyntax = m:
     let
       delayedModule = delayProperties m;
-      getImports =
-        if m ? config || m ? options then
-          m.imports or []
-        else
-          toList (rmProperties (delayedModule.require or []));
 
+      getImports =
+        toList (rmProperties (delayedModule.require or []));
       getImportedPaths = filter isPath getImports;
       getImportedSets = filter (x: !isPath x) getImports;
 
       getConfig =
-        removeAttrs delayedModule ["require" "key"];
+        removeAttrs delayedModule ["require" "key" "imports"];
 
     in
       if isModule m then
         { key = "<unknown location>"; } // m
       else
-        {
-          key = "<unknown location>";
-          imports = getImportedPaths;
+        { key = "<unknown location>";
+          imports = (m.imports or []) ++ getImportedPaths;
           config = getConfig;
         } // (
           if getImportedSets != [] then

From b8bc3aa26d81c9031d6c883a47eddea15b6037d7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 4 Sep 2013 13:59:25 +0200
Subject: [PATCH 305/452] Remove meaningless package priority

---
 .../linux/firmware/firmware-linux-nonfree/default.nix            | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index 9ddddfde259..6bc4cf3f865 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -65,6 +65,5 @@ in stdenv.mkDerivation {
     homepage = http://packages.debian.org/sid/firmware-linux-nonfree;
     license = stdenv.lib.licenses.unfreeRedistributableFirmware;
     platforms = stdenv.lib.platforms.linux;
-    priority = 10; # low priority so that other packages can override this big package
   };
 }

From 8a56adee74e9312d7152c1c2ab8afc7a2a0c2b2b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 4 Sep 2013 14:07:58 +0200
Subject: [PATCH 306/452] microcode-intel: Update to 20130808

---
 pkgs/os-specific/linux/microcode/intel.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix
index e85ab29078b..fdd8bf63dfc 100644
--- a/pkgs/os-specific/linux/microcode/intel.nix
+++ b/pkgs/os-specific/linux/microcode/intel.nix
@@ -1,12 +1,13 @@
 { stdenv, fetchurl, microcode2ucode }:
 
-let version = "20120606";
-    num = "21385";
-in stdenv.mkDerivation {
+let version = "20130808"; in
+
+stdenv.mkDerivation {
   name = "microcode-intel-${version}";
+
   src = fetchurl {
-    url = "http://downloadmirror.intel.com/${num}/eng/microcode-${version}.tgz";
-    sha256 = "0hs95lj24zx3jscc64zg3hf8xc95vrnsyqlid66h453ib0wf8fg1";
+    url = "http://downloadmirror.intel.com/23082/eng/microcode-${version}.tgz";
+    sha256 = "19v0059v6dxv7ly57wgqy9nkjjnmprgwz4s94khdf213k5vikpfm";
   };
 
   buildInputs = [ microcode2ucode ];
@@ -17,12 +18,13 @@ in stdenv.mkDerivation {
   '';
 
   installPhase = ''
-    ensureDir $out
+    mkdir -p $out
     cp -r intel-ucode "$out/"
   '';
 
   meta = {
     homepage = http://www.intel.com/;
     description = "Microcode for Intel processors";
+    license = stdenv.lib.licenses.unfree;
   };
 }

From 26028c2107cd4ad1f7059735bec043d5fcaf3e4d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 4 Sep 2013 14:22:24 +0200
Subject: [PATCH 307/452] Install firmware in $out/lib/firmware instead of $out

---
 .../firmware/firmware-linux-nonfree/default.nix  |  4 ++--
 pkgs/os-specific/linux/microcode/amd.nix         | 16 ++++++++--------
 pkgs/os-specific/linux/microcode/intel.nix       |  5 +++--
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index 6bc4cf3f865..f5efc565753 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -54,8 +54,8 @@ in stdenv.mkDerivation {
   buildInputs = [ dpkg ];
 
   installPhase = ''
-    mkdir -p $out/share
-    cp -r lib/firmware/* "$out/"
+    mkdir -p $out/share $out/lib/firmware
+    cp -r lib/firmware/* "$out/lib/firmware/"
     cp -r usr/share/doc $out/share/
     find $out/share -name changelog.gz | xargs rm
   '';
diff --git a/pkgs/os-specific/linux/microcode/amd.nix b/pkgs/os-specific/linux/microcode/amd.nix
index d54f93a7bd1..0ca33fa31f0 100644
--- a/pkgs/os-specific/linux/microcode/amd.nix
+++ b/pkgs/os-specific/linux/microcode/amd.nix
@@ -1,25 +1,25 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-
   name = "amd-ucode-2012-09-10";
 
   src = fetchurl {
     urls =
-      [ "http://www.amd64.org/pub/microcode/${name}.tar"
-        "http://pkgs.fedoraproject.org/repo/pkgs/microcode_ctl/${name}.tar/559bc355d3799538584add80df2996f0/${name}.tar"
+      [ "http://pkgs.fedoraproject.org/repo/pkgs/microcode_ctl/${name}.tar/559bc355d3799538584add80df2996f0/${name}.tar"
+        "http://www.amd64.org/pub/microcode/${name}.tar"
       ];
     sha256 = "065phvhx5hx5ssdd1x2p5m1yv26ak7l5aaw6yk6h95x9mxn5r111";
   };
 
   installPhase = ''
-    mkdir -p $out/amd-ucode
-    mv microcode_amd_fam15h.bin microcode_amd.bin $out/amd-ucode/
+    mkdir -p $out/lib/firmware/amd-ucode $out/share/doc/amd-ucode
+    mv microcode_amd_fam15h.bin microcode_amd.bin $out/lib/firmware/amd-ucode/
+    mv LICENSE $out/share/doc/amd-ucode
   '';
 
   meta = {
-    description = "AMD Processor Microcode Patch";
-    homepage = "http://www.amd64.org/support/microcode.html";
-    license = "non-free";
+    description = "AMD Processor microcode patch";
+    homepage = http://www.amd64.org/support/microcode.html;
+    license = stdenv.lib.licenses.unfreeRedistributableFirmware;
   };
 }
diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix
index fdd8bf63dfc..ad7cea18084 100644
--- a/pkgs/os-specific/linux/microcode/intel.nix
+++ b/pkgs/os-specific/linux/microcode/intel.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ microcode2ucode ];
+
   sourceRoot = ".";
 
   buildPhase = ''
@@ -18,8 +19,8 @@ stdenv.mkDerivation {
   '';
 
   installPhase = ''
-    mkdir -p $out
-    cp -r intel-ucode "$out/"
+    mkdir -p $out/lib/firmware
+    cp -r intel-ucode "$out/lib/firmware/"
   '';
 
   meta = {

From e12c5deabe155a707c2fe7cea734f62868f40897 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 4 Sep 2013 15:51:49 +0200
Subject: [PATCH 308/452] libffi: disable doCheck on darwin until we fix
 dejagnu build

---
 pkgs/development/libraries/libffi/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix
index f8ca40168ef..807fe54c27e 100644
--- a/pkgs/development/libraries/libffi/default.nix
+++ b/pkgs/development/libraries/libffi/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-gcc-arch=generic" ]; # no detection of -march= or -mtune=
 
-  doCheck = true;
+  doCheck = !stdenv.isDarwin; # until we solve dejagnu problems on darwin
 
   dontStrip = stdenv ? cross; # Don't run the native `strip' when cross-compiling.
 

From 9ffc2dff98561ccdfb3a44fa15c4411fa79e5626 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 4 Sep 2013 19:29:15 +0200
Subject: [PATCH 309/452] updating node packages and adding few to the json
 list

 - bower
 - grunt-cli
 - grunt-contrib-jshint
 - grunt-contrib-requirejs
 - grunt-contrib-less
 - grunt-contrib-cssmin
 - grunt-contrib-uglify
 - grunt-karma
 - karma-mocha
 - karma-coverage
 - karma-requirejs
 - karma-sauce-launcher
 - karma-chrome-launcher
 - karma-junit-reporter
 - almond
 - lcov-result-merger
 - coveralls
---
 pkgs/top-level/node-packages-generated.nix | 2371 ++++++++++++++------
 pkgs/top-level/node-packages.json          |   19 +-
 pkgs/top-level/node-packages.nix           |    2 +-
 3 files changed, 1763 insertions(+), 629 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 7bb1a67c489..15c01748a44 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -2,32 +2,33 @@
 
 {
   full."CSSselect"."0.x" = lib.makeOverridable self.buildNodePackage {
-    name = "CSSselect-0.3.1";
+    name = "CSSselect-0.3.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.3.1.tgz";
-        sha1 = "ad91c2821658320c5047ba899201a236922c42f9";
+        url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.3.5.tgz";
+        sha1 = "b85cae765678432aa54be73c140e3d4de78938a1";
       })
     ];
     buildInputs =
       (self.nativeDeps."CSSselect"."0.x" or []);
     deps = [
-      self.full."CSSwhat".">= 0.1"
+      self.full."CSSwhat"."0.3"
+      self.full."domutils"."1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "CSSselect" ];
   };
-  full."CSSwhat".">= 0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "CSSwhat-0.2.0";
+  full."CSSwhat"."0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "CSSwhat-0.3.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.2.0.tgz";
-        sha1 = "c952fdc67f01c991805fd2c7f6defaedf90e992d";
+        url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.3.0.tgz";
+        sha1 = "44e93c6a50dab70f59575a539cb09f4016e188ae";
       })
     ];
     buildInputs =
-      (self.nativeDeps."CSSwhat".">= 0.1" or []);
+      (self.nativeDeps."CSSwhat"."0.3" or []);
     deps = [
     ];
     peerDependencies = [
@@ -50,6 +51,22 @@
     ];
     passthru.names = [ "abbrev" ];
   };
+  full."abbrev"."1.0.x" = lib.makeOverridable self.buildNodePackage {
+    name = "abbrev-1.0.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.4.tgz";
+        sha1 = "bd55ae5e413ba1722ee4caba1f6ea10414a59ecd";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."abbrev"."1.0.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "abbrev" ];
+  };
   full."abbrev"."~1.0.4" = lib.makeOverridable self.buildNodePackage {
     name = "abbrev-1.0.4";
     src = [
@@ -115,6 +132,39 @@
     ];
     passthru.names = [ "adm-zip" ];
   };
+  full."adm-zip"."~0.4.3" = lib.makeOverridable self.buildNodePackage {
+    name = "adm-zip-0.4.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/adm-zip/-/adm-zip-0.4.3.tgz";
+        sha1 = "28d6a3809abb7845a0ffa38f9fff455c2c6f6f6c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."adm-zip"."~0.4.3" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "adm-zip" ];
+  };
+  full."almond"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "almond-0.2.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/almond/-/almond-0.2.6.tgz";
+        sha1 = "7165a9246894239efe74ec4a41d6c97898eafc05";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."almond"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "almond" ];
+  };
+  "almond" = self.full."almond"."*";
   full."ambi"."~2.0.0" = lib.makeOverridable self.buildNodePackage {
     name = "ambi-2.0.0";
     src = [
@@ -132,6 +182,23 @@
     ];
     passthru.names = [ "ambi" ];
   };
+  full."ambi"."~2.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "ambi-2.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ambi/-/ambi-2.1.1.tgz";
+        sha1 = "254ea79bf4203ed74a7038632e176e64640bb91d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ambi"."~2.1.0" or []);
+    deps = [
+      self.full."typechecker"."~2.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ambi" ];
+  };
   full."amdefine"."*" = lib.makeOverridable self.buildNodePackage {
     name = "amdefine-0.0.8";
     src = [
@@ -263,6 +330,24 @@
     ];
     passthru.names = [ "apparatus" ];
   };
+  full."archiver"."~0.4.6" = lib.makeOverridable self.buildNodePackage {
+    name = "archiver-0.4.9";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/archiver/-/archiver-0.4.9.tgz";
+        sha1 = "7c8a5c8f186497b430698855b1a827af81ce94f1";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."archiver"."~0.4.6" or []);
+    deps = [
+      self.full."readable-stream"."~1.0.2"
+      self.full."iconv-lite"."~0.2.11"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "archiver" ];
+  };
   full."archy"."0" = lib.makeOverridable self.buildNodePackage {
     name = "archy-0.0.2";
     src = [
@@ -478,6 +563,22 @@
     ];
     passthru.names = [ "async" ];
   };
+  full."async"."~0.1.22" = lib.makeOverridable self.buildNodePackage {
+    name = "async-0.1.22";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/async/-/async-0.1.22.tgz";
+        sha1 = "0fc1aaa088a0e3ef0ebe2d8831bab0dcf8845061";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."async"."~0.1.22" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "async" ];
+  };
   full."async"."~0.2.6" = lib.makeOverridable self.buildNodePackage {
     name = "async-0.2.9";
     src = [
@@ -543,11 +644,11 @@
     passthru.names = [ "async" ];
   };
   full."aws-sdk"."*" = lib.makeOverridable self.buildNodePackage {
-    name = "aws-sdk-1.5.0";
+    name = "aws-sdk-1.5.1";
     src = [
       (self.patchLatest {
-        url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.5.0.tgz";
-        sha1 = "30081b392fcb7d093754d7dc6e8a7bb6f0dc405a";
+        url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.5.1.tgz";
+        sha1 = "5927d9539c9c82116501aed0747a2073375dfacd";
       })
     ];
     buildInputs =
@@ -562,11 +663,11 @@
   };
   "aws-sdk" = self.full."aws-sdk"."*";
   full."aws-sdk".">=1.2.0 <2" = lib.makeOverridable self.buildNodePackage {
-    name = "aws-sdk-1.5.0";
+    name = "aws-sdk-1.5.1";
     src = [
       (self.patchLatest {
-        url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.5.0.tgz";
-        sha1 = "30081b392fcb7d093754d7dc6e8a7bb6f0dc405a";
+        url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.5.1.tgz";
+        sha1 = "5927d9539c9c82116501aed0747a2073375dfacd";
       })
     ];
     buildInputs =
@@ -819,20 +920,20 @@
     ];
     passthru.names = [ "boom" ];
   };
-  full."bower".">=0.9.0" = lib.makeOverridable self.buildNodePackage {
-    name = "bower-1.2.4";
+  full."bower"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "bower-1.2.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/bower/-/bower-1.2.4.tgz";
-        sha1 = "7dce66cef5ffab8ef56c053d8df5aa1f1356cfac";
+        url = "http://registry.npmjs.org/bower/-/bower-1.2.6.tgz";
+        sha1 = "a8b7bd344601554821957b9ab62fb436febc674d";
       })
     ];
     buildInputs =
-      (self.nativeDeps."bower".">=0.9.0" or []);
+      (self.nativeDeps."bower"."*" or []);
     deps = [
       self.full."abbrev"."~1.0.4"
       self.full."archy"."0.0.2"
-      self.full."bower-config"."~0.4.3"
+      self.full."bower-config"."~0.5.0"
       self.full."bower-endpoint-parser"."~0.2.0"
       self.full."bower-json"."~0.4.0"
       self.full."bower-logger"."~0.2.1"
@@ -845,17 +946,72 @@
       self.full."glob"."~3.2.1"
       self.full."graceful-fs"."~2.0.0"
       self.full."handlebars"."~1.0.11"
-      self.full."inquirer"."~0.2.2"
+      self.full."inquirer"."~0.3.0"
       self.full."junk"."~0.2.0"
       self.full."mkdirp"."~0.3.5"
       self.full."mout"."~0.6.0"
       self.full."nopt"."~2.1.1"
       self.full."lru-cache"."~2.3.0"
       self.full."open"."~0.0.3"
+      self.full."osenv"."0.0.3"
       self.full."promptly"."~0.2.0"
       self.full."q"."~0.9.2"
       self.full."request"."~2.27.0"
-      self.full."request-progress"."~0.2.0"
+      self.full."request-progress"."~0.3.0"
+      self.full."retry"."~0.6.0"
+      self.full."rimraf"."~2.2.0"
+      self.full."semver"."~2.1.0"
+      self.full."stringify-object"."~0.1.4"
+      self.full."sudo-block"."~0.2.0"
+      self.full."tar"."~0.1.17"
+      self.full."tmp"."~0.0.20"
+      self.full."unzip"."~0.1.7"
+      self.full."update-notifier"."~0.1.3"
+      self.full."which"."~1.0.5"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "bower" ];
+  };
+  "bower" = self.full."bower"."*";
+  full."bower".">=0.9.0" = lib.makeOverridable self.buildNodePackage {
+    name = "bower-1.2.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/bower/-/bower-1.2.6.tgz";
+        sha1 = "a8b7bd344601554821957b9ab62fb436febc674d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."bower".">=0.9.0" or []);
+    deps = [
+      self.full."abbrev"."~1.0.4"
+      self.full."archy"."0.0.2"
+      self.full."bower-config"."~0.5.0"
+      self.full."bower-endpoint-parser"."~0.2.0"
+      self.full."bower-json"."~0.4.0"
+      self.full."bower-logger"."~0.2.1"
+      self.full."bower-registry-client"."~0.1.4"
+      self.full."cardinal"."~0.4.0"
+      self.full."chalk"."~0.2.0"
+      self.full."chmodr"."~0.1.0"
+      self.full."fstream"."~0.1.22"
+      self.full."fstream-ignore"."~0.0.6"
+      self.full."glob"."~3.2.1"
+      self.full."graceful-fs"."~2.0.0"
+      self.full."handlebars"."~1.0.11"
+      self.full."inquirer"."~0.3.0"
+      self.full."junk"."~0.2.0"
+      self.full."mkdirp"."~0.3.5"
+      self.full."mout"."~0.6.0"
+      self.full."nopt"."~2.1.1"
+      self.full."lru-cache"."~2.3.0"
+      self.full."open"."~0.0.3"
+      self.full."osenv"."0.0.3"
+      self.full."promptly"."~0.2.0"
+      self.full."q"."~0.9.2"
+      self.full."request"."~2.27.0"
+      self.full."request-progress"."~0.3.0"
       self.full."retry"."~0.6.0"
       self.full."rimraf"."~2.2.0"
       self.full."semver"."~2.1.0"
@@ -872,11 +1028,11 @@
     passthru.names = [ "bower" ];
   };
   full."bower-config"."~0.4.3" = lib.makeOverridable self.buildNodePackage {
-    name = "bower-config-0.4.4";
+    name = "bower-config-0.4.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/bower-config/-/bower-config-0.4.4.tgz";
-        sha1 = "33c6a772397f24d46322a294b415128a6e3090ff";
+        url = "http://registry.npmjs.org/bower-config/-/bower-config-0.4.5.tgz";
+        sha1 = "baa7cee382f53b13bb62a4afaee7c05f20143c13";
       })
     ];
     buildInputs =
@@ -891,6 +1047,26 @@
     ];
     passthru.names = [ "bower-config" ];
   };
+  full."bower-config"."~0.5.0" = lib.makeOverridable self.buildNodePackage {
+    name = "bower-config-0.5.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/bower-config/-/bower-config-0.5.0.tgz";
+        sha1 = "d081d43008816b1beb876dee272219851dd4c89c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."bower-config"."~0.5.0" or []);
+    deps = [
+      self.full."graceful-fs"."~2.0.0"
+      self.full."mout"."~0.6.0"
+      self.full."optimist"."~0.6.0"
+      self.full."osenv"."0.0.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "bower-config" ];
+  };
   full."bower-endpoint-parser"."~0.2.0" = lib.makeOverridable self.buildNodePackage {
     name = "bower-endpoint-parser-0.2.1";
     src = [
@@ -1009,11 +1185,11 @@
     passthru.names = [ "broadway" ];
   };
   full."browserchannel"."*" = lib.makeOverridable self.buildNodePackage {
-    name = "browserchannel-1.0.6";
+    name = "browserchannel-1.0.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/browserchannel/-/browserchannel-1.0.6.tgz";
-        sha1 = "9d3b33cac45b66611c35cd84ef237ad2c1d660d9";
+        url = "http://registry.npmjs.org/browserchannel/-/browserchannel-1.0.7.tgz";
+        sha1 = "0966d021d6001011f3fae3377db4bd2992458b57";
       })
     ];
     buildInputs =
@@ -1108,22 +1284,6 @@
     ];
     passthru.names = [ "buffer-crc32" ];
   };
-  full."buffer-equal"."~0.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "buffer-equal-0.0.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.0.tgz";
-        sha1 = "4a68196ac33522daa17ec99858b302a636b62cf1";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."buffer-equal"."~0.0.0" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "buffer-equal" ];
-  };
   full."buffers"."~0.1.1" = lib.makeOverridable self.buildNodePackage {
     name = "buffers-0.1.1";
     src = [
@@ -1173,23 +1333,6 @@
     ];
     passthru.names = [ "buffertools" ];
   };
-  full."bunker"."0.1.X" = lib.makeOverridable self.buildNodePackage {
-    name = "bunker-0.1.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bunker/-/bunker-0.1.2.tgz";
-        sha1 = "c88992464a8e2a6ede86930375f92b58077ef97c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bunker"."0.1.X" or []);
-    deps = [
-      self.full."burrito".">=0.2.5 <0.3"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "bunker" ];
-  };
   full."bunyan"."0.21.1" = lib.makeOverridable self.buildNodePackage {
     name = "bunyan-0.21.1";
     src = [
@@ -1208,24 +1351,6 @@
     ];
     passthru.names = [ "bunyan" ];
   };
-  full."burrito".">=0.2.5 <0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "burrito-0.2.12";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/burrito/-/burrito-0.2.12.tgz";
-        sha1 = "d0d6e6ac81d5e99789c6fa4accb0b0031ea54f6b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."burrito".">=0.2.5 <0.3" or []);
-    deps = [
-      self.full."traverse"."~0.5.1"
-      self.full."uglify-js"."~1.1.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "burrito" ];
-  };
   full."bytes"."0.2.0" = lib.makeOverridable self.buildNodePackage {
     name = "bytes-0.2.0";
     src = [
@@ -1314,11 +1439,11 @@
     passthru.names = [ "chalk" ];
   };
   full."chalk"."~0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "chalk-0.2.0";
+    name = "chalk-0.2.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/chalk/-/chalk-0.2.0.tgz";
-        sha1 = "47270e80edce0e219911af65479d17db525ff5db";
+        url = "http://registry.npmjs.org/chalk/-/chalk-0.2.1.tgz";
+        sha1 = "7613e1575145b21386483f7f485aa5ffa8cbd10c";
       })
     ];
     buildInputs =
@@ -1347,22 +1472,6 @@
     ];
     passthru.names = [ "character-parser" ];
   };
-  full."charm"."0.1.x" = lib.makeOverridable self.buildNodePackage {
-    name = "charm-0.1.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/charm/-/charm-0.1.2.tgz";
-        sha1 = "06c21eed1a1b06aeb67553cdc53e23274bac2296";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."charm"."0.1.x" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "charm" ];
-  };
   full."cheerio"."~0.10.8" = lib.makeOverridable self.buildNodePackage {
     name = "cheerio-0.10.8";
     src = [
@@ -1384,11 +1493,11 @@
     passthru.names = [ "cheerio" ];
   };
   full."cheerio"."~0.12.0" = lib.makeOverridable self.buildNodePackage {
-    name = "cheerio-0.12.1";
+    name = "cheerio-0.12.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/cheerio/-/cheerio-0.12.1.tgz";
-        sha1 = "82cf2b7e9a260f216142cf3c41e94289a3ea4aa3";
+        url = "http://registry.npmjs.org/cheerio/-/cheerio-0.12.2.tgz";
+        sha1 = "d9908e29679e6d1b501c2cfe0e4ada330ea278c7";
       })
     ];
     buildInputs =
@@ -1404,11 +1513,11 @@
     passthru.names = [ "cheerio" ];
   };
   full."cheerio"."~0.12.1" = lib.makeOverridable self.buildNodePackage {
-    name = "cheerio-0.12.1";
+    name = "cheerio-0.12.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/cheerio/-/cheerio-0.12.1.tgz";
-        sha1 = "82cf2b7e9a260f216142cf3c41e94289a3ea4aa3";
+        url = "http://registry.npmjs.org/cheerio/-/cheerio-0.12.2.tgz";
+        sha1 = "d9908e29679e6d1b501c2cfe0e4ada330ea278c7";
       })
     ];
     buildInputs =
@@ -1504,6 +1613,23 @@
     ];
     passthru.names = [ "chownr" ];
   };
+  full."clean-css"."~1.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "clean-css-1.0.12";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/clean-css/-/clean-css-1.0.12.tgz";
+        sha1 = "e6e0d977860466363d9110a17423d27cd6874300";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."clean-css"."~1.0.4" or []);
+    deps = [
+      self.full."commander"."1.3.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "clean-css" ];
+  };
   full."cli"."0.4.x" = lib.makeOverridable self.buildNodePackage {
     name = "cli-0.4.5";
     src = [
@@ -1626,18 +1752,18 @@
     passthru.names = [ "cmd-shim" ];
   };
   full."cmd-shim"."~1.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "cmd-shim-1.1.0";
+    name = "cmd-shim-1.1.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/cmd-shim/-/cmd-shim-1.1.0.tgz";
-        sha1 = "e69fe26e9a8b9040c7b61dc8ad6b04d7dbabe767";
+        url = "http://registry.npmjs.org/cmd-shim/-/cmd-shim-1.1.1.tgz";
+        sha1 = "348b292db32ed74c8283fcf6c48549b84c6658a7";
       })
     ];
     buildInputs =
       (self.nativeDeps."cmd-shim"."~1.1.0" or []);
     deps = [
       self.full."mkdirp"."~0.3.3"
-      self.full."graceful-fs"."1.2"
+      self.full."graceful-fs"."2"
     ];
     peerDependencies = [
     ];
@@ -1708,6 +1834,22 @@
     ];
     passthru.names = [ "coffee-script" ];
   };
+  full."coffee-script"."~1.3.3" = lib.makeOverridable self.buildNodePackage {
+    name = "coffee-script-1.3.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.3.3.tgz";
+        sha1 = "150d6b4cb522894369efed6a2101c20bc7f4a4f4";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."coffee-script"."~1.3.3" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "coffee-script" ];
+  };
   full."coffee-script"."~1.6" = lib.makeOverridable self.buildNodePackage {
     name = "coffee-script-1.6.3";
     src = [
@@ -1788,6 +1930,22 @@
     ];
     passthru.names = [ "colors" ];
   };
+  full."colors"."~0.6.0-1" = lib.makeOverridable self.buildNodePackage {
+    name = "colors-0.6.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz";
+        sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."colors"."~0.6.0-1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "colors" ];
+  };
   full."combined-stream"."~0.0.4" = lib.makeOverridable self.buildNodePackage {
     name = "combined-stream-0.0.4";
     src = [
@@ -1870,6 +2028,23 @@
     ];
     passthru.names = [ "commander" ];
   };
+  full."commander"."1.3.x" = lib.makeOverridable self.buildNodePackage {
+    name = "commander-1.3.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/commander/-/commander-1.3.2.tgz";
+        sha1 = "8a8f30ec670a6fdd64af52f1914b907d79ead5b5";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."commander"."1.3.x" or []);
+    deps = [
+      self.full."keypress"."0.1.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "commander" ];
+  };
   full."commander"."2.0.0" = lib.makeOverridable self.buildNodePackage {
     name = "commander-2.0.0";
     src = [
@@ -2037,16 +2212,16 @@
     ];
     passthru.names = [ "connect" ];
   };
-  full."connect"."2.8.5" = lib.makeOverridable self.buildNodePackage {
-    name = "connect-2.8.5";
+  full."connect"."2.8.8" = lib.makeOverridable self.buildNodePackage {
+    name = "connect-2.8.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/connect/-/connect-2.8.5.tgz";
-        sha1 = "20572077ba1f626fdb740b0ad7068f9130d701b8";
+        url = "http://registry.npmjs.org/connect/-/connect-2.8.8.tgz";
+        sha1 = "b9abf8caf0bd9773cb3dea29344119872582446d";
       })
     ];
     buildInputs =
-      (self.nativeDeps."connect"."2.8.5" or []);
+      (self.nativeDeps."connect"."2.8.8" or []);
     deps = [
       self.full."qs"."0.6.5"
       self.full."formidable"."1.0.14"
@@ -2066,11 +2241,11 @@
     passthru.names = [ "connect" ];
   };
   full."connect"."~2" = lib.makeOverridable self.buildNodePackage {
-    name = "connect-2.8.5";
+    name = "connect-2.8.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/connect/-/connect-2.8.5.tgz";
-        sha1 = "20572077ba1f626fdb740b0ad7068f9130d701b8";
+        url = "http://registry.npmjs.org/connect/-/connect-2.8.8.tgz";
+        sha1 = "b9abf8caf0bd9773cb3dea29344119872582446d";
       })
     ];
     buildInputs =
@@ -2094,11 +2269,11 @@
     passthru.names = [ "connect" ];
   };
   full."connect"."~2.8.4" = lib.makeOverridable self.buildNodePackage {
-    name = "connect-2.8.5";
+    name = "connect-2.8.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/connect/-/connect-2.8.5.tgz";
-        sha1 = "20572077ba1f626fdb740b0ad7068f9130d701b8";
+        url = "http://registry.npmjs.org/connect/-/connect-2.8.8.tgz";
+        sha1 = "b9abf8caf0bd9773cb3dea29344119872582446d";
       })
     ];
     buildInputs =
@@ -2189,17 +2364,17 @@
     passthru.names = [ "console-browserify" ];
   };
   full."constantinople"."~1.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "constantinople-1.0.1";
+    name = "constantinople-1.0.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/constantinople/-/constantinople-1.0.1.tgz";
-        sha1 = "038727385eb70567ffb5a825abc44870b56f4de9";
+        url = "http://registry.npmjs.org/constantinople/-/constantinople-1.0.2.tgz";
+        sha1 = "0e64747dc836644d3f659247efd95231b48c3e71";
       })
     ];
     buildInputs =
       (self.nativeDeps."constantinople"."~1.0.1" or []);
     deps = [
-      self.full."uglify-js"."~2.3.6"
+      self.full."uglify-js"."~2.4.0"
     ];
     peerDependencies = [
     ];
@@ -2367,6 +2542,27 @@
     ];
     passthru.names = [ "couch-login" ];
   };
+  full."coveralls"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "coveralls-2.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/coveralls/-/coveralls-2.2.0.tgz";
+        sha1 = "9bfe310447895b5665fee55bfee0743cc47fa4e4";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."coveralls"."*" or []);
+    deps = [
+      self.full."yaml"."0.2.3"
+      self.full."request"."2.16.2"
+      self.full."lcov-parse"."0.0.4"
+      self.full."log-driver"."1.2.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "coveralls" ];
+  };
+  "coveralls" = self.full."coveralls"."*";
   full."cryptiles"."0.1.x" = lib.makeOverridable self.buildNodePackage {
     name = "cryptiles-0.1.3";
     src = [
@@ -2531,6 +2727,38 @@
     ];
     passthru.names = [ "dargs" ];
   };
+  full."dateformat"."1.0.2-1.2.3" = lib.makeOverridable self.buildNodePackage {
+    name = "dateformat-1.0.2-1.2.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz";
+        sha1 = "b0220c02de98617433b72851cf47de3df2cdbee9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."dateformat"."1.0.2-1.2.3" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "dateformat" ];
+  };
+  full."dateformat"."~1.0.6" = lib.makeOverridable self.buildNodePackage {
+    name = "dateformat-1.0.6-1.2.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.6-1.2.3.tgz";
+        sha1 = "6b3de9f974f698d8b2d3ff9094bbaac8d696c16b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."dateformat"."~1.0.6" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "dateformat" ];
+  };
   full."debug"."*" = lib.makeOverridable self.buildNodePackage {
     name = "debug-0.7.2";
     src = [
@@ -2627,28 +2855,12 @@
     ];
     passthru.names = [ "deep-equal" ];
   };
-  full."deep-equal"."~0.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "deep-equal-0.0.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz";
-        sha1 = "99679d3bbd047156fcd450d3d01eeb9068691e83";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."deep-equal"."~0.0.0" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "deep-equal" ];
-  };
   full."deep-extend"."~0.2.5" = lib.makeOverridable self.buildNodePackage {
-    name = "deep-extend-0.2.5";
+    name = "deep-extend-0.2.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.2.5.tgz";
-        sha1 = "04471b170de4afdb150f2e8b530b2974dbfee90d";
+        url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.2.6.tgz";
+        sha1 = "1f767e02b46d88d0a4087affa4b11b1b0b804250";
       })
     ];
     buildInputs =
@@ -2659,22 +2871,6 @@
     ];
     passthru.names = [ "deep-extend" ];
   };
-  full."deep-is"."0.1.x" = lib.makeOverridable self.buildNodePackage {
-    name = "deep-is-0.1.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/deep-is/-/deep-is-0.1.2.tgz";
-        sha1 = "9ced65ea0bc0b09f42a6d79c1b1903f9d913cc18";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."deep-is"."0.1.x" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "deep-is" ];
-  };
   full."delayed-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage {
     name = "delayed-stream-0.0.5";
     src = [
@@ -2740,11 +2936,11 @@
     passthru.names = [ "diff" ];
   };
   full."diff"."~1.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "diff-1.0.5";
+    name = "diff-1.0.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/diff/-/diff-1.0.5.tgz";
-        sha1 = "664b6bdb113fb3a51ced79aff621badeed29a02c";
+        url = "http://registry.npmjs.org/diff/-/diff-1.0.6.tgz";
+        sha1 = "987bbd1ed596bd2f0c61d57ba2d9eb27b34f7e50";
       })
     ];
     buildInputs =
@@ -2756,11 +2952,11 @@
     passthru.names = [ "diff" ];
   };
   full."diff"."~1.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "diff-1.0.5";
+    name = "diff-1.0.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/diff/-/diff-1.0.5.tgz";
-        sha1 = "664b6bdb113fb3a51ced79aff621badeed29a02c";
+        url = "http://registry.npmjs.org/diff/-/diff-1.0.6.tgz";
+        sha1 = "987bbd1ed596bd2f0c61d57ba2d9eb27b34f7e50";
       })
     ];
     buildInputs =
@@ -2771,25 +2967,6 @@
     ];
     passthru.names = [ "diff" ];
   };
-  full."difflet"."~0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "difflet-0.2.6";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/difflet/-/difflet-0.2.6.tgz";
-        sha1 = "ab23b31f5649b6faa8e3d2acbd334467365ca6fa";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."difflet"."~0.2.0" or []);
-    deps = [
-      self.full."traverse"."0.6.x"
-      self.full."charm"."0.1.x"
-      self.full."deep-is"."0.1.x"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "difflet" ];
-  };
   full."director"."1.1.10" = lib.makeOverridable self.buildNodePackage {
     name = "director-1.1.10";
     src = [
@@ -2839,6 +3016,23 @@
     ];
     passthru.names = [ "domhandler" ];
   };
+  full."domutils"."1" = lib.makeOverridable self.buildNodePackage {
+    name = "domutils-1.1.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/domutils/-/domutils-1.1.4.tgz";
+        sha1 = "14b774276187066c76f80141f7eac47a22f77248";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."domutils"."1" or []);
+    deps = [
+      self.full."domelementtype"."1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "domutils" ];
+  };
   full."domutils"."1.0" = lib.makeOverridable self.buildNodePackage {
     name = "domutils-1.0.1";
     src = [
@@ -2857,11 +3051,11 @@
     passthru.names = [ "domutils" ];
   };
   full."domutils"."1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "domutils-1.1.2";
+    name = "domutils-1.1.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/domutils/-/domutils-1.1.2.tgz";
-        sha1 = "fcf1d3596cd419818041cdaf6f7894a8d127bb07";
+        url = "http://registry.npmjs.org/domutils/-/domutils-1.1.4.tgz";
+        sha1 = "14b774276187066c76f80141f7eac47a22f77248";
       })
     ];
     buildInputs =
@@ -2955,17 +3149,17 @@
     passthru.names = [ "emitter-component" ];
   };
   full."encoding"."~0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "encoding-0.1.6";
+    name = "encoding-0.1.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/encoding/-/encoding-0.1.6.tgz";
-        sha1 = "fec66b6d1c6b8cc554aa78c05ece35bef11a913f";
+        url = "http://registry.npmjs.org/encoding/-/encoding-0.1.7.tgz";
+        sha1 = "25cc19b34e9225d120c2ea769f9136c91cecc908";
       })
     ];
     buildInputs =
       (self.nativeDeps."encoding"."~0.1" or []);
     deps = [
-      self.full."iconv-lite"."0.2.7"
+      self.full."iconv-lite"."~0.2.11"
     ];
     peerDependencies = [
     ];
@@ -3036,12 +3230,47 @@
     passthru.names = [ "escape-html" ];
   };
   "escape-html" = self.full."escape-html"."*";
-  full."esprima"."~ 1.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "esprima-1.0.3";
+  full."escodegen"."0.0.23" = lib.makeOverridable self.buildNodePackage {
+    name = "escodegen-0.0.23";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/esprima/-/esprima-1.0.3.tgz";
-        sha1 = "7bdb544f95526d424808654d3b8fbe928650c0fe";
+        url = "http://registry.npmjs.org/escodegen/-/escodegen-0.0.23.tgz";
+        sha1 = "9acf978164368e42276571f18839c823b3a844df";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."escodegen"."0.0.23" or []);
+    deps = [
+      self.full."esprima"."~1.0.2"
+      self.full."estraverse"."~0.0.4"
+      self.full."source-map".">= 0.1.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "escodegen" ];
+  };
+  full."esprima"."1.0.x" = lib.makeOverridable self.buildNodePackage {
+    name = "esprima-1.0.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz";
+        sha1 = "9f557e08fc3b4d26ece9dd34f8fbf476b62585ad";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."esprima"."1.0.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "esprima" ];
+  };
+  full."esprima"."~ 1.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "esprima-1.0.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz";
+        sha1 = "9f557e08fc3b4d26ece9dd34f8fbf476b62585ad";
       })
     ];
     buildInputs =
@@ -3053,11 +3282,11 @@
     passthru.names = [ "esprima" ];
   };
   full."esprima"."~1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "esprima-1.0.3";
+    name = "esprima-1.0.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/esprima/-/esprima-1.0.3.tgz";
-        sha1 = "7bdb544f95526d424808654d3b8fbe928650c0fe";
+        url = "http://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz";
+        sha1 = "9f557e08fc3b4d26ece9dd34f8fbf476b62585ad";
       })
     ];
     buildInputs =
@@ -3068,6 +3297,38 @@
     ];
     passthru.names = [ "esprima" ];
   };
+  full."esprima"."~1.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "esprima-1.0.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz";
+        sha1 = "9f557e08fc3b4d26ece9dd34f8fbf476b62585ad";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."esprima"."~1.0.2" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "esprima" ];
+  };
+  full."estraverse"."~0.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "estraverse-0.0.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/estraverse/-/estraverse-0.0.4.tgz";
+        sha1 = "01a0932dfee574684a598af5a67c3bf9b6428db2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."estraverse"."~0.0.4" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "estraverse" ];
+  };
   full."event-emitter"."~0.2.2" = lib.makeOverridable self.buildNodePackage {
     name = "event-emitter-0.2.2";
     src = [
@@ -3134,6 +3395,22 @@
     ];
     passthru.names = [ "eventemitter2" ];
   };
+  full."eventemitter2"."~0.4.9" = lib.makeOverridable self.buildNodePackage {
+    name = "eventemitter2-0.4.13";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.13.tgz";
+        sha1 = "0a8ab97f9c1b563361b8927f9e80606277509153";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."eventemitter2"."~0.4.9" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "eventemitter2" ];
+  };
   full."events.node".">= 0.4.0" = lib.makeOverridable self.buildNodePackage {
     name = "events.node-0.4.9";
     src = [
@@ -3151,17 +3428,17 @@
     passthru.names = [ "events.node" ];
   };
   full."express"."*" = lib.makeOverridable self.buildNodePackage {
-    name = "express-3.3.5";
+    name = "express-3.3.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/express/-/express-3.3.5.tgz";
-        sha1 = "3fd077660c9ccae4710fcfb326290a01d1e72566";
+        url = "http://registry.npmjs.org/express/-/express-3.3.8.tgz";
+        sha1 = "8e98ac30d81f4c95b85d71d2af6cf84f62ef19bd";
       })
     ];
     buildInputs =
       (self.nativeDeps."express"."*" or []);
     deps = [
-      self.full."connect"."2.8.5"
+      self.full."connect"."2.8.8"
       self.full."commander"."1.2.0"
       self.full."range-parser"."0.0.4"
       self.full."mkdirp"."0.3.5"
@@ -3233,17 +3510,17 @@
     passthru.names = [ "express" ];
   };
   full."express"."3.x" = lib.makeOverridable self.buildNodePackage {
-    name = "express-3.3.5";
+    name = "express-3.3.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/express/-/express-3.3.5.tgz";
-        sha1 = "3fd077660c9ccae4710fcfb326290a01d1e72566";
+        url = "http://registry.npmjs.org/express/-/express-3.3.8.tgz";
+        sha1 = "8e98ac30d81f4c95b85d71d2af6cf84f62ef19bd";
       })
     ];
     buildInputs =
       (self.nativeDeps."express"."3.x" or []);
     deps = [
-      self.full."connect"."2.8.5"
+      self.full."connect"."2.8.8"
       self.full."commander"."1.2.0"
       self.full."range-parser"."0.0.4"
       self.full."mkdirp"."0.3.5"
@@ -3323,11 +3600,11 @@
     passthru.names = [ "express-partials" ];
   };
   full."extend"."*" = lib.makeOverridable self.buildNodePackage {
-    name = "extend-1.1.3";
+    name = "extend-1.2.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/extend/-/extend-1.1.3.tgz";
-        sha1 = "5ae3d12e33009879dfb574e911a2da1e3da29ef4";
+        url = "http://registry.npmjs.org/extend/-/extend-1.2.0.tgz";
+        sha1 = "da1a81af472a5a3e7fd607f85cdeaf69c169294d";
       })
     ];
     buildInputs =
@@ -3454,6 +3731,24 @@
     ];
     passthru.names = [ "faye-websocket" ];
   };
+  full."fileset"."0.1.x" = lib.makeOverridable self.buildNodePackage {
+    name = "fileset-0.1.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/fileset/-/fileset-0.1.5.tgz";
+        sha1 = "acc423bfaf92843385c66bf75822264d11b7bd94";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."fileset"."0.1.x" or []);
+    deps = [
+      self.full."minimatch"."0.x"
+      self.full."glob"."3.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "fileset" ];
+  };
   full."findup-sync"."~0.1.0" = lib.makeOverridable self.buildNodePackage {
     name = "findup-sync-0.1.2";
     src = [
@@ -4081,11 +4376,11 @@
     passthru.names = [ "generator-mocha" ];
   };
   full."generator-webapp"."*" = lib.makeOverridable self.buildNodePackage {
-    name = "generator-webapp-0.3.1";
+    name = "generator-webapp-0.4.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/generator-webapp/-/generator-webapp-0.3.1.tgz";
-        sha1 = "def094ddf1b079fd1e33fe381bc898c4f094bd1e";
+        url = "http://registry.npmjs.org/generator-webapp/-/generator-webapp-0.4.1.tgz";
+        sha1 = "b2d3f1b3ea83fbbc0043c81fdf82a3fe725b6001";
       })
     ];
     buildInputs =
@@ -4170,6 +4465,24 @@
     ];
     passthru.names = [ "glob" ];
   };
+  full."glob"."3.x" = lib.makeOverridable self.buildNodePackage {
+    name = "glob-3.2.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/glob/-/glob-3.2.6.tgz";
+        sha1 = "28c805b47bc6c19ba3059cbdf079b98ff62442f2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."glob"."3.x" or []);
+    deps = [
+      self.full."minimatch"."~0.2.11"
+      self.full."inherits"."2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "glob" ];
+  };
   full."glob".">= 3.1.4" = lib.makeOverridable self.buildNodePackage {
     name = "glob-3.2.6";
     src = [
@@ -4438,6 +4751,90 @@
     ];
     passthru.names = [ "growl" ];
   };
+  full."grunt"."0.4.x" = lib.makeOverridable self.buildNodePackage {
+    name = "grunt-0.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/grunt/-/grunt-0.4.1.tgz";
+        sha1 = "d5892e5680add9ed1befde9aa635cf46b8f49729";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."grunt"."0.4.x" or []);
+    deps = [
+      self.full."async"."~0.1.22"
+      self.full."coffee-script"."~1.3.3"
+      self.full."colors"."~0.6.0-1"
+      self.full."dateformat"."1.0.2-1.2.3"
+      self.full."eventemitter2"."~0.4.9"
+      self.full."findup-sync"."~0.1.0"
+      self.full."glob"."~3.1.21"
+      self.full."hooker"."~0.2.3"
+      self.full."iconv-lite"."~0.2.5"
+      self.full."minimatch"."~0.2.6"
+      self.full."nopt"."~1.0.10"
+      self.full."rimraf"."~2.0.2"
+      self.full."lodash"."~0.9.0"
+      self.full."underscore.string"."~2.2.0rc"
+      self.full."which"."~1.0.5"
+      self.full."js-yaml"."~2.0.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "grunt" ];
+  };
+  full."grunt"."~0.4.0" = lib.makeOverridable self.buildNodePackage {
+    name = "grunt-0.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/grunt/-/grunt-0.4.1.tgz";
+        sha1 = "d5892e5680add9ed1befde9aa635cf46b8f49729";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."grunt"."~0.4.0" or []);
+    deps = [
+      self.full."async"."~0.1.22"
+      self.full."coffee-script"."~1.3.3"
+      self.full."colors"."~0.6.0-1"
+      self.full."dateformat"."1.0.2-1.2.3"
+      self.full."eventemitter2"."~0.4.9"
+      self.full."findup-sync"."~0.1.0"
+      self.full."glob"."~3.1.21"
+      self.full."hooker"."~0.2.3"
+      self.full."iconv-lite"."~0.2.5"
+      self.full."minimatch"."~0.2.6"
+      self.full."nopt"."~1.0.10"
+      self.full."rimraf"."~2.0.2"
+      self.full."lodash"."~0.9.0"
+      self.full."underscore.string"."~2.2.0rc"
+      self.full."which"."~1.0.5"
+      self.full."js-yaml"."~2.0.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "grunt" ];
+  };
+  full."grunt-cli"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "grunt-cli-0.1.9";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/grunt-cli/-/grunt-cli-0.1.9.tgz";
+        sha1 = "3f08bfb0bef30ba33083defe53efe0575cbe4e14";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."grunt-cli"."*" or []);
+    deps = [
+      self.full."nopt"."~1.0.10"
+      self.full."findup-sync"."~0.1.0"
+      self.full."resolve"."~0.3.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "grunt-cli" ];
+  };
+  "grunt-cli" = self.full."grunt-cli"."*";
   full."grunt-cli"."~0.1.7" = lib.makeOverridable self.buildNodePackage {
     name = "grunt-cli-0.1.9";
     src = [
@@ -4457,6 +4854,158 @@
     ];
     passthru.names = [ "grunt-cli" ];
   };
+  full."grunt-contrib-cssmin"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "grunt-contrib-cssmin-0.6.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.6.1.tgz";
+        sha1 = "534e632bfe19521b21c364677157b8b11e173efc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."grunt-contrib-cssmin"."*" or []);
+    deps = [
+      self.full."clean-css"."~1.0.4"
+      self.full."grunt-lib-contrib"."~0.6.0"
+    ];
+    peerDependencies = [
+      self.full."grunt"."~0.4.0"
+    ];
+    passthru.names = [ "grunt-contrib-cssmin" ];
+  };
+  "grunt-contrib-cssmin" = self.full."grunt-contrib-cssmin"."*";
+  full."grunt-contrib-jshint"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "grunt-contrib-jshint-0.6.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-0.6.4.tgz";
+        sha1 = "c5a0e56c13d3f758cf1b5d0786dcb4a7d4b4d748";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."grunt-contrib-jshint"."*" or []);
+    deps = [
+      self.full."jshint"."~2.1.10"
+    ];
+    peerDependencies = [
+      self.full."grunt"."~0.4.0"
+    ];
+    passthru.names = [ "grunt-contrib-jshint" ];
+  };
+  "grunt-contrib-jshint" = self.full."grunt-contrib-jshint"."*";
+  full."grunt-contrib-less"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "grunt-contrib-less-0.7.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.7.0.tgz";
+        sha1 = "35f6513e47ec5f3c99188d46efa9dcf378207be8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."grunt-contrib-less"."*" or []);
+    deps = [
+      self.full."less"."~1.4.0"
+      self.full."grunt-lib-contrib"."~0.6.1"
+    ];
+    peerDependencies = [
+      self.full."grunt"."~0.4.0"
+    ];
+    passthru.names = [ "grunt-contrib-less" ];
+  };
+  "grunt-contrib-less" = self.full."grunt-contrib-less"."*";
+  full."grunt-contrib-requirejs"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "grunt-contrib-requirejs-0.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/grunt-contrib-requirejs/-/grunt-contrib-requirejs-0.4.1.tgz";
+        sha1 = "862ba167141b8a8f36af5444feab3272bb8cf4bd";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."grunt-contrib-requirejs"."*" or []);
+    deps = [
+      self.full."requirejs"."~2.1.0"
+    ];
+    peerDependencies = [
+      self.full."grunt"."~0.4.0"
+    ];
+    passthru.names = [ "grunt-contrib-requirejs" ];
+  };
+  "grunt-contrib-requirejs" = self.full."grunt-contrib-requirejs"."*";
+  full."grunt-contrib-uglify"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "grunt-contrib-uglify-0.2.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.2.4.tgz";
+        sha1 = "51113f28a72432521e35e63f7f18a251fda2fd49";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."grunt-contrib-uglify"."*" or []);
+    deps = [
+      self.full."uglify-js"."~2.4.0"
+      self.full."grunt-lib-contrib"."~0.6.1"
+    ];
+    peerDependencies = [
+      self.full."grunt"."~0.4.0"
+    ];
+    passthru.names = [ "grunt-contrib-uglify" ];
+  };
+  "grunt-contrib-uglify" = self.full."grunt-contrib-uglify"."*";
+  full."grunt-karma"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "grunt-karma-0.7.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/grunt-karma/-/grunt-karma-0.7.1.tgz";
+        sha1 = "7fb8c40988b8e88da454afb821a7a925ed05ff81";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."grunt-karma"."*" or []);
+    deps = [
+      self.full."optimist"."~0.6.0"
+    ];
+    peerDependencies = [
+      self.full."grunt"."0.4.x"
+      self.full."karma"."~0.10.0"
+    ];
+    passthru.names = [ "grunt-karma" ];
+  };
+  "grunt-karma" = self.full."grunt-karma"."*";
+  full."grunt-lib-contrib"."~0.6.0" = lib.makeOverridable self.buildNodePackage {
+    name = "grunt-lib-contrib-0.6.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/grunt-lib-contrib/-/grunt-lib-contrib-0.6.1.tgz";
+        sha1 = "3f56adb7da06e814795ee2415b0ebe5fb8903ebb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."grunt-lib-contrib"."~0.6.0" or []);
+    deps = [
+      self.full."zlib-browserify"."0.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "grunt-lib-contrib" ];
+  };
+  full."grunt-lib-contrib"."~0.6.1" = lib.makeOverridable self.buildNodePackage {
+    name = "grunt-lib-contrib-0.6.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/grunt-lib-contrib/-/grunt-lib-contrib-0.6.1.tgz";
+        sha1 = "3f56adb7da06e814795ee2415b0ebe5fb8903ebb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."grunt-lib-contrib"."~0.6.1" or []);
+    deps = [
+      self.full."zlib-browserify"."0.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "grunt-lib-contrib" ];
+  };
   full."guifi-earth"."https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " = lib.makeOverridable self.buildNodePackage {
     name = "guifi-earth-0.2.1";
     src = [
@@ -4497,6 +5046,24 @@
     passthru.names = [ "gzippo" ];
   };
   "gzippo" = self.full."gzippo"."*";
+  full."handlebars"."1.0.x" = lib.makeOverridable self.buildNodePackage {
+    name = "handlebars-1.0.12";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/handlebars/-/handlebars-1.0.12.tgz";
+        sha1 = "18c6d3440c35e91b19b3ff582b9151ab4985d4fc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."handlebars"."1.0.x" or []);
+    deps = [
+      self.full."optimist"."~0.3"
+      self.full."uglify-js"."~2.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "handlebars" ];
+  };
   full."handlebars"."~1.0.11" = lib.makeOverridable self.buildNodePackage {
     name = "handlebars-1.0.12";
     src = [
@@ -4547,6 +5114,26 @@
     ];
     passthru.names = [ "hat" ];
   };
+  full."hawk"."~0.10.0" = lib.makeOverridable self.buildNodePackage {
+    name = "hawk-0.10.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/hawk/-/hawk-0.10.2.tgz";
+        sha1 = "9b361dee95a931640e6d504e05609a8fc3ac45d2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."hawk"."~0.10.0" or []);
+    deps = [
+      self.full."hoek"."0.7.x"
+      self.full."boom"."0.3.x"
+      self.full."cryptiles"."0.1.x"
+      self.full."sntp"."0.1.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "hawk" ];
+  };
   full."hawk"."~0.10.2" = lib.makeOverridable self.buildNodePackage {
     name = "hawk-0.10.2";
     src = [
@@ -4672,6 +5259,22 @@
     ];
     passthru.names = [ "hoek" ];
   };
+  full."hooker"."~0.2.3" = lib.makeOverridable self.buildNodePackage {
+    name = "hooker-0.2.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz";
+        sha1 = "b834f723cc4a242aa65963459df6d984c5d3d959";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."hooker"."~0.2.3" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "hooker" ];
+  };
   full."hooks"."0.2.1" = lib.makeOverridable self.buildNodePackage {
     name = "hooks-0.2.1";
     src = [
@@ -4891,22 +5494,6 @@
     passthru.names = [ "i18next" ];
   };
   "i18next" = self.full."i18next"."*";
-  full."iconv-lite"."0.2.7" = lib.makeOverridable self.buildNodePackage {
-    name = "iconv-lite-0.2.7";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.7.tgz";
-        sha1 = "45be2390d27af4b7613aac4ee4d957e3f4cbdb54";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."iconv-lite"."0.2.7" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "iconv-lite" ];
-  };
   full."iconv-lite"."~0.2.10" = lib.makeOverridable self.buildNodePackage {
     name = "iconv-lite-0.2.11";
     src = [
@@ -4923,21 +5510,37 @@
     ];
     passthru.names = [ "iconv-lite" ];
   };
-  full."inherits"."*" = lib.makeOverridable self.buildNodePackage {
-    name = "inherits-2.0.1";
+  full."iconv-lite"."~0.2.11" = lib.makeOverridable self.buildNodePackage {
+    name = "iconv-lite-0.2.11";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
-        sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1";
+        url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz";
+        sha1 = "1ce60a3a57864a292d1321ff4609ca4bb965adc8";
       })
     ];
     buildInputs =
-      (self.nativeDeps."inherits"."*" or []);
+      (self.nativeDeps."iconv-lite"."~0.2.11" or []);
     deps = [
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "inherits" ];
+    passthru.names = [ "iconv-lite" ];
+  };
+  full."iconv-lite"."~0.2.5" = lib.makeOverridable self.buildNodePackage {
+    name = "iconv-lite-0.2.11";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz";
+        sha1 = "1ce60a3a57864a292d1321ff4609ca4bb965adc8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."iconv-lite"."~0.2.5" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "iconv-lite" ];
   };
   full."inherits"."1" = lib.makeOverridable self.buildNodePackage {
     name = "inherits-1.0.0";
@@ -5107,46 +5710,6 @@
     ];
     passthru.names = [ "init-package-json" ];
   };
-  full."inquirer"."~0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "inquirer-0.2.5";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/inquirer/-/inquirer-0.2.5.tgz";
-        sha1 = "6b49a9cbe03de776122211f174ef9fe2822c08f6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."inquirer"."~0.2.0" or []);
-    deps = [
-      self.full."lodash"."~1.2.1"
-      self.full."async"."~0.2.8"
-      self.full."cli-color"."~0.2.2"
-      self.full."mute-stream"."0.0.3"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "inquirer" ];
-  };
-  full."inquirer"."~0.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "inquirer-0.2.5";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/inquirer/-/inquirer-0.2.5.tgz";
-        sha1 = "6b49a9cbe03de776122211f174ef9fe2822c08f6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."inquirer"."~0.2.2" or []);
-    deps = [
-      self.full."lodash"."~1.2.1"
-      self.full."async"."~0.2.8"
-      self.full."cli-color"."~0.2.2"
-      self.full."mute-stream"."0.0.3"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "inquirer" ];
-  };
   full."inquirer"."~0.2.4" = lib.makeOverridable self.buildNodePackage {
     name = "inquirer-0.2.5";
     src = [
@@ -5167,19 +5730,59 @@
     ];
     passthru.names = [ "inquirer" ];
   };
-  full."insight"."~0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "insight-0.1.3";
+  full."inquirer"."~0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "inquirer-0.3.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/insight/-/insight-0.1.3.tgz";
-        sha1 = "868a1135460e48dc0603f1ba2ddd7d3c772e1c97";
+        url = "http://registry.npmjs.org/inquirer/-/inquirer-0.3.2.tgz";
+        sha1 = "a061f2ad3488bd2b38e5ac237c059a79f160bdd4";
       })
     ];
     buildInputs =
-      (self.nativeDeps."insight"."~0.1.0" or []);
+      (self.nativeDeps."inquirer"."~0.3.0" or []);
+    deps = [
+      self.full."lodash"."~1.2.1"
+      self.full."async"."~0.2.8"
+      self.full."cli-color"."~0.2.2"
+      self.full."mute-stream"."0.0.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "inquirer" ];
+  };
+  full."inquirer"."~0.3.1" = lib.makeOverridable self.buildNodePackage {
+    name = "inquirer-0.3.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/inquirer/-/inquirer-0.3.2.tgz";
+        sha1 = "a061f2ad3488bd2b38e5ac237c059a79f160bdd4";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."inquirer"."~0.3.1" or []);
+    deps = [
+      self.full."lodash"."~1.2.1"
+      self.full."async"."~0.2.8"
+      self.full."cli-color"."~0.2.2"
+      self.full."mute-stream"."0.0.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "inquirer" ];
+  };
+  full."insight"."~0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "insight-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/insight/-/insight-0.2.0.tgz";
+        sha1 = "3b430f3c903558d690d1b96c7479b6f1b9186a5e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."insight"."~0.2.0" or []);
     deps = [
       self.full."chalk"."~0.2.0"
-      self.full."request"."~2.26.0"
+      self.full."request"."~2.27.0"
       self.full."configstore"."~0.1.0"
       self.full."async"."~0.2.9"
       self.full."lodash"."~1.3.1"
@@ -5206,11 +5809,11 @@
     passthru.names = [ "intersect" ];
   };
   full."ironhorse"."*" = lib.makeOverridable self.buildNodePackage {
-    name = "ironhorse-0.0.6";
+    name = "ironhorse-0.0.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/ironhorse/-/ironhorse-0.0.6.tgz";
-        sha1 = "de774f72022630a258158acdcb590e1542a09b58";
+        url = "http://registry.npmjs.org/ironhorse/-/ironhorse-0.0.7.tgz";
+        sha1 = "5217f2cced8caffe15df95033492f8582e44e5ef";
       })
     ];
     buildInputs =
@@ -5269,6 +5872,33 @@
     ];
     passthru.names = [ "isbinaryfile" ];
   };
+  full."istanbul"."~0.1.41" = lib.makeOverridable self.buildNodePackage {
+    name = "istanbul-0.1.43";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/istanbul/-/istanbul-0.1.43.tgz";
+        sha1 = "8dfd86802b345209f366d29093330ace17f1539d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."istanbul"."~0.1.41" or []);
+    deps = [
+      self.full."esprima"."1.0.x"
+      self.full."escodegen"."0.0.23"
+      self.full."handlebars"."1.0.x"
+      self.full."mkdirp"."0.3.x"
+      self.full."nopt"."2.1.x"
+      self.full."fileset"."0.1.x"
+      self.full."which"."1.0.x"
+      self.full."async"."0.2.x"
+      self.full."abbrev"."1.0.x"
+      self.full."wordwrap"."0.0.x"
+      self.full."resolve"."0.4.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "istanbul" ];
+  };
   full."jade"."*" = lib.makeOverridable self.buildNodePackage {
     name = "jade-0.35.0";
     src = [
@@ -5386,6 +6016,24 @@
     ];
     passthru.names = [ "js-yaml" ];
   };
+  full."js-yaml"."~2.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "js-yaml-2.0.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.0.5.tgz";
+        sha1 = "a25ae6509999e97df278c6719da11bd0687743a8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."js-yaml"."~2.0.2" or []);
+    deps = [
+      self.full."argparse"."~ 0.1.11"
+      self.full."esprima"."~ 1.0.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "js-yaml" ];
+  };
   full."js-yaml"."~2.1.0" = lib.makeOverridable self.buildNodePackage {
     name = "js-yaml-2.1.0";
     src = [
@@ -5426,6 +6074,27 @@
     passthru.names = [ "jshint" ];
   };
   "jshint" = self.full."jshint"."*";
+  full."jshint"."~2.1.10" = lib.makeOverridable self.buildNodePackage {
+    name = "jshint-2.1.10";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/jshint/-/jshint-2.1.10.tgz";
+        sha1 = "0c015ec5bc5ad65c11c4b5152f221f24b7af5522";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."jshint"."~2.1.10" or []);
+    deps = [
+      self.full."shelljs"."0.1.x"
+      self.full."underscore"."1.4.x"
+      self.full."cli"."0.4.x"
+      self.full."minimatch"."0.x.x"
+      self.full."console-browserify"."0.1.x"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "jshint" ];
+  };
   full."json-schema"."0.2.2" = lib.makeOverridable self.buildNodePackage {
     name = "json-schema-0.2.2";
     src = [
@@ -5543,15 +6212,15 @@
     passthru.names = [ "junk" ];
   };
   full."karma"."*" = lib.makeOverridable self.buildNodePackage {
-    name = "karma-0.10.2";
+    name = "karma-0.11.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma/-/karma-0.10.2.tgz";
-        sha1 = "4e100bd346bb24a1260dcd34b5b3d2d4a9b27b17";
+        url = "http://registry.npmjs.org/karma/-/karma-0.11.0.tgz";
+        sha1 = "554ff769ad9b5f3c78f051ad7e607c529b6c825e";
       })
       (fetchurl {
-        url = "http://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.2.tgz";
-        sha1 = "4f4b8271ffbb7aba543daf38bbc004f4f7f28da3";
+        url = "http://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.3.tgz";
+        sha1 = "b7f3b87973ea8e9e1ebfa721188876c31c5fa3be";
       })
       (fetchurl {
         url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.1.0.tgz";
@@ -5618,15 +6287,15 @@
   };
   "karma" = self.full."karma"."*";
   full."karma".">=0.9" = lib.makeOverridable self.buildNodePackage {
-    name = "karma-0.10.2";
+    name = "karma-0.11.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma/-/karma-0.10.2.tgz";
-        sha1 = "4e100bd346bb24a1260dcd34b5b3d2d4a9b27b17";
+        url = "http://registry.npmjs.org/karma/-/karma-0.11.0.tgz";
+        sha1 = "554ff769ad9b5f3c78f051ad7e607c529b6c825e";
       })
       (fetchurl {
-        url = "http://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.2.tgz";
-        sha1 = "4f4b8271ffbb7aba543daf38bbc004f4f7f28da3";
+        url = "http://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.3.tgz";
+        sha1 = "b7f3b87973ea8e9e1ebfa721188876c31c5fa3be";
       })
       (fetchurl {
         url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.1.0.tgz";
@@ -5692,15 +6361,15 @@
     passthru.names = [ "karma" "karma-jasmine" "karma-requirejs" "karma-coffee-preprocessor" "karma-html2js-preprocessor" "karma-chrome-launcher" "karma-firefox-launcher" "karma-phantomjs-launcher" "karma-script-launcher" ];
   };
   full."karma".">=0.9.3" = lib.makeOverridable self.buildNodePackage {
-    name = "karma-0.10.2";
+    name = "karma-0.11.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma/-/karma-0.10.2.tgz";
-        sha1 = "4e100bd346bb24a1260dcd34b5b3d2d4a9b27b17";
+        url = "http://registry.npmjs.org/karma/-/karma-0.11.0.tgz";
+        sha1 = "554ff769ad9b5f3c78f051ad7e607c529b6c825e";
       })
       (fetchurl {
-        url = "http://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.2.tgz";
-        sha1 = "4f4b8271ffbb7aba543daf38bbc004f4f7f28da3";
+        url = "http://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.3.tgz";
+        sha1 = "b7f3b87973ea8e9e1ebfa721188876c31c5fa3be";
       })
       (fetchurl {
         url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.1.0.tgz";
@@ -5765,14 +6434,169 @@
     ];
     passthru.names = [ "karma" "karma-jasmine" "karma-requirejs" "karma-coffee-preprocessor" "karma-html2js-preprocessor" "karma-chrome-launcher" "karma-firefox-launcher" "karma-phantomjs-launcher" "karma-script-launcher" ];
   };
-  full."karma-chrome-launcher"."*" = self.full."karma".">=0.9.3";
-  full."karma-coffee-preprocessor"."*" = self.full."karma".">=0.9.3";
-  full."karma-firefox-launcher"."*" = self.full."karma".">=0.9.3";
-  full."karma-html2js-preprocessor"."*" = self.full."karma".">=0.9.3";
-  full."karma-jasmine"."*" = self.full."karma".">=0.9.3";
-  full."karma-phantomjs-launcher"."*" = self.full."karma".">=0.9.3";
-  full."karma-requirejs"."*" = self.full."karma".">=0.9.3";
-  full."karma-script-launcher"."*" = self.full."karma".">=0.9.3";
+  full."karma"."~0.10.0" = lib.makeOverridable self.buildNodePackage {
+    name = "karma-0.10.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma/-/karma-0.10.2.tgz";
+        sha1 = "4e100bd346bb24a1260dcd34b5b3d2d4a9b27b17";
+      })
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.3.tgz";
+        sha1 = "b7f3b87973ea8e9e1ebfa721188876c31c5fa3be";
+      })
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.1.0.tgz";
+        sha1 = "d9554aa0f11f2c0ff2e933ab5043a633b1305622";
+      })
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma-coffee-preprocessor/-/karma-coffee-preprocessor-0.1.0.tgz";
+        sha1 = "713affc9990707e43eb6f64afdaf312072b73aab";
+      })
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma-html2js-preprocessor/-/karma-html2js-preprocessor-0.1.0.tgz";
+        sha1 = "2f7cf881f54a5d0b72154cc6ee1241c44292c7fe";
+      })
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.0.tgz";
+        sha1 = "d29f42911358a640ba4a13f1d2110819ae2e5cea";
+      })
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-0.1.0.tgz";
+        sha1 = "e5517590eea029d10d500b5f82ae423aafe069d4";
+      })
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma-phantomjs-launcher/-/karma-phantomjs-launcher-0.1.0.tgz";
+        sha1 = "9ef8243751524e32e67b97e3f8a321ee68a3fa2f";
+      })
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma-script-launcher/-/karma-script-launcher-0.1.0.tgz";
+        sha1 = "b643e7c2faead1a52cdb2eeaadcf7a245f0d772a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."karma"."~0.10.0" or [])
+      ++ (self.nativeDeps."karma-jasmine"."*" or [])
+      ++ (self.nativeDeps."karma-requirejs"."*" or [])
+      ++ (self.nativeDeps."karma-coffee-preprocessor"."*" or [])
+      ++ (self.nativeDeps."karma-html2js-preprocessor"."*" or [])
+      ++ (self.nativeDeps."karma-chrome-launcher"."*" or [])
+      ++ (self.nativeDeps."karma-firefox-launcher"."*" or [])
+      ++ (self.nativeDeps."karma-phantomjs-launcher"."*" or [])
+      ++ (self.nativeDeps."karma-script-launcher"."*" or []);
+    deps = [
+      self.full."di"."~0.0.1"
+      self.full."socket.io"."~0.9.13"
+      self.full."chokidar"."~0.6"
+      self.full."glob"."~3.1.21"
+      self.full."minimatch"."~0.2"
+      self.full."http-proxy"."~0.10"
+      self.full."optimist"."~0.3"
+      self.full."coffee-script"."~1.6"
+      self.full."rimraf"."~2.1"
+      self.full."q"."~0.9"
+      self.full."colors"."0.6.0-1"
+      self.full."lodash"."~1.1"
+      self.full."mime"."~1.2"
+      self.full."log4js"."~0.6.3"
+      self.full."useragent"."~2.0.4"
+      self.full."graceful-fs"."~1.2.1"
+      self.full."connect"."~2.8.4"
+      self.full."phantomjs"."~1.9"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "karma" "karma-jasmine" "karma-requirejs" "karma-coffee-preprocessor" "karma-html2js-preprocessor" "karma-chrome-launcher" "karma-firefox-launcher" "karma-phantomjs-launcher" "karma-script-launcher" ];
+  };
+  full."karma-chrome-launcher"."*" = self.full."karma"."~0.10.0";
+  "karma-chrome-launcher" = self.full."karma-chrome-launcher"."*";
+  full."karma-coffee-preprocessor"."*" = self.full."karma"."~0.10.0";
+  full."karma-coverage"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "karma-coverage-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.1.0.tgz";
+        sha1 = "6d5d03352cbe2d529807e558688dceea55f9dbb0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."karma-coverage"."*" or []);
+    deps = [
+      self.full."istanbul"."~0.1.41"
+      self.full."dateformat"."~1.0.6"
+    ];
+    peerDependencies = [
+      self.full."karma".">=0.9"
+    ];
+    passthru.names = [ "karma-coverage" ];
+  };
+  "karma-coverage" = self.full."karma-coverage"."*";
+  full."karma-firefox-launcher"."*" = self.full."karma"."~0.10.0";
+  full."karma-html2js-preprocessor"."*" = self.full."karma"."~0.10.0";
+  full."karma-jasmine"."*" = self.full."karma"."~0.10.0";
+  full."karma-junit-reporter"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "karma-junit-reporter-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma-junit-reporter/-/karma-junit-reporter-0.1.0.tgz";
+        sha1 = "7af72b64d7e9f192d1a40f4ef063ffbcf9e7bba5";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."karma-junit-reporter"."*" or []);
+    deps = [
+      self.full."xmlbuilder"."0.4.2"
+    ];
+    peerDependencies = [
+      self.full."karma".">=0.9"
+    ];
+    passthru.names = [ "karma-junit-reporter" ];
+  };
+  "karma-junit-reporter" = self.full."karma-junit-reporter"."*";
+  full."karma-mocha"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "karma-mocha-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma-mocha/-/karma-mocha-0.1.0.tgz";
+        sha1 = "451cfef48c51850e45db9d119927502e6a2feb40";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."karma-mocha"."*" or []);
+    deps = [
+    ];
+    peerDependencies = [
+      self.full."karma".">=0.9"
+      self.full."mocha"."*"
+    ];
+    passthru.names = [ "karma-mocha" ];
+  };
+  "karma-mocha" = self.full."karma-mocha"."*";
+  full."karma-phantomjs-launcher"."*" = self.full."karma"."~0.10.0";
+  full."karma-requirejs"."*" = self.full."karma"."~0.10.0";
+  "karma-requirejs" = self.full."karma-requirejs"."*";
+  full."karma-sauce-launcher"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "karma-sauce-launcher-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.1.0.tgz";
+        sha1 = "46be4b9888fda09e6512516cd5dc6ab8b114d392";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."karma-sauce-launcher"."*" or []);
+    deps = [
+      self.full."wd"."~0.0.32"
+      self.full."sauce-connect-launcher"."~0.1.10"
+      self.full."q"."~0.9.6"
+    ];
+    peerDependencies = [
+      self.full."karma".">=0.9"
+    ];
+    passthru.names = [ "karma-sauce-launcher" ];
+  };
+  "karma-sauce-launcher" = self.full."karma-sauce-launcher"."*";
+  full."karma-script-launcher"."*" = self.full."karma"."~0.10.0";
   full."keep-alive-agent"."0.0.1" = lib.makeOverridable self.buildNodePackage {
     name = "keep-alive-agent-0.0.1";
     src = [
@@ -5897,6 +6721,60 @@
     ];
     passthru.names = [ "lazy" ];
   };
+  full."lcov-parse"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "lcov-parse-0.0.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.4.tgz";
+        sha1 = "3853a4f132f04581db0e74c180542d90f0d1c66b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lcov-parse"."0.0.4" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lcov-parse" ];
+  };
+  full."lcov-result-merger"."*" = lib.makeOverridable self.buildNodePackage {
+    name = "lcov-result-merger-0.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-0.0.1.tgz";
+        sha1 = "8b0e68a7f9136de084f62d92ecafcfa41ce9e4d9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lcov-result-merger"."*" or []);
+    deps = [
+      self.full."glob"."~3.2.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lcov-result-merger" ];
+  };
+  "lcov-result-merger" = self.full."lcov-result-merger"."*";
+  full."less"."~1.4.0" = lib.makeOverridable self.buildNodePackage {
+    name = "less-1.4.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/less/-/less-1.4.2.tgz";
+        sha1 = "b7deefe98a3a87bee364411b3df2d1efe5a412d0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."less"."~1.4.0" or []);
+    deps = [
+      self.full."mime"."1.2.x"
+      self.full."request".">=2.12.0"
+      self.full."mkdirp"."~0.3.4"
+      self.full."ycssmin".">=1.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "less" ];
+  };
   full."libyaml"."*" = lib.makeOverridable self.buildNodePackage {
     name = "libyaml-0.2.2";
     src = [
@@ -5946,12 +6824,28 @@
     ];
     passthru.names = [ "lockfile" ];
   };
+  full."lodash"."~0.9.0" = lib.makeOverridable self.buildNodePackage {
+    name = "lodash-0.9.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz";
+        sha1 = "8f3499c5245d346d682e5b0d3b40767e09f1a92c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash"."~0.9.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash" ];
+  };
   full."lodash"."~1.0.1" = lib.makeOverridable self.buildNodePackage {
     name = "lodash-1.0.1";
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/lodash/-/lodash-1.0.1.tgz";
-        sha1 = "b751fb1c141fe8bcee6fc1bad44a30f9b9ccd95e";
+        sha1 = "57945732498d92310e5bd4b1ff4f273a79e6c9fc";
       })
     ];
     buildInputs =
@@ -5967,7 +6861,7 @@
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/lodash/-/lodash-1.1.1.tgz";
-        sha1 = "7b7384521f12bef886368a9450162ebec14fa394";
+        sha1 = "41a2b2e9a00e64d6d1999f143ff6b0755f6bbb24";
       })
     ];
     buildInputs =
@@ -5983,7 +6877,7 @@
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/lodash/-/lodash-1.1.1.tgz";
-        sha1 = "7b7384521f12bef886368a9450162ebec14fa394";
+        sha1 = "41a2b2e9a00e64d6d1999f143ff6b0755f6bbb24";
       })
     ];
     buildInputs =
@@ -5999,7 +6893,7 @@
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/lodash/-/lodash-1.2.1.tgz";
-        sha1 = "fc16f434d3a5c2afd0be336262dacda6b14237b8";
+        sha1 = "ed47b16e46f06b2b40309b68e9163c17e93ea304";
       })
     ];
     buildInputs =
@@ -6015,7 +6909,7 @@
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/lodash/-/lodash-1.3.1.tgz";
-        sha1 = "8a5f251d744f2f33d81931e04d60a5a1610b7827";
+        sha1 = "a4663b53686b895ff074e2ba504dfb76a8e2b770";
       })
     ];
     buildInputs =
@@ -6031,7 +6925,7 @@
     src = [
       (fetchurl {
         url = "http://registry.npmjs.org/lodash/-/lodash-1.3.1.tgz";
-        sha1 = "8a5f251d744f2f33d81931e04d60a5a1610b7827";
+        sha1 = "a4663b53686b895ff074e2ba504dfb76a8e2b770";
       })
     ];
     buildInputs =
@@ -6042,6 +6936,22 @@
     ];
     passthru.names = [ "lodash" ];
   };
+  full."log-driver"."1.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "log-driver-1.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/log-driver/-/log-driver-1.2.1.tgz";
+        sha1 = "ada8202a133e99764306652e195e28268b0bea5b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."log-driver"."1.2.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "log-driver" ];
+  };
   full."log4js"."~0.6.3" = lib.makeOverridable self.buildNodePackage {
     name = "log4js-0.6.8";
     src = [
@@ -6293,6 +7203,22 @@
     ];
     passthru.names = [ "mime" ];
   };
+  full."mime"."1.2.x" = lib.makeOverridable self.buildNodePackage {
+    name = "mime-1.2.11";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
+        sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mime"."1.2.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mime" ];
+  };
   full."mime"."~1.2" = lib.makeOverridable self.buildNodePackage {
     name = "mime-1.2.11";
     src = [
@@ -6426,6 +7352,24 @@
     ];
     passthru.names = [ "minimatch" ];
   };
+  full."minimatch"."0.x" = lib.makeOverridable self.buildNodePackage {
+    name = "minimatch-0.2.12";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.12.tgz";
+        sha1 = "ea82a012ac662c7ddfaa144f1c147e6946f5dafb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."minimatch"."0.x" or []);
+    deps = [
+      self.full."lru-cache"."2"
+      self.full."sigmund"."~1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "minimatch" ];
+  };
   full."minimatch"."0.x.x" = lib.makeOverridable self.buildNodePackage {
     name = "minimatch-0.2.12";
     src = [
@@ -6534,12 +7478,30 @@
     ];
     passthru.names = [ "minimatch" ];
   };
-  full."minimist"."~0.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "minimist-0.0.1";
+  full."minimatch"."~0.2.6" = lib.makeOverridable self.buildNodePackage {
+    name = "minimatch-0.2.12";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/minimist/-/minimist-0.0.1.tgz";
-        sha1 = "fa2439fbf7da8525c51b2a74e2815b380abc8ab6";
+        url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.12.tgz";
+        sha1 = "ea82a012ac662c7ddfaa144f1c147e6946f5dafb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."minimatch"."~0.2.6" or []);
+    deps = [
+      self.full."lru-cache"."2"
+      self.full."sigmund"."~1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "minimatch" ];
+  };
+  full."minimist"."~0.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "minimist-0.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/minimist/-/minimist-0.0.2.tgz";
+        sha1 = "3297e0500be195b8fcb56668c45b925bc9bca7ab";
       })
     ];
     buildInputs =
@@ -6679,22 +7641,6 @@
     ];
     passthru.names = [ "mkdirp" ];
   };
-  full."mkdirp"."~0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "mkdirp-0.3.5";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
-        sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mkdirp"."~0.3" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "mkdirp" ];
-  };
   full."mkdirp"."~0.3.3" = lib.makeOverridable self.buildNodePackage {
     name = "mkdirp-0.3.5";
     src = [
@@ -6744,11 +7690,11 @@
     passthru.names = [ "mkdirp" ];
   };
   full."mocha"."*" = lib.makeOverridable self.buildNodePackage {
-    name = "mocha-1.12.0";
+    name = "mocha-1.12.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mocha/-/mocha-1.12.0.tgz";
-        sha1 = "95fc936622ce156b8b19ff8def466ac2f3a3f29e";
+        url = "http://registry.npmjs.org/mocha/-/mocha-1.12.1.tgz";
+        sha1 = "5212e3f5914eef8c0888ae344e6a7dd2e5ac294a";
       })
     ];
     buildInputs =
@@ -6760,7 +7706,6 @@
       self.full."diff"."1.0.2"
       self.full."debug"."*"
       self.full."mkdirp"."0.3.5"
-      self.full."ms"."0.3.0"
       self.full."glob"."3.2.1"
     ];
     peerDependencies = [
@@ -7096,34 +8041,17 @@
     ];
     passthru.names = [ "ms" ];
   };
-  full."ms"."0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "ms-0.3.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ms/-/ms-0.3.0.tgz";
-        sha1 = "03edc348d613e66a56486cfdac53bcbe899cbd61";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ms"."0.3.0" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "ms" ];
-  };
   full."msgpack".">= 0.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "msgpack-0.2.0";
+    name = "msgpack-0.2.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/msgpack/-/msgpack-0.2.0.tgz";
-        sha1 = "d022af5c7db98eff5c01dd48942bc5354e167817";
+        url = "http://registry.npmjs.org/msgpack/-/msgpack-0.2.1.tgz";
+        sha1 = "5da246daa2138b4163640e486c00c4f3961e92ac";
       })
     ];
     buildInputs =
       (self.nativeDeps."msgpack".">= 0.0.1" or []);
     deps = [
-      self.full."nodeunit"."https://github.com/godsflaw/nodeunit/tarball/master"
     ];
     peerDependencies = [
     ];
@@ -7194,11 +8122,11 @@
     passthru.names = [ "mv" ];
   };
   full."nan"."~0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "nan-0.3.1";
+    name = "nan-0.3.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/nan/-/nan-0.3.1.tgz";
-        sha1 = "672523b3fbdbc8e73213dc1951b636e98b3b176f";
+        url = "http://registry.npmjs.org/nan/-/nan-0.3.2.tgz";
+        sha1 = "0df1935cab15369075ef160ad2894107aa14dc2d";
       })
     ];
     buildInputs =
@@ -7653,23 +8581,6 @@
     passthru.names = [ "nodemon" ];
   };
   "nodemon" = self.full."nodemon"."*";
-  full."nodeunit"."https://github.com/godsflaw/nodeunit/tarball/master" = lib.makeOverridable self.buildNodePackage {
-    name = "nodeunit-0.7.4";
-    src = [
-      (fetchurl {
-        url = "https://github.com/godsflaw/nodeunit/tarball/master";
-        sha256 = "c79333b5b54ca3b9eb42e42d6ea48d261aa9e015c0ad9cf340abacb528d0ee3a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."nodeunit"."https://github.com/godsflaw/nodeunit/tarball/master" or []);
-    deps = [
-      self.full."tap".">=0.2.3"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "nodeunit" ];
-  };
   full."nopt"."2" = lib.makeOverridable self.buildNodePackage {
     name = "nopt-2.1.2";
     src = [
@@ -7704,6 +8615,23 @@
     ];
     passthru.names = [ "nopt" ];
   };
+  full."nopt"."2.1.x" = lib.makeOverridable self.buildNodePackage {
+    name = "nopt-2.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz";
+        sha1 = "6cccd977b80132a07731d6e8ce58c2c8303cf9af";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."nopt"."2.1.x" or []);
+    deps = [
+      self.full."abbrev"."1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "nopt" ];
+  };
   full."nopt"."~1.0.10" = lib.makeOverridable self.buildNodePackage {
     name = "nopt-1.0.10";
     src = [
@@ -7721,23 +8649,6 @@
     ];
     passthru.names = [ "nopt" ];
   };
-  full."nopt"."~2" = lib.makeOverridable self.buildNodePackage {
-    name = "nopt-2.1.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz";
-        sha1 = "6cccd977b80132a07731d6e8ce58c2c8303cf9af";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."nopt"."~2" or []);
-    deps = [
-      self.full."abbrev"."1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "nopt" ];
-  };
   full."nopt"."~2.1.1" = lib.makeOverridable self.buildNodePackage {
     name = "nopt-2.1.2";
     src = [
@@ -8070,11 +8981,11 @@
     passthru.names = [ "npmconf" ];
   };
   full."npmconf"."~0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "npmconf-0.1.2";
+    name = "npmconf-0.1.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.2.tgz";
-        sha1 = "99af8122f0067802436a5b71dbf8c3539697e62c";
+        url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.3.tgz";
+        sha1 = "e17832649a36785f086dac3d50705508e4f996e6";
       })
     ];
     buildInputs =
@@ -8094,11 +9005,11 @@
     passthru.names = [ "npmconf" ];
   };
   full."npmconf"."~0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "npmconf-0.1.2";
+    name = "npmconf-0.1.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.2.tgz";
-        sha1 = "99af8122f0067802436a5b71dbf8c3539697e62c";
+        url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.3.tgz";
+        sha1 = "e17832649a36785f086dac3d50705508e4f996e6";
       })
     ];
     buildInputs =
@@ -8418,6 +9329,24 @@
     ];
     passthru.names = [ "optimist" ];
   };
+  full."optimist"."0.6.0" = lib.makeOverridable self.buildNodePackage {
+    name = "optimist-0.6.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz";
+        sha1 = "69424826f3405f79f142e6fc3d9ae58d4dbb9200";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."optimist"."0.6.0" or []);
+    deps = [
+      self.full."wordwrap"."~0.0.2"
+      self.full."minimist"."~0.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "optimist" ];
+  };
   full."optimist"."~0.3" = lib.makeOverridable self.buildNodePackage {
     name = "optimist-0.3.7";
     src = [
@@ -8746,11 +9675,11 @@
     passthru.names = [ "pause" ];
   };
   full."phantomjs"."~1.9" = lib.makeOverridable self.buildNodePackage {
-    name = "phantomjs-1.9.1-8";
+    name = "phantomjs-1.9.1-9";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.1-8.tgz";
-        sha1 = "1fb7a800b403474974a696afebfbaa20b616e040";
+        url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.1-9.tgz";
+        sha1 = "f18671f4bcbbb5d5fc4a20ddcd6800ab0edc4453";
       })
     ];
     buildInputs =
@@ -9010,6 +9939,22 @@
     ];
     passthru.names = [ "pullstream" ];
   };
+  full."q"."0.9.x" = lib.makeOverridable self.buildNodePackage {
+    name = "q-0.9.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/q/-/q-0.9.6.tgz";
+        sha1 = "5884b2154bdb3b6d5765e0fafddcb1506e133619";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."q"."0.9.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "q" ];
+  };
   full."q".">= 0.0.1" = lib.makeOverridable self.buildNodePackage {
     name = "q-0.9.6";
     src = [
@@ -9058,6 +10003,22 @@
     ];
     passthru.names = [ "q" ];
   };
+  full."q"."~0.9.6" = lib.makeOverridable self.buildNodePackage {
+    name = "q-0.9.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/q/-/q-0.9.6.tgz";
+        sha1 = "5884b2154bdb3b6d5765e0fafddcb1506e133619";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."q"."~0.9.6" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "q" ];
+  };
   full."qs"."0.5.1" = lib.makeOverridable self.buildNodePackage {
     name = "qs-0.5.1";
     src = [
@@ -9106,6 +10067,22 @@
     ];
     passthru.names = [ "qs" ];
   };
+  full."qs"."~0.5.0" = lib.makeOverridable self.buildNodePackage {
+    name = "qs-0.5.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/qs/-/qs-0.5.6.tgz";
+        sha1 = "31b1ad058567651c526921506b9a8793911a0384";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."qs"."~0.5.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "qs" ];
+  };
   full."qs"."~0.5.4" = lib.makeOverridable self.buildNodePackage {
     name = "qs-0.5.6";
     src = [
@@ -9351,11 +10328,11 @@
     passthru.names = [ "read-package-json" ];
   };
   full."readable-stream"."1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "readable-stream-1.0.15";
+    name = "readable-stream-1.0.17";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.15.tgz";
-        sha1 = "a2c160237235951da985a1572d0a3af585e4be95";
+        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.17.tgz";
+        sha1 = "cbc295fdf394dfa1225d225d02e6b6d0f409fd4b";
       })
     ];
     buildInputs =
@@ -9367,11 +10344,11 @@
     passthru.names = [ "readable-stream" ];
   };
   full."readable-stream"."~1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "readable-stream-1.0.15";
+    name = "readable-stream-1.0.17";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.15.tgz";
-        sha1 = "a2c160237235951da985a1572d0a3af585e4be95";
+        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.17.tgz";
+        sha1 = "cbc295fdf394dfa1225d225d02e6b6d0f409fd4b";
       })
     ];
     buildInputs =
@@ -9383,11 +10360,11 @@
     passthru.names = [ "readable-stream" ];
   };
   full."readable-stream"."~1.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "readable-stream-1.0.15";
+    name = "readable-stream-1.0.17";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.15.tgz";
-        sha1 = "a2c160237235951da985a1572d0a3af585e4be95";
+        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.17.tgz";
+        sha1 = "cbc295fdf394dfa1225d225d02e6b6d0f409fd4b";
       })
     ];
     buildInputs =
@@ -9616,6 +10593,33 @@
     ];
     passthru.names = [ "request" ];
   };
+  full."request"."2.16.2" = lib.makeOverridable self.buildNodePackage {
+    name = "request-2.16.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/request/-/request-2.16.2.tgz";
+        sha1 = "83a028be61be4a05163e7e2e7a4b40e35df1bcb9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."request"."2.16.2" or []);
+    deps = [
+      self.full."form-data"."~0.0.3"
+      self.full."mime"."~1.2.7"
+      self.full."hawk"."~0.10.0"
+      self.full."node-uuid"."~1.4.0"
+      self.full."cookie-jar"."~0.2.0"
+      self.full."aws-sign"."~0.2.0"
+      self.full."oauth-sign"."~0.2.0"
+      self.full."forever-agent"."~0.2.0"
+      self.full."tunnel-agent"."~0.2.0"
+      self.full."json-stringify-safe"."~3.0.0"
+      self.full."qs"."~0.5.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "request" ];
+  };
   full."request"."2.16.x" = lib.makeOverridable self.buildNodePackage {
     name = "request-2.16.6";
     src = [
@@ -9659,6 +10663,34 @@
     ];
     passthru.names = [ "request" ];
   };
+  full."request".">=2.12.0" = lib.makeOverridable self.buildNodePackage {
+    name = "request-2.27.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/request/-/request-2.27.0.tgz";
+        sha1 = "dfb1a224dd3a5a9bade4337012503d710e538668";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."request".">=2.12.0" or []);
+    deps = [
+      self.full."qs"."~0.6.0"
+      self.full."json-stringify-safe"."~5.0.0"
+      self.full."forever-agent"."~0.5.0"
+      self.full."tunnel-agent"."~0.3.0"
+      self.full."http-signature"."~0.10.0"
+      self.full."hawk"."~1.0.0"
+      self.full."aws-sign"."~0.3.0"
+      self.full."oauth-sign"."~0.3.0"
+      self.full."cookie-jar"."~0.3.0"
+      self.full."node-uuid"."~1.4.0"
+      self.full."mime"."~1.2.9"
+      self.full."form-data"."~0.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "request" ];
+  };
   full."request"."~2" = lib.makeOverridable self.buildNodePackage {
     name = "request-2.27.0";
     src = [
@@ -9798,34 +10830,6 @@
     ];
     passthru.names = [ "request" ];
   };
-  full."request"."~2.26.0" = lib.makeOverridable self.buildNodePackage {
-    name = "request-2.26.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/request/-/request-2.26.0.tgz";
-        sha1 = "79b03075cbac2e22ebe41aa7fca884e869c1c212";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."request"."~2.26.0" or []);
-    deps = [
-      self.full."qs"."~0.6.0"
-      self.full."json-stringify-safe"."~5.0.0"
-      self.full."forever-agent"."~0.5.0"
-      self.full."tunnel-agent"."~0.3.0"
-      self.full."http-signature"."~0.10.0"
-      self.full."hawk"."~1.0.0"
-      self.full."aws-sign"."~0.3.0"
-      self.full."oauth-sign"."~0.3.0"
-      self.full."cookie-jar"."~0.3.0"
-      self.full."node-uuid"."~1.4.0"
-      self.full."mime"."~1.2.9"
-      self.full."form-data"."~0.1.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "request" ];
-  };
   full."request"."~2.27.0" = lib.makeOverridable self.buildNodePackage {
     name = "request-2.27.0";
     src = [
@@ -9854,16 +10858,16 @@
     ];
     passthru.names = [ "request" ];
   };
-  full."request-progress"."~0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "request-progress-0.2.3";
+  full."request-progress"."~0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "request-progress-0.3.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/request-progress/-/request-progress-0.2.3.tgz";
-        sha1 = "5be7088f66642e2739e9058a07cceef0c2868b8b";
+        url = "http://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz";
+        sha1 = "0721c105d8a96ac6b2ce8b2c89ae2d5ecfcf6b3a";
       })
     ];
     buildInputs =
-      (self.nativeDeps."request-progress"."~0.2.0" or []);
+      (self.nativeDeps."request-progress"."~0.3.0" or []);
     deps = [
       self.full."throttleit"."~0.0.2"
     ];
@@ -9888,6 +10892,38 @@
     ];
     passthru.names = [ "request-replay" ];
   };
+  full."requirejs"."~2.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "requirejs-2.1.8";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/requirejs/-/requirejs-2.1.8.tgz";
+        sha1 = "f0dfa656d60d404947da796f9c661d92c1b0257a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."requirejs"."~2.1.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "requirejs" ];
+  };
+  full."resolve"."0.4.x" = lib.makeOverridable self.buildNodePackage {
+    name = "resolve-0.4.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/resolve/-/resolve-0.4.3.tgz";
+        sha1 = "dcadad202e7cacc2467e3a38800211f42f9c13df";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."resolve"."0.4.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "resolve" ];
+  };
   full."resolve"."~0.3.1" = lib.makeOverridable self.buildNodePackage {
     name = "resolve-0.3.1";
     src = [
@@ -10120,23 +11156,6 @@
     ];
     passthru.names = [ "rimraf" ];
   };
-  full."runforcover"."~0.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "runforcover-0.0.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/runforcover/-/runforcover-0.0.2.tgz";
-        sha1 = "344f057d8d45d33aebc6cc82204678f69c4857cc";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."runforcover"."~0.0.2" or []);
-    deps = [
-      self.full."bunker"."0.1.X"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "runforcover" ];
-  };
   full."s3http"."*" = lib.makeOverridable self.buildNodePackage {
     name = "s3http-0.0.2";
     src = [
@@ -10158,22 +11177,41 @@
   };
   "s3http" = self.full."s3http"."*";
   full."safefs"."~3.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "safefs-3.0.1";
+    name = "safefs-3.0.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/safefs/-/safefs-3.0.1.tgz";
-        sha1 = "a4fd36bcd4805782f0d702e97b47323eafc94cb8";
+        url = "http://registry.npmjs.org/safefs/-/safefs-3.0.3.tgz";
+        sha1 = "1d511e2945f0e7eccdd6bb12ec2e309abf13514e";
       })
     ];
     buildInputs =
       (self.nativeDeps."safefs"."~3.0.1" or []);
     deps = [
-      self.full."taskgroup".">=3 <3.2"
+      self.full."taskgroup"."~3.2.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "safefs" ];
   };
+  full."sauce-connect-launcher"."~0.1.10" = lib.makeOverridable self.buildNodePackage {
+    name = "sauce-connect-launcher-0.1.11";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-0.1.11.tgz";
+        sha1 = "71ac88bdab7bd8396a3f7d9feb165a4e457c3ecd";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."sauce-connect-launcher"."~0.1.10" or []);
+    deps = [
+      self.full."lodash"."~1.3.1"
+      self.full."async"."~0.2.9"
+      self.full."adm-zip"."~0.4.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "sauce-connect-launcher" ];
+  };
   full."sax"."0.5.x" = lib.makeOverridable self.buildNodePackage {
     name = "sax-0.5.5";
     src = [
@@ -10742,22 +11780,6 @@
     ];
     passthru.names = [ "sliced" ];
   };
-  full."slide"."*" = lib.makeOverridable self.buildNodePackage {
-    name = "slide-1.1.5";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/slide/-/slide-1.1.5.tgz";
-        sha1 = "31732adeae78f1d2d60a29b63baf6a032df7c25d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."slide"."*" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "slide" ];
-  };
   full."slide"."~1.1.3" = lib.makeOverridable self.buildNodePackage {
     name = "slide-1.1.5";
     src = [
@@ -11006,6 +12028,23 @@
     passthru.names = [ "source-map" ];
   };
   "source-map" = self.full."source-map"."*";
+  full."source-map".">= 0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "source-map-0.1.29";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/source-map/-/source-map-0.1.29.tgz";
+        sha1 = "39d571a0988fb7a548a676c4de72db78914d173c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."source-map".">= 0.1.2" or []);
+    deps = [
+      self.full."amdefine".">=0.0.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "source-map" ];
+  };
   full."source-map"."~0.1.7" = lib.makeOverridable self.buildNodePackage {
     name = "source-map-0.1.29";
     src = [
@@ -11161,11 +12200,11 @@
     passthru.names = [ "streamsearch" ];
   };
   full."stringify-object"."~0.1.4" = lib.makeOverridable self.buildNodePackage {
-    name = "stringify-object-0.1.5";
+    name = "stringify-object-0.1.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/stringify-object/-/stringify-object-0.1.5.tgz";
-        sha1 = "87d8b63a3e5dfb189370622f241beeedf706ab3b";
+        url = "http://registry.npmjs.org/stringify-object/-/stringify-object-0.1.6.tgz";
+        sha1 = "f6f66711ef72225ea6e82e6147e43b03e732e40c";
       })
     ];
     buildInputs =
@@ -11347,32 +12386,6 @@
     ];
     passthru.names = [ "sylvester" ];
   };
-  full."tap".">=0.2.3" = lib.makeOverridable self.buildNodePackage {
-    name = "tap-0.4.4";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/tap/-/tap-0.4.4.tgz";
-        sha1 = "122ee7afee3fc7f327660a4fda1e5ac9db2b7714";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."tap".">=0.2.3" or []);
-    deps = [
-      self.full."inherits"."*"
-      self.full."yamlish"."*"
-      self.full."slide"."*"
-      self.full."runforcover"."~0.0.2"
-      self.full."nopt"."~2"
-      self.full."mkdirp"."~0.3"
-      self.full."difflet"."~0.2.0"
-      self.full."deep-equal"."~0.0.0"
-      self.full."buffer-equal"."~0.0.0"
-      self.full."glob"."~3.2.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "tap" ];
-  };
   full."tar"."*" = lib.makeOverridable self.buildNodePackage {
     name = "tar-0.1.18";
     src = [
@@ -11469,24 +12482,6 @@
     ];
     passthru.names = [ "tar" ];
   };
-  full."taskgroup".">=3 <3.2" = lib.makeOverridable self.buildNodePackage {
-    name = "taskgroup-3.1.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/taskgroup/-/taskgroup-3.1.2.tgz";
-        sha1 = "81fec5dc7eb647fd5a0ba8ed02ee3a730244ca16";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."taskgroup".">=3 <3.2" or []);
-    deps = [
-      self.full."ambi"."~2.0.0"
-      self.full."eventemitter2"."~0.4.11"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "taskgroup" ];
-  };
   full."taskgroup"."~3.1.1" = lib.makeOverridable self.buildNodePackage {
     name = "taskgroup-3.1.2";
     src = [
@@ -11505,6 +12500,23 @@
     ];
     passthru.names = [ "taskgroup" ];
   };
+  full."taskgroup"."~3.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "taskgroup-3.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/taskgroup/-/taskgroup-3.2.0.tgz";
+        sha1 = "ac45e79852a080bd20716eae6d79931968d637d2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."taskgroup"."~3.2.0" or []);
+    deps = [
+      self.full."ambi"."~2.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "taskgroup" ];
+  };
   full."temp"."*" = lib.makeOverridable self.buildNodePackage {
     name = "temp-0.5.1";
     src = [
@@ -11655,22 +12667,6 @@
     ];
     passthru.names = [ "transformers" ];
   };
-  full."traverse"."0.6.x" = lib.makeOverridable self.buildNodePackage {
-    name = "traverse-0.6.3";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/traverse/-/traverse-0.6.3.tgz";
-        sha1 = "a053ffa1b6179b9240ea16d74bfd604bd6b6e41b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."traverse"."0.6.x" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "traverse" ];
-  };
   full."traverse".">=0.3.0 <0.4" = lib.makeOverridable self.buildNodePackage {
     name = "traverse-0.3.9";
     src = [
@@ -11687,22 +12683,6 @@
     ];
     passthru.names = [ "traverse" ];
   };
-  full."traverse"."~0.5.1" = lib.makeOverridable self.buildNodePackage {
-    name = "traverse-0.5.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/traverse/-/traverse-0.5.2.tgz";
-        sha1 = "e203c58d5f7f0e37db6e74c0acb929bb09b61d85";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."traverse"."~0.5.1" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "traverse" ];
-  };
   full."tunnel-agent"."~0.2.0" = lib.makeOverridable self.buildNodePackage {
     name = "tunnel-agent-0.2.0";
     src = [
@@ -11767,36 +12747,21 @@
     ];
     passthru.names = [ "uglify-js" ];
   };
-  full."uglify-js"."2.3.6" = lib.makeOverridable self.buildNodePackage {
-    name = "uglify-js-2.3.6";
+  full."uglify-js"."2.4.0" = lib.makeOverridable self.buildNodePackage {
+    name = "uglify-js-2.4.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz";
-        sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a";
+        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.0.tgz";
+        sha1 = "a5f2b6b1b817fb34c16a04234328c89ba1e77137";
       })
     ];
     buildInputs =
-      (self.nativeDeps."uglify-js"."2.3.6" or []);
+      (self.nativeDeps."uglify-js"."2.4.0" or []);
     deps = [
       self.full."async"."~0.2.6"
       self.full."source-map"."~0.1.7"
       self.full."optimist"."~0.3.5"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "uglify-js" ];
-  };
-  full."uglify-js"."~1.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "uglify-js-1.1.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.1.1.tgz";
-        sha1 = "ee71a97c4cefd06a1a9b20437f34118982aa035b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."uglify-js"."~1.1.1" or []);
-    deps = [
+      self.full."uglify-to-browserify"."~1.0.0"
     ];
     peerDependencies = [
     ];
@@ -11839,25 +12804,42 @@
     ];
     passthru.names = [ "uglify-js" ];
   };
-  full."uglify-js"."~2.3.6" = lib.makeOverridable self.buildNodePackage {
-    name = "uglify-js-2.3.6";
+  full."uglify-js"."~2.4.0" = lib.makeOverridable self.buildNodePackage {
+    name = "uglify-js-2.4.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz";
-        sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a";
+        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.0.tgz";
+        sha1 = "a5f2b6b1b817fb34c16a04234328c89ba1e77137";
       })
     ];
     buildInputs =
-      (self.nativeDeps."uglify-js"."~2.3.6" or []);
+      (self.nativeDeps."uglify-js"."~2.4.0" or []);
     deps = [
       self.full."async"."~0.2.6"
       self.full."source-map"."~0.1.7"
       self.full."optimist"."~0.3.5"
+      self.full."uglify-to-browserify"."~1.0.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "uglify-js" ];
   };
+  full."uglify-to-browserify"."~1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "uglify-to-browserify-1.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.1.tgz";
+        sha1 = "0e9ada5d4ca358a59a00bb33c8061e2f40ef97d2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."uglify-to-browserify"."~1.0.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "uglify-to-browserify" ];
+  };
   full."uid-number"."0" = lib.makeOverridable self.buildNodePackage {
     name = "uid-number-0.0.3";
     src = [
@@ -12003,6 +12985,22 @@
     ];
     passthru.names = [ "underscore" ];
   };
+  full."underscore.string"."~2.2.0rc" = lib.makeOverridable self.buildNodePackage {
+    name = "underscore.string-2.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz";
+        sha1 = "d7c0fa2af5d5a1a67f4253daee98132e733f0f19";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."underscore.string"."~2.2.0rc" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "underscore.string" ];
+  };
   full."underscore.string"."~2.3.1" = lib.makeOverridable self.buildNodePackage {
     name = "underscore.string-2.3.3";
     src = [
@@ -12020,11 +13018,11 @@
     passthru.names = [ "underscore.string" ];
   };
   full."ungit"."*" = lib.makeOverridable self.buildNodePackage {
-    name = "ungit-0.1.6";
+    name = "ungit-0.1.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/ungit/-/ungit-0.1.6.tgz";
-        sha1 = "83c7aa319fea9201ae1b5ed43612303881b593d2";
+        url = "http://registry.npmjs.org/ungit/-/ungit-0.1.8.tgz";
+        sha1 = "9d6c45b3771d983bf011424f4cb284c1e79ef0c8";
       })
     ];
     buildInputs =
@@ -12048,6 +13046,7 @@
       self.full."semver"."2.0.8"
       self.full."forever-monitor"."1.1.0"
       self.full."open"."0.0.4"
+      self.full."optimist"."0.6.0"
     ];
     peerDependencies = [
     ];
@@ -12055,11 +13054,11 @@
   };
   "ungit" = self.full."ungit"."*";
   full."unzip"."~0.1.7" = lib.makeOverridable self.buildNodePackage {
-    name = "unzip-0.1.8";
+    name = "unzip-0.1.9";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/unzip/-/unzip-0.1.8.tgz";
-        sha1 = "b6ca171798242150b06fca320544592231aeb158";
+        url = "http://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz";
+        sha1 = "12ac4d05c0a19fc4546df4c50ae0a7f4706a9424";
       })
     ];
     buildInputs =
@@ -12250,6 +13249,22 @@
     ];
     passthru.names = [ "validator" ];
   };
+  full."vargs"."~0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "vargs-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/vargs/-/vargs-0.1.0.tgz";
+        sha1 = "6b6184da6520cc3204ce1b407cac26d92609ebff";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."vargs"."~0.1.0" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "vargs" ];
+  };
   full."vasync"."1.3.3" = lib.makeOverridable self.buildNodePackage {
     name = "vasync-1.3.3";
     src = [
@@ -12426,6 +13441,28 @@
     ];
     passthru.names = [ "watchr" ];
   };
+  full."wd"."~0.0.32" = lib.makeOverridable self.buildNodePackage {
+    name = "wd-0.0.34";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/wd/-/wd-0.0.34.tgz";
+        sha1 = "c8d00ccdbb2862f914b7bd5935330a53cfa88562";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."wd"."~0.0.32" or []);
+    deps = [
+      self.full."async"."0.2.x"
+      self.full."underscore"."1.4.x"
+      self.full."vargs"."~0.1.0"
+      self.full."q"."0.9.x"
+      self.full."request"."~2.21.0"
+      self.full."archiver"."~0.4.6"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "wd" ];
+  };
   full."websocket-driver".">=0.2.0" = lib.makeOverridable self.buildNodePackage {
     name = "websocket-driver-0.2.2";
     src = [
@@ -12474,6 +13511,22 @@
     ];
     passthru.names = [ "which" ];
   };
+  full."which"."1.0.x" = lib.makeOverridable self.buildNodePackage {
+    name = "which-1.0.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/which/-/which-1.0.5.tgz";
+        sha1 = "5630d6819dda692f1464462e7956cb42c0842739";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."which"."1.0.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "which" ];
+  };
   full."which"."~1.0.5" = lib.makeOverridable self.buildNodePackage {
     name = "which-1.0.5";
     src = [
@@ -12602,22 +13655,38 @@
     passthru.names = [ "winston" ];
   };
   full."with"."~1.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "with-1.1.0";
+    name = "with-1.1.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/with/-/with-1.1.0.tgz";
-        sha1 = "7f722ce4050ab55310777327b014194c544c66dd";
+        url = "http://registry.npmjs.org/with/-/with-1.1.1.tgz";
+        sha1 = "66bd6664deb318b2482dd0424ccdebe822434ac0";
       })
     ];
     buildInputs =
       (self.nativeDeps."with"."~1.1.0" or []);
     deps = [
-      self.full."uglify-js"."2.3.6"
+      self.full."uglify-js"."2.4.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "with" ];
   };
+  full."wordwrap"."0.0.x" = lib.makeOverridable self.buildNodePackage {
+    name = "wordwrap-0.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
+        sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."wordwrap"."0.0.x" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "wordwrap" ];
+  };
   full."wordwrap".">=0.0.1 <0.1.0" = lib.makeOverridable self.buildNodePackage {
     name = "wordwrap-0.0.2";
     src = [
@@ -12651,11 +13720,11 @@
     passthru.names = [ "wordwrap" ];
   };
   full."ws"."0.4.x" = lib.makeOverridable self.buildNodePackage {
-    name = "ws-0.4.29";
+    name = "ws-0.4.30";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/ws/-/ws-0.4.29.tgz";
-        sha1 = "4b79ef62b4f3f782a05ba56b41b122d1252d4f90";
+        url = "http://registry.npmjs.org/ws/-/ws-0.4.30.tgz";
+        sha1 = "5e2c18b7bb7ee0f9c9fcc3d3ec50f513ba5f99e8";
       })
     ];
     buildInputs =
@@ -12754,6 +13823,22 @@
     ];
     passthru.names = [ "xmlbuilder" ];
   };
+  full."xmlbuilder"."0.4.2" = lib.makeOverridable self.buildNodePackage {
+    name = "xmlbuilder-0.4.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.2.tgz";
+        sha1 = "1776d65f3fdbad470a08d8604cdeb1c4e540ff83";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."xmlbuilder"."0.4.2" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "xmlbuilder" ];
+  };
   full."xmlhttprequest"."1.4.2" = lib.makeOverridable self.buildNodePackage {
     name = "xmlhttprequest-1.4.2";
     src = [
@@ -12786,21 +13871,37 @@
     ];
     passthru.names = [ "xoauth2" ];
   };
-  full."yamlish"."*" = lib.makeOverridable self.buildNodePackage {
-    name = "yamlish-0.0.5";
+  full."yaml"."0.2.3" = lib.makeOverridable self.buildNodePackage {
+    name = "yaml-0.2.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/yamlish/-/yamlish-0.0.5.tgz";
-        sha1 = "86c6c8e6b28b0827416dcc86f7419bba5610b57d";
+        url = "http://registry.npmjs.org/yaml/-/yaml-0.2.3.tgz";
+        sha1 = "b5450e92e76ef36b5dd24e3660091ebaeef3e5c7";
       })
     ];
     buildInputs =
-      (self.nativeDeps."yamlish"."*" or []);
+      (self.nativeDeps."yaml"."0.2.3" or []);
     deps = [
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "yamlish" ];
+    passthru.names = [ "yaml" ];
+  };
+  full."ycssmin".">=1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "ycssmin-1.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ycssmin/-/ycssmin-1.0.1.tgz";
+        sha1 = "7cdde8db78cfab00d2901c3b2301e304faf4df16";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ycssmin".">=1.0.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ycssmin" ];
   };
   full."yeoman-generator"."~0.10.0" = lib.makeOverridable self.buildNodePackage {
     name = "yeoman-generator-0.10.5";
@@ -12834,11 +13935,11 @@
     passthru.names = [ "yeoman-generator" ];
   };
   full."yeoman-generator"."~0.13.0" = lib.makeOverridable self.buildNodePackage {
-    name = "yeoman-generator-0.13.3";
+    name = "yeoman-generator-0.13.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.13.3.tgz";
-        sha1 = "5e0f0a74d6ebb61e72689d446404c200e915d14c";
+        url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.13.4.tgz";
+        sha1 = "066798dd978026d37be6657b2672a17bc4f4ce34";
       })
     ];
     buildInputs =
@@ -12858,7 +13959,7 @@
       self.full."isbinaryfile"."~0.1.8"
       self.full."dargs"."~0.1.0"
       self.full."async"."~0.2.8"
-      self.full."inquirer"."~0.2.0"
+      self.full."inquirer"."~0.3.1"
       self.full."iconv-lite"."~0.2.10"
       self.full."shelljs"."~0.1.4"
       self.full."findup-sync"."~0.1.2"
@@ -12870,11 +13971,11 @@
     passthru.names = [ "yeoman-generator" ];
   };
   full."yeoman-generator"."~0.13.1" = lib.makeOverridable self.buildNodePackage {
-    name = "yeoman-generator-0.13.3";
+    name = "yeoman-generator-0.13.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.13.3.tgz";
-        sha1 = "5e0f0a74d6ebb61e72689d446404c200e915d14c";
+        url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.13.4.tgz";
+        sha1 = "066798dd978026d37be6657b2672a17bc4f4ce34";
       })
     ];
     buildInputs =
@@ -12894,7 +13995,7 @@
       self.full."isbinaryfile"."~0.1.8"
       self.full."dargs"."~0.1.0"
       self.full."async"."~0.2.8"
-      self.full."inquirer"."~0.2.0"
+      self.full."inquirer"."~0.3.1"
       self.full."iconv-lite"."~0.2.10"
       self.full."shelljs"."~0.1.4"
       self.full."findup-sync"."~0.1.2"
@@ -12906,11 +14007,11 @@
     passthru.names = [ "yeoman-generator" ];
   };
   full."yeoman-generator"."~0.13.2" = lib.makeOverridable self.buildNodePackage {
-    name = "yeoman-generator-0.13.3";
+    name = "yeoman-generator-0.13.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.13.3.tgz";
-        sha1 = "5e0f0a74d6ebb61e72689d446404c200e915d14c";
+        url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.13.4.tgz";
+        sha1 = "066798dd978026d37be6657b2672a17bc4f4ce34";
       })
     ];
     buildInputs =
@@ -12930,7 +14031,7 @@
       self.full."isbinaryfile"."~0.1.8"
       self.full."dargs"."~0.1.0"
       self.full."async"."~0.2.8"
-      self.full."inquirer"."~0.2.0"
+      self.full."inquirer"."~0.3.1"
       self.full."iconv-lite"."~0.2.10"
       self.full."shelljs"."~0.1.4"
       self.full."findup-sync"."~0.1.2"
@@ -12942,11 +14043,11 @@
     passthru.names = [ "yeoman-generator" ];
   };
   full."yo"."*" = lib.makeOverridable self.buildNodePackage {
-    name = "yo-1.0.3";
+    name = "yo-1.0.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/yo/-/yo-1.0.3.tgz";
-        sha1 = "7235b66201eb66e523204a463a0ed2cf3c2ee45b";
+        url = "http://registry.npmjs.org/yo/-/yo-1.0.4.tgz";
+        sha1 = "666b5965a8e920df877d351da793f89bd1c8707a";
       })
     ];
     buildInputs =
@@ -12956,11 +14057,11 @@
       self.full."nopt"."~2.1.1"
       self.full."lodash"."~1.3.1"
       self.full."update-notifier"."~0.1.3"
-      self.full."insight"."~0.1.0"
+      self.full."insight"."~0.2.0"
       self.full."sudo-block"."~0.2.0"
       self.full."async"."~0.2.9"
       self.full."open"."0.0.4"
-      self.full."chalk"."~0.1.0"
+      self.full."chalk"."~0.2.0"
     ];
     peerDependencies = [
       self.full."grunt-cli"."~0.1.7"
@@ -12970,11 +14071,11 @@
   };
   "yo" = self.full."yo"."*";
   full."yo".">=1.0.0-rc.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "yo-1.0.3";
+    name = "yo-1.0.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/yo/-/yo-1.0.3.tgz";
-        sha1 = "7235b66201eb66e523204a463a0ed2cf3c2ee45b";
+        url = "http://registry.npmjs.org/yo/-/yo-1.0.4.tgz";
+        sha1 = "666b5965a8e920df877d351da793f89bd1c8707a";
       })
     ];
     buildInputs =
@@ -12984,11 +14085,11 @@
       self.full."nopt"."~2.1.1"
       self.full."lodash"."~1.3.1"
       self.full."update-notifier"."~0.1.3"
-      self.full."insight"."~0.1.0"
+      self.full."insight"."~0.2.0"
       self.full."sudo-block"."~0.2.0"
       self.full."async"."~0.2.9"
       self.full."open"."0.0.4"
-      self.full."chalk"."~0.1.0"
+      self.full."chalk"."~0.2.0"
     ];
     peerDependencies = [
       self.full."grunt-cli"."~0.1.7"
@@ -13012,4 +14113,20 @@
     ];
     passthru.names = [ "zeparser" ];
   };
+  full."zlib-browserify"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "zlib-browserify-0.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/zlib-browserify/-/zlib-browserify-0.0.1.tgz";
+        sha1 = "4fa6a45d00dbc15f318a4afa1d9afc0258e176cc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."zlib-browserify"."0.0.1" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "zlib-browserify" ];
+  };
 }
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index 05892068dc8..d3dcbe665c5 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -73,8 +73,25 @@
 , "generator-webapp"
 , "generator-angular"
 , "statsd"
-, "karma"
 , "ungit"
 , { "node-uptime": "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" }
 , { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " }
+, "bower"
+, "grunt-cli"
+, "grunt-contrib-jshint"
+, "grunt-contrib-requirejs"
+, "grunt-contrib-less"
+, "grunt-contrib-cssmin"
+, "grunt-contrib-uglify"
+, "grunt-karma"
+, "karma"
+, "karma-mocha"
+, "karma-coverage"
+, "karma-requirejs"
+, "karma-sauce-launcher"
+, "karma-chrome-launcher"
+, "karma-junit-reporter"
+, "almond"
+, "lcov-result-merger"
+, "coveralls"
 ]
diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix
index 2b050b1319a..8725ce1e9cd 100644
--- a/pkgs/top-level/node-packages.nix
+++ b/pkgs/top-level/node-packages.nix
@@ -3,7 +3,7 @@
 {
   nativeDeps = {
     "node-expat"."*" = [ pkgs.expat ];
-    "rbytes"."0.0.2" = [ pkgs.openssl ];
+    "rbytes"."*" = [ pkgs.openssl ];
     "phantomjs"."~1.9" = [ pkgs.phantomjs ];
   };
 

From 99942d1fad0f86eb4cdc01e176d09610b60179bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 4 Sep 2013 19:49:09 +0200
Subject: [PATCH 310/452] source-highlight: unbreak by using boost 1.53

One of the tests started failing when boost was bumped from 1.53 to 1.54
(in July). Instead of skipping the tests, fix it by using boost 1.53.
---
 pkgs/top-level/all-packages.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8396fd60c1a..6b5356b223b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1737,7 +1737,10 @@ let
 
   socat = callPackage ../tools/networking/socat { };
 
-  sourceHighlight = callPackage ../tools/text/source-highlight { };
+  sourceHighlight = callPackage ../tools/text/source-highlight {
+    # Boost 1.54 causes the "test_regexranges" test to fail
+    boost = boost153;
+  };
 
   socat2pre = lowPrio (builderDefsPackage ../tools/networking/socat/2.0.0-b3.nix {
     inherit fetchurl stdenv openssl;

From 6167864aaba8e04d48070b0ee68d71c0e3eeb76c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 4 Sep 2013 19:55:54 +0200
Subject: [PATCH 311/452] source-highlight: 3.1.6 -> 3.1.7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From NEWS file (version 3.1.7):

  * fixed compilation bugs in MacOsX systems (thanks to
    Trevor Spiteri)
  * language definition for Lilypond (thanks to Federico Bruni)
  * language definition for R statistics programming language
  * language definition for ISLISP (thanks to Christian Jullien)
  * improved Erlang definition file (thanks to Erik Søe Sørensen)
  * new output format: ESC 256 ascii code (thanks to
    Xavier-Emmanuel Vincent).

(It still needs boost 1.53 for all tests to pass.)
---
 pkgs/tools/text/source-highlight/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix
index ca3ec39da71..148bbfce99d 100644
--- a/pkgs/tools/text/source-highlight/default.nix
+++ b/pkgs/tools/text/source-highlight/default.nix
@@ -2,14 +2,14 @@
 
 let
   name = "source-highlight";
-  version = "3.1.6";
+  version = "3.1.7";
 in
 stdenv.mkDerivation {
   name = "${name}-${version}";
 
   src = fetchurl {
       url = "mirror://gnu/src-highlite/${name}-${version}.tar.gz";
-      sha256 = "0a5zh876nc1gig8z586b953r8ahh9zbs1lmi8vxjrkwp6zqzf4xm";
+      sha256 = "1s49ld8cnpzhhwq0r7s0sfm3cg3nhhm0wla27lwraifrrl3y1cp1";
     };
 
   configureFlags = [ "--with-boost=${boost}" ];

From 6eb240ed2448971ad8c261172b5ebbb74051a92d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 4 Sep 2013 21:18:48 +0200
Subject: [PATCH 312/452] gsoap: 2.7.15 -> 2.8.16

Version 2.7.15 doesn't build anymore (source archive not downloadable).
Bump it to latest version and update meta attributes.
---
 pkgs/development/libraries/gsoap/default.nix | 33 ++++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/gsoap/default.nix b/pkgs/development/libraries/gsoap/default.nix
index 4d661d4088f..d1140319611 100644
--- a/pkgs/development/libraries/gsoap/default.nix
+++ b/pkgs/development/libraries/gsoap/default.nix
@@ -1,19 +1,32 @@
-{ stdenv, fetchurl, m4, bison, flex, openssl, zlib }:
+{ stdenv, fetchurl, unzip, m4, bison, flex, openssl, zlib }:
 
-let version = "2.7.15"; in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "gsoap-${version}";
+  version = "2.8.16";
 
   src = fetchurl {
-    url = "mirror://sourceforge/gsoap2/files/gSOAP/2.7.15%20stable/gsoap_${version}.tar.gz";
-    sha256 = "3ed883ab1a3d32b5bb2bf599306f247f6de3ffedd8890eb0e6303ae15995dc12";
+    url = "mirror://sourceforge/project/gsoap2/gSOAP/gsoap_${version}.zip";
+    sha256 = "00lhhysa9f9ychkvn1ij0ngr54l1dl9ww801yrliwq5c05gql7a6";
   };
 
-  buildInputs = [ m4 bison flex openssl zlib ];
-  meta = {
+  buildInputs = [ unzip m4 bison flex openssl zlib ];
+
+  meta = with stdenv.lib; {
+    description = "C/C++ toolkit for SOAP web services and XML-based applications";
     homepage = "http://www.cs.fsu.edu/~engelen/soap.html";
-    description = "The gSOAP toolkit is an open source C and C++ software development toolkit for SOAP/WSDL and XML Web services.";
-    license = "free-non-copyleft";
+    # gsoap is dual/triple licensed (see homepage for details):
+    # 1. gSOAP Public License 1.3 (based on Mozilla Public License 1.1).
+    #    Components NOT covered by the gSOAP Public License are:
+    #     - wsdl2h tool and its source code output,
+    #     - soapcpp2 tool and its source code output,
+    #     - UDDI code,
+    #     - the webserver example code in gsoap/samples/webserver,
+    #     - and several example applications in the gsoap/samples directory.
+    # 2. GPLv2 covers all of the software
+    # 3. Proprietary commercial software development license (removes GPL
+    #    restrictions)
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
   };
 }

From 1642e3a6d79ee9c35f56d573cac1c682c0176fc4 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Wed, 4 Sep 2013 22:34:08 +0200
Subject: [PATCH 313/452] libX11 is not in vice's rpath. this fixes it

---
 pkgs/misc/emulators/vice/default.nix | 9 +++++++--
 pkgs/top-level/all-packages.nix      | 4 +++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix
index 12f1222553e..6507730f74a 100644
--- a/pkgs/misc/emulators/vice/default.nix
+++ b/pkgs/misc/emulators/vice/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lib, perl, gettext, libpng, giflib, libjpeg, alsaLib, readline, mesa
+{ stdenv, fetchurl, perl, gettext, libpng, giflib, libjpeg, alsaLib, readline, mesa, libX11
 , pkgconfig, gtk, SDL, autoconf, automake, makeDesktopItem
 }:
 
@@ -28,15 +28,20 @@ stdenv.mkDerivation rec {
     autoreconf -f -i
   '';
   
+  NIX_LDFLAGS = "-lX11 -L${libX11}/lib";
+  
   postInstall = ''
     mkdir -p $out/share/applications
     cp ${desktopItem}/share/applications/* $out/share/applications
+    
+    # Patch executables to find libX11
+    #patchelf --set-rpath $(patchelf --print-rpath $out/bin/x64):${libX11}/lib $out/bin/x64
   '';
   
   meta = {
     description = "Commodore 64, 128 and other emulators";
     homepage = http://www.viceteam.org;
     license = "GPLv2+";
-    maintainers = [ lib.maintainers.sander ];
+    maintainers = [ stdenv.lib.maintainers.sander ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b5356b223b..d583d89911a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9891,7 +9891,9 @@ let
 
   thinkfan = callPackage ../tools/system/thinkfan { };
 
-  vice = callPackage ../misc/emulators/vice { };
+  vice = callPackage ../misc/emulators/vice {
+    libX11 = xlibs.libX11;
+  };
 
   viewnior = callPackage ../applications/graphics/viewnior { };
 

From aed1cd3c1777f039de94cb2286474886a49924a1 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 4 Sep 2013 16:42:20 -0400
Subject: [PATCH 314/452] Add patch to fix GET Bucket requests to fake-s3

See https://github.com/jubos/fake-s3/pull/37

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 .../development/interpreters/ruby/patches.nix |  7 +++++
 .../ruby-modules/fake-s3-list-bucket.patch    | 30 +++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/ruby-modules/fake-s3-list-bucket.patch

diff --git a/pkgs/development/interpreters/ruby/patches.nix b/pkgs/development/interpreters/ruby/patches.nix
index 2ac65dbb7e1..7c80cdfe065 100644
--- a/pkgs/development/interpreters/ruby/patches.nix
+++ b/pkgs/development/interpreters/ruby/patches.nix
@@ -117,4 +117,11 @@ in
   };
   
   pry = { gemFlags = "--no-ri --no-rdoc"; };
+
+  fakes3 = {
+    postInstall = ''
+      cd $out/${ruby.gemPath}/gems/*
+      patch -Np1 -i ${../../ruby-modules/fake-s3-list-bucket.patch}
+    '';
+  };
 }
diff --git a/pkgs/development/ruby-modules/fake-s3-list-bucket.patch b/pkgs/development/ruby-modules/fake-s3-list-bucket.patch
new file mode 100644
index 00000000000..251935161d1
--- /dev/null
+++ b/pkgs/development/ruby-modules/fake-s3-list-bucket.patch
@@ -0,0 +1,30 @@
+commit 983634ea6b81910529596c262644eacfa2c2c4f9
+Author: Shea Levy <shea@shealevy.com>
+Date:   Wed Sep 4 16:16:12 2013 -0400
+
+    Fix LS_BUCKET
+    
+    GET foo.s3.amazonaws.com/ and GET s3.amazonaws.com/foo should result in
+    an LS_BUCKET request, but under the previous logic it would result in a
+    LIST_BUCKETS request. GET s3.amazonaws.com/ still results in a
+    LIST_BUCKETS request due to the 'if path == "/" and s_req.is_path_style'
+    conditional.
+    
+    Signed-off-by: Shea Levy <shea@shealevy.com>
+
+diff --git a/lib/fakes3/server.rb b/lib/fakes3/server.rb
+index 6958151..36d9cad 100644
+--- a/lib/fakes3/server.rb
++++ b/lib/fakes3/server.rb
+@@ -213,10 +213,7 @@ module FakeS3
+           elems = path.split("/")
+         end
+ 
+-        if elems.size == 0
+-          # List buckets
+-          s_req.type = Request::LIST_BUCKETS
+-        elsif elems.size == 1
++        if elems.size < 2
+           s_req.type = Request::LS_BUCKET
+           s_req.query = query
+         else

From f2e4efcf281cb38ecdd94e6019ddb7df9e8e0a55 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 5 Sep 2013 10:43:01 +0200
Subject: [PATCH 315/452] Removed obsolete patchelf instruction that was
 commented out

---
 pkgs/misc/emulators/vice/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix
index 6507730f74a..8323ca082b7 100644
--- a/pkgs/misc/emulators/vice/default.nix
+++ b/pkgs/misc/emulators/vice/default.nix
@@ -33,9 +33,6 @@ stdenv.mkDerivation rec {
   postInstall = ''
     mkdir -p $out/share/applications
     cp ${desktopItem}/share/applications/* $out/share/applications
-    
-    # Patch executables to find libX11
-    #patchelf --set-rpath $(patchelf --print-rpath $out/bin/x64):${libX11}/lib $out/bin/x64
   '';
   
   meta = {

From 207aa56201758700dd8481bce9c84b332de9b55b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 5 Sep 2013 10:17:35 +0200
Subject: [PATCH 316/452] linux: Update to 3.4.60

---
 pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix
index 8dc4b0e4ddc..5bcb8aaf250 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.4.59";
+  version = "3.4.60";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "19ylh9k9qykr8x29jcqv1q6agmyvzx7q5md2yxph4sykjsccqzj7";
+    sha256 = "16pg9sdsf5nwp1lc583dcbn1ay67b7yb55xg8cgv63bvmh4h3vrb";
   };
 
   features.iwlwifi = true;

From be9b6c0fe2507461b0e85d84ecfe6b4a7c7aaa39 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 5 Sep 2013 12:03:02 +0200
Subject: [PATCH 317/452] GNU Stow: package - Symlink manager which makes it
 easy to manage dotfiles

---
 pkgs/tools/misc/stow/default.nix | 34 ++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/tools/misc/stow/default.nix

diff --git a/pkgs/tools/misc/stow/default.nix b/pkgs/tools/misc/stow/default.nix
new file mode 100644
index 00000000000..e0d7985ae07
--- /dev/null
+++ b/pkgs/tools/misc/stow/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, perl, perlPackages }:
+
+stdenv.mkDerivation {
+  name = "stow-2.2.0";
+
+  src = fetchurl {
+    url = mirror://gnu/stow/stow-2.2.0.tar.bz2;
+    sha256 = "01bbsqjmrnd9925s3grvgjnrl52q4w65imrvzy05qaij3pz31g46";
+  };
+
+  buildInputs = [ perl perlPackages.TestOutput ];
+
+  doCheck = true;
+
+  meta = {
+    description = "Stow is a tool for managing the installation of multiple software packages in the same run-time directory tree.";
+
+    longDescription = ''
+      GNU Stow is a symlink farm manager which takes distinct packages
+      of software and/or data located in separate directories on the
+      filesystem, and makes them appear to be installed in the same
+      place. For example, /usr/local/bin could contain symlinks to
+      files within /usr/local/stow/emacs/bin, /usr/local/stow/perl/bin
+      etc., and likewise recursively for any other subdirectories such
+      as .../share, .../man, and so on.
+    '';
+
+    license = "GPLv3+";
+    homepage = http://www.gnu.org/software/stow/;
+
+    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d583d89911a..af5c50d5dce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1764,6 +1764,8 @@ let
 
   storeBackup = callPackage ../tools/backup/store-backup { };
 
+  stow = callPackage ../tools/misc/stow { };
+
   stun = callPackage ../tools/networking/stun { };
 
   stunnel = callPackage ../tools/networking/stunnel { };

From 86c7583ab4d2860e0781b80fdd6177b7fbb45936 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 5 Sep 2013 22:46:07 +0200
Subject: [PATCH 318/452] lttng: 2.2.x -> 2.3.0

---
 pkgs/development/tools/misc/lttng-tools/default.nix | 4 ++--
 pkgs/development/tools/misc/lttng-ust/default.nix   | 4 ++--
 pkgs/os-specific/linux/lttng-modules/default.nix    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix
index 9bc24b9387b..42d11ebe7c5 100644
--- a/pkgs/development/tools/misc/lttng-tools/default.nix
+++ b/pkgs/development/tools/misc/lttng-tools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, popt, libuuid, liburcu, lttngUst }:
 
 stdenv.mkDerivation rec {
-  name = "lttng-tools-2.2.3";
+  name = "lttng-tools-2.3.0";
 
   src = fetchurl {
     url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2";
-    sha256 = "1p16n42j34xkaj17zg2g12rzkfwpdv9ay1h4bkdq6038v320mljv";
+    sha256 = "16j55xqrh00mjbcvdmdkfxchavi7jsxlpnfjqc1g1d3x65ss9wri";
   };
 
   buildInputs = [ popt libuuid liburcu lttngUst ];
diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix
index d234a7b74f8..014a97a9158 100644
--- a/pkgs/development/tools/misc/lttng-ust/default.nix
+++ b/pkgs/development/tools/misc/lttng-ust/default.nix
@@ -12,11 +12,11 @@
 # Debian builds with std.h (systemtap).
 
 stdenv.mkDerivation rec {
-  name = "lttng-ust-2.2.1";
+  name = "lttng-ust-2.3.0";
 
   src = fetchurl {
     url = "https://lttng.org/files/lttng-ust/${name}.tar.bz2";
-    sha256 = "0881ri3v96fjii24qnwgsypk4crri4qp6mc4zp7kwghz8gys9rla";
+    sha256 = "1hazjybrppyaakvfp1bs92vx0n2sgcsw0m6i5hwq7xq8vij7cj4q";
   };
 
   buildInputs = [ liburcu ];
diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix
index 7495deb231d..e58d61e426b 100644
--- a/pkgs/os-specific/linux/lttng-modules/default.nix
+++ b/pkgs/os-specific/linux/lttng-modules/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, kernelDev }:
 
 stdenv.mkDerivation rec {
-  pname = "lttng-modules-2.2.1";
+  pname = "lttng-modules-2.3.0";
   name = "${pname}-${kernelDev.version}";
 
   src = fetchurl {
     url = "https://lttng.org/files/lttng-modules/${pname}.tar.bz2";
-    sha256 = "00ww1443ssv614s1ix6zby8llaf6zzlxcf5k4w7jsyji47ng33m2";
+    sha256 = "0l9fbmpsjvm5pbrc6axy8chdp21j4b8fm0hmjhpk658ll0iixmpb";
   };
 
   patches = [ ./lttng-fix-build-error-on-linux-3.2.patch ];

From 9f19d23282927ad76ffa9594dd0b9337b0d97717 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Fri, 6 Sep 2013 10:03:33 +1000
Subject: [PATCH 319/452] perlPackages.ack: fix build on darwin

---
 pkgs/top-level/perl-packages.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d75346e41ea..870f5fa67b9 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9,7 +9,7 @@
 
 rec {
 
-  inherit (pkgs) buildPerlPackage fetchurl stdenv perl fetchsvn;
+  inherit (pkgs) buildPerlPackage fetchurl stdenv perl fetchsvn gnused;
 
   inherit __overrides;
 
@@ -30,12 +30,15 @@ rec {
       url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz";
       sha256 = "de5560f2ce6334f3f83bef4ee942fdb09b792f05cf534fe67be3cb0431bf758f";
     };
+    # use gnused so that the preCheck command passes
+    buildInputs = stdenv.lib.optional stdenv.isDarwin [ gnused ];
     propagatedBuildInputs = [ FileNext ];
-    meta = {
+    meta = with stdenv.lib; {
       description = "A grep-like tool tailored to working with large trees of source code";
-      homepage = http://betterthangrep.com/;
-      license = "free";  # Artistic 2.0
-      platforms = stdenv.lib.platforms.unix;
+      homepage    = http://betterthangrep.com/;
+      license     = "free";  # Artistic 2.0
+      maintainers = with maintainers; [ lovek323 ];
+      platforms   = stdenv.lib.platforms.unix;
     };
     # t/swamp/{0,perl-without-extension} are datafiles for the test
     # t/ack-show-types.t, but the perl generic builder confuses them

From 7bfeed07e0ef36d7f29d404b7f44390225f6d758 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Fri, 6 Sep 2013 10:33:28 +1000
Subject: [PATCH 320/452] bacula: fix build on darwin

---
 pkgs/tools/backup/bacula/default.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix
index d3acdf74753..4882097c91a 100644
--- a/pkgs/tools/backup/bacula/default.nix
+++ b/pkgs/tools/backup/bacula/default.nix
@@ -1,14 +1,16 @@
-{stdenv, fetchurl, sqlite, postgresql, zlib, acl, ncurses, openssl, readline}:
+{ stdenv, fetchurl, sqlite, postgresql, zlib, acl, ncurses, openssl, readline }:
 
 stdenv.mkDerivation rec {
   name = "bacula-5.2.13";
 
   src = fetchurl {
-    url = "mirror://sourceforge/bacula/${name}.tar.gz";
+    url    = "mirror://sourceforge/bacula/${name}.tar.gz";
     sha256 = "1n3sc0kd7r0afpyi708y3md0a24rbldnfcdz0syqj600pxcd9gm4";
   };
 
-  buildInputs = [ postgresql sqlite zlib acl ncurses openssl readline ];
+  buildInputs = [ postgresql sqlite zlib ncurses openssl readline ]
+    # acl relies on attr, which I can't get to build on darwin
+    ++ stdenv.lib.optional (!stdenv.isDarwin) acl;
 
   configureFlags = [ 
     "--with-sqlite3=${sqlite}" 
@@ -20,11 +22,11 @@ stdenv.mkDerivation rec {
     ln -s $out/sbin/* $out/bin
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Enterprise ready, Network Backup Tool";
-    homepage = http://bacula.org/;
-    license = "GPLv2";
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.iElectric ];
+    homepage    = http://bacula.org/;
+    license     = "GPLv2";
+    maintainers = with maintainers; [ iElectric lovek323 ];
+    platforms   = stdenv.lib.platforms.all;
   };
 }

From 5789021b542922c8683f6193809d4bcda1d92c37 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 6 Sep 2013 03:10:38 +0200
Subject: [PATCH 321/452] chromium: Update all channels to latest versions.

Overview of the updated channels:

stable: 29.0.1547.62 -> 29.0.1547.65
beta:   29.0.1547.57 -> 30.0.1599.22
dev:    30.0.1599.10 -> 31.0.1612.0

All channels build fine and are tested. Actually if you look at the
versions, the beta channel was lagging behind the stable channel,
because the download was unavailable. This is now fixed.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/sources.nix   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix
index f7adfa04697..e83f9948535 100644
--- a/pkgs/applications/networking/browsers/chromium/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/sources.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   dev = {
-    version = "30.0.1599.10";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-30.0.1599.10.tar.xz";
-    sha256 = "1h6wak2sy0cawsk63gdbg7ggq8lg7cahs1v8i0hvzwm9k6apwphs";
+    version = "31.0.1612.0";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-31.0.1612.0.tar.xz";
+    sha256 = "19h6i8jdnpzbvyq8pk9jq89lghnydpij9yj8xfs7qdgqgyxxcl5w";
   };
   beta = {
-    version = "29.0.1547.57";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1547.57.tar.xz";
-    sha256 = "0xl595fng7qzlc8vh73lslzchr6ayd4vlmz2mpqppb8pai520xxf";
+    version = "30.0.1599.22";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-30.0.1599.22.tar.xz";
+    sha256 = "0955q7fz6nfr7nbxa8hp9q7mgljlan42rjg8ql5x2vn6c80sjji8";
   };
   stable = {
-    version = "29.0.1547.62";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1547.62.tar.xz";
-    sha256 = "0ld7cm287k2lkq3rfnhwgvvnjbm9345wvjbwfn4yzwy7gxzyfld6";
+    version = "29.0.1547.65";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1547.65.tar.xz";
+    sha256 = "0vmb5dsh61jyr68838pnczlc2mhvvil4hjkrmwklzlfz30c8s2w6";
   };
 }

From 485d22f862f14f8082c54695c7a905e2105bdd6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Thu, 5 Sep 2013 19:03:28 +0200
Subject: [PATCH 322/452] Added abook 0.6.0pre2

Abook is a text-based addressbook program designed to use with mutt mail
client.
---
 pkgs/applications/misc/abook/default.nix | 21 +++++++++++++++++++++
 pkgs/lib/maintainers.nix                 |  1 +
 pkgs/top-level/all-packages.nix          |  2 ++
 3 files changed, 24 insertions(+)
 create mode 100644 pkgs/applications/misc/abook/default.nix

diff --git a/pkgs/applications/misc/abook/default.nix b/pkgs/applications/misc/abook/default.nix
new file mode 100644
index 00000000000..09345576487
--- /dev/null
+++ b/pkgs/applications/misc/abook/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pkgconfig, ncurses, readline }:
+
+let version = "0.6.0pre2"; in
+stdenv.mkDerivation rec {
+  name = "abook-${version}";
+
+  src = fetchurl {
+    url = "http://abook.sourceforge.net/devel/${name}.tar.gz";
+    sha256 = "59d444504109dd96816e003b3023175981ae179af479349c34fa70bc12f6d385";
+  };
+
+  buildInputs = [ pkgconfig ncurses readline ];
+
+  meta = {
+    homepage = "http://abook.sourceforge.net/";
+    description = "Abook is a text-based addressbook program designed to use with mutt mail client.";
+    license = "GPLv2";
+    maintainers = [ stdenv.lib.maintainers.edwtjo ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix
index 78c77f61f4e..373d2a8da4d 100644
--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@@ -19,6 +19,7 @@
   bodil = "Bodil Stokke <nix@bodil.org>";
   chaoflow = "Florian Friesdorf <flo@chaoflow.net>";
   coconnor = "Corey O'Connor <coreyoconnor@gmail.com>";
+  edwtjo = "Edward Tjörnhammar <ed@cflags.cc>";
   eelco = "Eelco Dolstra <eelco.dolstra@logicblox.com>";
   ertes = "Ertugrul Söylemez <es@ertes.de>";
   garbas = "Rok Garbas <rok@garbas.si>";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b5356b223b..9e45bc3fc77 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7133,6 +7133,8 @@ let
     inherit (gnome) libglade libgnomecanvas;
   };
 
+  abook = callPackage ../applications/misc/abook { };
+
   adobeReader = callPackage_i686 ../applications/misc/adobe-reader { };
 
   aewan = callPackage ../applications/editors/aewan { };

From bcec0454e95856798548b8d051d1496faf4e2690 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Tue, 27 Aug 2013 15:07:32 +1000
Subject: [PATCH 323/452] texLive: fix build on darwin

vcunat edit: use ruby19 on all platforms now.
See #700 for discussion related to the changes.
---
 pkgs/tools/typesetting/tex/tetex/default.nix  | 39 +++++-----
 .../typesetting/tex/texlive/aggregate.nix     | 15 ++--
 .../tools/typesetting/tex/texlive/default.nix | 72 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  7 +-
 4 files changed, 78 insertions(+), 55 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/tetex/default.nix b/pkgs/tools/typesetting/tex/tetex/default.nix
index bb1e3f8b4b0..5cd3228aced 100644
--- a/pkgs/tools/typesetting/tex/tetex/default.nix
+++ b/pkgs/tools/typesetting/tex/tetex/default.nix
@@ -15,30 +15,33 @@ stdenv.mkDerivation {
 
   buildInputs = [ flex bison zlib libpng ncurses ed ];
 
+  # fixes "error: conflicting types for 'calloc'", etc.
+  preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
+    sed -i 57d texk/kpathsea/c-std.h
+  '';
+
   patches = [ ./environment.patch ./getline.patch ];
 
   setupHook = ./setup-hook.sh;
 
   configureFlags =
-    [ "--disable-multiplatform"
-      "--without-x11"
-      "--without-xdvik"
-      "--without-oxdvik"
-      "--without-texinfo"
-      "--without-texi2html"
-      "--with-system-zlib"
-      "--with-system-pnglib"
-      "--with-system-ncurses"
-    ];
+    [ "--disable-multiplatform" "--without-x11" "--without-xdvik"
+      "--without-oxdvik" "--without-texinfo" "--without-texi2html"
+      "--with-system-zlib" "--with-system-pnglib" "--with-system-ncurses" ]
+    # couldn't get gsftopk working on darwin
+    ++ stdenv.lib.optional stdenv.isDarwin "--without-gsftopk";
 
-  postUnpack =
-    ''
-      mkdir -p $out/share/texmf
-      mkdir -p $out/share/texmf-dist
-      gunzip < $texmf | (cd $out/share/texmf-dist && tar xvf -)
-    '';
+  postUnpack = ''
+    mkdir -p $out/share/texmf
+    mkdir -p $out/share/texmf-dist
+    gunzip < $texmf | (cd $out/share/texmf-dist && tar xvf -)
+  '';
 
-  meta = {
-    description = "A full-featured (La)TeX distribution";
+  meta = with stdenv.lib; {
+    description  = "A full-featured (La)TeX distribution";
+    homepage     = http://www.tug.org/tetex/;
+    matintainers = with maintainers; [ lovek323 ];
+    platforms    = platforms.unix;
   };
 }
+
diff --git a/pkgs/tools/typesetting/tex/texlive/aggregate.nix b/pkgs/tools/typesetting/tex/texlive/aggregate.nix
index c2ccecab089..84fa1cfab75 100644
--- a/pkgs/tools/typesetting/tex/texlive/aggregate.nix
+++ b/pkgs/tools/typesetting/tex/texlive/aggregate.nix
@@ -1,12 +1,13 @@
 args : with args;
 rec {
-  phaseNames = ["doAggregate"];
   name = "TeXLive-linkdir";
 
-  buildInputs = lib.closePropagation paths;
+  buildInputs = lib.closePropagation paths
+    ++ stdenv.lib.optional stdenv.isDarwin makeWrapper;
+
+  phaseNames = [ "doAggregate" ];
 
   doAggregate = fullDepEntry (''
-
     mkdir -p $out/bin
     for currentPath in ${lib.concatStringsSep " " buildInputs}; do
         echo Symlinking "$currentPath"
@@ -54,7 +55,13 @@ rec {
     yes | PATH=$PATH:$out/bin mktexlsr $out/texmf*
     yes | TEXMFCONFIG=$out/texmf-config HOME=$PWD PATH=$PATH:$out/bin updmap --syncwithtrees
     yes | PATH=$PATH:$out/bin mktexlsr $out/texmf*
-  '') ["minInit" "defEnsureDir" "addInputs"];
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    # did the same thing in texLive, but couldn't get it to carry to the
+    # binaries installed by texLiveFull
+    for prog in $out/bin/*; do
+      wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler}/lib"
+    done
+  '' ) [ "minInit" "defEnsureDir" "addInputs" ];
 
   meta = {
     description = "TeX distribution directory";
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index aac8da784b3..e53c336c0ed 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -17,7 +17,9 @@ rec {
 
   setupHook = ./setup-hook.sh;
 
-  doMainBuild = fullDepEntry (''
+  doMainBuild = fullDepEntry ( stdenv.lib.optionalString stdenv.isDarwin ''
+    export DYLD_LIBRARY_PATH="${poppler}/lib"
+  '' + ''
     mkdir -p $out
     mkdir -p $out/nix-support
     cp ${setupHook} $out/nix-support/setup-hook.sh
@@ -41,24 +43,26 @@ rec {
     ./Build --prefix="$out" --datadir="$out/share" --mandir "$out/share/man" --infodir "$out/share/info" \
       ${args.lib.concatStringsSep " " configureFlags}
     cd Work
-  '') ["minInit" "doUnpack" "addInputs" "defEnsureDir"];
+  '' ) [ "minInit" "doUnpack" "addInputs" "defEnsureDir" ];
 
-  doPostInstall = fullDepEntry(''
+  doPostInstall = fullDepEntry( ''
     mkdir -p $out/libexec/
     mv $out/bin $out/libexec/$(uname -m)
     mkdir -p $out/bin
     for i in "$out/libexec/"* "$out/libexec/"*/* ; do
         test \( \! -d "$i" \) -a \( -x "$i" -o -L "$i" \) || continue
-	if [ -x "$i" ]; then
-	    echo -ne "#! $SHELL\\nexec $i \"\$@\"" >$out/bin/$(basename $i)
-            chmod a+x $out/bin/$(basename $i)
-	else
-	    mv "$i" "$out/libexec"
-	    ln -s "$(readlink -f "$out/libexec/$(basename "$i")")" "$out/bin/$(basename "$i")";
-	    ln -sf "$(readlink -f "$out/libexec/$(basename "$i")")" "$out/libexec/$(uname -m)/$(basename "$i")";
-            rm "$out/libexec/$(basename "$i")"
-	fi;
+
+      if [ -x "$i" ]; then
+          echo -ne "#! $SHELL\\nexec $i \"\$@\"" >$out/bin/$(basename $i)
+                chmod a+x $out/bin/$(basename $i)
+      else
+          mv "$i" "$out/libexec"
+          ln -s "$(readlink -f "$out/libexec/$(basename "$i")")" "$out/bin/$(basename "$i")";
+          ln -sf "$(readlink -f "$out/libexec/$(basename "$i")")" "$out/libexec/$(uname -m)/$(basename "$i")";
+          rm "$out/libexec/$(basename "$i")"
+      fi;
     done
+
     [ -d $out/texmf-config ] || ln -s $out/texmf $out/texmf-config
     ln -s -v "$out/"*texmf* "$out/share/" || true
 
@@ -81,29 +85,37 @@ rec {
     PATH="$PATH:$out/bin" fmtutil-sys --all || true
 
     PATH=$PATH:$out/bin mktexlsr $out/texmf*
- '') ["minInit" "defEnsureDir" "doUnpack" "doMakeInstall"];
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    for prog in $out/bin/*; do
+      wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler}/lib"
+    done
+  '' ) [ "minInit" "defEnsureDir" "doUnpack" "doMakeInstall" ];
 
-  buildInputs = [
-    zlib bzip2 ncurses libpng flex bison libX11 libICE
-    xproto freetype t1lib gd libXaw icu ghostscript ed
-    libXt libXpm libXmu libXext xextproto perl libSM
-    ruby expat curl libjpeg python fontconfig xz
-    pkgconfig poppler silgraphite lesstif zziplib
-  ];
+  buildInputs = [ zlib bzip2 ncurses libpng flex bison libX11 libICE xproto
+    freetype t1lib gd libXaw icu ghostscript ed libXt libXpm libXmu libXext
+    xextproto perl libSM ruby expat curl libjpeg python fontconfig xz pkgconfig
+    poppler silgraphite lesstif zziplib ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper ];
 
-  configureFlags = [ "--with-x11"
-    "--enable-ipc" "--with-mktexfmt" "--enable-shared"
-    "--disable-native-texlive-build" "--with-system-zziplib"
-    "--with-system-icu" "--with-system-libgs" "--with-system-t1lib"
-    "--with-system-freetype2"
-  ];
+  configureFlags = [ "--with-x11" "--enable-ipc" "--with-mktexfmt"
+    "--enable-shared" "--disable-native-texlive-build" "--with-system-zziplib"
+    "--with-system-libgs" "--with-system-t1lib" "--with-system-freetype2" ]
+    ++ ( if stdenv.isDarwin
+         # ironically, couldn't get xetex compiling on darwin
+         then [ "--disable-xetex" "--disable-xdv2pdf" "--disable-xdvipdfmx" ]
+         # couldn't seem to get system icu working on darwin
+         else [ "--with-system-icu" ] );
 
-  phaseNames = ["addInputs" "doMainBuild" "doMakeInstall" "doPostInstall"];
+  phaseNames = [ "addInputs" "doMainBuild" "doMakeInstall" "doPostInstall" ];
 
   name = "texlive-core-2012";
-  meta = {
+
+  meta = with stdenv.lib; {
     description = "A TeX distribution";
-    maintainers = [ args.lib.maintainers.raskin ];
-    platforms = args.lib.platforms.linux ++ args.lib.platforms.freebsd ;
+    homepage    = http://www.tug.org/texlive;
+    licnese     = stdenv.lib.licneses.gpl2;
+    maintainers = with maintainers; [ lovek323 raskin ];
+    platforms   = platforms.unix;
   };
 }
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index af5c50d5dce..3facd5bc269 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9827,19 +9827,20 @@ let
   texFunctions = import ../tools/typesetting/tex/nix pkgs;
 
   texLive = builderDefsPackage (import ../tools/typesetting/tex/texlive) {
-    inherit builderDefs zlib bzip2 ncurses libpng ed lesstif
+    inherit builderDefs zlib bzip2 ncurses libpng ed lesstif ruby
       gd t1lib freetype icu perl expat curl xz pkgconfig zziplib
-      libjpeg bison python fontconfig flex poppler silgraphite;
+      libjpeg bison python fontconfig flex poppler silgraphite makeWrapper;
     inherit (xlibs) libXaw libX11 xproto libXt libXpm
       libXmu libXext xextproto libSM libICE;
     ghostscript = ghostscriptX;
-    ruby = ruby18;
   };
 
   texLiveFull = lib.setName "texlive-full" (texLiveAggregationFun {
     paths = [ texLive texLiveExtra lmodern texLiveCMSuper texLiveLatexXColor
               texLivePGF texLiveBeamer texLiveModerncv tipa tex4ht texinfo5
               texLiveModerntimeline ];
+
+    inherit poppler makeWrapper;
   });
 
   /* Look in configurations/misc/raskin.nix for usage example (around revisions

From e1dc4d8ea82ebeb1a96113facab3f7f0ab7d882f Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Fri, 6 Sep 2013 09:00:56 +1000
Subject: [PATCH 324/452] libusb1: fix build on darwin via dropping udev (close
 #920)

vcunat edit: we have udev (systemd) only on Linux systems,
extend platforms so we know about breakages from Hydra.
---
 pkgs/development/libraries/libusb1/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix
index a39e33f4f27..c01baa2fd0f 100644
--- a/pkgs/development/libraries/libusb1/default.nix
+++ b/pkgs/development/libraries/libusb1/default.nix
@@ -9,12 +9,12 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ pkgconfig ];
-  propagatedBuildInputs = [ udev ];
+  propagatedBuildInputs = stdenv.lib.optional (stdenv.isLinux) udev;
 
   meta = {
     homepage = http://www.libusb.org;
     description = "User-space USB library";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.urkud ];
   };
 }

From c93d33b74e90348982784bc6d41c1b89048d54fd Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Tue, 3 Sep 2013 07:53:36 +1000
Subject: [PATCH 325/452] asymptote: fix build on darwin

---
 pkgs/top-level/all-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3facd5bc269..df63bd3543b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -417,9 +417,9 @@ let
       mesa ncurses readline gsl libsigsegv python zlib perl
       texinfo lzma;
     texLive = texLiveAggregationFun {
-      paths = [
-        texLive texLiveExtra
-      ];
+      paths = [ texLive texLiveExtra ];
+
+      inherit makeWrapper poppler;
     };
   };
 

From ab0ca44ffbf808ab602ccb3eb0cd3e2eb3a99256 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Tue, 3 Sep 2013 07:53:36 +1000
Subject: [PATCH 326/452] texliveAggregationFunction: fix eval

vcunat edited to fix all cases (not just asymptote),
and a two "licnese" typos :-)
---
 pkgs/tools/typesetting/tex/texlive/default.nix | 2 +-
 pkgs/top-level/all-packages.nix                | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index e53c336c0ed..540ab07c286 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -113,7 +113,7 @@ rec {
   meta = with stdenv.lib; {
     description = "A TeX distribution";
     homepage    = http://www.tug.org/texlive;
-    licnese     = stdenv.lib.licneses.gpl2;
+    license     = stdenv.lib.licenses.gpl2;
     maintainers = with maintainers; [ lovek323 raskin ];
     platforms   = platforms.unix;
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9b4c871979a..4f201725322 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -418,8 +418,6 @@ let
       texinfo lzma;
     texLive = texLiveAggregationFun {
       paths = [ texLive texLiveExtra ];
-
-      inherit makeWrapper poppler;
     };
   };
 
@@ -9841,8 +9839,6 @@ let
     paths = [ texLive texLiveExtra lmodern texLiveCMSuper texLiveLatexXColor
               texLivePGF texLiveBeamer texLiveModerncv tipa tex4ht texinfo5
               texLiveModerntimeline ];
-
-    inherit poppler makeWrapper;
   });
 
   /* Look in configurations/misc/raskin.nix for usage example (around revisions
@@ -9857,8 +9853,9 @@ let
   You need to use texLiveAggregationFun to regenerate, say, ls-R (TeX-related file list)
   Just installing a few packages doesn't work.
   */
-  texLiveAggregationFun =
-    (builderDefsPackage (import ../tools/typesetting/tex/texlive/aggregate.nix));
+  texLiveAggregationFun = params:
+    builderDefsPackage (import ../tools/typesetting/tex/texlive/aggregate.nix)
+      ({inherit poppler makeWrapper;} // params);
 
   texDisser = callPackage ../tools/typesetting/tex/disser {};
 

From b4a9ab5bd68df4f42ac4c9d6fb8b1a3f7dc46189 Mon Sep 17 00:00:00 2001
From: Gergely Risko <gergely@risko.hu>
Date: Tue, 27 Aug 2013 17:17:41 +0200
Subject: [PATCH 327/452] Add thyme haskell library

---
 .../libraries/haskell/thyme/default.nix       | 22 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/thyme/default.nix

diff --git a/pkgs/development/libraries/haskell/thyme/default.nix b/pkgs/development/libraries/haskell/thyme/default.nix
new file mode 100644
index 00000000000..1e372d8f5ba
--- /dev/null
+++ b/pkgs/development/libraries/haskell/thyme/default.nix
@@ -0,0 +1,22 @@
+{ cabal, attoparsec, deepseq, lens, QuickCheck
+, random, text, time, transformers, vector
+, vectorSpace
+}:
+
+cabal.mkDerivation (self: {
+  pname = "thyme";
+  version = "0.3.0.0";
+  sha256 = "0nv8kp5ax0088z0d9y93xkv59v1i8wrrdprsj7bknk3yn0gd2gb3";
+  buildDepends = [
+    attoparsec deepseq lens QuickCheck random text time transformers
+    vector vectorSpace
+  ];
+  # have some strange test depends
+  doCheck = false;
+  meta = {
+    homepage = "https://github.com/liyang/thyme";
+    description = "A faster time library";
+    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 e66f82d32e9..60f5a767cd1 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1993,6 +1993,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   threads = callPackage ../development/libraries/haskell/threads {};
 
+  thyme = callPackage ../development/libraries/haskell/thyme {};
+
   time_1_1_2_4 = callPackage ../development/libraries/haskell/time/1.1.2.4.nix {};
   time_1_4_1 = callPackage ../development/libraries/haskell/time/1.4.1.nix {};
   # time is in the core package set. It should only be necessary to

From 692dfb6af986cb3c05dfa55ed64741f6b3351ef0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Sep 2013 11:41:37 +0200
Subject: [PATCH 328/452] Update nixUnstable

---
 pkgs/tools/package-management/nix/unstable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index 4d5eeca12c1..f61f5e2b95a 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.6pre3187_3fb7ae0";
+  name = "nix-1.6pre3215_2c1ecf8";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/5663853/download/5/${name}.tar.xz";
-    sha256 = "3cd695b3bb23ea7f9e4779f5b79180319444204b30120ed2cc0f0bf1e070403f";
+    url = "http://hydra.nixos.org/build/5940181/download/5/${name}.tar.xz";
+    sha256 = "404fe856ae534b09e9a81d69751127e0987fea6bf2d0ec01acac3a9ea4ce72ae";
   };
 
   nativeBuildInputs = [ perl pkgconfig ];

From 0cf8a74e82f25cc6f5b94f50358f1bfbfb379e89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 6 Sep 2013 15:51:38 +0200
Subject: [PATCH 329/452] dbus: minor update, style refactoring, parallel build

---
 pkgs/development/libraries/dbus/default.nix | 58 ++++++++++++---------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index d50a0076e62..fe4be4f3726 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -3,8 +3,8 @@
 , libX11, libICE, libSM, useX11 ? stdenv.isLinux }:
 
 let
-  version = "1.6.12"; # 1.7.* isn't recommended, even for gnome 3.8
-  sha256 = "14pfh2ksn4srfry752kf1jy3c61hklcs9fx2xglw2ifhsszplypn";
+  version = "1.6.14"; # 1.7.* isn't recommended, even for gnome 3.8
+  sha256 = "0v7mcxwfmpjf7vndnvf2kf02al61clrxs36bqii20s0lawfh2xjn";
 
   inherit (stdenv) lib;
 
@@ -25,30 +25,13 @@ let
       inherit sha256;
     };
 
-    configureFlags = [
-      "--localstatedir=/var"
-      "--sysconfdir=/etc"
-      "--with-session-socket-dir=/tmp"
-      "--with-systemdsystemunitdir=$(out)/lib/systemd"
-    ];
-
-    preConfigure = ''
-      patchShebangs .
-      substituteInPlace tools/Makefile.am --replace 'install-localstatelibDATA:' 'disabled:'
-      autoreconf -fi
-    '';
-
-    installFlags = "sysconfdir=$(out)/etc";
-
-    doCheck = true;
-
-    patches = [ ./ignore-missing-includedirs.patch ]
-      ++ lib.optional (stdenv.isSunOS || stdenv.isLinux/*avoid rebuilds*/) ./implement-getgrouplist.patch
-      ++ [ ./ucred-dirty-hack.patch ./no-create-dirs.patch ];
-
-    nativeBuildInputs = [ pkgconfig ];
-    propagatedBuildInputs = [ expat ];
-    buildInputs = [ autoconf automake libtool ]; # ToDo: optional selinux?
+    patches = [
+        ./ignore-missing-includedirs.patch
+        ./ucred-dirty-hack.patch
+        ./no-create-dirs.patch
+      ]
+      ++ lib.optional (stdenv.isSunOS || stdenv.isLinux) ./implement-getgrouplist.patch
+      ;
 
     # build only the specified subdirs
     postPatch = "sed '/SUBDIRS/s/=.*/=" + subdirs + "/' -i Makefile.am\n"
@@ -59,6 +42,29 @@ let
           done
         '';
 
+    nativeBuildInputs = [ pkgconfig ];
+    propagatedBuildInputs = [ expat ];
+    buildInputs = [ autoconf automake libtool ]; # ToDo: optional selinux?
+
+    preConfigure = ''
+      patchShebangs .
+      substituteInPlace tools/Makefile.am --replace 'install-localstatelibDATA:' 'disabled:'
+      autoreconf -fi
+    '';
+
+    configureFlags = [
+      "--localstatedir=/var"
+      "--sysconfdir=/etc"
+      "--with-session-socket-dir=/tmp"
+      "--with-systemdsystemunitdir=$(out)/lib/systemd"
+    ];
+
+    enableParallelBuilding = true;
+
+    doCheck = true;
+
+    installFlags = "sysconfdir=$(out)/etc";
+
   } merge ]);
 
   libs = dbus_drv "libs" "dbus" ({

From 63051ab66bc72bef15750658a0dbdecf7eec6e0c Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Fri, 6 Sep 2013 23:54:46 +1000
Subject: [PATCH 330/452] cogl: fix build on darwin (close #924)

---
 pkgs/development/libraries/cogl/default.nix | 33 +++++++++++++--------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix
index b697ed87edc..9c3a1a4d674 100644
--- a/pkgs/development/libraries/cogl/default.nix
+++ b/pkgs/development/libraries/cogl/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, mesa, glib, gdk_pixbuf
-, pangoSupport ? true, pango, cairo
-, libXfixes, libXcomposite, libXdamage }:
+{ stdenv, fetchurl, pkgconfig, mesa, glib, gdk_pixbuf, libXfixes, libXcomposite
+, libXdamage, libintlOrEmpty
+, pangoSupport ? true, pango, cairo }:
 
 stdenv.mkDerivation rec {
   name = "cogl-1.8.2";
@@ -13,19 +13,28 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
 
   propagatedBuildInputs =
-    [ mesa glib gdk_pixbuf libXfixes libXcomposite libXdamage ];
+    [ mesa glib gdk_pixbuf libXfixes libXcomposite libXdamage ]
+    ++ libintlOrEmpty;
 
   buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ];
 
-  meta = {
+  COGL_PANGO_DEP_CFLAGS
+    = stdenv.lib.optionalString (stdenv.isDarwin && pangoSupport)
+      "-I${pango}/include/pango-1.0 -I${cairo}/include/cairo";
+
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
+
+  meta = with stdenv.lib; {
     description = "A small open source library for using 3D graphics hardware for rendering";
-    longDescription =
-      ''
-        Cogl is a small open source library for using 3D graphics hardware for
-        rendering. The API departs from the flat state machine style of OpenGL
-        and is designed to make it easy to write orthogonal components that can
-        render without stepping on each others toes.
-      '';
+    maintainers = with maintainers; [ lovek323 ];
+
+    longDescription = ''
+      Cogl is a small open source library for using 3D graphics hardware for
+      rendering. The API departs from the flat state machine style of OpenGL
+      and is designed to make it easy to write orthogonal components that can
+      render without stepping on each other's toes.
+    '';
+
     inherit (glib.meta) platforms;
   };
 }

From bf9b36b616e4a0901d8b5582948db10805f002a4 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Wed, 4 Sep 2013 22:16:28 +0200
Subject: [PATCH 331/452] ledger3: Don't run tests on Darwin (they fail).

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
close #914
---
 pkgs/applications/office/ledger/3.0.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/ledger/3.0.nix b/pkgs/applications/office/ledger/3.0.nix
index 6a49ede0857..8b74dbad6f8 100644
--- a/pkgs/applications/office/ledger/3.0.nix
+++ b/pkgs/applications/office/ledger/3.0.nix
@@ -14,7 +14,8 @@ stdenv.mkDerivation {
 
   buildInputs = [ cmake boost gmp mpfr libedit python texinfo ];
 
-  doCheck = true;
+  # Tests on Darwin are failing
+  doCheck = !stdenv.isDarwin;
   enableParallelBuilding = true;
 
   # Skip byte-compiling of emacs-lisp files because this is currently
@@ -37,6 +38,6 @@ stdenv.mkDerivation {
     '';
 
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = with stdenv.lib.maintainers; [ simons the-kenny ];
   };
 }

From d050dade3ba3b3591b5491a3246d4445b4940be8 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Fri, 6 Sep 2013 21:46:20 +0200
Subject: [PATCH 332/452] nvidia for kernel 3.11 fixed

---
 pkgs/os-specific/linux/nvidia-x11/default.nix |  1 +
 ...vidia-drivers-linux-3.11-incremental.patch | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/os-specific/linux/nvidia-x11/nvidia-drivers-linux-3.11-incremental.patch

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 455a763c7f0..f8413b0e541 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -21,6 +21,7 @@ stdenv.mkDerivation {
 
   patches =
     [ ./version-test.patch ]
+    ++ optional (!libsOnly && versionAtLeast kernelDev.version "3.11") ./nvidia-drivers-linux-3.11-incremental.patch
     ;
 
   src =
diff --git a/pkgs/os-specific/linux/nvidia-x11/nvidia-drivers-linux-3.11-incremental.patch b/pkgs/os-specific/linux/nvidia-x11/nvidia-drivers-linux-3.11-incremental.patch
new file mode 100644
index 00000000000..bb6fad932e3
--- /dev/null
+++ b/pkgs/os-specific/linux/nvidia-x11/nvidia-drivers-linux-3.11-incremental.patch
@@ -0,0 +1,25 @@
+From 8a8647ad942c8ac5161e1335f7f3e9dbb34dbf9e Mon Sep 17 00:00:00 2001
+From: Lukas Elsner <open@mindrunner.de>
+Date: Wed, 17 Jul 2013 01:16:04 +0200
+Subject: [PATCH] replace num_physpages with totalram_pages
+
+---
+ kernel/nv-linux.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kernel/nv-linux.h b/kernel/nv-linux.h
+index 4e5ed89..46c51ec 100644
+--- a/kernel/nv-linux.h
++++ b/kernel/nv-linux.h
+@@ -957,7 +957,7 @@ static inline int nv_execute_on_all_cpus(void (*func)(void *info), void *info)
+ #endif
+ 
+ #if !defined(NV_VMWARE)
+-#define NV_NUM_PHYSPAGES                num_physpages
++#define NV_NUM_PHYSPAGES                totalram_pages
+ #define NV_GET_CURRENT_PROCESS()        current->tgid
+ #define NV_IN_ATOMIC()                  in_atomic()
+ #define NV_LOCAL_BH_DISABLE()           local_bh_disable()
+-- 
+1.8.3.2
+

From 190dcbbc7ab3d8882d21763405278167755f4809 Mon Sep 17 00:00:00 2001
From: Sergey Mironov <grrwlf@gmail.com>
Date: Sat, 7 Sep 2013 00:35:22 +0400
Subject: [PATCH 333/452] Ur/Web: Version bump

---
 pkgs/development/compilers/urweb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix
index 7c0ddde6612..66b15e3499d 100644
--- a/pkgs/development/compilers/urweb/default.nix
+++ b/pkgs/development/compilers/urweb/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "urweb";
-  version = "20120807";
+  version = "20130421";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://www.impredicative.com/ur/${name}.tgz";
-    sha256 = "15g1cz108dkzlp433cg56x76f20y6zcs9sbgxgdniyfakmn4ld6l";
+    sha256 = "1dglcial9bzximw778wbfqx99khy34qpf9gw4bbncn9f742ji872";
   };
 
   buildInputs = [ stdenv.gcc file openssl mlton mysql postgresql sqlite ];

From fe6b021ee1e7cdd857038eb4e63dc21607e421e6 Mon Sep 17 00:00:00 2001
From: Sergey Mironov <grrwlf@gmail.com>
Date: Sat, 7 Sep 2013 01:10:14 +0400
Subject: [PATCH 334/452] fuse-exfat: add FUSE-mounter for exFAT devices

---
 pkgs/tools/filesystems/fuse-exfat/default.nix | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/tools/filesystems/fuse-exfat/default.nix

diff --git a/pkgs/tools/filesystems/fuse-exfat/default.nix b/pkgs/tools/filesystems/fuse-exfat/default.nix
new file mode 100644
index 00000000000..093b01bb141
--- /dev/null
+++ b/pkgs/tools/filesystems/fuse-exfat/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, pkgconfig, fuse, scons }:
+
+stdenv.mkDerivation rec {
+  name = "fuse-exfat-1.0.1";
+
+  src = fetchurl {
+    url = "http://exfat.googlecode.com/files/${name}.tar.gz";
+    sha256 = "0n27hpi45lj9hpi7k8d7npiwyhasf1v832g7ckpknd6lnyhipb0j";
+  };
+
+  buildInputs = [ pkgconfig fuse scons ];
+
+  buildPhase = ''
+    export CCFLAGS="-O2 -Wall -std=c99 -I${fuse}/include"
+    export LDFLAGS="-L${fuse}/lib"
+    mkdir -pv $out/sbin
+    scons DESTDIR=$out/sbin install
+  '';
+
+  installPhase = ":";
+
+  meta = {
+    homepage = http://code.google.com/p/exfat/;
+    description = "A FUSE-based filesystem that allows read and write access to exFAT devices";
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4f201725322..21a3a3c87d0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -888,6 +888,8 @@ let
 
   fuse_zip = callPackage ../tools/filesystems/fuse-zip { };
 
+  fuse_exfat = callPackage ../tools/filesystems/fuse-exfat { };
+
   dos2unix = callPackage ../tools/text/dos2unix { };
 
   uni2ascii = callPackage ../tools/text/uni2ascii { };

From 89d707aee4332883bdb08c84c09231bad2b755b2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 4 Sep 2013 13:04:19 +0200
Subject: [PATCH 335/452] haskell-cipher-aes: update to version 0.2.5

---
 pkgs/development/libraries/haskell/cipher-aes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/cipher-aes/default.nix b/pkgs/development/libraries/haskell/cipher-aes/default.nix
index f5098fc2c61..5fc5905ebb9 100644
--- a/pkgs/development/libraries/haskell/cipher-aes/default.nix
+++ b/pkgs/development/libraries/haskell/cipher-aes/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cipher-aes";
-  version = "0.2.4";
-  sha256 = "13nxxgb55jmrq9m9jpbsdxpj2j2kvdjv8b1c0gp1pvkxhyfzk610";
+  version = "0.2.5";
+  sha256 = "1ayypdfn2nnxp595dpyivmzw2jc4iyjz2in3z7ldccx36gn5j6b3";
   buildDepends = [ byteable cryptoCipherTypes securemem ];
   testDepends = [
     byteable cryptoCipherTests cryptoCipherTypes QuickCheck

From 209791d6b16f4179ad0c6848c8db451344ed63be Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 4 Sep 2013 13:04:19 +0200
Subject: [PATCH 336/452] haskell-cryptocipher: update to version 0.6.0

---
 .../libraries/haskell/cryptocipher/default.nix | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/haskell/cryptocipher/default.nix b/pkgs/development/libraries/haskell/cryptocipher/default.nix
index 0f99ccdfe38..a8c7579cc5b 100644
--- a/pkgs/development/libraries/haskell/cryptocipher/default.nix
+++ b/pkgs/development/libraries/haskell/cryptocipher/default.nix
@@ -1,20 +1,14 @@
-{ cabal, cereal, cipherAes, cipherRc4, cpu, cryptoApi, cryptohash
-, entropy, primitive, QuickCheck, testFramework
-, testFrameworkQuickcheck2, vector
+{ cabal, cipherAes, cipherBlowfish, cipherCamellia, cipherDes
+, cipherRc4, cryptoCipherTypes
 }:
 
 cabal.mkDerivation (self: {
   pname = "cryptocipher";
-  version = "0.5.2";
-  sha256 = "0ffd3w2hvi1zbhgk0xvgbnlfzzwijbrs5b9b4g2vc5p69wkv24zr";
-  isLibrary = true;
-  isExecutable = true;
+  version = "0.6.0";
+  sha256 = "1jgwn1j7h5rhg872ghmz54phxn7nlwmk83qv1cbnbww1l2ay8gz5";
   buildDepends = [
-    cereal cipherAes cipherRc4 cpu cryptoApi primitive vector
-  ];
-  testDepends = [
-    cryptoApi cryptohash entropy QuickCheck testFramework
-    testFrameworkQuickcheck2 vector
+    cipherAes cipherBlowfish cipherCamellia cipherDes cipherRc4
+    cryptoCipherTypes
   ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-crypto-cipher";

From 00162c8279236b1973fc45976ecb72118f02fc29 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 4 Sep 2013 13:04:19 +0200
Subject: [PATCH 337/452] haskell-ghc-mod: update to version 2.1.2

---
 pkgs/development/libraries/haskell/ghc-mod/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
index bfefbfe9b7e..e7feb8d5bb7 100644
--- a/pkgs/development/libraries/haskell/ghc-mod/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ghc-mod";
-  version = "2.1.1";
-  sha256 = "00m44pjfvzwy7926r48h6q38yg82la1ls0p5q9fmfjxsdg351wi1";
+  version = "2.1.2";
+  sha256 = "0cpy93r0dgzgmr3ig1j0fkzgzs5r6ca11rns21wqxc043vq3v955";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 37c870846aa430954595ad0c707be41a9c16d267 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 4 Sep 2013 13:04:19 +0200
Subject: [PATCH 338/452] haskell-http-conduit: update to version 1.9.4.5

---
 pkgs/development/libraries/haskell/http-conduit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
index dab65b11ad4..6d6ac6b3fd0 100644
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-conduit";
-  version = "1.9.4.4";
-  sha256 = "0awmifa3l7nq28bhp00x4qdhjxddpsybnwl0n569d9sajva53afj";
+  version = "1.9.4.5";
+  sha256 = "04b459x60dspd827k6ccikkm4j0cl7phcprvsdcqbc78yjf7vqpg";
   buildDepends = [
     asn1Data base64Bytestring blazeBuilder blazeBuilderConduit
     caseInsensitive certificate conduit cookie cprngAes dataDefault

From 908e0cc23d1f26875ac12ff5dcb227c7f7f042c2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 4 Sep 2013 13:04:19 +0200
Subject: [PATCH 339/452] haskell-uuagc-cabal: update to version 1.0.5.0

---
 pkgs/development/tools/haskell/uuagc/cabal.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/haskell/uuagc/cabal.nix b/pkgs/development/tools/haskell/uuagc/cabal.nix
index ea981ad423b..38be593a1f0 100644
--- a/pkgs/development/tools/haskell/uuagc/cabal.nix
+++ b/pkgs/development/tools/haskell/uuagc/cabal.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "uuagc-cabal";
-  version = "1.0.4.0";
-  sha256 = "0m6q8lfbrzcdxd923s175x0z1rnniv7gk08ninzpq16fisscr4lf";
+  version = "1.0.5.0";
+  sha256 = "0p3rc1gszd62wwzzqz0hmj6jdmwdnpx92rdf6mgd7w63ic1wdxj5";
   buildDepends = [ Cabal filepath mtl uulib ];
   meta = {
     homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";

From a508572731ac71208a5caedf3526c6ce79dd6a4f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 4 Sep 2013 14:08:10 +0200
Subject: [PATCH 340/452] haskell-cipher-{blowfish,camellia,des}: add new
 packages

---
 .../haskell/cipher-blowfish/default.nix       | 20 +++++++++++++++++++
 .../haskell/cipher-camellia/default.nix       | 20 +++++++++++++++++++
 .../libraries/haskell/cipher-des/default.nix  | 20 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  6 ++++++
 4 files changed, 66 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/cipher-blowfish/default.nix
 create mode 100644 pkgs/development/libraries/haskell/cipher-camellia/default.nix
 create mode 100644 pkgs/development/libraries/haskell/cipher-des/default.nix

diff --git a/pkgs/development/libraries/haskell/cipher-blowfish/default.nix b/pkgs/development/libraries/haskell/cipher-blowfish/default.nix
new file mode 100644
index 00000000000..af8114c6d02
--- /dev/null
+++ b/pkgs/development/libraries/haskell/cipher-blowfish/default.nix
@@ -0,0 +1,20 @@
+{ cabal, byteable, cryptoCipherTests, cryptoCipherTypes, QuickCheck
+, securemem, testFramework, testFrameworkQuickcheck2, vector
+}:
+
+cabal.mkDerivation (self: {
+  pname = "cipher-blowfish";
+  version = "0.0.1";
+  sha256 = "0bz8jd65idcalyzcbmgz16hr6y5mnw7mckk5yvrm9k19cr6mwq52";
+  buildDepends = [ byteable cryptoCipherTypes securemem vector ];
+  testDepends = [
+    byteable cryptoCipherTests cryptoCipherTypes QuickCheck
+    testFramework testFrameworkQuickcheck2
+  ];
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-crypto-cipher";
+    description = "Blowfish cipher";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/cipher-camellia/default.nix b/pkgs/development/libraries/haskell/cipher-camellia/default.nix
new file mode 100644
index 00000000000..6d29792ea33
--- /dev/null
+++ b/pkgs/development/libraries/haskell/cipher-camellia/default.nix
@@ -0,0 +1,20 @@
+{ cabal, byteable, cryptoCipherTests, cryptoCipherTypes, QuickCheck
+, securemem, testFramework, testFrameworkQuickcheck2, vector
+}:
+
+cabal.mkDerivation (self: {
+  pname = "cipher-camellia";
+  version = "0.0.1";
+  sha256 = "11narl4h77v7317hdqy8zxhym3k7xrmw97yfwh0vr8k1y5dkiqh3";
+  buildDepends = [ byteable cryptoCipherTypes securemem vector ];
+  testDepends = [
+    byteable cryptoCipherTests cryptoCipherTypes QuickCheck
+    testFramework testFrameworkQuickcheck2
+  ];
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-crypto-cipher";
+    description = "Camellia block cipher primitives";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/cipher-des/default.nix b/pkgs/development/libraries/haskell/cipher-des/default.nix
new file mode 100644
index 00000000000..2217fddffcc
--- /dev/null
+++ b/pkgs/development/libraries/haskell/cipher-des/default.nix
@@ -0,0 +1,20 @@
+{ cabal, byteable, cryptoCipherTests, cryptoCipherTypes, QuickCheck
+, securemem, testFramework, testFrameworkQuickcheck2
+}:
+
+cabal.mkDerivation (self: {
+  pname = "cipher-des";
+  version = "0.0.2";
+  sha256 = "1bykxfn2jhqzr5l2319bbyr8ky6i844m2lm39axvfizfxav9wbgz";
+  buildDepends = [ byteable cryptoCipherTypes securemem ];
+  testDepends = [
+    byteable cryptoCipherTests cryptoCipherTypes QuickCheck
+    testFramework testFrameworkQuickcheck2
+  ];
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-crypto-cipher";
+    description = "DES and 3DES primitives";
+    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 60f5a767cd1..6a5065fa049 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -698,6 +698,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   cipherAes = callPackage ../development/libraries/haskell/cipher-aes {};
 
+  cipherBlowfish = callPackage ../development/libraries/haskell/cipher-blowfish {};
+
+  cipherCamellia = callPackage ../development/libraries/haskell/cipher-camellia {};
+
+  cipherDes = callPackage ../development/libraries/haskell/cipher-des {};
+
   cipherRc4 = callPackage ../development/libraries/haskell/cipher-rc4 {};
 
   circlePacking = callPackage ../development/libraries/haskell/circle-packing {};

From 9ed90073b35b62f97152f5134b59b975ef59d7c5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Sep 2013 13:10:14 +0200
Subject: [PATCH 341/452] haskell-Cabal: add version 1.18.0

---
 .../libraries/haskell/Cabal/1.18.0.nix        | 26 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/Cabal/1.18.0.nix

diff --git a/pkgs/development/libraries/haskell/Cabal/1.18.0.nix b/pkgs/development/libraries/haskell/Cabal/1.18.0.nix
new file mode 100644
index 00000000000..6e0d3074bdb
--- /dev/null
+++ b/pkgs/development/libraries/haskell/Cabal/1.18.0.nix
@@ -0,0 +1,26 @@
+{ cabal, deepseq, extensibleExceptions, filepath, HUnit, QuickCheck
+, regexPosix, testFramework, testFrameworkHunit
+, testFrameworkQuickcheck2, time
+}:
+
+cabal.mkDerivation (self: {
+  pname = "Cabal";
+  version = "1.18.0";
+  sha256 = "1nxvkfkjkyxsa4nbrwl59r84j63qh2qx4cbd3vnr6vvdnflbix8f";
+  buildDepends = [ deepseq filepath time ];
+  testDepends = [
+    extensibleExceptions filepath HUnit QuickCheck regexPosix
+    testFramework testFrameworkHunit testFrameworkQuickcheck2
+  ];
+  doCheck = false;
+  meta = {
+    homepage = "http://www.haskell.org/cabal/";
+    description = "A framework for packaging Haskell software";
+    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 6a5065fa049..c9c1cc6076f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -653,6 +653,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix { cabal = self.cabal.override { Cabal = null; }; };
   Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix { cabal = self.cabal.override { Cabal = null; }; };
+  Cabal_1_18_0 = callPackage ../development/libraries/haskell/Cabal/1.18.0.nix { cabal = self.cabal.override { Cabal = null; }; };
   Cabal = null; # core package in GHC
 
   cabalFileTh = callPackage ../development/libraries/haskell/cabal-file-th {};

From 880ca8abbc118a2e6c301cfd1f16b0309488c96e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Sep 2013 13:11:23 +0200
Subject: [PATCH 342/452] cabal-install: add version 1.18.0

---
 .../cabal-install/1.18.0.nix                  | 30 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  5 ++--
 2 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/tools/package-management/cabal-install/1.18.0.nix

diff --git a/pkgs/tools/package-management/cabal-install/1.18.0.nix b/pkgs/tools/package-management/cabal-install/1.18.0.nix
new file mode 100644
index 00000000000..8b093bc925c
--- /dev/null
+++ b/pkgs/tools/package-management/cabal-install/1.18.0.nix
@@ -0,0 +1,30 @@
+{ cabal, Cabal, filepath, HTTP, HUnit, mtl, network, QuickCheck
+, random, stm, testFramework, testFrameworkHunit
+, testFrameworkQuickcheck2, time, zlib
+}:
+
+cabal.mkDerivation (self: {
+  pname = "cabal-install";
+  version = "1.18.0";
+  sha256 = "14c4i8cy2rnvjj2krv3swna53k2674xhpzqkmcr56lxnyzych5wh";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    Cabal filepath HTTP mtl network random stm time zlib
+  ];
+  testDepends = [
+    Cabal filepath HTTP HUnit mtl network QuickCheck stm testFramework
+    testFrameworkHunit testFrameworkQuickcheck2 time zlib
+  ];
+  postInstall = ''
+    mkdir $out/etc
+    mv bash-completion $out/etc/bash_completion.d
+  '';
+  meta = {
+    homepage = "http://www.haskell.org/cabal/";
+    description = "The command-line interface for Cabal and Hackage";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index c9c1cc6076f..2b69370e38b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -173,7 +173,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     vector       = self.vector_0_10_0_1;
     xhtml        = self.xhtml_3000_2_1;
     zlib         = self.zlib_0_5_4_1;
-    cabalInstall = self.cabalInstall_1_16_0_2;
+    cabalInstall = self.cabalInstall_1_18_0;
     alex         = self.alex_3_0_5;
     haddock      = self.haddock_2_13_2;
     happy        = self.happy_1_18_10;
@@ -2368,7 +2368,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   cabalInstall_0_10_2 = callPackage ../tools/package-management/cabal-install/0.10.2.nix {};
   cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {};
   cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix {};
-  cabalInstall = self.cabalInstall_1_16_0_2;
+  cabalInstall_1_18_0 = callPackage ../tools/package-management/cabal-install/1.18.0.nix {};
+  cabalInstall = self.cabalInstall_1_18_0;
 
   gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex {};
 

From 5204195c2cd6dd43af20e613f53eb056698312eb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Sep 2013 13:13:30 +0200
Subject: [PATCH 343/452] haskell-HsOpenSSL: update to version 0.10.3.4

---
 pkgs/development/libraries/haskell/HsOpenSSL/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
index 9eefaaef84a..8df2209ffbf 100644
--- a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
+++ b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
@@ -2,13 +2,13 @@
 
 cabal.mkDerivation (self: {
   pname = "HsOpenSSL";
-  version = "0.10.3.3";
-  sha256 = "04d2nd2hcbglw8blwhi3d32vazdxnvs9s52788qyllgm7gmay6a5";
+  version = "0.10.3.4";
+  sha256 = "1xgnzivphnzb4yf31406yg5fjycrfypwrlxi2s8lfzgja8m1l7h5";
   buildDepends = [ network time ];
   extraLibraries = [ openssl ];
   meta = {
     homepage = "https://github.com/phonohawk/HsOpenSSL";
-    description = "(Incomplete) OpenSSL binding for Haskell";
+    description = "Partial OpenSSL binding for Haskell";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];

From 5d0ffebdf701ed3e93a032cbb03bd0ee516b7d15 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Sep 2013 13:13:30 +0200
Subject: [PATCH 344/452] haskell-aeson: update to version 0.6.2.0

---
 pkgs/development/libraries/haskell/aeson/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/default.nix
index 3c4135feb72..bcb202c64d0 100644
--- a/pkgs/development/libraries/haskell/aeson/default.nix
+++ b/pkgs/development/libraries/haskell/aeson/default.nix
@@ -5,15 +5,15 @@
 
 cabal.mkDerivation (self: {
   pname = "aeson";
-  version = "0.6.1.0";
-  sha256 = "16hjwcybmgmk1sg8x02r9bxisx4gl61rlq8w2zsxfgkxwjpfhkbx";
+  version = "0.6.2.0";
+  sha256 = "1f7bzgwl9pm5a79gr3a8wxh7dyz4k2508d0bw4l0mbjgv6r7s4an";
   buildDepends = [
     attoparsec blazeBuilder deepseq dlist hashable mtl syb text time
     unorderedContainers vector
   ];
   testDepends = [
     attoparsec QuickCheck testFramework testFrameworkQuickcheck2 text
-    time
+    time unorderedContainers vector
   ];
   doCheck = false;
   meta = {

From 19faee15ef52bf994ba10bde88075fd7de7708d5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Sep 2013 13:13:30 +0200
Subject: [PATCH 345/452] haskell-cipher-des: update to version 0.0.3

---
 pkgs/development/libraries/haskell/cipher-des/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/cipher-des/default.nix b/pkgs/development/libraries/haskell/cipher-des/default.nix
index 2217fddffcc..588a28f3a25 100644
--- a/pkgs/development/libraries/haskell/cipher-des/default.nix
+++ b/pkgs/development/libraries/haskell/cipher-des/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cipher-des";
-  version = "0.0.2";
-  sha256 = "1bykxfn2jhqzr5l2319bbyr8ky6i844m2lm39axvfizfxav9wbgz";
+  version = "0.0.3";
+  sha256 = "1gcpwfxrlgwl34yy7k3vhpmcrmyiirbmz40zssk2lv6cfrylc4z7";
   buildDepends = [ byteable cryptoCipherTypes securemem ];
   testDepends = [
     byteable cryptoCipherTests cryptoCipherTypes QuickCheck

From 9ed322cc9de424ac8cb7545b94d626b50f55ecb8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Sep 2013 13:13:30 +0200
Subject: [PATCH 346/452] haskell-cryptocipher: update to version 0.6.1

---
 pkgs/development/libraries/haskell/cryptocipher/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/cryptocipher/default.nix b/pkgs/development/libraries/haskell/cryptocipher/default.nix
index a8c7579cc5b..57d0e2483f8 100644
--- a/pkgs/development/libraries/haskell/cryptocipher/default.nix
+++ b/pkgs/development/libraries/haskell/cryptocipher/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cryptocipher";
-  version = "0.6.0";
-  sha256 = "1jgwn1j7h5rhg872ghmz54phxn7nlwmk83qv1cbnbww1l2ay8gz5";
+  version = "0.6.1";
+  sha256 = "1qa0s7mr1a3nv4ppyk8wr57rxbfc2qpw9rq26pfziwnpin5k2j3x";
   buildDepends = [
     cipherAes cipherBlowfish cipherCamellia cipherDes cipherRc4
     cryptoCipherTypes

From 9e0cacb3593d2b941e0dd9804c93709a29edea20 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Sep 2013 13:13:30 +0200
Subject: [PATCH 347/452] haskell-ghc-mod: update to version 3.0.0

---
 pkgs/development/libraries/haskell/ghc-mod/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
index e7feb8d5bb7..b90944816d6 100644
--- a/pkgs/development/libraries/haskell/ghc-mod/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ghc-mod";
-  version = "2.1.2";
-  sha256 = "0cpy93r0dgzgmr3ig1j0fkzgzs5r6ca11rns21wqxc043vq3v955";
+  version = "3.0.0";
+  sha256 = "1ll2vn4vv4k7jaah0ngr2ml381cpprqy9ndqpf8cn44m5xd9qn6p";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From eedc69957a506929179a053401c0fe8ba7140f86 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Sep 2013 13:13:30 +0200
Subject: [PATCH 348/452] haskell-mmap: update to version 0.5.9

---
 pkgs/development/libraries/haskell/mmap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/mmap/default.nix b/pkgs/development/libraries/haskell/mmap/default.nix
index 4d0b9fcabeb..53785f45c22 100644
--- a/pkgs/development/libraries/haskell/mmap/default.nix
+++ b/pkgs/development/libraries/haskell/mmap/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "mmap";
-  version = "0.5.8";
-  sha256 = "17zsb95ynyrqj51h4jxi9glsih4vq33hbxycgw13z5fivv261m7y";
+  version = "0.5.9";
+  sha256 = "1y5mk3yf4b8r6rzmlx1xqn4skaigrqnv08sqq0v7r3nbw42bpz2q";
   isLibrary = true;
   isExecutable = true;
   meta = {

From b94cf8c733f0620d06281b6cc071fc27759148ae Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Sep 2013 13:13:30 +0200
Subject: [PATCH 349/452] haskell-HaRe: update to version 0.7.0.1

---
 .../tools/haskell/HaRe/default.nix            | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/haskell/HaRe/default.nix b/pkgs/development/tools/haskell/HaRe/default.nix
index 88f5d0baee6..bb2a1341128 100644
--- a/pkgs/development/tools/haskell/HaRe/default.nix
+++ b/pkgs/development/tools/haskell/HaRe/default.nix
@@ -1,12 +1,24 @@
-{ cabal, filepath, hint, mtl, network, syb }:
+{ cabal, cmdtheline, deepseq, Diff, filepath, ghcMod, ghcPaths
+, ghcSybUtils, hslogger, hspec, HUnit, mtl, parsec, QuickCheck
+, rosezipper, silently, StrafunskiStrategyLib, stringbuilder, syb
+, syz, time, transformers
+}:
 
 cabal.mkDerivation (self: {
   pname = "HaRe";
-  version = "0.6.0.2";
-  sha256 = "13mi6z37fszrl97mll4injhq8dyhqzm344x7y2vw8krr5xjj3kw2";
-  isLibrary = false;
+  version = "0.7.0.1";
+  sha256 = "1ykbyc6p71k6rs85vcsjgk47cxd2lda3iw78jzs0fx43qr1dywnl";
+  isLibrary = true;
   isExecutable = true;
-  buildDepends = [ filepath hint mtl network syb ];
+  buildDepends = [
+    cmdtheline filepath ghcMod ghcPaths ghcSybUtils hslogger mtl parsec
+    rosezipper StrafunskiStrategyLib syb syz time transformers
+  ];
+  testDepends = [
+    deepseq Diff filepath ghcMod ghcPaths ghcSybUtils hslogger hspec
+    HUnit mtl QuickCheck rosezipper silently StrafunskiStrategyLib
+    stringbuilder syb syz time transformers
+  ];
   meta = {
     homepage = "http://www.cs.kent.ac.uk/projects/refactor-fp";
     description = "the Haskell Refactorer";

From d645b7895c2f688159a92786d1138c5cc64a8f2d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Sep 2013 23:06:43 +0200
Subject: [PATCH 350/452] haskell-github: jailbreak to fix build with new aeson

---
 pkgs/development/libraries/haskell/github/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/github/default.nix b/pkgs/development/libraries/haskell/github/default.nix
index 511b1b70f28..6154ed6c9a7 100644
--- a/pkgs/development/libraries/haskell/github/default.nix
+++ b/pkgs/development/libraries/haskell/github/default.nix
@@ -11,6 +11,7 @@ cabal.mkDerivation (self: {
     aeson attoparsec caseInsensitive conduit dataDefault failure HTTP
     httpConduit httpTypes network text time unorderedContainers vector
   ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/fpco/github";
     description = "Access to the Github API, v3";

From 4f827ec7d0a9c613dad45fbbd3d7046692121e6e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Sep 2013 23:20:41 +0200
Subject: [PATCH 351/452] haskell-syz: add version 0.2.0.0

---
 pkgs/development/libraries/haskell/syz/default.nix | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/syz/default.nix

diff --git a/pkgs/development/libraries/haskell/syz/default.nix b/pkgs/development/libraries/haskell/syz/default.nix
new file mode 100644
index 00000000000..67e6bc58436
--- /dev/null
+++ b/pkgs/development/libraries/haskell/syz/default.nix
@@ -0,0 +1,14 @@
+{ cabal, syb }:
+
+cabal.mkDerivation (self: {
+  pname = "syz";
+  version = "0.2.0.0";
+  sha256 = "1m5395937yyxsa1bmlfn1dxa1jr15yjhlz9s15bpwapshcd8119y";
+  buildDepends = [ syb ];
+  meta = {
+    homepage = "http://www.cs.indiana.edu/~adamsmd/papers/scrap_your_zippers/";
+    description = "Scrap Your Zippers";
+    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 2b69370e38b..bc1e968cb75 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1865,6 +1865,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   sybWithClassInstancesText = callPackage ../development/libraries/haskell/syb/syb-with-class-instances-text.nix {};
 
+  syz = callPackage ../development/libraries/haskell/syz {};
+
   SDLImage = callPackage ../development/libraries/haskell/SDL-image {};
 
   SDLMixer = callPackage ../development/libraries/haskell/SDL-mixer {};

From 0e8bf4f075f2b690736ebe46369bd16f2a7e1c64 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Sep 2013 23:20:50 +0200
Subject: [PATCH 352/452] haskell-Strafunski-StrategyLib: add version 5.0.0.3

---
 .../haskell/Strafunski-StrategyLib/default.nix      | 13 +++++++++++++
 pkgs/top-level/haskell-packages.nix                 |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/Strafunski-StrategyLib/default.nix

diff --git a/pkgs/development/libraries/haskell/Strafunski-StrategyLib/default.nix b/pkgs/development/libraries/haskell/Strafunski-StrategyLib/default.nix
new file mode 100644
index 00000000000..b7b8b6336e6
--- /dev/null
+++ b/pkgs/development/libraries/haskell/Strafunski-StrategyLib/default.nix
@@ -0,0 +1,13 @@
+{ cabal, mtl, syb }:
+
+cabal.mkDerivation (self: {
+  pname = "Strafunski-StrategyLib";
+  version = "5.0.0.3";
+  sha256 = "1s7410dfzkqd9j8n5g92pvh9rwglngj3ca9ipcr6xsq0n6yhs51y";
+  buildDepends = [ mtl syb ];
+  meta = {
+    description = "Library for strategic programming";
+    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 bc1e968cb75..e5d914113e5 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1832,6 +1832,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   statistics = callPackage ../development/libraries/haskell/statistics {};
 
+  StrafunskiStrategyLib = callPackage ../development/libraries/haskell/Strafunski-StrategyLib {};
+
   streamproc = callPackage ../development/libraries/haskell/streamproc {};
 
   strict = callPackage ../development/libraries/haskell/strict {};

From c2c66fcda951287e5df055bfe882543f225bd629 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Sep 2013 23:21:00 +0200
Subject: [PATCH 353/452] haskell-cmdtheline: add version 0.2.3

---
 .../libraries/haskell/cmdtheline/default.nix  | 19 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/cmdtheline/default.nix

diff --git a/pkgs/development/libraries/haskell/cmdtheline/default.nix b/pkgs/development/libraries/haskell/cmdtheline/default.nix
new file mode 100644
index 00000000000..c49093f6859
--- /dev/null
+++ b/pkgs/development/libraries/haskell/cmdtheline/default.nix
@@ -0,0 +1,19 @@
+{ cabal, filepath, HUnit, parsec, testFramework, testFrameworkHunit
+, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "cmdtheline";
+  version = "0.2.3";
+  sha256 = "1jwbr34xgccjbz6nm58bdsg1vqyv87rh45yia5j36vlfbaclyb04";
+  buildDepends = [ filepath parsec transformers ];
+  testDepends = [
+    filepath HUnit parsec testFramework testFrameworkHunit transformers
+  ];
+  meta = {
+    homepage = "http://github.com/eli-frey/cmdtheline";
+    description = "Declarative command-line option parsing and documentation library";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index e5d914113e5..0c6e554ea7d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -719,6 +719,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   cmdlib = callPackage ../development/libraries/haskell/cmdlib {};
 
+  cmdtheline = callPackage ../development/libraries/haskell/cmdtheline {};
+
   colorizeHaskell = callPackage ../development/libraries/haskell/colorize-haskell {};
 
   colour = callPackage ../development/libraries/haskell/colour {};

From 2692c6e1706ef617b51eac56ab324b837213d1a7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Sep 2013 23:21:08 +0200
Subject: [PATCH 354/452] haskell-rosezipper: add version 0.2

---
 .../libraries/haskell/rosezipper/default.nix         | 12 ++++++++++++
 pkgs/top-level/haskell-packages.nix                  |  2 ++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/rosezipper/default.nix

diff --git a/pkgs/development/libraries/haskell/rosezipper/default.nix b/pkgs/development/libraries/haskell/rosezipper/default.nix
new file mode 100644
index 00000000000..3c25392e7c9
--- /dev/null
+++ b/pkgs/development/libraries/haskell/rosezipper/default.nix
@@ -0,0 +1,12 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "rosezipper";
+  version = "0.2";
+  sha256 = "1g6ppa8cappdbq9923lsac504dfjh0ks64gbm6qbihrc34f4zavc";
+  meta = {
+    description = "Generic zipper implementation for Data.Tree";
+    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 0c6e554ea7d..ac7a229d6bd 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1774,6 +1774,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   resourcet = callPackage ../development/libraries/haskell/resourcet {};
 
+  rosezipper = callPackage ../development/libraries/haskell/rosezipper {};
+
   RSA = callPackage ../development/libraries/haskell/RSA {};
 
   sampleFrame = callPackage ../development/libraries/haskell/sample-frame {};

From 222cf9a8fc07d0b0d6234d1de89c46606bd54009 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Sep 2013 23:33:20 +0200
Subject: [PATCH 355/452] haskell-HaRe: jailbreak to support recent versions of
 Diff and hspec

---
 pkgs/development/tools/haskell/HaRe/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/haskell/HaRe/default.nix b/pkgs/development/tools/haskell/HaRe/default.nix
index bb2a1341128..cb0ad759d55 100644
--- a/pkgs/development/tools/haskell/HaRe/default.nix
+++ b/pkgs/development/tools/haskell/HaRe/default.nix
@@ -19,6 +19,7 @@ cabal.mkDerivation (self: {
     HUnit mtl QuickCheck rosezipper silently StrafunskiStrategyLib
     stringbuilder syb syz time transformers
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://www.cs.kent.ac.uk/projects/refactor-fp";
     description = "the Haskell Refactorer";

From 71f04ebe845b6bfee229c3f15ea7e5c454176284 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Sep 2013 23:49:32 +0200
Subject: [PATCH 356/452] haskell-regex-compat-tdfa: add version 0.95.1.2

---
 .../haskell/regex-compat-tdfa/default.nix          | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix

diff --git a/pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix b/pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix
new file mode 100644
index 00000000000..08c2f6556e2
--- /dev/null
+++ b/pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix
@@ -0,0 +1,14 @@
+{ cabal, regexBase, regexTdfa }:
+
+cabal.mkDerivation (self: {
+  pname = "regex-compat-tdfa";
+  version = "0.95.1.2";
+  sha256 = "0b7pp5xq4ybgji5shz5v1a91y6wwzila3vjiyq4nma0xj3njy802";
+  buildDepends = [ regexBase regexTdfa ];
+  meta = {
+    homepage = "http://hub.darcs.net/shelarcy/regex-compat-tdfa";
+    description = "Unicode Support version of Text.Regex, using regex-tdfa";
+    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 ac7a229d6bd..8947945abb4 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1739,6 +1739,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   regexCompat93 = self.regexCompat_0_93_1;
   regexCompat = self.regexCompat_0_71_0_1;
 
+  regexCompatTdfa = callPackage ../development/libraries/haskell/regex-compat-tdfa {};
+
   regexPosix_0_72_0_3 = callPackage ../development/libraries/haskell/regex-posix/0.72.0.3.nix {};
   regexPosix_0_94_1 = callPackage ../development/libraries/haskell/regex-posix/0.94.1.nix {};
   regexPosix_0_94_2 = callPackage ../development/libraries/haskell/regex-posix/0.94.2.nix {};

From 6039f2effea02c1ee6a716d0487f787293cd081b Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Sat, 7 Sep 2013 05:08:30 +0200
Subject: [PATCH 357/452] go: update to 1.1.2

Also fix impurity in src/pkg/net/lookup_unix.go.
---
 pkgs/development/compilers/go/1.1.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/go/1.1.nix b/pkgs/development/compilers/go/1.1.nix
index 01a8f1b6b18..5aeb053e110 100644
--- a/pkgs/development/compilers/go/1.1.nix
+++ b/pkgs/development/compilers/go/1.1.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata}:
+{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc }:
 
 let
   loader386 = "${glibc}/lib/ld-linux.so.2";
@@ -7,11 +7,11 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "go-1.1.1";
+  name = "go-1.1.2";
 
   src = fetchurl {
-    url = http://go.googlecode.com/files/go1.1.1.src.tar.gz;
-    sha1 = "f365aed8183e487a48a66ace7bf36e5974dffbb3";
+    url = http://go.googlecode.com/files/go1.1.2.src.tar.gz;
+    sha256 = "0w7bchhb4b053az3wjp6z342rs9lp9nxf4w2mnfd1b89d6sb7izz";
   };
 
   buildInputs = [ bison glibc bash makeWrapper ];
@@ -36,6 +36,7 @@ stdenv.mkDerivation {
     sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c
     sed -i 's,/lib64/ld-linux-x86-64.so.3,${loaderArm},' src/cmd/5l/asm.c
     sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go
+    sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/pkg/net/lookup_unix.go
 
     #sed -i -e 's,/bin/cat,${coreutils}/bin/cat,' \
     #  -e 's,/bin/echo,${coreutils}/bin/echo,' \
@@ -49,8 +50,6 @@ stdenv.mkDerivation {
     sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go
     # Disable the hostname test
     sed -i '/TestHostname/areturn' src/pkg/os/os_test.go
-    # Disable a failing icmp test (maybe because not being root?)
-    sed -i '/ip[46]:.*icmp.*nil/d' src/pkg/net/ipraw_test.go
   '';
 
   patches = [ ./cacert.patch ];

From e886f9aea10e798ad3f3e2f84c6c805615dd3d4c Mon Sep 17 00:00:00 2001
From: Alexander Tsamutali <astsmtl@yandex.ru>
Date: Sat, 7 Sep 2013 16:46:53 +0400
Subject: [PATCH 358/452] applications/networking/sniffers/kismet: Update to
 2013-03-R1b.

---
 .../networking/sniffers/kismet/default.nix    | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/sniffers/kismet/default.nix b/pkgs/applications/networking/sniffers/kismet/default.nix
index 9e41e8b7aaf..1bff834791d 100644
--- a/pkgs/applications/networking/sniffers/kismet/default.nix
+++ b/pkgs/applications/networking/sniffers/kismet/default.nix
@@ -1,19 +1,22 @@
-{stdenv, fetchurl, libpcap, ncurses, expat, pcre}:
+{ stdenv, fetchurl, pkgconfig, libpcap, ncurses, expat, pcre, libnl }:
 
-stdenv.mkDerivation {
-  name = "kismet-2011-03-r2";
+stdenv.mkDerivation rec {
+  name = "kismet-${version}";
+  version = "2013-03-R1b";
 
   src = fetchurl {
-    url = http://www.kismetwireless.net/code/kismet-2011-03-R2.tar.gz;
-    sha256 = "0r1admlaiq7k0v13d9ci9i9mf5m25i1r5r18bkawsla9fbxrk83i";
+    url = "http://www.kismetwireless.net/code/${name}.tar.xz";
+    sha256 = "0b3wabdkh0p3msphihm4kz5yw02p27ska5lfippfcyn6z1z4svb3";
   };
 
-  buildInputs = [libpcap ncurses expat pcre];
-  postConfigure =
-    "sed -e 's@-o \$(INSTUSR)@@' \\
-        -e 's@-g \$(INSTGRP)@@' \\
-        -e 's@-g \$(MANGRP)@@' \\
-        -i Makefile";
+  buildInputs = [ pkgconfig libpcap ncurses expat pcre libnl ];
+  postConfigure = ''
+    sed -e 's/-o $(INSTUSR)//' \
+        -e 's/-g $(INSTGRP)//' \
+        -e 's/-g $(MANGRP)//' \
+        -e 's/-g $(SUIDGROUP)//' \
+        -i Makefile
+  '';
 
   meta = {
     description = "Wireless network sniffer";

From 618fc386d701f2fc10d35791e9148aaeb8657bc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 7 Sep 2013 13:43:44 +0200
Subject: [PATCH 359/452] samba: provide libnss_{wins,winbind}.so.2 symlinks
 for nsswitch

Glibc >= 2.1 looks for libnss_<name>.so.2 files (see man nsswitch.conf),
so provide that.
---
 pkgs/servers/samba/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix
index dacfa75181f..568daf36773 100644
--- a/pkgs/servers/samba/default.nix
+++ b/pkgs/servers/samba/default.nix
@@ -68,8 +68,13 @@ stdenv.mkDerivation rec {
       ln -sv ../../../bin/smbspool $out/lib/cups/backend/smb
       mkdir -pv $out/etc/openldap/schema
       cp ../examples/LDAP/samba.schema $out/etc/openldap/schema
+
+      # For nsswitch. Glibc >= 2.1 looks for libnss_<name>.so.2 (see man
+      # nsswitch.conf), so provide that too.
       cp -v ../nsswitch/libnss_wins.so "$out/lib"
       cp -v ../nsswitch/libnss_winbind.so "$out/lib"
+      (cd "$out/lib" && ln -s libnss_winbind.so libnss_winbind.so.2)
+      (cd "$out/lib" && ln -s libnss_wins.so libnss_wins.so.2)
     '' # */
     + stdenv.lib.optionalString (configDir == "") "touch $out/lib/smb.conf";
 

From e70c15bb2655e013669969d61c12340fb99106c3 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sat, 7 Sep 2013 16:10:27 +0200
Subject: [PATCH 360/452] lm_sensors 3.3.4 update, support for many more
 sensors

---
 pkgs/os-specific/linux/lm-sensors/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/lm-sensors/default.nix b/pkgs/os-specific/linux/lm-sensors/default.nix
index 4cfbdd6e691..354027dbd71 100644
--- a/pkgs/os-specific/linux/lm-sensors/default.nix
+++ b/pkgs/os-specific/linux/lm-sensors/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, bison, flex, which, perl }:
 
-let version = "3.3.1"; in
+let version = "3.3.4"; in
 
 stdenv.mkDerivation rec {
-  name = "lm-sensors-3.3.1";
+  name = "lm-sensors-${version}";
   
   src = fetchurl {
     url = "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${version}.tar.bz2";
-    sha256 = "13v2gszagmx8hwjyzh2k47rdpc2kyg9zky3kdqhdbgzp8lwpik6g";
+    sha256 = "0vd7dgpcri7cbvgl5fwvja53lqz829vkbbp17x7b5r2xrc88cq5l";
   };
 
   buildInputs = [ bison flex which perl ];

From 9766dbb1dff94d2ad8f2c613ac78d278f44c6268 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 7 Sep 2013 07:55:55 +0200
Subject: [PATCH 361/452] dejagnu: minor update

---
 pkgs/development/tools/misc/dejagnu/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix
index 06c1d4fe76b..beed6032393 100644
--- a/pkgs/development/tools/misc/dejagnu/default.nix
+++ b/pkgs/development/tools/misc/dejagnu/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, expect, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "dejagnu-1.5";
+  name = "dejagnu-1.5.1";
 
   src = fetchurl {
     url = "mirror://gnu/dejagnu/${name}.tar.gz";
-    sha256 = "1nx3x3h96a82q92q108q71giv2nz9xmbbn2nrlr3wvvs6l45id68";
+    sha256 = "1lik8h4qi7x0mhsi8xmj91an1yb63rjbk6v4xrmzgiy5lk8lgrv0";
   };
 
   patches = [ ./wrapped-runtest-program-name.patch ];
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     wrapProgram "$out/bin/runtest" \
-		--prefix PATH ":" "${expect}/bin"
+      --prefix PATH ":" "${expect}/bin"
   '';
 
   meta = {

From decad1fc7da71db1d1b080a5ad248adcf8128a23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 2 Sep 2013 22:13:01 +0200
Subject: [PATCH 362/452] nixpkgs-lint: add check for meta.platforms attribute

---
 maintainers/scripts/nixpkgs-lint.pl | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/maintainers/scripts/nixpkgs-lint.pl b/maintainers/scripts/nixpkgs-lint.pl
index baf2cbf8ba7..d74f5c740f5 100755
--- a/maintainers/scripts/nixpkgs-lint.pl
+++ b/maintainers/scripts/nixpkgs-lint.pl
@@ -44,6 +44,7 @@ my $info = XMLin($xml, KeyAttr => { 'item' => '+attrPath', 'meta' => 'name' }, F
 print "=== Package meta information ===\n\n";
 my $nrBadNames = 0;
 my $nrMissingMaintainers = 0;
+my $nrMissingPlatforms = 0;
 my $nrMissingDescriptions = 0;
 my $nrBadDescriptions = 0;
 my $nrMissingLicenses = 0;
@@ -77,6 +78,12 @@ foreach my $attr (sort keys %{$info->{item}}) {
         $nrMissingMaintainers++;
     }
 
+    # Check the platforms.
+    if (!defined $pkg->{meta}->{platforms}) {
+        print "$attr: Lacks a platform\n";
+        $nrMissingPlatforms++;
+    }
+
     # Package names should not be capitalised.
     if ($pkgName =~ /^[A-Z]/) {
         print "$attr: package name ‘$pkgName’ should not be capitalised\n";
@@ -159,6 +166,7 @@ print "=== Bottom line ===\n";
 print "Number of packages: ", scalar(keys %{$info->{item}}), "\n";
 print "Number of bad names: $nrBadNames\n";
 print "Number of missing maintainers: $nrMissingMaintainers\n";
+print "Number of missing platforms: $nrMissingPlatforms\n";
 print "Number of missing licenses: $nrMissingLicenses\n";
 print "Number of missing descriptions: $nrMissingDescriptions\n";
 print "Number of bad descriptions: $nrBadDescriptions\n";

From 38d54cfc211e2463874cb82d0a6c83a2fb1cb5a3 Mon Sep 17 00:00:00 2001
From: Gergely Risko <gergely@risko.hu>
Date: Sat, 7 Sep 2013 20:55:42 +0200
Subject: [PATCH 363/452] Update splot to 0.3.11, so it compiles again

---
 pkgs/development/tools/haskell/splot/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/haskell/splot/default.nix b/pkgs/development/tools/haskell/splot/default.nix
index f1b15a731d5..460dc3f8c43 100644
--- a/pkgs/development/tools/haskell/splot/default.nix
+++ b/pkgs/development/tools/haskell/splot/default.nix
@@ -1,15 +1,15 @@
-{ cabal, bytestringLexing, cairo, Chart, colour, HUnit, mtl
+{ cabal, bytestringLexing, cairo, colour, HUnit, mtl
 , strptime, time, vcsRevision
 }:
 
 cabal.mkDerivation (self: {
   pname = "splot";
-  version = "0.3.9";
-  sha256 = "039k6lgwdvpyc8w74zh98wxi1wj2jmin69jnwp7gnmv43kjpbgh5";
+  version = "0.3.11";
+  sha256 = "0mpyfmafjjcf85v740h69p5mggyqsq3li8m1fa5c0z4rdd0395an";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-    bytestringLexing cairo Chart colour HUnit mtl strptime time
+    bytestringLexing cairo colour HUnit mtl strptime time
     vcsRevision
   ];
   meta = {

From 1d931d049b75c66f2b8ffc2a9c1d336967a5eeaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 7 Sep 2013 23:36:21 +0200
Subject: [PATCH 364/452] libwnck: update

News claim it's important for Xfce-4.10, which still builds.
---
 .../development/libraries/libwnck/default.nix | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/libwnck/default.nix b/pkgs/development/libraries/libwnck/default.nix
index d2855afc43e..6a4479bdda3 100644
--- a/pkgs/development/libraries/libwnck/default.nix
+++ b/pkgs/development/libraries/libwnck/default.nix
@@ -1,14 +1,24 @@
-{stdenv, fetchurl, pkgconfig, libX11, gtk, intltool}:
+{ stdenv, fetchurl, pkgconfig, gtk, intltool, xorg }:
 
-stdenv.mkDerivation {
-  name = "libwnck-2.30.7";
+let
+  ver_maj = "2.31";
+  ver_min = "0";
+in
+stdenv.mkDerivation rec {
+  name = "libwnck-${ver_maj}.${ver_min}";
 
   src = fetchurl {
-    url = mirror://gnome/sources/libwnck/2.30/libwnck-2.30.7.tar.xz;
-    sha256 = "15713yl0f8f3p99jzqqfmbicrdswd3vwpx7r3bkf1bgh6d9lvs4b";
+    url = "mirror://gnome/sources/libwnck/${ver_maj}/${name}.tar.xz";
+    sha256 = "17isfjvrzgj5znld2a7zsk9vd39q9wnsysnw5jr8iz410z935xw3";
   };
 
-  buildInputs = [ pkgconfig libX11 gtk intltool ];
+  buildInputs = [ pkgconfig gtk intltool xorg.libX11 xorg.libXres ];
+  # ?another optional: startup-notification
 
   configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK
+
+  meta = {
+    description = "A library for creating task lists and pagers";
+    license = stdenv.lib.licenses.lgpl21;
+  };
 }

From 834cd6c886bece46a553203f03522f192b66da2c Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Fri, 6 Sep 2013 11:47:49 +1000
Subject: [PATCH 365/452] beret: Fix build on darwin (close #923)

---
 pkgs/development/libraries/SDL/default.nix    | 11 ++--
 .../libraries/SDL_image/default.nix           | 11 ++--
 .../libraries/SDL_mixer/default.nix           | 16 ++---
 pkgs/games/beret/default.nix                  | 14 +++--
 pkgs/servers/pulseaudio/default.nix           | 62 +++++++++----------
 pkgs/top-level/all-packages.nix               | 16 ++++-
 6 files changed, 74 insertions(+), 56 deletions(-)

diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index 899c3bb5c8d..e58397fa9a5 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -23,10 +23,11 @@ let
       '';
 in
 stdenv.mkDerivation rec {
-  name = "SDL-1.2.15";
+  version = "1.2.15";
+  name    = "SDL-${version}";
 
   src = fetchurl {
-    url = "http://www.libsdl.org/release/${name}.tar.gz";
+    url    = "http://www.libsdl.org/release/${name}.tar.gz";
     sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn";
   };
 
@@ -49,8 +50,10 @@ stdenv.mkDerivation rec {
 
   passthru = {inherit openglSupport;};
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A cross-platform multimedia library";
-    homepage = http://www.libsdl.org/;
+    homepage    = http://www.libsdl.org/;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix
index 8f0d59bc212..a1d83950477 100644
--- a/pkgs/development/libraries/SDL_image/default.nix
+++ b/pkgs/development/libraries/SDL_image/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
   name = "SDL_image-1.2.12";
 
   src = fetchurl {
-    url = "http://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz";
+    url    = "http://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz";
     sha256 = "16an9slbb8ci7d89wakkmyfvp7c0cval8xw4hkg0842nhhlp540b";
   };
 
-  buildInputs = [SDL libpng libjpeg libtiff libungif libXpm];
+  buildInputs = [ SDL libpng libjpeg libtiff libungif libXpm ];
 
   postInstall = ''
     sed -i -e 's,"SDL.h",<SDL/SDL.h>,' \
@@ -19,9 +19,10 @@ stdenv.mkDerivation rec {
     ln -sv SDL/SDL_image.h $out/include/SDL_image.h
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "SDL image library";
-    homepage = "http://www.libsdl.org/projects/SDL_image/";
-    platforms = stdenv.lib.platforms.linux;
+    homepage    = http://www.libsdl.org/projects/SDL_image/;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix
index af83f19dbbd..f5b40daaf68 100644
--- a/pkgs/development/libraries/SDL_mixer/default.nix
+++ b/pkgs/development/libraries/SDL_mixer/default.nix
@@ -1,14 +1,13 @@
 { stdenv, fetchurl, SDL, libogg, libvorbis, enableNativeMidi ? false }:
 
 stdenv.mkDerivation rec {
-  pname = "SDL_mixer";
-  version = "1.2.8";
-
-  name = "${pname}-${version}";
+  pname   = "SDL_mixer";
+  version = "1.2.12";
+  name    = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://www.libsdl.org/projects/${pname}/release/${name}.tar.gz";
-    sha256 = "a8222a274778ff16d0e3ee49a30db27a48a4d357169a915fc599a764e405e0b6";
+    url    = "http://www.libsdl.org/projects/${pname}/release/${name}.tar.gz";
+    sha256 = "0alrhqgm40p4c92s26mimg9cm1y7rzr6m0p49687jxd9g6130i0n";
   };
 
   buildInputs = [SDL libogg libvorbis];
@@ -17,7 +16,10 @@ stdenv.mkDerivation rec {
 
   postInstall = "ln -s $out/include/SDL/SDL_mixer.h $out/include/";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "SDL multi-channel audio mixer library";
+    homepage    = http://www.libsdl.org/projects/SDL_mixer/;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/games/beret/default.nix b/pkgs/games/beret/default.nix
index 2e252a5cd54..a92fe4d7c67 100644
--- a/pkgs/games/beret/default.nix
+++ b/pkgs/games/beret/default.nix
@@ -6,8 +6,9 @@ stdenv.mkDerivation {
   buildInputs = [ SDL SDL_image SDL_ttf SDL_mixer ];
 
   NIX_CFLAGS_COMPILE = "-I${SDL}/include/SDL";
-
-  NIX_CFLAGS_LINK = "-lgcc_s";
+  NIX_CFLAGS_LINK = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin
+    "-framework CoreFoundation -framework OpenGL -framework Cocoa";
 
   patches = [ ./use-home-dir.patch ];
 
@@ -28,11 +29,12 @@ stdenv.mkDerivation {
     cp -av tahoma.ttf images music rooms sfx $out/share
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A 2D puzzle-platformer game about a scientist with telekinetic abilities";
-    homepage = http://kiwisauce.com/beret/;
-    platforms = stdenv.lib.platforms.all;
-    license = stdenv.lib.licenses.lgpl2;
+    homepage    = http://kiwisauce.com/beret/;
+    license     = licenses.lgpl2;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.all;
   };
 }
 
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index 46f6735edee..629dcb5bbce 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -1,11 +1,9 @@
 { stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, avahi
-, gconf, gtk, intltool, gettext
-, alsaLib, libsamplerate, libsndfile, speex, bluez, sbc, udev, libcap
+, gconf, gtk, intltool, gettext, alsaLib, libsamplerate, libsndfile, speex
+, bluez, sbc, udev, libcap, json_c
 , jackaudioSupport ? false, jackaudio ? null
 , x11Support ? false, xlibs
-, json_c
-, useSystemd ? false, systemd ? null
-}:
+, useSystemd ? false, systemd ? null }:
 
 assert jackaudioSupport -> jackaudio != null;
 
@@ -18,20 +16,18 @@ stdenv.mkDerivation rec {
   };
 
   # Since `libpulse*.la' contain `-lgdbm' and `-lcap', it must be propagated.
-  propagatedBuildInputs = [ gdbm libcap ];
+  propagatedBuildInputs
+    = [ gdbm ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libcap ];
 
   buildInputs =
-    [ pkgconfig gnum4 libtool intltool glib dbus avahi
-      libsamplerate libsndfile speex alsaLib bluez sbc udev
-      json_c
-      #gtk gconf 
-    ]
+    [ pkgconfig gnum4 libtool intltool glib dbus avahi libsamplerate libsndfile
+      speex json_c ]
     ++ stdenv.lib.optional jackaudioSupport jackaudio
     ++ stdenv.lib.optionals x11Support [ xlibs.xlibs xlibs.libXtst xlibs.libXi ]
-    ++ stdenv.lib.optional useSystemd systemd;
+    ++ stdenv.lib.optional useSystemd systemd
+    ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib bluez sbc udev ];
 
   preConfigure = ''
-
     # Move the udev rules under $(prefix).
     sed -i "src/Makefile.in" \
         -e "s|udevrulesdir[[:blank:]]*=.*$|udevrulesdir = $out/lib/udev/rules.d|g"
@@ -42,19 +38,32 @@ stdenv.mkDerivation rec {
        -e "s|chmod r+s |true |"
   '';
 
-  configureFlags = ''
-    --disable-solaris --disable-hal --disable-jack
-    --disable-oss-output --disable-oss-wrapper
-    --localstatedir=/var --sysconfdir=/etc
-    ${if jackaudioSupport then "--enable-jack" else ""}
-  '';
-
-  installFlags = "sysconfdir=$(out)/etc pulseconfdir=$(out)/etc/pulse";
+  configureFlags =
+    [ "--disable-solaris" "--disable-jack" "--disable-oss-output"
+      "--disable-oss-wrapper" "--localstatedir=/var" "--sysconfdir=/etc" ]
+    ++ stdenv.lib.optional jackaudioSupport "--enable-jack"
+    ++ stdenv.lib.optional stdenv.isDarwin "--with-mac-sysroot=/";
 
   enableParallelBuilding = true;
 
-  meta = {
+  # not sure what the best practices are here -- can't seem to find a way
+  # for the compiler to bring in stdlib and stdio (etc.) properly
+  # the alternative is to copy the files from /usr/include to src, but there are
+  # probably a large number of files that would need to be copied (I stopped
+  # after the seventh)
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin
+    "-I/usr/include";
+
+  installFlags = "sysconfdir=$(out)/etc pulseconfdir=$(out)/etc/pulse";
+
+  meta = with stdenv.lib; {
     description = "PulseAudio, a sound server for POSIX and Win32 systems";
+    homepage    = http://www.pulseaudio.org/;
+    # Note: Practically, the server is under the GPL due to the
+    # dependency on `libsamplerate'.  See `LICENSE' for details.
+    licenses    = licenses.lgpl2Plus;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.unix;
 
     longDescription = ''
       PulseAudio is a sound server for POSIX and Win32 systems.  A
@@ -65,14 +74,5 @@ stdenv.mkDerivation rec {
       sample format or channel count and mixing several sounds into
       one are easily achieved using a sound server.
     '';
-
-    homepage = http://www.pulseaudio.org/;
-
-    # Note: Practically, the server is under the GPL due to the
-    # dependency on `libsamplerate'.  See `LICENSE' for details.
-    licenses = "LGPLv2+";
-
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.gnu;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 21a3a3c87d0..01d1d1fac16 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5402,14 +5402,24 @@ let
 
   SDL = callPackage ../development/libraries/SDL {
     openglSupport = mesaSupported;
-    alsaSupport = true;
+    alsaSupport = (!stdenv.isDarwin);
     x11Support = true;
-    pulseaudioSupport = false; # better go through ALSA
+    pulseaudioSupport = stdenv.isDarwin; # better go through ALSA
+
+    # resolve the unrecognized -fpascal-strings option error
+    stdenv = if stdenv.isDarwin
+      then clangStdenv
+      else stdenv;
   };
 
   SDL_gfx = callPackage ../development/libraries/SDL_gfx { };
 
-  SDL_image = callPackage ../development/libraries/SDL_image { };
+  SDL_image = callPackage ../development/libraries/SDL_image {
+    # provide an Objective-C compiler
+    stdenv = if stdenv.isDarwin
+      then clangStdenv
+      else stdenv;
+  };
 
   SDL_mixer = callPackage ../development/libraries/SDL_mixer { };
 

From ac39ba7953daf369e266363ae8bd9df4e9e3c5d8 Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Sat, 7 Sep 2013 07:36:30 +1000
Subject: [PATCH 366/452] dbus_tools: fix build on darwin (close #929)

---
 pkgs/development/libraries/dbus/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index d50a0076e62..4063d34491d 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, autoconf, automake, libtool
 , expat, systemd, glib, dbus_glib, python
-, libX11, libICE, libSM, useX11 ? stdenv.isLinux }:
+, libX11, libICE, libSM, useX11 ? (stdenv.isLinux || stdenv.isDarwin) }:
 
 let
   version = "1.6.12"; # 1.7.* isn't recommended, even for gnome 3.8
@@ -83,7 +83,9 @@ in rec {
   tools = dbus_drv "tools" "tools" {
     configureFlags = [ "--with-dbus-daemondir=${daemon}/bin" ];
     buildInputs = buildInputsX ++ systemdOrEmpty ++ [ libs daemon dbus_glib ];
-    NIX_CFLAGS_LINK = "-Wl,--as-needed -ldbus-1";
+    NIX_CFLAGS_LINK = 
+      stdenv.lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed "
+      + "-ldbus-1";
 
     meta.platforms = stdenv.lib.platforms.all;
   };
@@ -98,7 +100,9 @@ in rec {
   tests = dbus_drv "tests" "test" {
     preBuild = makeInternalLib;
     buildInputs = buildInputsX ++ systemdOrEmpty ++ [ libs tools daemon dbus_glib python ];
-    NIX_CFLAGS_LINK = "-Wl,--as-needed -ldbus-1";
+    NIX_CFLAGS_LINK = 
+      stdenv.lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed "
+      + "-ldbus-1";
   };
 
   docs = dbus_drv "docs" "doc" {

From 28bf9caca2cafb2e3a7cffe73923dcc1d4cd3cd0 Mon Sep 17 00:00:00 2001
From: Sergey Mironov <grrwlf@gmail.com>
Date: Sun, 8 Sep 2013 02:03:44 +0400
Subject: [PATCH 367/452] xfce4-power-manager: fix an brightness plugin issue

Close #943.
---
 pkgs/desktops/xfce/core/xfce4-power-manager.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager.nix b/pkgs/desktops/xfce/core/xfce4-power-manager.nix
index 1e77ba39f8f..5f38308f6d4 100644
--- a/pkgs/desktops/xfce/core/xfce4-power-manager.nix
+++ b/pkgs/desktops/xfce/core/xfce4-power-manager.nix
@@ -10,6 +10,12 @@ stdenv.mkDerivation rec {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
     sha256 = "1sc4f4wci5yl3l9lk7vcsbwj6hdjshbxw9qm43s64jr882jriyyp";
   };
+
+  brightness_patch = fetchurl {
+    url = "http://git.xfce.org/xfce/xfce4-power-manager/patch/?id=05d12e12596512f7a31d3cdb4845a69dc2d4c611";
+    sha256 = "0rbldvjwpj93hx59xrmvbdql1pgkbqzjh4vp6gkavn4z6sv535v8";
+  };
+
   name = "${p_name}-${ver_maj}.${ver_min}";
 
   buildInputs =
@@ -18,6 +24,8 @@ stdenv.mkDerivation rec {
     ];
   preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
 
+  patches = [ brightness_patch ];
+
   meta = {
     homepage = http://goodies.xfce.org/projects/applications/xfce4-power-manager;
     description = "A power manager for the Xfce Desktop Environment";

From f3802002c307023cbceee0d9d45d560b38b2fc82 Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Sun, 8 Sep 2013 09:59:45 +1000
Subject: [PATCH 368/452] ginac: fix build on darwin (close #944)

---
 pkgs/applications/science/math/ginac/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix
index 9bffc5548dd..9ea43023d57 100644
--- a/pkgs/applications/science/math/ginac/default.nix
+++ b/pkgs/applications/science/math/ginac/default.nix
@@ -1,24 +1,25 @@
-{ stdenv, fetchurl, cln, pkgconfig, readline }:
+{ stdenv, fetchurl, cln, pkgconfig, readline, gmp }:
 
 stdenv.mkDerivation rec {
   name = "ginac-1.6.2";
 
   src = fetchurl {
-    url = "${meta.homepage}/${name}.tar.bz2";
+    url    = "${meta.homepage}/${name}.tar.bz2";
     sha256 = "1pivcqqaf142l6vrj2azq6dxrcyzhag4za2dwicb4gsb09ax4d0g";
   };
 
   propagatedBuildInputs = [ cln ];
-  buildInputs = [ readline ];
+
+  buildInputs = [ readline ] ++ stdenv.lib.optional stdenv.isDarwin gmp;
 
   nativeBuildInputs = [ pkgconfig ];
 
   configureFlags = "--disable-rpath";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "GiNaC is Not a CAS";
-    homepage = http://www.ginac.de/;
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    homepage    = http://www.ginac.de/;
+    maintainers = with maintainers; [ lovek323 urkud ];
+    platforms   = platforms.all;
   };
 }

From 0021d4495ee90e96081950034b7bd70b54e66a03 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 7 Sep 2013 12:33:15 +0200
Subject: [PATCH 369/452] calibre: upgrade to 1.2.0

---
 pkgs/applications/misc/calibre/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index f75fee9983f..c2a48ffb6e1 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-1.1.0";
+  name = "calibre-1.2.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/calibre/${name}.tar.xz";
-    sha256 = "1gb6h6jn2fj5b1xv5xkmsrdrid2k8zp496alnfi88x7dmahfb6f6";
+    sha256 = "0h6afn57pw3rb03ffbnss774gdx7ldirr43hbhzsc2k2h7lxnzyj";
   };
 
   inherit python;
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     tar xf ${qt48.src}
     qtdir=$(realpath $(ls | grep qt | grep 4.8 | grep src))
     sed -i setup/build_environment.py \
-        -e "s|^qt_private_inc = .*|qt_private_inc = ['$qtdir/include/%s\'%(m) for m in ('QtGui', 'QtCore')]|"
+        -e "s|^qt_private_inc = .*|qt_private_inc = ['$qtdir/include/%s'%(m) for m in ('QtGui', 'QtCore')]|"
   '';
 
   buildInputs =

From ef72e19b275b9c272bcea7ea0ec723a639a0533b Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Tue, 3 Sep 2013 22:02:07 +0100
Subject: [PATCH 370/452] ghc-mod: Wrap to call ghc-get-packages.sh first

---
 pkgs/development/libraries/haskell/ghc-mod/default.nix | 9 +++++++++
 pkgs/lib/maintainers.nix                               | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
index b90944816d6..0f60a650d36 100644
--- a/pkgs/development/libraries/haskell/ghc-mod/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix
@@ -25,6 +25,14 @@ cabal.mkDerivation (self: {
     cd ..
     ensureDir "$out/share/emacs"
     mv $pname-$version emacs/site-lisp
+    mv $out/bin/ghc-mod $out/ghc-mod
+    cat - > $out/bin/ghc-mod <<EOF
+    #!/bin/sh
+    COMMAND=\$1
+    shift
+    eval exec $out/ghc-mod \$COMMAND \$( ${self.ghc.GHCGetPackages} ${self.ghc.ghcVersion} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@"
+    EOF
+    chmod +x $out/bin/ghc-mod
   '';
   meta = {
     homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
@@ -34,6 +42,7 @@ cabal.mkDerivation (self: {
     maintainers = [
       self.stdenv.lib.maintainers.andres
       self.stdenv.lib.maintainers.bluescreen303
+      self.stdenv.lib.maintainers.ocharles
     ];
   };
 })
diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix
index 373d2a8da4d..52487b72490 100644
--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@@ -7,8 +7,8 @@
   aforemny = "Alexander Foremny <alexanderforemny@googlemail.com>";
   all = "Nix Committers <nix-commits@lists.science.uu.nl>";
   amiddelk = "Arie Middelkoop <amiddelk@gmail.com>";
-  andres = "Andres Loeh <ksnixos@andres-loeh.de>";
   amorsillo = "Andrew Morsillo <andrew.morsillo@gmail.com>";
+  andres = "Andres Loeh <ksnixos@andres-loeh.de>";
   antono = "Antono Vasiljev <self@antono.info>";
   astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>";
   aszlig = "aszlig <aszlig@redmoonstudios.org>";
@@ -34,6 +34,7 @@
   marcweber = "Marc Weber <marco-oweber@gmx.de>";
   modulistic = "Pablo Costa <modulistic@gmail.com>";
   mornfall = "Petr Ročkai <me@mornfall.net>";
+  ocharles = "Oliver Charles <ollie@ocharles.org.uk>";
   offline = "Jaka Hudoklin <jakahudoklin@gmail.com>";
   orbitz = "Malcolm Matalka <mmatalka@gmail.com>";
   page = "Carles Pagès <page@cubata.homelinux.net>";

From a0ab379c00beea50d76547a1d2e00cd87fa06183 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Sun, 8 Sep 2013 12:40:37 +0100
Subject: [PATCH 371/452] pipes: Add Haskell 'pipes' family of libraries

---
 .../libraries/haskell/exceptions/default.nix  | 21 ++++++++++++++++++
 .../libraries/haskell/free/default.nix        | 20 +++++++++++++++++
 .../haskell/network-simple/default.nix        | 15 +++++++++++++
 .../libraries/haskell/pipes-aeson/default.nix | 19 ++++++++++++++++
 .../haskell/pipes-attoparsec/default.nix      | 22 +++++++++++++++++++
 .../haskell/pipes-concurrency/default.nix     |  8 ++++---
 .../haskell/pipes-network/default.nix         | 17 ++++++++++++++
 .../libraries/haskell/pipes-parse/default.nix |  9 ++++----
 .../libraries/haskell/pipes-safe/default.nix  |  9 ++++----
 .../libraries/haskell/pipes-zlib/default.nix  | 15 +++++++++++++
 .../libraries/haskell/pipes/default.nix       |  9 ++++----
 pkgs/top-level/haskell-packages.nix           | 16 ++++++++++++++
 12 files changed, 165 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/exceptions/default.nix
 create mode 100644 pkgs/development/libraries/haskell/free/default.nix
 create mode 100644 pkgs/development/libraries/haskell/network-simple/default.nix
 create mode 100644 pkgs/development/libraries/haskell/pipes-aeson/default.nix
 create mode 100644 pkgs/development/libraries/haskell/pipes-attoparsec/default.nix
 create mode 100644 pkgs/development/libraries/haskell/pipes-network/default.nix
 create mode 100644 pkgs/development/libraries/haskell/pipes-zlib/default.nix

diff --git a/pkgs/development/libraries/haskell/exceptions/default.nix b/pkgs/development/libraries/haskell/exceptions/default.nix
new file mode 100644
index 00000000000..ad940556ec5
--- /dev/null
+++ b/pkgs/development/libraries/haskell/exceptions/default.nix
@@ -0,0 +1,21 @@
+{ cabal, mtl, QuickCheck, testFramework, testFrameworkQuickcheck2
+, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "exceptions";
+  version = "0.3.2";
+  sha256 = "0c1d78wm8is9kyv26drbx3f1sq2bfcq5m6wfw2qzwgalb3z2kxlw";
+  buildDepends = [ mtl transformers ];
+  testDepends = [
+    mtl QuickCheck testFramework testFrameworkQuickcheck2 transformers
+  ];
+  meta = {
+    homepage = "http://github.com/ekmett/exceptions/";
+    description = "Extensible optionally-pure exceptions";
+    license = "unknown";
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
+  };
+  doCheck = false; # https://github.com/ekmett/exceptions/issues/18
+})
diff --git a/pkgs/development/libraries/haskell/free/default.nix b/pkgs/development/libraries/haskell/free/default.nix
new file mode 100644
index 00000000000..385700ca863
--- /dev/null
+++ b/pkgs/development/libraries/haskell/free/default.nix
@@ -0,0 +1,20 @@
+{ cabal, bifunctors, comonad, comonadsFd, comonadTransformers
+, distributive, mtl, semigroupoids, semigroups, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "free";
+  version = "3.4.1";
+  sha256 = "09yfkmnmhwwq22fsm1f4li4h13c3bqnh274z8jpgw0hrcnssh0rk";
+  buildDepends = [
+    bifunctors comonad comonadsFd comonadTransformers distributive mtl
+    semigroupoids semigroups transformers
+  ];
+  meta = {
+    homepage = "http://github.com/ekmett/free/";
+    description = "Monads for free";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/network-simple/default.nix b/pkgs/development/libraries/haskell/network-simple/default.nix
new file mode 100644
index 00000000000..72d8c8af8c8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/network-simple/default.nix
@@ -0,0 +1,15 @@
+{ cabal, exceptions, network, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "network-simple";
+  version = "0.3.0";
+  sha256 = "046nbgdwazbqffcim1gxry1mf35yg41g52zdk86h9whhiwjzlywz";
+  buildDepends = [ exceptions network transformers ];
+  meta = {
+    homepage = "https://github.com/k0001/network-simple";
+    description = "Simple network sockets usage patterns";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/pipes-aeson/default.nix b/pkgs/development/libraries/haskell/pipes-aeson/default.nix
new file mode 100644
index 00000000000..156b89244ee
--- /dev/null
+++ b/pkgs/development/libraries/haskell/pipes-aeson/default.nix
@@ -0,0 +1,19 @@
+{ cabal, aeson, attoparsec, pipes, pipesAttoparsec, pipesParse
+, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "pipes-aeson";
+  version = "0.2.0";
+  sha256 = "12y5dywrhx3mvmlq26bc1cwybnclqbf91zvlz5ig2pi01ji3q94y";
+  buildDepends = [
+    aeson attoparsec pipes pipesAttoparsec pipesParse transformers
+  ];
+  meta = {
+    homepage = "https://github.com/k0001/pipes-aeson";
+    description = "Encode and decode JSON streams using Aeson and Pipes";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix
new file mode 100644
index 00000000000..50f169928db
--- /dev/null
+++ b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix
@@ -0,0 +1,22 @@
+{ cabal, attoparsec, HUnit, mmorph, pipes, pipesParse, QuickCheck
+, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text
+, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "pipes-attoparsec";
+  version = "0.3.0";
+  sha256 = "1jsgssfs0ndn8aayc0rxyb4vlp2fny8npmnvym7v1yhp2qv84c7b";
+  buildDepends = [ attoparsec pipes pipesParse text transformers ];
+  testDepends = [
+    attoparsec HUnit mmorph pipes pipesParse QuickCheck testFramework
+    testFrameworkHunit testFrameworkQuickcheck2 text transformers
+  ];
+  meta = {
+    homepage = "https://github.com/k0001/pipes-attoparsec";
+    description = "Attoparsec and Pipes integration";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/pipes-concurrency/default.nix b/pkgs/development/libraries/haskell/pipes-concurrency/default.nix
index 970321bf286..3a14619d266 100644
--- a/pkgs/development/libraries/haskell/pipes-concurrency/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-concurrency/default.nix
@@ -1,13 +1,15 @@
-{ cabal, pipes, stm }:
+{ cabal, async, pipes, stm }:
 
 cabal.mkDerivation (self: {
   pname = "pipes-concurrency";
-  version = "1.2.1";
-  sha256 = "036cn6pafqpf2811iigablks3zk747bnzji9ykrgwhpja427vlbl";
+  version = "2.0.0";
+  sha256 = "1f9l6qlaf8dyldzwaavj3k5akm74ycga5j173ypdna3pv0jbzfrk";
   buildDepends = [ pipes stm ];
+  testDepends = [ async pipes stm ];
   meta = {
     description = "Concurrency for the pipes ecosystem";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pipes-network/default.nix b/pkgs/development/libraries/haskell/pipes-network/default.nix
new file mode 100644
index 00000000000..89c67fb79ca
--- /dev/null
+++ b/pkgs/development/libraries/haskell/pipes-network/default.nix
@@ -0,0 +1,17 @@
+{ cabal, network, networkSimple, pipes, pipesSafe, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "pipes-network";
+  version = "0.6.0";
+  sha256 = "1jfj5bmpvf9vvq86jz8hbhzzjawchri90vx11fxcbz2ckks673k9";
+  buildDepends = [
+    network networkSimple pipes pipesSafe transformers
+  ];
+  meta = {
+    homepage = "https://github.com/k0001/pipes-network";
+    description = "Use network sockets together with the pipes library";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/pipes-parse/default.nix b/pkgs/development/libraries/haskell/pipes-parse/default.nix
index 2a5e62926b9..2584e001c4f 100644
--- a/pkgs/development/libraries/haskell/pipes-parse/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-parse/default.nix
@@ -1,13 +1,14 @@
-{ cabal, pipes }:
+{ cabal, free, pipes, transformers }:
 
 cabal.mkDerivation (self: {
   pname = "pipes-parse";
-  version = "1.0.0";
-  sha256 = "0fk39a6d0ik5ghwyj6yyi9d0cj2sp22812fin7amcxcafrplf88w";
-  buildDepends = [ pipes ];
+  version = "2.0.0";
+  sha256 = "092y0a4lvll451gnbz6ddrqgh22bd69wi00c0zd8s0hmf2f53y0s";
+  buildDepends = [ free pipes transformers ];
   meta = {
     description = "Parsing infrastructure for the pipes ecosystem";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pipes-safe/default.nix b/pkgs/development/libraries/haskell/pipes-safe/default.nix
index 09c58f0a017..fd722c0fb05 100644
--- a/pkgs/development/libraries/haskell/pipes-safe/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-safe/default.nix
@@ -1,13 +1,14 @@
-{ cabal, pipes, transformers }:
+{ cabal, exceptions, pipes, transformers }:
 
 cabal.mkDerivation (self: {
   pname = "pipes-safe";
-  version = "1.2.0";
-  sha256 = "0ki9i9378j8kgw5dd91b38r686pcr9fl2vf9dfgfshia072ppggj";
-  buildDepends = [ pipes transformers ];
+  version = "2.0.0";
+  sha256 = "1g7ha6x87qyk3f9vrl0djzdvaq80q4q6hh7lya4kgm3cbz00a0yv";
+  buildDepends = [ exceptions pipes transformers ];
   meta = {
     description = "Safety for the pipes ecosystem";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pipes-zlib/default.nix b/pkgs/development/libraries/haskell/pipes-zlib/default.nix
new file mode 100644
index 00000000000..171b8c90b56
--- /dev/null
+++ b/pkgs/development/libraries/haskell/pipes-zlib/default.nix
@@ -0,0 +1,15 @@
+{ cabal, pipes, transformers, zlib, zlibBindings }:
+
+cabal.mkDerivation (self: {
+  pname = "pipes-zlib";
+  version = "0.3.0";
+  sha256 = "15d475rxziazxlbcbm8snik45z88kk7gxbxrpv4070bwylh3z0wc";
+  buildDepends = [ pipes transformers zlib zlibBindings ];
+  meta = {
+    homepage = "https://github.com/k0001/pipes-zlib";
+    description = "Zlib compression and decompression for Pipes streams";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/pipes/default.nix b/pkgs/development/libraries/haskell/pipes/default.nix
index 87c173850f9..a7802841607 100644
--- a/pkgs/development/libraries/haskell/pipes/default.nix
+++ b/pkgs/development/libraries/haskell/pipes/default.nix
@@ -1,13 +1,14 @@
-{ cabal, mmorph, transformers }:
+{ cabal, mmorph, mtl, transformers, void }:
 
 cabal.mkDerivation (self: {
   pname = "pipes";
-  version = "3.3.0";
-  sha256 = "1bgznfv7hxqwj5f7vkm8d41phw63bl2swzr0wrz0pcqxlr42likb";
-  buildDepends = [ mmorph transformers ];
+  version = "4.0.0";
+  sha256 = "0zsz739hjmfirwv9sacibpikwz48l006g95m8da1rqk5p1yyr2lm";
+  buildDepends = [ mmorph mtl transformers void ];
   meta = {
     description = "Compositional pipelines";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
   };
 })
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 8947945abb4..d6497b49ff0 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -938,6 +938,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   exceptionTransformers = callPackage ../development/libraries/haskell/exception-transformers {};
 
+  exceptions = callPackage ../development/libraries/haskell/exceptions {
+    QuickCheck = self.QuickCheck_2_5_1_1;
+  };
+
   explicitException = callPackage ../development/libraries/haskell/explicit-exception {};
 
   executablePath = callPackage ../development/libraries/haskell/executable-path {};
@@ -986,6 +990,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   forceLayout = callPackage ../development/libraries/haskell/force-layout {};
 
+  free = callPackage ../development/libraries/haskell/free {};
+
   fsnotify = callPackage ../development/libraries/haskell/fsnotify {};
 
   gamma = callPackage ../development/libraries/haskell/gamma {};
@@ -1520,6 +1526,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   networkProtocolXmpp = callPackage ../development/libraries/haskell/network-protocol-xmpp {};
 
+  networkSimple = callPackage ../development/libraries/haskell/network-simple { };
+
   networkTransport = callPackage ../development/libraries/haskell/network-transport {};
 
   networkTransportTcp = callPackage ../development/libraries/haskell/network-transport-tcp {};
@@ -1623,12 +1631,20 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   pipes = callPackage ../development/libraries/haskell/pipes {};
 
+  pipesAeson = callPackage ../development/libraries/haskell/pipes-aeson {};
+
+  pipesAttoparsec = callPackage ../development/libraries/haskell/pipes-attoparsec {};
+
   pipesConcurrency = callPackage ../development/libraries/haskell/pipes-concurrency {};
 
+  pipesNetwork = callPackage ../development/libraries/haskell/pipes-network {};
+
   pipesParse = callPackage ../development/libraries/haskell/pipes-parse {};
 
   pipesSafe = callPackage ../development/libraries/haskell/pipes-safe {};
 
+  pipesZlib = callPackage ../development/libraries/haskell/pipes-zlib {};
+
   polyparse = callPackage ../development/libraries/haskell/polyparse {};
 
   poolConduit = callPackage ../development/libraries/haskell/pool-conduit {};

From 7cc15281b6ff5bfd8df6a574b48a2810324f58e5 Mon Sep 17 00:00:00 2001
From: Sergey Mironov <grrwlf@gmail.com>
Date: Sat, 7 Sep 2013 23:32:03 +0400
Subject: [PATCH 372/452] libusb1: bring 1.0.9 back as a separate file

---
 pkgs/development/libraries/libusb1/1_0_9.nix | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 pkgs/development/libraries/libusb1/1_0_9.nix

diff --git a/pkgs/development/libraries/libusb1/1_0_9.nix b/pkgs/development/libraries/libusb1/1_0_9.nix
new file mode 100644
index 00000000000..a2d628f9689
--- /dev/null
+++ b/pkgs/development/libraries/libusb1/1_0_9.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "libusb-1.0.9";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/libusb/${name}.tar.bz2";
+    sha256 = "16sz34ix6hw2wwl3kqx6rf26fg210iryr68wc439dc065pffw879";
+  };
+
+  buildInputs = [ pkgconfig ];
+
+  meta = {
+    homepage = http://www.libusb.org;
+    description = "User-space USB library";
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+  };
+}
+

From 3a1626e1a14e281753b1c18de03559a6167214ec Mon Sep 17 00:00:00 2001
From: Sergey Mironov <grrwlf@gmail.com>
Date: Sat, 7 Sep 2013 23:32:32 +0400
Subject: [PATCH 373/452] upower: revert libusb1 version to 1.0.9

That workarounds the coldplug problem

$ sudo ./libexec/upowerd -v
TI:18:38:27     Starting upowerd version 0.9.19
...
TI:18:38:27     registering subsystem : usb
TI:18:38:27     failed to coldplug /sys/devices/pci0000:00/0000:00:1c.4/0000:03:00.0/usb1
<upowerd EXITS>
---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 01d1d1fac16..39bedd990d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6863,7 +6863,9 @@ let
 
   untie = callPackage ../os-specific/linux/untie { };
 
-  upower = callPackage ../os-specific/linux/upower { };
+  upower = callPackage ../os-specific/linux/upower {
+    libusb1 = callPackage ../development/libraries/libusb1/1_0_9.nix {};
+    };
 
   upstart = callPackage ../os-specific/linux/upstart { };
 

From f5768c5da1a7c11fa5836f784188cddcc8dbe5b0 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Sun, 8 Sep 2013 11:11:24 +1000
Subject: [PATCH 374/452] pythonPackages.powerline: update to latest develop

---
 pkgs/top-level/python-packages.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fc54f79ebb3..5104adb8042 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3890,13 +3890,13 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
 
   powerline = buildPythonPackage rec {
-    rev = "72ea6730ead85fc19b983bd70173d15e6caa4965";
+    rev  = "db80fc95ed01d2c559c4bdc7da8514ed3cc7fcd9";
     name = "powerline-beta_${rev}";
 
     src = fetchurl {
-      url = "https://github.com/Lokaltog/powerline/tarball/${rev}";
-      name = "${name}.tar.bz";
-      sha256 = "08sr8ymhphh7rsn2gcmpdz3kzd04b7w3k4pc35h8w60jvg9i449s";
+      url    = "https://github.com/Lokaltog/powerline/tarball/${rev}";
+      name   = "${name}.tar.bz";
+      sha256 = "1csd4vasy0avwfxrpdr61plj6k1nzf36f6qvd9kl15s3lnspsfaz";
     };
 
     propagatedBuildInputs = [ pkgs.git pkgs.mercurial pkgs.bazaar pythonPackages.psutil pythonPackages.pygit2 ];
@@ -3920,11 +3920,12 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       install -m644 "powerline/bindings/tmux/powerline.conf" "$out/share/tmux/powerline.conf"
     '';
 
-    meta = {
-      homepage = https://github.com/Lokaltog/powerline;
+    meta = with stdenv.lib; {
+      homepage    = https://github.com/Lokaltog/powerline;
       description = "The ultimate statusline/prompt utility.";
-      license = with stdenv.lib.licenses; mit;
-      platforms = with stdenv.lib.platforms; all;
+      license     = licenses.mit;
+      maintainers = with maintainers; [ lovek323 ];
+      platforms   = platforms.all;
     };
   };
 

From 499109b7dd83d53387e788b0bd2cf22a7fa2af48 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Sun, 8 Sep 2013 11:11:32 +1000
Subject: [PATCH 375/452] vimPlugins.syntastic: update to 3.1.0

---
 pkgs/misc/vim-plugins/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 8758475f347..9e81b898e66 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -145,12 +145,15 @@ in
     };
   };
 
-  syntastic = simpleDerivation {
-    name = "vim-syntastic-3.0.0";
+  syntastic = simpleDerivation rec {
+    version = "3.1.0";
+    name    = "vim-syntastic-${version}";
+
     src = fetchurl {
-      url = "https://github.com/scrooloose/syntastic/archive/3.0.0.tar.gz";
-      sha256 = "0nf69wpa8qa7xcfvywy2khmazs4dn1i2nal9qwjh2bzrbwbbkdyl";
+      url    = "https://github.com/scrooloose/syntastic/archive/${version}.tar.gz";
+      sha256 = "155zfb5z0gmd1xrpna4varqf502lq0cr41gmxq5v71r6kmb7ql82";
     };
+
     path = "syntastic";
   };
 

From c4115d45a04dc9361d3f8077242c9989c9c0666a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 21:07:57 +0200
Subject: [PATCH 376/452] nbd: update to version 3.4

---
 pkgs/tools/networking/nbd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix
index c5636c6e6ee..653bec89747 100644
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/pkgs/tools/networking/nbd/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, glib }:
 
 let
-  name = "nbd-3.3";
+  name = "nbd-3.4";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "mirror://sourceforge/nbd/${name}.tar.bz2";
-    sha256 = "068cm0lkw67g7vj95kqxwb9z15c0jbsfbmjjl5zfx7mbvhc5f443";
+    sha256 = "1krj185fagnqsqpcfig7zkqa3cqgyyn956241ix224wssvynsajm";
   };
 
   buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.kernelHeaders;

From aa0df547a8b544ca3a91bb3184c7c91f576641f4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 21:08:13 +0200
Subject: [PATCH 377/452] bison-3.x: fix test suite by adding flex as a build
 input

---
 pkgs/development/tools/parsing/bison/3.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix
index d076d8ba4db..9b1499c1537 100644
--- a/pkgs/development/tools/parsing/bison/3.x.nix
+++ b/pkgs/development/tools/parsing/bison/3.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, m4, perl }:
+{ stdenv, fetchurl, m4, perl, flex }:
 
 stdenv.mkDerivation rec {
   name = "bison-3.0";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1j14fqgi9wzqgsy4fhkcdrv4hv6rrvhvn84axs520w9b022mbb79";
   };
 
-  nativeBuildInputs = [ m4 ] ++ stdenv.lib.optional doCheck perl;
+  nativeBuildInputs = [ m4 ] ++ stdenv.lib.optionals doCheck [perl flex];
   propagatedBuildInputs = [ m4 ];
 
   doCheck = true;

From 575be7dd4bde2121dfff755d3f671ef8822580da Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Sun, 8 Sep 2013 11:35:38 +1000
Subject: [PATCH 378/452] vimPlugins.tagbar: add expression

---
 pkgs/misc/vim-plugins/default.nix | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 9e81b898e66..af4363f9217 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -203,7 +203,7 @@ in
     meta = with stdenv.lib; {
       description = "Source code browser plugin";
       homepage    = "http://www.vim.org/scripts/script.php?script_id=273";
-      license     = stdenv.lib.licenses.gpl3;
+      license     = licenses.gpl3;
       maintainers = with maintainers; [ lovek323 ];
       platforms   = platforms.unix;
     };
@@ -222,6 +222,26 @@ in
     path = "taglist";
   };
 
+  tagbar = simpleDerivation rec {
+    version = "2.5";
+    name    = "vim-tagbar-${version}";
+
+    meta = with stdenv.lib; {
+      description = "A vim plugin for browsing the tags of source code files";
+      homepage    = https://github.com/majutsushi/tagbar;
+      license     = licenses.gpl3;
+      maintainers = with maintainers; [ lovek323 ];
+      platforms   = platforms.unix;
+    };
+
+    src = fetchurl {
+      url    = "https://github.com/majutsushi/tagbar/archive/v${version}.tar.gz";
+      sha256 = "1s4aic3qbk2ra2cif06g16d0avlmpxhrm96dksrw9qnv4hcjqqxr";
+    };
+
+    path = "tagbar";
+  };
+
   xdebug = simpleDerivation {
     name = "vim-xdebug-a4980fa65f7f159780593ee37c178281691ba2c4";
     src = fetchurl {

From 5f3b19e661a18a10f65185a02df025c094ffe59b Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Sat, 7 Sep 2013 00:48:42 +0200
Subject: [PATCH 379/452] recursive-pth-loader: build sitecustomize.pyc

If this file is not created at build time, then python (when run as root) will
create it at run time and mess up the consistency of the nix store.
---
 .../python-modules/recursive-pth-loader/default.nix         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/recursive-pth-loader/default.nix b/pkgs/development/python-modules/recursive-pth-loader/default.nix
index 959882be938..e281d69c98a 100644
--- a/pkgs/development/python-modules/recursive-pth-loader/default.nix
+++ b/pkgs/development/python-modules/recursive-pth-loader/default.nix
@@ -7,11 +7,15 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ python ];
 
+  patchPhase = "cat ${./sitecustomize.py} > sitecustomize.py";
+
+  buildPhase = "python -m compileall .";
+
   installPhase =
     ''
       dst=$out/lib/${python.libPrefix}/site-packages
       mkdir -p $dst
-      cat ${./sitecustomize.py} >> $dst/sitecustomize.py
+      cp sitecustomize.* $dst/
     '';
 
   meta = {

From cadc9a03a726face1390269f88d91a7d2b29da2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 8 Sep 2013 22:07:20 +0200
Subject: [PATCH 380/452] recursive-pth-loader: fix python path

This should work for both python2 and python3.
---
 .../development/python-modules/recursive-pth-loader/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/recursive-pth-loader/default.nix b/pkgs/development/python-modules/recursive-pth-loader/default.nix
index e281d69c98a..9a17e722679 100644
--- a/pkgs/development/python-modules/recursive-pth-loader/default.nix
+++ b/pkgs/development/python-modules/recursive-pth-loader/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   patchPhase = "cat ${./sitecustomize.py} > sitecustomize.py";
 
-  buildPhase = "python -m compileall .";
+  buildPhase = "${python}/bin/${python.executable} -m compileall .";
 
   installPhase =
     ''

From d26466c6d853c7291d7800b6898be16cbd5c4be6 Mon Sep 17 00:00:00 2001
From: Gergely Risko <gergely@risko.hu>
Date: Sun, 8 Sep 2013 22:25:27 +0200
Subject: [PATCH 381/452] Fix impurity in HFuse

This impurity caused hsc2hs to start look into /usr/include in any Cabal
project that depends on HFuse on systems where /usr/include is present.
---
 pkgs/development/libraries/haskell/HFuse/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/HFuse/default.nix b/pkgs/development/libraries/haskell/HFuse/default.nix
index bbb145fd8bf..9d37b580d80 100644
--- a/pkgs/development/libraries/haskell/HFuse/default.nix
+++ b/pkgs/development/libraries/haskell/HFuse/default.nix
@@ -7,6 +7,7 @@ cabal.mkDerivation (self: {
   extraLibraries = [ fuse ];
   preConfigure = ''
     sed -i -e "s@  Extra-Lib-Dirs:         /usr/local/lib@  Extra-Lib-Dirs:         ${fuse}/lib@" HFuse.cabal
+    sed -i -e "s@  Include-Dirs:           /usr/include, /usr/local/include, .@  Include-Dirs:           ${fuse}/include@" HFuse.cabal
     sed -i -e "s/LANGUAGE FlexibleContexts/LANGUAGE FlexibleContexts, RankNTypes/" System/Fuse.hsc
     sed -i -e "s/E(Exception/E(catch, Exception, IOException/" System/Fuse.hsc
     sed -i -e "s/IO(catch,/IO(/" System/Fuse.hsc

From 2f8a09a2ff1db97bc497c319621f6997aac7ee57 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 21:45:42 +0200
Subject: [PATCH 382/452] haskell-thyme: enable unit tests

---
 pkgs/development/libraries/haskell/thyme/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/thyme/default.nix b/pkgs/development/libraries/haskell/thyme/default.nix
index 1e372d8f5ba..7d79881127d 100644
--- a/pkgs/development/libraries/haskell/thyme/default.nix
+++ b/pkgs/development/libraries/haskell/thyme/default.nix
@@ -1,5 +1,5 @@
-{ cabal, attoparsec, deepseq, lens, QuickCheck
-, random, text, time, transformers, vector
+{ cabal, attoparsec, Cabal, deepseq, filepath, lens, QuickCheck
+, random, systemPosixRedirect, text, time, transformers, vector
 , vectorSpace
 }:
 
@@ -11,8 +11,10 @@ cabal.mkDerivation (self: {
     attoparsec deepseq lens QuickCheck random text time transformers
     vector vectorSpace
   ];
-  # have some strange test depends
-  doCheck = false;
+  testDepends = [
+    attoparsec Cabal filepath lens QuickCheck random
+    systemPosixRedirect text time vectorSpace
+  ];
   meta = {
     homepage = "https://github.com/liyang/thyme";
     description = "A faster time library";

From b68dfd49c7c494a88fc8cd2fe9dae5f2ef435e4d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 21:45:59 +0200
Subject: [PATCH 383/452] haskell-splot: re-generate expression with cabal2nix

---
 pkgs/development/tools/haskell/splot/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/haskell/splot/default.nix b/pkgs/development/tools/haskell/splot/default.nix
index 460dc3f8c43..4e99a1e68cd 100644
--- a/pkgs/development/tools/haskell/splot/default.nix
+++ b/pkgs/development/tools/haskell/splot/default.nix
@@ -1,5 +1,5 @@
-{ cabal, bytestringLexing, cairo, colour, HUnit, mtl
-, strptime, time, vcsRevision
+{ cabal, bytestringLexing, cairo, colour, HUnit, mtl, strptime
+, time, vcsRevision
 }:
 
 cabal.mkDerivation (self: {
@@ -9,8 +9,7 @@ cabal.mkDerivation (self: {
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-    bytestringLexing cairo colour HUnit mtl strptime time
-    vcsRevision
+    bytestringLexing cairo colour HUnit mtl strptime time vcsRevision
   ];
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Splot";

From 2aa0411562ff9ab37de0a66f9f8599ae78c0fa69 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 21:47:08 +0200
Subject: [PATCH 384/452] cabal-install: update to version 1.18.0.1

---
 .../cabal-install/{1.18.0.nix => 1.18.0.1.nix}                | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/tools/package-management/cabal-install/{1.18.0.nix => 1.18.0.1.nix} (90%)

diff --git a/pkgs/tools/package-management/cabal-install/1.18.0.nix b/pkgs/tools/package-management/cabal-install/1.18.0.1.nix
similarity index 90%
rename from pkgs/tools/package-management/cabal-install/1.18.0.nix
rename to pkgs/tools/package-management/cabal-install/1.18.0.1.nix
index 8b093bc925c..ceb54effdd9 100644
--- a/pkgs/tools/package-management/cabal-install/1.18.0.nix
+++ b/pkgs/tools/package-management/cabal-install/1.18.0.1.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal-install";
-  version = "1.18.0";
-  sha256 = "14c4i8cy2rnvjj2krv3swna53k2674xhpzqkmcr56lxnyzych5wh";
+  version = "1.18.0.1";
+  sha256 = "0b44w4iqzaq5119zjkpagd3a2279kz6xq5pk5rqnlnfn8a8ihdbb";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index d6497b49ff0..7de5605eed8 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -173,7 +173,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     vector       = self.vector_0_10_0_1;
     xhtml        = self.xhtml_3000_2_1;
     zlib         = self.zlib_0_5_4_1;
-    cabalInstall = self.cabalInstall_1_18_0;
+    cabalInstall = self.cabalInstall_1_18_0_1;
     alex         = self.alex_3_0_5;
     haddock      = self.haddock_2_13_2;
     happy        = self.happy_1_18_10;
@@ -2394,7 +2394,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   cabalInstall_0_10_2 = callPackage ../tools/package-management/cabal-install/0.10.2.nix {};
   cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {};
   cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix {};
-  cabalInstall_1_18_0 = callPackage ../tools/package-management/cabal-install/1.18.0.nix {};
+  cabalInstall_1_18_0_1 = callPackage ../tools/package-management/cabal-install/1.18.0.1.nix {};
   cabalInstall = self.cabalInstall_1_18_0;
 
   gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex {};

From d7748daf2ca77570c1bb3a9aeeb281eef97891f5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:04:39 +0200
Subject: [PATCH 385/452] haskell-unordered-containers: add version 0.2.3.2

---
 .../unordered-containers/{0.2.3.1.nix => 0.2.3.2.nix}       | 4 ++--
 pkgs/top-level/haskell-packages.nix                         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename pkgs/development/libraries/haskell/unordered-containers/{0.2.3.1.nix => 0.2.3.2.nix} (87%)

diff --git a/pkgs/development/libraries/haskell/unordered-containers/0.2.3.1.nix b/pkgs/development/libraries/haskell/unordered-containers/0.2.3.2.nix
similarity index 87%
rename from pkgs/development/libraries/haskell/unordered-containers/0.2.3.1.nix
rename to pkgs/development/libraries/haskell/unordered-containers/0.2.3.2.nix
index af4f93c7457..669f45d83f2 100644
--- a/pkgs/development/libraries/haskell/unordered-containers/0.2.3.1.nix
+++ b/pkgs/development/libraries/haskell/unordered-containers/0.2.3.2.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "unordered-containers";
-  version = "0.2.3.1";
-  sha256 = "10wz5y42r9b2ym7vl5sqrcawyjixmhy370h0kzpvczs8mlzvrlx8";
+  version = "0.2.3.2";
+  sha256 = "0fgfb2zqa2zi2hb9nkj92nwnxr54wkqa6gmqbcn4h5zks5anfvn5";
   buildDepends = [ deepseq hashable ];
   testDepends = [
     ChasingBottoms hashable HUnit QuickCheck testFramework
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7de5605eed8..a6d26ab8e01 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -169,7 +169,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     syb          = self.syb_0_4_1;
     text         = self.text_0_11_3_1;
     transformers = null;                        # this has become a core package in GHC 7.7
-    unorderedContainers = self.unorderedContainers_0_2_3_0;
+    unorderedContainers = self.unorderedContainers_0_2_3_2;
     vector       = self.vector_0_10_0_1;
     xhtml        = self.xhtml_3000_2_1;
     zlib         = self.zlib_0_5_4_1;
@@ -2075,8 +2075,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   unlambda = callPackage ../development/libraries/haskell/unlambda {};
 
   unorderedContainers_0_2_3_0 = callPackage ../development/libraries/haskell/unordered-containers/0.2.3.0.nix {};
-  unorderedContainers_0_2_3_1 = callPackage ../development/libraries/haskell/unordered-containers/0.2.3.1.nix {};
-  unorderedContainers = self.unorderedContainers_0_2_3_1;
+  unorderedContainers_0_2_3_2 = callPackage ../development/libraries/haskell/unordered-containers/0.2.3.2.nix {};
+  unorderedContainers = self.unorderedContainers_0_2_3_2;
 
   url = callPackage ../development/libraries/haskell/url {};
 

From efce71f0232b26ff8bb2b7f307eafa1b4dd40b41 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:04:50 +0200
Subject: [PATCH 386/452] haskell-system-posix-redirect: add version 1.1

---
 .../haskell/system-posix-redirect/default.nix        | 12 ++++++++++++
 pkgs/top-level/haskell-packages.nix                  |  2 ++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/system-posix-redirect/default.nix

diff --git a/pkgs/development/libraries/haskell/system-posix-redirect/default.nix b/pkgs/development/libraries/haskell/system-posix-redirect/default.nix
new file mode 100644
index 00000000000..b8a65e41fd8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/system-posix-redirect/default.nix
@@ -0,0 +1,12 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "system-posix-redirect";
+  version = "1.1";
+  sha256 = "08l8n671ypmharmkm9s8wv5ipcznn7hv5zadf96liml3v16d8fcr";
+  meta = {
+    description = "A toy module that allows you to temporarily redirect a program's stdout";
+    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 a6d26ab8e01..ca723691828 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1959,6 +1959,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   systemFileio = callPackage ../development/libraries/haskell/system-fileio {};
 
+  systemPosixRedirect = callPackage ../development/libraries/haskell/system-posix-redirect {};
+
   TableAlgebra = callPackage ../development/libraries/haskell/TableAlgebra {};
 
   tabular = callPackage ../development/libraries/haskell/tabular {};

From b64ddfd486c2415792f10797ffb4a77ecebb935e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:05:39 +0200
Subject: [PATCH 387/452] haskell-boomerang: update to version 1.4.0

---
 pkgs/development/libraries/haskell/boomerang/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/boomerang/default.nix b/pkgs/development/libraries/haskell/boomerang/default.nix
index 963448a56e7..3e65c0a2dd4 100644
--- a/pkgs/development/libraries/haskell/boomerang/default.nix
+++ b/pkgs/development/libraries/haskell/boomerang/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "boomerang";
-  version = "1.3.3";
-  sha256 = "1i44j3qyjkq69h65wfsrps5zp097i3nh9fwcb2f1spr8nznb5mff";
+  version = "1.4.0";
+  sha256 = "1z6sx2r886jms59ah31is0fqkwix2kwxmpnrc6bb2r6xazznxfc9";
   buildDepends = [ mtl text ];
   meta = {
     description = "Library for invertible parsing and printing";

From f804f8390c43d7332559ccee8b6123266f2e1d98 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:05:39 +0200
Subject: [PATCH 388/452] haskell-cereal-conduit: update to version 0.7.1

---
 pkgs/development/libraries/haskell/cereal-conduit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/cereal-conduit/default.nix b/pkgs/development/libraries/haskell/cereal-conduit/default.nix
index 464e8dbb5e7..fc76f85cebc 100644
--- a/pkgs/development/libraries/haskell/cereal-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/cereal-conduit/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cereal-conduit";
-  version = "0.7";
-  sha256 = "0cf0lp47qiilrdrzmn58hwh3q7fh7g55f2a1r1bw31xapp1cvbix";
+  version = "0.7.1";
+  sha256 = "0ry6vc3nkb1lj0p103b8pyd3472hx62s3c7yw3fk8mbjlygxyv43";
   buildDepends = [ cereal conduit transformers ];
   testDepends = [ cereal conduit HUnit mtl resourcet transformers ];
   meta = {

From e29c5d21ff1f516ce25aeab3ed1014133982c825 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:05:39 +0200
Subject: [PATCH 389/452] haskell-cipher-blowfish: update to version 0.0.2

---
 .../development/libraries/haskell/cipher-blowfish/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/cipher-blowfish/default.nix b/pkgs/development/libraries/haskell/cipher-blowfish/default.nix
index af8114c6d02..535a4b97fca 100644
--- a/pkgs/development/libraries/haskell/cipher-blowfish/default.nix
+++ b/pkgs/development/libraries/haskell/cipher-blowfish/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cipher-blowfish";
-  version = "0.0.1";
-  sha256 = "0bz8jd65idcalyzcbmgz16hr6y5mnw7mckk5yvrm9k19cr6mwq52";
+  version = "0.0.2";
+  sha256 = "08jc1qsvnyk7zm7bp0nibkc6lx3bkid79cn1r6fidmccf716r3sp";
   buildDepends = [ byteable cryptoCipherTypes securemem vector ];
   testDepends = [
     byteable cryptoCipherTests cryptoCipherTypes QuickCheck

From 1bad058b34ed658cbb5e301ec880bb1817abf25f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:05:39 +0200
Subject: [PATCH 390/452] haskell-cipher-des: update to version 0.0.4

---
 pkgs/development/libraries/haskell/cipher-des/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/cipher-des/default.nix b/pkgs/development/libraries/haskell/cipher-des/default.nix
index 588a28f3a25..0340372d54b 100644
--- a/pkgs/development/libraries/haskell/cipher-des/default.nix
+++ b/pkgs/development/libraries/haskell/cipher-des/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cipher-des";
-  version = "0.0.3";
-  sha256 = "1gcpwfxrlgwl34yy7k3vhpmcrmyiirbmz40zssk2lv6cfrylc4z7";
+  version = "0.0.4";
+  sha256 = "18xpc7v0xyh0qb7p03ail1lyh376h1vg000xn22b5shpgp5kxiqq";
   buildDepends = [ byteable cryptoCipherTypes securemem ];
   testDepends = [
     byteable cryptoCipherTests cryptoCipherTypes QuickCheck

From 7669fcf0369e371ac96c83f5009fc072f72efbbb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:05:39 +0200
Subject: [PATCH 391/452] haskell-conduit: update to version 1.0.7.4

---
 pkgs/development/libraries/haskell/conduit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index 8c550065deb..0e1757f7b50 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "1.0.7.3";
-  sha256 = "0ih3ymv5m3c66wr9xydc1dxgpvh5b92dyyc7v67li6n3w7dzi6fp";
+  version = "1.0.7.4";
+  sha256 = "1bvi9gw9sfi1fml339rn3cfq4i3yd9j9vw41p5cpz5pnv3gw225x";
   buildDepends = [
     liftedBase mmorph monadControl mtl resourcet text transformers
     transformersBase void

From ab574fc4fe5b9cfc7db0532f39174a2d76cf9987 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:05:39 +0200
Subject: [PATCH 392/452] haskell-cprng-aes: update to version 0.5.2

---
 pkgs/development/libraries/haskell/cprng-aes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/cprng-aes/default.nix b/pkgs/development/libraries/haskell/cprng-aes/default.nix
index fb6d2ff456b..9425ec37547 100644
--- a/pkgs/development/libraries/haskell/cprng-aes/default.nix
+++ b/pkgs/development/libraries/haskell/cprng-aes/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cprng-aes";
-  version = "0.5.1";
-  sha256 = "1bw76y2krcshimvwzph76d69bdfaxfi21w4dxfslmqm78knlls47";
+  version = "0.5.2";
+  sha256 = "1nf8dd83ywriq2ynv48f2s5lvc9s3srq4j5vbspmf0kc74kmq2pf";
   buildDepends = [ byteable cipherAes cryptoRandom random ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-cprng-aes";

From 642a838e0a3d1159ff26bdb9b64fb20a461288c3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:05:39 +0200
Subject: [PATCH 393/452] haskell-crypto-numbers: update to version 0.2.1

---
 pkgs/development/libraries/haskell/crypto-numbers/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/crypto-numbers/default.nix b/pkgs/development/libraries/haskell/crypto-numbers/default.nix
index eba1b906d5b..68deb8e3472 100644
--- a/pkgs/development/libraries/haskell/crypto-numbers/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-numbers/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "crypto-numbers";
-  version = "0.2.0";
-  sha256 = "1s4q9qqb7qb0shaxmhhxixsnhgwn2h6nxxblkfqqqvkdiwis278j";
+  version = "0.2.1";
+  sha256 = "1bc24xk101x7npv083gzh3vjzwjh65ql85h4z0vxk3lnd0pmdmnq";
   buildDepends = [ cryptoRandom vector ];
   testDepends = [
     byteable cryptoRandom HUnit QuickCheck testFramework

From 54a7cc2b8844a62b9dcf0ba282537470af0a8076 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:05:39 +0200
Subject: [PATCH 394/452] haskell-crypto-random: update to version 0.0.7

---
 pkgs/development/libraries/haskell/crypto-random/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/crypto-random/default.nix b/pkgs/development/libraries/haskell/crypto-random/default.nix
index 583e9e5805b..1b5e2aa3238 100644
--- a/pkgs/development/libraries/haskell/crypto-random/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-random/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "crypto-random";
-  version = "0.0.5";
-  sha256 = "1wvbbqqfqaylq9w8pyiz243d06ivh982mhb2ci5yhjl06vqv2gk3";
+  version = "0.0.7";
+  sha256 = "1dj63y85l3f1x7fw8j7hykz56ajd38iikl3f8ygaz8r95pd1zjxw";
   buildDepends = [ securemem vector ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-crypto-random";

From b3e339151843edae97badac46e82d23d605083de Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:05:39 +0200
Subject: [PATCH 395/452] haskell-derive: update to version 2.5.13

---
 pkgs/development/libraries/haskell/derive/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/derive/default.nix b/pkgs/development/libraries/haskell/derive/default.nix
index 7fe2fdcba9f..0873e65d9da 100644
--- a/pkgs/development/libraries/haskell/derive/default.nix
+++ b/pkgs/development/libraries/haskell/derive/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "derive";
-  version = "2.5.12";
-  sha256 = "17agsdarxm22z4g911layb5g11gg8r1p2ar86pg1ch1q0jnhfqxr";
+  version = "2.5.13";
+  sha256 = "0lmwj66s4krh29qqmkyc3cn3j4b4mhyqvlngvmy1xaigmgib5aci";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 2d76cc56d47b99407e8109719ff9d3962daedce9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:05:39 +0200
Subject: [PATCH 396/452] haskell-gnutls: update to version 0.1.5

---
 pkgs/development/libraries/haskell/gnutls/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/gnutls/default.nix b/pkgs/development/libraries/haskell/gnutls/default.nix
index 72f98677ce6..8e77a0626ce 100644
--- a/pkgs/development/libraries/haskell/gnutls/default.nix
+++ b/pkgs/development/libraries/haskell/gnutls/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gnutls";
-  version = "0.1.4";
-  sha256 = "0xgjp274m4z005z77lhmh7blg6rw9g28jm0sd376rr49hykbxwd1";
+  version = "0.1.5";
+  sha256 = "1sf6b4g0jwk1jrzjq4vwwak57lzm1zc43ggysp973q5icm6gs8wp";
   buildDepends = [ monadsTf transformers ];
   extraLibraries = [ gnutls ];
   pkgconfigDepends = [ gnutls ];

From e986d8b36f832e3bb2d4820022cd32f1edc79a4d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:05:39 +0200
Subject: [PATCH 397/452] haskell-hamlet: update to version 1.1.7.2

---
 pkgs/development/libraries/haskell/hamlet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix
index c5d0b335531..c29672767a6 100644
--- a/pkgs/development/libraries/haskell/hamlet/default.nix
+++ b/pkgs/development/libraries/haskell/hamlet/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hamlet";
-  version = "1.1.7.1";
-  sha256 = "1kcjzvslxis8qapy7g1cqkqqamrnkyammy33pan7ckzv5fd59q5p";
+  version = "1.1.7.2";
+  sha256 = "1pfpygbabfmgx01vjkxhf3p9map2v7x8jys06jd6qgc4j90dnk1c";
   buildDepends = [
     blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text
   ];

From d2d3efbaf81235b3de79eb7ea6a0c19d8c32e0a6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:05:40 +0200
Subject: [PATCH 398/452] haskell-heist: update to version 0.13.0

---
 pkgs/development/libraries/haskell/heist/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix
index 22ad08afe38..9def726fb69 100644
--- a/pkgs/development/libraries/haskell/heist/default.nix
+++ b/pkgs/development/libraries/haskell/heist/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "heist";
-  version = "0.12.0";
-  sha256 = "0fdqvippsxljylchfcr32lw367i17cpv4yavjvmhfd923vgmmfj9";
+  version = "0.13.0";
+  sha256 = "1f406i7jdz45s88n0nrd76vj927a0fx02nf1f98r4in0ic5anp11";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors
     filepath hashable MonadCatchIOTransformers mtl random text time

From ec7b50f81e688de7d0977496a895b15c6c67bde7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:05:40 +0200
Subject: [PATCH 399/452] haskell-hspec-meta: update to version 1.7.2

---
 pkgs/development/libraries/haskell/hspec-meta/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix
index ff6c0f204d7..d409501d706 100644
--- a/pkgs/development/libraries/haskell/hspec-meta/default.nix
+++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hspec-meta";
-  version = "1.7.1";
-  sha256 = "08g327jnv7alamabxafhsv7ssisgymgsf91khr73zja5x8idfkxc";
+  version = "1.7.2";
+  sha256 = "03ksxx7w61iw3hf055mjb47bjh8srwxpqxs5bxqdqrilfd1cixmj";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 14940d747bd29f475c00c92ee4ba8c53d46f5f97 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:05:40 +0200
Subject: [PATCH 400/452] haskell-hspec: update to version 1.7.2

---
 pkgs/development/libraries/haskell/hspec/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix
index 0c9783c9a9c..6d9caf6e6b6 100644
--- a/pkgs/development/libraries/haskell/hspec/default.nix
+++ b/pkgs/development/libraries/haskell/hspec/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hspec";
-  version = "1.7.1";
-  sha256 = "0fc8phc36876f8qydc5iwz3i7nri0n6b4dlxv0w4rcxgv9hp7ls0";
+  version = "1.7.2";
+  sha256 = "0f0l5kzkpn957v7ibaxz9bxmjmbjaw50z2xs23g2w06zwnxii90h";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 49dbebec60471c0582e8fb57f3ddfef291eb155c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:05:40 +0200
Subject: [PATCH 401/452] haskell-http-reverse-proxy: update to version 0.2.1.1

---
 .../libraries/haskell/http-reverse-proxy/default.nix      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
index c44e489519c..a4f458f8395 100644
--- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
+++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
@@ -1,4 +1,4 @@
-{ cabal, blazeBuilder, caseInsensitive, classyPrelude, conduit
+{ cabal, basicPrelude, blazeBuilder, caseInsensitive, conduit
 , dataDefault, hspec, httpConduit, httpTypes, liftedBase
 , monadControl, network, networkConduit, text, transformers, wai
 , waiLogger, warp, word8
@@ -6,10 +6,10 @@
 
 cabal.mkDerivation (self: {
   pname = "http-reverse-proxy";
-  version = "0.2.1";
-  sha256 = "1f1087igr4kisb3z3lxznb85sfhzr2s08am1za3jg8cgffmrais8";
+  version = "0.2.1.1";
+  sha256 = "12hfbl8239ivrqvd5pi1avlcb381q861958qwyf20jc5jpwvjjgj";
   buildDepends = [
-    blazeBuilder caseInsensitive classyPrelude conduit dataDefault
+    basicPrelude blazeBuilder caseInsensitive conduit dataDefault
     httpConduit httpTypes liftedBase monadControl network
     networkConduit text wai waiLogger warp word8
   ];

From 61883ffabec940f980b16ceb87b6f63c6d1a3ca4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:05:40 +0200
Subject: [PATCH 402/452] haskell-lens: update to version 3.9.1

---
 pkgs/development/libraries/haskell/lens/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix
index 8bc221f1493..20541aa4a2f 100644
--- a/pkgs/development/libraries/haskell/lens/default.nix
+++ b/pkgs/development/libraries/haskell/lens/default.nix
@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lens";
-  version = "3.9.0.2";
-  sha256 = "0ch38z33zgdyzjmc7jqwabwq68iidicpzhbwzpd4fvcqdp27apl2";
+  version = "3.9.1";
+  sha256 = "141v7b5ag6jxnim1hdyxqi5m2sm1j5fpspkcs8qnznfcd33gyfja";
   buildDepends = [
     bifunctors comonad comonadsFd comonadTransformers contravariant
     distributive filepath genericDeriving hashable
@@ -26,9 +26,6 @@ cabal.mkDerivation (self: {
     transformers unorderedContainers vector
   ];
   doCheck = false;
-  patchPhase = ''
-    sed -i -e 's|generic-deriving.*,|generic-deriving,|' lens.cabal
-  '';
   meta = {
     homepage = "http://github.com/ekmett/lens/";
     description = "Lenses, Folds and Traversals";

From 17f8b638378077946e77071040c80630bf23e0f5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:05:40 +0200
Subject: [PATCH 403/452] haskell-pandoc-types: update to version 1.12

---
 .../libraries/haskell/pandoc-types/default.nix            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/pandoc-types/default.nix b/pkgs/development/libraries/haskell/pandoc-types/default.nix
index d4f49791d30..63874d39fb8 100644
--- a/pkgs/development/libraries/haskell/pandoc-types/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc-types/default.nix
@@ -1,10 +1,10 @@
-{ cabal, syb }:
+{ cabal, aeson, syb }:
 
 cabal.mkDerivation (self: {
   pname = "pandoc-types";
-  version = "1.10";
-  sha256 = "1xbqvgb95h0jhqx2y0jzds3xvycx5gwi3xn6agdmfkg7xhx9hnz6";
-  buildDepends = [ syb ];
+  version = "1.12";
+  sha256 = "1dn5zl6r1vvnqcsdxdd5cv0n44rbffg3sm2jxpvcv9846wpaj8qj";
+  buildDepends = [ aeson syb ];
   meta = {
     homepage = "http://johnmacfarlane.net/pandoc";
     description = "Types for representing a structured document";

From 0d0679d169603c45e65fa4dcfd36c15d4b6126ef Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:05:40 +0200
Subject: [PATCH 404/452] haskell-project-template: update to version 0.1.3.2

---
 .../libraries/haskell/project-template/default.nix   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/project-template/default.nix b/pkgs/development/libraries/haskell/project-template/default.nix
index fa60370f1f5..f4c9214b0b6 100644
--- a/pkgs/development/libraries/haskell/project-template/default.nix
+++ b/pkgs/development/libraries/haskell/project-template/default.nix
@@ -1,19 +1,19 @@
-{ cabal, base64Bytestring, base64Conduit, classyPrelude, conduit
+{ cabal, base64Bytestring, base64Conduit, basicPrelude, conduit
 , hspec, mtl, QuickCheck, resourcet, systemFileio, systemFilepath
 , text, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "project-template";
-  version = "0.1.3";
-  sha256 = "1nsc4i3s9a7d0nysswhylvnr79z0ax9biiwr7b6jn7jzx0f2bdmm";
+  version = "0.1.3.2";
+  sha256 = "076xq5hwi7bfn3cmx8zd19vnj6lj2p7qm2waam94qqw2m466xq50";
   buildDepends = [
-    base64Bytestring base64Conduit classyPrelude conduit mtl resourcet
+    base64Bytestring base64Conduit basicPrelude conduit mtl resourcet
     systemFileio systemFilepath text transformers
   ];
   testDepends = [
-    base64Bytestring classyPrelude conduit hspec QuickCheck
-    transformers
+    base64Bytestring basicPrelude conduit hspec QuickCheck
+    systemFilepath text transformers
   ];
   meta = {
     homepage = "https://github.com/fpco/haskell-ide";

From 34d6228f91d431bc555dcf2be6fb61955b94b10a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:05:40 +0200
Subject: [PATCH 405/452] haskell-resourcet: update to version 0.4.8

---
 pkgs/development/libraries/haskell/resourcet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix
index 3887abad71c..b0953cf9f7c 100644
--- a/pkgs/development/libraries/haskell/resourcet/default.nix
+++ b/pkgs/development/libraries/haskell/resourcet/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "resourcet";
-  version = "0.4.7.2";
-  sha256 = "0gchdip4srilgqwxdzlamplwqsyrn4df0m72i8pjqpk7zwn96q1w";
+  version = "0.4.8";
+  sha256 = "10pp4hm5c2k2fqzqpagy03gmr526ac2ji8h7k0mcypf4v0ga620m";
   buildDepends = [
     liftedBase mmorph monadControl mtl transformers transformersBase
   ];

From b2d322a65d6ce2945978dd9f27e55a5d1c816184 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:05:40 +0200
Subject: [PATCH 406/452] haskell-shakespeare-css: update to version 1.0.6.3

---
 .../development/libraries/haskell/shakespeare-css/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
index df12c935d71..f24d60612d6 100644
--- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-css";
-  version = "1.0.6.2";
-  sha256 = "1w29k0k5124vygydavb6a5szrv5a6n9qqhf1f27bkk86br55vnw6";
+  version = "1.0.6.3";
+  sha256 = "1zwvrdb8kgknp2ri3ws6m0jg41d8kdprvjdimwxh98san7vmk744";
   buildDepends = [ parsec shakespeare text transformers ];
   testDepends = [ hspec HUnit shakespeare text ];
   meta = {

From 607da7c3c90111a2a90920fa297196895ab9a34b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:05:40 +0200
Subject: [PATCH 407/452] haskell-shakespeare-i18n: update to version 1.0.0.4

---
 .../libraries/haskell/shakespeare-i18n/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
index 667edcdce1c..b7710d7c3d5 100644
--- a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-i18n";
-  version = "1.0.0.3";
-  sha256 = "0k5daz6ayc4d6zxsq7p27bp5fq4qr31qxw9z9mwb5xcz2404d00r";
+  version = "1.0.0.4";
+  sha256 = "1ia73rq9kva2v4vxcyc2nzbvvkrbwrx48gjhnljx39szx1klyk3l";
   buildDepends = [ parsec shakespeare text ];
   testDepends = [ hspec text ];
   meta = {

From 54c362392fab870293d447196dc2af10f922bfe5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:05:41 +0200
Subject: [PATCH 408/452] haskell-shakespeare-js: update to version 1.2.0

---
 pkgs/development/libraries/haskell/shakespeare-js/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
index 917ea0c6cad..6aa34026ce8 100644
--- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-js";
-  version = "1.1.4.1";
-  sha256 = "1mvsdbc3c6vgdpdb4m8b2d28vrh79v64vb9wkpnvhfg0jn7kb5c0";
+  version = "1.2.0";
+  sha256 = "1g37m7shqxfv7i2dk5qhvxldfzh1xipd91vcyqhks1jwa5byarzj";
   buildDepends = [ aeson shakespeare text ];
   testDepends = [ aeson hspec HUnit shakespeare text ];
   meta = {

From c1a1f3c3baa8f32875378dc4b90644da6ebc0ac6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:05:41 +0200
Subject: [PATCH 409/452] haskell-shakespeare-text: update to version 1.0.0.7

---
 .../libraries/haskell/shakespeare-text/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
index e2ff7ff27e1..d05e2247710 100644
--- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-text";
-  version = "1.0.0.6";
-  sha256 = "1qlf51rpyzgnxdhyfs6g3vh8zq5vyq263qhm577w7rc9s4hjxk45";
+  version = "1.0.0.7";
+  sha256 = "0vl8884a0x927svvkza5xzjn4g1rip8dak1zh9wkm4d0q7lhv2px";
   buildDepends = [ shakespeare text ];
   testDepends = [ hspec HUnit text ];
   meta = {

From 629a868e6cdc884fd56f31479ee88e1fd0d3e6c5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:05:41 +0200
Subject: [PATCH 410/452] haskell-shakespeare: update to version 1.2.0

---
 pkgs/development/libraries/haskell/shakespeare/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix
index 4864adfe83a..231470dca5a 100644
--- a/pkgs/development/libraries/haskell/shakespeare/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare";
-  version = "1.0.5.1";
-  sha256 = "1qsg23jqv6lzwqk42yapqydx3fn6crkrzim8wr7ds55z6iblxbq6";
+  version = "1.2.0";
+  sha256 = "0lzzdkry3sm5i5hhdygsikpnaps66k1sfdxi2mp0ly5aqi1n1blz";
   buildDepends = [ parsec systemFileio systemFilepath text time ];
   testDepends = [
     hspec parsec systemFileio systemFilepath text time

From a09fda2838b198bb44d5c21a694463dfb563b5b6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:05:41 +0200
Subject: [PATCH 411/452] haskell-snap: update to version 0.13.0

---
 pkgs/development/libraries/haskell/snap/snap.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix
index 11ef315a523..b93adda166c 100644
--- a/pkgs/development/libraries/haskell/snap/snap.nix
+++ b/pkgs/development/libraries/haskell/snap/snap.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "snap";
-  version = "0.12.1";
-  sha256 = "0mmmai257r3ssmy58v4c3hds0i0hwrww6r495j8yb2r90b31b1gg";
+  version = "0.13.0";
+  sha256 = "03m6fi8dbc69i6mafyq2xxdmqp1zm0akfilahvjd7cknf4qhdyq7";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From d0b0d530b65c801709ab2706534fa7a6f7cc69b7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:05:41 +0200
Subject: [PATCH 412/452] haskell-tagsoup: update to version 0.13

---
 pkgs/development/libraries/haskell/tagsoup/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/tagsoup/default.nix b/pkgs/development/libraries/haskell/tagsoup/default.nix
index 3258267f012..5dc83178be0 100644
--- a/pkgs/development/libraries/haskell/tagsoup/default.nix
+++ b/pkgs/development/libraries/haskell/tagsoup/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tagsoup";
-  version = "0.12.8";
-  sha256 = "05cm9h80qmxvk7xhlgly9zcmpbsajagspaa8p6k4ddch6q9lj7m3";
+  version = "0.13";
+  sha256 = "1pfkcfrmhzxplfkdzb0zj24dfsddw91plqp3mg2gqkv82y8blzk1";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ text ];

From e890f1b66fda7e5e28a302c5ec67080722396cfd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:05:41 +0200
Subject: [PATCH 413/452] haskell-tls: update to version 1.1.5

---
 pkgs/development/libraries/haskell/tls/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix
index 56999914989..0f354d8b77e 100644
--- a/pkgs/development/libraries/haskell/tls/default.nix
+++ b/pkgs/development/libraries/haskell/tls/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tls";
-  version = "1.1.4";
-  sha256 = "0fq6hnc3j54kkzlvcvhskjrj740p44y65fggnj3m4kgfiwjphw5p";
+  version = "1.1.5";
+  sha256 = "1ja03x3i7dgjpy22h4shnni1xslph8i8q4accqq8njpqpz54c84c";
   buildDepends = [
     cereal certificate cryptohash cryptoPubkey cryptoRandom mtl network
   ];

From 4b21c50856a7d3d3fd94f2a77329a6d2c45a821a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:05:41 +0200
Subject: [PATCH 414/452] haskell-wai-extra: update to version 1.3.4.5

---
 .../libraries/haskell/wai-extra/default.nix        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix
index 917000364c3..9789c80e8c1 100644
--- a/pkgs/development/libraries/haskell/wai-extra/default.nix
+++ b/pkgs/development/libraries/haskell/wai-extra/default.nix
@@ -1,19 +1,19 @@
 { cabal, ansiTerminal, base64Bytestring, blazeBuilder
 , blazeBuilderConduit, caseInsensitive, conduit, dataDefault
-, dateCache, fastLogger, hspec, httpTypes, HUnit, network
-, resourcet, stringsearch, text, time, transformers, void, wai
-, waiLogger, waiTest, word8, zlib, zlibBindings, zlibConduit
+, dateCache, fastLogger, hspec, httpTypes, HUnit, liftedBase
+, network, resourcet, stringsearch, text, time, transformers, void
+, wai, waiLogger, waiTest, word8, zlib, zlibBindings, zlibConduit
 }:
 
 cabal.mkDerivation (self: {
   pname = "wai-extra";
-  version = "1.3.4.4";
-  sha256 = "0x7nm3vrp1jhcdvcspdpgpgm12rcafng81f9kq9c01z5270myg2f";
+  version = "1.3.4.5";
+  sha256 = "062d7f8p2xgzn94fllgfc2bhbjv4vgp9j1adjaw9f0s1asnsdmnj";
   buildDepends = [
     ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit
     caseInsensitive conduit dataDefault dateCache fastLogger httpTypes
-    network resourcet stringsearch text time transformers void wai
-    waiLogger word8 zlibConduit
+    liftedBase network resourcet stringsearch text time transformers
+    void wai waiLogger word8 zlibConduit
   ];
   testDepends = [
     blazeBuilder conduit dataDefault fastLogger hspec httpTypes HUnit

From be6549a4bf3671b117109e37a40bd77d0423d943 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:05:41 +0200
Subject: [PATCH 415/452] haskell-xml-hamlet: update to version 0.4.0.5

---
 pkgs/development/libraries/haskell/xml-hamlet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/xml-hamlet/default.nix b/pkgs/development/libraries/haskell/xml-hamlet/default.nix
index 9c85223d654..e2719984708 100644
--- a/pkgs/development/libraries/haskell/xml-hamlet/default.nix
+++ b/pkgs/development/libraries/haskell/xml-hamlet/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xml-hamlet";
-  version = "0.4.0.4";
-  sha256 = "1s4s5z1xir9zmcbfz8mrznf2byclmg0qjjhwmpal2r9ly9g3na98";
+  version = "0.4.0.5";
+  sha256 = "1w1ixjdbpbny332j24d5yjxc4i7cg83jc4yjdm6yl94y1sr90yc5";
   buildDepends = [ parsec shakespeare text xmlConduit ];
   testDepends = [ hspec HUnit parsec shakespeare text xmlConduit ];
   meta = {

From cd9728173187b3078f283d59a9363285092e7977 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:05:41 +0200
Subject: [PATCH 416/452] haskell-yaml: update to version 0.8.5

---
 pkgs/development/libraries/haskell/yaml/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix
index 1e22f1ae4ba..7e2bd368c7e 100644
--- a/pkgs/development/libraries/haskell/yaml/default.nix
+++ b/pkgs/development/libraries/haskell/yaml/default.nix
@@ -4,14 +4,17 @@
 
 cabal.mkDerivation (self: {
   pname = "yaml";
-  version = "0.8.4.1";
-  sha256 = "0zbnyf5hp206ywqkdd7c1hsdbn4wxwk7p3rzn53m7rzxvfshlbbx";
+  version = "0.8.5";
+  sha256 = "12jj785gzcnrif460cx2k69pc2h9h956g0w1gp8pcr5hawrvd6rg";
+  isLibrary = true;
+  isExecutable = true;
   buildDepends = [
     aeson attoparsec conduit resourcet text transformers
     unorderedContainers vector
   ];
   testDepends = [
-    conduit hspec HUnit text transformers unorderedContainers
+    aeson conduit hspec HUnit text transformers unorderedContainers
+    vector
   ];
   meta = {
     homepage = "http://github.com/snoyberg/yaml/";

From 699282966c2aa12d03f9419c73d6b46187a4dd96 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:05:41 +0200
Subject: [PATCH 417/452] haskell-yesod-auth: update to version 1.2.2.1

---
 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 66ed9df2d20..c437b5b8624 100644
--- a/pkgs/development/libraries/haskell/yesod-auth/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-auth";
-  version = "1.2.1";
-  sha256 = "0xvb2v1c7zih4r1acd21s0fl18ygcajry5w6yiqqhnhx8wcniiqv";
+  version = "1.2.2.1";
+  sha256 = "1f3zdqywak54f2s11v26iyzb3svb0mdpfskxhps30jmkji2ph2iz";
   buildDepends = [
     aeson authenticate blazeHtml blazeMarkup dataDefault emailValidate
     fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network

From 8b15f9ce5a76be88116fb01798aaf1fd23121a88 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:05:41 +0200
Subject: [PATCH 418/452] haskell-yesod-bin: update to version 1.2.3.2

---
 pkgs/development/libraries/haskell/yesod-bin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix
index 3dfedd471fe..3afb8747547 100644
--- a/pkgs/development/libraries/haskell/yesod-bin/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix
@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-bin";
-  version = "1.2.2.1";
-  sha256 = "0m68wm46qh8bwaccq2y8l4hh4xby0kczvhgd7caaxhmv6j3srrf2";
+  version = "1.2.3.2";
+  sha256 = "10q4xjhcrskz3h0nay2vxfz2b3c2d532bvbggl2615aih05zdhwc";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

From 60264d613641339e8112cc520bd99e87b901c403 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:05:41 +0200
Subject: [PATCH 419/452] haskell-yesod-core: update to version 1.2.4.2

---
 pkgs/development/libraries/haskell/yesod-core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index 3fcec1a7d9f..bd2d0d97b2f 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "1.2.4";
-  sha256 = "0vgxspdxdjfdfgyx20lp460np7v1qjv6wzw95kj5cb5yiqv1nr9d";
+  version = "1.2.4.2";
+  sha256 = "0zrhqh3phla8p7fjv30n4ypicbd6x6rwkrhpag79p1w4wwvkjxnn";
   buildDepends = [
     aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup
     caseInsensitive cereal clientsession conduit cookie dataDefault

From fb3e61ffb8eb973c3ac2a3e0110d4dde726515bd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:05:41 +0200
Subject: [PATCH 420/452] haskell-yesod-form: update to version 1.3.2.1

---
 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 926cba46499..aca42bfce6c 100644
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-form";
-  version = "1.3.1";
-  sha256 = "0zkwpymxwxca2p8i0fhq58wq7ic0dlyc3z89ypqglnp6h2mv2lwx";
+  version = "1.3.2.1";
+  sha256 = "0lybrw244y2ca1jvz218jh2kfypj4wblpdvk4n8wllll79dm3pq7";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi
     dataDefault emailValidate hamlet network persistent resourcet

From 39ac320e8e9286a00ad14fd2486cc819509a325a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:05:42 +0200
Subject: [PATCH 421/452] haskell-yesod-platform: update to version 1.2.4.1

---
 .../haskell/yesod-platform/default.nix        | 54 ++++++++++---------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-platform/default.nix b/pkgs/development/libraries/haskell/yesod-platform/default.nix
index 3d900d94cda..5831bfe1df6 100644
--- a/pkgs/development/libraries/haskell/yesod-platform/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-platform/default.nix
@@ -3,9 +3,10 @@
 , baseUnicodeSymbols, blazeBuilder, blazeBuilderConduit, blazeHtml
 , blazeMarkup, byteable, byteorder, caseInsensitive, cereal
 , certificate, cipherAes, cipherRc4, clientsession, conduit, cookie
-, cprngAes, cryptoApi, cryptoConduit, cryptohash, cryptoNumbers
-, cryptoPubkey, cryptoPubkeyTypes, cryptoRandomApi, cssText
-, dataDefault, dataDefaultClass, dataDefaultInstancesBase
+, cprngAes, cryptoApi, cryptoCipherTypes, cryptoConduit, cryptohash
+, cryptohashCryptoapi, cryptoNumbers, cryptoPubkey
+, cryptoPubkeyTypes, cryptoRandom, cssText, dataDefault
+, dataDefaultClass, dataDefaultInstancesBase
 , dataDefaultInstancesContainers, dataDefaultInstancesDlist
 , dataDefaultInstancesOldLocale, dateCache, dlist, emailValidate
 , entropy, failure, fastLogger, fileEmbed, filesystemConduit
@@ -15,7 +16,7 @@
 , monadControl, monadLogger, networkConduit, pathPieces, pem
 , persistent, persistentTemplate, poolConduit, primitive
 , publicsuffixlist, pureMD5, pwstoreFast, quickcheckIo
-, resourcePool, resourcet, safe, semigroups, setenv, SHA
+, resourcePool, resourcet, safe, securemem, semigroups, setenv, SHA
 , shakespeare, shakespeareCss, shakespeareI18n, shakespeareJs
 , shakespeareText, silently, simpleSendfile, skein, socks
 , stringsearch, systemFileio, systemFilepath, tagged, tagsoup
@@ -29,33 +30,34 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-platform";
-  version = "1.2.3";
-  sha256 = "16hp64gqgvpmlrwg6h8ldakw2n3x985cnv4pzmv9akjq27jq8rjl";
+  version = "1.2.4.1";
+  sha256 = "13fw1svs3769m8rf5mnks0ibgdd73s1qq9dgg4h49xkzrdgs31rk";
   buildDepends = [
     aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit
     authenticate base64Bytestring baseUnicodeSymbols blazeBuilder
     blazeBuilderConduit blazeHtml blazeMarkup byteable byteorder
     caseInsensitive cereal certificate cipherAes cipherRc4
-    clientsession conduit cookie cprngAes cryptoApi cryptoConduit
-    cryptohash cryptoNumbers cryptoPubkey cryptoPubkeyTypes
-    cryptoRandomApi cssText dataDefault dataDefaultClass
-    dataDefaultInstancesBase dataDefaultInstancesContainers
-    dataDefaultInstancesDlist dataDefaultInstancesOldLocale dateCache
-    dlist emailValidate entropy failure fastLogger fileEmbed
-    filesystemConduit hamlet hjsmin hspec hspecExpectations htmlConduit
-    httpAttoparsec httpConduit httpDate httpTypes languageJavascript
-    liftedBase mimeMail mimeTypes mmorph monadControl monadLogger
-    networkConduit pathPieces pem persistent persistentTemplate
-    poolConduit primitive publicsuffixlist pureMD5 pwstoreFast
-    quickcheckIo resourcePool resourcet safe semigroups setenv SHA
-    shakespeare shakespeareCss shakespeareI18n shakespeareJs
-    shakespeareText silently simpleSendfile skein socks stringsearch
-    systemFileio systemFilepath tagged tagsoup tagstreamConduit tls
-    tlsExtra transformersBase unixCompat unorderedContainers utf8Light
-    utf8String vault vector void wai waiAppStatic waiExtra waiLogger
-    waiTest warp word8 xmlConduit xmlTypes xssSanitize yaml yesod
-    yesodAuth yesodCore yesodForm yesodPersistent yesodRoutes
-    yesodStatic yesodTest zlibBindings zlibConduit
+    clientsession conduit cookie cprngAes cryptoApi cryptoCipherTypes
+    cryptoConduit cryptohash cryptohashCryptoapi cryptoNumbers
+    cryptoPubkey cryptoPubkeyTypes cryptoRandom cssText dataDefault
+    dataDefaultClass dataDefaultInstancesBase
+    dataDefaultInstancesContainers dataDefaultInstancesDlist
+    dataDefaultInstancesOldLocale dateCache dlist emailValidate entropy
+    failure fastLogger fileEmbed filesystemConduit hamlet hjsmin hspec
+    hspecExpectations htmlConduit httpAttoparsec httpConduit httpDate
+    httpTypes languageJavascript liftedBase mimeMail mimeTypes mmorph
+    monadControl monadLogger networkConduit pathPieces pem persistent
+    persistentTemplate poolConduit primitive publicsuffixlist pureMD5
+    pwstoreFast quickcheckIo resourcePool resourcet safe securemem
+    semigroups setenv SHA shakespeare shakespeareCss shakespeareI18n
+    shakespeareJs shakespeareText silently simpleSendfile skein socks
+    stringsearch systemFileio systemFilepath tagged tagsoup
+    tagstreamConduit tls tlsExtra transformersBase unixCompat
+    unorderedContainers utf8Light utf8String vault vector void wai
+    waiAppStatic waiExtra waiLogger waiTest warp word8 xmlConduit
+    xmlTypes xssSanitize yaml yesod yesodAuth yesodCore yesodForm
+    yesodPersistent yesodRoutes yesodStatic yesodTest zlibBindings
+    zlibConduit
   ];
   jailbreak = true;
   meta = {

From c690153d55a977b76858d58f2fbdd7765495679b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:05:42 +0200
Subject: [PATCH 422/452] haskell-yesod: update to version 1.2.2.1

---
 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 fd68a161c68..556b210b91b 100644
--- a/pkgs/development/libraries/haskell/yesod/default.nix
+++ b/pkgs/development/libraries/haskell/yesod/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod";
-  version = "1.2.2";
-  sha256 = "06ac99srh44rwj6mwyl7h0d0ckyb19dvpabylbawmks25v5ig0y3";
+  version = "1.2.2.1";
+  sha256 = "0xhpsqfshnay7kaz0czr7ass84cbjlgz2n13jk08hs8g8dw72as4";
   buildDepends = [
     aeson blazeHtml blazeMarkup dataDefault hamlet monadControl
     networkConduit safe shakespeareCss shakespeareJs text transformers

From c8c7a8dc42cd604bb8c143fcd2d126e833e53eaa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:05:42 +0200
Subject: [PATCH 423/452] haskell-keter: update to version 1.0.1

---
 .../tools/haskell/keter/default.nix           | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/tools/haskell/keter/default.nix b/pkgs/development/tools/haskell/keter/default.nix
index 7e8b3ea11ff..4cb75151b00 100644
--- a/pkgs/development/tools/haskell/keter/default.nix
+++ b/pkgs/development/tools/haskell/keter/default.nix
@@ -1,23 +1,25 @@
-{ cabal, attoparsec, blazeBuilder, caseInsensitive, conduit
-, dataDefault, filepath, fsnotify, httpConduit, httpReverseProxy
-, httpTypes, mtl, network, networkConduit, networkConduitTls
-, random, regexTdfa, systemFileio, systemFilepath, tar, text, time
-, transformers, unixCompat, unixProcessConduit, wai, waiAppStatic
-, warp, warpTls, yaml, zlib
+{ cabal, aeson, async, attoparsec, blazeBuilder, caseInsensitive
+, conduit, dataDefault, filepath, fsnotify, httpConduit
+, httpReverseProxy, httpTypes, mtl, network, networkConduit
+, networkConduitTls, random, regexTdfa, stm, systemFileio
+, systemFilepath, tar, text, time, transformers, unixCompat
+, unixProcessConduit, unorderedContainers, vector, wai
+, waiAppStatic, waiExtra, warp, warpTls, yaml, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "keter";
-  version = "0.4.0";
-  sha256 = "0ny8z2rfn090vci262xvyrdbkmdb7qjb4x15r81l2691ibf09ppv";
+  version = "1.0.1";
+  sha256 = "0ghgwp1winf0jj70jrwsk4b85f8m4v78n8kijhqghh4kskh457b5";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    attoparsec blazeBuilder caseInsensitive conduit dataDefault
-    filepath fsnotify httpConduit httpReverseProxy httpTypes mtl
-    network networkConduit networkConduitTls random regexTdfa
-    systemFileio systemFilepath tar text time transformers unixCompat
-    unixProcessConduit wai waiAppStatic warp warpTls yaml zlib
+    aeson async attoparsec blazeBuilder caseInsensitive conduit
+    dataDefault filepath fsnotify httpConduit httpReverseProxy
+    httpTypes mtl network networkConduit networkConduitTls random
+    regexTdfa stm systemFileio systemFilepath tar text time
+    transformers unixCompat unixProcessConduit unorderedContainers
+    vector wai waiAppStatic waiExtra warp warpTls yaml zlib
   ];
   meta = {
     homepage = "http://www.yesodweb.com/";

From 53f8f8f50da72fb64f9af0c1ef4c84d2618a5011 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:52:39 +0200
Subject: [PATCH 424/452] haskell-digestive-functors-heist: jailbreak to fix
 the build with recent heist

---
 .../libraries/haskell/digestive-functors-heist/default.nix       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
index e2dc195b196..460154c70f0 100644
--- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
+++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
@@ -8,6 +8,7 @@ cabal.mkDerivation (self: {
   buildDepends = [
     blazeBuilder digestiveFunctors heist mtl text xmlhtml
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/jaspervdj/digestive-functors";
     description = "Heist frontend for the digestive-functors library";

From 2943574903b4c2eae4f66f919c0ce2eb183d40ed Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 8 Sep 2013 22:53:29 +0200
Subject: [PATCH 425/452] haskell-citeproc-hs: jailbreak to fix build with
 recent pandoc-types

---
 pkgs/development/libraries/haskell/citeproc-hs/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/citeproc-hs/default.nix b/pkgs/development/libraries/haskell/citeproc-hs/default.nix
index 2c68fd24d1f..573c5085b10 100644
--- a/pkgs/development/libraries/haskell/citeproc-hs/default.nix
+++ b/pkgs/development/libraries/haskell/citeproc-hs/default.nix
@@ -10,6 +10,7 @@ cabal.mkDerivation (self: {
     filepath hexpat hsBibutils HTTP json mtl network pandocTypes parsec
     syb time utf8String
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://gorgias.mine.nu/repos/citeproc-hs/";
     description = "A Citation Style Language implementation in Haskell";

From d58b4205c8c80cc190546420ddaecd646b252668 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Sep 2013 10:02:18 +0200
Subject: [PATCH 426/452] haskell-thyme: disable unit tests

https://github.com/liyang/thyme/issues/4
---
 pkgs/development/libraries/haskell/thyme/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/thyme/default.nix b/pkgs/development/libraries/haskell/thyme/default.nix
index 7d79881127d..dde2b0942f5 100644
--- a/pkgs/development/libraries/haskell/thyme/default.nix
+++ b/pkgs/development/libraries/haskell/thyme/default.nix
@@ -15,6 +15,7 @@ cabal.mkDerivation (self: {
     attoparsec Cabal filepath lens QuickCheck random
     systemPosixRedirect text time vectorSpace
   ];
+  check = false;
   meta = {
     homepage = "https://github.com/liyang/thyme";
     description = "A faster time library";

From b2a54d51b555ccaa4c4f27bdefe8db62462c395b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Sep 2013 10:20:27 +0200
Subject: [PATCH 427/452] haskell-vault: jailbreak to fix build with older
 versions of GHC

---
 pkgs/development/libraries/haskell/vault/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/vault/default.nix b/pkgs/development/libraries/haskell/vault/default.nix
index f73633b4f24..4632d599a2e 100644
--- a/pkgs/development/libraries/haskell/vault/default.nix
+++ b/pkgs/development/libraries/haskell/vault/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "0.3.0.0";
   sha256 = "1lvv2sw5j48jbxniw55bxq88dhn46l7lk0blv2cnaf1vw6wms4m8";
   buildDepends = [ hashable unorderedContainers ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/HeinrichApfelmus/vault";
     description = "a persistent store for values of arbitrary types";

From da69f138630226adc9e39fd90feb306bffc7e019 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Sep 2013 10:43:15 +0200
Subject: [PATCH 428/452] haskell-pandoc-types: Revert "update to version 1.12"

This reverts commit 17f8b638378077946e77071040c80630bf23e0f5. The new version
breaks Pandoc, curiously enough. Who would have thought? Everyone seems to be
going Snoyman these days.
---
 .../libraries/haskell/pandoc-types/default.nix            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/pandoc-types/default.nix b/pkgs/development/libraries/haskell/pandoc-types/default.nix
index 63874d39fb8..d4f49791d30 100644
--- a/pkgs/development/libraries/haskell/pandoc-types/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc-types/default.nix
@@ -1,10 +1,10 @@
-{ cabal, aeson, syb }:
+{ cabal, syb }:
 
 cabal.mkDerivation (self: {
   pname = "pandoc-types";
-  version = "1.12";
-  sha256 = "1dn5zl6r1vvnqcsdxdd5cv0n44rbffg3sm2jxpvcv9846wpaj8qj";
-  buildDepends = [ aeson syb ];
+  version = "1.10";
+  sha256 = "1xbqvgb95h0jhqx2y0jzds3xvycx5gwi3xn6agdmfkg7xhx9hnz6";
+  buildDepends = [ syb ];
   meta = {
     homepage = "http://johnmacfarlane.net/pandoc";
     description = "Types for representing a structured document";

From a9d625b3dcdb718bda4408bbce3bf1fd4df1d97a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Sep 2013 10:44:55 +0200
Subject: [PATCH 429/452] haskell-tagsoup: Revert "update to version 0.13"

This reverts commit d0b0d530b65c801709ab2706534fa7a6f7cc69b7. The new version
breaks the build of Pandoc.
---
 pkgs/development/libraries/haskell/tagsoup/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/tagsoup/default.nix b/pkgs/development/libraries/haskell/tagsoup/default.nix
index 5dc83178be0..3258267f012 100644
--- a/pkgs/development/libraries/haskell/tagsoup/default.nix
+++ b/pkgs/development/libraries/haskell/tagsoup/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tagsoup";
-  version = "0.13";
-  sha256 = "1pfkcfrmhzxplfkdzb0zj24dfsddw91plqp3mg2gqkv82y8blzk1";
+  version = "0.12.8";
+  sha256 = "05cm9h80qmxvk7xhlgly9zcmpbsajagspaa8p6k4ddch6q9lj7m3";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ text ];

From 9f6d539707fb42d0d470bd8ca674aae5e65118b9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Sep 2013 12:23:00 +0200
Subject: [PATCH 430/452] cabal-install-1.18.0.1: this package requires Cabal
 1.18.x to compile

---
 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 ca723691828..bd7a9f2e828 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2396,7 +2396,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   cabalInstall_0_10_2 = callPackage ../tools/package-management/cabal-install/0.10.2.nix {};
   cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {};
   cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix {};
-  cabalInstall_1_18_0_1 = callPackage ../tools/package-management/cabal-install/1.18.0.1.nix {};
+  cabalInstall_1_18_0_1 = callPackage ../tools/package-management/cabal-install/1.18.0.1.nix {
+    Cabal = self.Cabal_1_18_0;
+  };
   cabalInstall = self.cabalInstall_1_18_0;
 
   gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex {};

From 2282809b350e25b90e35190d85b2cb5097b282ef Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Sep 2013 12:52:31 +0200
Subject: [PATCH 431/452] libnetfilter_queue: add version 1.0.2

---
 .../libraries/libnetfilter_queue/default.nix  | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/libnetfilter_queue/default.nix

diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/development/libraries/libnetfilter_queue/default.nix
new file mode 100644
index 00000000000..a1d2b3b8e24
--- /dev/null
+++ b/pkgs/development/libraries/libnetfilter_queue/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, libmnl, libnfnetlink }:
+
+stdenv.mkDerivation rec {
+  name = "libnetfilter_queue-1.0.2";
+
+  src = fetchurl {
+    url = "ftp://ftp.netfilter.org/pub/libnetfilter_queue/${name}.tar.bz2";
+    sha256 = "0chsmj9ky80068vn458ijz9sh4sk5yc08dw2d6b8yddybpmr1143";
+  };
+
+  buildInputs = [ pkgconfig libmnl libnfnetlink ];
+
+  meta = {
+    homepage = "http://www.netfilter.org/projects/libnetfilter_queue/";
+    description = "userspace API to packets queued by the kernel packet filter";
+
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 39bedd990d3..0c779ae07bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4812,6 +4812,8 @@ let
 
   libnetfilter_conntrack = callPackage ../development/libraries/libnetfilter_conntrack { };
 
+  libnetfilter_queue = callPackage ../development/libraries/libnetfilter_queue { };
+
   libnfnetlink = callPackage ../development/libraries/libnfnetlink { };
 
   libnih = callPackage ../development/libraries/libnih { };

From 0c5cf00829d3e3414df3069c689ddaf27fc16c4a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Sep 2013 12:56:22 +0200
Subject: [PATCH 432/452] tcpcrypt: add current HEAD of the Github master
 branch

---
 pkgs/tools/security/tcpcrypt/default.nix | 28 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/tools/security/tcpcrypt/default.nix

diff --git a/pkgs/tools/security/tcpcrypt/default.nix b/pkgs/tools/security/tcpcrypt/default.nix
new file mode 100644
index 00000000000..3026ed66d72
--- /dev/null
+++ b/pkgs/tools/security/tcpcrypt/default.nix
@@ -0,0 +1,28 @@
+{ fetchurl, stdenv
+, openssl, libcap, libnfnetlink, libnetfilter_queue
+}:
+
+let
+  rev = "0e07772316061ad67b8770e7d98d5dd099c9c7c7";
+in
+stdenv.mkDerivation rec {
+  name = "tcpcrypt-2011.07.22";
+
+  src = fetchurl {
+    url = "https://github.com/sorbo/tcpcrypt/archive/${rev}.tar.gz";
+    sha256 = "1f1f1iawlvipnccwh31fxnb8yam1fgh36m0qcbc29qk1ggwrfnkk";
+    name = "${name}.tar.gz";
+  };
+
+  buildInputs = [ openssl libcap libnfnetlink libnetfilter_queue ];
+
+  preConfigure = "cd user";
+
+  meta = {
+    homepage = "http://tcpcrypt.org/";
+    description = "enable opportunistic encryption of all TCP traffic";
+
+    maintainers = [ stdenv.lib.maintainers.simons ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0c779ae07bd..4f36ba63f07 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1794,6 +1794,8 @@ let
 
   tarsnap = callPackage ../tools/backup/tarsnap { };
 
+  tcpcrypt = callPackage ../tools/security/tcpcrypt { };
+
   tcpdump = callPackage ../tools/networking/tcpdump { };
 
   teamviewer = callPackage_i686 ../applications/networking/remote/teamviewer { };

From 3a8adb70143e77cca58b3bd934fab34be4a7b001 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 9 Sep 2013 13:03:39 +0200
Subject: [PATCH 433/452] Update nixops to 1.1

---
 pkgs/tools/package-management/nixops/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix
index 7f2b533383e..3381e3644fe 100644
--- a/pkgs/tools/package-management/nixops/default.nix
+++ b/pkgs/tools/package-management/nixops/default.nix
@@ -1,12 +1,12 @@
-{ lib, pythonPackages, fetchurl, libxslt, docbook5_xsl }:
+{ lib, pythonPackages, fetchurl, libxslt, docbook5_xsl, openssh }:
 
 pythonPackages.buildPythonPackage rec {
-  name = "nixops-1.0.1";
+  name = "nixops-1.1";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://nixos.org/releases/nixops/${name}/${name}.tar.bz2";
-    sha256 = "c6dda2597ba0ab2f60c984d4715163c02940f20803619668d6c16eba8570a394";
+    sha256 = "1i0v4v83s663izw6al63avhs0378rp3nxchy8nkb1zam5rj097z2";
   };
 
   buildInputs = [ libxslt ];
@@ -15,6 +15,7 @@ pythonPackages.buildPythonPackage rec {
     [ pythonPackages.prettytable
       pythonPackages.boto
       pythonPackages.sqlite3
+      pythonPackages.hetzner
     ];
 
   doCheck = false;
@@ -29,6 +30,10 @@ pythonPackages.buildPythonPackage rec {
 
       mkdir -p $out/share/nix/nixops
       cp -av nix/* $out/share/nix/nixops
+
+      # Add openssh to nixops' PATH. On some platforms, e.g. CentOS and RHEL
+      # the version of openssh is causing errors when have big networks (40+)
+      wrapProgram $out/bin/nixops --prefix PATH : "${openssh}/bin"
     '';
 
   meta = {

From eac934c83affc067d46e0f9c6640210ebead1df4 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 9 Sep 2013 13:05:50 +0200
Subject: [PATCH 434/452] Fix collectd, couldn't run due to missing
 pthread_cancel.

---
 pkgs/tools/system/collectd/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix
index 7da45c596ef..37283fc18a4 100644
--- a/pkgs/tools/system/collectd/default.nix
+++ b/pkgs/tools/system/collectd/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0gljf5c60q6i0nrii6addxy1p76qqixww8zy17a7a1zil6a3i5wh";
   };
 
+  NIX_LDFLAGS = "-lgcc_s"; # for pthread_cancel
+
   meta = {
     homepage = http://collectd.org;
     description = "collectd is a daemon which collects system performance statistics periodically";

From 0e7783c608b52a57712902c46f8aca9a72271bfc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Sep 2013 12:10:28 +0200
Subject: [PATCH 435/452] haskell-exceptions: re-generate with cabal2nix

---
 pkgs/development/libraries/haskell/exceptions/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/exceptions/default.nix b/pkgs/development/libraries/haskell/exceptions/default.nix
index ad940556ec5..a15c2cc1e48 100644
--- a/pkgs/development/libraries/haskell/exceptions/default.nix
+++ b/pkgs/development/libraries/haskell/exceptions/default.nix
@@ -10,6 +10,7 @@ cabal.mkDerivation (self: {
   testDepends = [
     mtl QuickCheck testFramework testFrameworkQuickcheck2 transformers
   ];
+  doCheck = false;
   meta = {
     homepage = "http://github.com/ekmett/exceptions/";
     description = "Extensible optionally-pure exceptions";
@@ -17,5 +18,4 @@ cabal.mkDerivation (self: {
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.ocharles ];
   };
-  doCheck = false; # https://github.com/ekmett/exceptions/issues/18
 })

From 28c5958658dadbd49b2570e7265756dad4cdd7c5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Sep 2013 12:11:06 +0200
Subject: [PATCH 436/452] haskell-thyme: disable the test suite some more

---
 pkgs/development/libraries/haskell/thyme/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/thyme/default.nix b/pkgs/development/libraries/haskell/thyme/default.nix
index dde2b0942f5..60999f51898 100644
--- a/pkgs/development/libraries/haskell/thyme/default.nix
+++ b/pkgs/development/libraries/haskell/thyme/default.nix
@@ -15,7 +15,7 @@ cabal.mkDerivation (self: {
     attoparsec Cabal filepath lens QuickCheck random
     systemPosixRedirect text time vectorSpace
   ];
-  check = false;
+  doCheck = false;
   meta = {
     homepage = "https://github.com/liyang/thyme";
     description = "A faster time library";

From 09477f6002f0e2cfa0f34f0cf0efb45ccecbe059 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Sep 2013 12:11:14 +0200
Subject: [PATCH 437/452] haskell-HaRe: update to version 0.7.0.2

---
 pkgs/development/tools/haskell/HaRe/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/haskell/HaRe/default.nix b/pkgs/development/tools/haskell/HaRe/default.nix
index cb0ad759d55..efdc65c389e 100644
--- a/pkgs/development/tools/haskell/HaRe/default.nix
+++ b/pkgs/development/tools/haskell/HaRe/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HaRe";
-  version = "0.7.0.1";
-  sha256 = "1ykbyc6p71k6rs85vcsjgk47cxd2lda3iw78jzs0fx43qr1dywnl";
+  version = "0.7.0.2";
+  sha256 = "05dlrx4wfadv798098bclkmsmm6f226n9rqp19ajdwaa11x5mf8d";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 7e8b474485e377ef56507d93ade804b8e1facb97 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Sep 2013 12:11:19 +0200
Subject: [PATCH 438/452] haskell-digestive-functors-heist: update to version
 0.8.0.0

---
 .../libraries/haskell/digestive-functors-heist/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
index 460154c70f0..3773192a5dc 100644
--- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
+++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "digestive-functors-heist";
-  version = "0.7.0.0";
-  sha256 = "0ljsr4yy3pb4cjg9dcgfcs9rn1ihg3xi9ak5p3h3kw3w19d1hsaq";
+  version = "0.8.0.0";
+  sha256 = "1zy2fy30q51q8pqw78f8gxc1x52vw49w3mnqc2hfqw190v5r9dgh";
   buildDepends = [
     blazeBuilder digestiveFunctors heist mtl text xmlhtml
   ];

From bca133d225ec241185ba4cab611771a0275ae31a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Sep 2013 12:11:19 +0200
Subject: [PATCH 439/452] haskell-dimensional: update to version 0.12.1.1

---
 pkgs/development/libraries/haskell/dimensional/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/dimensional/default.nix b/pkgs/development/libraries/haskell/dimensional/default.nix
index 154b7ea0628..1f672c25cfa 100644
--- a/pkgs/development/libraries/haskell/dimensional/default.nix
+++ b/pkgs/development/libraries/haskell/dimensional/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dimensional";
-  version = "0.12.1";
-  sha256 = "176mvnd570xskjs6ky1wax9adzzrm9j6ai0fc4hy2z4097ydcgwm";
+  version = "0.12.1.1";
+  sha256 = "1fjkvyp62bh5gyzhkn189z5mxrr1acwmk39mqxk4579xbchvpyq6";
   buildDepends = [ numtype time ];
   meta = {
     homepage = "http://dimensional.googlecode.com/";

From 32d609654ce25e6b0985afa7f0ac30ae1109b5ff Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Sep 2013 12:11:19 +0200
Subject: [PATCH 440/452] haskell-free: update to version 3.4.2

---
 pkgs/development/libraries/haskell/free/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/free/default.nix b/pkgs/development/libraries/haskell/free/default.nix
index 385700ca863..56bf80d71af 100644
--- a/pkgs/development/libraries/haskell/free/default.nix
+++ b/pkgs/development/libraries/haskell/free/default.nix
@@ -1,14 +1,15 @@
 { cabal, bifunctors, comonad, comonadsFd, comonadTransformers
-, distributive, mtl, semigroupoids, semigroups, transformers
+, distributive, mtl, profunctors, semigroupoids, semigroups
+, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "free";
-  version = "3.4.1";
-  sha256 = "09yfkmnmhwwq22fsm1f4li4h13c3bqnh274z8jpgw0hrcnssh0rk";
+  version = "3.4.2";
+  sha256 = "1x6pdkcxk6z9ndph2yzz5n21afc2330m0ryv4w67jsss5aa69fwb";
   buildDepends = [
     bifunctors comonad comonadsFd comonadTransformers distributive mtl
-    semigroupoids semigroups transformers
+    profunctors semigroupoids semigroups transformers
   ];
   meta = {
     homepage = "http://github.com/ekmett/free/";

From 563786deffa33c56f17b341b9d57bd9518709a99 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Sep 2013 12:11:19 +0200
Subject: [PATCH 441/452] haskell-unix-bytestring: update to version 0.3.7

---
 .../development/libraries/haskell/unix-bytestring/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/unix-bytestring/default.nix b/pkgs/development/libraries/haskell/unix-bytestring/default.nix
index 49022b12a29..174fc925aae 100644
--- a/pkgs/development/libraries/haskell/unix-bytestring/default.nix
+++ b/pkgs/development/libraries/haskell/unix-bytestring/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "unix-bytestring";
-  version = "0.3.6";
-  sha256 = "0m2ndw6r88vb4cqdkd8jg8dlk9h99mp3rand5j1gxxdjfv7q63ap";
+  version = "0.3.7";
+  sha256 = "1qwgs2bwga057csfa8izq0kc5vwi2vcaz2snlcgp0h9vql3qmvrg";
   meta = {
     homepage = "http://code.haskell.org/~wren/";
     description = "Unix/Posix-specific functions for ByteStrings";

From 66f905c14ef832b0406e97acef578a2375999757 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Sep 2013 12:11:19 +0200
Subject: [PATCH 442/452] haskell-yesod-platform: update to version 1.2.4.2

---
 .../libraries/haskell/yesod-platform/default.nix       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-platform/default.nix b/pkgs/development/libraries/haskell/yesod-platform/default.nix
index 5831bfe1df6..9fe24ca4a74 100644
--- a/pkgs/development/libraries/haskell/yesod-platform/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-platform/default.nix
@@ -21,8 +21,8 @@
 , shakespeareText, silently, simpleSendfile, skein, socks
 , stringsearch, systemFileio, systemFilepath, tagged, tagsoup
 , tagstreamConduit, tls, tlsExtra, transformersBase, unixCompat
-, unorderedContainers, utf8Light, utf8String, vault, vector, void
-, wai, waiAppStatic, waiExtra, waiLogger, waiTest, warp, word8
+, unorderedContainers, utf8Light, utf8String, vector, void, wai
+, waiAppStatic, waiExtra, waiLogger, waiTest, warp, word8
 , xmlConduit, xmlTypes, xssSanitize, yaml, yesod, yesodAuth
 , yesodCore, yesodForm, yesodPersistent, yesodRoutes, yesodStatic
 , yesodTest, zlibBindings, zlibConduit
@@ -30,8 +30,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-platform";
-  version = "1.2.4.1";
-  sha256 = "13fw1svs3769m8rf5mnks0ibgdd73s1qq9dgg4h49xkzrdgs31rk";
+  version = "1.2.4.2";
+  sha256 = "1hmzdwjqi3cxdmyvcr48kprrsa8h548z272mif07114d0qh48x4w";
   buildDepends = [
     aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit
     authenticate base64Bytestring baseUnicodeSymbols blazeBuilder
@@ -53,7 +53,7 @@ cabal.mkDerivation (self: {
     shakespeareJs shakespeareText silently simpleSendfile skein socks
     stringsearch systemFileio systemFilepath tagged tagsoup
     tagstreamConduit tls tlsExtra transformersBase unixCompat
-    unorderedContainers utf8Light utf8String vault vector void wai
+    unorderedContainers utf8Light utf8String vector void wai
     waiAppStatic waiExtra waiLogger waiTest warp word8 xmlConduit
     xmlTypes xssSanitize yaml yesod yesodAuth yesodCore yesodForm
     yesodPersistent yesodRoutes yesodStatic yesodTest zlibBindings

From aeefa7b0700791bfb56bcd34b17282973200ab9f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Sep 2013 12:59:26 +0200
Subject: [PATCH 443/452] Cabal-1.18.0: this version won't build without
 deepseq 1.3 or later

---
 pkgs/top-level/haskell-packages.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index bd7a9f2e828..135e1b5660e 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -653,7 +653,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix { cabal = self.cabal.override { Cabal = null; }; };
   Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix { cabal = self.cabal.override { Cabal = null; }; };
-  Cabal_1_18_0 = callPackage ../development/libraries/haskell/Cabal/1.18.0.nix { cabal = self.cabal.override { Cabal = null; }; };
+  Cabal_1_18_0 = callPackage ../development/libraries/haskell/Cabal/1.18.0.nix {
+    cabal = self.cabal.override { Cabal = null; };
+    deepseq = self.deepseq_1_3_0_1;
+  };
   Cabal = null; # core package in GHC
 
   cabalFileTh = callPackage ../development/libraries/haskell/cabal-file-th {};

From ea8a7bcd0c2ddec1463a9a4eb5edf976a342d92e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 10 Sep 2013 10:42:33 +0200
Subject: [PATCH 444/452] libav: update 9.8 -> 9.9

It's supposed to include some security-related fixes.
---
 pkgs/development/libraries/libav/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index ce305a2880b..ea45902b749 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -26,7 +26,7 @@ with { inherit (stdenv.lib) optional optionals; };
 
 let
   result = {
-    libav_9   = libavFun   "9.8" "0r7hg9wg3cxjsmwzpa6f2p1a092g2iazyjjy23604ccskzbnirg3";
+    libav_9   = libavFun   "9.9" "1rwphyqb2c4zyp20y4ywxjiddmd46vd4dbpdm1lxqm3q63rmmdk9";
     libav_0_8 = libavFun "0.8.8" "1wnbmbs0z4f55y8r9bwb63l04zn383l1avy4c9x1ffb2xccgcp79";
   };
 

From 1628c03c4e834b4f3e1ac2696d2ebfcad1b719c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 10 Sep 2013 12:28:10 +0200
Subject: [PATCH 445/452] upgrade deform and deform_bootstrap

---
 pkgs/top-level/python-packages.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5104adb8042..3dfd8fac4b8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1109,11 +1109,11 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
 
   deform = buildPythonPackage rec {
-    name = "deform-0.9.7";
+    name = "deform-0.9.8";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/d/deform/${name}.tar.gz";
-      md5 = "d450eef05432d473257da5621c72c8b7";
+      sha256 = "15500rm33n6kxsdpqyn3ih25y3rvab4nxy2yzsj2754kdlhlyjpx";
     };
 
     buildInputs = [] ++ optional isPy26 unittest2;
@@ -1140,11 +1140,11 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
 
   deform_bootstrap = buildPythonPackage rec {
-    name = "deform_bootstrap-0.2";
+    name = "deform_bootstrap-0.2.9";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/d/deform_bootstrap/${name}.tar.gz";
-      md5 = "57812251f327367761f32d49a8286aa4";
+      sha256 = "1hgq3vqsfqdmlyahnlc40w13viawhpzqf4jzigsggdb41x545fda";
     };
 
     propagatedBuildInputs = [ deform ];

From 64d648e92e70801f4dc55c31632d0ce8973b3083 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Sep 2013 13:57:32 +0200
Subject: [PATCH 446/452] Update nixUnstable

---
 pkgs/tools/package-management/nix/unstable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index f61f5e2b95a..17e860f7d7c 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.6pre3215_2c1ecf8";
+  name = "nix-1.6pre3220_fecad91";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/5940181/download/5/${name}.tar.xz";
-    sha256 = "404fe856ae534b09e9a81d69751127e0987fea6bf2d0ec01acac3a9ea4ce72ae";
+    url = "http://hydra.nixos.org/build/6038922/download/5/${name}.tar.xz";
+    sha256 = "0251b8cb7ad2a4974a9c8002c65f1c6e1b334be082d3dd2f085929594637f947";
   };
 
   nativeBuildInputs = [ perl pkgconfig ];

From 70fee5da112b8a0093d59ac16cdead4d0a72f357 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Sep 2013 15:54:06 +0200
Subject: [PATCH 447/452] Fix Nixpkgs evaluation

The evaluation of liferea causes an error:

  error: assertion failed at `/tmp/nix-build-nixpkgs-tarball-1.0pre28992_1628c03.drv-0/git-export/pkgs/desktops/gnome-2/desktop/libgweather/default.nix:4:1'

Why this happens is a mystery, since liferea doesn't depend on
libgweather.  The problem can be reproduced by evaluating:

  builtins.toXML (import <nixpkgs> { system = "x86_64-darwin"; }).liferea

It seems to have something to do with builderDefs magic in webkit_gtk2.

http://hydra.nixos.org/build/6039089
---
 pkgs/applications/networking/newsreaders/liferea/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix
index 4703a4f28c8..55e0ed88814 100644
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
     description = "A GTK-based news feed agregator";
     homepage = http://lzone.de/liferea/;
     maintainers = [ stdenv.lib.maintainers.vcunat ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From b2c97f6ca53dd123a1320ae0fd5052c8c2677920 Mon Sep 17 00:00:00 2001
From: Gergely Risko <gergely@risko.hu>
Date: Tue, 10 Sep 2013 16:06:56 +0200
Subject: [PATCH 448/452] Add statvfs haskell library

---
 .../libraries/haskell/statvfs/default.nix            | 12 ++++++++++++
 pkgs/top-level/haskell-packages.nix                  |  2 ++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/statvfs/default.nix

diff --git a/pkgs/development/libraries/haskell/statvfs/default.nix b/pkgs/development/libraries/haskell/statvfs/default.nix
new file mode 100644
index 00000000000..604edc83139
--- /dev/null
+++ b/pkgs/development/libraries/haskell/statvfs/default.nix
@@ -0,0 +1,12 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "statvfs";
+  version = "0.1";
+  sha256 = "1v45lx7wr27f5sx7cpfsapx1r6akgf1q3hpip1ibbsbhj65ws2r2";
+  meta = {
+    description = "Get unix filesystem statistics with statfs, statvfs";
+    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 135e1b5660e..7db23042dca 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1857,6 +1857,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   statistics = callPackage ../development/libraries/haskell/statistics {};
 
+  statvfs = callPackage ../development/libraries/haskell/statvfs {};
+
   StrafunskiStrategyLib = callPackage ../development/libraries/haskell/Strafunski-StrategyLib {};
 
   streamproc = callPackage ../development/libraries/haskell/streamproc {};

From b73deae714b85ea4d182df73bf34a77f482a1166 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Sep 2013 17:53:13 +0200
Subject: [PATCH 449/452] nix: Update to 1.6

---
 pkgs/tools/package-management/nix/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix               | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index b6f8d5000a1..89cf2d1e00e 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.5.3";
+  name = "nix-1.6";
 
   src = fetchurl {
     url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
-    sha256 = "070e82a155851900768eb4a638aa50a6df9a8475c6dbc78a3b4a7dea75d64201";
+    sha256 = "2e451a6ad0b43997d8df71d29a7d20ef42f7715fe16efbf4b53bdcdd1d5227fe";
   };
 
   nativeBuildInputs = [ perl pkgconfig ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cc942c36b06..8bc25d24a92 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9743,10 +9743,13 @@ let
     stateDir = config.nix.stateDir or "/nix/var";
   };
 
+  nixUnstable = nixStable;
+  /*
   nixUnstable = callPackage ../tools/package-management/nix/unstable.nix {
     storeDir = config.nix.storeDir or "/nix/store";
     stateDir = config.nix.stateDir or "/nix/var";
   };
+  */
 
   nixops = callPackage ../tools/package-management/nixops { };
 

From d1882a1940a6503d540319a2da345baa770e6b76 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 10 Sep 2013 19:19:27 +0200
Subject: [PATCH 450/452] trac: Update to 1.0.1. The old version did not work
 at all with the current genshi package (0.7).

---
 pkgs/top-level/python-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3dfd8fac4b8..cb77e11babd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5563,11 +5563,11 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
 
   trac = buildPythonPackage {
-    name = "trac-0.12.2";
+    name = "trac-1.0.1";
 
     src = fetchurl {
-      url = http://ftp.edgewall.com/pub/trac/Trac-0.12.2.tar.gz;
-      sha256 = "1ihf5031pc1wpwbxpfzzz2bcpwww795n5y22baglyim1lalivd65";
+      url = http://ftp.edgewall.com/pub/trac/Trac-1.0.1.tar.gz;
+      sha256 = "1nqa95fcnkpyq4jk6az7l7sqgm3b3pjq3bx1n7y4v3bad5jr1m4x";
     };
 
     # couple of failing tests

From 5a75874b96917baaf43e6d03135633b062dde9b8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Sep 2013 21:15:41 +0200
Subject: [PATCH 451/452] all-packages.nix: add 'linuxHeaders36' attribute

We have that version of the kernel headers in Nixpkgs already, there was
just no attribute for them.
---
 pkgs/top-level/all-packages.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8bc25d24a92..56764892dba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6410,6 +6410,8 @@ let
 
   linuxConsoleTools = callPackage ../os-specific/linux/consoletools { };
 
+  linuxHeaders36 = callPackage ../os-specific/linux/kernel-headers/2.6.32.nix { };
+
   linuxHeaders37 = callPackage ../os-specific/linux/kernel-headers/3.7.nix { };
 
   linuxHeaders26Cross = forceNativeDrv (import ../os-specific/linux/kernel-headers/2.6.32.nix {

From e08fab28f5e5e2ca346faa5e0e8d787942a8733f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Sep 2013 21:16:33 +0200
Subject: [PATCH 452/452] Um, make that 'linuxHeaders26'. Sorry.

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 56764892dba..87f376c1e25 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6410,7 +6410,7 @@ let
 
   linuxConsoleTools = callPackage ../os-specific/linux/consoletools { };
 
-  linuxHeaders36 = callPackage ../os-specific/linux/kernel-headers/2.6.32.nix { };
+  linuxHeaders26 = callPackage ../os-specific/linux/kernel-headers/2.6.32.nix { };
 
   linuxHeaders37 = callPackage ../os-specific/linux/kernel-headers/3.7.nix { };