From 719b488b102ac5bfa501cb5a64aca097efcda5c2 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Wed, 19 Jun 2013 12:05:42 +1000
Subject: [PATCH 001/314] vim_configurable: fix python on darwin

* was not linking to the correct python library on darwin (using the OS
  X framework, which is not what we want)
---
 .../applications/editors/vim/configurable.nix | 27 ++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index d9211203cad..066c8fddd96 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -40,6 +40,15 @@ composableDerivation {
       }.src;
     };
 
+    # if darwin support is enabled, we want to make sure we're not building with
+    # OS-installed python framework
+    preConfigure
+      = stdenv.lib.optionalString
+        (stdenv.isDarwin && (config.vim.darwin or true)) ''
+          sed -i "5387,5390d" src/auto/configure
+          sed -i "5394d" src/auto/configure
+        '';
+
     configureFlags
       = [ "--enable-gui=${args.gui}" "--with-features=${args.features}" ];
 
@@ -58,7 +67,19 @@ composableDerivation {
       // edf { name = "xsmp_interact"; } #Disable XSMP interaction
       // edf { name = "mzscheme"; } #Include MzScheme interpreter.
       // edf { name = "perl"; feat = "perlinterp"; enable = { nativeBuildInputs = [perl]; };} #Include Perl interpreter.
-      // edf { name = "python"; feat = "pythoninterp"; enable = { nativeBuildInputs = [python]; }; } #Include Python interpreter.
+
+      // edf {
+        name = "python";
+        feat = "pythoninterp";
+        enable = {
+          nativeBuildInputs = [ python ];
+        } // lib.optionalAttrs stdenv.isDarwin {
+          configureFlags
+            = [ "--enable-pythoninterp=yes"
+                "--with-python-config-dir=${python}/lib" ];
+        };
+      }
+
       // edf { name = "tcl"; enable = { nativeBuildInputs = [tcl]; }; } #Include Tcl interpreter.
       // edf { name = "ruby"; feat = "rubyinterp"; enable = { nativeBuildInputs = [ruby]; };} #Include Ruby interpreter.
       // edf { name = "lua" ; feat = "luainterp"; enable = { nativeBuildInputs = [lua]; configureFlags = ["--with-lua-prefix=${args.lua}"];};}
@@ -104,7 +125,7 @@ composableDerivation {
       // edf "gtktest" "gtktest" { } #Do not try to compile and run a test GTK program
     */
 
-  postInstall = if stdenv.isLinux then ''
+  postInstall = stdenv.lib.optionalString stdenv.isLinux ''
     rpath=`patchelf --print-rpath $out/bin/vim`;
     for i in $nativeBuildInputs; do
       echo adding $i/lib
@@ -113,7 +134,7 @@ composableDerivation {
     echo $nativeBuildInputs
     echo $rpath
     patchelf --set-rpath $rpath $out/bin/{vim,gvim}
-  '' else "";
+  '';
 
   dontStrip = 1;
 

From ed3a63b5d7aec50f803e3e91fcb71a001a7ebe78 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Sat, 15 Jun 2013 21:57:05 +1000
Subject: [PATCH 002/314] php53: fix on darwin

* add libssh2 to build inputs (configure fails without this)
* link with stdc++
* add icu/lib directory to DYLD_LIBRARY_PATH (and wrap binaries with this
  environment variable
* add libiconv to build inputs
* fix --with-iconv configure flag (was --with-iconv-dir which is not a valid
  flag)
---
 pkgs/development/interpreters/php/5.3.nix | 43 ++++++++++++++++-------
 1 file changed, 31 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix
index 35508230ebd..1625c924cbb 100644
--- a/pkgs/development/interpreters/php/5.3.nix
+++ b/pkgs/development/interpreters/php/5.3.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison
 , apacheHttpd, mysql, libxml2, readline, zlib, curl, gd, postgresql, gettext
-, openssl, pkgconfig, sqlite, config, libiconv, libjpeg, libpng, freetype
-, libxslt, libmcrypt, bzip2, icu }:
+, openssl, pkgconfig, sqlite, config, libjpeg, libpng, freetype, libxslt
+, libmcrypt, bzip2, icu, libssh2, makeWrapper, libiconvOrEmpty, libiconv }:
 
 let
   libmcryptOverride = libmcrypt.override { disablePosixThreads = true; };
@@ -15,7 +15,15 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
 
   enableParallelBuilding = true;
 
-  buildInputs = ["flex" "bison" "pkgconfig"];
+  buildInputs
+    = [ flex bison pkgconfig ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ libssh2 makeWrapper ];
+
+  # need to include the C++ standard library when compiling on darwin
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lstdc++";
+
+  # need to specify where the dylib for icu is stored
+  DYLD_LIBRARY_PATH = stdenv.lib.optionalString stdenv.isDarwin "${icu}/lib";
 
   flags = {
 
@@ -41,11 +49,11 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
       };
 
       libxml2 = {
-        configureFlags = [
-          "--with-libxml-dir=${libxml2}"
-          #"--with-iconv-dir=${libiconv}"
-          ];
-        buildInputs = [ libxml2 ];
+        configureFlags
+          = [ "--with-libxml-dir=${libxml2}" ]
+            ++ stdenv.lib.optional (libiconvOrEmpty != [])
+              [ "--with-iconv=${libiconv}" ];
+        buildInputs = [ libxml2 ] ++ libiconvOrEmpty;
       };
 
       readline = {
@@ -89,7 +97,12 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
       };
 
       gd = {
-        configureFlags = ["--with-gd=${gd} --with-freetype-dir=${freetype}"];
+        configureFlags = [
+          "--with-gd"
+          "--with-freetype-dir=${freetype}"
+          "--with-png-dir=${libpng}"
+          "--with-jpeg-dir=${libjpeg}"
+        ];
         buildInputs = [gd libpng libjpeg freetype];
       };
 
@@ -197,7 +210,11 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
   installPhase = ''
     unset installPhase; installPhase;
     cp php.ini-production $iniFile
-  '';
+  '' + ( stdenv.lib.optionalString stdenv.isDarwin ''
+    for prog in $out/bin/*; do
+      wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "$DYLD_LIBRARY_PATH"
+    done
+  '' );
 
   src = fetchurl {
     url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror";
@@ -207,8 +224,10 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
 
   meta = {
     description = "The PHP language runtime engine";
-    homepage = http://www.php.net/;
-    license = "PHP-3";
+    homepage    = http://www.php.net/;
+    license     = "PHP-3";
+    maintainers = with stdenv.lib.maintainers; [ lovek323 ];
+    platforms   = stdenv.lib.platforms.unix;
   };
 
   patches = [./fix.patch];

From 6ae1241934323fc04badab567ed64875fb51ba85 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Thu, 20 Jun 2013 17:42:09 +1000
Subject: [PATCH 003/314] php53: add optional pcntl flag

---
 pkgs/development/interpreters/php/5.3.nix | 35 +++++++++++++----------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix
index 1625c924cbb..a6f5964091f 100644
--- a/pkgs/development/interpreters/php/5.3.nix
+++ b/pkgs/development/interpreters/php/5.3.nix
@@ -43,6 +43,10 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
         buildInputs = [curl openssl];
       };
 
+      pcntl = {
+        configureFlags = [ "--enable-pcntl" ];
+      };
+
       zlib = {
         configureFlags = ["--with-zlib=${zlib}"];
         buildInputs = [zlib];
@@ -174,30 +178,31 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
     };
 
   cfg = {
-    mysqlSupport = config.php.mysql or true;
-    mysqliSupport = config.php.mysqli or true;
-    pdo_mysqlSupport = config.php.pdo_mysql or true;
-    libxml2Support = config.php.libxml2 or true;
     apxs2Support = config.php.apxs2 or true;
     bcmathSupport = config.php.bcmath or true;
-    socketsSupport = config.php.sockets or true;
+    bz2Support = config.php.bz2 or false;
     curlSupport = config.php.curl or true;
+    exifSupport = config.php.exif or true;
+    ftpSupport = config.php.ftp or true;
+    gdSupport = config.php.gd or true;
     gettextSupport = config.php.gettext or true;
+    intlSupport = config.php.intl or true;
+    libxml2Support = config.php.libxml2 or true;
+    mbstringSupport = config.php.mbstring or true;
+    mcryptSupport = config.php.mcrypt or false;
+    mysqlSupport = config.php.mysql or true;
+    mysqliSupport = config.php.mysqli or true;
+    opensslSupport = config.php.openssl or true;
+    pcntlSupport = config.php.pcntl or true;
+    pdo_mysqlSupport = config.php.pdo_mysql or true;
     postgresqlSupport = config.php.postgresql or true;
     readlineSupport = config.php.readline or true;
-    sqliteSupport = config.php.sqlite or true;
     soapSupport = config.php.soap or true;
-    zlibSupport = config.php.zlib or true;
-    opensslSupport = config.php.openssl or true;
-    mbstringSupport = config.php.mbstring or true;
-    gdSupport = config.php.gd or true;
-    intlSupport = config.php.intl or true;
-    exifSupport = config.php.exif or true;
+    socketsSupport = config.php.sockets or true;
+    sqliteSupport = config.php.sqlite or true;
     xslSupport = config.php.xsl or false;
-    mcryptSupport = config.php.mcrypt or false;
-    bz2Support = config.php.bz2 or false;
     zipSupport = config.php.zip or true;
-    ftpSupport = config.php.ftp or true;
+    zlibSupport = config.php.zlib or true;
   };
 
   configurePhase = ''

From a7746e3585cbdf437c57f43fa50750a1bc6c3c11 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Thu, 20 Jun 2013 17:45:29 +1000
Subject: [PATCH 004/314] php53: restore nix gd version

---
 pkgs/development/interpreters/php/5.3.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix
index a6f5964091f..347a374ffcc 100644
--- a/pkgs/development/interpreters/php/5.3.nix
+++ b/pkgs/development/interpreters/php/5.3.nix
@@ -102,7 +102,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
 
       gd = {
         configureFlags = [
-          "--with-gd"
+          "--with-gd=${gd}"
           "--with-freetype-dir=${freetype}"
           "--with-png-dir=${libpng}"
           "--with-jpeg-dir=${libjpeg}"

From b38308553b00424bf859f8c60699c4a5c044f3f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 20 Jun 2013 20:52:58 +0200
Subject: [PATCH 005/314] Adding cjdns.

The executable runs; I haven't tried to run a node.
---
 pkgs/tools/networking/cjdns/default.nix | 31 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/networking/cjdns/default.nix

diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix
new file mode 100644
index 00000000000..a76e351efc4
--- /dev/null
+++ b/pkgs/tools/networking/cjdns/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchgit, cmake }:
+
+let
+  rev = "f7b02ac0cc";
+in
+stdenv.mkDerivation {
+  name = "cjdns-git-20130620-${rev}";
+
+  src = fetchgit {
+    url = "https://github.com/cjdelisle/cjdns.git";
+    inherit rev;
+    sha256 = "1580a62yhph62nv7q2jdqrbkyk9a9g5i17snibkxyykc7rili5zq";
+  };
+
+  preConfigure = ''
+    sed -i -e '/toolchain.*CACHE/d' CMakeLists.txt
+  '';
+
+  doCheck = true;
+  checkPhase = "ctest";
+
+  buildInputs = [ cmake ];
+
+  meta = {
+    homepage = https://github.com/cjdelisle/cjdns;
+    description = "Encrypted networking for regular people";
+    license = "GPLv3+";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 412d48e863c..6316f0a7557 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -593,6 +593,8 @@ let
 
   chrony = callPackage ../tools/networking/chrony { };
 
+  cjdns = callPackage ../tools/networking/cjdns { };
+
   cksfv = callPackage ../tools/networking/cksfv { };
 
   ciopfs = callPackage ../tools/filesystems/ciopfs { };

From 60fd7188565ae9f1f97a27cf8ab6554dfce216ed Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Fri, 21 Jun 2013 15:11:07 +1000
Subject: [PATCH 006/314] vim-coffee-script: add expression

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

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 3a24bee43de..da06eaec35c 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -144,5 +144,27 @@ in
       cp -R syntax_checkers "$out/vim-plugins"
     '';
   };
+
+  coffeeScript = stdenv.mkDerivation {
+    name = "vim-coffee-script-v002";
+
+    src = fetchurl {
+      url = "https://github.com/vim-scripts/vim-coffee-script/archive/v002.tar.gz";
+      sha256 = "1xln6i6jbbihcyp5bsdylr2146y41hmp2xf7wi001g2ymj1zdsc0";
+    };
+
+    buildPhase = "";
+
+    installPhase = ''
+      mkdir -p "$out/vim-plugins"
+      cp -R after "$out/vim-plugins"
+      cp -R compiler "$out/vim-plugins"
+      cp -R doc "$out/vim-plugins"
+      cp -R ftdetect "$out/vim-plugins"
+      cp -R ftplugin "$out/vim-plugins"
+      cp -R indent "$out/vim-plugins"
+      cp -R syntax "$out/vim-plugins"
+    '';
+  };
 }
 

From d195372ebacb660f640e71bf16145e11ba307dcb Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Fri, 21 Jun 2013 15:03:00 +1000
Subject: [PATCH 007/314] php53-xdebug: add expression

---
 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 6316f0a7557..9bcfd7ba145 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3009,7 +3009,11 @@ let
 
   php_xcache = callPackage ../development/libraries/php-xcache { };
 
-  phpXdebug = callPackage ../development/interpreters/php-xdebug { };
+  phpXdebug_5_3 = callPackage ../development/interpreters/php-xdebug {
+    php = php53;
+  };
+  phpXdebug_5_4 = callPackage ../development/interpreters/php-xdebug { };
+  phpXdebug = phpXdebug_5_4;
 
   picolisp = callPackage ../development/interpreters/picolisp {};
 

From 34cf9baaa6d19db6b5c13a14bbebb7211b6a9253 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 21 Jun 2013 11:10:41 +0200
Subject: [PATCH 008/314] Update mumble to 1.2.4

Now it should have opus. The source code of opus comes with mumble.
---
 pkgs/applications/networking/mumble/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 9befe98399d..0981ab39449 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -6,16 +6,14 @@ jackaudio ? null }:
 
 stdenv.mkDerivation rec {
   name = "mumble-" + version;
-  version = "1.2.3";
+  version = "1.2.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/mumble/${name}.tar.gz";
-    sha256 = "0p4as6bcmbzkiff1gvc0f277dzbz2sfys97gcbxw7gjamqi53285";
+    sha256 = "16wwj6gwcnyjlnzh7wk0l255ldxmbwx0wi652sdp20lsv61q7kx1";
   };
 
   patchPhase = ''
-    sed -e s/qt_ja_JP.qm// -i src/mumble/mumble.pro src/mumble11x/mumble11x.pro
-    sed -e /qt_ja_JP.qm/d -i src/mumble/mumble_qt.qrc src/mumble11x/mumble_qt.qrc
     patch -p1 < ${ ./mumble-jack-support.patch }
   '';
 

From 1b8548fc725ea75a5ea5bf931e0fd70b685e54af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 21 Jun 2013 12:15:12 +0200
Subject: [PATCH 009/314] Updating umurmur to 0.2.13

Now opus works.
---
 pkgs/applications/networking/umurmur/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/applications/networking/umurmur/default.nix
index 715e7fa6998..1f08b9873d4 100644
--- a/pkgs/applications/networking/umurmur/default.nix
+++ b/pkgs/applications/networking/umurmur/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, protobufc, libconfig }:
 
 stdenv.mkDerivation rec {
-  name = "umurmur-0.2.12";
+  name = "umurmur-0.2.13";
   
   src = fetchurl {
     url = "http://umurmur.googlecode.com/files/${name}.tar.gz";
-    sha1 = "5be3c765af3c5f518d1e1bbd828b3582ad4097cd";
+    sha1 = "c9345b67213f52688fef2113132c62d2edbf4bea";
   };
   
   buildInputs = [ openssl protobufc libconfig ];

From 57dee2a27e99bc9187e2c832f3e63082a05542d7 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 21 Jun 2013 06:20:45 +0200
Subject: [PATCH 010/314] synergy: Update to new upstream version 1.4.12.

This brings in support for encryption and thus requires the crypto++ library as
an additional dependency. Unfortunately the upstream integration isn't quite the
way we'd like it to be, so we need to add a small patch to ignore the bundled
version and use the package from nixpkgs.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/misc/synergy/cryptopp.patch | 54 +++++++++++++++++++
 pkgs/applications/misc/synergy/default.nix    | 15 +++---
 2 files changed, 62 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/applications/misc/synergy/cryptopp.patch

diff --git a/pkgs/applications/misc/synergy/cryptopp.patch b/pkgs/applications/misc/synergy/cryptopp.patch
new file mode 100644
index 00000000000..f20ef9544a2
--- /dev/null
+++ b/pkgs/applications/misc/synergy/cryptopp.patch
@@ -0,0 +1,54 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3b61fc0..2206646 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -133,6 +133,9 @@ if (UNIX)
+ 	check_type_size(long SIZEOF_LONG)
+ 	check_type_size(short SIZEOF_SHORT)
+ 
++    # let's just assume cryptopp exists (provided by the Nix expression)
++    list(APPEND libs cryptopp)
++
+ 	# pthread is used on both Linux and Mac
+ 	check_library_exists("pthread" pthread_create "" HAVE_PTHREAD)
+ 	if (HAVE_PTHREAD)
+@@ -303,7 +306,6 @@ if (VNC_SUPPORT)
+ endif()
+ 
+ add_subdirectory(src)
+-add_subdirectory(tools)
+ 
+ if (WIN32)
+ 	# add /analyze in order to unconver potential bugs in the source code
+diff --git a/src/lib/synergy/CCryptoMode.h b/src/lib/synergy/CCryptoMode.h
+index 9b7e8ad..0d659ac 100644
+--- a/src/lib/synergy/CCryptoMode.h
++++ b/src/lib/synergy/CCryptoMode.h
+@@ -17,9 +17,9 @@
+ 
+ #pragma once
+ 
+-#include <cryptopp562/gcm.h>
+-#include <cryptopp562/modes.h>
+-#include <cryptopp562/aes.h>
++#include <cryptopp/gcm.h>
++#include <cryptopp/modes.h>
++#include <cryptopp/aes.h>
+ #include "ECryptoMode.h"
+ #include "CString.h"
+ 
+diff --git a/src/lib/synergy/CCryptoStream.h b/src/lib/synergy/CCryptoStream.h
+index 104b1f6..09c4dc4 100644
+--- a/src/lib/synergy/CCryptoStream.h
++++ b/src/lib/synergy/CCryptoStream.h
+@@ -20,8 +20,8 @@
+ #include "BasicTypes.h"
+ #include "CStreamFilter.h"
+ #include "CCryptoMode.h"
+-#include <cryptopp562/osrng.h>
+-#include <cryptopp562/sha.h>
++#include <cryptopp/osrng.h>
++#include <cryptopp/sha.h>
+ 
+ class CCryptoOptions;
+ 
diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index 4bb3ef9e64a..d650f964c2b 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -1,19 +1,20 @@
-{ stdenv, fetchurl, cmake, x11, libX11, libXi, libXtst }:
+{ stdenv, fetchurl, cmake, x11, libX11, libXi, libXtst, cryptopp }:
 
 stdenv.mkDerivation rec {
-  name = "synergy-1.4.10";
+  name = "synergy-1.4.12";
 
   src = fetchurl {
   	url = "http://synergy.googlecode.com/files/${name}-Source.tar.gz";
-  	sha256 = "1ghgf96gbk4sdw8sqlc3pjschkmmqybihi12mg6hi26gnk7a5m86";
+  	sha256 = "0j884skwqy8r8ckj9a4rlwsbjwb1yrj9wqma1nwhr2inff6hrdim";
   };
 
-  buildInputs = [ cmake x11 libX11 libXi libXtst ];
-  
+  patches = [ ./cryptopp.patch ];
+
+  buildInputs = [ cmake x11 libX11 libXi libXtst cryptopp ];
+
   # At this moment make install doesn't work for synergy
   # http://synergy-foss.org/spit/issues/details/3317/
 
-  
   installPhase = ''
     ensureDir $out/bin
     cp ../bin/synergyc $out/bin
@@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
     cp ../bin/synergyd $out/bin
   '';
 
-  meta = { 
+  meta = {
     description = "Tool to share the mouse keyboard and the clipboard between computers";
     homepage = http://synergy-foss.org;
     license = stdenv.lib.licenses.gpl2;

From ea4afb73d89742accd61508d06a01e2dd95b0729 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 21 Jun 2013 06:25:00 +0200
Subject: [PATCH 011/314] synergy: Add support for XrandR.

Nowadays, multiple monitor setups are quite common, so I suppose we'd want
support for that. Especially because users might get confused if synergy is
unable to pick the right screen resolution and thus cause edges to be cut off
from the available pointing area.

The postPatch hook is to force cmake into thinking that we have XRRNotifyEvent,
which we _do_ have with the xrandr version shipped in nixpkgs. Automatic
detection from CMakeLists.txt fails here because it tries to search for the
symbol within the libX11 store path.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/misc/synergy/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index d650f964c2b..56bf876147b 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, x11, libX11, libXi, libXtst, cryptopp }:
+{ stdenv, fetchurl, cmake, x11, libX11, libXi, libXtst, libXrandr, cryptopp }:
 
 stdenv.mkDerivation rec {
   name = "synergy-1.4.12";
@@ -10,7 +10,12 @@ stdenv.mkDerivation rec {
 
   patches = [ ./cryptopp.patch ];
 
-  buildInputs = [ cmake x11 libX11 libXi libXtst cryptopp ];
+  postPatch = ''
+    sed -i -e '/HAVE_X11_EXTENSIONS_XRANDR_H/c \
+      set(HAVE_X11_EXTENSIONS_XRANDR_H true)' CMakeLists.txt
+  '';
+
+  buildInputs = [ cmake x11 libX11 libXi libXtst libXrandr cryptopp ];
 
   # At this moment make install doesn't work for synergy
   # http://synergy-foss.org/spit/issues/details/3317/

From d9e0c355a0bee2ebc5cba3b6b8af9082665bd608 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 21 Jun 2013 07:12:59 +0200
Subject: [PATCH 012/314] synergy: Add support for Xinput2.

This is needed in order to support devices such as gamepads or tablets.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/misc/synergy/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index 56bf876147b..a4ea8a99973 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, cmake, x11, libX11, libXi, libXtst, libXrandr, cryptopp }:
+{ stdenv, fetchurl, cmake, x11, libX11, libXi, libXtst, libXrandr, xinput
+, cryptopp }:
 
 stdenv.mkDerivation rec {
   name = "synergy-1.4.12";
@@ -15,7 +16,7 @@ stdenv.mkDerivation rec {
       set(HAVE_X11_EXTENSIONS_XRANDR_H true)' CMakeLists.txt
   '';
 
-  buildInputs = [ cmake x11 libX11 libXi libXtst libXrandr cryptopp ];
+  buildInputs = [ cmake x11 libX11 libXi libXtst libXrandr xinput cryptopp ];
 
   # At this moment make install doesn't work for synergy
   # http://synergy-foss.org/spit/issues/details/3317/

From 9a37a306b83c6aa71048021a9c05938c20434205 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 21 Jun 2013 07:14:17 +0200
Subject: [PATCH 013/314] synergy: Enable unit tests.

Integration tests don't seem to work right now, so let's see if we can figure
out a way to enable them later. But at least running unit tests is better than
not running any tests :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/misc/synergy/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index a4ea8a99973..22ede723fab 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -28,6 +28,9 @@ stdenv.mkDerivation rec {
     cp ../bin/synergyd $out/bin
   '';
 
+  doCheck = true;
+  checkPhase = "../bin/unittests";
+
   meta = {
     description = "Tool to share the mouse keyboard and the clipboard between computers";
     homepage = http://synergy-foss.org;

From e0ea957d640f75fa40d5ca9bd6dfff927745567e Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 21 Jun 2013 08:54:26 +0200
Subject: [PATCH 014/314] php53: Don't use bundled version of libgd.

This fixes a copy & paste error I made in 486e918, which resulted in PHP being
built with the bundled version of GD instead of the one we have in nixpkgs.

Thanks to @peti for noticing.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/interpreters/php/5.3.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix
index 6a65cce0768..576c1dac7ed 100644
--- a/pkgs/development/interpreters/php/5.3.nix
+++ b/pkgs/development/interpreters/php/5.3.nix
@@ -90,7 +90,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
 
       gd = {
         configureFlags = [
-          "--with-gd"
+          "--with-gd=${gd}"
           "--with-freetype-dir=${freetype}"
           "--with-png-dir=${libpng}"
           "--with-jpeg-dir=${libjpeg}"

From 8b425e2ae3421d9b8937873268bcca875ed69aaf Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 21 Jun 2013 09:16:26 +0200
Subject: [PATCH 015/314] chromium: Mark beta and dev versions lowPrio.

I'm still wondering why noone has reported this, but I found out about this
while trying to introduce someone to NixOS, eventually wondering why it is going
to install version 29 when using "nix-env -i chromium".

So, in hope that everyone out there using the package is using the attribute,
let's make _stable_ the default here.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/all-packages.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6316f0a7557..5a64da16aa7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6992,11 +6992,11 @@ let
     pulseSupport = config.pulseaudio or false;
   });
 
-  chromiumBeta = chromium.override { channel = "beta"; };
-  chromiumBetaWrapper = wrapChromium chromiumBeta;
+  chromiumBeta = lowPrio (chromium.override { channel = "beta"; });
+  chromiumBetaWrapper = lowPrio (wrapChromium chromiumBeta);
 
-  chromiumDev = chromium.override { channel = "dev"; };
-  chromiumDevWrapper = wrapChromium chromiumDev;
+  chromiumDev = lowPrio (chromium.override { channel = "dev"; });
+  chromiumDevWrapper = lowPrio (wrapChromium chromiumDev);
 
   chromiumWrapper = wrapChromium chromium;
 

From 1709571b3f9341df37a91b559c5eba29b44996f8 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 21 Jun 2013 09:57:07 +0200
Subject: [PATCH 016/314] ninja: Update to v1.3.4 and drop unzip dependency.

Version 1.2.0 is way too old in order to build the latest chromium (29) version,
so let's get it up to date (especially because no other package is referencing
ninja, so it should be non-critical).

The dependency on unzip is not needed here, because GitHub also provides
archives in tar.gz format.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../tools/build-managers/ninja/default.nix           | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix
index c4a8b83a7cf..68a6640951b 100644
--- a/pkgs/development/tools/build-managers/ninja/default.nix
+++ b/pkgs/development/tools/build-managers/ninja/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, unzip, python, asciidoc, re2c }:
+{ stdenv, fetchurl, python, asciidoc, re2c }:
 
 stdenv.mkDerivation rec {
   name = "ninja-${version}";
-  version = "1.2.0";
+  version = "1.3.4";
 
   src = fetchurl {
-    name = "${name}.zip";
-    url = "https://github.com/martine/ninja/archive/v${version}.zip";
-    sha256 = "15ynh806ah37bqb57hcs3mj2g82900sncp6n3bssfggb4azgjlh3";
+    name = "${name}.tar.gz";
+    url = "https://github.com/martine/ninja/archive/v${version}.tar.gz";
+    sha256 = "16b0dxq3v19qjchcmfqq3m4l8s4qx2d674vfvamg0s3vvfqnc477";
   };
 
-  buildInputs = [ python asciidoc unzip re2c ];
+  buildInputs = [ python asciidoc re2c ];
 
   buildPhase = ''
     python bootstrap.py

From b0601f6d6f8d9254f70017ebb02d6c25467aee6e Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 21 Jun 2013 10:02:03 +0200
Subject: [PATCH 017/314] chromium: Update all channels to latest versions.

Chromium 28.0.1500.52 finally is stable, so the release channels are now:

stable: 28.0.1500.52 (builds fine, tested)
beta:   28.0.1500.52 (same as stable)
dev:    29.0.1541.2  (patch rebased, builds fine, tested)

The user namespace patch doesn't apply for version 29, so I had to rebase it
against the current trunk (revision 207742).

And as version 27 is outdated, we no longer need to distinguish versions for
patching the hardcoded gcc path in core/core.gypi.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/default.nix  |  13 +-
 .../browsers/chromium/sandbox_userns_29.patch | 287 ++++++++++++++++++
 .../networking/browsers/chromium/sources.nix  |  18 +-
 3 files changed, 303 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/applications/networking/browsers/chromium/sandbox_userns_29.patch

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index b0dc8721747..b5557cc1200 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -84,6 +84,11 @@ let
   buildPath = "out/${buildType}";
   libExecPath = "$out/libexec/${packageName}";
 
+  # user namespace sandbox patch
+  userns_patch = if versionOlder sourceInfo.version "29.0.0.0"
+                 then ./sandbox_userns.patch
+                 else ./sandbox_userns_29.patch;
+
 in stdenv.mkDerivation rec {
   name = "${packageName}-${version}";
   inherit packageName;
@@ -116,18 +121,14 @@ in stdenv.mkDerivation rec {
 
   prePatch = "patchShebangs .";
 
-  patches = [ ./sandbox_userns.patch ]
+  patches = [ userns_patch ]
          ++ optional cupsSupport ./cups_allow_deprecated.patch;
 
   postPatch = ''
     sed -i -r -e 's/-f(stack-protector)(-all)?/-fno-\1/' build/common.gypi
+    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
-  '' + ''
-    sed -i -e 's|/usr/bin/gcc|gcc|' \
-      third_party/WebKit/Source/${if !versionOlder sourceInfo.version "28.0.0.0"
-                                  then "core/core.gypi"
-                                  else "WebCore/WebCore.gyp/WebCore.gyp"}
   '';
 
   gypFlags = mkGypFlags (gypFlagsUseSystemLibs // {
diff --git a/pkgs/applications/networking/browsers/chromium/sandbox_userns_29.patch b/pkgs/applications/networking/browsers/chromium/sandbox_userns_29.patch
new file mode 100644
index 00000000000..c1987c43e15
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/sandbox_userns_29.patch
@@ -0,0 +1,287 @@
+commit 557daf9cc9c02b8f17e6ee84f9b1ae6e6132d478
+Author: aszlig <aszlig@redmoonstudios.org>
+Date:   Thu May 16 14:17:56 2013 +0200
+
+    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>
+
+diff --git a/base/process_util.h b/base/process_util.h
+index 0bec8e0..6b6f566 100644
+--- a/base/process_util.h
++++ b/base/process_util.h
+@@ -175,6 +175,7 @@ struct LaunchOptions {
+         new_process_group(false)
+ #if defined(OS_LINUX)
+         , clone_flags(0)
++        , new_user_namespace(false)
+ #endif  // OS_LINUX
+ #if defined(OS_CHROMEOS)
+         , ctrl_terminal_fd(-1)
+@@ -249,6 +250,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 83afe44..e529b2b 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 130f44a..c1232d4 100644
+--- a/content/browser/zygote_host/zygote_host_impl_linux.cc
++++ b/content/browser/zygote_host/zygote_host_impl_linux.cc
+@@ -118,25 +118,31 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) {
+ 
+   sandbox_binary_ = sandbox_cmd.c_str();
+ 
+-  // A non empty sandbox_cmd means we want a SUID sandbox.
+-  using_suid_sandbox_ = !sandbox_cmd.empty();
++  bool userns_sandbox = false;
++  const std::vector<std::string> cmd_line_unwrapped(cmd_line.argv());
+ 
+-  if (using_suid_sandbox_) {
++  if (!sandbox_cmd.empty()) {
+     struct stat st;
+     if (stat(sandbox_binary_.c_str(), &st) != 0) {
+       LOG(FATAL) << "The SUID sandbox helper binary is missing: "
+                  << 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 "
+@@ -160,7 +166,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 7d01722..2f445ef 100644
+--- a/content/zygote/zygote_main_linux.cc
++++ b/content/zygote/zygote_main_linux.cc
+@@ -395,6 +395,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 34231d4..36e3201 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";
diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix
index 780c3b62a30..dce02893a56 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 = "29.0.1521.3";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1521.3.tar.xz";
-    sha256 = "0szc3g24jlhcp8cgijdv0q9rfn3mhp2kjyc85ml4snskkpasfrv3";
+    version = "29.0.1541.2";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1541.2.tar.xz";
+    sha256 = "0i3vp2zrk1sjdhkwdhig08jh0qmzahn96pm0i22r63cp8i9vny1p";
   };
   beta = {
-    version = "28.0.1500.45";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.45.tar.xz";
-    sha256 = "01sxqv6i7m5h0jsypg801w2ivbrir37wdi4ijd5yvprkyzbd90zi";
+    version = "28.0.1500.52";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.52.tar.xz";
+    sha256 = "1d0q8lsvwqkaninmnyc8jjj0pnqxc5rr3lr3mgzj37avksxvyg3v";
   };
   stable = {
-    version = "27.0.1453.110";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.110.tar.xz";
-    sha256 = "1y61shbzrkcv70x9zyj559g2yyp40hi9y59f7wwx5g076lsaxsw5";
+    version = "28.0.1500.52";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.52.tar.xz";
+    sha256 = "1d0q8lsvwqkaninmnyc8jjj0pnqxc5rr3lr3mgzj37avksxvyg3v";
   };
 }

From f974573a5e91b8d4b92a695c4c355990f41f3b25 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 21 Jun 2013 11:33:08 +0200
Subject: [PATCH 018/314] iksemel: Add new package with version 1.4.

This library is used by Zabbix in order to send XMPP alerts/notifications.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../development/libraries/iksemel/default.nix | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/libraries/iksemel/default.nix

diff --git a/pkgs/development/libraries/iksemel/default.nix b/pkgs/development/libraries/iksemel/default.nix
new file mode 100644
index 00000000000..7e8061ee8bb
--- /dev/null
+++ b/pkgs/development/libraries/iksemel/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, gnutls, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "iksemel-${version}";
+  version = "1.4";
+
+  src = fetchurl {
+    url = "https://iksemel.googlecode.com/files/${name}.tar.gz";
+    sha1 = "722910b99ce794fd3f6f0e5f33fa804732cf46db";
+  };
+
+  preConfigure = ''
+    sed -i -e '/if.*gnutls_check_version/,/return 1;/c return 0;' configure
+    export LIBGNUTLS_CONFIG="${pkgconfig}/bin/pkg-config gnutls"
+  '';
+
+  buildInputs = [ pkgconfig gnutls zlib ];
+
+  meta = {
+    homepage = "https://code.google.com/p/iksemel/";
+    license = stdenv.lib.licenses.lgpl21Plus;
+    description = "Fast and portable XML parser and Jabber protocol library";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5a64da16aa7..18577679c3a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4220,6 +4220,8 @@ let
 
   id3lib = callPackage ../development/libraries/id3lib { };
 
+  iksemel = callPackage ../development/libraries/iksemel { };
+
   ilbc = callPackage ../development/libraries/ilbc { };
 
   ilmbase = callPackage ../development/libraries/ilmbase { };

From 60ba4485b11460fc75e1acda3c0d56a7ecf1a398 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 21 Jun 2013 11:34:46 +0200
Subject: [PATCH 019/314] zabbix2: Add optional XMPP support using iksemel.

This uses recurseForDerivations directly after using callPackage magic to ensure
that the input attributes can be overriden *and* nix-env shows the package as in
recurseIntoAttrs.

The reason for making this optional is because there probably is only a minority
of people who want to use XMPP and we don't want to introduce an additional
dependency for the majority, do we?

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/servers/monitoring/zabbix/2.0.nix | 14 ++++++++++++--
 pkgs/top-level/all-packages.nix        |  4 +---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix
index 5131e8a2e42..fef5010218c 100644
--- a/pkgs/servers/monitoring/zabbix/2.0.nix
+++ b/pkgs/servers/monitoring/zabbix/2.0.nix
@@ -1,4 +1,7 @@
-{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib, gettext }:
+{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib, gettext
+, enableJabber ? false, iksemel ? null }:
+
+assert enableJabber -> iksemel != null;
 
 let
 
@@ -21,13 +24,20 @@ let
 in
 
 {
+  recurseForDerivations = true;
 
   server = stdenv.mkDerivation {
     name = "zabbix-${version}";
 
     inherit src preConfigure;
 
-    configureFlags = "--enable-agent --enable-server --with-postgresql --with-libcurl --with-gettext";
+    configureFlags = [
+      "--enable-agent"
+      "--enable-server"
+      "--with-postgresql"
+      "--with-libcurl"
+      "--with-gettext"
+    ] ++ stdenv.lib.optional enableJabber "--with-jabber=${iksemel}";
 
     buildInputs = [ pkgconfig postgresql curl openssl zlib ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 18577679c3a..288cee3de99 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5912,9 +5912,7 @@ let
     inherit fetchurl stdenv pkgconfig postgresql curl openssl zlib;
   });
 
-  zabbix20 = recurseIntoAttrs (import ../servers/monitoring/zabbix/2.0.nix {
-    inherit fetchurl stdenv pkgconfig postgresql curl openssl zlib gettext;
-  });
+  zabbix20 = callPackage ../servers/monitoring/zabbix/2.0.nix { };
 
 
   ### OS-SPECIFIC

From 467962b1857609e08f97bc53837a2b9894af8a18 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 21 Jun 2013 12:15:32 +0200
Subject: [PATCH 020/314] synergy: Take over maintenance.

I'm heavily using synergy for daily work, so I'm most probably going to watch
out for changes/improvements/bugs :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/misc/synergy/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index 22ede723fab..46850d6763c 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -35,6 +35,7 @@ stdenv.mkDerivation rec {
     description = "Tool to share the mouse keyboard and the clipboard between computers";
     homepage = http://synergy-foss.org;
     license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.aszlig ];
     platforms = stdenv.lib.platforms.all;
   };
 }

From cfd284443e9899ace5a442eff53b490e6018287c Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 21 Jun 2013 13:16:30 +0200
Subject: [PATCH 021/314] synergy: Use bundled crypto++ on non-Linux archs.

Seems that crypto++ in nixpkgs doesn't build on Darwin, so let's use bundled
crypto++ until the version in nixpkgs works well.

This refers to the following build:

http://hydra.nixos.org/build/5404516

Hopefully, this will fix it on Mac OS X, because I don't have a Darwin machine
for testing.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/misc/synergy/default.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index 46850d6763c..b283c061029 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -1,5 +1,9 @@
 { stdenv, fetchurl, cmake, x11, libX11, libXi, libXtst, libXrandr, xinput
-, cryptopp }:
+, cryptopp, unzip ? null }:
+
+assert !stdenv.isLinux -> unzip != null;
+
+with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "synergy-1.4.12";
@@ -9,11 +13,13 @@ stdenv.mkDerivation rec {
   	sha256 = "0j884skwqy8r8ckj9a4rlwsbjwb1yrj9wqma1nwhr2inff6hrdim";
   };
 
-  patches = [ ./cryptopp.patch ];
+  patches = optional stdenv.isLinux ./cryptopp.patch;
 
-  postPatch = ''
+  postPatch = if stdenv.isLinux then ''
     sed -i -e '/HAVE_X11_EXTENSIONS_XRANDR_H/c \
       set(HAVE_X11_EXTENSIONS_XRANDR_H true)' CMakeLists.txt
+  '' else ''
+    ${unzip}/bin/unzip -d tools/cryptopp562 tools/cryptopp562.zip
   '';
 
   buildInputs = [ cmake x11 libX11 libXi libXtst libXrandr xinput cryptopp ];
@@ -34,8 +40,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Tool to share the mouse keyboard and the clipboard between computers";
     homepage = http://synergy-foss.org;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.aszlig ];
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.aszlig ];
+    platforms = platforms.all;
   };
 }

From 467608f614ce8f79d14309d0bf7d5ba8768c1bb3 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 21 Jun 2013 13:46:22 +0200
Subject: [PATCH 022/314] synergy: Only pass cryptopp on Linux platforms.

The second failure, and the last one I'm going to try today:

http://hydra.nixos.org/build/5404634

On the bright side there is at least the fact that version 1.4.10 has failed on
Darwin already, so I guess we don't have a lot of Mac users using Synergy.

Latest (failed) build of 1.4.10:

http://hydra.nixos.org/build/5359408

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/misc/synergy/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index b283c061029..0b3734ea147 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, cmake, x11, libX11, libXi, libXtst, libXrandr, xinput
-, cryptopp, unzip ? null }:
+, cryptopp ? null, unzip ? null }:
 
+assert stdenv.isLinux -> cryptopp != null;
 assert !stdenv.isLinux -> unzip != null;
 
 with stdenv.lib;
@@ -22,7 +23,8 @@ stdenv.mkDerivation rec {
     ${unzip}/bin/unzip -d tools/cryptopp562 tools/cryptopp562.zip
   '';
 
-  buildInputs = [ cmake x11 libX11 libXi libXtst libXrandr xinput cryptopp ];
+  buildInputs = [ cmake x11 libX11 libXi libXtst libXrandr xinput ]
+             ++ optional stdenv.isLinux cryptopp;
 
   # At this moment make install doesn't work for synergy
   # http://synergy-foss.org/spit/issues/details/3317/

From f84119331ce2a27128f2d8c00d5d3251ead5affd Mon Sep 17 00:00:00 2001
From: rnons <remotenonsense@gmail.com>
Date: Fri, 21 Jun 2013 22:55:37 +0800
Subject: [PATCH 023/314] yesod-bin: as of yesod 1.2, binaries are kept in
 yesod-bin.

---
 .../libraries/haskell/yesod-bin/default.nix   | 31 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/yesod-bin/default.nix

diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix
new file mode 100644
index 00000000000..717ca54d808
--- /dev/null
+++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix
@@ -0,0 +1,31 @@
+{ cabal, attoparsec, base64Bytestring, blazeBuilder, Cabal, conduit
+, fileEmbed, filepath, fsnotify, ghcPaths, httpConduit
+, httpReverseProxy, httpTypes, liftedBase, network, networkConduit
+, optparseApplicative, parsec, projectTemplate, resourcet
+, shakespeare, shakespeareCss, shakespeareJs, shakespeareText
+, split, systemFileio, systemFilepath, tar, text, time
+, transformers, unixCompat, unorderedContainers, wai, warp, yaml
+, zlib
+}:
+
+cabal.mkDerivation (self: {
+  pname = "yesod-bin";
+  version = "1.2.0.1";
+  sha256 = "0dikjxs1wdqv87ng6iqnnc3pwi3hzgqfwnnj3bb1fpz4plv4bnbc";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    attoparsec base64Bytestring blazeBuilder Cabal conduit fileEmbed
+    filepath fsnotify ghcPaths httpConduit httpReverseProxy httpTypes
+    liftedBase network networkConduit optparseApplicative parsec
+    projectTemplate resourcet shakespeare shakespeareCss shakespeareJs
+    shakespeareText split systemFileio systemFilepath tar text time
+    transformers unixCompat unorderedContainers wai warp yaml zlib
+  ];
+  meta = {
+    homepage = "http://www.yesodweb.com/";
+    description = "The yesod helper executable";
+    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 58706742e07..5c443f22d1c 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2117,6 +2117,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   yesodAuth = callPackage ../development/libraries/haskell/yesod-auth {};
 
+  yesodBin = callPackage ../development/libraries/haskell/yesod-bin {};
+
   yesodCore = callPackage ../development/libraries/haskell/yesod-core {};
 
   yesodDefault = callPackage ../development/libraries/haskell/yesod-default {};

From 76fbbb73c6ad91ff365a7382567e2a60ef137cdc Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 21 Jun 2013 18:18:29 +0300
Subject: [PATCH 024/314] Make most of Ruby Gem builds repeatable

---
 .../interpreters/ruby/bitperfect-rdoc.patch         | 13 +++++++++++++
 pkgs/development/interpreters/ruby/gem.nix          |  4 ++++
 pkgs/development/interpreters/ruby/ruby-19.nix      |  4 +++-
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/interpreters/ruby/bitperfect-rdoc.patch

diff --git a/pkgs/development/interpreters/ruby/bitperfect-rdoc.patch b/pkgs/development/interpreters/ruby/bitperfect-rdoc.patch
new file mode 100644
index 00000000000..d5fb9e4554f
--- /dev/null
+++ b/pkgs/development/interpreters/ruby/bitperfect-rdoc.patch
@@ -0,0 +1,13 @@
+diff -r -u orig/lib/rdoc/generator/template/darkfish/filepage.rhtml new/lib/rdoc/generator/template/darkfish/filepage.rhtml
+--- orig/lib/rdoc/generator/template/darkfish/filepage.rhtml
++++ new/lib/rdoc/generator/template/darkfish/filepage.rhtml
+@@ -88,9 +88,6 @@
+ <body class="file file-popup">
+   <div id="metadata">
+     <dl>
+-      <dt class="modified-date">Last Modified</dt>
+-      <dd class="modified-date"><%= file.last_modified %></dd>
+-
+       <% if file.requires %>
+       <dt class="requires">Requires</dt>
+       <dd class="requires">
diff --git a/pkgs/development/interpreters/ruby/gem.nix b/pkgs/development/interpreters/ruby/gem.nix
index b4ddd26bb46..22801aa5b04 100644
--- a/pkgs/development/interpreters/ruby/gem.nix
+++ b/pkgs/development/interpreters/ruby/gem.nix
@@ -39,6 +39,10 @@ let
         [[ -e "$out/bin/$(basename $prog)" ]]
       done
 
+      # looks like useless files which break build repeatability and consume space
+      rm $out/${ruby.gemPath}/doc/*/*/created.rid || true
+      rm $out/${ruby.gemPath}/gems/*/ext/*/mkmf.log || true
+
       runHook postInstall
     '';
 
diff --git a/pkgs/development/interpreters/ruby/ruby-19.nix b/pkgs/development/interpreters/ruby/ruby-19.nix
index afe9066dd08..038a160b327 100644
--- a/pkgs/development/interpreters/ruby/ruby-19.nix
+++ b/pkgs/development/interpreters/ruby/ruby-19.nix
@@ -38,7 +38,9 @@ stdenv.mkDerivation rec {
     ++ (op (!cursesSupport && stdenv.isDarwin) readline);
 
   enableParallelBuilding = true;
-  patches = [ ./ruby19-parallel-install.patch ];
+  patches = [ ./ruby19-parallel-install.patch
+	      ./bitperfect-rdoc.patch
+  ];
 
   configureFlags = [ "--enable-shared" "--enable-pthread" ]
     # on darwin, we have /usr/include/tk.h -- so the configure script detects

From a0ba1a20e9b12f7586cce838367d9e04d15f2955 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 21 Jun 2013 18:20:35 +0300
Subject: [PATCH 025/314] Add a stdenv version which tries harder to make
 builds repeatable.

---
 pkgs/stdenv/generic/setup-repeatable.sh | 876 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |   2 +
 2 files changed, 878 insertions(+)
 create mode 100644 pkgs/stdenv/generic/setup-repeatable.sh

diff --git a/pkgs/stdenv/generic/setup-repeatable.sh b/pkgs/stdenv/generic/setup-repeatable.sh
new file mode 100644
index 00000000000..8247ede3e46
--- /dev/null
+++ b/pkgs/stdenv/generic/setup-repeatable.sh
@@ -0,0 +1,876 @@
+# Run the named hook, either by calling the function with that name or
+# by evaluating the variable with that name.  This allows convenient
+# setting of hooks both from Nix expressions (as attributes /
+# environment variables) and from shell scripts (as functions).
+runHook() {
+    local hookName="$1"
+    case "$(type -t $hookName)" in
+        (function|alias|builtin) $hookName;;
+        (file) source $hookName;;
+        (keyword) :;;
+        (*) eval "${!hookName}";;
+    esac
+}
+
+
+exitHandler() {
+    exitCode=$?
+    set +e
+
+    closeNest
+
+    if [ -n "$showBuildStats" ]; then
+        times > "$NIX_BUILD_TOP/.times"
+        local -a times=($(cat "$NIX_BUILD_TOP/.times"))
+        # Print the following statistics:
+        # - user time for the shell
+        # - system time for the shell
+        # - user time for all child processes
+        # - system time for all child processes
+        echo "build time elapsed: " ${times[*]}
+    fi
+
+    if [ $exitCode != 0 ]; then
+        runHook failureHook
+
+        # If the builder had a non-zero exit code and
+        # $succeedOnFailure is set, create the file
+        # `$out/nix-support/failed' to signal failure, and exit
+        # normally.  Otherwise, return the original exit code.
+        if [ -n "$succeedOnFailure" ]; then
+            echo "build failed with exit code $exitCode (ignored)"
+            mkdir -p "$out/nix-support"
+            echo -n $exitCode > "$out/nix-support/failed"
+            exit 0
+        fi
+
+    else
+        runHook exitHook
+    fi
+
+    exit $exitCode
+}
+
+trap "exitHandler" EXIT
+
+
+######################################################################
+# Helper functions that might be useful in setup hooks.
+
+
+addToSearchPathWithCustomDelimiter() {
+    local delimiter=$1
+    local varName=$2
+    local dir=$3
+    if [ -d "$dir" ]; then
+        eval export ${varName}=${!varName}${!varName:+$delimiter}${dir}
+    fi
+}
+
+PATH_DELIMITER=':'
+
+addToSearchPath() {
+    addToSearchPathWithCustomDelimiter "${PATH_DELIMITER}" "$@"
+}
+
+
+######################################################################
+# Initialisation.
+
+set -e
+
+[ -z $NIX_GCC ] && NIX_GCC=@gcc@
+
+
+# Wildcard expansions that don't match should expand to an empty list.
+# This ensures that, for instance, "for i in *; do ...; done" does the
+# right thing.
+shopt -s nullglob
+
+
+# Set up the initial path.
+PATH=
+for i in $NIX_GCC @initialPath@; do
+    if [ "$i" = / ]; then i=; fi
+    addToSearchPath PATH $i/bin
+done
+
+if [ "$NIX_DEBUG" = 1 ]; then
+    echo "initial path: $PATH"
+fi
+
+
+# Execute the pre-hook.
+export SHELL=@shell@
+if [ -z "$shell" ]; then export shell=@shell@; fi
+runHook preHook
+
+
+# Check that the pre-hook initialised SHELL.
+if [ -z "$SHELL" ]; then echo "SHELL not set"; exit 1; fi
+
+
+# Hack: run gcc's setup hook.
+envHooks=()
+crossEnvHooks=()
+if [ -f $NIX_GCC/nix-support/setup-hook ]; then
+    source $NIX_GCC/nix-support/setup-hook
+fi
+
+
+# Ensure that the given directories exists.
+ensureDir() {
+    local dir
+    for dir in "$@"; do
+        if ! [ -x "$dir" ]; then mkdir -p "$dir"; fi
+    done
+}
+
+installBin() {
+    mkdir -p $out/bin
+    cp "$@" $out/bin
+}
+
+
+# Allow the caller to augment buildInputs (it's not always possible to
+# do this before the call to setup.sh, since the PATH is empty at that
+# point; here we have a basic Unix environment).
+runHook addInputsHook
+
+
+# Recursively find all build inputs.
+findInputs() {
+    local pkg=$1
+    local var=$2
+    local propagatedBuildInputsFile=$3
+
+    case ${!var} in
+        *\ $pkg\ *)
+            return 0
+            ;;
+    esac
+
+    eval $var="'${!var} $pkg '"
+
+    if [ -f $pkg/nix-support/setup-hook ]; then
+        source $pkg/nix-support/setup-hook
+    fi
+
+    if [ -f $pkg/nix-support/$propagatedBuildInputsFile ]; then
+        for i in $(cat $pkg/nix-support/$propagatedBuildInputsFile); do
+            findInputs $i $var $propagatedBuildInputsFile
+        done
+    fi
+}
+
+crossPkgs=""
+for i in $buildInputs $propagatedBuildInputs; do
+    findInputs $i crossPkgs propagated-build-inputs
+done
+
+nativePkgs=""
+for i in $nativeBuildInputs $propagatedNativeBuildInputs; do
+    findInputs $i nativePkgs propagated-native-build-inputs
+done
+
+
+# Set the relevant environment variables to point to the build inputs
+# found above.
+addToNativeEnv() {
+    local pkg=$1
+
+    if [ -d $1/bin ]; then
+        addToSearchPath _PATH $1/bin
+    fi
+
+    # Run the package-specific hooks set by the setup-hook scripts.
+    for i in "${envHooks[@]}"; do
+        $i $pkg
+    done
+}
+
+for i in $nativePkgs; do
+    addToNativeEnv $i
+done
+
+addToCrossEnv() {
+    local pkg=$1
+
+    # Some programs put important build scripts (freetype-config and similar)
+    # into their crossDrv bin path. Intentionally these should go after
+    # the nativePkgs in PATH.
+    if [ -d $1/bin ]; then
+        addToSearchPath _PATH $1/bin
+    fi
+
+    # Run the package-specific hooks set by the setup-hook scripts.
+    for i in "${crossEnvHooks[@]}"; do
+        $i $pkg
+    done
+}
+
+for i in $crossPkgs; do
+    addToCrossEnv $i
+done
+
+
+# Add the output as an rpath.
+if [ "$NIX_NO_SELF_RPATH" != 1 ]; then
+    export NIX_LDFLAGS="-rpath $out/lib $NIX_LDFLAGS"
+    if [ -n "$NIX_LIB64_IN_SELF_RPATH" ]; then
+        export NIX_LDFLAGS="-rpath $out/lib64 $NIX_LDFLAGS"
+    fi
+    if [ -n "$NIX_LIB32_IN_SELF_RPATH" ]; then
+        export NIX_LDFLAGS="-rpath $out/lib32 $NIX_LDFLAGS"
+    fi
+fi
+
+
+# Set the TZ (timezone) environment variable, otherwise commands like
+# `date' will complain (e.g., `Tue Mar 9 10:01:47 Local time zone must
+# be set--see zic manual page 2004').
+export TZ=UTC
+
+
+# Set the prefix.  This is generally $out, but it can be overriden,
+# for instance if we just want to perform a test build/install to a
+# temporary location and write a build report to $out.
+if [ -z "$prefix" ]; then
+    prefix="$out";
+fi
+
+if [ "$useTempPrefix" = 1 ]; then
+    prefix="$NIX_BUILD_TOP/tmp_prefix";
+fi
+
+
+PATH=$_PATH${_PATH:+:}$PATH
+if [ "$NIX_DEBUG" = 1 ]; then
+    echo "final path: $PATH"
+fi
+
+
+# Make GNU Make produce nested output.
+export NIX_INDENT_MAKE=1
+
+
+# Normalize the NIX_BUILD_CORES variable. The value might be 0, which
+# means that we're supposed to try and auto-detect the number of
+# available CPU cores at run-time.
+
+if [ -z "${NIX_BUILD_CORES:-}" ]; then
+  NIX_BUILD_CORES="1"
+elif [ "$NIX_BUILD_CORES" -le 0 ]; then
+  NIX_BUILD_CORES=$(nproc 2>/dev/null || true)
+  if expr >/dev/null 2>&1 "$NIX_BUILD_CORES" : "^[0-9][0-9]*$"; then
+    :
+  else
+    NIX_BUILD_CORES="1"
+  fi
+fi
+export NIX_BUILD_CORES
+
+
+######################################################################
+# Misc. helper functions.
+
+
+stripDirs() {
+    local dirs="$1"
+    local stripFlags="$2"
+    local dirsNew=
+
+    for d in ${dirs}; do
+        if [ -d "$prefix/$d" ]; then
+            dirsNew="${dirsNew} $prefix/$d "
+        fi
+    done
+    dirs=${dirsNew}
+
+    if [ -n "${dirs}" ]; then
+        header "stripping (with flags $stripFlags) in $dirs"
+        find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} strip $stripFlags || true
+        stopNest
+    fi
+}
+
+
+######################################################################
+# Textual substitution functions.
+
+
+substitute() {
+    local input="$1"
+    local output="$2"
+
+    local -a params=("$@")
+
+    local n p pattern replacement varName
+
+    local content="$(cat $input)"
+
+    for ((n = 2; n < ${#params[*]}; n += 1)); do
+        p=${params[$n]}
+
+        if [ "$p" = --replace ]; then
+            pattern="${params[$((n + 1))]}"
+            replacement="${params[$((n + 2))]}"
+            n=$((n + 2))
+        fi
+
+        if [ "$p" = --subst-var ]; then
+            varName="${params[$((n + 1))]}"
+            pattern="@$varName@"
+            replacement="${!varName}"
+            n=$((n + 1))
+        fi
+
+        if [ "$p" = --subst-var-by ]; then
+            pattern="@${params[$((n + 1))]}@"
+            replacement="${params[$((n + 2))]}"
+            n=$((n + 2))
+        fi
+
+        content="${content//"$pattern"/$replacement}"
+    done
+
+    # !!! This doesn't work properly if $content is "-n".
+    echo -n "$content" > "$output".tmp
+    if [ -x "$output" ]; then chmod +x "$output".tmp; fi
+    mv -f "$output".tmp "$output"
+}
+
+
+substituteInPlace() {
+    local fileName="$1"
+    shift
+    substitute "$fileName" "$fileName" "$@"
+}
+
+
+substituteAll() {
+    local input="$1"
+    local output="$2"
+
+    # Select all environment variables that start with a lowercase character.
+    for envVar in $(env | sed "s/^[^a-z].*//" | sed "s/^\([^=]*\)=.*/\1/"); do
+        if [ "$NIX_DEBUG" = "1" ]; then
+            echo "$envVar -> ${!envVar}"
+        fi
+        args="$args --subst-var $envVar"
+    done
+
+    substitute "$input" "$output" $args
+}
+
+
+substituteAllInPlace() {
+    local fileName="$1"
+    shift
+    substituteAll "$fileName" "$fileName" "$@"
+}
+
+
+######################################################################
+# What follows is the generic builder.
+
+
+nestingLevel=0
+
+startNest() {
+    nestingLevel=$(($nestingLevel + 1))
+    echo -en "\033[$1p"
+}
+
+stopNest() {
+    nestingLevel=$(($nestingLevel - 1))
+    echo -en "\033[q"
+}
+
+header() {
+    startNest "$2"
+    echo "$1"
+}
+
+# Make sure that even when we exit abnormally, the original nesting
+# level is properly restored.
+closeNest() {
+    while [ $nestingLevel -gt 0 ]; do
+        stopNest
+    done
+}
+
+
+# This function is useful for debugging broken Nix builds.  It dumps
+# all environment variables to a file `env-vars' in the build
+# directory.  If the build fails and the `-K' option is used, you can
+# then go to the build directory and source in `env-vars' to reproduce
+# the environment used for building.
+dumpVars() {
+    if [ "$noDumpEnvVars" != 1 ]; then
+        export > "$NIX_BUILD_TOP/env-vars"
+    fi
+}
+
+
+# Utility function: return the base name of the given path, with the
+# prefix `HASH-' removed, if present.
+stripHash() {
+    strippedName=$(basename $1);
+    if echo "$strippedName" | grep -q '^[a-z0-9]\{32\}-'; then
+        strippedName=$(echo "$strippedName" | cut -c34-)
+    fi
+}
+
+
+unpackFile() {
+    curSrc="$1"
+    local cmd
+
+    header "unpacking source archive $curSrc" 3
+
+    case "$curSrc" in
+        *.tar.xz | *.tar.lzma)
+            # Don't rely on tar knowing about .xz.
+            xz -d < $curSrc | tar xf -
+            ;;
+        *.tar | *.tar.* | *.tgz | *.tbz2)
+            # GNU tar can automatically select the decompression method
+            # (info "(tar) gzip").
+            tar xf $curSrc
+            ;;
+        *.zip)
+            unzip -qq $curSrc
+            ;;
+        *)
+            if [ -d "$curSrc" ]; then
+                stripHash $curSrc
+                cp -prd --no-preserve=timestamps $curSrc $strippedName
+            else
+                if [ -z "$unpackCmd" ]; then
+                    echo "source archive $curSrc has unknown type"
+                    exit 1
+                fi
+                runHook unpackCmd
+            fi
+            ;;
+    esac
+
+    stopNest
+}
+
+
+unpackPhase() {
+    runHook preUnpack
+
+    if [ -z "$srcs" ]; then
+        if [ -z "$src" ]; then
+            echo 'variable $src or $srcs should point to the source'
+            exit 1
+        fi
+        srcs="$src"
+    fi
+
+    # To determine the source directory created by unpacking the
+    # source archives, we record the contents of the current
+    # directory, then look below which directory got added.  Yeah,
+    # it's rather hacky.
+    local dirsBefore=""
+    for i in *; do
+        if [ -d "$i" ]; then
+            dirsBefore="$dirsBefore $i "
+        fi
+    done
+
+    # Unpack all source archives.
+    for i in $srcs; do
+        unpackFile $i
+    done
+
+    # Find the source directory.
+    if [ -n "$setSourceRoot" ]; then
+        runHook setSourceRoot
+    elif [ -z "$sourceRoot" ]; then
+        sourceRoot=
+        for i in *; do
+            if [ -d "$i" ]; then
+                case $dirsBefore in
+                    *\ $i\ *)
+                        ;;
+                    *)
+                        if [ -n "$sourceRoot" ]; then
+                            echo "unpacker produced multiple directories"
+                            exit 1
+                        fi
+                        sourceRoot="$i"
+                        ;;
+                esac
+            fi
+        done
+    fi
+
+    if [ -z "$sourceRoot" ]; then
+        echo "unpacker appears to have produced no directories"
+        exit 1
+    fi
+
+    echo "source root is $sourceRoot"
+
+    # By default, add write permission to the sources.  This is often
+    # necessary when sources have been copied from other store
+    # locations.
+    if [ "$dontMakeSourcesWritable" != 1 ]; then
+        chmod -R u+w "$sourceRoot"
+    fi
+
+    runHook postUnpack
+}
+
+
+patchPhase() {
+    runHook prePatch
+
+    for i in $patches; do
+        header "applying patch $i" 3
+        local uncompress=cat
+        case $i in
+            *.gz)
+                uncompress="gzip -d"
+                ;;
+            *.bz2)
+                uncompress="bzip2 -d"
+                ;;
+            *.lzma)
+                uncompress="lzma -d"
+                ;;
+        esac
+        $uncompress < $i | patch ${patchFlags:--p1}
+        stopNest
+    done
+
+    runHook postPatch
+}
+
+
+fixLibtool() {
+    sed -i -e 's^eval sys_lib_.*search_path=.*^^' "$1"
+}
+
+
+configurePhase() {
+    runHook preConfigure
+
+    if [ -z "$configureScript" ]; then
+        configureScript=./configure
+        if ! [ -x $configureScript ]; then
+            echo "no configure script, doing nothing"
+            return
+        fi
+    fi
+
+    if [ -z "$dontFixLibtool" ]; then
+        for i in $(find . -name "ltmain.sh"); do
+            echo "fixing libtool script $i"
+            fixLibtool $i
+        done
+    fi
+
+    if [ -z "$dontAddPrefix" ]; then
+        configureFlags="${prefixKey:---prefix=}$prefix $configureFlags"
+    fi
+
+    # Add --disable-dependency-tracking to speed up some builds.
+    if [ -z "$dontAddDisableDepTrack" ]; then
+        if grep -q dependency-tracking $configureScript; then
+            configureFlags="--disable-dependency-tracking $configureFlags"
+        fi
+    fi
+
+    # By default, disable static builds.
+    if [ -z "$dontDisableStatic" ]; then
+        if grep -q enable-static $configureScript; then
+            configureFlags="--disable-static $configureFlags"
+        fi
+    fi
+
+    echo "configure flags: $configureFlags ${configureFlagsArray[@]}"
+    $configureScript $configureFlags "${configureFlagsArray[@]}"
+
+    runHook postConfigure
+}
+
+
+buildPhase() {
+    runHook preBuild
+
+    if [ -z "$makeFlags" ] && ! [ -n "$makefile" -o -e "Makefile" -o -e "makefile" -o -e "GNUmakefile" ]; then
+        echo "no Makefile, doing nothing"
+        return
+    fi
+
+    echo "make flags: $makeFlags ${makeFlagsArray[@]} $buildFlags ${buildFlagsArray[@]}"
+    make ${makefile:+-f $makefile} \
+        ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \
+        $makeFlags "${makeFlagsArray[@]}" \
+        $buildFlags "${buildFlagsArray[@]}"
+
+    runHook postBuild
+}
+
+
+checkPhase() {
+    runHook preCheck
+
+    echo "check flags: $makeFlags ${makeFlagsArray[@]} $checkFlags ${checkFlagsArray[@]}"
+    make ${makefile:+-f $makefile} \
+        ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \
+        $makeFlags "${makeFlagsArray[@]}" \
+        ${checkFlags:-VERBOSE=y} "${checkFlagsArray[@]}" ${checkTarget:-check}
+
+    runHook postCheck
+}
+
+
+patchELF() {
+    # Patch all ELF executables and shared libraries.
+    header "patching ELF executables and libraries"
+    if [ -e "$prefix" ]; then
+        find "$prefix" \( \
+            \( -type f -a -name "*.so*" \) -o \
+            \( -type f -a -perm +0100 \) \
+            \) -print -exec patchelf --shrink-rpath {} \;
+    fi
+    stopNest
+}
+
+
+patchShebangs() {
+    # Rewrite all script interpreter file names (`#! /path') under the
+    # specified  directory tree to paths found in $PATH.  E.g.,
+    # /bin/sh will be rewritten to /nix/store/<hash>-some-bash/bin/sh.
+    # Interpreters that are already in the store are left untouched.
+    header "patching script interpreter paths"
+    local dir="$1"
+    local f
+    for f in $(find "$dir" -type f -perm +0100); do
+        local oldPath=$(sed -ne '1 s,^#![ ]*\([^ ]*\).*$,\1,p' "$f")
+        if [ -n "$oldPath" -a "${oldPath:0:${#NIX_STORE}}" != "$NIX_STORE" ]; then
+            local newPath=$(type -P $(basename $oldPath) || true)
+            if [ -n "$newPath" -a "$newPath" != "$oldPath" ]; then
+                echo "$f: interpreter changed from $oldPath to $newPath"
+                sed -i -e "1 s,$oldPath,$newPath," "$f"
+            fi
+        fi
+    done
+    stopNest
+}
+
+
+installPhase() {
+    runHook preInstall
+
+    mkdir -p "$prefix"
+
+    installTargets=${installTargets:-install}
+    echo "install flags: $installTargets $makeFlags ${makeFlagsArray[@]} $installFlags ${installFlagsArray[@]}"
+    make ${makefile:+-f $makefile} $installTargets \
+        $makeFlags "${makeFlagsArray[@]}" \
+        $installFlags "${installFlagsArray[@]}"
+
+    runHook postInstall
+}
+
+
+# The fixup phase performs generic, package-independent, Nix-related
+# stuff, like running patchelf and setting the
+# propagated-build-inputs.  It should rarely be overriden.
+fixupPhase() {
+    runHook preFixup
+
+    # Put man/doc/info under $out/share.
+    forceShare=${forceShare:=man doc info}
+    if [ -n "$forceShare" ]; then
+        for d in $forceShare; do
+            if [ -d "$prefix/$d" ]; then
+                if [ -d "$prefix/share/$d" ]; then
+                    echo "both $d/ and share/$d/ exists!"
+                else
+                    echo "fixing location of $d/ subdirectory"
+                    mkdir -p $prefix/share
+                    if [ -w $prefix/share ]; then
+                        mv -v $prefix/$d $prefix/share
+                        ln -sv share/$d $prefix
+                    fi
+                fi
+            fi
+        done;
+    fi
+
+    if [ -z "$dontGzipMan" ]; then
+        GLOBIGNORE=.:..:*.gz:*.bz2
+        for f in $out/share/man/*/* $out/share/man/*/*/*; do
+            if [ -f $f ]; then
+                if gzip -c -n $f > $f.gz; then
+                    rm $f
+                else
+                    rm $f.gz
+                fi
+            fi
+        done
+        unset GLOBIGNORE
+    fi
+
+    # TODO: strip _only_ ELF executables, and return || fail here...
+    if [ -z "$dontStrip" ]; then
+        stripDebugList=${stripDebugList:-lib lib32 lib64 libexec bin sbin}
+        if [ -n "$stripDebugList" ]; then
+            stripDirs "$stripDebugList" "${stripDebugFlags:--S}"
+        fi
+
+        stripAllList=${stripAllList:-}
+        if [ -n "$stripAllList" ]; then
+            stripDirs "$stripAllList" "${stripAllFlags:--s}"
+        fi
+    fi
+
+    if [ "$havePatchELF" = 1 -a -z "$dontPatchELF" ]; then
+        patchELF "$prefix"
+    fi
+
+    if [ -z "$dontPatchShebangs" ]; then
+        patchShebangs "$prefix"
+    fi
+
+    if [ -n "$propagatedBuildInputs" ]; then
+        mkdir -p "$out/nix-support"
+        echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs"
+    fi
+
+    if [ -n "$propagatedNativeBuildInputs" ]; then
+        mkdir -p "$out/nix-support"
+        echo "$propagatedNativeBuildInputs" > "$out/nix-support/propagated-native-build-inputs"
+    fi
+
+    if [ -n "$propagatedUserEnvPkgs" ]; then
+        mkdir -p "$out/nix-support"
+        echo "$propagatedUserEnvPkgs" > "$out/nix-support/propagated-user-env-packages"
+    fi
+
+    if [ -n "$setupHook" ]; then
+        mkdir -p "$out/nix-support"
+        substituteAll "$setupHook" "$out/nix-support/setup-hook"
+    fi
+
+    runHook postFixup
+}
+
+
+installCheckPhase() {
+    runHook preInstallCheck
+
+    echo "installcheck flags: $makeFlags ${makeFlagsArray[@]} $installCheckFlags ${installCheckFlagsArray[@]}"
+    make ${makefile:+-f $makefile} \
+        ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \
+        $makeFlags "${makeFlagsArray[@]}" \
+        $installCheckFlags "${installCheckFlagsArray[@]}" ${installCheckTarget:-installcheck}
+
+    runHook postInstallCheck
+}
+
+
+distPhase() {
+    runHook preDist
+
+    echo "dist flags: $distFlags ${distFlagsArray[@]}"
+    make ${makefile:+-f $makefile} $distFlags "${distFlagsArray[@]}" ${distTarget:-dist}
+
+    if [ "$dontCopyDist" != 1 ]; then
+        mkdir -p "$out/tarballs"
+
+        # Note: don't quote $tarballs, since we explicitly permit
+        # wildcards in there.
+        cp -pvd ${tarballs:-*.tar.gz} $out/tarballs
+    fi
+
+    runHook postDist
+}
+
+
+showPhaseHeader() {
+    local phase="$1"
+    case $phase in
+        unpackPhase) header "unpacking sources";;
+        patchPhase) header "patching sources";;
+        configurePhase) header "configuring";;
+        buildPhase) header "building";;
+        checkPhase) header "running tests";;
+        installPhase) header "installing";;
+        fixupPhase) header "post-installation fixup";;
+        installCheckPhase) header "running install tests";;
+        *) header "$phase";;
+    esac
+}
+
+
+genericBuild() {
+    header "building $out"
+
+    if [ -n "$buildCommand" ]; then
+        eval "$buildCommand"
+        return
+    fi
+
+    if [ -z "$phases" ]; then
+        phases="$prePhases unpackPhase patchPhase $preConfigurePhases \
+            configurePhase $preBuildPhases buildPhase checkPhase \
+            $preInstallPhases installPhase fixupPhase installCheckPhase \
+            $preDistPhases distPhase $postPhases";
+    fi
+
+    for curPhase in $phases; do
+        if [ "$curPhase" = buildPhase -a -n "$dontBuild" ]; then continue; fi
+        if [ "$curPhase" = checkPhase -a -z "$doCheck" ]; then continue; fi
+        if [ "$curPhase" = installPhase -a -n "$dontInstall" ]; then continue; fi
+        if [ "$curPhase" = fixupPhase -a -n "$dontFixup" ]; then continue; fi
+        if [ "$curPhase" = installCheckPhase -a -z "$doInstallCheck" ]; then continue; fi
+        if [ "$curPhase" = distPhase -a -z "$doDist" ]; then continue; fi
+
+        if [ -n "$tracePhases" ]; then
+            echo
+            echo "@ phase-started $out $curPhase"
+        fi
+
+        showPhaseHeader "$curPhase"
+        dumpVars
+
+        # Evaluate the variable named $curPhase if it exists, otherwise the
+        # function named $curPhase.
+        eval "${!curPhase:-$curPhase}"
+
+        if [ "$curPhase" = unpackPhase ]; then
+            cd "${sourceRoot:-.}"
+        fi
+
+        if [ -n "$tracePhases" ]; then
+            echo
+            echo "@ phase-succeeded $out $curPhase"
+        fi
+
+        stopNest
+    done
+
+    stopNest
+}
+
+
+# Execute the post-hook.
+runHook postHook
+
+
+# Execute the global user hook (defined through the Nixpkgs
+# configuration option ‘stdenv.userHook’).  This can be used to set
+# global compiler optimisation flags, for instance.
+runHook userHook
+
+
+dumpVars
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 288cee3de99..404a36bb2b9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2813,6 +2813,8 @@ let
     ocaml = ocaml_3_08_0;
   };
 
+  repeatableStdenv  = lowPrio (stdenvAdapters.overrideSetup stdenv ../stdenv/generic/setup-repeatable.sh );
+
   roadsend = callPackage ../development/compilers/roadsend { };
 
   # TODO: the corresponding nix file is missing

From dbe9bf7e59a47d4a64d790841b4741e5076dafab Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Fri, 21 Jun 2013 19:59:20 +0200
Subject: [PATCH 026/314] networkmanagerapplet: 0.9.8.0 -> 0.9.8.2

Upgraded because some icons weren't displaying. Also adds new
dependency libsecret.
---
 .../libraries/libsecret/default.nix           | 22 +++++++++++++++++++
 .../network-manager-applet/default.nix        | 10 ++++-----
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/libraries/libsecret/default.nix

diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix
new file mode 100644
index 00000000000..70c20caa88a
--- /dev/null
+++ b/pkgs/development/libraries/libsecret/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, glib, dbus_libs, unzip, automake, libtool, autoconf, m4, docbook_xsl,
+  intltool, gtk_doc, gobjectIntrospection, pkgconfig, libxslt, libgcrypt }:
+
+stdenv.mkDerivation rec {
+  version = "0.15";
+  name = "libsecret-${version}";
+
+  src = fetchurl {
+    url = "https://git.gnome.org/browse/libsecret/snapshot/libsecret-${version}.zip";
+    sha256 = "088v1z7zbdi8b0779jads7q20x1gx6c4zmrj3q0vysc7a0k16i6k";
+  };
+
+  propagatedBuildInputs = [ glib dbus_libs ];
+  nativeBuildInputs = [ unzip ];
+  buildInputs = [ gtk_doc automake libtool autoconf intltool gobjectIntrospection pkgconfig libxslt libgcrypt m4 docbook_xsl ];
+
+  configureScript = "./autogen.sh";
+
+  meta = {
+    inherit (glib.meta) platforms maintainers;
+  };
+}
diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index 7daf1207567..7e86b576967 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, networkmanager, GConf
-, libnotify, libgnome_keyring, dbus_glib, polkit, isocodes
+, libnotify, libsecret, dbus_glib, polkit, isocodes, libgnome_keyring
 , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas
 , makeWrapper, networkmanager_openvpn, udev }:
 
 let
   pn = "network-manager-applet";
   major = "0.9";
-  version = "${major}.8.0";
+  version = "${major}.8.2";
 in
 
 stdenv.mkDerivation rec {
@@ -14,12 +14,12 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pn}/${major}/${name}.tar.xz";
-    sha256 = "141m0n4fhsv1k82jm4531f12mq29d3213lph5c9rbfkhd1rnxyqs";
+    sha256 = "1ixd19b7ap29lz9lq4mmlq9lqsmnisix1a33hrxrl68wjx1wfh55";
   };
 
   buildInputs = [
-    gtk libglade networkmanager GConf libnotify libgnome_keyring dbus_glib
-    polkit isocodes makeWrapper udev
+    gtk libglade networkmanager GConf libnotify libsecret dbus_glib
+    polkit isocodes makeWrapper udev libgnome_keyring
   ];
 
   nativeBuildInputs = [ intltool pkgconfig ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 404a36bb2b9..1db460827c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4420,6 +4420,8 @@ let
   libgnome_keyring = callPackage ../development/libraries/libgnome-keyring { };
   libgnome_keyring3 = gnome3.libgnome_keyring;
 
+  libsecret = callPackage ../development/libraries/libsecret { };
+
   libgtop = callPackage ../development/libraries/libgtop {};
 
   liblo = callPackage ../development/libraries/liblo { };

From a3bf1ca3b19d326ba6d7733541ec175061a44729 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 21 Jun 2013 17:21:03 -0400
Subject: [PATCH 027/314] Linux 3.9.7

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/os-specific/linux/kernel/linux-3.9.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.9.nix b/pkgs/os-specific/linux/kernel/linux-3.9.nix
index ed7451dfe5d..4a2a0c1d163 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.9.nix
@@ -253,7 +253,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.9.6";
+    version = "3.9.7";
     testing = false;
 
     preConfigure = ''
@@ -262,7 +262,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
-      sha256 = "0spba7qkf56j233r84y23xl7d44ndvw5ja7h3pfhsq861dypcc0i";
+      sha256 = "1xgk13bj33wayrs2jfgb2vf4xfys3vm28ijaavpjgs2wlsav94lx";
     };
 
     config = configWithPlatform stdenv.platform;

From 09e6ae577bcd7eb8d8e142fc473798f938cbae1c Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 22 Jun 2013 08:52:27 +0300
Subject: [PATCH 028/314] Python: add DETERMINISTIC_BUILD env var. If set,
 python doesn't write timestamps to pyc files. Tested by building argparse,
 compiling from cli, compiling using py_compile.

---
 .../interpreters/python/2.7/default.nix       |  4 +++
 .../python/2.7/deterministic-build.patch      | 36 +++++++++++++++++++
 .../python-modules/generic/default.nix        |  1 +
 3 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/interpreters/python/2.7/deterministic-build.patch

diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index 4110f2502dc..ccb423ef32e 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -25,6 +25,10 @@ let
       # doesn't work in Nix because Nix changes the mtime of files in
       # the Nix store to 1.  So treat that as a special case.
       ./nix-store-mtime.patch
+
+      # patch python to put zero timestamp into pyc
+      # if DETERMINISTIC_BUILD env var is set
+      ./deterministic-build.patch
     ];
 
   postPatch = stdenv.lib.optionalString (stdenv.gcc.libc != null) ''
diff --git a/pkgs/development/interpreters/python/2.7/deterministic-build.patch b/pkgs/development/interpreters/python/2.7/deterministic-build.patch
new file mode 100644
index 00000000000..98d9d339fa1
--- /dev/null
+++ b/pkgs/development/interpreters/python/2.7/deterministic-build.patch
@@ -0,0 +1,36 @@
+diff -ur orig/Lib/py_compile.py new/Lib/py_compile.py
+--- orig/Lib/py_compile.py
++++ new/Lib/py_compile.py
+@@ -122,7 +122,10 @@
+         cfile = file + (__debug__ and 'c' or 'o')
+     with open(cfile, 'wb') as fc:
+         fc.write('\0\0\0\0')
+-        wr_long(fc, timestamp)
++        if "DETERMINISTIC_BUILD" in os.environ:
++            fc.write('\0\0\0\0')
++        else:
++            wr_long(fc, timestamp)
+         marshal.dump(codeobject, fc)
+         fc.flush()
+         fc.seek(0, 0)
+diff -ur orig/Python/import.c new/Python/import.c
+--- orig/Python/import.c
++++ new/Python/import.c
+@@ -939,10 +939,12 @@
+         return;
+     }
+     /* Now write the true mtime (as a 32-bit field) */
+-    fseek(fp, 4L, 0);
+-    assert(mtime <= 0xFFFFFFFF);
+-    PyMarshal_WriteLongToFile((long)mtime, fp, Py_MARSHAL_VERSION);
+-    fflush(fp);
++    if (Py_GETENV("DETERMINISTIC_BUILD") == NULL) {
++        fseek(fp, 4L, 0);
++        assert(mtime <= 0xFFFFFFFF);
++        PyMarshal_WriteLongToFile((long)mtime, fp, Py_MARSHAL_VERSION);
++        fflush(fp);
++    }
+     fclose(fp);
+     if (Py_VerboseFlag)
+         PySys_WriteStderr("# wrote %s\n", cpathname);
+
diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index f72fbff1806..d32c6818bb2 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -68,6 +68,7 @@ python.stdenv.mkDerivation (attrs // {
   pythonPath = [ setuptools ] ++ pythonPath;
 
   preConfigure = ''
+    export DETERMINISTIC_BUILD=1
     PYTHONPATH="${offlineDistutils}/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
     ${preConfigure}
   '';

From 7b924a9ac46c0f6e30b06cb6fb76353af96c04e9 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sat, 22 Jun 2013 14:10:10 +0200
Subject: [PATCH 029/314] Add supervisor, a system for controlling process
 state under UNIX

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6c27ef4bf01..431e9c6a28e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2401,6 +2401,24 @@ pythonPackages = python.modules // rec {
   });
 
 
+  meld3 = buildPythonPackage rec {
+    name = "meld3-0.6.10";
+
+    src = fetchurl {
+      url = https://pypi.python.org/packages/source/m/meld3/meld3-0.6.10.tar.gz;
+      md5 = "42e58624e9d427be7659d7a28e2b0b6f";
+    };
+
+    doCheck = false;
+
+    meta = {
+      description = "An HTML/XML templating engine used by supervisor";
+      homepage = https://github.com/supervisor/meld3;
+      license = "ZPL";
+    };
+  };
+
+
   memcached = buildPythonPackage rec {
     name = "memcached-1.48";
 
@@ -4430,6 +4448,25 @@ pythonPackages = python.modules // rec {
     };
   };
 
+
+  supervisor = buildPythonPackage rec {
+    name = "supervisor-3.0b2";
+
+    src = fetchurl {
+      url = https://pypi.python.org/packages/source/s/supervisor/supervisor-3.0b2.tar.gz;
+      md5 = "e2557853239ee69955f993091b0eddc4";
+    };
+
+    buildInputs = [ mock ];
+    propagatedBuildInputs = [ meld3  ];
+
+    meta = {
+      description = "A system for controlling process state under UNIX";
+      homepage = http://supervisord.org/;
+    };
+  };
+
+
   sphinx = buildPythonPackage (rec {
     name = "Sphinx-1.1.3";
 

From 2f4d1a5656054fe6c3529e440319701690a37178 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sat, 22 Jun 2013 14:11:47 +0200
Subject: [PATCH 030/314] memtest86: udpate to 4.1.0, fix download url

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

diff --git a/pkgs/tools/misc/memtest86/default.nix b/pkgs/tools/misc/memtest86/default.nix
index 35395fc116f..978bb2729f8 100644
--- a/pkgs/tools/misc/memtest86/default.nix
+++ b/pkgs/tools/misc/memtest86/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "memtest86-4.0a";
+  name = "memtest86-4.1.0";
   
   src = fetchurl {
-    url = http://memtest86.com/memtest86-4.0a.tar.gz;
-    sha256 = "0d2n3nzyvna9k880zk6vl1z3b7wal1hrwcqay9vda8br7yp7634y";
+    url = http://www.memtest86.com/downloads/memtest86-4.1.0-src.tar.gz;
+    sha256 = "1kdvq16s8hvk7plprws33mfh7cnhmfl1m32sfgbmzygbhk5wqxxq";
   };
 
   preBuild = ''

From 819dbd2539db30b0821b73a54e5a550630836c0d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 22 Jun 2013 14:59:59 +0200
Subject: [PATCH 031/314] haskell-hledger-irr: add version 0.1.1.2

---
 pkgs/applications/office/hledger-irr/default.nix | 16 ++++++++++++++++
 pkgs/top-level/haskell-packages.nix              |  1 +
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/applications/office/hledger-irr/default.nix

diff --git a/pkgs/applications/office/hledger-irr/default.nix b/pkgs/applications/office/hledger-irr/default.nix
new file mode 100644
index 00000000000..1f4dd165c50
--- /dev/null
+++ b/pkgs/applications/office/hledger-irr/default.nix
@@ -0,0 +1,16 @@
+{ cabal, Cabal, hledgerLib, statistics, time }:
+
+cabal.mkDerivation (self: {
+  pname = "hledger-irr";
+  version = "0.1.1.2";
+  sha256 = "1mh1lzhnxc8ps8n5j37wrmbqafwdyap60j8rqr6xdfa2syfyq8i2";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [ Cabal hledgerLib statistics time ];
+  meta = {
+    description = "computes the internal rate of return of an investment";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 5c443f22d1c..411f735dbe8 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1164,6 +1164,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   hledger = callPackage ../development/libraries/haskell/hledger {};
   hledgerLib = callPackage ../development/libraries/haskell/hledger-lib {};
   hledgerInterest = callPackage ../applications/office/hledger-interest {};
+  hledgerIrr = callPackage ../applications/office/hledger-irr {};
   hledgerWeb = callPackage ../development/libraries/haskell/hledger-web {};
 
   HList = callPackage ../development/libraries/haskell/HList {};

From 01bc9204e004a517a93d07e6f5790e0d5a094fcd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 22 Jun 2013 15:41:11 +0200
Subject: [PATCH 032/314] git-annex: fix installation of git-annex-shell

---
 .../version-management/git-and-tools/git-annex/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 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 5086f4f31b3..9991a506485 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
@@ -7,8 +7,8 @@
 , monadControl, mtl, network, networkInfo, networkMulticast
 , networkProtocolXmpp, openssh, QuickCheck, random, regexTdfa
 , rsync, SafeSemaphore, SHA, stm, text, time, transformers
-, unixCompat, utf8String, uuid, wai, waiLogger, warp, xmlConduit
-, xmlTypes, yesod, yesodDefault, yesodForm, yesodStatic
+, unixCompat, utf8String, uuid, wai, waiLogger, warp, which
+, xmlConduit, xmlTypes, yesod, yesodDefault, yesodForm, yesodStatic
 }:
 
 cabal.mkDerivation (self: {
@@ -28,7 +28,7 @@ cabal.mkDerivation (self: {
     uuid wai waiLogger warp xmlConduit xmlTypes yesod yesodDefault
     yesodForm yesodStatic
   ];
-  buildTools = [ bup curl git gnupg1 lsof openssh rsync ];
+  buildTools = [ bup curl git gnupg1 lsof openssh rsync which ];
   configureFlags = "-fS3
                     -fWebDAV
                     -fInotify
@@ -41,6 +41,7 @@ cabal.mkDerivation (self: {
                     -fProduction
                     -fTDFA";
   preConfigure = "patchShebangs .";
+  installPhase = "make PREFIX=$out CABAL=./Setup docs install";
   checkPhase = ''
     export HOME="$NIX_BUILD_TOP/tmp"
     mkdir "$HOME"

From ad06d4df18a9f0c081e79139803bd45fbcc82486 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Thu, 20 Jun 2013 22:48:35 +0200
Subject: [PATCH 033/314] update pulseaudio to 4.0 and sbc to 1.1

---
 pkgs/development/libraries/sbc/default.nix |  4 ++--
 pkgs/servers/pulseaudio/default.nix        | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/sbc/default.nix b/pkgs/development/libraries/sbc/default.nix
index d621eed6728..12662b9dea9 100644
--- a/pkgs/development/libraries/sbc/default.nix
+++ b/pkgs/development/libraries/sbc/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libsndfile, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "sbc-1.0";
+  name = "sbc-1.1";
 
   src = fetchurl {
     url = "http://www.kernel.org/pub/linux/bluetooth/${name}.tar.xz";
-    sha256 = "10mq2rmh3h90bwq5cdcmizf93zf8f2br8gds0jxr9i962ai0m5xz";
+    sha256 = "1ipvkhilyhdbd2nzq0la6l7q361l0zm0c6kvga2a0y89q8nssc4s";
   };
 
   buildInputs = [ pkgconfig libsndfile ];
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index e315f788904..04318a792e8 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, avahi
 , gconf, gtk, intltool, gettext
-, alsaLib, libsamplerate, libsndfile, speex, bluez, udev
+, alsaLib, libsamplerate, libsndfile, speex, bluez, sbc, udev, libcap
 , jackaudioSupport ? false, jackaudio ? null
 , x11Support ? false, xlibs
 , json_c
@@ -10,11 +10,11 @@
 assert jackaudioSupport -> jackaudio != null;
 
 stdenv.mkDerivation rec {
-  name = "pulseaudio-2.1";
+  name = "pulseaudio-4.0";
 
   src = fetchurl {
-    url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-2.1.tar.xz";
-    sha256 = "0zyal2mix7lzhxmr3pxlmss5kjca061iapvrh20bkgvsyixk8szg";
+    url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-4.0.tar.xz";
+    sha256 = "1bndz4l8jxyq3zq128gzp3gryxl6yjs66j2y1d7yabw2n5mv7kim";
   };
 
   # Since `libpulse*.la' contain `-lgdbm', it must be propagated.
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ pkgconfig gnum4 libtool intltool glib dbus avahi
-      libsamplerate libsndfile speex alsaLib bluez udev
-      json_c
+      libsamplerate libsndfile speex alsaLib bluez sbc udev
+      json_c libcap
       #gtk gconf 
     ]
     ++ stdenv.lib.optional jackaudioSupport jackaudio

From 860161dcb70a74d7dfecf1c3ddcfe415a6128be2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 22 Jun 2013 18:59:37 +0000
Subject: [PATCH 034/314] remake: bump from version 3.81+dbg-0.2 to
 3.82+dbg-0.6

This version needs readline. And the license is GPLv3. Also, add
meta.platforms and meta.maintainers attributes.
---
 .../tools/build-managers/remake/default.nix    | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/build-managers/remake/default.nix b/pkgs/development/tools/build-managers/remake/default.nix
index af2465c208c..676354a6e8d 100644
--- a/pkgs/development/tools/build-managers/remake/default.nix
+++ b/pkgs/development/tools/build-managers/remake/default.nix
@@ -1,15 +1,21 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl, readline }:
+
+stdenv.mkDerivation rec {
+  name = "remake-${version}";
+  version = "3.82+dbg-0.6";
 
-stdenv.mkDerivation {
-  name = "remake-3.81-dbg-0.2";
   src = fetchurl {
-    url = mirror://sourceforge/bashdb/remake-3.81+dbg-0.2.tar.gz;
-    sha256 = "0mhc06zgd39dl8rk16ii0m2x22b9zi67d48km7rn0fzzv519lmwc";
+    url = "mirror://sourceforge/project/bashdb/remake/${version}/${name}.tar.bz2";
+    sha256 = "0i2g6vi9zya78d9zpigfnmzg2qcl93myjfibh3kfmjk7b9lajfyz";
   };
 
+  buildInputs = [ readline ];
+
   meta = {
     homepage = http://bashdb.sourceforge.net/remake/;
-    license = "GPL";
+    license = stdenv.lib.licenses.gpl3;
     description = "GNU Make with comprehensible tracing and a debugger";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ bjornfor ];
   };
 }

From dbda1a29890d67558db712bc878d03a12703ff50 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sat, 22 Jun 2013 22:59:55 +0200
Subject: [PATCH 035/314] libcap needs to be a propagated build input for
 pulseaudio

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

diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index 04318a792e8..e78dc7b5dec 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -17,13 +17,13 @@ stdenv.mkDerivation rec {
     sha256 = "1bndz4l8jxyq3zq128gzp3gryxl6yjs66j2y1d7yabw2n5mv7kim";
   };
 
-  # Since `libpulse*.la' contain `-lgdbm', it must be propagated.
-  propagatedBuildInputs = [ gdbm ];
+  # Since `libpulse*.la' contain `-lgdbm' and `-lcap', it must be propagated.
+  propagatedBuildInputs = [ gdbm libcap ];
 
   buildInputs =
     [ pkgconfig gnum4 libtool intltool glib dbus avahi
       libsamplerate libsndfile speex alsaLib bluez sbc udev
-      json_c libcap
+      json_c
       #gtk gconf 
     ]
     ++ stdenv.lib.optional jackaudioSupport jackaudio

From 2c8acd9cec396ef67b21a2893411867d46a0de9d Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sun, 23 Jun 2013 00:11:42 +0200
Subject: [PATCH 036/314] oiio: 1.1.8 -> 1.1.12

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

diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix
index fa7d16ccf0a..f8160e4d688 100644
--- a/pkgs/applications/graphics/openimageio/default.nix
+++ b/pkgs/applications/graphics/openimageio/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "oiio-${version}";
-  version = "1.1.8";
+  version = "1.1.12";
 
   src = fetchurl {
     url = "https://github.com/OpenImageIO/oiio/archive/Release-${version}.zip";
-    sha256 = "08a6qhplzs8kianqb1gjgrndg81h3il5531jn9g6i4940b1xispg";
+    sha256 = "196iq15waa2yyryiwhf6ynlpqnpknm4cc4azakg01xs70yiphsfl";
   };
 
   buildInputs = [ 
@@ -31,4 +31,4 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.goibhniu ];
     platforms = platforms.linux;
   };
-}
\ No newline at end of file
+}

From c74b3e26f74cc28995f0e4ed4cce487f1c07d481 Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Sun, 23 Jun 2013 14:53:18 +0800
Subject: [PATCH 037/314] kmplayer: update to 0.11.3d

---
 pkgs/applications/video/kmplayer/builder.sh  |  9 ---------
 pkgs/applications/video/kmplayer/default.nix | 20 +++++++++++++-------
 2 files changed, 13 insertions(+), 16 deletions(-)
 delete mode 100644 pkgs/applications/video/kmplayer/builder.sh

diff --git a/pkgs/applications/video/kmplayer/builder.sh b/pkgs/applications/video/kmplayer/builder.sh
deleted file mode 100644
index 92c7515c9a9..00000000000
--- a/pkgs/applications/video/kmplayer/builder.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-source $stdenv/setup
-
-myPatchPhase()
-{
-    sed -i -e "s|files.length|files.size|" \
-           -e "s|chlds.length|chlds.size|" src/kmplayerapp.cpp
-}
-patchPhase=myPatchPhase
-genericBuild
diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix
index a762bed0e28..5f6c2259d1c 100644
--- a/pkgs/applications/video/kmplayer/default.nix
+++ b/pkgs/applications/video/kmplayer/default.nix
@@ -1,17 +1,23 @@
-{stdenv, fetchurl, lib, cmake, qt4, perl, gettext, pango, gtk, dbus_glib, kdelibs, automoc4, phonon}:
+{ stdenv, fetchurl, cmake, pkgconfig, gettext
+, kdelibs, gtk
+}:
 
 stdenv.mkDerivation {
-  name = "kmplayer-0.11.2c";
+  name = "kmplayer-0.11.3d";
+
   src = fetchurl {
-    url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.2c.tar.bz2;
-    sha256 = "1qhafq865bzpz6m9k7cjdv4884qfpn481ak77ly0nidpq2ab0l9m";
+    url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.3d.tar.bz2;
+    sha256 = "1yvbkb1hh5y7fqfvixjf2rryzm0fm0fpkx4lmvhi7k7d0v4wpgky";
   };
-  builder = ./builder.sh;
-  buildInputs = [ cmake qt4 perl gettext stdenv.gcc.libc pango gtk dbus_glib kdelibs automoc4 phonon ];
+
+  buildInputs = [
+    cmake gettext pkgconfig kdelibs gtk
+  ];
+
   meta = {
     description = "MPlayer front-end for KDE";
     license = "GPL";
     homepage = http://kmplayer.kde.org;
-    maintainers = [ lib.maintainers.sander ];
+    maintainers = [ stdenv.lib.maintainers.sander ];
   };
 }

From 48e1e1cae649231b533c03a4f8ebda59b2c6424f Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Sun, 23 Jun 2013 17:48:21 +0800
Subject: [PATCH 038/314] add smplayer 0.8.5

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

diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix
new file mode 100644
index 00000000000..21be1fdb74a
--- /dev/null
+++ b/pkgs/applications/video/smplayer/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, qt4 }:
+
+stdenv.mkDerivation rec {
+  name = "smplayer-0.8.5";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/smplayer/${name}.tar.bz2";
+    sha256 = "0vbfvaqg5c25vabq1mf9xg6kzgvxnpd0i172y1gjznnlpcw2fxrw";
+  };
+
+  buildInputs = [ qt4 ];
+
+  preConfigure = ''
+    makeFlags="PREFIX=$out"
+  '';
+
+  meta = {
+    description = "A complete front-end for MPlayer";
+    homepage = "http://smplayer.sourceforge.net/";
+    license = "GPLv3+";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1db460827c5..9944bff7c3a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7874,6 +7874,8 @@ let
 
   ruby_ncursesw_sup = callPackage ../development/libraries/ruby_ncursesw_sup { };
 
+  smplayer = callPackage ../applications/video/smplayer { };
+
   sup = callPackage ../applications/networking/mailreaders/sup {
     ruby = ruby19;
 

From 43c9ab900b884bd981e00d59845bb07d042794d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 23 Jun 2013 13:06:03 +0200
Subject: [PATCH 039/314] virtualbox-guestadditions: fix xorg incompatibility

A recent X update broke VirtualBox guest additions (vboxvideo driver version
mismatch, desktop won't start). This fixes it.

Here is the error log:

 (II) "glx" will be loaded by default.
 (II) LoadModule: "glx"
 (II) Loading /nix/store/kzvmnjlps51q4piqmwr7zbmxcg2z9vgk-xorg-server-1.13.4/lib/xorg/modules/extensions/libglx.so
 (II) Module glx: vendor="X.Org Foundation"
 	compiled for 1.13.4, module version = 1.0.0
 	ABI class: X.Org Server Extension, version 7.0
 (==) AIGLX enabled
 Loading extension GLX
 (II) LoadModule: "vboxvideo"
 (II) Loading /nix/store/4kbxi00h8xsmfgbws2qqh674lcfp03h6-VirtualBox-GuestAdditions-4.2.14-3.2.46/lib/xorg/modules/drivers/vboxvideo_drv.so
 (II) Module vboxvideo: vendor="Oracle Corporation"
 	compiled for 10.12.0, module version = 1.0.1
 	Module class: X.Org Video Driver
 	ABI class: X.Org Video Driver, version 12.0
 (EE) module ABI major version (12) doesn't match the server's version (13)
 (II) UnloadModule: "vboxvideo"
 (II) Unloading vboxvideo
 (EE) Failed to load module "vboxvideo" (module requirement mismatch, 0)
 (II) LoadModule: "vboxmouse"
 (WW) Warning, couldn't open module vboxmouse
 (II) UnloadModule: "vboxmouse"
 (II) Unloading vboxmouse
 (EE) Failed to load module "vboxmouse" (module does not exist, 0)
 (EE) No drivers available.

Fatal server error:
 no screens found
---
 .../virtualization/virtualbox/guest-additions/default.nix       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index f3d7c18a2c6..98fffe90ff6 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -104,7 +104,7 @@ stdenv.mkDerivation {
 
     # Install Xorg drivers
     mkdir -p $out/lib/xorg/modules/{drivers,input}
-    install -m 644 lib/VBoxGuestAdditions/vboxvideo_drv_112.so $out/lib/xorg/modules/drivers/vboxvideo_drv.so
+    install -m 644 lib/VBoxGuestAdditions/vboxvideo_drv_113.so $out/lib/xorg/modules/drivers/vboxvideo_drv.so
 
     # Install kernel modules
     cd src

From 45f7b9c319d9f5659278391ea660025953b0a07d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 23 Jun 2013 13:57:13 +0200
Subject: [PATCH 040/314] virtualbox: make guest additions use driver according
 to xserver version

---
 .../virtualbox/guest-additions/default.nix          | 13 ++++++++-----
 pkgs/servers/x11/xorg/overrides.nix                 |  1 +
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 98fffe90ff6..50449b8f094 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -1,8 +1,11 @@
 { stdenv, fetchurl, lib, patchelf, cdrkit, kernelDev, which, makeWrapper
-, libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor
-, dbus }:
+, xorg, dbus }:
 
-let version = "4.2.12"; in
+let
+  version = "4.2.12";
+  xserverVListFunc = builtins.elemAt (stdenv.lib.splitString "." xorg.xorgserver.version);
+  xserverABI = xserverVListFunc 0 + xserverVListFunc 1;
+in
 
 stdenv.mkDerivation {
   name = "VirtualBox-GuestAdditions-${version}-${kernelDev.version}";
@@ -22,7 +25,7 @@ stdenv.mkDerivation {
 
   '';
 
-  buildCommand = ''
+  buildCommand = with xorg; ''
     ${if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then ''
         isoinfo -J -i $src -x /VBoxLinuxAdditions.run > ./VBoxLinuxAdditions.run
         chmod 755 ./VBoxLinuxAdditions.run
@@ -104,7 +107,7 @@ stdenv.mkDerivation {
 
     # Install Xorg drivers
     mkdir -p $out/lib/xorg/modules/{drivers,input}
-    install -m 644 lib/VBoxGuestAdditions/vboxvideo_drv_113.so $out/lib/xorg/modules/drivers/vboxvideo_drv.so
+    install -m 644 lib/VBoxGuestAdditions/vboxvideo_drv_${xserverABI}.so $out/lib/xorg/modules/drivers/vboxvideo_drv.so
 
     # Install kernel modules
     cd src
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index ff815fb1cf5..22e0096ad65 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -209,6 +209,7 @@ in
         rm -fr $out/share/X11/xkb/compiled
         ln -s /var/tmp $out/share/X11/xkb/compiled
       '';
+    passthru.version = (builtins.parseDrvName attrs.name).version; # needed by virtualbox guest additions
   };
 
 

From 4cad420d5c7693737c39e0575ccc0e9e5ac05dc7 Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Sun, 23 Jun 2013 21:26:43 +0800
Subject: [PATCH 041/314] smplayer: add platform and set license to
 `stdenv.lib.licenses.gpl3Plus`

---
 pkgs/applications/video/smplayer/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix
index 21be1fdb74a..ab48d74c00d 100644
--- a/pkgs/applications/video/smplayer/default.nix
+++ b/pkgs/applications/video/smplayer/default.nix
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A complete front-end for MPlayer";
     homepage = "http://smplayer.sourceforge.net/";
-    license = "GPLv3+";
+    license = stdenv.lib.licenses.gpl3Plus;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From 6c86398ff3f56794b0ef08f7613cabe8ef5652fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 23 Jun 2013 14:35:33 +0200
Subject: [PATCH 042/314] virtualbox: minor update, lock versions with
 guest-additions

I saw no reason to use requireFile, it seems normally downloadable.
---
 .../virtualization/virtualbox/default.nix         | 15 +++++++--------
 .../virtualbox/guest-additions/default.nix        |  6 +++---
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 3dd020dfa10..6ca2c66a35a 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -11,8 +11,7 @@ with stdenv.lib;
 
 let
 
-  version = "4.2.12";
-  extpackRevision = "84980";
+  version = "4.2.14"; # changes ./guest-additions as well
 
   forEachModule = action: ''
     for mod in \
@@ -31,12 +30,10 @@ let
     done
   '';
 
-  extensionPack = requireFile {
-    name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}"
-         + ".vbox-extpack";
+  extensionPack = fetchurl {
+    url = "http://download.virtualbox.org/virtualbox/${version}/Oracle_VM_VirtualBox_Extension_Pack-${version}.vbox-extpack";
     # Has to be base16 because it's used as an input to VBoxExtPackHelperApp!
-    sha256 = "ad15a92e49095c2115bd1793b3b957d3eaf44af0f5d24bb53d6b4fc81c3e2fc4";
-    url = "https://www.virtualbox.org/wiki/Downloads";
+    sha256 = "5813cae72790de4893cadb839ffbd148290a44ec6913d901d84c9b3740ab1b1e";
   };
 
 in stdenv.mkDerivation {
@@ -44,7 +41,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
-    sha256 = "eb65ecac94f63d6292a967d39cb5e28326404c10d0e8c2c50399eedb59c17ee6";
+    sha256 = "038k65cdvr80da5nfan5r3rjrnxqab2fbf2pr2jq8g1gc4cxrxpq";
   };
 
   buildInputs =
@@ -137,6 +134,8 @@ in stdenv.mkDerivation {
     done
   '';
 
+  passthru = { inherit version; /* for guest additions */ };
+
   meta = {
     description = "PC emulator";
     homepage = http://www.virtualbox.org/;
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 50449b8f094..e7843b07fc3 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, lib, patchelf, cdrkit, kernelDev, which, makeWrapper
-, xorg, dbus }:
+, xorg, dbus, virtualbox }:
 
 let
-  version = "4.2.12";
+  version = virtualbox.version;
   xserverVListFunc = builtins.elemAt (stdenv.lib.splitString "." xorg.xorgserver.version);
   xserverABI = xserverVListFunc 0 + xserverVListFunc 1;
 in
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "aed4730b643aca8daa0829e1122b7c8d592b9f6cea902a98e390c4d22373dfb8";
+    sha256 = "9f08f13bbd818fb3ef9916658542ad0999c35e11afc1f6e8ff0b944405486e8a";
   };
 
   KERN_DIR = "${kernelDev}/lib/modules/*/build";

From e387731b823cfbc7616610b3ae80a53c5315987f Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 23 Jun 2013 09:38:44 +0200
Subject: [PATCH 043/314] youtube-dl: upgrade to 2013.06.21

---
 pkgs/tools/misc/youtube-dl/default.nix | 16 +++++++---------
 pkgs/top-level/all-packages.nix        |  2 +-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 54b3e6a4856..e4d934968b2 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,27 +1,25 @@
-{ stdenv, fetchurl, python, pandoc, zip }:
+{ stdenv, fetchurl, python, zip }:
 
 let
-  version = "2012.12.11";
+  version = "2013.06.21";
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "youtube-dl-${version}";
 
   src = fetchurl {
-    url = "https://github.com/downloads/rg3/youtube-dl/youtube-dl.${version}.tar.gz";
-    sha256 = "03zv3z8p0fi122nqj7ff8hkgqscir4s7psm03rq7dfpg1z35klmn";
+    url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
+    sha256 = "3d4e9cc38af3c2fccfafd83d0c6382080531fd03e9067ceccc6864dfbea92b1e";
   };
 
   buildInputs = [ python ];
-  nativeBuildInputs = [ zip ] ++
-      stdenv.lib.optional (stdenv.isi686 || stdenv.isx86_64) pandoc;
+  nativeBuildInputs = [ zip ];
 
   patchPhase = ''
     rm youtube-dl
-    substituteInPlace Makefile --replace "#!/usr/bin/env python" "#!${python}/bin/python"
   '';
 
   configurePhase = ''
-    makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc )
+    makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc PYTHON=${python}/bin/python )
   '';
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9944bff7c3a..c45192bde66 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1989,7 +1989,7 @@ let
 
   xvfb_run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; };
 
-  youtubeDL = callPackage ../tools/misc/youtube-dl { inherit (haskellPackages) pandoc; };
+  youtubeDL = callPackage ../tools/misc/youtube-dl { };
 
   zbar = callPackage ../tools/graphics/zbar {
     pygtk = lib.overrideDerivation pygtk (x: {

From c9130547485d978512d04fd121ae29187769540e Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 23 Jun 2013 17:00:06 +0200
Subject: [PATCH 044/314] linux-3.2: upgrade to 3.2.47

---
 pkgs/os-specific/linux/kernel/linux-3.2.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
index 9f16fc78b09..c07448b43b5 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix
@@ -240,7 +240,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.2.46";
+    version = "3.2.47";
 
     modDirVersion = version;
 
@@ -249,8 +249,8 @@ import ./generic.nix (
     '';
 
     src = fetchurl {
-      url = "mirror://kernel/linux/kernel/v3.0/linux-${version}.tar.xz";
-      sha256 = "1yxkkiay2a84113zjxyf680fz5l0ihvjq3fcik8hfibrb5x2rhgr";
+      url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
+      sha256 = "1554c7r32q87jxkkpggpgwg4rcc4zanahmrw30sg39krxbf2s7q1";
     };
 
     config = configWithPlatform stdenv.platform;

From 4e10617bc41d7b1f2b5f0f55b60b620dc161bcc5 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 21 Jun 2013 16:15:07 +0200
Subject: [PATCH 045/314] winswitch: Basic somewhat working version.

Wow, this is one of the most dangerous programs I've seen in a while. It not
only tries to probe for a package manager to install dependencies but also
tries to execute a whole bunch of programs in $PATH. That's why I decided to
override the postFixup phase for now in order to get rid of the current $PATH
and meanwhile getting the basics working.

So, I'm still not sure how to do the best implementation here on NixOS without
allowing winswitch to be too invasive and without restricting it too much so
that it's of no use.

But let's figure that out once we trimmed down the radiation level of this
"living" thing ;-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/tools/X11/winswitch/default.nix | 46 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  4 ++-
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/X11/winswitch/default.nix

diff --git a/pkgs/tools/X11/winswitch/default.nix b/pkgs/tools/X11/winswitch/default.nix
new file mode 100644
index 00000000000..b53db509daf
--- /dev/null
+++ b/pkgs/tools/X11/winswitch/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchurl, buildPythonPackage, pythonPackages
+, which, xpra, xmodmap }:
+
+let
+  base = buildPythonPackage rec {
+    name = "winswitch-${version}";
+    namePrefix = "";
+    version = "0.12.16";
+
+    src = fetchurl {
+      url = "http://winswitch.org/src/${name}.src.tar.bz2";
+      sha256 = "0ix122d7rgzdkk70f2q3sd7a4pvyaqsyxkw93pc4zkcg1xh9z3y8";
+    };
+
+    propagatedBuildInputs = with pythonPackages; [
+      pygtk twisted pycrypto pyasn1 which xpra xmodmap
+    ];
+
+    patchPhase = ''
+      sed -i -r -e 's|(PREFIX_DIR *= *).*|\1"'"$out"'"|'             \
+                -e 's|(PREFIX_SEARCH_ORDER *= *).*|\1["'"$out"'"]|'  \
+                -e 's|(ETC_SEARCH_ORDER *= *).*|\1["'"$out/etc"'"]|' \
+                -e 's|(BIN_SEARCH_ORDER *= *).*|\1["'"$out/bin"'"]|' \
+                winswitch/util/paths.py
+
+      sed -i -e '/elif *LINUX:/,/distro_helper/{
+        s/elif *LINUX:.*/else: name = "NixOS"/p
+        /distro_helper/!d
+      }' winswitch/util/distro_packaging_util.py
+    '';
+
+    buildPhase = ''
+      python setup.py build
+    '';
+
+    installCommand = ''
+      PREFIX="$out" python ./setup.py install --prefix="$out"
+    '';
+
+    doCheck = false;
+  };
+in stdenv.lib.overrideDerivation base (b: {
+  postFixup = b.postFixup + ''
+    sed -i -e 's/\''${PATH:+:}\$PATH//g' "$out/bin"/*
+  '';
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c45192bde66..c8acc2c39c7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8395,7 +8395,9 @@ let
       glSupport = true;
     };
   };
-    
+
+  winswitch = callPackage ../tools/X11/winswitch { };
+
   wings = callPackage ../applications/graphics/wings {
     erlang = erlangR14B04;
     esdl = esdl.override { erlang = erlangR14B04; };

From 5228e569e8686f271d124d137354204e7d67d5e8 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 24 Jun 2013 08:31:46 +0200
Subject: [PATCH 046/314] gpgme: Update to latest upstream version 1.4.1.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/libraries/gpgme/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 4ba4cbb3347..9b56344743d 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -11,16 +11,16 @@ let
     "${gnupg}/bin/gpg2";
 in
 stdenv.mkDerivation rec {
-  name = "gpgme-1.3.1";
+  name = "gpgme-1.4.1";
   
   src = fetchurl {
     url = "ftp://ftp.gnupg.org/gcrypt/gpgme/${name}.tar.bz2";
-    sha256 = "1m7l7nicn6gd952cgspv9xr8whqivbg33nbg8kbpj3dffnl2gvqm";
+    sha1 = "d6110763e7459214fd72705e87ebc682e3b5815e";
   };
   
   propagatedBuildInputs = [ libgpgerror glib libassuan pth ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig gnupg ];
 
   configureFlags = "--with-gpg=${gpgPath}";
 }

From 63c937ba069f6d75632a863867b542f6fadd67b7 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 24 Jun 2013 08:33:09 +0200
Subject: [PATCH 047/314] python-packages: Add new package pyparted v3.10.

This is one of our required dependencies for the soon-to-be-packaged blivet
library.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/python-packages.nix | 37 ++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 431e9c6a28e..376d5dc3d1a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3647,6 +3647,43 @@ pythonPackages = python.modules // rec {
     };
   };
 
+
+  pyparted = buildPythonPackage rec {
+    name = "pyparted-${version}";
+    version = "3.10";
+
+    src = fetchurl {
+      url = "https://fedorahosted.org/releases/p/y/pyparted/${name}.tar.gz";
+      sha256 = "17wq4invmv1nfazaksf59ymqyvgv3i8h4q03ry2az0s9lldyg3dv";
+    };
+
+    postPatch = ''
+      sed -i -e 's|/sbin/mke2fs|${pkgs.e2fsprogs}&|' tests/baseclass.py
+      sed -i -e '
+        s|e\.path\.startswith("/tmp/temp-device-")|"temp-device-" in e.path|
+      ' tests/test__ped_ped.py
+    '';
+
+    preConfigure = ''
+      PATH="${pkgs.parted}/sbin:$PATH"
+    '';
+
+    buildInputs = [ pkgs.pkgconfig ];
+
+    propagatedBuildInputs = [ pkgs.parted ];
+
+    checkPhase = ''
+      python -m unittest discover -v
+    '';
+
+    meta = {
+      homepage = "https://fedorahosted.org/pyparted/";
+      description = "Python interface for libparted";
+      license = pkgs.lib.licenses.gpl2Plus;
+    };
+  };
+
+
   pyptlib = buildPythonPackage (rec {
     name = "pyptlib-${version}";
     version = "0.0.3";

From c53918b6f1eaa4dc033db319b695c4e78e43c697 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 24 Jun 2013 08:35:03 +0200
Subject: [PATCH 048/314] python-packages: Add pykickstart version 1.99.32.

Needed for blivet and this is part of Anaconda (Fedora's installation system).
The reason I'm packaging this is because of blivet and because it's quite well
decoupled from Anaconda itself, so it can be used for other purposes.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/python-packages.nix | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 376d5dc3d1a..3df30c6dc48 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3630,6 +3630,30 @@ pythonPackages = python.modules // rec {
   };
 
 
+  pykickstart = buildPythonPackage rec {
+    name = "pykickstart-${version}";
+    version = "1.99.32-1";
+
+    src = fetchurl {
+      url = "https://git.fedorahosted.org/cgit/pykickstart.git/snapshot/"
+          + "r${version}.tar.bz2";
+      sha256 = "1sq68jvc39k9wrkcc4xlabhwi8gdz019yh2k5nrl7ya35b8daqw0";
+    };
+
+    propagatedBuildInputs = [ urlgrabber ];
+
+    checkPhase = ''
+      python tests/baseclass.py -vv
+    '';
+
+    meta = {
+      homepage = "http://fedoraproject.org/wiki/Pykickstart";
+      description = "Read and write Fedora kickstart files";
+      license = pkgs.lib.licenses.gpl2Plus;
+    };
+  };
+
+
   pyparsing = buildPythonPackage rec {
     name = "pyparsing-1.5.6";
 

From b574d0146fdd1077d637dbf9433c569dfb533622 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 24 Jun 2013 08:37:33 +0200
Subject: [PATCH 049/314] libselinux: Add option to enable Python support.

The reason this is optional is because we might want to use it for bootstrapping
in some constellations. And we really don't want whole lot of dependencies in
those situations.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/os-specific/linux/libselinux/default.nix | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix
index 873065d5424..01935e76632 100644
--- a/pkgs/os-specific/linux/libselinux/default.nix
+++ b/pkgs/os-specific/linux/libselinux/default.nix
@@ -1,4 +1,10 @@
-{ stdenv, fetchurl, pkgconfig, libsepol, pcre }:
+{ stdenv, fetchurl, pkgconfig, libsepol, pcre
+, enablePython ? false, swig ? null, python ? null
+}:
+
+assert enablePython -> swig != null && python != null;
+
+with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "libselinux-${version}";
@@ -17,7 +23,8 @@ stdenv.mkDerivation rec {
 
   patches = [ ./fPIC.patch ]; # libsemanage seems to need -fPIC everywhere
 
-  buildInputs = [ pkgconfig libsepol pcre ];
+  buildInputs = [ pkgconfig libsepol pcre ]
+             ++ optionals enablePython [ swig python ];
 
   prePatch = ''
     tar xvf ${patch_src}
@@ -26,7 +33,12 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  preInstall = '' makeFlags="$makeFlags PREFIX=$out DESTDIR=$out" '';
+  postPatch = optionalString enablePython ''
+    sed -i -e 's|\$(LIBDIR)/libsepol.a|${libsepol}/lib/libsepol.a|' src/Makefile
+  '';
+
+  installFlags = [ "PREFIX=$(out)" "DESTDIR=$(out)" "LIBSEPOLDIR=${libsepol}" ];
+  installTargets = [ "install" ] ++ optional enablePython "install-pywrap";
 
   meta = {
     inherit (libsepol.meta) homepage platforms maintainers;

From 8c469779417b7e2e811bbe0580d85e6bcabb2d20 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 24 Jun 2013 08:40:12 +0200
Subject: [PATCH 050/314] python-packages: Add pyudev in version 0.16.1.

Thought this would be needed for blivet, but it wasn't the case. They seem to
have their own mini-implementation. But it might be useful for other Nixers, who
knows?

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/python-packages.nix | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3df30c6dc48..395f20bc77d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3737,6 +3737,32 @@ pythonPackages = python.modules // rec {
     };
   });
 
+
+  pyudev = buildPythonPackage rec {
+    name = "pyudev-${version}";
+    version = "0.16.1";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/p/pyudev/${name}.tar.gz";
+      md5 = "4034de584b6d9efcbfc590a047c63285";
+    };
+
+    postPatch = ''
+      sed -i -e '/udev_library_name/,/^ *libudev/ {
+        s|CDLL([^,]*|CDLL("${pkgs.udev}/lib/libudev.so.1"|p; d
+      }' pyudev/_libudev.py
+    '';
+
+    propagatedBuildInputs = [ pkgs.udev ];
+
+    meta = {
+      homepage = "http://pyudev.readthedocs.org/";
+      description = "Pure Python libudev binding";
+      license = stdenv.lib.licenses.lgpl21Plus;
+    };
+  };
+
+
   pynzb = buildPythonPackage (rec {
     name = "pynzb-0.1.0";
 

From e7c4273cb908079cc7b32096361d47037fe480e3 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 24 Jun 2013 09:16:04 +0200
Subject: [PATCH 051/314] python-packages: Add pyblock in version 0.52.

This is needed for blivet in order to work with dmraid and lvm.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/python-packages.nix | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 395f20bc77d..08d62f87055 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3445,6 +3445,35 @@ pythonPackages = python.modules // rec {
   });
 
 
+  pyblock = stdenv.mkDerivation rec {
+    name = "python-pyblock-${version}";
+    version = "0.52-1";
+
+    src = fetchurl {
+      url = "https://git.fedorahosted.org/cgit/pyblock.git/snapshot/"
+          + "pyblock-${version}.tar.bz2";
+      sha256 = "1jj5hd1dcr8xx00rg3jynsf4ak88wwr5id3fmb0qf6zvim1whj7l";
+    };
+
+    postPatch = ''
+      sed -i -e 's|/usr/include/python|${python}/include/python|' \
+             -e 's/-Werror *//' -e 's|/usr/|'"$out"'/|' Makefile
+    '';
+
+    buildInputs = [ python pkgs.lvm2 pkgs.dmraid ];
+
+    makeFlags = [
+      "USESELINUX=0"
+      "SITELIB=$(out)/lib/${python.libPrefix}/site-packages"
+    ];
+
+    meta = {
+      description = "Interface for working with block devices";
+      license = stdenv.lib.licenses.gpl2Plus;
+    };
+  };
+
+
   pycryptopp = buildPythonPackage (rec {
     name = "pycryptopp-0.5.29";
 

From b785a7192e92428a3473328a01ad927ae4d59f52 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 24 Jun 2013 09:23:44 +0200
Subject: [PATCH 052/314] cryptsetup: Allow to build with Python support.

This again is only optional to avoid too much dependencies when bootstrapping
small systems or when constrained to RAM disks of lower size. It is needed for
blivet as well, which will override the option in its dependency list.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/os-specific/linux/cryptsetup/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix
index 6d612f8cdbd..0eb4be30284 100644
--- a/pkgs/os-specific/linux/cryptsetup/default.nix
+++ b/pkgs/os-specific/linux/cryptsetup/default.nix
@@ -1,4 +1,8 @@
-{ stdenv, fetchurl, devicemapper, libgcrypt, libuuid, pkgconfig, popt }:
+{ stdenv, fetchurl, devicemapper, libgcrypt, libuuid, pkgconfig, popt
+, enablePython ? false, python ? null
+}:
+
+assert enablePython -> python != null;
 
 stdenv.mkDerivation rec {
   name = "cryptsetup-1.5.1";
@@ -8,9 +12,11 @@ stdenv.mkDerivation rec {
     sha256 = "0dib3nw6ifd7d7hr9k4iyaha3hz0pkzairqa38l3fndkr9w3zlhn";
   };
 
-  configureFlags = "--enable-cryptsetup-reencrypt";
+  configureFlags = [ "--enable-cryptsetup-reencrypt" ]
+                ++ stdenv.lib.optional enablePython "--enable-python";
 
-  buildInputs = [ devicemapper libgcrypt libuuid pkgconfig popt ];
+  buildInputs = [ devicemapper libgcrypt libuuid pkgconfig popt ]
+             ++ stdenv.lib.optional enablePython python;
 
   meta = {
     homepage = http://code.google.com/p/cryptsetup/;

From b0f4ae64c29289d024d22767b9ca0d582cf1db3e Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 24 Jun 2013 10:22:03 +0200
Subject: [PATCH 053/314] python-packages: Add blivet version 0.16-1.

This still doesn't have all possibly required dependencies, but at least we can
do basic partitioning, which is our primary goal. At least when it comes to the
Hetzner target of nixops. But even for partitioning when installing NixOS this
library could be _very_ useful.

Test cases currently don't work because they're filled with syntax errors and
some references to the mocking library are missing.

As you can see in propagatedBuildInputs, here are the promised overrides for
Python support of libselinux and cryptsetup.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/python-packages.nix | 38 ++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 08d62f87055..6aa12fdf3ae 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -451,6 +451,44 @@ pythonPackages = python.modules // rec {
   };
 
 
+  blivet = buildPythonPackage rec {
+    name = "blivet-${version}";
+    version = "0.16-1";
+
+    src = fetchurl {
+      url = "https://git.fedorahosted.org/cgit/blivet.git/snapshot/"
+          + "${name}.tar.bz2";
+      sha256 = "0gfxf86sc0mkpqjcainch6gqh3r7brgma85pbl4nfpzmylhzj5sg";
+    };
+
+    postPatch = ''
+      sed -i -e '/find_library/,/find_library/ {
+        c libudev = "${pkgs.udev}/lib/libudev.so.1"
+      }' blivet/pyudev.py
+      sed -i -e 's|"multipath"|"${pkgs.multipath_tools}/sbin/multipath"|' \
+        blivet/devicelibs/mpath.py blivet/devices.py
+    '';
+
+    propagatedBuildInputs = let
+      pyenable = { enablePython = true; };
+      selinuxWithPython = pkgs.libselinux.override pyenable;
+      cryptsetupWithPython = pkgs.cryptsetup.override pyenable;
+    in [
+      pykickstart pyparted pkgs.udev pyblock
+      selinuxWithPython cryptsetupWithPython
+    ];
+
+    # tests are currently _heavily_ broken upstream
+    doCheck = false;
+
+    meta = {
+      homepage = "https://fedoraproject.org/wiki/Blivet";
+      description = "Module for management of a system's storage configuration";
+      license = [ "GPLv2+" "LGPLv2.1+" ];
+    };
+  };
+
+
   # euca2ools (and maybe Nova) needs boto 1.9, 2.0 doesn't work.
   boto_1_9 = buildPythonPackage (rec {
     name = "boto-1.9b";

From f04b0db6d3d325fcdafab9d14534e25b5f4aebbf Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 24 Jun 2013 12:36:44 +0200
Subject: [PATCH 054/314] python-pyparted: Fix test cases for 32bit systems.

Fixes http://hydra.nixos.org/build/5425941

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/python-packages.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6aa12fdf3ae..80d75d109d5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3753,6 +3753,10 @@ pythonPackages = python.modules // rec {
       sed -i -e '
         s|e\.path\.startswith("/tmp/temp-device-")|"temp-device-" in e.path|
       ' tests/test__ped_ped.py
+    '' + pkgs.lib.optionalString stdenv.isi686 ''
+      # remove some integers in this test case which overflow on 32bit systems
+      sed -i -r -e '/class *UnitGetSizeTestCase/,/^$/{/[0-9]{11}/d}' \
+        tests/test__ped_ped.py
     '';
 
     preConfigure = ''

From 86d14a5ab2dec0981b51cac8b2223bd29906a99b Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 24 Jun 2013 14:06:30 +0200
Subject: [PATCH 055/314] pykickstart: Run test cases in order of name.

This should ensure the test casnes are always running in the same order,
regardless of the target machine. We're just using the class name here, which
should be sufficient enough to address the issue.

Now the following build should be fixed:

http://hydra.nixos.org/build/5425811

Big thanks to @rbvermaa for being a *really* great help debugging the problem
quickly, because I couldn't reproduce it here (the run order of the test cases
on my machine were 'accidentally' right).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/python-packages.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 80d75d109d5..f0e74a0277f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3707,6 +3707,11 @@ pythonPackages = python.modules // rec {
       sha256 = "1sq68jvc39k9wrkcc4xlabhwi8gdz019yh2k5nrl7ya35b8daqw0";
     };
 
+    postPatch = ''
+      sed -i -e "s/for tst in tstList/for tst in sorted(tstList, \
+                 key=lambda m: m.__name__)/" tests/baseclass.py
+    '';
+
     propagatedBuildInputs = [ urlgrabber ];
 
     checkPhase = ''

From f305fe1c02b223463af9263a9800fc6b606527db Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Tue, 25 Jun 2013 07:32:04 +0800
Subject: [PATCH 056/314] kmplayer: minor fixes

Wrap mplayer into PATH
Remove unneeded dependency on gtk
---
 pkgs/applications/video/kmplayer/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix
index 5f6c2259d1c..553b86a3801 100644
--- a/pkgs/applications/video/kmplayer/default.nix
+++ b/pkgs/applications/video/kmplayer/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, cmake, pkgconfig, gettext
-, kdelibs, gtk
+{ stdenv, fetchurl, cmake, pkgconfig, gettext, makeWrapper
+, kdelibs, cairo, dbus_glib, mplayer
 }:
 
 stdenv.mkDerivation {
@@ -11,9 +11,14 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    cmake gettext pkgconfig kdelibs gtk
+    cmake gettext pkgconfig makeWrapper
+    kdelibs cairo dbus_glib
   ];
 
+  postInstall = ''
+    wrapProgram $out/bin/kmplayer --suffix PATH : ${mplayer}/bin
+  '';
+
   meta = {
     description = "MPlayer front-end for KDE";
     license = "GPL";

From f22880408ea8661529b2760c21ecb82f70463801 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Tue, 25 Jun 2013 09:59:19 +0300
Subject: [PATCH 057/314] Kindly ask strip to not mess up timestamps in static
 libraries

---
 pkgs/stdenv/generic/setup-repeatable.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/setup-repeatable.sh b/pkgs/stdenv/generic/setup-repeatable.sh
index 8247ede3e46..3b2e0151932 100644
--- a/pkgs/stdenv/generic/setup-repeatable.sh
+++ b/pkgs/stdenv/generic/setup-repeatable.sh
@@ -724,12 +724,12 @@ fixupPhase() {
     if [ -z "$dontStrip" ]; then
         stripDebugList=${stripDebugList:-lib lib32 lib64 libexec bin sbin}
         if [ -n "$stripDebugList" ]; then
-            stripDirs "$stripDebugList" "${stripDebugFlags:--S}"
+            stripDirs "$stripDebugList" "${stripDebugFlags:--S --enable-deterministic-archives}"
         fi
 
         stripAllList=${stripAllList:-}
         if [ -n "$stripAllList" ]; then
-            stripDirs "$stripAllList" "${stripAllFlags:--s}"
+            stripDirs "$stripAllList" "${stripAllFlags:--s --enable-deterministic-archives}"
         fi
     fi
 

From 0889bbe88fc6c6a9c962421ce38b7f2fad690e4a Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Tue, 25 Jun 2013 10:53:37 +0300
Subject: [PATCH 058/314] Patch binutils to produce more deterministic output

---
 pkgs/development/tools/misc/binutils/default.nix     |  9 ++++++---
 .../tools/misc/binutils/deterministic.patch          | 12 ++++++++++++
 pkgs/top-level/all-packages.nix                      |  2 ++
 3 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/tools/misc/binutils/deterministic.patch

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index e1afceebaa2..ca763a5e1fb 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, noSysDirs, zlib, cross ? null, gold ? false, bison ? null, flex2535 ? null, bc ? null, dejagnu ? null }:
+{ stdenv, fetchurl, noSysDirs, zlib
+, cross ? null, gold ? false, bison ? null, flex2535 ? null, bc ? null, dejagnu ? null
+, deterministic ? false }:
 
 let basename = "binutils-2.23.1"; in
 stdenv.mkDerivation rec {
@@ -19,7 +21,7 @@ stdenv.mkDerivation rec {
     # That requires upstream changes for things to work. So we can patch it to
     # get the old behaviour by now.
     ./dtneeded.patch
-  ];
+  ] ++ (stdenv.lib.optional deterministic ./deterministic.patch);
 
   buildInputs =
     [ zlib ]
@@ -48,7 +50,8 @@ 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"
+      + stdenv.lib.optionalString deterministic " --enable-deterministic-archives";
 
   enableParallelBuilding = true;
       
diff --git a/pkgs/development/tools/misc/binutils/deterministic.patch b/pkgs/development/tools/misc/binutils/deterministic.patch
new file mode 100644
index 00000000000..736e0aca6ce
--- /dev/null
+++ b/pkgs/development/tools/misc/binutils/deterministic.patch
@@ -0,0 +1,12 @@
+diff -ur orig/binutils-2.23.1/ld/ldlang.c binutils-2.23.1/ld/ldlang.c
+--- orig/ld/ldlang.c
++++ new/ld/ldlang.c
+@@ -3095,6 +3095,8 @@
+                           ldfile_output_machine))
+     einfo (_("%P%F:%s: can not set architecture: %E\n"), name);
+ 
++  link_info.output_bfd->flags |= BFD_DETERMINISTIC_OUTPUT;
++
+   link_info.hash = bfd_link_hash_table_create (link_info.output_bfd);
+   if (link_info.hash == NULL)
+     einfo (_("%P%F: can not create hash table: %E\n"));
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c8acc2c39c7..ba9a6c4b7de 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3206,6 +3206,8 @@ let
     inherit noSysDirs;
   };
 
+  binutils_deterministic = binutils.override { deterministic = true; };
+
   binutils_gold = lowPrio (callPackage ../development/tools/misc/binutils {
     inherit noSysDirs;
     gold = true;

From 92a48cb305add94aa76382f27b57ba9b2cffbf2d Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Tue, 25 Jun 2013 10:59:25 +0300
Subject: [PATCH 059/314] Add gcc4.6 wrapped using deterministic binutils

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ba9a6c4b7de..25b5db6f872 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2131,6 +2131,37 @@ let
 
   gcc45 = gcc45_real;
 
+  wrapDeterministicGCCWith = gccWrapper: glibc: baseGCC: gccWrapper {
+    nativeTools = stdenv ? gcc && stdenv.gcc.nativeTools;
+    nativeLibc = stdenv ? gcc && stdenv.gcc.nativeLibc;
+    nativePrefix = if stdenv ? gcc then stdenv.gcc.nativePrefix else "";
+    gcc = baseGCC;
+    libc = glibc;
+    shell = bash;
+    binutils = binutils_deterministic;
+    inherit stdenv coreutils zlib;
+  };
+  
+  wrapDeterministicGCC = wrapDeterministicGCCWith (import ../build-support/gcc-wrapper) glibc;
+  
+  gcc46_deterministic = lowPrio (wrapDeterministicGCC (callPackage ../development/compilers/gcc/4.6 {
+    inherit noSysDirs;
+
+    # bootstrapping a profiled compiler does not work in the sheevaplug:
+    # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944
+    profiledCompiler = !stdenv.isArm;
+
+    # When building `gcc.crossDrv' (a "Canadian cross", with host == target
+    # and host != build), `cross' must be null but the cross-libc must still
+    # be passed.
+    cross = null;
+    libcCross = if crossSystem != null then libcCross else null;
+    libpthreadCross =
+      if crossSystem != null && crossSystem.config == "i586-pc-gnu"
+      then gnu.libpthreadCross
+      else null;
+  }));
+
   gcc46 = gcc46_real;
 
   gcc47 = gcc47_real;

From 6c9838ad54727574bb0faa62fc46a1e0fcced9ba Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Tue, 25 Jun 2013 11:03:47 +0300
Subject: [PATCH 060/314] Rename repeatableStdenv to deterministicStdenv for
 consistency. Make it plug more holes to avoid regular binutils sneaking in
 and ruining builds.

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 25b5db6f872..b9018dc568c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2844,7 +2844,14 @@ let
     ocaml = ocaml_3_08_0;
   };
 
-  repeatableStdenv  = lowPrio (stdenvAdapters.overrideSetup stdenv ../stdenv/generic/setup-repeatable.sh );
+  deterministicStdenv = lowPrio (
+    overrideInStdenv (
+      stdenvAdapters.overrideGCC
+        (stdenvAdapters.overrideSetup stdenv ../stdenv/generic/setup-repeatable.sh )
+      gcc46_deterministic
+    )
+    [ binutils_deterministic ]
+  );
 
   roadsend = callPackage ../development/compilers/roadsend { };
 

From 97bf9fbbc846e5e7a2d24e931dc91fdc6ef74d63 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 21 Jun 2013 09:13:38 +0200
Subject: [PATCH 061/314] xbmc: Make it read /etc/zoneinfo

---
 pkgs/applications/video/xbmc/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/video/xbmc/default.nix b/pkgs/applications/video/xbmc/default.nix
index 55734e49539..d3b3556baf4 100644
--- a/pkgs/applications/video/xbmc/default.nix
+++ b/pkgs/applications/video/xbmc/default.nix
@@ -68,6 +68,11 @@ stdenv.mkDerivation rec {
 
     dontUseCmakeConfigure = true;
 
+    preConfigure = ''
+      substituteInPlace xbmc/linux/LinuxTimezone.cpp \
+        --replace 'usr/share/zoneinfo' 'etc/zoneinfo'
+    '';
+
     configureFlags = [
       "--enable-external-libraries"
       "--disable-webserver"

From 270da328b94caaf6ef5a29fdeecc872f3a25d7da Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 25 Jun 2013 10:03:00 +0200
Subject: [PATCH 062/314] qemu: Enable virtfs

This makes it possible to share host directories to qemu guests
using 9P.
---
 pkgs/applications/virtualization/qemu/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index b1165b3535b..997cc8bd49d 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses, perl, pixman }:
+{ stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses, perl, pixman
+, attr, libcap }:
 
 stdenv.mkDerivation rec {
   name = "qemu-1.4.0";
@@ -8,10 +9,16 @@ stdenv.mkDerivation rec {
     sha256 = "1a7d11vjs1p6i1ck2ff9annmkhpkbjl73hl9i1cbg3s0fznrfqh6";
   };
 
-  buildInputs = [ python zlib pkgconfig glib SDL ncurses perl pixman ];
+  buildInputs = [
+    python zlib pkgconfig glib SDL ncurses perl pixman attr libcap
+  ];
 
   enableParallelBuilding = true;
 
+  configureFlags = [
+    "--enable-virtfs"
+  ];
+
   meta = {
     description = "QEmu processor emulator";
     license = "GPLv2+";

From 266da813a3cba3462394e05c5bda97fb858a7fcc Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 25 Jun 2013 12:19:38 +0200
Subject: [PATCH 063/314] spotify: Update to 0.9.1.55

---
 pkgs/applications/audio/spotify/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 36c6c2ca9cd..ccdfcbb3d99 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -3,7 +3,7 @@
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
 
 let
-  version = "0.9.0.133";
+  version = "0.9.1.55";
   qt4webkit =
     if stdenv.system == "i686-linux" then
       fetchurl {
@@ -25,13 +25,13 @@ stdenv.mkDerivation {
   src =
     if stdenv.system == "i686-linux" then
       fetchurl {
-        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.gd18ed58.259-1_i386.deb";
-        sha256 = "15kbwll63pm99262f7xq1z0c5bwmk5cz46pkh8xd5xsqxlsvvv1n";
+        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.gbdd3b79.203-1_i386.deb";
+        sha256 = "1sls4gb85700126bbk4sz73ipa2rjcinmpnsi78q0bsdj365y2wc";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
-        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.gd18ed58.259-1_amd64.deb";
-        sha256 = "0l3nikhf4hyj6z7639s668kd806730va005rwqcxvymxddcbcp03";
+        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.gbdd3b79.203-1_amd64.deb";
+        sha256 = "10pzj3p8bjbxh9nnm4qc5s1hn9nh7hgh3vbwm0xblj9rn71wl03y";
       }
     else throw "Spotify not supported on this platform.";
 

From 9e85628fb94ffc10c27a56698646dc543517f1a7 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 25 Jun 2013 12:20:00 +0200
Subject: [PATCH 064/314] mkpasswd: Update to 5.0.25

---
 pkgs/tools/security/mkpasswd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/mkpasswd/default.nix b/pkgs/tools/security/mkpasswd/default.nix
index a1982cc4e66..f131fcef4ce 100644
--- a/pkgs/tools/security/mkpasswd/default.nix
+++ b/pkgs/tools/security/mkpasswd/default.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
   name = "mkpasswd-${version}";
 
-  version = "5.0.20";
+  version = "5.0.25";
 
   src = fetchurl {
     url = "http://ftp.debian.org/debian/pool/main/w/whois/whois_${version}.tar.xz";
-    sha256 = "1kwf5pwc7w8dw40nrd4m4637mz7pbhc4c1v78j56nqj38sak50w1";
+    sha256 = "0qb859vwd6g93cb5zbf19gpw2g2b9s1qlq4nqia1a966pjkvw1qj";
   };
 
   preConfigure = ''

From 8496b31e34be68cc663c66169dd868935597bee5 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 25 Jun 2013 12:31:44 +0200
Subject: [PATCH 065/314] sbt: Use recommended java options

---
 .../tools/build-managers/simple-build-tool/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/simple-build-tool/default.nix b/pkgs/development/tools/build-managers/simple-build-tool/default.nix
index a72f94d52f6..e446bf1c1eb 100644
--- a/pkgs/development/tools/build-managers/simple-build-tool/default.nix
+++ b/pkgs/development/tools/build-managers/simple-build-tool/default.nix
@@ -66,8 +66,8 @@ versionedDerivation "simple-build-tool" version {
   "xsbt-0.12.3" = let version = "0.12.3"; in {
     name = "xsbt-${version}";
 
-    # scala needs much more PermGen space
-    javaArgs = "-Xmx1024M";
+    # Recommended java options from sbt Getting started guide
+    javaArgs = "-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=384M";
     # from https://github.com/harrah/xsbt/wiki/Getting-Started-Setup
     src = fetchurl {
       url = http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.12.3/sbt-launch.jar;

From 0dbb2fdcfe68de0b231e5007a104cd92c7c417c0 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 25 Jun 2013 12:32:28 +0200
Subject: [PATCH 066/314] sbt: Remove duplicate package

---
 .../tools/build-managers/sbt/default.nix      | 27 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 29 deletions(-)
 delete mode 100644 pkgs/development/tools/build-managers/sbt/default.nix

diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
deleted file mode 100644
index 90045b97352..00000000000
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, writeScript, bash, jre }:
-
-let 
-
-  sbt = writeScript "sbt.sh" ''
-    #!${bash}/bin/bash
-    ${jre}/bin/java -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled \
-      -XX:MaxPermSize=384M -jar @out@/lib/sbt-launch.jar "$@"
-  '';
-
-in stdenv.mkDerivation rec {
-  name = "sbt-${version}";
-
-  version = "0.12.3";
-
-  src = fetchurl {
-    url = "http://scalasbt.artifactoryonline.com/scalasbt/sbt-native-packages/org/scala-sbt/sbt/${version}/sbt.tgz";
-    sha256 = "154ydaxd6ink5sy4flzpyh47nnhgkxwpzmml8q16am7655fpib08";
-  };
-
-  installPhase = ''
-    mkdir -p $out/lib $out/bin
-    mv bin/sbt-launch.jar $out/lib/
-    cp ${sbt} $out/bin/sbt
-    substituteInPlace $out/bin/sbt --replace @out@ $out
-  '';
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b9018dc568c..89fb02eba0e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3537,8 +3537,6 @@ let
     jre = jdk;
   };
 
-  sbt = callPackage ../development/tools/build-managers/sbt { };
-
   scons = callPackage ../development/tools/build-managers/scons { };
 
   simpleBuildTool = callPackage ../development/tools/build-managers/simple-build-tool { };

From 9b2a657f420cd8b3dbca5f46862585fcbc921f16 Mon Sep 17 00:00:00 2001
From: Gergely Risko <gergely@risko.hu>
Date: Tue, 25 Jun 2013 13:01:41 +0200
Subject: [PATCH 067/314] Add regex-tdfa-text

---
 .../libraries/haskell/regex-tdfa-text/default.nix   | 13 +++++++++++++
 pkgs/top-level/haskell-packages.nix                 |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/regex-tdfa-text/default.nix

diff --git a/pkgs/development/libraries/haskell/regex-tdfa-text/default.nix b/pkgs/development/libraries/haskell/regex-tdfa-text/default.nix
new file mode 100644
index 00000000000..1a329c25b2d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/regex-tdfa-text/default.nix
@@ -0,0 +1,13 @@
+{ cabal, regexBase, regexTdfa, text }:
+
+cabal.mkDerivation (self: {
+  pname = "regex-tdfa-text";
+  version = "1.0.0.2";
+  sha256 = "1p17xv3j2xd74iilyqwlqhkmyp26asq4k1pb0h2f0wdqqfr87bfd";
+  buildDepends = [ regexBase regexTdfa text ];
+  meta = {
+    description = "Text interface for 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 411f735dbe8..4bcce23fc3b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1691,6 +1691,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   regexTDFA = callPackage ../development/libraries/haskell/regex-tdfa {};
   regexTdfa = self.regexTDFA;
 
+  regexTdfaText = callPackage ../development/libraries/haskell/regex-tdfa-text {};
+
   regexPCRE = callPackage ../development/libraries/haskell/regex-pcre {};
   regexPcre = self.regexPCRE;
 

From cbf2526bfda604260fcf69973fffddc535afc099 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 068/314] 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 89fb02eba0e..782e83d1948 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9428,6 +9428,8 @@ let
   };
   */
 
+  nixops = callPackage ../tools/package-management/nixops { };
+
   nut = callPackage ../applications/misc/nut { };
 
   solfege = callPackage ../misc/solfege {

From acba9240cdd89295c6e3a22525dc67cb936d164c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 25 Jun 2013 14:05:48 +0200
Subject: [PATCH 069/314] nixos.org/tarballs -> tarballs.nixos.org

It's currently the same machine, but tarballs.nixos.org should become
an S3/CloudFront site eventually.
---
 doc/release-notes.xml                                     | 4 ++--
 pkgs/applications/editors/emacs-modes/cua/default.nix     | 2 +-
 pkgs/applications/editors/monodevelop/default.nix         | 2 +-
 pkgs/applications/editors/monodoc/default.nix             | 2 +-
 pkgs/applications/graphics/batik/default.nix              | 2 +-
 pkgs/applications/graphics/f-spot/default.nix             | 2 +-
 pkgs/applications/video/mplayer/default.nix               | 2 +-
 pkgs/build-support/fetchurl/default.nix                   | 2 +-
 pkgs/build-support/fetchurl/mirrors.nix                   | 2 +-
 pkgs/data/fonts/bakoma-ttf/default.nix                    | 2 +-
 pkgs/data/misc/cacert/default.nix                         | 2 +-
 pkgs/development/compilers/ghc/6.4.2-binary.nix           | 2 +-
 pkgs/development/compilers/ocaml/3.08.0.nix               | 2 +-
 pkgs/development/compilers/openjdk/bootstrap.nix          | 4 ++--
 pkgs/development/compilers/qcmm/default.nix               | 2 +-
 pkgs/development/libraries/db4/db4-4.4.nix                | 2 +-
 pkgs/development/libraries/gtk-sharp-1/default.nix        | 2 +-
 pkgs/development/libraries/gtkmozembed-sharp/default.nix  | 2 +-
 .../development/libraries/gtksourceview-sharp/default.nix | 2 +-
 pkgs/development/libraries/imlib/default.nix              | 2 +-
 pkgs/development/libraries/java/jakarta-bcel/default.nix  | 2 +-
 .../development/libraries/java/jakarta-regexp/default.nix | 2 +-
 pkgs/development/libraries/pdf2xml/default.nix            | 2 +-
 .../tools/build-managers/gnumake-3.80/default.nix         | 2 +-
 pkgs/development/tools/build-managers/mk/default.nix      | 2 +-
 pkgs/games/keen4/default.nix                              | 2 +-
 pkgs/games/quake3/demo/default.nix                        | 4 ++--
 pkgs/os-specific/linux/aufs-util/2.nix                    | 2 +-
 pkgs/os-specific/linux/aufs/2.nix                         | 2 +-
 pkgs/os-specific/linux/usbutils/default.nix               | 2 +-
 pkgs/stdenv/linux/bootstrap/armv5tel/default.nix          | 2 +-
 pkgs/stdenv/linux/bootstrap/i686/default.nix              | 2 +-
 pkgs/stdenv/linux/bootstrap/loongson2f/default.nix        | 2 +-
 pkgs/stdenv/linux/bootstrap/powerpc/default.nix           | 8 ++++----
 pkgs/stdenv/linux/bootstrap/x86_64/default.nix            | 2 +-
 pkgs/tools/filesystems/aefs/default.nix                   | 2 +-
 pkgs/tools/misc/getopt/default.nix                        | 2 +-
 pkgs/tools/networking/openssh/default.nix                 | 2 +-
 pkgs/tools/networking/p2p/azureus/default.nix             | 2 +-
 pkgs/tools/security/gnupg1/default.nix                    | 2 +-
 pkgs/tools/system/pciutils/default.nix                    | 2 +-
 pkgs/tools/text/xml/xpf/default.nix                       | 2 +-
 pkgs/tools/typesetting/bibtex-tools/default.nix           | 2 +-
 pkgs/tools/virtualization/ec2-ami-tools/default.nix       | 2 +-
 pkgs/tools/virtualization/ec2-api-tools/default.nix       | 2 +-
 pkgs/top-level/perl-packages.nix                          | 2 +-
 46 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/doc/release-notes.xml b/doc/release-notes.xml
index 0551b36cdbf..2a1fb9f3109 100644
--- a/doc/release-notes.xml
+++ b/doc/release-notes.xml
@@ -237,12 +237,12 @@ fetchurl {
 
   <function>fetchurl</function> will first try to download this file
   from <link
-  xlink:href="http://nixos.org/tarballs/sha1/eb72f55e4a8bf08e8c6ef227c0ade3d068ba1082"/>.
+  xlink:href="http://tarballs.nixos.org/sha1/eb72f55e4a8bf08e8c6ef227c0ade3d068ba1082"/>.
   If that file doesn’t exist, it will try the original URL.  In
   general, the “content-addressed” location is
   <replaceable>mirror</replaceable><literal>/</literal><replaceable>hash-type</replaceable><literal>/</literal><replaceable>hash</replaceable>.
   There is currently only one content-addressable mirror (<link
-  xlink:href="http://nixos.org/tarballs"/>), but more can be
+  xlink:href="http://tarballs.nixos.org"/>), but more can be
   specified in the <varname>hashedMirrors</varname> attribute in
   <filename>pkgs/build-support/fetchurl/mirrors.nix</filename>, or by
   setting the <envar>NIX_HASHED_MIRRORS</envar> environment variable
diff --git a/pkgs/applications/editors/emacs-modes/cua/default.nix b/pkgs/applications/editors/emacs-modes/cua/default.nix
index b5348967a3e..a03c6447622 100644
--- a/pkgs/applications/editors/emacs-modes/cua/default.nix
+++ b/pkgs/applications/editors/emacs-modes/cua/default.nix
@@ -2,7 +2,7 @@
   name = "cua-mode-2.10";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nixos.org/tarballs/cua-mode-2.10.el;
+    url = http://tarballs.nixos.org/cua-mode-2.10.el;
     md5 = "5bf5e43f5f38c8383868c7c6c5baca09";
   };
 }
diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix
index c823ecfdf83..aad6325fa44 100644
--- a/pkgs/applications/editors/monodevelop/default.nix
+++ b/pkgs/applications/editors/monodevelop/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://nixos.org/tarballs/monodevelop-0.6-pre2315.tar.bz2;
+    url = http://tarballs.nixos.org/monodevelop-0.6-pre2315.tar.bz2;
     md5 = "8c33df5629b0676b7ab552854c1de6fd";
   };
 
diff --git a/pkgs/applications/editors/monodoc/default.nix b/pkgs/applications/editors/monodoc/default.nix
index 8f6b6d6024c..0e8421646a8 100644
--- a/pkgs/applications/editors/monodoc/default.nix
+++ b/pkgs/applications/editors/monodoc/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nixos.org/tarballs/monodoc-1.0.6.tar.gz;
+    url = http://tarballs.nixos.org/monodoc-1.0.6.tar.gz;
     md5 = "f2fc27e8e4717d90dc7efa2450625693";
   };
 
diff --git a/pkgs/applications/graphics/batik/default.nix b/pkgs/applications/graphics/batik/default.nix
index fbe67d1600d..d776d433b37 100644
--- a/pkgs/applications/graphics/batik/default.nix
+++ b/pkgs/applications/graphics/batik/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "batik-1.6";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nixos.org/tarballs/batik-1.6.zip;
+    url = http://tarballs.nixos.org/batik-1.6.zip;
     md5 = "edff288fc64f968ff96ca49763d50f3c";
   };
 
diff --git a/pkgs/applications/graphics/f-spot/default.nix b/pkgs/applications/graphics/f-spot/default.nix
index 856795ea356..8ecfc0df162 100644
--- a/pkgs/applications/graphics/f-spot/default.nix
+++ b/pkgs/applications/graphics/f-spot/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   inherit makeWrapper;
 
   src = fetchurl {
-    url = http://nixos.org/tarballs/f-spot-0.0.10.tar.bz2;
+    url = http://tarballs.nixos.org/f-spot-0.0.10.tar.bz2;
     md5 = "19cc6e067ccc261b0502ff6189b79832";
   };
 
diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix
index a1ec200aaf0..2051590a819 100644
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     # Old kind of URL:
-    # url = http://nixos.org/tarballs/mplayer-snapshot-20101227.tar.bz2;
+    # url = http://tarballs.nixos.org/mplayer-snapshot-20101227.tar.bz2;
     # Snapshot I took on 20110423
 
     #Transient
diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
index 6c981229531..294d9a43ef7 100644
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@@ -91,7 +91,7 @@ stdenv.mkDerivation {
   urls = urls_;
 
   # If set, prefer the content-addressable mirrors
-  # (http://nixos.org/tarballs) over the original URLs.
+  # (http://tarballs.nixos.org) over the original URLs.
   preferHashedMirrors = true;
 
   # New-style output content requirements.
diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index d6ad25afbad..70a06735e68 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -2,7 +2,7 @@ rec {
 
   # Content-addressable Nix mirrors.
   hashedMirrors = [
-    http://nixos.org/tarballs
+    http://tarballs.nixos.org
   ];
 
   # Mirrors for mirror://site/filename URIs, where "site" is
diff --git a/pkgs/data/fonts/bakoma-ttf/default.nix b/pkgs/data/fonts/bakoma-ttf/default.nix
index 5f9cbec7a97..8b607adaaae 100644
--- a/pkgs/data/fonts/bakoma-ttf/default.nix
+++ b/pkgs/data/fonts/bakoma-ttf/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "bakoma-ttf";
   
   src = fetchurl {
-    url = http://nixos.org/tarballs/bakoma-ttf.tar.bz2;
+    url = http://tarballs.nixos.org/bakoma-ttf.tar.bz2;
     sha256 = "1j1y3cq6ys30m734axc0brdm2q9n2as4h32jws15r7w5fwr991km";
   };
   
diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix
index 711ebc9e88f..aafb9104e22 100644
--- a/pkgs/data/misc/cacert/default.nix
+++ b/pkgs/data/misc/cacert/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "cacert-20121229";
 
   src = fetchurl {
-    url = "http://nixos.org/tarballs/${name}.pem.bz2";
+    url = "http://tarballs.nixos.org/${name}.pem.bz2";
     sha256 = "031s86pqvn620zkj6w97hqgjvkp6vsvlymzz7rwvkv25zvrjsgif";
   };
 
diff --git a/pkgs/development/compilers/ghc/6.4.2-binary.nix b/pkgs/development/compilers/ghc/6.4.2-binary.nix
index 8e4e6c58a3f..b42602829ac 100644
--- a/pkgs/development/compilers/ghc/6.4.2-binary.nix
+++ b/pkgs/development/compilers/ghc/6.4.2-binary.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   src =
     if stdenv.system == "i686-linux" then
       fetchurl {
-        url = http://nixos.org/tarballs/ghc-6.4.2-i386-unknown-linux.tar.bz2;
+        url = http://tarballs.nixos.org/ghc-6.4.2-i386-unknown-linux.tar.bz2;
         md5 = "092fe2e25dab22b926babe97cc77db1f";
       }
     else if stdenv.system == "x86_64-linux" then
diff --git a/pkgs/development/compilers/ocaml/3.08.0.nix b/pkgs/development/compilers/ocaml/3.08.0.nix
index 4f7e9469bbf..f4640b36e67 100644
--- a/pkgs/development/compilers/ocaml/3.08.0.nix
+++ b/pkgs/development/compilers/ocaml/3.08.0.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "ocaml-3.08.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nixos.org/tarballs/ocaml-3.08.0.tar.gz;
+    url = http://tarballs.nixos.org/ocaml-3.08.0.tar.gz;
     md5 = "c6ef478362295c150101cdd2efcd38e0";
   };
   configureScript = ./configure-3.08.0;
diff --git a/pkgs/development/compilers/openjdk/bootstrap.nix b/pkgs/development/compilers/openjdk/bootstrap.nix
index 2ac2eed117c..01ed43069b6 100644
--- a/pkgs/development/compilers/openjdk/bootstrap.nix
+++ b/pkgs/development/compilers/openjdk/bootstrap.nix
@@ -4,12 +4,12 @@ let
   # !!! These should be on nixos.org
   src = if glibc.system == "x86_64-linux" then
     fetchurl {
-      url = http://nixos.org/tarballs/openjdk-bootstrap-x86_64-linux-2012-08-24.tar.xz;
+      url = http://tarballs.nixos.org/openjdk-bootstrap-x86_64-linux-2012-08-24.tar.xz;
       sha256 = "0gla9dxrfq2w1hvgsnn8jg8a60k27im6z43a6iidi0qmwa0wah32";
     }
   else if glibc.system == "i686-linux" then
     fetchurl {
-      url = http://nixos.org/tarballs/openjdk-bootstrap-i686-linux-2012-08-24.tar.xz;
+      url = http://tarballs.nixos.org/openjdk-bootstrap-i686-linux-2012-08-24.tar.xz;
       sha256 = "184wq212bycwbbq4ix8cc6jwjxkrqw9b01zb86q95kqpa8zy5206";
     }
   else throw "No bootstrap for system";
diff --git a/pkgs/development/compilers/qcmm/default.nix b/pkgs/development/compilers/qcmm/default.nix
index b7f11866687..a221ae29f04 100644
--- a/pkgs/development/compilers/qcmm/default.nix
+++ b/pkgs/development/compilers/qcmm/default.nix
@@ -2,7 +2,7 @@
 stdenv.mkDerivation {
   name = "qcmm-2006-01-31";
   src = fetchurl {
-    url = http://nixos.org/tarballs/qc--20060131.tar.gz;
+    url = http://tarballs.nixos.org/qc--20060131.tar.gz;
     md5 = "9097830775bcf22c9bad54f389f5db23";
   };
   buildInputs = [ mk ocaml noweb groff ];
diff --git a/pkgs/development/libraries/db4/db4-4.4.nix b/pkgs/development/libraries/db4/db4-4.4.nix
index 7444439fc73..ab3ffa85cf2 100644
--- a/pkgs/development/libraries/db4/db4-4.4.nix
+++ b/pkgs/development/libraries/db4/db4-4.4.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   src = fetchurl {
     urls = [
       http://download.oracle.com/berkeley-db/db-4.4.20.NC.tar.gz
-      http://nixos.org/tarballs/db-4.4.20.NC.tar.gz
+      http://tarballs.nixos.org/db-4.4.20.NC.tar.gz
     ];
     md5 = "afd9243ea353bbaa04421488d3b37900";
   };
diff --git a/pkgs/development/libraries/gtk-sharp-1/default.nix b/pkgs/development/libraries/gtk-sharp-1/default.nix
index 2110884a022..aad440bf672 100644
--- a/pkgs/development/libraries/gtk-sharp-1/default.nix
+++ b/pkgs/development/libraries/gtk-sharp-1/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nixos.org/tarballs/gtk-sharp-1.0.6.tar.gz;
+    url = http://tarballs.nixos.org/gtk-sharp-1.0.6.tar.gz;
     md5 = "2651d14fe77174ab20b8af53d150ee11";
   };
 
diff --git a/pkgs/development/libraries/gtkmozembed-sharp/default.nix b/pkgs/development/libraries/gtkmozembed-sharp/default.nix
index 43476d6e78a..b54f3cc2f61 100644
--- a/pkgs/development/libraries/gtkmozembed-sharp/default.nix
+++ b/pkgs/development/libraries/gtkmozembed-sharp/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nixos.org/tarballs/gtkmozembed-sharp-0.7-pre41601.tar.bz2;
+    url = http://tarballs.nixos.org/gtkmozembed-sharp-0.7-pre41601.tar.bz2;
     md5 = "34aac139377296791acf3af9b5dc27ed";
   };
 
diff --git a/pkgs/development/libraries/gtksourceview-sharp/default.nix b/pkgs/development/libraries/gtksourceview-sharp/default.nix
index abd97ca777b..56c6e1b1ee5 100644
--- a/pkgs/development/libraries/gtksourceview-sharp/default.nix
+++ b/pkgs/development/libraries/gtksourceview-sharp/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nixos.org/tarballs/gtksourceview-sharp-0.6-pre40261.tar.bz2;
+    url = http://tarballs.nixos.org/gtksourceview-sharp-0.6-pre40261.tar.bz2;
     md5 = "8bc26c182bd897f50988e110a9a11f34";
   };
 
diff --git a/pkgs/development/libraries/imlib/default.nix b/pkgs/development/libraries/imlib/default.nix
index 24e7d2afab5..27aaad7598a 100644
--- a/pkgs/development/libraries/imlib/default.nix
+++ b/pkgs/development/libraries/imlib/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "imlib-1.9.15";
   src = fetchurl {
-    url = http://nixos.org/tarballs/imlib-1.9.15.tar.gz;
+    url = http://tarballs.nixos.org/imlib-1.9.15.tar.gz;
     md5 = "2a5561457e7f8b2e04d88f73508fd13a";
   };
 
diff --git a/pkgs/development/libraries/java/jakarta-bcel/default.nix b/pkgs/development/libraries/java/jakarta-bcel/default.nix
index 3bea2a0d8f4..1ff88a36247 100644
--- a/pkgs/development/libraries/java/jakarta-bcel/default.nix
+++ b/pkgs/development/libraries/java/jakarta-bcel/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://nixos.org/tarballs/bcel-5.1.tar.gz;
+    url = http://tarballs.nixos.org/bcel-5.1.tar.gz;
     md5 = "318f22e4f5f59b68cd004db83a7d65dc";
   };
 
diff --git a/pkgs/development/libraries/java/jakarta-regexp/default.nix b/pkgs/development/libraries/java/jakarta-regexp/default.nix
index d6c093423d8..55c3beff70a 100644
--- a/pkgs/development/libraries/java/jakarta-regexp/default.nix
+++ b/pkgs/development/libraries/java/jakarta-regexp/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   builder = ./java-bin-builder.sh;
 
   src = fetchurl {
-    url = http://nixos.org/tarballs/jakarta-regexp-1.4.tar.gz;
+    url = http://tarballs.nixos.org/jakarta-regexp-1.4.tar.gz;
     md5 = "d903d84c949df848009f3bf205b32c97";
   };
 
diff --git a/pkgs/development/libraries/pdf2xml/default.nix b/pkgs/development/libraries/pdf2xml/default.nix
index 0f9a3dc2b2d..4f3cd931fce 100644
--- a/pkgs/development/libraries/pdf2xml/default.nix
+++ b/pkgs/development/libraries/pdf2xml/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "pdf2xml";
   
   src = fetchurl {
-      url = http://nixos.org/tarballs/pdf2xml.tar.gz;
+      url = http://tarballs.nixos.org/pdf2xml.tar.gz;
       sha256 = "04rl7ppxqgnvxvvws669cxp478lnrdmiqj0g3m4p69bawfjc4z3w";
   };
   sourceRoot = "pdf2xml/pdf2xml";
diff --git a/pkgs/development/tools/build-managers/gnumake-3.80/default.nix b/pkgs/development/tools/build-managers/gnumake-3.80/default.nix
index dbc68e1d90c..b0926a7f531 100644
--- a/pkgs/development/tools/build-managers/gnumake-3.80/default.nix
+++ b/pkgs/development/tools/build-managers/gnumake-3.80/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "gnumake-3.80";
   src = fetchurl {
-    url = http://nixos.org/tarballs/make-3.80.tar.bz2;
+    url = http://tarballs.nixos.org/make-3.80.tar.bz2;
     md5 = "0bbd1df101bc0294d440471e50feca71";
   };
   patches = [./log.patch];
diff --git a/pkgs/development/tools/build-managers/mk/default.nix b/pkgs/development/tools/build-managers/mk/default.nix
index 9cd208f5a81..6e40e4653ac 100644
--- a/pkgs/development/tools/build-managers/mk/default.nix
+++ b/pkgs/development/tools/build-managers/mk/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "mk-2006-01-31";
   src = fetchurl {
-    url = http://nixos.org/tarballs/mk-20060131.tar.gz;
+    url = http://tarballs.nixos.org/mk-20060131.tar.gz;
     md5 = "167fd4e0eea4f49def01984ec203289b";
   };
   builder = ./builder.sh;
diff --git a/pkgs/games/keen4/default.nix b/pkgs/games/keen4/default.nix
index 745d9f6b38c..4d6189603a9 100644
--- a/pkgs/games/keen4/default.nix
+++ b/pkgs/games/keen4/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   dist = fetchurl {
-    url = http://nixos.org/tarballs/keen4.zip;
+    url = http://tarballs.nixos.org/keen4.zip;
     md5 = "ffcdd9e3bce224d92797166bc3f56f1c";
   };
 
diff --git a/pkgs/games/quake3/demo/default.nix b/pkgs/games/quake3/demo/default.nix
index fb6d1f0b232..99c07a9a7e0 100644
--- a/pkgs/games/quake3/demo/default.nix
+++ b/pkgs/games/quake3/demo/default.nix
@@ -6,13 +6,13 @@ stdenv.mkDerivation {
 
   # This is needed for pak0.pk3.
   demo = fetchurl {
-    url = http://nixos.org/tarballs/linuxq3ademo-1.11-6.x86.gz.sh;
+    url = http://tarballs.nixos.org/linuxq3ademo-1.11-6.x86.gz.sh;
     md5 = "484610c1ce34272223a52ec331c99d5d";
   };
 
   # This is needed for the additional pak?.pk3 files.
   update = fetchurl {
-    url = http://nixos.org/tarballs/linuxq3apoint-1.31.x86.run;
+    url = http://tarballs.nixos.org/linuxq3apoint-1.31.x86.run;
     md5 = "2620b9eefb6d0775f766b6570870157a";
   };
 
diff --git a/pkgs/os-specific/linux/aufs-util/2.nix b/pkgs/os-specific/linux/aufs-util/2.nix
index 130cfd85ee7..e4968b92048 100644
--- a/pkgs/os-specific/linux/aufs-util/2.nix
+++ b/pkgs/os-specific/linux/aufs-util/2.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   name = "aufs2-util-${version}-${kernelDev.version}";
 
   src = fetchurl {
-    url = "http://nixos.org/tarballs/aufs2-util-git-${version}.tar.bz2";
+    url = "http://tarballs.nixos.org/aufs2-util-git-${version}.tar.bz2";
     sha256 = "0ly0c3p8fjxqbk8k5rmm1a91wg8wcrvhi1lv4aawalkkk8rqbnwk";
   };
 
diff --git a/pkgs/os-specific/linux/aufs/2.nix b/pkgs/os-specific/linux/aufs/2.nix
index 87d16c113a5..a4a40823f7a 100644
--- a/pkgs/os-specific/linux/aufs/2.nix
+++ b/pkgs/os-specific/linux/aufs/2.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   src = 
   if (builtins.lessThan (builtins.compareVersions kernelDev.version "2.6.35") 0) then
     fetchurl {
-      url = "http://nixos.org/tarballs/aufs2-standalone-git-${version}.tar.bz2";
+      url = "http://tarballs.nixos.org/aufs2-standalone-git-${version}.tar.bz2";
       sha256 = "1g4mw4qx2xzpygdwjiw36bkhfz1hi7wxx7w79n2h0lr5grzzdnd6";
     }
   else
diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix
index 5af28876dc1..3956b5e04d0 100644
--- a/pkgs/os-specific/linux/usbutils/default.nix
+++ b/pkgs/os-specific/linux/usbutils/default.nix
@@ -4,7 +4,7 @@ let
 
   # Obtained from http://www.linux-usb.org/usb.ids.bz2.
   usbids = fetchurl {
-    url = http://nixos.org/tarballs/usb.ids.20120920.bz2;
+    url = http://tarballs.nixos.org/usb.ids.20120920.bz2;
     sha256 = "0sz860g7grf6kx22p49s6j8h85c69ymcw16a8110klzfl9hl9hli";
   };
 
diff --git a/pkgs/stdenv/linux/bootstrap/armv5tel/default.nix b/pkgs/stdenv/linux/bootstrap/armv5tel/default.nix
index 3a8a03e5a54..1d4d53a38ee 100644
--- a/pkgs/stdenv/linux/bootstrap/armv5tel/default.nix
+++ b/pkgs/stdenv/linux/bootstrap/armv5tel/default.nix
@@ -7,7 +7,7 @@
   curl = ./curl.bz2;
 
   bootstrapTools = {
-    url = "http://nixos.org/tarballs/stdenv-linux/armv5tel/r18744/bootstrap-tools.cpio.bz2";
+    url = "http://tarballs.nixos.org/stdenv-linux/armv5tel/r18744/bootstrap-tools.cpio.bz2";
     sha256 = "1rn4n5kilqmv62dfjfcscbsm0w329k3gyb2v9155fsi1sl2cfzcb";
   };
 }
diff --git a/pkgs/stdenv/linux/bootstrap/i686/default.nix b/pkgs/stdenv/linux/bootstrap/i686/default.nix
index 1d709766bfd..dc4fee1becc 100644
--- a/pkgs/stdenv/linux/bootstrap/i686/default.nix
+++ b/pkgs/stdenv/linux/bootstrap/i686/default.nix
@@ -7,7 +7,7 @@
   curl = ./curl.bz2;
 
   bootstrapTools = {
-    url = http://nixos.org/tarballs/stdenv-linux/i686/r24519/bootstrap-tools.cpio.bz2;
+    url = http://tarballs.nixos.org/stdenv-linux/i686/r24519/bootstrap-tools.cpio.bz2;
     sha256 = "0imypaxy6piwbk8ff2y1nr7yk49pqmdgdbv6g8miq1zs5yfip6ij";
   };
 }
diff --git a/pkgs/stdenv/linux/bootstrap/loongson2f/default.nix b/pkgs/stdenv/linux/bootstrap/loongson2f/default.nix
index b0ad8d6545d..b9a294e1332 100644
--- a/pkgs/stdenv/linux/bootstrap/loongson2f/default.nix
+++ b/pkgs/stdenv/linux/bootstrap/loongson2f/default.nix
@@ -7,7 +7,7 @@
   curl = ./curl.bz2;
 
   bootstrapTools = {
-    url = "http://nixos.org/tarballs/stdenv-linux/loongson2f/r22849/cross-bootstrap-tools.cpio.bz2";
+    url = "http://tarballs.nixos.org/stdenv-linux/loongson2f/r22849/cross-bootstrap-tools.cpio.bz2";
     sha256 = "00aavbk76qjj2gdlmpaaj66r8nzl4d7pyl8cv1gigyzgpbr5vv3j";
   };
 }
diff --git a/pkgs/stdenv/linux/bootstrap/powerpc/default.nix b/pkgs/stdenv/linux/bootstrap/powerpc/default.nix
index 61f7f863512..d3569362b6c 100644
--- a/pkgs/stdenv/linux/bootstrap/powerpc/default.nix
+++ b/pkgs/stdenv/linux/bootstrap/powerpc/default.nix
@@ -6,22 +6,22 @@
   tar = ./tar.bz2;
 
   staticToolsURL = {
-    url = http://nixos.org/tarballs/stdenv-linux/powerpc/r9828/static-tools.tar.bz2;
+    url = http://tarballs.nixos.org/stdenv-linux/powerpc/r9828/static-tools.tar.bz2;
     sha1 = "e4d1680e3dfa752e49a996a31140db53b10061cb";
   };
 
   binutilsURL = {
-    url = http://nixos.org/tarballs/stdenv-linux/powerpc/r9828/binutils.tar.bz2;
+    url = http://tarballs.nixos.org/stdenv-linux/powerpc/r9828/binutils.tar.bz2;
     sha1 = "2609f4d9277a60fcd178395d3d49911190e08f36";
   };
 
   gccURL = {
-    url = http://nixos.org/tarballs/stdenv-linux/powerpc/r9828/gcc.tar.bz2;
+    url = http://tarballs.nixos.org/stdenv-linux/powerpc/r9828/gcc.tar.bz2;
     sha1 = "71d79d736bfef6252208fe6239e528a591becbed";
   };
 
   glibcURL = {
-    url = http://nixos.org/tarballs/stdenv-linux/powerpc/r9828/glibc.tar.bz2;
+    url = http://tarballs.nixos.org/stdenv-linux/powerpc/r9828/glibc.tar.bz2;
     sha1 = "bf0245e16235800c8aa9c6a5de6565583a66e46d";
   };
 }
diff --git a/pkgs/stdenv/linux/bootstrap/x86_64/default.nix b/pkgs/stdenv/linux/bootstrap/x86_64/default.nix
index d9b9b460db2..eb8c1834a3a 100644
--- a/pkgs/stdenv/linux/bootstrap/x86_64/default.nix
+++ b/pkgs/stdenv/linux/bootstrap/x86_64/default.nix
@@ -4,7 +4,7 @@
 
 {
   bootstrapTools = {
-    url = http://nixos.org/tarballs/stdenv-linux/x86_64/r23302/bootstrap-tools.cpio.bz2;
+    url = http://tarballs.nixos.org/stdenv-linux/x86_64/r23302/bootstrap-tools.cpio.bz2;
     sha256 = "0w89kqhx47yl0jifp2vffp073pyrqha5f312kp971smi4h41drna";
   };
 }
diff --git a/pkgs/tools/filesystems/aefs/default.nix b/pkgs/tools/filesystems/aefs/default.nix
index 7e52190d43a..d081f08ffc7 100644
--- a/pkgs/tools/filesystems/aefs/default.nix
+++ b/pkgs/tools/filesystems/aefs/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "aefs-0.4pre259-8843b7c";
   
   src = fetchurl {
-    url = "http://nixos.org/tarballs/${name}.tar.bz2";
+    url = "http://tarballs.nixos.org/${name}.tar.bz2";
     sha256 = "167hp58hmgdavg2mqn5dx1xgq24v08n8d6psf33jhbdabzx6a6zq";
   };
 
diff --git a/pkgs/tools/misc/getopt/default.nix b/pkgs/tools/misc/getopt/default.nix
index faa4a9e8f7a..41bc2ffc99d 100644
--- a/pkgs/tools/misc/getopt/default.nix
+++ b/pkgs/tools/misc/getopt/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "getopt-1.1.4";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nixos.org/tarballs/getopt-1.1.4.tar.gz;
+    url = http://tarballs.nixos.org/getopt-1.1.4.tar.gz;
     md5 = "02188ca68da27c4175d6e9f3da732101";
   };
 }
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 9de3156f2a7..8542580e431 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -6,7 +6,7 @@
 let
 
   hpnSrc = fetchurl {
-    url = http://nixos.org/tarballs/openssh-6.1p1-hpn13v14.diff.gz;
+    url = http://tarballs.nixos.org/openssh-6.1p1-hpn13v14.diff.gz;
     sha256 = "14das6lim6fxxnx887ssw76ywsbvx3s4q3n43afgh5rgvs4xmnnq";
   };
 
diff --git a/pkgs/tools/networking/p2p/azureus/default.nix b/pkgs/tools/networking/p2p/azureus/default.nix
index 3e613bb9a6b..ffa360f3de4 100644
--- a/pkgs/tools/networking/p2p/azureus/default.nix
+++ b/pkgs/tools/networking/p2p/azureus/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "azureus-2.3.0.6";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nixos.org/tarballs/Azureus2.3.0.6.jar;
+    url = http://tarballs.nixos.org/Azureus2.3.0.6.jar;
     md5 = "84f85b144cdc574338c2c84d659ca620";
   };
 #  buildInputs = [unzip];
diff --git a/pkgs/tools/security/gnupg1/default.nix b/pkgs/tools/security/gnupg1/default.nix
index c779b979d9d..f9b959061da 100644
--- a/pkgs/tools/security/gnupg1/default.nix
+++ b/pkgs/tools/security/gnupg1/default.nix
@@ -8,7 +8,7 @@
 let
 
   idea = fetchurl {
-    url = http://nixos.org/tarballs/idea.c.gz;
+    url = http://tarballs.nixos.org/idea.c.gz;
     md5 = "9dc3bc086824a8c7a331f35e09a3e57f";
   };
 
diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix
index 3cab8b0ef10..78ff9131fa8 100644
--- a/pkgs/tools/system/pciutils/default.nix
+++ b/pkgs/tools/system/pciutils/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   pciids = fetchurl {
     # Obtained from http://pciids.sourceforge.net/v2.2/pci.ids.bz2.
-    url = http://nixos.org/tarballs/pci.ids.20120929.bz2;
+    url = http://tarballs.nixos.org/pci.ids.20120929.bz2;
     sha256 = "1q3i479ay88wam1zz1vbgkbqb2axg8av9qjxaigrqbnw2pv0srmb";
   };
 
diff --git a/pkgs/tools/text/xml/xpf/default.nix b/pkgs/tools/text/xml/xpf/default.nix
index fa8e8078362..3ff89294ab1 100644
--- a/pkgs/tools/text/xml/xpf/default.nix
+++ b/pkgs/tools/text/xml/xpf/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "xpf-0.2";
   
   src = fetchurl {
-    url = http://nixos.org/tarballs/xpf-0.2.tar.gz;
+    url = http://tarballs.nixos.org/xpf-0.2.tar.gz;
     md5 = "d92658828139e1495e052d0cfe25d312";
   };
   
diff --git a/pkgs/tools/typesetting/bibtex-tools/default.nix b/pkgs/tools/typesetting/bibtex-tools/default.nix
index 304f50f2906..c2c9a942845 100644
--- a/pkgs/tools/typesetting/bibtex-tools/default.nix
+++ b/pkgs/tools/typesetting/bibtex-tools/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "bibtex-tools-0.2pre13026";
   src = fetchurl {
-    url = http://nixos.org/tarballs/bibtex-tools-0.2pre13026.tar.gz;
+    url = http://tarballs.nixos.org/bibtex-tools-0.2pre13026.tar.gz;
     md5 = "2d8a5de7c53eb670307048eb3d14cdd6";
   };
   configureFlags = "
diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix
index 1905166c38e..e9b62886fce 100644
--- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix
+++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ unzip makeWrapper ];
 
   src = fetchurl {
-    url = "http://nixos.org/tarballs/${name}.zip";
+    url = "http://tarballs.nixos.org/${name}.zip";
     sha256 = "0icpjr2ipch3f6cf4rg9x5z2y9k6a4rd85npsmw3a1ambs3dwxlq";
   };
 
diff --git a/pkgs/tools/virtualization/ec2-api-tools/default.nix b/pkgs/tools/virtualization/ec2-api-tools/default.nix
index ac2902aab94..a80ad91c4c3 100644
--- a/pkgs/tools/virtualization/ec2-api-tools/default.nix
+++ b/pkgs/tools/virtualization/ec2-api-tools/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "ec2-api-tools-1.6.5.1";
 
   src = fetchurl {
-    url = "http://nixos.org/tarballs/${name}.zip";
+    url = "http://tarballs.nixos.org/${name}.zip";
     sha256 = "1j2pc20vggi4hv950999mhh7dl6475yma76nyj6k0hzkd1lf5hda";
   };
 
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 5c4574fddd8..c4fc6a1767a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -152,7 +152,7 @@ rec {
   ArchiveZip = buildPerlPackage {
     name = "Archive-Zip-1.16";
     src = fetchurl {
-      url = http://nixos.org/tarballs/Archive-Zip-1.16.tar.gz;
+      url = http://tarballs.nixos.org/Archive-Zip-1.16.tar.gz;
       md5 = "e28dff400d07b1659d659d8dde7071f1";
     };
   };

From e382e34f51fcbbbd31eb8203cf2bb43b78bb3025 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 25 Jun 2013 19:47:01 +0200
Subject: [PATCH 070/314] qemu: Enable support for VDE networking

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

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 997cc8bd49d..434ec180203 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses, perl, pixman
-, attr, libcap }:
+, attr, libcap, vde2 }:
 
 stdenv.mkDerivation rec {
   name = "qemu-1.4.0";
@@ -11,12 +11,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     python zlib pkgconfig glib SDL ncurses perl pixman attr libcap
+    vde2
   ];
 
   enableParallelBuilding = true;
 
   configureFlags = [
     "--enable-virtfs"
+    "--enable-vde"
   ];
 
   meta = {

From b7ccfc258abce98f999035dac83b821360016ac4 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 25 Jun 2013 13:42:35 +0200
Subject: [PATCH 071/314] Linux 3.2-3.9: Add CONFIG_RC_DEVICES=y, to enable IR
 devices that can be used by lirc/devinput

---
 pkgs/os-specific/linux/kernel/linux-3.2.nix | 1 +
 pkgs/os-specific/linux/kernel/linux-3.4.nix | 1 +
 pkgs/os-specific/linux/kernel/linux-3.7.nix | 1 +
 pkgs/os-specific/linux/kernel/linux-3.8.nix | 1 +
 pkgs/os-specific/linux/kernel/linux-3.9.nix | 1 +
 5 files changed, 5 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
index c07448b43b5..318b417f444 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix
@@ -197,6 +197,7 @@ let
       NET_FC y # Fibre Channel driver support
       PPP_MULTILINK y # PPP multilink support
       REGULATOR y # Voltage and Current Regulator Support
+      RC_DEVICES y # Enable IR devices
       SCSI_LOGGING y # SCSI logging facility
       SERIAL_8250 y # 8250/16550 and compatible serial support
       SLIP_COMPRESSED y # CSLIP compressed headers
diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix
index cd7e9f2b375..440f39227ed 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix
@@ -199,6 +199,7 @@ let
       NET_FC y # Fibre Channel driver support
       PPP_MULTILINK y # PPP multilink support
       REGULATOR y # Voltage and Current Regulator Support
+      RC_DEVICES y # Enable IR devices
       SCSI_LOGGING y # SCSI logging facility
       SERIAL_8250 y # 8250/16550 and compatible serial support
       SLIP_COMPRESSED y # CSLIP compressed headers
diff --git a/pkgs/os-specific/linux/kernel/linux-3.7.nix b/pkgs/os-specific/linux/kernel/linux-3.7.nix
index 8f77334901d..2b31ec282ca 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.7.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.7.nix
@@ -200,6 +200,7 @@ let
       NET_FC y # Fibre Channel driver support
       PPP_MULTILINK y # PPP multilink support
       REGULATOR y # Voltage and Current Regulator Support
+      RC_DEVICES y # Enable IR devices
       SCSI_LOGGING y # SCSI logging facility
       SERIAL_8250 y # 8250/16550 and compatible serial support
       SLIP_COMPRESSED y # CSLIP compressed headers
diff --git a/pkgs/os-specific/linux/kernel/linux-3.8.nix b/pkgs/os-specific/linux/kernel/linux-3.8.nix
index 6681438edd5..1516f97521d 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.8.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.8.nix
@@ -200,6 +200,7 @@ let
       NET_FC y # Fibre Channel driver support
       PPP_MULTILINK y # PPP multilink support
       REGULATOR y # Voltage and Current Regulator Support
+      RC_DEVICES y # Enable IR devices
       SCSI_LOGGING y # SCSI logging facility
       SERIAL_8250 y # 8250/16550 and compatible serial support
       SLIP_COMPRESSED y # CSLIP compressed headers
diff --git a/pkgs/os-specific/linux/kernel/linux-3.9.nix b/pkgs/os-specific/linux/kernel/linux-3.9.nix
index 4a2a0c1d163..b63dfd5d827 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.9.nix
@@ -200,6 +200,7 @@ let
       NET_FC y # Fibre Channel driver support
       PPP_MULTILINK y # PPP multilink support
       REGULATOR y # Voltage and Current Regulator Support
+      RC_DEVICES y # Enable IR devices
       SCSI_LOGGING y # SCSI logging facility
       SERIAL_8250 y # 8250/16550 and compatible serial support
       SLIP_COMPRESSED y # CSLIP compressed headers

From 1802152e93717c66e67e93934412de03eff6773d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 25 Jun 2013 17:59:23 +0200
Subject: [PATCH 072/314] Remove Firefox 20.0

---
 .../networking/browsers/firefox/20.0.nix      | 175 ------------------
 pkgs/top-level/all-packages.nix               |   7 -
 2 files changed, 182 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/firefox/20.0.nix

diff --git a/pkgs/applications/networking/browsers/firefox/20.0.nix b/pkgs/applications/networking/browsers/firefox/20.0.nix
deleted file mode 100644
index 39cf69dcfb0..00000000000
--- a/pkgs/applications/networking/browsers/firefox/20.0.nix
+++ /dev/null
@@ -1,175 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
-, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
-, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
-, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
-
-, # If you want the resulting program to call itself "Firefox" instead
-  # of "Shiretoko" or whatever, enable this option.  However, those
-  # binaries may not be distributed without permission from the
-  # Mozilla Foundation, see
-  # http://www.mozilla.org/foundation/trademarks/.
-  enableOfficialBranding ? false
-}:
-
-assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
-
-rec {
-
-  firefoxVersion = "20.0";
-
-  xulVersion = "20.0"; # this attribute is used by other packages
-
-
-  src = fetchurl {
-    urls = [
-        # It is better to use this url for official releases, to take load off Mozilla's ftp server.
-        "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
-        # 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 = "6d776c29da0be0d2a50abeb504d63b06b7861218";
-  };
-
-  commonConfigureFlags =
-    [ "--enable-optimize"
-      #"--enable-profiling"
-      "--disable-debug"
-      "--enable-strip"
-      "--with-system-jpeg" # now we use recent libjpeg-turbo
-      "--with-system-zlib"
-      "--with-system-bz2"
-      "--with-system-nspr"
-      "--with-system-nss"
-      # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
-      # "--enable-system-cairo" # <-- doesn't build
-      "--enable-system-sqlite"
-      "--disable-crashreporter"
-      "--disable-tests"
-      "--disable-necko-wifi" # maybe we want to enable this at some point
-      "--disable-installer"
-      "--disable-updater"
-    ];
-
-
-  xulrunner = stdenv.mkDerivation rec {
-    name = "xulrunner-${xulVersion}";
-
-    inherit src;
-
-    buildInputs =
-      [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
-        python dbus dbus_glib pango freetype fontconfig xlibs.libXi
-        xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
-        alsaLib nspr nss libnotify xlibs.pixman yasm mesa
-        xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
-        xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
-      ];
-
-    configureFlags =
-      [ "--enable-application=xulrunner"
-        "--disable-javaxpcom"
-      ] ++ commonConfigureFlags;
-
-    enableParallelBuilding = true;
-
-    preConfigure =
-      ''
-        export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}"
-
-        mkdir ../objdir
-        cd ../objdir
-        configureScript=../mozilla-release/configure
-      ''; # */
-
-    #installFlags = "SKIP_GRE_REGISTRATION=1";
-
-    postInstall = ''
-      # Fix run-mozilla.sh search
-      libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*)
-      echo libDir: $libDir
-      test -n "$libDir"
-      cd $out/bin
-      rm xulrunner
-
-      for i in $out/lib/$libDir/*; do
-          file $i;
-          if file $i | grep executable &>/dev/null; then
-              echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")";
-              chmod a+x "$out/bin/$(basename "$i")";
-          fi;
-      done
-      for i in $out/lib/$libDir/*.so; do
-          patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true
-      done
-      for i in $out/lib/$libDir/{plugin-container,xulrunner,xulrunner-stub}; do
-          wrapProgram $i --prefix LD_LIBRARY_PATH ':' "$out/lib/$libDir"
-      done
-      rm -f $out/bin/run-mozilla.sh
-    ''; # */
-
-    meta = {
-      description = "Mozilla Firefox XUL runner";
-      homepage = http://www.mozilla.com/en-US/firefox/;
-    };
-
-    passthru = { inherit gtk; version = xulVersion; };
-  };
-
-
-  firefox = stdenv.mkDerivation rec {
-    name = "firefox-${firefoxVersion}";
-
-    inherit src;
-
-    enableParallelBuilding = true;
-
-    buildInputs =
-      [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
-        dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
-        xlibs.pixman yasm mesa sqlite file unzip pysqlite
-      ];
-
-    propagatedBuildInputs = [xulrunner];
-
-    configureFlags =
-      [ "--enable-application=browser"
-        "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
-        "--enable-chrome-format=jar"
-      ]
-      ++ commonConfigureFlags
-      ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
-
-    makeFlags = [
-      "SYSTEM_LIBXUL=1"
-    ];
-
-    # Hack to work around make's idea of -lbz2 dependency
-    preConfigure =
-      ''
-        find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
-          stdenv.lib.concatStringsSep ":"
-            (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
-        }' ';'
-      '';
-
-    postInstall =
-      ''
-        ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner
-        cd "$out/lib/"firefox-*
-        rm firefox
-        echo -e '#!${stdenv.shell}\nexec ${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox
-        chmod a+x firefox
-      ''; # */
-
-    meta = {
-      description = "Mozilla Firefox - the browser, reloaded";
-      homepage = http://www.mozilla.com/en-US/firefox/;
-      maintainers = [ stdenv.lib.maintainers.eelco ];
-    };
-
-    passthru = {
-      inherit gtk xulrunner nspr;
-      isFirefox3Like = true;
-    };
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 782e83d1948..6c5e3c6025e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7379,13 +7379,6 @@ let
 
   firefox13Wrapper = lowPrio (wrapFirefox { browser = firefox13Pkgs.firefox; });
 
-  firefox20Pkgs = callPackage ../applications/networking/browsers/firefox/20.0.nix {
-    inherit (gnome) libIDL;
-    inherit (pythonPackages) pysqlite;
-  };
-
-  firefox20Wrapper = lowPrio (wrapFirefox { browser = firefox20Pkgs.firefox; });
-
   firefox21Pkgs = callPackage ../applications/networking/browsers/firefox/21.0.nix {
     inherit (gnome) libIDL;
     inherit (pythonPackages) pysqlite;

From 9da4ccaf3d3a1d5c686678a2bf3f1d0bb41faa17 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 25 Jun 2013 18:02:41 +0200
Subject: [PATCH 073/314] firefox: Rename 21.0.nix to default.nix

---
 .../networking/browsers/firefox/{21.0.nix => default.nix} | 0
 pkgs/top-level/all-packages.nix                           | 8 ++------
 2 files changed, 2 insertions(+), 6 deletions(-)
 rename pkgs/applications/networking/browsers/firefox/{21.0.nix => default.nix} (100%)

diff --git a/pkgs/applications/networking/browsers/firefox/21.0.nix b/pkgs/applications/networking/browsers/firefox/default.nix
similarity index 100%
rename from pkgs/applications/networking/browsers/firefox/21.0.nix
rename to pkgs/applications/networking/browsers/firefox/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6c5e3c6025e..058833a13a8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7363,10 +7363,6 @@ let
 
   firefox = pkgs.firefoxPkgs.firefox;
 
-  firefoxWrapper = wrapFirefox { browser = pkgs.firefox; };
-
-  firefoxPkgs = pkgs.firefox21Pkgs;
-
   firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix {
     inherit (gnome) libIDL;
   };
@@ -7379,12 +7375,12 @@ let
 
   firefox13Wrapper = lowPrio (wrapFirefox { browser = firefox13Pkgs.firefox; });
 
-  firefox21Pkgs = callPackage ../applications/networking/browsers/firefox/21.0.nix {
+  firefoxPkgs = callPackage ../applications/networking/browsers/firefox {
     inherit (gnome) libIDL;
     inherit (pythonPackages) pysqlite;
   };
 
-  firefox21Wrapper = lowPrio (wrapFirefox { browser = firefox21Pkgs.firefox; });
+  firefoxWrapper = lowPrio (wrapFirefox { browser = firefoxPkgs.firefox; });
 
   flac = callPackage ../applications/audio/flac { };
 

From 94d9f18e4765f53bf0f29e0ad0ca30470269b81a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 25 Jun 2013 20:58:12 +0200
Subject: [PATCH 074/314] firefox: Update to 22.0

---
 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 35ba2cad124..5a50bab0945 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 = "21.0";
+  firefoxVersion = "22.0";
 
-  xulVersion = "21.0"; # this attribute is used by other packages
+  xulVersion = "22.0"; # 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 = "e63b5488eaec1956947f59609d5839332ba7ffe1";
+    sha1 = "db2d5b028b6ea95b5f006b46e153f50f7a52bf80";
   };
 
   commonConfigureFlags =

From 489040bf58f5f10b7ad347bf9d1c0389b52419a5 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 25 Jun 2013 22:17:00 +0200
Subject: [PATCH 075/314] Linux 3.2: Doesn't support CONFIG_RC_DEVICES option

---
 pkgs/os-specific/linux/kernel/linux-3.2.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
index 318b417f444..c07448b43b5 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix
@@ -197,7 +197,6 @@ let
       NET_FC y # Fibre Channel driver support
       PPP_MULTILINK y # PPP multilink support
       REGULATOR y # Voltage and Current Regulator Support
-      RC_DEVICES y # Enable IR devices
       SCSI_LOGGING y # SCSI logging facility
       SERIAL_8250 y # 8250/16550 and compatible serial support
       SLIP_COMPRESSED y # CSLIP compressed headers

From 978fa9893346bd04f0bf0e264a9c2db5831a6ca9 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Tue, 25 Jun 2013 22:19:31 +0200
Subject: [PATCH 076/314] avrdude: Add libusb to enable USB support

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

diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix
index 7a294e72078..adbaf5e3e8b 100644
--- a/pkgs/development/tools/misc/avrdude/default.nix
+++ b/pkgs/development/tools/misc/avrdude/default.nix
@@ -1,4 +1,4 @@
-{ composableDerivation, fetchurl, yacc, flex, texLive }:
+{ composableDerivation, fetchurl, yacc, flex, texLive, libusb }:
 
 let edf = composableDerivation.edf; in
 
@@ -12,7 +12,7 @@ composableDerivation.composableDerivation {} rec {
 
   configureFlags = [ "--disable-dependency-tracking" ];
 
-  buildInputs = [ yacc flex ];
+  buildInputs = [ yacc flex libusb ];
 
   flags =
        edf { name = "doc"; enable = { buildInputs = texLive; configureFlags = ["--enable-doc"]; }; }

From 896da1bf8a31ba72ef8be91421afca66af8548f4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 26 Jun 2013 11:24:10 +0200
Subject: [PATCH 077/314] Fix reference to firefox21

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

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index ffe054ee674..8a711d56405 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -359,7 +359,7 @@ let
       };
 
       firefox36Pkgs.firefox = linux;
-      firefox21Pkgs.firefox = linux;
+      firefoxPkgs.firefox = linux;
 
       gnome = {
         gnome_panel = linux;

From 1e7e9c583d2aaecbe0e6e0c6eb4ed20755e07190 Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Wed, 26 Jun 2013 19:25:09 +0800
Subject: [PATCH 078/314] add retroarch 0.9.9

---
 pkgs/misc/emulators/retroarch/default.nix | 27 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/misc/emulators/retroarch/default.nix

diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix
new file mode 100644
index 00000000000..a98e6db2db4
--- /dev/null
+++ b/pkgs/misc/emulators/retroarch/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pkgconfig, which
+, SDL, mesa, alsaLib
+}:
+
+stdenv.mkDerivation rec {
+  name = "retroarch-0.9.9";
+
+  src = fetchurl {
+    url = "http://themaister.net/retroarch-dl/${name}.tar.gz";
+    sha256 = "08xlndpl14c4ccgp752ixx3a7ajf3xp93nawhinwxq0cw801prda";
+  };
+
+  buildInputs = [
+    pkgconfig which SDL mesa alsaLib
+  ];
+
+  preConfigure = ''
+    configureFlags="--global-config-dir=$out/etc"
+  '';
+
+  meta = {
+    description = "A cross-platform multi-system emulator";
+    homepage = "http://themaister.net/retroarch.html";
+    license = stdenv.lib.licenses.gpl3Plus;
+    platform = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 058833a13a8..bf19d3e01c1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9474,6 +9474,8 @@ let
 
   putty = callPackage ../applications/networking/remote/putty { };
 
+  retroarch = callPackage ../misc/emulators/retroarch { };
+
   rssglx = callPackage ../misc/screensavers/rss-glx { };
 
   xlockmore = callPackage ../misc/screensavers/xlockmore { };

From 0db328dde0cd62491d104f4846cd86f2d37be62a Mon Sep 17 00:00:00 2001
From: David Guibert <david.guibert@gmail.com>
Date: Tue, 18 Jun 2013 17:20:28 +0200
Subject: [PATCH 079/314] String::ToIdentifier::EN: Update to 0.10

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c4fc6a1767a..2139341f3b5 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5775,10 +5775,10 @@ rec {
   };
 
   StringToIdentifierEN = buildPerlPackage rec {
-    name = "String-ToIdentifier-EN-0.06";
+    name = "String-ToIdentifier-EN-0.10";
     src = fetchurl {
       url = "mirror://cpan/modules/by-module/String/${name}.tar.gz";
-      sha256 = "1rmldr7jf4jvkhzlv8hgp48lrmybvinmhv8kcnrpa8las0ijm4vm";
+      sha256 = "1xm0v1cq9hdgx4mswa9wdr2lqk7z9kh1bwjkx4wb5xljd0lxhas6";
     };
     propagatedBuildInputs =
       [ LinguaENInflectPhrase TextUnidecode namespaceclean ];

From 3d8cd48c58903110e85f3ee41bf7bc961fc1b676 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 26 Jun 2013 23:46:47 +0200
Subject: [PATCH 080/314] Making ccrtp propagate its build time requirement,
 ucommon.

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

diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix
index a6e426b164a..c5ae776fe3e 100644
--- a/pkgs/development/libraries/ccrtp/default.nix
+++ b/pkgs/development/libraries/ccrtp/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation {
     sha256 = "1p4zzqn02zvnyjy84khiq8v65pl422fb6ni946h9sxh4yw2lgn01";
   };
 
-  buildInputs = [ openssl pkgconfig libgcrypt ucommon ];
+  buildInputs = [ openssl pkgconfig libgcrypt ];
+  propagatedBuildInputs = [ ucommon ];
 
   doCheck = true;
 

From c77f6a0c2fb99235d8eca2b8b09c54b655999d2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 26 Jun 2013 23:47:09 +0200
Subject: [PATCH 081/314] As libccrtp propagates ucommon, it's not needed in
 libzrtpcpp.

---
 pkgs/development/libraries/libzrtpcpp/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libzrtpcpp/default.nix b/pkgs/development/libraries/libzrtpcpp/default.nix
index 9e569eea580..02741bc6fa1 100644
--- a/pkgs/development/libraries/libzrtpcpp/default.nix
+++ b/pkgs/development/libraries/libzrtpcpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, ucommon, openssl, pkgconfig, ccrtp }:
+{ stdenv, fetchurl, cmake, openssl, pkgconfig, ccrtp }:
 
 stdenv.mkDerivation rec {
   name = "libzrtpcpp-2.0.0";
@@ -8,7 +8,12 @@ stdenv.mkDerivation rec {
     sha256 = "05yw8n5xpj0jxkvzgsvn3xkxirpypc1japy9k1jqs9301fgb1a3i";
   };
 
-  buildInputs = [ cmake ucommon openssl pkgconfig ccrtp ];
+  # We disallow 'lib64', or pkgconfig will not find it.
+  prePatch = ''
+    sed -i s/lib64/lib/ CMakeLists.txt
+  '';
+
+  buildInputs = [ cmake openssl pkgconfig ccrtp ];
 
   meta = { 
     description = "GNU RTP stack for the zrtp protocol developed by Phil Zimmermann";

From d3e7649eeec968b7979ea4c1f6f16c8d7d292155 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 26 Jun 2013 23:47:34 +0200
Subject: [PATCH 082/314] Update ucommon to 6.0.5.

The hope that newer means better.
---
 pkgs/development/libraries/ucommon/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix
index cfcb47dd54f..ca0427481da 100644
--- a/pkgs/development/libraries/ucommon/default.nix
+++ b/pkgs/development/libraries/ucommon/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, gnutls, pkgconfig, zlib, libgcrypt }:
 
 stdenv.mkDerivation rec {
-  name = "ucommon-5.2.2";
+  name = "ucommon-6.0.5";
 
   src = fetchurl {
-    url = mirror://gnu/commoncpp/ucommon-5.2.2.tar.gz;
-    sha256 = "1s9r7yhvqnj57aiw7sklp2p6llfzn1jxvc3hwhpli5zq3r6kypwx";
+    url = mirror://gnu/commoncpp/ucommon-6.0.5.tar.gz;
+    sha256 = "0w5nl2a2l630n4kvfaz22by1s92ybd87g0q1zpcmsl8i5d00789l";
   };
 
   buildInputs = [ pkgconfig gnutls zlib ];

From 53f38dcbd041b95c09dabae536fb3ff73d3bb61d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 26 Jun 2013 23:48:55 +0200
Subject: [PATCH 083/314] Adding partially sflphone (only daemon, maybe failing
 to build)

---
 .../instant-messengers/sflphone/default.nix   | 32 +++++++++++++++++++
 .../sflphone/libzrtpcpp-cflags.patch          | 15 +++++++++
 pkgs/top-level/all-packages.nix               |  3 +-
 3 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/networking/instant-messengers/sflphone/default.nix
 create mode 100644 pkgs/applications/networking/instant-messengers/sflphone/libzrtpcpp-cflags.patch

diff --git a/pkgs/applications/networking/instant-messengers/sflphone/default.nix b/pkgs/applications/networking/instant-messengers/sflphone/default.nix
new file mode 100644
index 00000000000..4dbfa3da979
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/sflphone/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, libyaml, alsaLib, openssl, libuuid, pkgconfig, pulseaudio, libsamplerate,
+commoncpp2, ccrtp, libzrtpcpp, dbus, dbus_cplusplus, expat, pcre, gsm, speex, ilbc, libopus,
+autoconf, automake, libtool, gettext, perl }:
+
+stdenv.mkDerivation rec {
+  name = "sflphone-1.2.3";
+
+  src = fetchurl {
+    url = "https://projects.savoirfairelinux.com/attachments/download/6423/${name}.tar.gz";
+    sha256 = "0aiwlky7mp5l51a7kkhkmaz7ivapypar291kdxzdxl1s3qy0x6fd";
+  };
+
+  patches = [ ./libzrtpcpp-cflags.patch ];
+
+  preConfigure = ''
+    cd daemon
+
+    # Post patch, required
+    autoreconf -vfi
+
+    cd libs
+    bash ./compile_pjsip.sh
+    cd ..
+  '';
+
+  configureFlags = "--with-expat --with-expat-inc=${expat}/include " +
+    "--with-expat-lib=-lexpat --with-opus ";
+
+  buildInputs = [ libyaml alsaLib openssl libuuid pkgconfig pulseaudio libsamplerate 
+    commoncpp2 ccrtp libzrtpcpp dbus dbus_cplusplus expat pcre gsm speex ilbc libopus
+    autoconf automake libtool gettext perl ];
+}
diff --git a/pkgs/applications/networking/instant-messengers/sflphone/libzrtpcpp-cflags.patch b/pkgs/applications/networking/instant-messengers/sflphone/libzrtpcpp-cflags.patch
new file mode 100644
index 00000000000..972d9c58808
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/sflphone/libzrtpcpp-cflags.patch
@@ -0,0 +1,15 @@
+diff --git a/daemon/src/audio/audiortp/Makefile.am b/daemon/src/audio/audiortp/Makefile.am
+index c27eedd..fe64077 100644
+--- a/daemon/src/audio/audiortp/Makefile.am
++++ b/daemon/src/audio/audiortp/Makefile.am
+@@ -4,6 +4,10 @@ noinst_LTLIBRARIES = libaudiortp.la
+ 
+ if BUILD_ZRTP
+ SFL_ZRTP_SRC=audio_zrtp_session.h audio_zrtp_session.cpp zrtp_session_callback.cpp zrtp_session_callback.h
++libaudiortp_la_CXXFLAGS = \
++		@CCGNU2_CFLAGS@ \
++		@ZRTPCPP_CFLAGS@ \
++		@CCRTP_CFLAGS@
+ endif
+ 
+ libaudiortp_la_SOURCES = \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6316f0a7557..7ac7ff889ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8107,6 +8107,8 @@ let
 
   seq24 = callPackage ../applications/audio/seq24 { };
 
+  sflphone = callPackage ../applications/networking/instant-messengers/sflphone { };
+
   siproxd = callPackage ../applications/networking/siproxd { };
 
   skype = callPackage_i686 ../applications/networking/instant-messengers/skype {
@@ -8115,7 +8117,6 @@ let
 
   skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { };
 
-
   skype_call_recorder = callPackage ../applications/networking/instant-messengers/skype-call-recorder { };
 
   st = callPackage ../applications/misc/st {

From 538a1d3aa14358446e66dfe41ccd82fa8f032e9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 27 Jun 2013 00:09:26 +0200
Subject: [PATCH 084/314] Making sflphone build, and its gnome client too.

---
 .../instant-messengers/sflphone/default.nix   | 83 +++++++++++++++----
 pkgs/top-level/all-packages.nix               |  4 +-
 2 files changed, 68 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/sflphone/default.nix b/pkgs/applications/networking/instant-messengers/sflphone/default.nix
index 4dbfa3da979..79b554798ee 100644
--- a/pkgs/applications/networking/instant-messengers/sflphone/default.nix
+++ b/pkgs/applications/networking/instant-messengers/sflphone/default.nix
@@ -1,8 +1,10 @@
-{ stdenv, fetchurl, libyaml, alsaLib, openssl, libuuid, pkgconfig, pulseaudio, libsamplerate,
-commoncpp2, ccrtp, libzrtpcpp, dbus, dbus_cplusplus, expat, pcre, gsm, speex, ilbc, libopus,
-autoconf, automake, libtool, gettext, perl }:
+{ stdenv, fetchurl, libyaml, alsaLib, openssl, libuuid, pkgconfig, pulseaudio, libsamplerate
+, commoncpp2, ccrtp, libzrtpcpp, dbus, dbus_cplusplus, expat, pcre, gsm, speex, ilbc, libopus
+, autoconf, automake, libtool, gettext, perl
+, cmake, qt4
+, gtk, glib, dbus_glib, libnotify, intltool }:
 
-stdenv.mkDerivation rec {
+let
   name = "sflphone-1.2.3";
 
   src = fetchurl {
@@ -10,23 +12,68 @@ stdenv.mkDerivation rec {
     sha256 = "0aiwlky7mp5l51a7kkhkmaz7ivapypar291kdxzdxl1s3qy0x6fd";
   };
 
-  patches = [ ./libzrtpcpp-cflags.patch ];
+  meta = {
+    homepage = http://sflphone.org/;
+    license = "GPLv3+";
+    description = "Free software enterprise-class softphone for GNU/Linux";
+    platforms = with stdenv.lib.platforms; linux;
+    maintainers = with stdenv.lib.maintainers; [viric];
+  };
 
-  preConfigure = ''
-    cd daemon
+in
+rec {
+  daemon = stdenv.mkDerivation {
+    name = name + "-daemon";
 
-    # Post patch, required
-    autoreconf -vfi
+    inherit src;
 
-    cd libs
-    bash ./compile_pjsip.sh
-    cd ..
-  '';
+    patches = [ ./libzrtpcpp-cflags.patch ];
 
-  configureFlags = "--with-expat --with-expat-inc=${expat}/include " +
-    "--with-expat-lib=-lexpat --with-opus ";
+    preConfigure = ''
+      cd daemon
 
-  buildInputs = [ libyaml alsaLib openssl libuuid pkgconfig pulseaudio libsamplerate 
-    commoncpp2 ccrtp libzrtpcpp dbus dbus_cplusplus expat pcre gsm speex ilbc libopus
-    autoconf automake libtool gettext perl ];
+      # Post patch, required
+      autoreconf -vfi
+
+      cd libs
+      bash ./compile_pjsip.sh
+      cd ..
+    '';
+
+    configureFlags = "--with-expat --with-expat-inc=${expat}/include " +
+      "--with-expat-lib=-lexpat --with-opus ";
+
+    buildInputs = [ libyaml alsaLib openssl libuuid pkgconfig pulseaudio libsamplerate 
+      commoncpp2 ccrtp libzrtpcpp dbus dbus_cplusplus expat pcre gsm speex ilbc libopus
+      autoconf automake libtool gettext perl ];
+  };
+
+  # This fails still.
+  # I don't know the best way to make this a KDE program (with switchable kde
+  # libs, like digikam for example)
+  /*
+  kde = stdenv.mkDerivation {
+    name = name + "-kde";
+
+    inherit src;
+
+    preConfigure = ''
+      cd kde
+    '';
+
+    buildInputs = [ daemon cmake qt4 pkgconfig ];
+  };
+  */
+
+  gnome = stdenv.mkDerivation {
+    name = name + "-gnome";
+
+    inherit src;
+
+    preConfigure = ''
+      cd gnome
+    '';
+
+    buildInputs = [ daemon pkgconfig gtk glib dbus_glib libnotify intltool ];
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7ac7ff889ff..45ed59df888 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8107,7 +8107,9 @@ let
 
   seq24 = callPackage ../applications/audio/seq24 { };
 
-  sflphone = callPackage ../applications/networking/instant-messengers/sflphone { };
+  sflphone = callPackage ../applications/networking/instant-messengers/sflphone {
+    gtk = gtk3;
+  };
 
   siproxd = callPackage ../applications/networking/siproxd { };
 

From 81a0a3d458b226dabf7b2849f3ee00d4a9a688e5 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Thu, 27 Jun 2013 00:35:47 +0200
Subject: [PATCH 085/314] python-six: Update to 1.3.0

---
 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 f0e74a0277f..9e15a2f2952 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4546,11 +4546,11 @@ pythonPackages = python.modules // rec {
 
 
   six = buildPythonPackage rec {
-    name = "six-1.1.0";
+    name = "six-1.3.0";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/s/six/${name}.tar.gz";
-      md5 = "9e8099b57cd27493a6988e9c9b313e23";
+      md5 = "ec47fe6070a8a64c802363d2c2b1e2ee";
     };
 
     # error: invalid command 'test'

From 84a4d03b51037be41b33e9db4b4f4955c1b9c47e Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Thu, 27 Jun 2013 00:36:28 +0200
Subject: [PATCH 086/314] python-mrbob: fix it and update to 0.1a9

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9e15a2f2952..45afdf766ef 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2541,16 +2541,17 @@ pythonPackages = python.modules // rec {
 
   mrbob = buildPythonPackage rec {
     name = "mrbob-${version}";
-    version = "0.1a6";
+    version = "0.1a9";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/m/mr.bob/mr.bob-${version}.zip";
-      md5 = "361c8ac7a31953ab94a95cf34d9a0b2b";
+      md5 = "2d27d9bd1fc6269a3ecfd1a1ae47cd8a";
     };
 
-    buildInputs = [ pkgs.unzip six ] ++ (optionals isPy26 [ importlib ordereddict ]);
+    buildInputs = [ pkgs.unzip ];
 
-    propagatedBuildInputs = [ argparse jinja2 ];
+    propagatedBuildInputs = [ argparse jinja2 six python.modules.readline ] ++
+                            (optionals isPy26 [ importlib ordereddict ]);
 
     meta = {
       homepage = https://github.com/iElectric/mr.bob.git;

From 72afda56d5913672ff2189a4e04c50a0f9201546 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Thu, 27 Jun 2013 11:21:11 +1000
Subject: [PATCH 087/314] vim-xdebug: add expression

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

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index da06eaec35c..68e968d571e 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -166,5 +166,19 @@ in
       cp -R syntax "$out/vim-plugins"
     '';
   };
+
+  xdebug = stdenv.mkDerivation {
+    name = "vim-xdebug-a4980fa65f7f159780593ee37c178281691ba2c4";
+
+    src = fetchurl {
+      url = "https://github.com/joonty/vim-xdebug/archive/a4980fa65f7f159780593ee37c178281691ba2c4.tar.gz";
+      sha256 = "1348gzp0zhc2wifvs5vmf92m9y8ik8ldnvy7bawsxahy8hmhiksk";
+    };
+
+    installPhase = ''
+      mkdir -p "$out/vim-plugins"
+      cp -R plugin "$out/vim-plugins"
+    '';
+  };
 }
 

From 25cffccc288453ce4ffc18c2da0fb065d62ad463 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 27 Jun 2013 09:50:52 +0300
Subject: [PATCH 088/314] Fix binutils_deterministic to not break evaluation in
 certain cases. Quite a sneaky bug!

---
 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 78d8561c2b5..578734e9b9e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3244,7 +3244,10 @@ let
     inherit noSysDirs;
   };
 
-  binutils_deterministic = binutils.override { deterministic = true; };
+  binutils_deterministic = lowPrio (callPackage ../development/tools/misc/binutils {
+    inherit noSysDirs;
+    deterministic = true;
+  });
 
   binutils_gold = lowPrio (callPackage ../development/tools/misc/binutils {
     inherit noSysDirs;

From b0c946a86a85cdb80e090e66a4d681e929caaa96 Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Thu, 27 Jun 2013 12:04:46 +0200
Subject: [PATCH 089/314] added mcrypt

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

diff --git a/pkgs/tools/misc/mcrypt/default.nix b/pkgs/tools/misc/mcrypt/default.nix
new file mode 100644
index 00000000000..7701f0e2059
--- /dev/null
+++ b/pkgs/tools/misc/mcrypt/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, libmcrypt, libmhash }:
+ 
+stdenv.mkDerivation rec {
+  version = "2.6.8";
+  name = "mcrypt-${version}";
+  
+  src = fetchurl {
+    url = "mirror://sourceforge/mcrypt/MCrypt/${version}/${name}.tar.gz";
+    sha256 = "5145aa844e54cca89ddab6fb7dd9e5952811d8d787c4f4bf27eb261e6c182098";
+  };
+ 
+  buildInputs = [libmcrypt libmhash];
+ 
+  meta = {
+    description = "mcrypt, and the accompanying libmcrypt, are intended to be replacements for the old Unix crypt, except that they are under the GPL and support an ever-wider range of algorithms and modes.";
+    homepage = http://mcrypt.sourceforge.net;
+    license = "GPLv2";
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.qknight ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 578734e9b9e..6f59d442dea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -522,6 +522,8 @@ let
   syslogng = callPackage ../tools/system/syslog-ng { };
   rsyslog = callPackage ../tools/system/rsyslog { };
 
+  mcrypt = callPackage ../tools/misc/mcrypt { };
+
   mcelog = callPackage ../os-specific/linux/mcelog { };
 
   asciidoc = callPackage ../tools/typesetting/asciidoc { };

From 4800a33b883fbdfb483dd69056b30032b650377f Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Thu, 27 Jun 2013 12:13:14 +0200
Subject: [PATCH 090/314] Linux 3.4: Doesn't support CONFIG_RC_DEVICES option

---
 pkgs/os-specific/linux/kernel/linux-3.4.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix
index 440f39227ed..cd7e9f2b375 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix
@@ -199,7 +199,6 @@ let
       NET_FC y # Fibre Channel driver support
       PPP_MULTILINK y # PPP multilink support
       REGULATOR y # Voltage and Current Regulator Support
-      RC_DEVICES y # Enable IR devices
       SCSI_LOGGING y # SCSI logging facility
       SERIAL_8250 y # 8250/16550 and compatible serial support
       SLIP_COMPRESSED y # CSLIP compressed headers

From 989c58eb2966b1cdcfd93b406e1525966845aa00 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 27 Jun 2013 13:31:35 +0200
Subject: [PATCH 091/314] Process /etc/fonts/conf.d before upstream
 fonts/conf.d

Otherwise the user won't be able to override anything specified in
NixOS' /etc/fonts/conf.d, since ~/.config/fontconfig is included from
upstream fonts/conf.5/50-user.conf.
---
 .../libraries/fontconfig/make-fonts-conf.xsl           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl b/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
index f716700d98e..68c91596ac5 100644
--- a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
+++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
@@ -22,19 +22,19 @@
     <fontconfig>
       <xsl:copy-of select="child::node()[name() != 'dir' and name() != 'cachedir' and name() != 'include']" />
 
-      <include xml:space="preserve"><xsl:value-of select="$fontconfig" />/etc/fonts/conf.d</include>
       <include ignore_missing="yes" xml:space="preserve">/etc/fonts/conf.d</include>
-      
+      <include xml:space="preserve"><xsl:value-of select="$fontconfig" />/etc/fonts/conf.d</include>
+
       <cachedir xml:space="preserve">/var/cache/fontconfig</cachedir>
       <cachedir xml:space="preserve">~/.fontconfig</cachedir>
-      
+
       <xsl:for-each select="str:tokenize($fontDirectories)">
         <dir><xsl:value-of select="." /></dir>
         <xsl:text>&#0010;</xsl:text>
       </xsl:for-each>
-      
+
     </fontconfig>
 
   </xsl:template>
-  
+
 </xsl:stylesheet>

From 4d3c59f454611e3471598bf309d460d766b004aa Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Thu, 27 Jun 2013 13:43:50 +0200
Subject: [PATCH 092/314] added AES crypt

---
 pkgs/tools/misc/aescrypt/default.nix | 32 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/tools/misc/aescrypt/default.nix

diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix
new file mode 100644
index 00000000000..34987cd717e
--- /dev/null
+++ b/pkgs/tools/misc/aescrypt/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl }:
+ 
+stdenv.mkDerivation rec {
+  version = "3.0.9";
+  name = "aescrypt-${version}";
+  
+  src = fetchurl {
+    url = "http://www.aescrypt.com/download/v3/linux/${name}.tgz";
+    sha256 = "3f3590f9b7e50039611ba9c0cf1cae1b188a44bd39cfc41553db7ec5709c0882";
+  };
+
+  preBuild = ''
+    cd src
+  '';
+
+  installPhase= ''
+    mkdir -p $out/bin
+    cp aescrypt $out/bin
+    cp aescrypt_keygen $out/bin
+  '';
+ 
+  buildInputs = [];
+ 
+  meta = {
+    description = "AES Crypt is a file encryption software available on several operating systems that uses the industry standard Advanced Encryption Standard (AES) to easily and securely encrypt files.";
+    homepage = http://www.aescrypt.com/;
+    license = "GPLv2";
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.qknight ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 578734e9b9e..62fcdc8bbbb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -389,6 +389,8 @@ let
 
   aespipe = callPackage ../tools/security/aespipe { };
 
+  aescrypt = callPackage ../tools/misc/aescrypt { };
+
   ahcpd = callPackage ../tools/networking/ahcpd { };
 
   aircrackng = callPackage ../tools/networking/aircrack-ng { };

From 2d521d84042640574bf08ef0d531215923882224 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 27 Jun 2013 14:27:03 +0200
Subject: [PATCH 093/314] google-talk-plugin: Enable screen sharing

---
 .../google-talk-plugin/default.nix            |  8 ++---
 .../google-talk-plugin/preload.c              | 32 +++++++++++++++++--
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
index 8cc62aa02db..0110dad9dc8 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
@@ -79,13 +79,13 @@ stdenv.mkDerivation rec {
         $plugins/libnpgtpo3dautoplugin.so
 
       mkdir -p $out/libexec/google/talkplugin
-      cp opt/google/talkplugin/GoogleTalkPlugin $out/libexec/google/talkplugin/
-      
+      cp -prd opt/google/talkplugin/{GoogleTalkPlugin,locale,windowpicker.glade} $out/libexec/google/talkplugin/
+
       mkdir -p $out/libexec/google/talkplugin/lib
       cp opt/google/talkplugin/lib/libCg* $out/libexec/google/talkplugin/lib/
 
       patchelf --set-rpath "$out/libexec/google/talkplugin/lib" \
-        $out/libexec/google/talkplugin/lib/libCgGL.so 
+        $out/libexec/google/talkplugin/lib/libCgGL.so
 
       patchelf \
         --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
@@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
 
   dontStrip = true;
   dontPatchELF = true;
-  
+
   passthru.mozillaPlugin = "/lib/mozilla/plugins";
 
   meta = {
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c
index 9c543fed758..a643e39c31a 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c
@@ -12,8 +12,8 @@
 #include <fcntl.h>
 #include <limits.h>
 
-char origDir [] = "/opt/google/talkplugin/GoogleTalkPlugin";
-char realDir [] = OUT "/libexec/google/talkplugin/GoogleTalkPlugin";
+char origDir [] = "/opt/google/talkplugin";
+char realDir [] = OUT "/libexec/google/talkplugin";
 
 const char * rewrite(const char * path, char * buf)
 {
@@ -29,3 +29,31 @@ int execvp(const char * path, char * const argv[])
     char buf[PATH_MAX];
     return _execvp(rewrite(path, buf), argv);
 }
+
+int open(const char *path, int flags, ...)
+{
+    char buf[PATH_MAX];
+    int (*_open) (const char *, int, mode_t) = dlsym(RTLD_NEXT, "open");
+    mode_t mode = 0;
+    if (flags & O_CREAT) {
+        va_list ap;
+        va_start(ap, flags);
+        mode = va_arg(ap, mode_t);
+        va_end(ap);
+    }
+    return _open(rewrite(path, buf), flags, mode);
+}
+
+int open64(const char *path, int flags, ...)
+{
+    char buf[PATH_MAX];
+    int (*_open64) (const char *, int, mode_t) = dlsym(RTLD_NEXT, "open64");
+    mode_t mode = 0;
+    if (flags & O_CREAT) {
+        va_list ap;
+        va_start(ap, flags);
+        mode = va_arg(ap, mode_t);
+        va_end(ap);
+    }
+    return _open64(rewrite(path, buf), flags, mode);
+}

From 9936b7c230a908e290c0242d7add132cdc97101e Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 27 Jun 2013 15:32:11 +0200
Subject: [PATCH 094/314] disnix: push to latest 0.3 development release

---
 .../disnix/activation-scripts/default.nix     | 48 -------------------
 .../package-management/disnix/default.nix     | 14 +++---
 .../disnix/disnixos/default.nix               |  6 +--
 .../disnix/dysnomia/default.nix               | 48 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 5 files changed, 58 insertions(+), 60 deletions(-)
 delete mode 100644 pkgs/tools/package-management/disnix/activation-scripts/default.nix
 create mode 100644 pkgs/tools/package-management/disnix/dysnomia/default.nix

diff --git a/pkgs/tools/package-management/disnix/activation-scripts/default.nix b/pkgs/tools/package-management/disnix/activation-scripts/default.nix
deleted file mode 100644
index beae2e3b5f6..00000000000
--- a/pkgs/tools/package-management/disnix/activation-scripts/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ stdenv, fetchurl
-, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null
-, enableApacheWebApplication ? false
-, enableAxis2WebService ? false
-, enableEjabberdDump ? false
-, enableMySQLDatabase ? false
-, enablePostgreSQLDatabase ? false
-, enableSubversionRepository ? false
-, enableTomcatWebApplication ? false
-, catalinaBaseDir ? "/var/tomcat"
-}:
-
-assert enableMySQLDatabase -> mysql != null;
-assert enablePostgreSQLDatabase -> postgresql != null;
-assert enableSubversionRepository -> subversion != null;
-assert enableEjabberdDump -> ejabberd != null;
-
-stdenv.mkDerivation {
-  name = "disnix-activation-scripts-0.3pre30423";
-  src = fetchurl {
-    url = http://hydra.nixos.org/build/2794103/download/1/disnix-activation-scripts-0.3pre30423.tar.gz;
-    sha256 = "1x1702isjnrkvwzycryc8rvjgka4qqmd1dk34pwl51y1l2bxymrx";
-  };
-  
-  preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else "";
-  
-  configureFlags = ''
-                     ${if enableApacheWebApplication then "--with-apache" else "--without-apache"}
-		     ${if enableAxis2WebService then "--with-axis2" else "--without-axis2"}
-		     ${if enableEjabberdDump then "--with-ejabberd" else "--without-ejabberd"}
-		     ${if enableMySQLDatabase then "--with-mysql" else "--without-mysql"}
-		     ${if enablePostgreSQLDatabase then "--with-postgresql" else "--without-postgresql"}
-		     ${if enableSubversionRepository then "--with-subversion" else "--without-subversion"}
-		     ${if enableTomcatWebApplication then "--with-tomcat=${catalinaBaseDir}" else "--without-tomcat"}
-		   '';
-		   
-  buildInputs = []
-                ++ stdenv.lib.optional enableEjabberdDump ejabberd
-                ++ stdenv.lib.optional enableMySQLDatabase mysql
-		++ stdenv.lib.optional enablePostgreSQLDatabase postgresql
-		++ stdenv.lib.optional enableSubversionRepository subversion;
-
-  meta = {
-    description = "Provides various activation types for Disnix";
-    license = "MIT";
-    maintainers = [ stdenv.lib.maintainers.sander ];
-  };
-}
diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix
index 9c17b9b78f7..e63de65410c 100644
--- a/pkgs/tools/package-management/disnix/default.nix
+++ b/pkgs/tools/package-management/disnix/default.nix
@@ -1,17 +1,15 @@
-{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, gettext, libiconv }:
+{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, libintlOrEmpty, libiconvOrEmpty }:
 
 stdenv.mkDerivation {
-  name = "disnix-0.3pre32254";
+  name = "disnix-0.3pre106668a42f982af4180d7657b47d8316862d4d1d";
   
   src = fetchurl {
-    url = http://hydra.nixos.org/build/2368541/download/4/disnix-0.3pre32254.tar.gz;
-    sha256 = "1jznx4mb6vwpzzpbk4c16j73hjgng7v1nraq8yya7f7m1s2gyhcw";
+    url = http://hydra.nixos.org/build/5430218/download/4/disnix-0.3pre106668a42f982af4180d7657b47d8316862d4d1d.tar.gz;
+    sha256 = "1cnrbw70gpkm9rg5a3j0kkbq0q0wrkc5hwqb614fvja20y52hld6";
   };
   
-  buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable ]
-                ++ stdenv.lib.optional (!stdenv.isLinux) libiconv
-                ++ stdenv.lib.optional (!stdenv.isLinux) gettext;
-                
+  buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconvOrEmpty ];
+
   dontStrip = true;
   
   meta = {
diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix
index 93cd2f3f846..46422d010fa 100644
--- a/pkgs/tools/package-management/disnix/disnixos/default.nix
+++ b/pkgs/tools/package-management/disnix/disnixos/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, disnix, socat, pkgconfig }:
 
 stdenv.mkDerivation {
-  name = "disnixos-0.2pre33586";
+  name = "disnixos-0.2pre827a5b52b8a68b7c16a2d92898e6281c54e7b1ff";
   
   src = fetchurl {
-    url = http://hydra.nixos.org/build/2368187/download/3/disnixos-0.2pre33586.tar.gz;
-    sha256 = "110vn4390447dws343py8ss6s8jizx8yg7yl38i64nlqh0bcn4ny";
+    url = http://hydra.nixos.org/build/5430738/download/3/disnixos-0.2pre827a5b52b8a68b7c16a2d92898e6281c54e7b1ff.tar.gz;
+    sha256 = "1alyzypli32whd371w9wfxcnq6by9zng88nysd3gy8nrvns8di7x";
   };
   
   buildInputs = [ socat pkgconfig disnix ];
diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix
new file mode 100644
index 00000000000..a2e2a78a46e
--- /dev/null
+++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl
+, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null
+, enableApacheWebApplication ? false
+, enableAxis2WebService ? false
+, enableEjabberdDump ? false
+, enableMySQLDatabase ? false
+, enablePostgreSQLDatabase ? false
+, enableSubversionRepository ? false
+, enableTomcatWebApplication ? false
+, catalinaBaseDir ? "/var/tomcat"
+}:
+
+assert enableMySQLDatabase -> mysql != null;
+assert enablePostgreSQLDatabase -> postgresql != null;
+assert enableSubversionRepository -> subversion != null;
+assert enableEjabberdDump -> ejabberd != null;
+
+stdenv.mkDerivation {
+  name = "disnix-activation-scripts-0.3predff2da00e2d29d15feb2b6b42931232d691f7f03";
+  src = fetchurl {
+    url = http://hydra.nixos.org/build/5430159/download/1/dysnomia-0.3predff2da00e2d29d15feb2b6b42931232d691f7f03.tar.gz;
+    sha256 = "1y9qf14ygdgq2hjh1p6rf7hcgij02wv091s8wpsn36mrmc9zk6rf";
+  };
+  
+  preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else "";
+  
+  configureFlags = ''
+     ${if enableApacheWebApplication then "--with-apache" else "--without-apache"}
+     ${if enableAxis2WebService then "--with-axis2" else "--without-axis2"}
+     ${if enableEjabberdDump then "--with-ejabberd" else "--without-ejabberd"}
+     ${if enableMySQLDatabase then "--with-mysql" else "--without-mysql"}
+     ${if enablePostgreSQLDatabase then "--with-postgresql" else "--without-postgresql"}
+     ${if enableSubversionRepository then "--with-subversion" else "--without-subversion"}
+     ${if enableTomcatWebApplication then "--with-tomcat=${catalinaBaseDir}" else "--without-tomcat"}
+   '';
+  
+  buildInputs = []
+    ++ stdenv.lib.optional enableEjabberdDump ejabberd
+    ++ stdenv.lib.optional enableMySQLDatabase mysql
+    ++ stdenv.lib.optional enablePostgreSQLDatabase postgresql
+    ++ stdenv.lib.optional enableSubversionRepository subversion;
+
+  meta = {
+    description = "Provides various activation types for Disnix";
+    license = "MIT";
+    maintainers = [ stdenv.lib.maintainers.sander ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 578734e9b9e..d7af6c8e69c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9433,7 +9433,7 @@ let
 
   disnix = callPackage ../tools/package-management/disnix { };
 
-  disnix_activation_scripts = callPackage ../tools/package-management/disnix/activation-scripts {
+  dysnomia = callPackage ../tools/package-management/disnix/dysnomia {
     enableApacheWebApplication = config.disnix.enableApacheWebApplication or false;
     enableAxis2WebService = config.disnix.enableAxis2WebService or false;
     enableEjabberdDump = config.disnix.enableEjabberdDump or false;

From 916fc482100465876b9716181854eddcdf9a366c Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Thu, 27 Jun 2013 17:49:05 +0200
Subject: [PATCH 095/314] moderntimeline: Add extra source URL

---
 pkgs/tools/typesetting/tex/texlive/moderntimeline.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix
index 6139911623f..d129cc62020 100644
--- a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix
+++ b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix
@@ -3,7 +3,10 @@ rec {
   version = "0.7";
   name = "moderntimeline-${version}";
   src = fetchurl {
-    url = "http://www.ctan.org/tex-archive/macros/latex/contrib/moderntimeline.zip";
+    urls = [
+      "http://www.ctan.org/tex-archive/macros/latex/contrib/moderntimeline.zip"
+      "http://mirror.ctan.org/macros/latex/contrib/moderntimeline.zip"
+    ];
     sha256 = "0dxwybanj7qvbr69wgsllha1brq6qjsnjfff6nw4r3nijzvvh876";
   };
 

From 38a59aa95347a013155ac0e57ef50f8ad7613730 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 27 Jun 2013 20:42:17 +0200
Subject: [PATCH 096/314] maintainers: change my attrname to be uniform

---
 pkgs/applications/misc/lyx/default.nix          | 2 +-
 pkgs/lib/maintainers.nix                        | 2 +-
 pkgs/os-specific/linux/broadcom-sta/default.nix | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix
index 07de6271289..31c00626847 100644
--- a/pkgs/applications/misc/lyx/default.nix
+++ b/pkgs/applications/misc/lyx/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     description = "WYSIWYM frontend for LaTeX, DocBook, etc.";
     homepage = "http://www.lyx.org";
     license = "GPL2";
-    maintainers = [ stdenv.lib.maintainers.neznalek ];
+    maintainers = [ stdenv.lib.maintainers.vcunat ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix
index 5e506ce25c2..da4d13b354d 100644
--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@@ -29,7 +29,6 @@
   ludo = "Ludovic Courtès <ludo@gnu.org>";
   marcweber = "Marc Weber <marco-oweber@gmx.de>";
   mornfall = "Petr Ročkai <me@mornfall.net>";
-  neznalek = "Vladimír Čunát <vcunat@gmail.com>";
   offline = "Jaka Hudoklin <jakahudoklin@gmail.com>";
   orbitz = "Malcolm Matalka <mmatalka@gmail.com>";
   page = "Carles Pagès <page@cubata.homelinux.net>";
@@ -48,6 +47,7 @@
   thammers = "Tobias Hammerschmidt <jawr@gmx.de>";
   the-kenny = "Moritz Ulrich <moritz@tarn-vedra.de>";
   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>";
   winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>";
   z77z = "Marco Maggesi <maggesi@math.unifi.it>";
diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix
index 43ba9dfc2b5..816a099e243 100644
--- a/pkgs/os-specific/linux/broadcom-sta/default.nix
+++ b/pkgs/os-specific/linux/broadcom-sta/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
     description = "Kernel module driver for some Broadcom's wireless cards";
     homepage = http://www.broadcom.com/support/802.11/linux_sta.php;
     license = "unfree-redistributable";
-    maintainers = [ stdenv.lib.maintainers.neznalek ];
+    maintainers = [ stdenv.lib.maintainers.vcunat ];
     platforms = stdenv.lib.platforms.linux;
   };
 }

From 0689016e3edf46cdf747740d0e8d0c457a33b0a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 27 Jun 2013 20:43:05 +0200
Subject: [PATCH 097/314] liferea: add -- A GTK-based news feed reader

---
 .../newsreaders/liferea/default.nix           | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/applications/networking/newsreaders/liferea/default.nix

diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix
new file mode 100644
index 00000000000..4703a4f28c8
--- /dev/null
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pkgconfig, intltool, glib, gtk2, gnome2 /*just GConf*/
+, libsoup, libunique, libxslt, webkit_gtk2, json_glib
+, libnotify /*optional*/ }:
+
+let version = "1.8.15";
+in
+stdenv.mkDerivation rec {
+  name = "liferea-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/liferea/Liferea%20Stable/${version}/${name}.tar.bz2";
+    sha256 = "12hhdl5biwcvr9ds7pdhhvlp4vggjix6xm4z5pnfaz53ai2dnc99";
+  };
+
+  buildInputs = [
+    pkgconfig intltool gtk2 gnome2.GConf
+    libsoup libunique libxslt webkit_gtk2 json_glib
+    libnotify
+  ];
+
+  meta = {
+    description = "A GTK-based news feed agregator";
+    homepage = http://lzone.de/liferea/;
+    maintainers = [ stdenv.lib.maintainers.vcunat ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d7af6c8e69c..b75fd707b34 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7739,6 +7739,8 @@ let
     poppler = poppler_0_18;
   };
 
+  liferea = callPackage ../applications/networking/newsreaders/liferea { };
+
   lingot = callPackage ../applications/audio/lingot {
     inherit (gnome) libglade;
   };

From 7f413e4d5c3d0e0374a3ea8d1c575ceb7249be16 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Tue, 25 Jun 2013 09:17:34 +0200
Subject: [PATCH 098/314] whitespace cleaning

---
 pkgs/applications/graphics/gimp/default.nix           |  4 ++--
 pkgs/development/libraries/ffmpeg/1.x.nix             |  6 +++---
 pkgs/development/libraries/gegl/0_0_22.nix            |  4 ++--
 pkgs/development/libraries/leptonica/default.nix      |  2 +-
 pkgs/development/libraries/qt-3/default.nix           |  4 ++--
 pkgs/development/ocaml-modules/camlimages/default.nix |  2 +-
 pkgs/games/minetest/default.nix                       | 10 +++++-----
 pkgs/top-level/all-packages.nix                       |  2 +-
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index b59b2bb6750..f2a4ec90f97 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -5,12 +5,12 @@
 
 stdenv.mkDerivation rec {
   name = "gimp-2.6.12";
-  
+
   src = fetchurl {
     url = "ftp://ftp.gtk.org/pub/gimp/v2.6/${name}.tar.bz2";
     sha256 = "0qpcgaa4pdqqhyyy8vjvzfflxgsrrs25zk79gixzlnbzq3qwjlym";
   };
-  
+
   buildInputs = [
     pkgconfig gtk freetype fontconfig
     libart_lgpl libtiff libjpeg libpng12 libexif zlib perl
diff --git a/pkgs/development/libraries/ffmpeg/1.x.nix b/pkgs/development/libraries/ffmpeg/1.x.nix
index 119e785ea4f..3798119acd2 100644
--- a/pkgs/development/libraries/ffmpeg/1.x.nix
+++ b/pkgs/development/libraries/ffmpeg/1.x.nix
@@ -30,12 +30,12 @@ assert playSupport -> SDL != null;
 
 stdenv.mkDerivation rec {
   name = "ffmpeg-1.2";
-  
+
   src = fetchurl {
     url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
     sha256 = "1bssxbn4p813xlgb8whg4b60j90yzfy92x70b4q8j35fgp0gnfcs";
   };
-  
+
   # `--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.
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional playSupport SDL;
 
   enableParallelBuilding = true;
-    
+
   crossAttrs = {
     dontSetConfigureCross = true;
     configureFlags = configureFlags ++ [
diff --git a/pkgs/development/libraries/gegl/0_0_22.nix b/pkgs/development/libraries/gegl/0_0_22.nix
index 150ba1ac961..4eeb6886d71 100644
--- a/pkgs/development/libraries/gegl/0_0_22.nix
+++ b/pkgs/development/libraries/gegl/0_0_22.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, glib, babl_0_0_22, libpng12, cairo, libjpeg
 , librsvg, pango, gtk }:
-        
+
 stdenv.mkDerivation {
   name = "gegl-0.0.22";
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ pkgconfig glib babl_0_0_22 libpng12 cairo libjpeg librsvg pango gtk ];
 
-  meta = { 
+  meta = {
     description = "Graph-based image processing framework";
     homepage = http://www.gegl.org;
     license = "GPL3";
diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix
index 232f2775c00..177b2d1f260 100644
--- a/pkgs/development/libraries/leptonica/default.nix
+++ b/pkgs/development/libraries/leptonica/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation {
   name = "leptonica-1.68";
-  
+
   src = fetchurl {
     url = http://www.leptonica.org/source/leptonica-1.68.tar.gz;
     sha256 = "13qzm24zy46bj9b476jxzbw9qh7p96jikfzxg88kz4dj1p2vdvxc";
diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix
index 91eec5fcd31..a24f444488d 100644
--- a/pkgs/development/libraries/qt-3/default.nix
+++ b/pkgs/development/libraries/qt-3/default.nix
@@ -59,10 +59,10 @@ stdenv.mkDerivation {
   patches = [
     # Don't strip everything so we can get useful backtraces.
     ./strip.patch
-    
+
     # Build on NixOS.
     ./qt-pwd.patch
-    
+
     # randr.h and Xrandr.h need not be in the same prefix.
     ./xrandr.patch
 
diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix
index 037ebdea6b6..29816d297b5 100644
--- a/pkgs/development/ocaml-modules/camlimages/default.nix
+++ b/pkgs/development/ocaml-modules/camlimages/default.nix
@@ -9,7 +9,7 @@ in
 stdenv.mkDerivation {
   name = "${pname}-${version}";
 
-  src = fetchurl { 
+  src = fetchurl {
     url = "https://bitbucket.org/camlspotter/camlimages/get/v4.0.1.tar.gz";
     sha256 = "b40237c1505487049799a7af296eb3996b3fa08eab94415546f46d61355747c4";
   };
diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix
index 3b06cd8694c..0a9a40140ef 100644
--- a/pkgs/games/minetest/default.nix
+++ b/pkgs/games/minetest/default.nix
@@ -15,23 +15,23 @@ let
   };
 in stdenv.mkDerivation {
   name = "minetest-${version}";
-  
+
   src = sources.src;
-  
+
   cmakeFlags = [
     "-DIRRLICHT_INCLUDE_DIR=${irrlicht3843}/include/irrlicht"
   ];
-  
+
   buildInputs = [
     cmake irrlicht3843 libpng12 bzip2 libjpeg
     libXxf86vm mesa openal libvorbis x11
   ];
-  
+
   postInstall = ''
     mkdir -pv $out/share/minetest/games/minetest_game/
     cp -rv ${sources.data}/* $out/share/minetest/games/minetest_game/
   '';
-  
+
   meta = {
     homepage = "http://minetest.net/";
     description = "Minetest is an infinite-world block sandbox game.";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b75fd707b34..22e43b0e4c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4042,7 +4042,7 @@ let
 
   glpk = callPackage ../development/libraries/glpk { };
 
-  glsurf = callPackage ../applications/science/math/glsurf { 
+  glsurf = callPackage ../applications/science/math/glsurf {
     inherit (ocamlPackages) lablgl findlib camlimages ocaml_mysql mlgmp;
   };
 

From 0b17251c06e9b63456b90c4046b7a2dbb39f8155 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 26 Jun 2013 16:48:45 +0200
Subject: [PATCH 099/314] libpng: keep versioning in all-packages.nix, not in
 individual expressions

---
 pkgs/applications/audio/spotify/default.nix   |  4 +--
 .../display-managers/slim/default.nix         |  4 +--
 pkgs/applications/graphics/gimp/default.nix   |  4 +--
 .../google-talk-plugin/default.nix            |  4 +--
 .../science/math/glsurf/default.nix           |  5 ++--
 pkgs/development/libraries/gegl/0_0_22.nix    |  4 +--
 .../libraries/leptonica/default.nix           |  4 +--
 pkgs/development/libraries/qt-3/default.nix   |  4 +--
 .../ocaml-modules/camlimages/default.nix      |  8 +++---
 pkgs/games/minetest/default.nix               |  4 +--
 pkgs/top-level/all-packages.nix               | 25 +++++++++++++++----
 11 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index ccdfcbb3d99..f4d264c0d8f 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib, makeWrapper, openssl, freetype, glib, pango, cairo, atk, gdk_pixbuf, gtk, cups, nspr, nss, libpng12, GConf, libgcrypt, chromium, sqlite, gst_plugins_base, gstreamer }:
+{ fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib, makeWrapper, openssl, freetype, glib, pango, cairo, atk, gdk_pixbuf, gtk, cups, nspr, nss, libpng, GConf, libgcrypt, chromium, sqlite, gst_plugins_base, gstreamer }:
 
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
 
@@ -73,7 +73,7 @@ stdenv.mkDerivation {
       mkdir -p $out/libexec/spotify
       gcc -shared ${./preload.c} -o $preload -ldl -DOUT=\"$out\" -fPIC
 
-      wrapProgram $out/bin/spotify --set LD_PRELOAD $preload --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ GConf libpng12 cups libgcrypt sqlite gst_plugins_base gstreamer]}:$out/lib"
+      wrapProgram $out/bin/spotify --set LD_PRELOAD $preload --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ GConf libpng cups libgcrypt sqlite gst_plugins_base gstreamer]}:$out/lib"
     ''; # */
 
   dontStrip = true;
diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix
index 601aa7bf53a..9d5c728de26 100644
--- a/pkgs/applications/display-managers/slim/default.nix
+++ b/pkgs/applications/display-managers/slim/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig, x11, libjpeg, libpng12, libXmu
+{ stdenv, fetchurl, cmake, pkgconfig, x11, libjpeg, libpng, libXmu
 , fontconfig, freetype, pam, dbus_libs }:
 
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs =
-    [ cmake pkgconfig x11 libjpeg libpng12 libXmu fontconfig freetype
+    [ cmake pkgconfig x11 libjpeg libpng libXmu fontconfig freetype
       pam dbus_libs
     ];
 
diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index f2a4ec90f97..33d52c6645b 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gtk, freetype
-, fontconfig, libart_lgpl, libtiff, libjpeg, libpng12, libexif, zlib, perl
+, fontconfig, libart_lgpl, libtiff, libjpeg, libpng, libexif, zlib, perl
 , perlXMLParser, python, pygtk, gettext, xlibs, intltool, babl_0_0_22, gegl_0_0_22
 }:
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gtk freetype fontconfig
-    libart_lgpl libtiff libjpeg libpng12 libexif zlib perl
+    libart_lgpl libtiff libjpeg libpng libexif zlib perl
     perlXMLParser python pygtk gettext intltool babl_0_0_22 gegl_0_0_22
   ];
 
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
index 0110dad9dc8..110f9522030 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, rpm, cpio, mesa, xorg, cairo
-, libpng12, gtk, glib, gdk_pixbuf, fontconfig, freetype, curl
+, libpng, gtk, glib, gdk_pixbuf, fontconfig, freetype, curl
 , dbus_glib, alsaLib, pulseaudio, udev, pango
 }:
 
@@ -14,7 +14,7 @@ let
       xorg.libXt
       xorg.libX11
       cairo
-      libpng12
+      libpng
       gtk
       glib
       fontconfig
diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix
index 51b2850347b..a056a32c64c 100644
--- a/pkgs/applications/science/math/glsurf/default.nix
+++ b/pkgs/applications/science/math/glsurf/default.nix
@@ -1,5 +1,4 @@
-
-{ stdenv, fetchdarcs, ocaml, findlib,  lablgl, camlimages, mesa, freeglut, ocaml_mysql, mlgmp, mpfr, gmp, libtiff, libjpeg, libpng12, giflib }:
+{ stdenv, fetchdarcs, ocaml, findlib,  lablgl, camlimages, mesa, freeglut, ocaml_mysql, mlgmp, mpfr, gmp, libtiff, libjpeg, libpng, giflib }:
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -16,7 +15,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ ocaml findlib freeglut mesa
   	          lablgl camlimages ocaml_mysql mlgmp mpfr gmp
-		  libtiff libjpeg libpng12 giflib ];
+		  libtiff libjpeg libpng giflib ];
 
   installPhase = ''
     mkdir -p $out/bin $out/share/doc/glsurf
diff --git a/pkgs/development/libraries/gegl/0_0_22.nix b/pkgs/development/libraries/gegl/0_0_22.nix
index 4eeb6886d71..b2f2e85a1ea 100644
--- a/pkgs/development/libraries/gegl/0_0_22.nix
+++ b/pkgs/development/libraries/gegl/0_0_22.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, babl_0_0_22, libpng12, cairo, libjpeg
+{ stdenv, fetchurl, pkgconfig, glib, babl_0_0_22, libpng, cairo, libjpeg
 , librsvg, pango, gtk }:
 
 stdenv.mkDerivation {
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
   configureFlags = "--disable-docs"; # needs fonts otherwise  don't know how to pass them
 
-  buildInputs = [ pkgconfig glib babl_0_0_22 libpng12 cairo libjpeg librsvg pango gtk ];
+  buildInputs = [ pkgconfig glib babl_0_0_22 libpng cairo libjpeg librsvg pango gtk ];
 
   meta = {
     description = "Graph-based image processing framework";
diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix
index 177b2d1f260..e84bd0656c4 100644
--- a/pkgs/development/libraries/leptonica/default.nix
+++ b/pkgs/development/libraries/leptonica/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libpng12, libtiff, libjpeg, zlib}:
+{stdenv, fetchurl, libpng, libtiff, libjpeg, zlib}:
 
 stdenv.mkDerivation {
   name = "leptonica-1.68";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "13qzm24zy46bj9b476jxzbw9qh7p96jikfzxg88kz4dj1p2vdvxc";
   };
 
-  buildInputs = [ libpng12 libtiff libjpeg zlib ];
+  buildInputs = [ libpng libtiff libjpeg zlib ];
 
   meta = {
     description = "Image processing and analysis library";
diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix
index a24f444488d..b3dfc021da9 100644
--- a/pkgs/development/libraries/qt-3/default.nix
+++ b/pkgs/development/libraries/qt-3/default.nix
@@ -7,10 +7,10 @@
 , threadSupport ? true
 , mysqlSupport ? false, mysql ? null
 , openglSupport ? false, mesa ? null, libXmu ? null
-, x11, xextproto, zlib, libjpeg, libpng12, which
+, x11, xextproto, zlib, libjpeg, libpng, which
 }:
 
-let libpng = libpng12; in
+let libpng = libpng; in
 
 assert xftSupport -> libXft != null;
 assert xrenderSupport -> xftSupport && libXrender != null;
diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix
index 29816d297b5..21610f8f310 100644
--- a/pkgs/development/ocaml-modules/camlimages/default.nix
+++ b/pkgs/development/ocaml-modules/camlimages/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, omake, ocaml, omake_rc1, libtiff, libjpeg, libpng12, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }:
+{stdenv, fetchurl, omake, ocaml, omake_rc1, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }:
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -14,9 +14,9 @@ stdenv.mkDerivation {
     sha256 = "b40237c1505487049799a7af296eb3996b3fa08eab94415546f46d61355747c4";
   };
 
-  buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript libtiff libjpeg libpng12 giflib freetype libXpm ];
- 
-  propagatedbuildInputs = [libtiff libjpeg libpng12 giflib freetype libXpm ];
+  buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript libtiff libjpeg libpng giflib freetype libXpm ];
+
+  propagatedbuildInputs = [libtiff libjpeg libpng giflib freetype libXpm ];
 
   createFindlibDestdir = true;
 
diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix
index 0a9a40140ef..6c860d42925 100644
--- a/pkgs/games/minetest/default.nix
+++ b/pkgs/games/minetest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, cmake, irrlicht3843, libpng12, bzip2,
+{ stdenv, fetchgit, cmake, irrlicht3843, libpng, bzip2,
   libjpeg, libXxf86vm, mesa, openal, libvorbis, x11 }:
 
 let
@@ -23,7 +23,7 @@ in stdenv.mkDerivation {
   ];
 
   buildInputs = [
-    cmake irrlicht3843 libpng12 bzip2 libjpeg
+    cmake irrlicht3843 libpng bzip2 libjpeg
     libXxf86vm mesa openal libvorbis x11
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 22e43b0e4c9..fbd8cac417e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1191,7 +1191,9 @@ let
 
   minecraft = callPackage ../games/minecraft { };
 
-  minetest = callPackage ../games/minetest { };
+  minetest = callPackage ../games/minetest {
+    libpng = libpng12;
+  };
 
   miniupnpc = callPackage ../tools/networking/miniupnpc { };
 
@@ -2744,7 +2746,9 @@ let
     camomile_0_8_2 = callPackage ../development/ocaml-modules/camomile/0.8.2.nix { };
     camomile = callPackage ../development/ocaml-modules/camomile { };
 
-    camlimages = callPackage ../development/ocaml-modules/camlimages { };
+    camlimages = callPackage ../development/ocaml-modules/camlimages {
+      libpng = libpng12;
+    };
 
     ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { };
 
@@ -3921,6 +3925,7 @@ let
 
   gegl_0_0_22 = callPackage ../development/libraries/gegl/0_0_22.nix {
     #  avocodec avformat librsvg
+    libpng = libpng12;
   };
 
   geoclue = callPackage ../development/libraries/geoclue {};
@@ -4044,6 +4049,7 @@ let
 
   glsurf = callPackage ../applications/science/math/glsurf {
     inherit (ocamlPackages) lablgl findlib camlimages ocaml_mysql mlgmp;
+    libpng = libpng12;
   };
 
   gmime = callPackage ../development/libraries/gmime { };
@@ -4333,7 +4339,9 @@ let
 
   levmar = callPackage ../development/libraries/levmar { };
 
-  leptonica = callPackage ../development/libraries/leptonica { };
+  leptonica = callPackage ../development/libraries/leptonica {
+    libpng = libpng12;
+  };
 
   lib3ds = callPackage ../development/libraries/lib3ds { };
 
@@ -5114,6 +5122,7 @@ let
 
   qt3 = callPackage ../development/libraries/qt-3 {
     openglSupport = mesaSupported;
+    libpng = libpng12;
   };
 
   qt4 = pkgs.kde4.qt4;
@@ -7425,6 +7434,7 @@ let
 
   gimp_2_6 = callPackage ../applications/graphics/gimp {
     inherit (gnome) libart_lgpl;
+    libpng = libpng12;
   };
 
   gimp_2_8 = callPackage ../applications/graphics/gimp/2.8.nix {
@@ -7548,7 +7558,9 @@ let
 
   googleearth = callPackage_i686 ../applications/misc/googleearth { };
 
-  google_talk_plugin = callPackage ../applications/networking/browsers/mozilla-plugins/google-talk-plugin { };
+  google_talk_plugin = callPackage ../applications/networking/browsers/mozilla-plugins/google-talk-plugin {
+    libpng = libpng12;
+  };
 
   gosmore = builderDefsPackage ../applications/misc/gosmore {
     inherit fetchsvn curl pkgconfig libxml2 gtk;
@@ -8175,7 +8187,9 @@ let
 
   lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm-gtk-greeter { };
 
-  slim = callPackage ../applications/display-managers/slim { };
+  slim = callPackage ../applications/display-managers/slim {
+    libpng = libpng12;
+  };
 
   sndBase = builderDefsPackage (import ../applications/audio/snd) {
     inherit fetchurl stdenv stringsWithDeps lib fftw;
@@ -8203,6 +8217,7 @@ let
 
   spotify = callPackage ../applications/audio/spotify {
     inherit (gnome) GConf;
+    libpng = libpng12;
   };
 
   libspotify = callPackage ../development/libraries/libspotify {

From e78b013fe39522ac51bd6e4a11b8d1e5249e5995 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 26 Jun 2013 10:54:06 +0200
Subject: [PATCH 100/314] libpng: merge apng expression (keep patch disabled by
 default)

I made sure no rebuild will happen because of this.
Unfortunately this meant merging attrsets instead of just using an
optionalString for postPatch
---
 pkgs/development/libraries/libpng/default.nix | 25 ++++++++++++----
 .../libraries/libpng/libpng-apng.nix          | 30 -------------------
 pkgs/top-level/all-packages.nix               |  2 +-
 3 files changed, 20 insertions(+), 37 deletions(-)
 delete mode 100644 pkgs/development/libraries/libpng/libpng-apng.nix

diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 0a150610781..c537ce55cf2 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -1,12 +1,19 @@
-{ stdenv, fetchurl, zlib }:
+{ stdenv, fetchurl, zlib, apngSupport ? false}:
 
 assert zlib != null;
 
-stdenv.mkDerivation rec {
-  name = "libpng-1.6.2";
+let whenPatched = stdenv.lib.optionalString apngSupport;
+    version = "1.6.2";
+    patch_src = fetchurl {
+      url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz";
+      sha256 = "0fy7p197ilr9phwqqk9h91s1mc28r6gj0w2ilrw5liagi71z75j1";
+    };
+
+in stdenv.mkDerivation (rec {
+  name = "libpng" + whenPatched "-apng" + "-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/libpng/${name}.tar.xz";
+    url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz";
     sha256 = "1pljkqjqgyz8c32w8fipd9f0v2gcyhah2ypp0h7ya1r1q85sk5qw";
   };
 
@@ -17,9 +24,15 @@ stdenv.mkDerivation rec {
   passthru = { inherit zlib; };
 
   meta = {
-    description = "The official reference implementation for the PNG file format";
+    description = "The official reference implementation for the PNG file format" + whenPatched " with animation patch";
     homepage = http://www.libpng.org/pub/png/libpng.html;
     license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt
     platforms = stdenv.lib.platforms.all;
   };
-}
+} // stdenv.lib.optionalAttrs apngSupport {
+
+  postPatch = ''
+    gunzip < ${patch_src} | patch -Np1
+  '';
+
+})
diff --git a/pkgs/development/libraries/libpng/libpng-apng.nix b/pkgs/development/libraries/libpng/libpng-apng.nix
deleted file mode 100644
index bc6a773dba3..00000000000
--- a/pkgs/development/libraries/libpng/libpng-apng.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, zlib }:
-
-stdenv.mkDerivation rec {
-  version = "1.5.14";
-  name = "libpng-apng-${version}";
-
-  patch_src = fetchurl {
-    url = "mirror://sourceforge/libpng-apng/libpng15/${version}/libpng-${version}-apng.patch.gz";
-    sha256 = "1vcqbkdssy4srm8jqyzaipdc70xzanilqssypmwqyngp8ph0m45p";
-  };
-
-  src = fetchurl {
-    url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz";
-    sha256 = "0m3vz3gig7s63zanq5b1dgb5ph12qm0cylw4g4fbxlsq3f74hn8l";
-  };
-
-  preConfigure = ''
-    gunzip < ${patch_src} | patch -Np1
-  '';
-
-  propagatedBuildInputs = [ zlib ];
-
-  passthru = { inherit zlib; };
-
-  meta = {
-    description = "The official reference implementation for the PNG file format with animation patch";
-    homepage = http://www.libpng.org/pub/png/libpng.html;
-    license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fbd8cac417e..d9e5242183f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4688,7 +4688,7 @@ let
   libpcap = callPackage ../development/libraries/libpcap { };
 
   libpng = callPackage ../development/libraries/libpng { };
-  libpng_apng = callPackage ../development/libraries/libpng/libpng-apng.nix { };
+  libpng_apng = libpng.override { apngSupport = true; };
   libpng12 = callPackage ../development/libraries/libpng/12.nix { };
   libpng15 = callPackage ../development/libraries/libpng/15.nix { };
 

From bf61d25dacf03502efd0c9e5acc0a18acccafc11 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 26 Jun 2013 13:31:21 +0200
Subject: [PATCH 101/314] kde 4.10: option to use a libcanberra with gtk
 support

by default (as it was before), kde depends on a libcanberra with its
gtk dependency removed so a kde system can be gtk-free.

However, both firefox and chromium depend on gtk+ and libcanberra too.
So this leads to 2 versions being installed. this option combats that
by letting the kde use the other libcanberra
---
 pkgs/desktops/kde-4.10/kde-runtime.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-4.10/kde-runtime.nix b/pkgs/desktops/kde-4.10/kde-runtime.nix
index b562d8cadd5..2282ee57c2c 100644
--- a/pkgs/desktops/kde-4.10/kde-runtime.nix
+++ b/pkgs/desktops/kde-4.10/kde-runtime.nix
@@ -1,12 +1,21 @@
 { kde, kdelibs, shared_desktop_ontologies, bzip2, libssh, exiv2, attica
 , libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, qca2, xz, pulseaudio
-, networkmanager, kactivities, kdepimlibs, openexr, ilmbase
+, networkmanager, kactivities, kdepimlibs, openexr, ilmbase, config
 }:
 
+let libcanberraWithoutGTK = if (config ? kde_runtime && config.kde_runtime ? libcanberraWithoutGTK)
+                            then config.kde_runtime.libcanberraWithoutGTK
+                            else true;
+
+    canberra = if libcanberraWithoutGTK
+               then libcanberra.override { gtk = null; }
+               else libcanberra;
+in
+
 kde {
   buildInputs = [
     kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack
-    qca2 samba (libcanberra.override { gtk = null; }) pulseaudio
+    qca2 samba canberra pulseaudio
     networkmanager kactivities kdepimlibs openexr
 #todo: add openslp
   ];

From f7b3032da7f0b5b0b331b629247a007a8642fdda Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Tue, 25 Jun 2013 16:17:52 +0200
Subject: [PATCH 102/314] ffmpeg-1.x: passthrough vdpauSupport

---
 pkgs/development/libraries/ffmpeg/1.x.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/ffmpeg/1.x.nix b/pkgs/development/libraries/ffmpeg/1.x.nix
index 3798119acd2..9f731d118bc 100644
--- a/pkgs/development/libraries/ffmpeg/1.x.nix
+++ b/pkgs/development/libraries/ffmpeg/1.x.nix
@@ -89,6 +89,10 @@ stdenv.mkDerivation rec {
       ];
   };
 
+  passthru = {
+    inherit vdpauSupport;
+  };
+
   meta = {
     homepage = http://www.ffmpeg.org/;
     description = "A complete, cross-platform solution to record, convert and stream audio and video";

From d51c01ac8ea8723459c214cff0e62bb8cf36ad87 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Thu, 27 Jun 2013 09:22:40 +0200
Subject: [PATCH 103/314] firefox 22: use system libpng

---
 pkgs/applications/networking/browsers/firefox/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix                           | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 5a50bab0945..912a193eec9 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -46,7 +46,7 @@ in rec {
       "--with-system-nss"
       "--with-system-libevent"
       "--with-system-libvpx"
-      # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
+      "--with-system-png"
       "--enable-startup-notification"
       "--enable-system-ffi"
       "--enable-system-hunspell"
@@ -66,7 +66,7 @@ in rec {
     inherit src;
 
     buildInputs =
-      [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib bzip2
+      [ pkgconfig libpng gtk perl zip libIDL libjpeg zlib bzip2
         python dbus dbus_glib pango freetype fontconfig xlibs.libXi
         xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
         alsaLib nspr nss libnotify xlibs.pixman yasm mesa
@@ -82,7 +82,7 @@ in rec {
 
     enableParallelBuilding = true;
 
-    patches = optional useSystemCairo ./system-cairo.patch; # probably in 22
+    patches = optional useSystemCairo ./system-cairo.patch;
 
     preConfigure =
       ''
@@ -136,7 +136,7 @@ in rec {
     enableParallelBuilding = true;
 
     buildInputs =
-      [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2 python
+      [ pkgconfig libpng gtk perl zip libIDL libjpeg zlib bzip2 python
         dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
         xlibs.pixman yasm mesa sqlite file unzip pysqlite
         hunspell libevent libstartup_notification libvpx
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d9e5242183f..3ee03794796 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7390,6 +7390,7 @@ let
   firefoxPkgs = callPackage ../applications/networking/browsers/firefox {
     inherit (gnome) libIDL;
     inherit (pythonPackages) pysqlite;
+    libpng = libpng.override { apngSupport = true; };
   };
 
   firefoxWrapper = lowPrio (wrapFirefox { browser = firefoxPkgs.firefox; });

From ffddc1be9f2484aa333f1286f80f19082f8d7dee Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 26 Jun 2013 14:32:24 +0200
Subject: [PATCH 104/314] eclipse: use latest cairo/gtk

Eclipse seems to work fine without this now (after x-updates merge).
---
 pkgs/top-level/all-packages.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3ee03794796..98604d6e9bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7149,11 +7149,7 @@ let
 
   eaglemode = callPackage ../applications/misc/eaglemode { };
 
-  eclipses = recurseIntoAttrs (
-    (callPackage ../applications/editors/eclipse { }).deepOverride {
-      cairo = cairo_1_12_2;
-    }
-  );
+  eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { });
 
   ed = callPackage ../applications/editors/ed { };
 

From 7c24918a5f8b618fa12baae71930eb318acb1ee1 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 26 Jun 2013 05:05:39 +0200
Subject: [PATCH 105/314] python-blivet: Fix path and call to wipefs.

First of all, the path to wipefs didn't work at all, and though it is
documented, the "-f" flag only works when used as a long option ("--force").
This is probably fixed upstream in util-linux, but using the long-option will
stay compatible.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/python-packages.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 45afdf766ef..bdb91f1765a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -467,6 +467,10 @@ pythonPackages = python.modules // rec {
       }' blivet/pyudev.py
       sed -i -e 's|"multipath"|"${pkgs.multipath_tools}/sbin/multipath"|' \
         blivet/devicelibs/mpath.py blivet/devices.py
+      sed -i -e '/"wipefs"/ {
+        s|wipefs|${pkgs.utillinux}/sbin/wipefs|
+        s/-f/--force/
+      }' blivet/formats/__init__.py
     '';
 
     propagatedBuildInputs = let

From e3c4acb3ddc7c5b5065f5f084aa19bb8eb373633 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 27 Jun 2013 20:04:36 +0200
Subject: [PATCH 106/314] python-nevow: Fix indentation of expression.

No functionality change, the expression just got a bit too far to the right :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/python-packages.nix | 48 +++++++++++++++---------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bdb91f1765a..2621cc28468 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2744,36 +2744,36 @@ pythonPackages = python.modules // rec {
       name = "${name}.tar.gz";
     };
 
-   propagatedBuildInputs = [ twisted ];
+    propagatedBuildInputs = [ twisted ];
 
-   postInstall = "twistd --help > /dev/null";
+    postInstall = "twistd --help > /dev/null";
 
-   meta = {
-     description = "Nevow, a web application construction kit for Python";
+    meta = {
+      description = "Nevow, a web application construction kit for Python";
 
-     longDescription = ''
-       Nevow - Pronounced as the French "nouveau", or "noo-voh", Nevow
-       is a web application construction kit written in Python.  It is
-       designed to allow the programmer to express as much of the view
-       logic as desired in Python, and includes a pure Python XML
-       expression syntax named stan to facilitate this.  However it
-       also provides rich support for designer-edited templates, using
-       a very small XML attribute language to provide bi-directional
-       template manipulation capability.
+      longDescription = ''
+        Nevow - Pronounced as the French "nouveau", or "noo-voh", Nevow
+        is a web application construction kit written in Python.  It is
+        designed to allow the programmer to express as much of the view
+        logic as desired in Python, and includes a pure Python XML
+        expression syntax named stan to facilitate this.  However it
+        also provides rich support for designer-edited templates, using
+        a very small XML attribute language to provide bi-directional
+        template manipulation capability.
 
-       Nevow also includes formless, a declarative syntax for
-       specifying the types of method parameters and exposing these
-       methods to the web.  Forms can be rendered automatically, and
-       form posts will be validated and input coerced, rendering error
-       pages if appropriate.  Once a form post has validated
-       successfully, the method will be called with the coerced values.
-     '';
+        Nevow also includes formless, a declarative syntax for
+        specifying the types of method parameters and exposing these
+        methods to the web.  Forms can be rendered automatically, and
+        form posts will be validated and input coerced, rendering error
+        pages if appropriate.  Once a form post has validated
+        successfully, the method will be called with the coerced values.
+      '';
 
-     homepage = http://divmod.org/trac/wiki/DivmodNevow;
+      homepage = http://divmod.org/trac/wiki/DivmodNevow;
 
-     license = "BSD-style";
-   };
- });
+      license = "BSD-style";
+    };
+  });
 
   nose = buildPythonPackage rec {
     name = "nose-1.2.1";

From 64d2bbc7e8c773f1d20f2ca3c492d368e553b057 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 28 Jun 2013 03:29:33 +0200
Subject: [PATCH 107/314] python-blivet: Patch in paths for mount and lsof.

This adds the correct store paths for mount, umount and lsof to blivet as these
commands are still generic enough to _not_ add them as a dependency.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/python-packages.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2621cc28468..d61916e184a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -471,6 +471,8 @@ pythonPackages = python.modules // rec {
         s|wipefs|${pkgs.utillinux}/sbin/wipefs|
         s/-f/--force/
       }' blivet/formats/__init__.py
+      sed -i -e 's|"lsof"|"${pkgs.lsof}/bin/lsof"|' blivet/formats/fs.py
+      sed -i -r -e 's|"(u?mount)"|"${pkgs.utillinux}/bin/\1"|' blivet/util.py
     '';
 
     propagatedBuildInputs = let

From 082252bc162608440ccb76542e427994b363f615 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 28 Jun 2013 03:31:11 +0200
Subject: [PATCH 108/314] python-blivet: Fix pvscan to not require lvmetad.

The --cache argument to pvscan won't work on NixOS, for specifics about this,
please have a look at:

http://www.mail-archive.com/pld-cvs-commit@lists.pld-linux.org/msg310821.html

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/python-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d61916e184a..3c0eccc5dbf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -473,6 +473,7 @@ pythonPackages = python.modules // rec {
       }' blivet/formats/__init__.py
       sed -i -e 's|"lsof"|"${pkgs.lsof}/bin/lsof"|' blivet/formats/fs.py
       sed -i -r -e 's|"(u?mount)"|"${pkgs.utillinux}/bin/\1"|' blivet/util.py
+      sed -i '/pvscan/s/, *"--cache"//' blivet/devicelibs/lvm.py
     '';
 
     propagatedBuildInputs = let

From 08a9a9b020c22dce241a18988efdbace88fc0c06 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 28 Jun 2013 03:34:55 +0200
Subject: [PATCH 109/314] radeon-juniper: Update to new JUNIPER_rlc.bin.

Kinda icky to not have archives available here, but I got an error during VM
tests because of an sha256sum mismatch, hence the update. Maybe Hydra has cached
this?

And yes, I checked twice, it wasn't a broken download - there really *is* a new
upstream version available.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/os-specific/linux/firmware/radeon-juniper/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/firmware/radeon-juniper/default.nix b/pkgs/os-specific/linux/firmware/radeon-juniper/default.nix
index ad277ac8dda..53e0fb235a5 100644
--- a/pkgs/os-specific/linux/firmware/radeon-juniper/default.nix
+++ b/pkgs/os-specific/linux/firmware/radeon-juniper/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   };
   srcRlc = fetchurl {
     url = "http://people.freedesktop.org/~agd5f/radeon_ucode/JUNIPER_rlc.bin";
-    sha256 = "1y3xr7qc7cvszgw0bh66vzy36pn4m1sj17bzy5dc9kfw01kq3n0y";
+    sha256 = "0hglq8ab1f3d81mvcb4aikkfdwh6i4a93ps0f9czq1qz5h0q6wlk";
   };
 
   unpackPhase = "true";

From b2973d3b07475bf4d1562bf3c7dcacddff1f41ec Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 28 Jun 2013 04:15:27 +0200
Subject: [PATCH 110/314] python-packages: Add nixpart version 0.1.

This version is preliminary because it quite heavily depends on pykickstart
(through blivet) and the roadmap is to have a nice NixOS attrset-based
specification of partitions.

Currently the main purpose for this is in preparation for the Hetzner nixops
backend, but we might want to make this part of the standard NixOS installer.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3c0eccc5dbf..c6fec3ee925 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2778,6 +2778,26 @@ pythonPackages = python.modules // rec {
     };
   });
 
+  nixpart = buildPythonPackage rec {
+    name = "nixpart-${version}";
+    version = "0.1";
+
+    src = fetchurl {
+      url = "https://github.com/aszlig/nixpart/archive/v${version}.tar.gz";
+      sha256 = "1gyk260qnv14w94f0ljfra4mmigq9i6cx0gy4ppf3fia5wfj2a6j";
+    };
+
+    propagatedBuildInputs = [ blivet ];
+
+    doCheck = false;
+
+    meta = {
+      description = "NixOS Anaconda Kickstart helper";
+      license = pkgs.lib.licenses.gpl2Plus;
+      maintainers = [ stdenv.lib.maintainers.aszlig ];
+    };
+  };
+
   nose = buildPythonPackage rec {
     name = "nose-1.2.1";
 

From b394ffc3ad50142183681efa831ea84f88f29e7d Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@gmail.com>
Date: Thu, 27 Jun 2013 18:40:42 -0430
Subject: [PATCH 111/314] racket: fix build broken by new libpng version and
 advance version to 5.3.5

---
 pkgs/development/interpreters/racket/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                  | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 347647fd87e..da3390bb1e1 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -4,12 +4,12 @@
 
 stdenv.mkDerivation rec {
   pname = "racket";
-  version = "5.3.4";
+  version = "5.3.5";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://download.racket-lang.org/installers/${version}/${pname}/${name}-src-unix.tgz";
-    sha256 = "0yrdmpdvzf092869y6zjjjxl6j2kypgiv7qrfkv7lj8w01pbh7sd";
+    sha256 = "0xrd25d2iskkih08ydcjqnasg84r7g32apvdw7qzlp4xs1xynjwk";
   };
 
   # Various racket executables do run-time searches for these.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 98604d6e9bb..fb3247ff44f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3096,7 +3096,9 @@ let
 
   qi = callPackage ../development/compilers/qi { };
 
-  racket = callPackage ../development/interpreters/racket { };
+  racket = callPackage ../development/interpreters/racket {
+    libpng = libpng15;
+  };
 
   regina = callPackage ../development/interpreters/regina {};
 

From bf94beff4217db662ed81ac952eebda082fc42ef Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 28 Jun 2013 07:50:20 +0200
Subject: [PATCH 112/314] chromium: Update dev channel to v29.0.1547.0.

Build tested and works on my machine.

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 dce02893a56..952ecf2a6f1 100644
--- a/pkgs/applications/networking/browsers/chromium/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/sources.nix
@@ -1,9 +1,9 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   dev = {
-    version = "29.0.1541.2";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1541.2.tar.xz";
-    sha256 = "0i3vp2zrk1sjdhkwdhig08jh0qmzahn96pm0i22r63cp8i9vny1p";
+    version = "29.0.1547.0";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1547.0.tar.xz";
+    sha256 = "0ydinl0zrsm995rcpph4i56335nzhp1fqnlz39lg4vbjsshchh9x";
   };
   beta = {
     version = "28.0.1500.52";

From 9404b2cc12c2c5c094f6fde8024cacae4abe2bb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 28 Jun 2013 08:33:09 +0200
Subject: [PATCH 113/314] qt3: fix infinite recursion created by 0b17251c06e

---
 pkgs/development/libraries/qt-3/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix
index b3dfc021da9..9b5cb0452d6 100644
--- a/pkgs/development/libraries/qt-3/default.nix
+++ b/pkgs/development/libraries/qt-3/default.nix
@@ -10,8 +10,6 @@
 , x11, xextproto, zlib, libjpeg, libpng, which
 }:
 
-let libpng = libpng; in
-
 assert xftSupport -> libXft != null;
 assert xrenderSupport -> xftSupport && libXrender != null;
 assert xrandrSupport -> libXrandr != null && randrproto != null;

From 4278f778b4bbbfe7862a74ae021bc84a68388d2a Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 28 Jun 2013 21:34:33 +0200
Subject: [PATCH 114/314] Improve error message for option that is not defined
 and has now default value.

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

diff --git a/pkgs/lib/modules.nix b/pkgs/lib/modules.nix
index ea38010cecc..9dda89b09f0 100644
--- a/pkgs/lib/modules.nix
+++ b/pkgs/lib/modules.nix
@@ -309,7 +309,7 @@ rec {
               let opt = option.decl; in
               opt.apply (
                 if isNotDefined then
-                  opt.default or (throw "Not defined.")
+                  opt.default or (throw "Option `${addName name}' not defined and does not have a default value.")
                 else opt.merge defs
               )
             );

From baf822a28743816924f71237f9541d70b00a5bf8 Mon Sep 17 00:00:00 2001
From: Benjamin Cahill <ben@benjamincahill.com>
Date: Fri, 28 Jun 2013 16:35:57 -0500
Subject: [PATCH 115/314] rmlint: Install to /bin, not /usr/bin

---
 pkgs/tools/misc/rmlint/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix
index a1cf21aa64a..805bcf6b01c 100644
--- a/pkgs/tools/misc/rmlint/default.nix
+++ b/pkgs/tools/misc/rmlint/default.nix
@@ -8,6 +8,11 @@ stdenv.mkDerivation rec {
     sha256 = "bea39a5872b39d3596e756f242967bc5bde6febeb996fdcd63fbcf5bfdc75f01";
   };
 
+  preConfigure = ''
+    substituteInPlace Makefile.in \
+      --replace "/usr/" "/"
+  '';
+
   makeFlags="DESTDIR=$(out)";
 
   meta = {

From f3f447ac6f7c126c39098e6e7316663ee9eb92d9 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 28 Jun 2013 20:16:39 -0400
Subject: [PATCH 116/314] ledger3: Update

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/applications/office/ledger/3.0.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/office/ledger/3.0.nix b/pkgs/applications/office/ledger/3.0.nix
index d564f2f561e..b51fd6fe41e 100644
--- a/pkgs/applications/office/ledger/3.0.nix
+++ b/pkgs/applications/office/ledger/3.0.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchgit, cmake, boost, gmp, mpfr, libedit, python, texinfo }:
 
 let
-  rev = "2c7ab8be";
+  rev = "26d7197";
 in
 stdenv.mkDerivation {
-  name = "ledger3-2013.04.${rev}";
+  name = "ledger3-2013.06.${rev}";
 
   src = fetchgit {
-    url = "git://github.com/jwiegley/ledger.git";
+    url = "https://github.com/ledger/ledger.git";
     inherit rev;
-    sha256 = "1ng5ymzqzbgdrn2ghhr7jvcjv5y7ikhyck5p1yv5j024s17xdyj5";
+    sha256 = "02nf4kdrd61q9rf5rrarwmx47y2ya5qix7n82cj9qi9p4v3k3m2g";
   };
 
   buildInputs = [ cmake boost gmp mpfr libedit python texinfo ];

From b02b7bd1621d69cd04d2d21b1381af9db2f5dae7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 29 Jun 2013 13:31:17 +0200
Subject: [PATCH 117/314] sqlite: set meta.platforms so that Hydra will build
 it

I'm sure that sqlite works on more platforms than linux, but I cannot
verify that myself (I only have linux). So I'll leave it up to the users
of other platforms to expand this as needed.
---
 pkgs/development/libraries/sqlite/3.7.14.nix | 1 +
 pkgs/development/libraries/sqlite/3.7.16.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/sqlite/3.7.14.nix b/pkgs/development/libraries/sqlite/3.7.14.nix
index be3a24c1e4c..50338f98a2c 100644
--- a/pkgs/development/libraries/sqlite/3.7.14.nix
+++ b/pkgs/development/libraries/sqlite/3.7.14.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://www.sqlite.org/;
     description = "A self-contained, serverless, zero-configuration, transactional SQL database engine";
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/sqlite/3.7.16.nix b/pkgs/development/libraries/sqlite/3.7.16.nix
index 231f4e5d69c..f681e94c6ba 100644
--- a/pkgs/development/libraries/sqlite/3.7.16.nix
+++ b/pkgs/development/libraries/sqlite/3.7.16.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://www.sqlite.org/;
     description = "A self-contained, serverless, zero-configuration, transactional SQL database engine";
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From 748a0f607b126ef1130293072d72f11ee34bff77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 28 Jun 2013 23:47:54 +0200
Subject: [PATCH 118/314] Updating siproxd to 0.8.1, and libosip.

---
 pkgs/applications/networking/siproxd/cheaders.patch | 13 +++++++++++++
 pkgs/applications/networking/siproxd/default.nix    | 10 ++++++----
 pkgs/development/libraries/osip/default.nix         |  4 ++--
 3 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/applications/networking/siproxd/cheaders.patch

diff --git a/pkgs/applications/networking/siproxd/cheaders.patch b/pkgs/applications/networking/siproxd/cheaders.patch
new file mode 100644
index 00000000000..53c4813cc33
--- /dev/null
+++ b/pkgs/applications/networking/siproxd/cheaders.patch
@@ -0,0 +1,13 @@
+diff --git a/src/dejitter.c b/src/dejitter.c
+index 1904ab3..cb3624d 100644
+--- a/src/dejitter.c
++++ b/src/dejitter.c
+@@ -22,6 +22,8 @@
+ 
+ #include <errno.h>
+ 
++#include <string.h>
++#include <sys/time.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
diff --git a/pkgs/applications/networking/siproxd/default.nix b/pkgs/applications/networking/siproxd/default.nix
index 3395ba6947a..69ebab78f94 100644
--- a/pkgs/applications/networking/siproxd/default.nix
+++ b/pkgs/applications/networking/siproxd/default.nix
@@ -1,13 +1,15 @@
 { stdenv, fetchurl, libosip }:
 
-stdenv.mkDerivation {
-  name = "siproxd-0.8.0";
+stdenv.mkDerivation rec {
+  name = "siproxd-0.8.1";
   
   src = fetchurl {
-    url = mirror://sourceforge/siproxd/siproxd-0.8.0.tar.gz;
-    sha256 = "0hl51z33cf68ki707jkrrjjc3a5vpaf49gbrsz3g4rfxypdhc0qs";
+    url = "mirror://sourceforge/siproxd/${name}.tar.gz";
+    sha256 = "1bcxl0h5nc28m8lcdhpbl5yc93w98xm53mfzrf04knsvmx7z0bfz";
   };
 
+  patches = [ ./cheaders.patch ];
+
   buildInputs = [ libosip ];
 
   meta = {
diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix
index 2c1b148251c..3ec3dac221f 100644
--- a/pkgs/development/libraries/osip/default.nix
+++ b/pkgs/development/libraries/osip/default.nix
@@ -1,9 +1,9 @@
 {stdenv, fetchurl}:
 stdenv.mkDerivation rec {
-  version = "3.6.0";
+  version = "4.0.0";
   src = fetchurl {
     url = "mirror://gnu/osip/libosip2-${version}.tar.gz";
-    sha256 = "1kcndqvsyxgbhkksgydvvjw15znfq6jiznvw058d21h5fq68p8f9";
+    sha256 = "05dhj4s5k4qmhn2amca070xgh1gkcl42n040fhwsn3vm86524bdv";
   };
   name = "libosip2-${version}";
 

From a6c1edf947ed9f7a3af49e11c3b1f774c7c6530b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 29 Jun 2013 10:19:26 +0200
Subject: [PATCH 119/314] Updating pjsip to 2.1

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

diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix
index 2dc909ca915..558394199f4 100644
--- a/pkgs/applications/networking/pjsip/default.nix
+++ b/pkgs/applications/networking/pjsip/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, openssl, libsamplerate}:
 
 stdenv.mkDerivation rec {
-  name = "pjsip-1.8.10";
+  name = "pjsip-2.1";
 
   src = fetchurl {
-    url = http://www.pjsip.org/release/1.8.10/pjproject-1.8.10.tar.bz2;
-    sha256 = "1v2mgbgzn7d3msb406jmg69ms97a0rqg58asykx71dmjipbaiqc0";
+    url = http://www.pjsip.org/release/2.1/pjproject-2.1.tar.bz2;
+    md5 = "310eb63638dac93095f6a1fc8ee1f578";
   };
 
   buildInputs = [ openssl libsamplerate ];

From 7c74edc9bca4c19dc625b3900e82a8e4bb19a489 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 29 Jun 2013 15:30:05 +0200
Subject: [PATCH 120/314] sipwitch: update to 1.6.1 to fix build

---
 pkgs/development/libraries/exosip/default.nix | 4 ++--
 pkgs/servers/sip/sipwitch/default.nix         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/exosip/default.nix b/pkgs/development/libraries/exosip/default.nix
index d850618ecdf..2a1aea6df32 100644
--- a/pkgs/development/libraries/exosip/default.nix
+++ b/pkgs/development/libraries/exosip/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, libosip, openssl, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  version = "3.6.0";
+  version = "4.0.0";
   src = fetchurl {
     url = "http://download.savannah.gnu.org/releases/exosip/libeXosip2-${version}.tar.gz";
-    sha256 = "0r1mj8x5991bgwf03bx1ajn5kbbmw1136jabw2pn7dls9h41mnli";
+    sha256 = "1rdjr3x7s992w004cqf4xji1522an9rpzsr9wvyhp685khmahrsj";
   };
   name = "libexosip2-${version}";
 
diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix
index 097dde325f1..90e71f5e47a 100644
--- a/pkgs/servers/sip/sipwitch/default.nix
+++ b/pkgs/servers/sip/sipwitch/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, pkgconfig, ucommon, libosip, libexosip, gnutls, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "sipwitch-1.2.4";
+  name = "sipwitch-1.6.1";
 
   src = fetchurl {
     url = "mirror://gnu/sipwitch/${name}.tar.gz";
-    sha256 = "1c826832xi9p85l7c9va33xx8hx01m3jq49s0d1xl4c8kvri7bsj";
+    sha256 = "1sa4fbv8filzcxqx2viyixsq4pwgvkidn6l6g3k62gl8bvdfk7p9";
   };
 
   buildInputs = [ pkgconfig ucommon libosip libexosip gnutls zlib ];

From 169c8ce3f700482802de5606e72911ba9446e483 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 29 Jun 2013 16:50:56 +0200
Subject: [PATCH 121/314] Linphone 3.6.1

Lots of updates and new/old libs to get the latest linphone

It segfaults on running.
---
 .../instant-messengers/linphone/default.nix    | 18 ++++++++++--------
 pkgs/development/libraries/exosip/3.x.nix      | 17 +++++++++++++++++
 .../libraries/libzrtpcpp/default.nix           |  8 +++++---
 .../libraries/mediastreamer/default.nix        | 15 +++++++--------
 pkgs/development/libraries/ortp/default.nix    | 10 +++++++---
 pkgs/development/libraries/osip/3.nix          | 17 +++++++++++++++++
 pkgs/development/libraries/srtp/default.nix    |  6 +++---
 pkgs/development/libraries/srtp/linphone.nix   | 15 +++++++++++++++
 pkgs/top-level/all-packages.nix                | 17 +++++++++++++++--
 9 files changed, 96 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/development/libraries/exosip/3.x.nix
 create mode 100644 pkgs/development/libraries/osip/3.nix
 create mode 100644 pkgs/development/libraries/srtp/linphone.nix

diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix
index a4a32327d0c..c3af0ad0e34 100644
--- a/pkgs/applications/networking/instant-messengers/linphone/default.nix
+++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix
@@ -1,21 +1,23 @@
 { stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, libosip, libexosip
-, speex, readline, mediastreamer, libsoup }:
+, speex, readline, mediastreamer, libsoup, udev, libnotify }:
 
 stdenv.mkDerivation rec {
-  name = "linphone-3.5.2";
+  name = "linphone-3.6.1";
 
   src = fetchurl {
-    url = "mirror://savannah/linphone/3.5.x/sources/${name}.tar.gz";
-    sha256 = "0830iam7kgqphgk3q6qx93kp5wrf0gnm5air82jamy7377jxadys";
+    url = "mirror://savannah/linphone/3.6.x/sources/${name}.tar.gz";
+    sha256 = "186jm4nd4ggb0j8cs8wnpm4sy9cr7chq0c6kx2yc6y4k7qi83fh5";
   };
 
-  patches = [ ./fix-deprecated.patch ];
-
-  buildInputs = [ gtk libglade libosip libexosip readline mediastreamer speex libsoup ];
+  buildInputs = [ gtk libglade libosip libexosip readline mediastreamer speex libsoup udev
+    libnotify ];
 
   nativeBuildInputs = [ intltool pkgconfig ];
 
-  preConfigure = "rm -r mediastreamer2 oRTP";
+  preConfigure = ''
+    rm -r mediastreamer2 oRTP
+    sed -i s,/bin/echo,echo, coreapi/Makefile*
+  '';
 
   configureFlags = "--enable-external-ortp --enable-external-mediastreamer";
 
diff --git a/pkgs/development/libraries/exosip/3.x.nix b/pkgs/development/libraries/exosip/3.x.nix
new file mode 100644
index 00000000000..d850618ecdf
--- /dev/null
+++ b/pkgs/development/libraries/exosip/3.x.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, libosip, openssl, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  version = "3.6.0";
+  src = fetchurl {
+    url = "http://download.savannah.gnu.org/releases/exosip/libeXosip2-${version}.tar.gz";
+    sha256 = "0r1mj8x5991bgwf03bx1ajn5kbbmw1136jabw2pn7dls9h41mnli";
+  };
+  name = "libexosip2-${version}";
+
+  buildInputs = [ libosip openssl pkgconfig ];
+      
+  meta = {
+    license = "GPLv2+";
+    description = "Library that hides the complexity of using the SIP protocol";
+  };
+}
diff --git a/pkgs/development/libraries/libzrtpcpp/default.nix b/pkgs/development/libraries/libzrtpcpp/default.nix
index 02741bc6fa1..e6c4cafcd55 100644
--- a/pkgs/development/libraries/libzrtpcpp/default.nix
+++ b/pkgs/development/libraries/libzrtpcpp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, openssl, pkgconfig, ccrtp }:
 
 stdenv.mkDerivation rec {
-  name = "libzrtpcpp-2.0.0";
+  name = "libzrtpcpp-2.3.3";
 
   src = fetchurl {
     url = "mirror://gnu/ccrtp/${name}.tar.gz";
-    sha256 = "05yw8n5xpj0jxkvzgsvn3xkxirpypc1japy9k1jqs9301fgb1a3i";
+    sha256 = "1p8i3qb4j1r64r7miva8hamaszk42kncpy1x5xlq1l0465h01rvg";
   };
 
   # We disallow 'lib64', or pkgconfig will not find it.
@@ -13,7 +13,9 @@ stdenv.mkDerivation rec {
     sed -i s/lib64/lib/ CMakeLists.txt
   '';
 
-  buildInputs = [ cmake openssl pkgconfig ccrtp ];
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  propagatedBuildInputs = [ openssl ccrtp ];
 
   meta = { 
     description = "GNU RTP stack for the zrtp protocol developed by Phil Zimmermann";
diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix
index 4aa78570b2f..3b1fd9faa6b 100644
--- a/pkgs/development/libraries/mediastreamer/default.nix
+++ b/pkgs/development/libraries/mediastreamer/default.nix
@@ -1,21 +1,20 @@
-{ stdenv, fetchurl, pkgconfig, alsaLib, ffmpeg, speex, ortp, pulseaudio, xorg,
-  libv4l, libtheora, intltool, libvpx, gsm }:
+{ stdenv, fetchurl, pkgconfig, alsaLib, ffmpeg, speex, ortp, pulseaudio,
+libv4l, libtheora, intltool, libvpx, gsm, mesa, libX11, libXv, libXext,
+glew, libopus, libupnp, vim }:
 
 stdenv.mkDerivation rec {
-  name = "mediastreamer-2.8.2";
+  name = "mediastreamer-2.9.0";
 
   src = fetchurl {
     url = "mirror://savannah/linphone/mediastreamer/${name}.tar.gz";
-    sha256 = "0csg9a4mwfw5j475q9d5klhy82jnpcqfrlbvw81nxnqki40bnbm6";
+    sha256 = "1mdcaqkcdwzlj7hy3bz0ipkrrqiw1cgy01in8f24rfra9i2bjif2";
   };
 
 # TODO: make it load plugins from *_PLUGIN_PATH
   nativeBuildInputs = [pkgconfig intltool];
 
-  propagatedBuildInputs = [alsaLib ffmpeg speex ortp pulseaudio xorg.libX11
-    xorg.libXv xorg.libXext libv4l libtheora libvpx gsm ];
-
-#patches = [ ./h264.patch ./plugins.patch ];
+  propagatedBuildInputs = [ alsaLib ffmpeg speex ortp pulseaudio libX11
+    libXv libXext libv4l libtheora libvpx gsm mesa glew libopus libupnp vim ];
 
   configureFlags = "--enable-external-ortp";
 }
diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix
index 255d9198105..ff7536de403 100644
--- a/pkgs/development/libraries/ortp/default.nix
+++ b/pkgs/development/libraries/ortp/default.nix
@@ -1,13 +1,17 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, srtp, libzrtpcpp, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "ortp-0.18.0";
+  name = "ortp-0.22.0";
 
   src = fetchurl {
     url = "mirror://savannah/linphone/ortp/sources/${name}.tar.gz";
-    sha256 = "1cgx9xid0abk3cad3xjdvx7p9whinlhrviphyrd9zkhhx7ddkih2";
+    sha256 = "02rdm6ymgblbx8fnjfvivkl4qkgbdizrf35fyb0vln9m7jdy4dvf";
   };
 
+  configureFlags = "--enable-zrtp";
+
+  propagatedBuildInputs = [ srtp libzrtpcpp pkgconfig ];
+
   meta = {
     description = "A Real-Time Transport Protocol (RFC3550) stack";
     homepage = http://www.linphone.org/index.php/eng/code_review/ortp;
diff --git a/pkgs/development/libraries/osip/3.nix b/pkgs/development/libraries/osip/3.nix
new file mode 100644
index 00000000000..2c1b148251c
--- /dev/null
+++ b/pkgs/development/libraries/osip/3.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl}:
+stdenv.mkDerivation rec {
+  version = "3.6.0";
+  src = fetchurl {
+    url = "mirror://gnu/osip/libosip2-${version}.tar.gz";
+    sha256 = "1kcndqvsyxgbhkksgydvvjw15znfq6jiznvw058d21h5fq68p8f9";
+  };
+  name = "libosip2-${version}";
+
+  meta = {
+    license = "LGPLv2.1+";
+    homepage = http://www.gnu.org/software/osip/;
+    description = "The GNU oSIP library, an implementation of the Session Initiation Protocol (SIP)";
+    maintainers = with stdenv.lib.maintainers; [ raskin ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/development/libraries/srtp/default.nix
index 1b8b654ca80..ee264a4e956 100644
--- a/pkgs/development/libraries/srtp/default.nix
+++ b/pkgs/development/libraries/srtp/default.nix
@@ -11,10 +11,10 @@ let
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="srtp";
-    version="1.4.2";
+    version="1.4.4";
     name="${baseName}-${version}";
-    url="http://srtp.sourceforge.net/${name}.tgz";
-    hash="1497mcxharnhiccjhny30g4wlv28ckdxhj14jrwvdnnvhl80jf43";
+    url="mirror://sourceforge/${name}.tgz";
+    hash="057k191hx7sf84wdvc8wr1nk4whhrvbg1vv3r4nyswjir6qwphnr";
   };
 in
 rec {
diff --git a/pkgs/development/libraries/srtp/linphone.nix b/pkgs/development/libraries/srtp/linphone.nix
new file mode 100644
index 00000000000..9108be5e30c
--- /dev/null
+++ b/pkgs/development/libraries/srtp/linphone.nix
@@ -0,0 +1,15 @@
+{ stdenv, fetchgit, automake, autoconf, libtool }:
+
+stdenv.mkDerivation {
+  name = "srtp-linphone-git-20130530-1c9bd9065";
+
+  src = fetchgit {
+    url = git://git.linphone.org/srtp.git;
+    rev = "1c9bd9065";
+    sha256 = "0r4wbrih8bggs69fnfmzm17z1pp1zp8x9qwcckcq6wc54b16d9g3";
+  };
+
+  preConfigure = "autoreconf -vfi";
+
+  buildInputs = [ automake autoconf libtool ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2962a24db31..975b43bdf6b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4498,6 +4498,10 @@ let
 
   libexosip = callPackage ../development/libraries/exosip {};
 
+  libexosip_3 = callPackage ../development/libraries/exosip/3.x.nix {
+    libosip = libosip_3;
+  };
+
   libextractor = callPackage ../development/libraries/libextractor {
     libmpeg2 = mpeg2dec;
   };
@@ -4685,6 +4689,8 @@ let
 
   libosip = callPackage ../development/libraries/osip {};
 
+  libosip_3 = callPackage ../development/libraries/osip/3.nix {};
+
   libotr = callPackage ../development/libraries/libotr { };
 
   libotr_3_2 = callPackage ../development/libraries/libotr/3.2.nix { };
@@ -4879,7 +4885,9 @@ let
   mdds = callPackage ../development/libraries/mdds { };
 
   # failed to build
-  mediastreamer = callPackage ../development/libraries/mediastreamer { };
+  mediastreamer = callPackage ../development/libraries/mediastreamer {
+    ffmpeg = ffmpeg_1;
+  };
 
   mesaSupported = lib.elem system lib.platforms.mesaPlatforms;
 
@@ -5049,7 +5057,9 @@ let
     };
   };
 
-  ortp = callPackage ../development/libraries/ortp { };
+  ortp = callPackage ../development/libraries/ortp {
+    srtp = srtp_linphone;
+  };
 
   p11_kit = callPackage ../development/libraries/p11-kit { };
 
@@ -5278,6 +5288,8 @@ let
 
   srtp = callPackage ../development/libraries/srtp {};
 
+  srtp_linphone = callPackage ../development/libraries/srtp/linphone.nix { };
+
   sqlite_3_7_16 = lowPrio (callPackage ../development/libraries/sqlite/3.7.16.nix {
     readline = null;
     ncurses = null;
@@ -7771,6 +7783,7 @@ let
 
   linphone = callPackage ../applications/networking/instant-messengers/linphone {
     inherit (gnome) libglade;
+    libexosip = libexosip_3;
   };
 
   linuxsampler = callPackage ../applications/audio/linuxsampler { };

From e20244fcf7835e681e1e8720b8b0d198e6827c1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 29 Jun 2013 16:55:35 +0200
Subject: [PATCH 122/314] Fixing linphone crossed lib versions on libosip.

---
 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 975b43bdf6b..2221d06cad5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7781,9 +7781,10 @@ let
 
   links2 = callPackage ../applications/networking/browsers/links2 { };
 
-  linphone = callPackage ../applications/networking/instant-messengers/linphone {
+  linphone = callPackage ../applications/networking/instant-messengers/linphone rec {
     inherit (gnome) libglade;
     libexosip = libexosip_3;
+    libosip = libosip_3;
   };
 
   linuxsampler = callPackage ../applications/audio/linuxsampler { };

From 18ddfda81a74555757295e9c87b2823b21bb34a8 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sat, 29 Jun 2013 18:30:22 +0200
Subject: [PATCH 123/314] fix rmlint

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

diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix
index a1cf21aa64a..3e69f160083 100644
--- a/pkgs/tools/misc/rmlint/default.nix
+++ b/pkgs/tools/misc/rmlint/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "bea39a5872b39d3596e756f242967bc5bde6febeb996fdcd63fbcf5bfdc75f01";
   };
 
-  makeFlags="DESTDIR=$(out)";
+  makeFlags="DESTDIR=$(out) INSTALLPATH=$(out)/bin/";
 
   meta = {
     description = "A tool to remove duplicates and other lint";

From efa4aac21e45db4b965f7aa84e3cf9827abac10a Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sat, 29 Jun 2013 18:46:37 +0200
Subject: [PATCH 124/314] dd-agent: ab14fde6f9 -> 3.8.0

---
 pkgs/tools/networking/dd-agent/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
index e83ad7933f1..ab0ba37daac 100644
--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/pkgs/tools/networking/dd-agent/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchgit, python, sysstat }:
+{ stdenv, fetchurl, python, sysstat, unzip }:
 
 stdenv.mkDerivation rec {
-    name = "dd-agent-ab14fde6f9";
+    version = "3.8.0";
+    name = "dd-agent-${version}";
 
-    src = fetchgit {
-      url = git://github.com/DataDog/dd-agent.git;
-      rev = "ab14fde6f9b9f6cb3544f643cece97ef18a0d770";
-      sha256 = "2615a2f122ac97363eba8973dfc6c2ce81cb61a26eb61c2988faad2abd05efc5";
+    src = fetchurl {
+      url = "https://github.com/DataDog/dd-agent/archive/${version}.zip";
+      sha256 = "1mh22rbja07gc7ydn357hlij0dl2rygkqsya9ckynsvmkkzn2gyx";
     };
 
-    buildInputs = [ python ];
+    buildInputs = [ python unzip ];
 
     postUnpack = "export sourceRoot=$sourceRoot/packaging";
 

From 175eb450cddae6a2471b657f3bb900f8511db578 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sat, 29 Jun 2013 19:12:11 +0200
Subject: [PATCH 125/314] Revert "fix rmlint"

This reverts commit 18ddfda81a74555757295e9c87b2823b21bb34a8.
---
 pkgs/tools/misc/rmlint/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix
index 3e69f160083..a1cf21aa64a 100644
--- a/pkgs/tools/misc/rmlint/default.nix
+++ b/pkgs/tools/misc/rmlint/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "bea39a5872b39d3596e756f242967bc5bde6febeb996fdcd63fbcf5bfdc75f01";
   };
 
-  makeFlags="DESTDIR=$(out) INSTALLPATH=$(out)/bin/";
+  makeFlags="DESTDIR=$(out)";
 
   meta = {
     description = "A tool to remove duplicates and other lint";

From 33717c46361221f03edabca3e2606f11e944ed71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 29 Jun 2013 20:07:21 +0200
Subject: [PATCH 126/314] python-demjson: new package

demjson is a Python JSON module that reads, writes and validates
JSON-encoded data; compliant with RFC 4627.

It also includes a lint checker, jsonlint, which can be used to validate
JSON documents for strict conformance to the RFC specification; as well
as to reformat them, either by re-indenting or for minimal/canonical
JSON output.

Homepage: http://deron.meranda.us/python/demjson/
---
 pkgs/top-level/python-packages.nix | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c6fec3ee925..00bcfcfd33c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -997,6 +997,30 @@ pythonPackages = python.modules // rec {
   };
 
 
+  demjson = buildPythonPackage rec {
+    name = "demjson-1.6";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/d/demjson/${name}.tar.gz";
+      sha256 = "0abf7wqqq7rk1sycy47ayn5p93yy7gjq50cb2z69wmik1qqrr60x";
+    };
+
+    doCheck = false; # there are no tests
+
+    preFixup = ''
+      mkdir -p "$out/bin"
+      cp jsonlint "$out/bin/"
+    '';
+
+    meta = {
+      description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)";
+      homepage = http://deron.meranda.us/python/demjson/;
+      maintainers = with stdenv.lib.maintainers; [ bjornfor ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+
   evdev = buildPythonPackage rec {
     version = "0.3.2";
     name = "evdev-${version}";

From ae1c5a58440baecfbf3157ba13e9a49322fcbf9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 29 Jun 2013 20:32:04 +0200
Subject: [PATCH 127/314] python-demjson: add missing license (LGPLv3 or later)

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 00bcfcfd33c..8993e467632 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1015,6 +1015,7 @@ pythonPackages = python.modules // rec {
     meta = {
       description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)";
       homepage = http://deron.meranda.us/python/demjson/;
+      license = stdenv.lib.licenses.lgpl3Plus;
       maintainers = with stdenv.lib.maintainers; [ bjornfor ];
       platforms = stdenv.lib.platforms.all;
     };

From f01588653c4781e0fbfa64cb00e3e3244257b474 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Sat, 29 Jun 2013 20:50:44 +0200
Subject: [PATCH 128/314] Update get_iplayer to 2.83, and fix the package.

---
 pkgs/applications/misc/get_iplayer/default.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix
index 0e222366729..308b181fe88 100644
--- a/pkgs/applications/misc/get_iplayer/default.nix
+++ b/pkgs/applications/misc/get_iplayer/default.nix
@@ -1,19 +1,23 @@
-{stdenv, fetchurl, flvstreamer, ffmpeg, makeWrapper, perl}:
-
-stdenv.mkDerivation {
-  name = "get_iplayer-2.80";
+{stdenv, fetchurl, flvstreamer, ffmpeg, makeWrapper, perl, buildPerlPackage, perlPackages, vlc, rtmpdump}:
+buildPerlPackage {
+  name = "get_iplayer-2.83";
 
   buildInputs = [makeWrapper perl];
+  propagatedBuildInputs = with perlPackages; [HTMLParser HTTPCookies LWP];
+
+  preConfigure = "touch Makefile.PL";
+  doCheck = false;
 
   installPhase = '' 
     mkdir -p $out/bin
     cp get_iplayer $out/bin
-    wrapProgram $out/bin/get_iplayer --suffix PATH ${ffmpeg}/bin:${flvstreamer}/bin
+    sed -i 's|^update_script|#update_script|' $out/bin/get_iplayer
+    wrapProgram $out/bin/get_iplayer --suffix PATH : ${ffmpeg}/bin:${flvstreamer}/bin:${vlc}/bin:${rtmpdump}/bin
   '';  
   
   src = fetchurl {
-    url = ftp://ftp.infradead.org/pub/get_iplayer/get_iplayer-2.80.tar.gz;
-    sha256 = "1hnadryyzca3bv1hfk2q3np9ihwvyxa3prwcrply6ywy4vnayjf8";
+    url = ftp://ftp.infradead.org/pub/get_iplayer/get_iplayer-2.83.tar.gz;
+    sha256 = "169zji0rr3z5ng6r4cyzvs89779m4iklln9gsqpryvm81ipalfga";
   };
   
 }

From 1ebaebbd93b4adf2b05779622e27adc507f296f2 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Sun, 30 Jun 2013 02:51:20 +0200
Subject: [PATCH 129/314] php-xdebug: update to latest version

---
 pkgs/development/interpreters/php-xdebug/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/php-xdebug/default.nix b/pkgs/development/interpreters/php-xdebug/default.nix
index 5a242f3c85a..fe7bbb869da 100644
--- a/pkgs/development/interpreters/php-xdebug/default.nix
+++ b/pkgs/development/interpreters/php-xdebug/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, php, autoconf, automake }:
 
-stdenv.mkDerivation {
-  name = "php-xdebug-2.0.5";
+stdenv.mkDerivation rec {
+  version = "2.2.3";
+  name = "php-xdebug-${version}";
 
   src = fetchurl {
-    url = "http://xdebug.org/files/xdebug-2.0.5.tgz";
-    sha256 = "1cmq7c36gj8n41mfq1wba5rij8j77yqhydpcsbcysk1zchg68f26";
+    url = "http://xdebug.org/files/xdebug-2.2.3.tgz";
+    sha256 = "076px4ax3qcqr3mmhi9jjkfhn7pcymrpda4hzy6kgn3flhnqfldk";
   };
 
   buildInputs = [ php autoconf automake ];

From 6d42b3b1dc3b857748b078b971feaed1eda6131d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 30 Jun 2013 12:09:42 +0400
Subject: [PATCH 130/314] srtp: fix URL

---
 pkgs/development/libraries/srtp/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/development/libraries/srtp/default.nix
index ee264a4e956..c6cf56e59d6 100644
--- a/pkgs/development/libraries/srtp/default.nix
+++ b/pkgs/development/libraries/srtp/default.nix
@@ -13,7 +13,7 @@ let
     baseName="srtp";
     version="1.4.4";
     name="${baseName}-${version}";
-    url="mirror://sourceforge/${name}.tgz";
+    url="mirror://sourceforge/${baseName}/${name}.tgz";
     hash="057k191hx7sf84wdvc8wr1nk4whhrvbg1vv3r4nyswjir6qwphnr";
   };
 in

From cffec59612492877038871630e781234697ea492 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 30 Jun 2013 10:47:44 +0200
Subject: [PATCH 131/314] cairo: no openGL on darwin by default (see #692)

---
 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 2221d06cad5..cc64901dbb5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4184,7 +4184,7 @@ let
   pixman = callPackage ../development/libraries/pixman { };
 
   cairo = callPackage ../development/libraries/cairo {
-    glSupport = lib.elem system lib.platforms.mesaPlatforms;
+    glSupport = config.cairo.gl or stdenv.isLinux;
   };
   cairo_1_12_2 = callPackage ../development/libraries/cairo/1.12.2.nix { };
   cairomm = callPackage ../development/libraries/cairomm { };

From 0d8025c612d3bfe1c52d0fd35b455693da3ec006 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 30 Jun 2013 20:55:21 -0400
Subject: [PATCH 132/314] Linux 3.10

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/os-specific/linux/kernel/linux-3.10.nix | 281 +++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  15 +-
 pkgs/top-level/platforms.nix                 |   6 +-
 3 files changed, 298 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/os-specific/linux/kernel/linux-3.10.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
new file mode 100644
index 00000000000..5e991d750ac
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -0,0 +1,281 @@
+args @ { stdenv, fetchurl, extraConfig ? ""
+, perl, mktemp, module_init_tools, bc
+, ... }:
+
+let
+  configWithPlatform = kernelPlatform :
+    ''
+      # Power management and debugging for powertop.
+      DEBUG_KERNEL y
+      PM_ADVANCED_DEBUG y
+      PM_RUNTIME y
+      TIMER_STATS y
+      BACKTRACE_SELF_TEST n
+      CPU_NOTIFIER_ERROR_INJECT? n
+      DEBUG_DEVRES n
+      DEBUG_NX_TEST n
+      DEBUG_STACK_USAGE n
+      DEBUG_STACKOVERFLOW n
+      RCU_TORTURE_TEST n
+      SCHEDSTATS n
+
+      # Support drivers that need external firmware.
+      STANDALONE n
+
+      # Make /proc/config.gz available.
+      IKCONFIG_PROC y
+
+      # Optimize with -O2, not -Os.
+      CC_OPTIMIZE_FOR_SIZE n
+
+      # Enable the kernel's built-in memory tester.
+      MEMTEST y
+
+      # Include the CFQ I/O scheduler in the kernel, rather than as a
+      # module, so that the initrd gets a good I/O scheduler.
+      IOSCHED_CFQ y
+      BLK_CGROUP y # required by CFQ
+
+      # Enable NUMA.
+      NUMA? y
+
+      # Disable some expensive (?) features.
+      FTRACE n
+      KPROBES n
+      PM_TRACE_RTC n
+
+      # Enable various subsystems.
+      ACCESSIBILITY y # Accessibility support
+      AUXDISPLAY y # Auxiliary Display support
+      DONGLE y # Serial dongle support
+      HIPPI? y
+      MTD_COMPLEX_MAPPINGS y # needed for many devices
+      SCSI_LOWLEVEL y # enable lots of SCSI devices
+      SCSI_LOWLEVEL_PCMCIA y
+      SPI y # needed for many devices
+      SPI_MASTER y
+      WAN y
+
+      # Networking options.
+      IP_PNP n
+      IPV6_PRIVACY y
+      NETFILTER_ADVANCED y
+      IP_VS_PROTO_TCP y
+      IP_VS_PROTO_UDP y
+      IP_VS_PROTO_ESP y
+      IP_VS_PROTO_AH y
+      IP_DCCP_CCID3 n # experimental
+      CLS_U32_PERF y
+      CLS_U32_MARK y
+
+      # Wireless networking.
+      IPW2100_MONITOR y # support promiscuous mode
+      IPW2200_MONITOR? y # support promiscuous mode
+      HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver
+      HOSTAP_FIRMWARE_NVRAM y
+      ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus
+      ATH9K_AHB y # Ditto, AHB bus
+      B43_PHY_HT y
+      BCMA_HOST_PCI y
+      CFG80211_WEXT y # Without it, ipw2200 drivers don't build
+
+      # Some settings to make sure that fbcondecor works - in particular,
+      # disable tileblitting and the drivers that need it.
+
+      # Enable various FB devices.
+      FB y
+      FB_EFI y
+      FB_NVIDIA_I2C y # Enable DDC Support
+      FB_RIVA_I2C y
+      FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support
+      FB_ATY_GX y # Mach64 GX support
+      FB_SAVAGE_I2C y
+      FB_SAVAGE_ACCEL y
+      FB_SIS_300 y
+      FB_SIS_315 y
+      FB_3DFX_ACCEL y
+      FB_GEODE y
+
+      # Video configuration
+      # Enable KMS for devices whose X.org driver supports it.
+      DRM_I915_KMS y
+      DRM_RADEON_KMS? y
+      # Hybrid graphics support
+      VGA_SWITCHEROO y
+
+      # Sound.
+      SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode
+      SND_HDA_INPUT_BEEP y # Support digital beep via input layer
+      SND_USB_CAIAQ_INPUT y
+      PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
+
+      # USB serial devices.
+      USB_SERIAL_GENERIC y # USB Generic Serial Driver
+      USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices
+      USB_SERIAL_KEYSPAN_USA28 y
+      USB_SERIAL_KEYSPAN_USA28X y
+      USB_SERIAL_KEYSPAN_USA28XA y
+      USB_SERIAL_KEYSPAN_USA28XB y
+      USB_SERIAL_KEYSPAN_USA19 y
+      USB_SERIAL_KEYSPAN_USA18X y
+      USB_SERIAL_KEYSPAN_USA19W y
+      USB_SERIAL_KEYSPAN_USA19QW y
+      USB_SERIAL_KEYSPAN_USA19QI y
+      USB_SERIAL_KEYSPAN_USA49W y
+      USB_SERIAL_KEYSPAN_USA49WLC y
+
+      # Filesystem options - in particular, enable extended attributes and
+      # ACLs for all filesystems that support them.
+      EXT2_FS_XATTR y # Ext2 extended attributes
+      EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists
+      EXT2_FS_SECURITY y # Ext2 Security Labels
+      EXT2_FS_XIP y # Ext2 execute in place support
+      EXT4_FS_POSIX_ACL y
+      EXT4_FS_SECURITY y
+      REISERFS_FS_XATTR y
+      REISERFS_FS_POSIX_ACL y
+      REISERFS_FS_SECURITY y
+      JFS_POSIX_ACL y
+      JFS_SECURITY y
+      XFS_QUOTA y
+      XFS_POSIX_ACL y
+      XFS_RT y # XFS Realtime subvolume support
+      OCFS2_DEBUG_MASKLOG n
+      BTRFS_FS_POSIX_ACL y
+      UBIFS_FS_XATTR? y
+      UBIFS_FS_ADVANCED_COMPR y
+      NFSD_V2_ACL y
+      NFSD_V3 y
+      NFSD_V3_ACL y
+      NFSD_V4 y
+      NFS_FSCACHE y
+      CIFS_XATTR y
+      CIFS_POSIX y
+      CIFS_FSCACHE y
+
+      # Security related features.
+      STRICT_DEVMEM y # Filter access to /dev/mem
+      SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default
+
+      # Misc. options.
+      8139TOO_8129 y
+      8139TOO_PIO n # PIO is slower
+      AIC79XX_DEBUG_ENABLE n
+      AIC7XXX_DEBUG_ENABLE n
+      AIC94XX_DEBUG n
+      AUDIT_LOGINUID_IMMUTABLE y
+      B43_PCMCIA y
+      BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support
+      BLK_DEV_IDEACPI y # IDE ACPI support
+      BLK_DEV_INTEGRITY y
+      BSD_PROCESS_ACCT_V3 y
+      BT_HCIUART_BCSP y
+      BT_HCIUART_H4 y # UART (H4) protocol support
+      BT_HCIUART_LL y
+      BT_RFCOMM m
+      BT_RFCOMM_TTY y # RFCOMM TTY support
+      CRASH_DUMP n
+      DMAR? n # experimental
+      DVB_DYNAMIC_MINORS? y # we use udev
+      EFI_STUB y # EFI bootloader in the bzImage itself
+      FHANDLE y # used by systemd
+      FUSION y # Fusion MPT device support
+      IDE_GD_ATAPI y # ATAPI floppy support
+      IRDA_ULTRA y # Ultra (connectionless) protocol
+      JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels
+      JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels
+      JOYSTICK_XPAD_FF y # X-Box gamepad rumble support
+      JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED
+      LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support
+      LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger
+      LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback
+      LOGO n # not needed
+      MEDIA_ATTACH? y
+      MEGARAID_NEWGEN y
+      MICROCODE_AMD y
+      MODVERSIONS y
+      MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension
+      MTRR_SANITIZER y
+      NET_FC y # Fibre Channel driver support
+      PPP_MULTILINK y # PPP multilink support
+      REGULATOR y # Voltage and Current Regulator Support
+      RC_DEVICES y # Enable IR devices
+      SCSI_LOGGING y # SCSI logging facility
+      SERIAL_8250 y # 8250/16550 and compatible serial support
+      SLIP_COMPRESSED y # CSLIP compressed headers
+      SLIP_SMART y
+      THERMAL_HWMON y # Hardware monitoring support
+      USB_DEBUG n
+      USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators
+      USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling
+      X86_CHECK_BIOS_CORRUPTION y
+      X86_MCE y
+
+      # Linux Containers
+      RT_GROUP_SCHED? y
+      CGROUP_DEVICE? y
+      MEMCG? y
+      MEMCG_SWAP? y
+      DEVPTS_MULTIPLE_INSTANCES? y
+
+      # Enable staging drivers.  These are somewhat experimental, but
+      # they generally don't hurt.
+      STAGING y
+
+      # PROC_EVENTS requires that the netlink connector is not built
+      # as a module.  This is required by libcgroup's cgrulesengd.
+      CONNECTOR y
+      PROC_EVENTS y
+
+      # Tracing
+      FTRACE y
+      FUNCTION_TRACER y
+      FTRACE_SYSCALLS y
+      SCHED_TRACER y
+
+      # Devtmpfs support.
+      DEVTMPFS y
+
+      # Media support
+      MEDIA_CAMERA_SUPPORT? y
+      MEDIA_RC_SUPPORT? y
+      MEDIA_USB_SUPPORT y
+
+      # Easier debug of NFS issues
+      SUNRPC_DEBUG y
+
+      ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
+      ${extraConfig}
+    '';
+in
+
+import ./generic.nix (
+
+  rec {
+    version = "3.10";
+    modDirVersion = "3.10.0";
+    testing = false;
+
+    preConfigure = ''
+      substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
+    '';
+
+    src = fetchurl {
+      url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
+      sha256 = "0i1mmp1fym49az75rjnwxbbh11b387qqjjkczq5l373ssa9gl9yz";
+    };
+
+    config = configWithPlatform stdenv.platform;
+    configCross = configWithPlatform stdenv.cross.platform;
+
+    features.iwlwifi = true;
+    features.efiBootStub = true;
+    features.needsCifsUtils = true;
+    features.canDisableNetfilterConntrackHelpers = true;
+    features.netfilterRPFilter = true;
+
+    extraNativeBuildInputs = [bc];
+  }
+
+  // removeAttrs args ["extraConfig"]
+)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cc64901dbb5..5341afbc776 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6299,6 +6299,18 @@ let
       ];
   };
 
+  linux_3_10 = makeOverridable (import ../os-specific/linux/kernel/linux-3.10.nix) {
+    inherit fetchurl stdenv perl mktemp bc module_init_tools 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
@@ -6426,8 +6438,9 @@ let
   linuxPackages_3_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_7 linuxPackages_3_7);
   linuxPackages_3_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_8 linuxPackages_3_8);
   linuxPackages_3_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_9 linuxPackages_3_9);
+  linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10);
   # Update this when adding a new version!
-  linuxPackages_latest = pkgs.linuxPackages_3_9;
+  linuxPackages_latest = pkgs.linuxPackages_3_10;
 
   # The current default kernel / kernel modules.
   linux = linuxPackages.kernel;
diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix
index 3c53be875e3..a7445c21a70 100644
--- a/pkgs/top-level/platforms.nix
+++ b/pkgs/top-level/platforms.nix
@@ -13,10 +13,10 @@ rec {
     kernelExtraConfig =
       ''
         # Virtualisation (KVM, Xen...).
-        PARAVIRT_GUEST y
+        PARAVIRT_GUEST? y #Doesn't exist in 3.10
         KVM_CLOCK? y #Part of KVM_GUEST since linux 3.7
-        KVM_GUEST y
-        XEN y
+        KVM_GUEST? y #Doesn't exist in 3.10
+        XEN? y #Doesn't exist in 3.10
         KSM y
 
         # We need 64 GB (PAE) support for Xen guest support.

From 270ba268d7b8f5a1dbc430259f2500bdf6eaed79 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 30 Jun 2013 21:42:51 -0400
Subject: [PATCH 133/314] Add HYPERVISOR_GUEST for linux 3.10

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/top-level/platforms.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix
index a7445c21a70..b2a12bf8b50 100644
--- a/pkgs/top-level/platforms.nix
+++ b/pkgs/top-level/platforms.nix
@@ -13,6 +13,7 @@ rec {
     kernelExtraConfig =
       ''
         # Virtualisation (KVM, Xen...).
+        HYPERVISOR_GUEST? y #3.10 version of the paravirt options
         PARAVIRT_GUEST? y #Doesn't exist in 3.10
         KVM_CLOCK? y #Part of KVM_GUEST since linux 3.7
         KVM_GUEST? y #Doesn't exist in 3.10

From fe622f65232d16808e7be51cb4451a10375a6e24 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Fri, 28 Jun 2013 23:04:28 +0200
Subject: [PATCH 134/314] upgrade some packages to libusb1

on my systems, I can now override "libusb = libusb1" in all of nixpkgs
so perhaps we can soon drop libusb 0.1 support?
---
 pkgs/misc/cups/default.nix      | 4 ++--
 pkgs/top-level/all-packages.nix | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index ad25b4180b5..bb1f60ed5db 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl
-, dbus, libusb1, acl }:
+, dbus, libusb, acl }:
 
 let version = "1.5.4"; in
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
     md5 = "de3006e5cf1ee78a9c6145ce62c4e982";
   };
 
-  buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb1 ]
+  buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb ]
     ++ stdenv.lib.optionals stdenv.isLinux [ pam dbus.libs acl ] ;
 
   propagatedBuildInputs = [ openssl ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5341afbc776..14c6ed1d497 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -901,7 +901,7 @@ let
   # use config.packageOverrides if you prefer original gnupg1
   gnupg1 = gnupg1compat;
 
-  gnupg = callPackage ../tools/security/gnupg { };
+  gnupg = callPackage ../tools/security/gnupg { libusb = libusb1; };
 
   gnupg2_1 = lowPrio (callPackage ../tools/security/gnupg/git.nix {
     libassuan = libassuan2_1;
@@ -942,7 +942,7 @@ let
     buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true;
   };
 
-  grub2 = callPackage ../tools/misc/grub/2.0x.nix { };
+  grub2 = callPackage ../tools/misc/grub/2.0x.nix { libusb = libusb1; };
 
   grub2_efi = grub2.override { EFIsupport = true; };
 
@@ -8992,6 +8992,7 @@ let
       boost = boost149;
       eigen = eigen2;
       libotr = libotr_3_2;
+      libusb = libusb1;
     }) ../desktops/kde-4.10;
 
   kdePackagesFor = self: dir:
@@ -9379,7 +9380,7 @@ let
 
   auctex = callPackage ../tools/typesetting/tex/auctex { };
 
-  cups = callPackage ../misc/cups { };
+  cups = callPackage ../misc/cups { libusb = libusb1; };
 
   cups_pdf_filter = callPackage ../misc/cups/pdf-filter.nix { };
 
@@ -9547,6 +9548,7 @@ let
   saneBackends = callPackage ../applications/graphics/sane/backends.nix {
     gt68xxFirmware = config.sane.gt68xxFirmware or null;
     hotplugSupport = config.sane.hotplugSupport or true;
+    libusb = libusb1;
   };
 
   saneBackendsGit = callPackage ../applications/graphics/sane/backends-git.nix {

From 6937609391eebf0be294637db1c40d74ef662b33 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 29 Jun 2013 11:49:46 +0200
Subject: [PATCH 135/314] clucene_core: upgrade some packages to clucene_core_2

on my systems, I can now override "clucene_core = clucene_core_2" globally in nixpkgs.
so perhaps we can soon drop v1?
---
 pkgs/applications/office/libreoffice/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                  | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index fc5f5058f97..cd45f76761d 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -6,7 +6,7 @@
 , 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_2, libcdr, lcms2, vigra
+, libwpg, dbus_glib, qt4, kde4, clucene_core, libcdr, lcms2, vigra
 , libiodbc, mdds, saneBackends, mythes, libexttextcat, libvisio
 , fontsConf
 , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" ]
@@ -162,7 +162,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs =
-    [ ant ArchiveZip autoconf automake bison boost cairo clucene_core_2
+    [ 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 lcms2 libcdr libexttextcat libiodbc libjpeg
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 14c6ed1d497..e1e1cb19b09 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5260,7 +5260,7 @@ let
 
   sofia_sip = callPackage ../development/libraries/sofia-sip { };
 
-  soprano = callPackage ../development/libraries/soprano { };
+  soprano = callPackage ../development/libraries/soprano { clucene_core = clucene_core_2; };
 
   soqt = callPackage ../development/libraries/soqt { };
 
@@ -5314,7 +5314,7 @@ let
 
   stlport = callPackage ../development/libraries/stlport { };
 
-  strigi = callPackage ../development/libraries/strigi {};
+  strigi = callPackage ../development/libraries/strigi { clucene_core = clucene_core_2; };
 
   suil = callPackage ../development/libraries/audio/suil { };
 
@@ -7779,6 +7779,7 @@ let
       ];
     };
     poppler = poppler_0_18;
+    clucene_core = clucene_core_2;
   };
 
   liferea = callPackage ../applications/networking/newsreaders/liferea { };

From 04cbaef102366be98e105a8d56c183ae7a90c1c5 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 29 Jun 2013 16:07:15 +0200
Subject: [PATCH 136/314] keep lcms versioning in all-packages.nix

---
 pkgs/applications/graphics/gimp/2.8.nix          |  4 ++--
 pkgs/applications/office/libreoffice/default.nix |  4 ++--
 pkgs/development/libraries/libcdr/default.nix    |  4 ++--
 pkgs/development/libraries/openjpeg/default.nix  |  4 ++--
 pkgs/development/libraries/poppler/0.18.nix      |  4 ++--
 pkgs/development/libraries/poppler/default.nix   |  4 ++--
 pkgs/misc/ghostscript/default.nix                |  4 ++--
 pkgs/top-level/all-packages.nix                  | 10 +++++++---
 8 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix
index 4a9890720a3..10426b4a5bd 100644
--- a/pkgs/applications/graphics/gimp/2.8.nix
+++ b/pkgs/applications/graphics/gimp/2.8.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk, glib, gdk_pixbuf
-, pango, cairo, freetype, fontconfig, lcms2, libpng, libjpeg, poppler, libtiff
+, pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff
 , webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper
 , python, pygtk, libart_lgpl, libexif, gettext, xlibs }:
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   
   buildInputs = 
     [ pkgconfig intltool babl gegl gtk glib gdk_pixbuf pango cairo
-      freetype fontconfig lcms2 libpng libjpeg poppler libtiff webkit
+      freetype fontconfig lcms libpng libjpeg poppler libtiff webkit
       libmng librsvg libwmf zlib libzip ghostscript aalib jasper
       python pygtk libart_lgpl libexif gettext 
     ];
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index cd45f76761d..6e3f83caae3 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -6,7 +6,7 @@
 , 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, lcms2, vigra
+, 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" ]
@@ -165,7 +165,7 @@ stdenv.mkDerivation rec {
     [ 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 lcms2 libcdr libexttextcat libiodbc libjpeg
+      hunspell icu jdk kde4.kdelibs lcms libcdr libexttextcat libiodbc 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
diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix
index d2d68640560..1da25527ef7 100644
--- a/pkgs/development/libraries/libcdr/default.nix
+++ b/pkgs/development/libraries/libcdr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libwpg, libwpd, lcms2, pkgconfig }:
+{ stdenv, fetchurl, libwpg, libwpd, lcms, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "libcdr-0.0.8";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "117a8gp29xs3kin6kaisb3frsx8dwrsjgs4wq4y5hjqprzy6lwz0";
   };
 
-  buildInputs = [ libwpg libwpd lcms2 ];
+  buildInputs = [ libwpg libwpd lcms ];
 
   nativeBuildInputs = [ pkgconfig ];
 
diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix
index 7fd18af450c..a47cacd62bc 100644
--- a/pkgs/development/libraries/openjpeg/default.nix
+++ b/pkgs/development/libraries/openjpeg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libpng, libtiff, lcms2, glib/*passthru only*/ }:
+{ stdenv, fetchurl, pkgconfig, libpng, libtiff, lcms, glib/*passthru only*/ }:
 
 stdenv.mkDerivation rec {
   name = "openjpeg-1.5.1";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   nativebuildInputs = [ pkgconfig ];
-  propagatedBuildInputs = [ libpng libtiff lcms2 ]; # in closure anyway
+  propagatedBuildInputs = [ libpng libtiff lcms ]; # in closure anyway
 
   postInstall = glib.flattenInclude;
 
diff --git a/pkgs/development/libraries/poppler/0.18.nix b/pkgs/development/libraries/poppler/0.18.nix
index 29e99b67549..123d229f2ba 100644
--- a/pkgs/development/libraries/poppler/0.18.nix
+++ b/pkgs/development/libraries/poppler/0.18.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, cairo, freetype, fontconfig, zlib
 , libjpeg, curl, libpthreadstubs, xorg, openjpeg
-, libxml2, pkgconfig, cmake, lcms2, libiconvOrEmpty
+, libxml2, pkgconfig, cmake, lcms, libiconvOrEmpty
 , glibSupport ? false, glib, gtk3Support ? false, gtk3 # gtk2 no longer accepted
 , qt4Support ? false, qt4 ? null
 }:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   propagatedBuildInputs = with xorg;
-    [ zlib cairo freetype fontconfig libjpeg lcms2 curl
+    [ zlib cairo freetype fontconfig libjpeg lcms curl
       libpthreadstubs libxml2 stdenv.gcc.libc
       libXau libXdmcp libxcb libXrender libXext
       openjpeg
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 7c392832406..55ab0da0cfd 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchgit, pkgconfig, cmake, libiconvOrEmpty, libintlOrEmpty
-, zlib, curl, cairo, freetype, fontconfig, lcms2, libjpeg, openjpeg
+, zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg
 , qt4Support ? false, qt4 ? null
 }:
 
@@ -26,7 +26,7 @@ let
       inherit sha256;
     };
 
-    propagatedBuildInputs = [ zlib cairo freetype fontconfig libjpeg lcms2 curl openjpeg ];
+    propagatedBuildInputs = [ zlib cairo freetype fontconfig libjpeg lcms curl openjpeg ];
 
     nativeBuildInputs = [ pkgconfig cmake ] ++ libiconvOrEmpty ++ libintlOrEmpty;
 
diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 79f36744603..24debae860a 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, libjpeg, libpng, libtiff, zlib, pkgconfig, fontconfig, openssl
-, lcms2, freetype, libpaper, jbig2dec, expat, libiconvOrEmpty
+, lcms, freetype, libpaper, jbig2dec, expat, libiconvOrEmpty
 , x11Support, x11 ? null
 , cupsSupport ? false, cups ? null
 , gnuFork ? true
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    libjpeg libpng libtiff zlib pkgconfig fontconfig openssl lcms2
+    libjpeg libpng libtiff zlib pkgconfig fontconfig openssl lcms
     libpaper jbig2dec expat
   ] ++ stdenv.lib.optionals x11Support [x11 freetype]
     ++ stdenv.lib.optional cupsSupport cups
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e1e1cb19b09..5e99403130a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4393,7 +4393,7 @@ let
 
   libcdio = callPackage ../development/libraries/libcdio { };
 
-  libcdr = callPackage ../development/libraries/libcdr { };
+  libcdr = callPackage ../development/libraries/libcdr { lcms = lcms2; };
 
   libchamplain = callPackage ../development/libraries/libchamplain {
     inherit (gnome) libsoup;
@@ -5045,7 +5045,7 @@ let
 
   opal = callPackage ../development/libraries/opal {};
 
-  openjpeg = callPackage ../development/libraries/openjpeg { };
+  openjpeg = callPackage ../development/libraries/openjpeg { lcms = lcms2; };
 
   openscenegraph = callPackage ../development/libraries/openscenegraph {};
 
@@ -5099,11 +5099,12 @@ let
 
   policykit = callPackage ../development/libraries/policykit { };
 
-  poppler = let popplers = callPackage ../development/libraries/poppler { };
+  poppler = let popplers = callPackage ../development/libraries/poppler { lcms = lcms2; };
     in popplers // popplers.poppler_glib;
   popplerQt4 = poppler.poppler_qt4;
 
   poppler_0_18 = callPackage ../development/libraries/poppler/0.18.nix {
+    lcms = lcms2;
     glibSupport = true;
     gtk3Support = false;
     qt4Support  = false;
@@ -7470,6 +7471,7 @@ let
   gimp_2_8 = callPackage ../applications/graphics/gimp/2.8.nix {
     inherit (gnome) libart_lgpl;
     webkit = null;
+    lcms = lcms2;
   };
 
   gimp = gimp_2_6;
@@ -7780,6 +7782,7 @@ let
     };
     poppler = poppler_0_18;
     clucene_core = clucene_core_2;
+    lcms = lcms2;
   };
 
   liferea = callPackage ../applications/networking/newsreaders/liferea { };
@@ -9420,6 +9423,7 @@ 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 bd7823d5de4e4c54f235e022a752c9c861c0e231 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 29 Jun 2013 16:08:14 +0200
Subject: [PATCH 137/314] upgrade some packages to lcms2

---
 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 5e99403130a..c1dbfb0d064 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4641,7 +4641,7 @@ let
 
   libmowgli = callPackage ../development/libraries/libmowgli { };
 
-  libmng = callPackage ../development/libraries/libmng { };
+  libmng = callPackage ../development/libraries/libmng { lcms = lcms2; };
 
   libmnl = callPackage ../development/libraries/libmnl { };
 
@@ -7682,6 +7682,7 @@ let
 
   inkscape = callPackage ../applications/graphics/inkscape {
     inherit (pythonPackages) lxml;
+    lcms = lcms2;
   };
 
   ion3 = callPackage ../applications/window-managers/ion-3 {

From 3a0dfdd87ac8d3130257ca20b0662756b6299daa Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 29 Jun 2013 18:55:01 +0200
Subject: [PATCH 138/314] kde 4.10: use up-to-date ffmpeg

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c1dbfb0d064..74666795c8f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8998,6 +8998,7 @@ let
       eigen = eigen2;
       libotr = libotr_3_2;
       libusb = libusb1;
+      ffmpeg = ffmpeg_1;
     }) ../desktops/kde-4.10;
 
   kdePackagesFor = self: dir:

From ca5b44a218acf41ed35727de493e382244691dd1 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 29 Jun 2013 19:33:45 +0200
Subject: [PATCH 139/314] explicitly flag gcc 4.6 as needing texinfo 4.13

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 74666795c8f..5a2f7a9be08 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2311,6 +2311,7 @@ let
       if crossSystem != null && crossSystem.config == "i586-pc-gnu"
       then gnu.libpthreadCross
       else null;
+    texinfo = texinfo413;
   }));
 
   # A non-stripped version of GCC.

From cbf48a8cd10f744f57c2aed683f81f6605f6de36 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 29 Jun 2013 21:52:12 +0200
Subject: [PATCH 140/314] upgrade to texinfo5 for some packages

---
 .../version-management/git-and-tools/default.nix |  5 +++--
 pkgs/top-level/all-packages.nix                  | 16 ++++++++++------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index fe5aebeb96e..69aeba92fd8 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -9,8 +9,9 @@ rec {
 
   git = lib.makeOverridable (import ./git) {
     inherit fetchurl stdenv curl openssl zlib expat perl python gettext gnugrep
-      asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt
-      cpio tcl tk makeWrapper subversionClient gzip;
+      asciidoc xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt cpio tcl
+      tk makeWrapper subversionClient gzip;
+    texinfo = texinfo5;
     svnSupport = false;		# for git-svn support
     guiSupport = false;		# requires tcl/tk
     sendEmailSupport = false;	# requires plenty of perl libraries
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5a2f7a9be08..6260aa46f2a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -721,6 +721,7 @@ let
 
   docbook2x = callPackage ../tools/typesetting/docbook2x {
     inherit (perlPackages) XMLSAX XMLParser XMLNamespaceSupport;
+    texinfo = texinfo5;
   };
 
   dosfstools = callPackage ../tools/filesystems/dosfstools { };
@@ -1149,7 +1150,7 @@ let
 
   lxc = callPackage ../os-specific/linux/lxc { };
 
-  lzip = callPackage ../tools/compression/lzip { };
+  lzip = callPackage ../tools/compression/lzip { texinfo = texinfo5; };
 
   lzma = xz;
 
@@ -2020,6 +2021,7 @@ let
 
   bashInteractive = appendToName "interactive" (callPackage ../shells/bash {
     interactive = true;
+    texinfo = texinfo5;
   });
 
   bashCompletion = callPackage ../shells/bash-completion { };
@@ -3870,6 +3872,7 @@ let
 
   ffmpeg_1 = callPackage ../development/libraries/ffmpeg/1.x.nix {
     vpxSupport = !stdenv.isMips;
+    texinfo = texinfo5;
   };
 
   ffms = callPackage ../development/libraries/ffms { };
@@ -7220,6 +7223,7 @@ let
     librsvg = null;
     alsaLib = null;
     imagemagick = null;
+    texinfo = texinfo5;
   };
 
   emacsPackages = emacs: self: let callPackage = newScope self; in rec {
@@ -7227,7 +7231,7 @@ let
 
     autoComplete = callPackage ../applications/editors/emacs-modes/auto-complete { };
 
-    bbdb = callPackage ../applications/editors/emacs-modes/bbdb { };
+    bbdb = callPackage ../applications/editors/emacs-modes/bbdb { texinfo = texinfo5; };
 
     cedet = callPackage ../applications/editors/emacs-modes/cedet { };
 
@@ -7247,9 +7251,9 @@ let
 
     emacsSessionManagement = callPackage ../applications/editors/emacs-modes/session-management-for-emacs { };
 
-    emacsw3m = callPackage ../applications/editors/emacs-modes/emacs-w3m { };
+    emacsw3m = callPackage ../applications/editors/emacs-modes/emacs-w3m { texinfo = texinfo5; };
 
-    emms = callPackage ../applications/editors/emacs-modes/emms { };
+    emms = callPackage ../applications/editors/emacs-modes/emms { texinfo = texinfo5; };
 
     ess = callPackage ../applications/editors/emacs-modes/ess { };
 
@@ -7285,7 +7289,7 @@ let
 
     loremIpsum = callPackage ../applications/editors/emacs-modes/lorem-ipsum { };
 
-    magit = callPackage ../applications/editors/emacs-modes/magit { };
+    magit = callPackage ../applications/editors/emacs-modes/magit { texinfo = texinfo5; };
 
     maudeMode = callPackage ../applications/editors/emacs-modes/maude { };
 
@@ -7293,7 +7297,7 @@ let
 
     # This is usually a newer version of Org-Mode than that found in GNU Emacs, so
     # we want it to have higher precedence.
-    org = hiPrio (callPackage ../applications/editors/emacs-modes/org { });
+    org = hiPrio (callPackage ../applications/editors/emacs-modes/org { texinfo = texinfo5; });
 
     org2blog = callPackage ../applications/editors/emacs-modes/org2blog { };
 

From fc8c97f5d96993fefee2c9809233358486377c26 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 30 Jun 2013 12:09:43 +0200
Subject: [PATCH 141/314] linux-3.9: upgrade to 3.9.8

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.9.nix b/pkgs/os-specific/linux/kernel/linux-3.9.nix
index b63dfd5d827..3c9976868bd 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.9.nix
@@ -254,7 +254,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.9.7";
+    version = "3.9.8";
     testing = false;
 
     preConfigure = ''
@@ -263,7 +263,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
-      sha256 = "1xgk13bj33wayrs2jfgb2vf4xfys3vm28ijaavpjgs2wlsav94lx";
+      sha256 = "0dfk3yrc6kcgywjgrj16lyi0m80847mn2l5sib8n5h2zadbdy0qy";
     };
 
     config = configWithPlatform stdenv.platform;

From a1febc799a7ffb1b62d8ee8140f3975ea519556e Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Fri, 28 Jun 2013 23:04:43 +0200
Subject: [PATCH 142/314] whitespace cleaning

---
 pkgs/applications/graphics/gimp/2.8.nix | 8 ++++----
 pkgs/top-level/all-packages.nix         | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix
index 10426b4a5bd..b4c1fccf9dc 100644
--- a/pkgs/applications/graphics/gimp/2.8.nix
+++ b/pkgs/applications/graphics/gimp/2.8.nix
@@ -5,17 +5,17 @@
 
 stdenv.mkDerivation rec {
   name = "gimp-2.8.4";
-  
+
   src = fetchurl {
     url = "ftp://ftp.gimp.org/pub/gimp/v2.8/${name}.tar.bz2";
     md5 = "392592e8755d046317878d226145900f";
   };
-  
-  buildInputs = 
+
+  buildInputs =
     [ pkgconfig intltool babl gegl gtk glib gdk_pixbuf pango cairo
       freetype fontconfig lcms libpng libjpeg poppler libtiff webkit
       libmng librsvg libwmf zlib libzip ghostscript aalib jasper
-      python pygtk libart_lgpl libexif gettext 
+      python pygtk libart_lgpl libexif gettext
     ];
 
   passthru = { inherit gtk; }; # probably its a good idea to use the same gtk in plugins ?
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6260aa46f2a..2e11edd297c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2147,9 +2147,9 @@ let
     binutils = binutils_deterministic;
     inherit stdenv coreutils zlib;
   };
-  
+
   wrapDeterministicGCC = wrapDeterministicGCCWith (import ../build-support/gcc-wrapper) glibc;
-  
+
   gcc46_deterministic = lowPrio (wrapDeterministicGCC (callPackage ../development/compilers/gcc/4.6 {
     inherit noSysDirs;
 

From 9cf9b24dc44290db591fca1fd4c60e25ffef0d03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 1 Jul 2013 08:55:55 +0200
Subject: [PATCH 143/314] kde4.rsibreak: fix broken download and homepage

---
 pkgs/applications/misc/rsibreak/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/rsibreak/default.nix b/pkgs/applications/misc/rsibreak/default.nix
index fe8118b1976..6587fb2debf 100644
--- a/pkgs/applications/misc/rsibreak/default.nix
+++ b/pkgs/applications/misc/rsibreak/default.nix
@@ -1,11 +1,13 @@
 { stdenv, fetchurl, kdelibs, kdebase_workspace, gettext }:
 
+let version = "0.11";
+in
 stdenv.mkDerivation rec {
-  name = "rsibreak-0.11";
+  name = "rsibreak-${version}";
 
   src = fetchurl {
-    url = "${meta.homepage}/files/${name}.tar.bz2";
-    sha256 = "1yrf73r8mixskh8b531wb8dfs9z7rrw010xsrflhjhjmqh94h8mw";
+    url = "mirror://debian/pool/main/r/rsibreak/rsibreak_${version}.orig.tar.gz";
+    sha256 = "0g27aswh8iz5v67v1wkjny4p100vs2gm0lw0qzfkg6sw1pb4i519";
   };
 
   nativeBuildInputs = [ gettext ];
@@ -13,8 +15,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ kdelibs kdebase_workspace ];
 
   meta = {
-    homepage = http://www.rsibreak.org/;
-    description = "Repetitive Strain Injury prevention";
+    homepage = http://userbase.kde.org/RSIBreak; # http://www.rsibreak.org/ is down since 2011
+    description = "Utility to help prevent repetitive strain injury for KDE 4";
     inherit (kdelibs.meta) platforms maintainers;
   };
 }

From 64cbe2d6ee8c68cbbd8170643adacc1516db1d52 Mon Sep 17 00:00:00 2001
From: Gergely Risko <gergely@risko.hu>
Date: Mon, 1 Jul 2013 11:39:58 +0200
Subject: [PATCH 144/314] Update hflags to 0.2

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

diff --git a/pkgs/development/libraries/haskell/hflags/default.nix b/pkgs/development/libraries/haskell/hflags/default.nix
index 17c01f9a659..89d2f2d518e 100644
--- a/pkgs/development/libraries/haskell/hflags/default.nix
+++ b/pkgs/development/libraries/haskell/hflags/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hflags";
-  version = "0.1.3";
-  sha256 = "0nn08xqn0hvdlblnaad3nsdfkc0ssab6kvhi4qbrcq9jmjmspld3";
+  version = "0.2";
+  sha256 = "1bz8w1vxqlc2c9iygr2dhy2ck1sd56zjwqzz707nqcmsqqsfmyhb";
   buildDepends = [ text ];
   meta = {
     homepage = "http://github.com/errge/hflags";

From b0b9f1fd5cddbc4824e8dc5640080bb1606d59e5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:00:50 +0200
Subject: [PATCH 145/314] haskell-time: update to version 1.4.1

---
 .../development/libraries/haskell/time/1.1.2.4.nix | 14 --------------
 .../haskell/time/{1.4.0.2.nix => 1.4.1.nix}        |  4 ++--
 pkgs/top-level/haskell-packages.nix                |  3 +--
 3 files changed, 3 insertions(+), 18 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/time/1.1.2.4.nix
 rename pkgs/development/libraries/haskell/time/{1.4.0.2.nix => 1.4.1.nix} (85%)

diff --git a/pkgs/development/libraries/haskell/time/1.1.2.4.nix b/pkgs/development/libraries/haskell/time/1.1.2.4.nix
deleted file mode 100644
index 56072676b67..00000000000
--- a/pkgs/development/libraries/haskell/time/1.1.2.4.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "time";
-  version = "1.1.2.4";
-  sha256 = "11dfcb9b5ca76428a7a31019928c3c1898320f774e5d3df8e4407580d074fad3";
-  meta = {
-    homepage = "http://semantic.org/TimeLib/";
-    description = "A time library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/time/1.4.0.2.nix b/pkgs/development/libraries/haskell/time/1.4.1.nix
similarity index 85%
rename from pkgs/development/libraries/haskell/time/1.4.0.2.nix
rename to pkgs/development/libraries/haskell/time/1.4.1.nix
index 62232d1aa5a..1e675110190 100644
--- a/pkgs/development/libraries/haskell/time/1.4.0.2.nix
+++ b/pkgs/development/libraries/haskell/time/1.4.1.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "time";
-  version = "1.4.0.2";
-  sha256 = "0p4ncankr9968lp4fnbq6pc5xwv2198gxhbds656da9jbv74w7j8";
+  version = "1.4.1";
+  sha256 = "04ndcp7m1a7mia4by15dqrwl5k0d2477x20s6xcrdb7in8w9ccvp";
   buildDepends = [ deepseq ];
   testDepends = [
     Cabal deepseq QuickCheck testFramework testFrameworkQuickcheck2
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 4bcce23fc3b..f117bf9d05e 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1930,8 +1930,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   threads = callPackage ../development/libraries/haskell/threads {};
 
-  time_1_1_2_4 = callPackage ../development/libraries/haskell/time/1.1.2.4.nix {};
-  time_1_4_0_2 = callPackage ../development/libraries/haskell/time/1.4.0.2.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
   # pass it explicitly in rare circumstances.
   time = null;

From 4b75f5a2ae73bd3a23f729a313d5e11f54f67062 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:02 +0200
Subject: [PATCH 146/314] haskell-git-annex: update to version 4.20130627

---
 .../git-and-tools/git-annex/default.nix             | 13 +++++++------
 1 file changed, 7 insertions(+), 6 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 9991a506485..f0c8c94437c 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
@@ -8,13 +8,14 @@
 , networkProtocolXmpp, openssh, QuickCheck, random, regexTdfa
 , rsync, SafeSemaphore, SHA, stm, text, time, transformers
 , unixCompat, utf8String, uuid, wai, waiLogger, warp, which
-, xmlConduit, xmlTypes, yesod, yesodDefault, yesodForm, yesodStatic
+, xmlConduit, xmlTypes, yesod, yesodCore, yesodDefault, yesodForm
+, yesodStatic
 }:
 
 cabal.mkDerivation (self: {
   pname = "git-annex";
-  version = "4.20130601";
-  sha256 = "0l6jbi9r26w5h9hfg9v9qybqvijp4n7c9l1zd4ikxg2nqcc8j8ln";
+  version = "4.20130627";
+  sha256 = "1q9hdh7m04idx1nm631624s37p6w1b9j1z5n06j2449b3pxqrn3y";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
@@ -25,8 +26,8 @@ cabal.mkDerivation (self: {
     MonadCatchIOTransformers monadControl mtl network networkInfo
     networkMulticast networkProtocolXmpp QuickCheck random regexTdfa
     SafeSemaphore SHA stm text time transformers unixCompat utf8String
-    uuid wai waiLogger warp xmlConduit xmlTypes yesod yesodDefault
-    yesodForm yesodStatic
+    uuid wai waiLogger warp xmlConduit xmlTypes yesod yesodCore
+    yesodDefault yesodForm yesodStatic
   ];
   buildTools = [ bup curl git gnupg1 lsof openssh rsync which ];
   configureFlags = "-fS3
@@ -51,7 +52,7 @@ cabal.mkDerivation (self: {
   meta = {
     homepage = "http://git-annex.branchable.com/";
     description = "manage files with git, without checking their contents into git";
-    license = "GPL";
+    license = self.stdenv.lib.licenses.gpl3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.simons ];
   };

From cf0fba67dcc73627ff2e0aad3e400663f3592d03 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:02 +0200
Subject: [PATCH 147/314] haskell-acid-state: update to version 0.11.3

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

diff --git a/pkgs/development/libraries/haskell/acid-state/default.nix b/pkgs/development/libraries/haskell/acid-state/default.nix
index dcd6698a5a2..ed31aaed000 100644
--- a/pkgs/development/libraries/haskell/acid-state/default.nix
+++ b/pkgs/development/libraries/haskell/acid-state/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "acid-state";
-  version = "0.10.0";
-  sha256 = "0jjjh8l6ka8kawgp1gm75is4ajavl7nd6b2l717wjs8sy93qnzsc";
+  version = "0.11.3";
+  sha256 = "0808wcr2n9r3z94ljlzalzkfr7ri327vm5s8xif42n9dw600xi0j";
   buildDepends = [
     cereal extensibleExceptions filepath mtl network safecopy stm
   ];

From ee5387106243517471ea99ba725c8d8056eb78d4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:02 +0200
Subject: [PATCH 148/314] haskell-authenticate-oauth: update to version 1.4.0.7

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

diff --git a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix
index c21d6eddbee..2ddd7c05ee9 100644
--- a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix
+++ b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "authenticate-oauth";
-  version = "1.4.0.6";
-  sha256 = "1ylfvc744wqyn5xbv6fivfys5kk9k9r2b9xf63zfzj5l5yqmv91a";
+  version = "1.4.0.7";
+  sha256 = "1pmkj35rpbhgyjrfdg8j51xn9a420aawkwfg28fpxz7kid0cqw8g";
   buildDepends = [
     base64Bytestring blazeBuilder blazeBuilderConduit conduit
     cryptoPubkeyTypes dataDefault httpConduit httpTypes monadControl

From 6e07719f4c3712dcf3ae7a1eb075049925ba6381 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:02 +0200
Subject: [PATCH 149/314] haskell-cmdargs: update to version 0.10.4

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

diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix
index dfaed86b9af..e180863e133 100644
--- a/pkgs/development/libraries/haskell/cmdargs/default.nix
+++ b/pkgs/development/libraries/haskell/cmdargs/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cmdargs";
-  version = "0.10.3";
-  sha256 = "1cglfbkmgbsv3k32vdfg4xk6b5g5c2z8pm0xgbmdb4bbg765lrh6";
+  version = "0.10.4";
+  sha256 = "0y8jmpm31z7dd02xa6b5i6gpdjb6pz4pg7m5wbqff7fhbipf0lk0";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ filepath transformers ];

From 126dd12da2c35541c8d232e9dbc92dab6c2577ca Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:03 +0200
Subject: [PATCH 150/314] haskell-comonad-transformers: update to version 3.0.3

---
 .../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 99c4016947d..eb1a83c80e8 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.2";
-  sha256 = "1910hqp7f03p44alxm4dm8i4wikf0b60hmm85yrhbq02kcr3379d";
+  version = "3.0.3";
+  sha256 = "1q11xasl90z8sv9f7h77dxjsi2cwnjxqpaf0n5pvzn88nz9h6g66";
   buildDepends = [
     comonad contravariant distributive semigroupoids semigroups
     transformers

From d83f8248c357f127ab7a67495fc900a03e9e7288 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:03 +0200
Subject: [PATCH 151/314] haskell-comonad: update to version 3.0.3

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

diff --git a/pkgs/development/libraries/haskell/comonad/default.nix b/pkgs/development/libraries/haskell/comonad/default.nix
index 7e11886fc58..86a8a5c2c30 100644
--- a/pkgs/development/libraries/haskell/comonad/default.nix
+++ b/pkgs/development/libraries/haskell/comonad/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "comonad";
-  version = "3.0.2";
-  sha256 = "0ryyifcxc5rmjrf9323zzj357709mah1hdsrnrbakd5ck7grjfay";
+  version = "3.0.3";
+  sha256 = "1wngwa1cdww5c631dcil0c7mgkqx9bj7m5i63p7d9ymhpyx9sw2l";
   buildDepends = [ semigroups transformers ];
   testDepends = [ doctest filepath ];
   meta = {

From 3e5b4ccd9a6a483db5a20bd9ce87123b2ec73beb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:03 +0200
Subject: [PATCH 152/314] haskell-comonads-fd: update to version 3.0.2

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

diff --git a/pkgs/development/libraries/haskell/comonads-fd/default.nix b/pkgs/development/libraries/haskell/comonads-fd/default.nix
index 5921d8b07d3..08032cb60ab 100644
--- a/pkgs/development/libraries/haskell/comonads-fd/default.nix
+++ b/pkgs/development/libraries/haskell/comonads-fd/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "comonads-fd";
-  version = "3.0.1";
-  sha256 = "0ap9sw7h130bza43091mbl9a5bsin6342zawgycdcsag49wm3dyy";
+  version = "3.0.2";
+  sha256 = "1gzgld895b11j556nc5pj7nbafx746b1z49bx4z38l9wq6qzbvqa";
   buildDepends = [
     comonad comonadTransformers mtl semigroups transformers
   ];

From 2cb552f2dc8726a402237f2ddef914350edb5e1d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:03 +0200
Subject: [PATCH 153/314] haskell-conduit: update to version 1.0.7

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

diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index 6a12708ea33..26d775772e0 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -1,17 +1,17 @@
-{ cabal, doctest, hspec, liftedBase, mmorph, monadControl
+{ cabal, doctest, hspec, liftedBase, mmorph, monadControl, mtl
 , QuickCheck, resourcet, text, transformers, transformersBase, void
 }:
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "1.0.6";
-  sha256 = "0da5wxhsfjgcn850iimcp15vhg5lw0fa8i7c3hdw4yvrpza14dcn";
+  version = "1.0.7";
+  sha256 = "0nail476sz4dmr052sl5s14hkk336zp22hpgmr2qf141zzy8i2m1";
   buildDepends = [
-    liftedBase mmorph monadControl resourcet text transformers
+    liftedBase mmorph monadControl mtl resourcet text transformers
     transformersBase void
   ];
   testDepends = [
-    doctest hspec QuickCheck resourcet text transformers void
+    doctest hspec mtl QuickCheck resourcet text transformers void
   ];
   meta = {
     homepage = "http://github.com/snoyberg/conduit";

From 3af166f42b0fd488783a0550dd4b9709c3dd0a34 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:03 +0200
Subject: [PATCH 154/314] haskell-constraints: update to version 0.3.3

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

diff --git a/pkgs/development/libraries/haskell/constraints/default.nix b/pkgs/development/libraries/haskell/constraints/default.nix
index 0fe2cb8864a..87ec5d82724 100644
--- a/pkgs/development/libraries/haskell/constraints/default.nix
+++ b/pkgs/development/libraries/haskell/constraints/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "constraints";
-  version = "0.3.2";
-  sha256 = "1fmjl6dh2iswvmq8r3izplp6zg9m8yq1c4rj0zpqjbv2iqsi4kl1";
+  version = "0.3.3";
+  sha256 = "0mglqd6l6bc333i7gymbm8q037hj5fny6jzyg1zmw5kg6r3xcwdi";
   buildDepends = [ newtype ];
   meta = {
     homepage = "http://github.com/ekmett/constraints/";

From 2c33e25eed5aa93d2a96fbd48e86aa7e7b75e898 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:03 +0200
Subject: [PATCH 155/314] haskell-cryptohash: update to version 0.9.1

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

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

From 4b40122b6974df3fc889fdcac16ff8e403750f33 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:03 +0200
Subject: [PATCH 156/314] haskell-dimensional: update to version 0.12

---
 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 329722abe8e..e820df4f0ba 100644
--- a/pkgs/development/libraries/haskell/dimensional/default.nix
+++ b/pkgs/development/libraries/haskell/dimensional/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dimensional";
-  version = "0.10.2";
-  sha256 = "14idyacd38a2kc97hp773j8iiim2lxh9czr8gp12m66w4n603znn";
+  version = "0.12";
+  sha256 = "1bk52wxmgcm34b516npy1ynrzqajgkshd8vfjm44vjcjvfrlf3bc";
   buildDepends = [ numtype time ];
   meta = {
     homepage = "http://dimensional.googlecode.com/";

From de20da33c388fbe20268a2afdeffa0bfaf246202 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:03 +0200
Subject: [PATCH 157/314] haskell-either: update to version 3.4.1

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

diff --git a/pkgs/development/libraries/haskell/either/default.nix b/pkgs/development/libraries/haskell/either/default.nix
index 4730af58569..67c1962cbe9 100644
--- a/pkgs/development/libraries/haskell/either/default.nix
+++ b/pkgs/development/libraries/haskell/either/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "either";
-  version = "3.4";
-  sha256 = "05nbp8gp50wq592k6dsrpzp6wmqjn9pz6mkizqfb65z1wvd1xiz2";
+  version = "3.4.1";
+  sha256 = "1cq4glqhxz9k8fxf0dc8b6hcxxfn4yci6h7wmfkmkfq5ca61ax1b";
   buildDepends = [
     MonadRandom mtl semigroupoids semigroups transformers
   ];

From 932df79a8515e9e47f0a0acdf4e5b6d41270a0a3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:03 +0200
Subject: [PATCH 158/314] haskell-errors: update to version 1.4.2

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

diff --git a/pkgs/development/libraries/haskell/errors/default.nix b/pkgs/development/libraries/haskell/errors/default.nix
index 7ed890c513c..d15ac59feba 100644
--- a/pkgs/development/libraries/haskell/errors/default.nix
+++ b/pkgs/development/libraries/haskell/errors/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "errors";
-  version = "1.4.1";
-  sha256 = "18npfwr6byh0aib9qxpynr2gf0v92c0xbxky4a733jbdrwli5c40";
+  version = "1.4.2";
+  sha256 = "1csry8bbz7r4gc7x3lf1ih10rvnig2i91nfij227p9744yndl2xw";
   buildDepends = [ either safe transformers ];
   meta = {
     description = "Simplified error-handling";

From 3b29e271dd25a126efec44778219fed2dbcff377 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:03 +0200
Subject: [PATCH 159/314] haskell-file-embed: update to version 0.0.4.9

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

diff --git a/pkgs/development/libraries/haskell/file-embed/default.nix b/pkgs/development/libraries/haskell/file-embed/default.nix
index ccb0f8bac82..2eb9ac94d8c 100644
--- a/pkgs/development/libraries/haskell/file-embed/default.nix
+++ b/pkgs/development/libraries/haskell/file-embed/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "file-embed";
-  version = "0.0.4.8";
-  sha256 = "1jq4jdrxw822gzz7mc07nx4yj233mwmykp6xk371pf3hnq8rly0h";
+  version = "0.0.4.9";
+  sha256 = "128z3jwxn6d13dkrfjx7maxgmax8bfgr8n2jfhqg3rvv4ryjnqv2";
   buildDepends = [ filepath ];
   testDepends = [ filepath HUnit ];
   meta = {

From 717a181d0dbb8a67bb33459c488de857fdcb92e0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:03 +0200
Subject: [PATCH 160/314] haskell-gloss: update to version 1.7.8.4

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

diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix
index 003207e77ae..a5984aef77c 100644
--- a/pkgs/development/libraries/haskell/gloss/default.nix
+++ b/pkgs/development/libraries/haskell/gloss/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gloss";
-  version = "1.7.8.3";
-  sha256 = "0wbp8bz5c3hzix6r7nbg6dmakb77i3lq4hgjk3gd8mvksd3n97jr";
+  version = "1.7.8.4";
+  sha256 = "06m90n0gxjhfdl2jalwzwsbgdg854bqw1qygkxbcfcknrpd2ampk";
   buildDepends = [ bmp GLUT OpenGL ];
   jailbreak = true;
   meta = {

From 2838565f9a38c423289e6ecd7b7a9a7cb0f710d0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:04 +0200
Subject: [PATCH 161/314] haskell-highlighting-kate: update to version 0.5.4

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

diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
index fb7d0d4a00a..f09e3efaeb4 100644
--- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix
+++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "highlighting-kate";
-  version = "0.5.3.9";
-  sha256 = "158k38snqhgfjyzq82f8k1fkrpw0ld023wndzyzwwc6s933ap8hc";
+  version = "0.5.4";
+  sha256 = "0khwhhcjvhsh92b420bylx4c1ahpvk6c50s8y6bacfwfq71ydwmb";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ blazeHtml filepath mtl parsec regexPcre ];

From 54fb831ad7021162211f2f169fcf705298b1ac51 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:04 +0200
Subject: [PATCH 162/314] haskell-hledger-lib: update to version 0.21.3

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

diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix
index 57cb8dc8710..87d5181fa7d 100644
--- a/pkgs/development/libraries/haskell/hledger-lib/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hledger-lib";
-  version = "0.21.2";
-  sha256 = "07li348kmwz9j4bfgmkq7zs9nyqxi5hhydij2fg4jwj0hbfxvmy9";
+  version = "0.21.3";
+  sha256 = "1vvki1dg98f8r9w6gmblazkbin7g2hzifwqd1frb0a3kp869i870";
   buildDepends = [
     cmdargs csv filepath HUnit mtl parsec prettyShow regexCompat
     regexpr safe split time transformers utf8String

From f3ee0ca9045055b4ca28ea41236760152af35aa2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:04 +0200
Subject: [PATCH 163/314] haskell-hledger: update to version 0.21.3

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

diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix
index 5d81a49f10b..36012251e07 100644
--- a/pkgs/development/libraries/haskell/hledger/default.nix
+++ b/pkgs/development/libraries/haskell/hledger/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hledger";
-  version = "0.21.2";
-  sha256 = "04n9bm97zqh8am83fr2aflw3gv5nwm9jm7bp9vzd4986f1c43ig3";
+  version = "0.21.3";
+  sha256 = "14j0axlq6xfaih7m6lqpis26ya0yl4v6g6xrqbihmjddvx7j32f2";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From e6535b526a5fa9e0439e492d9a7edafac0dcfb40 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:04 +0200
Subject: [PATCH 164/314] haskell-hspec-meta: update to version 1.6.1

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

diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix
index 93162ff8cdf..1e0c9275a24 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.5.4";
-  sha256 = "07m7wxannk9rr8q2bdxhkjjlvwlzp7lq2c41y6cgjkjcm2x9qcc8";
+  version = "1.6.1";
+  sha256 = "089j6dpl856q3m1wyc7n822k7vppzb7pxdcwvzbhck2cadad3zn5";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -14,9 +14,9 @@ cabal.mkDerivation (self: {
   ];
   doCheck = false;
   meta = {
-    homepage = "http://hspec.github.com/";
+    homepage = "http://hspec.github.io/";
     description = "A version of Hspec which is used to test Hspec itself";
-    license = self.stdenv.lib.licenses.bsd3;
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
   };
 })

From e3f3271812a1088097ebf788e0c091610cfa3e83 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:04 +0200
Subject: [PATCH 165/314] haskell-hspec: update to version 1.6.1

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

diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix
index 354cd286de0..7b06ea9c21c 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.5.4";
-  sha256 = "18c7mj2qh0q7ksb9sa7jhpfzsbbsfbv3gpkjpz1fx17bd3h8vkld";
+  version = "1.6.1";
+  sha256 = "16gwzc5x04kj7847w4nw0msj7myk22hlfkpal9dcpdvslzzy44nh";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -20,9 +20,9 @@ cabal.mkDerivation (self: {
   ];
   doCheck = false;
   meta = {
-    homepage = "http://hspec.github.com/";
+    homepage = "http://hspec.github.io/";
     description = "Behavior-Driven Development for Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
   };
 })

From 585ee36fb9e8d3e059d71c35a25f5fc641e939ae Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:04 +0200
Subject: [PATCH 166/314] haskell-http-conduit: update to version 1.9.4.1

---
 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 cea5708c269..d1cff617a82 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";
-  sha256 = "0zm8m3nvxyc9z3b8d47ggx56raqpz1aa8r268k6gidpc5zpad2yl";
+  version = "1.9.4.1";
+  sha256 = "181irzldrr554naq2yvs0yzmkkfk26n59snrsmxhr79d9kdp73l4";
   buildDepends = [
     asn1Data base64Bytestring blazeBuilder blazeBuilderConduit
     caseInsensitive certificate conduit cookie cprngAes dataDefault

From 469ec818b7bf158237d6abc8d755d5791734bdf2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:04 +0200
Subject: [PATCH 167/314] haskell-http-reverse-proxy: update to version 0.2.0

---
 .../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 6d1c34556f7..9be23188db4 100644
--- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
+++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
@@ -1,17 +1,17 @@
 { cabal, blazeBuilder, caseInsensitive, classyPrelude, conduit
 , dataDefault, hspec, httpConduit, httpTypes, liftedBase
 , monadControl, network, networkConduit, text, transformers, wai
-, warp, word8
+, waiLogger, warp, word8
 }:
 
 cabal.mkDerivation (self: {
   pname = "http-reverse-proxy";
-  version = "0.1.1.6";
-  sha256 = "0fh61rm3k00shzis2dkgifnkfn78vx124dzmmdzlf550kjmhxb9l";
+  version = "0.2.0";
+  sha256 = "01kqf9c2yr3x5jwzyn44gs76fbffpacxs2j89aa902l0rz6l8ral";
   buildDepends = [
     blazeBuilder caseInsensitive classyPrelude conduit dataDefault
     httpConduit httpTypes liftedBase monadControl network
-    networkConduit text wai warp word8
+    networkConduit text wai waiLogger warp word8
   ];
   testDepends = [
     blazeBuilder conduit hspec httpConduit httpTypes liftedBase network

From 265e043cff14a80808763742cfd63fbbeef1de84 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:04 +0200
Subject: [PATCH 168/314] haskell-io-choice: update to version 0.0.5

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

diff --git a/pkgs/development/libraries/haskell/io-choice/default.nix b/pkgs/development/libraries/haskell/io-choice/default.nix
index bec6431b42b..4cceb87c97e 100644
--- a/pkgs/development/libraries/haskell/io-choice/default.nix
+++ b/pkgs/development/libraries/haskell/io-choice/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "io-choice";
-  version = "0.0.4";
-  sha256 = "1b6jvk37jkpd4m3r6ip70xwzrz67a30yam831nqpljsbgk2f9arq";
+  version = "0.0.5";
+  sha256 = "19nr8kxcg98510cqgjn4c9sd8i9yz8fv4ryqg6lzzgpwqzkvx5ph";
   buildDepends = [
     liftedBase monadControl transformers transformersBase
   ];

From 42c3918056b09acc16769022644e0fd3b02a80ae Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:04 +0200
Subject: [PATCH 169/314] haskell-mime-mail: update to version 0.4.2

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

diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix
index d24bf5719bd..5b21949d5fa 100644
--- a/pkgs/development/libraries/haskell/mime-mail/default.nix
+++ b/pkgs/development/libraries/haskell/mime-mail/default.nix
@@ -1,12 +1,15 @@
-{ cabal, base64Bytestring, blazeBuilder, filepath, random, text }:
+{ cabal, base64Bytestring, blazeBuilder, filepath, hspec, random
+, text
+}:
 
 cabal.mkDerivation (self: {
   pname = "mime-mail";
-  version = "0.4.1.2";
-  sha256 = "01dw9zvgxmwg0jslw14a9kjrmyjvwla8bw40w2426ifdwwxb3ywy";
+  version = "0.4.2";
+  sha256 = "1v9qdj53swhg8xg9s2x0m6d6xaff5ya6bpdifya2vsp08fmgn4l9";
   buildDepends = [
     base64Bytestring blazeBuilder filepath random text
   ];
+  testDepends = [ blazeBuilder hspec ];
   meta = {
     homepage = "http://github.com/snoyberg/mime-mail";
     description = "Compose MIME email messages";

From 88034ca8196adaad5138ed1892d40f4ca8a67233 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:04 +0200
Subject: [PATCH 170/314] haskell-oeis: update to version 0.3.2

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

diff --git a/pkgs/development/libraries/haskell/oeis/default.nix b/pkgs/development/libraries/haskell/oeis/default.nix
index c8b9e984eb1..74b355c522a 100644
--- a/pkgs/development/libraries/haskell/oeis/default.nix
+++ b/pkgs/development/libraries/haskell/oeis/default.nix
@@ -1,12 +1,13 @@
-{ cabal, HTTP, network }:
+{ cabal, HTTP, HUnit, network, testFramework, testFrameworkHunit }:
 
 cabal.mkDerivation (self: {
   pname = "oeis";
-  version = "0.3.1";
-  sha256 = "0kxs25b1z0b807vhrn8v7chsdsw8civqiym8767fy2rk5si0i4w2";
+  version = "0.3.2";
+  sha256 = "1lp4mbsh98vnyfbnq9224n98hajv8q5prpzgbcw90bih0rbiw4w4";
   buildDepends = [ HTTP network ];
+  testDepends = [ HUnit testFramework testFrameworkHunit ];
   meta = {
-    description = "Interface to the Online Encyclopedia of Integer Sequences";
+    description = "Interface to the Online Encyclopedia of Integer Sequences (OEIS)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];

From be17d7d06c2411bf5bf64d03407f851a56cca072 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:04 +0200
Subject: [PATCH 171/314] haskell-persistent-postgresql: update to version
 1.2.1

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

diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
index c7d6b532db6..4195a048458 100644
--- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-postgresql";
-  version = "1.2.0";
-  sha256 = "0i5ha1vs91makwrw4qqwdzp92i24ynmmsmjyqpik6q80fxxiwps6";
+  version = "1.2.1";
+  sha256 = "04gl1qdhag60q4j2r61qr1skim1wcyx2vq34j51qk1a62wyqsdrl";
   buildDepends = [
     aeson blazeBuilder conduit monadControl persistent postgresqlLibpq
     postgresqlSimple text time transformers

From f35d36ed00d6716f177b7196c79325219027e595 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:05 +0200
Subject: [PATCH 172/314] haskell-persistent-sqlite: update to version 1.2.1

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

diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
index bb7a6731a26..e4a3bc77600 100644
--- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-sqlite";
-  version = "1.2.0";
-  sha256 = "09xd9z16rcq9ymx5ysshzdr30lih55b9kasvbq5xw6wq7lvg6q4h";
+  version = "1.2.1";
+  sha256 = "1lbb8s6p3xixlkgwx30p473b438qjnw9s41bcm1q38vkklpa75y0";
   buildDepends = [
     aeson conduit monadControl monadLogger persistent text transformers
   ];

From 15a12839377c18d75e99cc8f0232a399df1862bd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:05 +0200
Subject: [PATCH 173/314] haskell-persistent: update to version 1.2.1

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

diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
index 57bb615800b..7c4c1dba381 100644
--- a/pkgs/development/libraries/haskell/persistent/default.nix
+++ b/pkgs/development/libraries/haskell/persistent/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent";
-  version = "1.2.0.2";
-  sha256 = "026zdfccy57dbsacg8227jzcdyq50nb1bkcr56ryxi91ymlyf50k";
+  version = "1.2.1";
+  sha256 = "1f01fvagjxqqycblq3z3z6qcas9vp9bgxnjz09173x4c9xvg3qj2";
   buildDepends = [
     aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
     liftedBase monadControl monadLogger pathPieces poolConduit

From d71ce2786dc87e50661b0dc4c80c648937f22ce5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:05 +0200
Subject: [PATCH 174/314] haskell-profunctor-extras: update to version 3.3.1

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

diff --git a/pkgs/development/libraries/haskell/profunctor-extras/default.nix b/pkgs/development/libraries/haskell/profunctor-extras/default.nix
index df16898ddd3..0094ec5a340 100644
--- a/pkgs/development/libraries/haskell/profunctor-extras/default.nix
+++ b/pkgs/development/libraries/haskell/profunctor-extras/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "profunctor-extras";
-  version = "3.3";
-  sha256 = "0sdiwc1d2jx2xrzsxjsxjh8m24f4blr2m8vmh78knpi9hy0bxgvr";
+  version = "3.3.1";
+  sha256 = "0z3lip0mjw0xyf516shdrnkkp9h53wglz6sjjqagpjj2viyqkprb";
   buildDepends = [
     comonad profunctors semigroupoidExtras semigroupoids tagged
     transformers

From 7a5c8039327763cab2821e2669615bbb6fa61483 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:05 +0200
Subject: [PATCH 175/314] haskell-semigroupoids: update to version 3.0.3

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

diff --git a/pkgs/development/libraries/haskell/semigroupoids/default.nix b/pkgs/development/libraries/haskell/semigroupoids/default.nix
index 4f1367dd559..f8b535824cf 100644
--- a/pkgs/development/libraries/haskell/semigroupoids/default.nix
+++ b/pkgs/development/libraries/haskell/semigroupoids/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "semigroupoids";
-  version = "3.0.2";
-  sha256 = "0k137iafw0srgmy4qwx3cbx00519c0h91nmszdbx6pzpvf6m5fwm";
+  version = "3.0.3";
+  sha256 = "0hxg3q4bx6lmccxx9hrgb1yvnvcgb5vcaw4xv1fgdcbrydjfgfrm";
   buildDepends = [ comonad contravariant semigroups transformers ];
   meta = {
     homepage = "http://github.com/ekmett/semigroupoids";

From ec8723e71a1c3c0fd4698767797409da923d2f71 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:05 +0200
Subject: [PATCH 176/314] haskell-shake: update to version 0.10.6

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

diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix
index b7f605c2b7e..26171a56fdc 100644
--- a/pkgs/development/libraries/haskell/shake/default.nix
+++ b/pkgs/development/libraries/haskell/shake/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shake";
-  version = "0.10.5";
-  sha256 = "1abbls2rmpyxpj41c0afvfjh1bw6j6rz1n0w4jhqrmq0d32kpg7a";
+  version = "0.10.6";
+  sha256 = "0d2wrgraifcj0rv9jmvc5a0gl0j1jjkc4r0nmaypnv6929kl26q8";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From b7e4259ac56b18dd06b02b4942766357f59f8ecd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:05 +0200
Subject: [PATCH 177/314] haskell-shelly: update to version 1.3.0.1

---
 pkgs/development/libraries/haskell/shelly/default.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix
index 1e9e1f8c6cc..a61dfec8b7e 100644
--- a/pkgs/development/libraries/haskell/shelly/default.nix
+++ b/pkgs/development/libraries/haskell/shelly/default.nix
@@ -1,17 +1,13 @@
-{ cabal, hspec, HUnit, mtl, systemFileio, systemFilepath, text
-, time, unixCompat
+{ cabal, mtl, systemFileio, systemFilepath, text, time, unixCompat
 }:
 
 cabal.mkDerivation (self: {
   pname = "shelly";
-  version = "0.15.4.1";
-  sha256 = "12m11s22izz0ny1syb1ykp2hi9n240myf0nhapvn8jx1fgf5iyck";
+  version = "1.3.0.1";
+  sha256 = "0xcx6cxlb13wrn5wfnnb070h8cj3lnk285fxmigi6x97b9rjdl8w";
   buildDepends = [
     mtl systemFileio systemFilepath text time unixCompat
   ];
-  testDepends = [
-    hspec HUnit mtl systemFileio systemFilepath text time unixCompat
-  ];
   meta = {
     homepage = "https://github.com/yesodweb/Shelly.hs";
     description = "shell-like (systems) programming in Haskell";

From 643455fcea4a5d1c8dfa7a6cb39da73de95b1dd3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:05 +0200
Subject: [PATCH 178/314] haskell-smallcheck: update to version 1.0.4

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

diff --git a/pkgs/development/libraries/haskell/smallcheck/default.nix b/pkgs/development/libraries/haskell/smallcheck/default.nix
index 6d82e7e5132..bf4ba55e751 100644
--- a/pkgs/development/libraries/haskell/smallcheck/default.nix
+++ b/pkgs/development/libraries/haskell/smallcheck/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "smallcheck";
-  version = "1.0.2";
-  sha256 = "09zlsvgbwgpjwkjhizbzzww2nvkyxvkf214yqxzfaa1cj9xzbbdi";
+  version = "1.0.4";
+  sha256 = "0zqssw7r56k7gi1lxdss3f4piqa692y728rli9p81q9rbcvi3x7z";
   buildDepends = [ logict mtl ];
   meta = {
     homepage = "https://github.com/feuerbach/smallcheck";

From 2af75c20c7bfba84bab8ff99db5629d75283b327 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:05 +0200
Subject: [PATCH 179/314] haskell-tagged: update to version 0.6.1

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

diff --git a/pkgs/development/libraries/haskell/tagged/default.nix b/pkgs/development/libraries/haskell/tagged/default.nix
index 42f0beef125..baf9703b161 100644
--- a/pkgs/development/libraries/haskell/tagged/default.nix
+++ b/pkgs/development/libraries/haskell/tagged/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tagged";
-  version = "0.6";
-  sha256 = "0w2sx6lys074y5ck2ll53dmak39pfnckbh6llgmicrj4zhgcd8jm";
+  version = "0.6.1";
+  sha256 = "1n3m1y06lhbsx9rfwwdx5xqnw4ni41b39iyysgj5894iz9rwrrnv";
   meta = {
     homepage = "http://github.com/ekmett/tagged";
     description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";

From edc1b8d14afa898c507cf9d1da6839830184430d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:05 +0200
Subject: [PATCH 180/314] haskell-threadmanager: update to version 0.1.6

---
 .../libraries/haskell/threadmanager/default.nix            | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/threadmanager/default.nix b/pkgs/development/libraries/haskell/threadmanager/default.nix
index dc058844247..4641ec80f23 100644
--- a/pkgs/development/libraries/haskell/threadmanager/default.nix
+++ b/pkgs/development/libraries/haskell/threadmanager/default.nix
@@ -2,11 +2,10 @@
 
 cabal.mkDerivation (self: {
   pname = "threadmanager";
-  version = "0.1.5";
-  sha256 = "0jdr0rrpx7frnh0a2vibg0170w48wvn6gv8imkiqiz6y6481ny5p";
+  version = "0.1.6";
+  sha256 = "16q09kx3rfjaa3rvyfwrxpsnvw50r3q8pk1if6xm0v4ya3lbvibs";
   meta = {
-    homepage = "http://github.com/bsl/threadmanager";
-    description = "Simple thread management";
+    description = "(deprecated in favor of 'threads') Simple thread management";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];

From 435eab8d237cc46f68a61fca2854fe7f6a372003 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:05 +0200
Subject: [PATCH 181/314] haskell-unix-time: update to version 0.1.9

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

diff --git a/pkgs/development/libraries/haskell/unix-time/default.nix b/pkgs/development/libraries/haskell/unix-time/default.nix
index 22d3af28fd0..c3e5ca14b23 100644
--- a/pkgs/development/libraries/haskell/unix-time/default.nix
+++ b/pkgs/development/libraries/haskell/unix-time/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "unix-time";
-  version = "0.1.8";
-  sha256 = "1s9r2i4hl7nm1f4zya03q0a2ayliby51caziz1w79schhplfa5sv";
+  version = "0.1.9";
+  sha256 = "0z4761g7rkw771r9828h1l37pp3brrra9ihjg203h66jc1wlvb72";
   testDepends = [ doctest hspec QuickCheck time ];
   meta = {
     description = "Unix time parser/formatter and utilities";

From 66e80948bb60a005b40f6c954da74f4f3c6de52d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:05 +0200
Subject: [PATCH 182/314] haskell-void: update to version 0.6.1

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

diff --git a/pkgs/development/libraries/haskell/void/default.nix b/pkgs/development/libraries/haskell/void/default.nix
index 591040a9548..39cdcd8407f 100644
--- a/pkgs/development/libraries/haskell/void/default.nix
+++ b/pkgs/development/libraries/haskell/void/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "void";
-  version = "0.6";
-  sha256 = "0g1dja7qcp2d9a4m8j1f4ddyvbl003znyk7yn5w5qiiqr1pacs1n";
+  version = "0.6.1";
+  sha256 = "09pa0n17b7cz7sa699gjdmp1hxcshl3170nl5sx2x99zvxz2mv42";
   buildDepends = [ hashable semigroups ];
   meta = {
     homepage = "http://github.com/ekmett/void";

From e0470dcdff95012eead8a7f11b0fffd48a94b584 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:05 +0200
Subject: [PATCH 183/314] haskell-wai-test: update to version 1.3.1.1

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

diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix
index 2d0f6637171..bbc1ed1d136 100644
--- a/pkgs/development/libraries/haskell/wai-test/default.nix
+++ b/pkgs/development/libraries/haskell/wai-test/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-test";
-  version = "1.3.1";
-  sha256 = "0dw9lbwb27yr3953ill0r727ivqav5b2ica8gbaalvnh3h5c8akg";
+  version = "1.3.1.1";
+  sha256 = "0daaq8kn1c35y26y7pb00sw1jyhp84zpzk6vfy1p4vfay4ppknd2";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit cookie
     httpTypes HUnit network text transformers wai

From 3c5de343a2f85dc4bc25a59f1ea7d3fdb1a84bed Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:05 +0200
Subject: [PATCH 184/314] haskell-warp: update to version 1.3.9

---
 .../libraries/haskell/warp/default.nix        | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
index 3cf1f8e6ba6..91f51a76e2a 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -1,22 +1,23 @@
 { cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive
-, conduit, hashable, hspec, httpTypes, HUnit, liftedBase, network
-, networkConduit, QuickCheck, simpleSendfile, transformers
-, unixCompat, void, wai
+, conduit, hashable, hspec, httpAttoparsec, httpTypes, HUnit
+, liftedBase, network, networkConduit, QuickCheck, simpleSendfile
+, transformers, unixCompat, void, wai
 }:
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "1.3.8.2";
-  sha256 = "0s8na04n21glgkc0bcc0171ikh9cagx35s2h6i1pb5pwa8l0akv6";
+  version = "1.3.9";
+  sha256 = "1gnsikk1z5q1mblwshg9pbaa1ijy64da7vscanzp70lw63jjk7cg";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
-    httpTypes liftedBase network networkConduit simpleSendfile
-    transformers unixCompat void wai
+    httpAttoparsec httpTypes liftedBase network networkConduit
+    simpleSendfile transformers unixCompat void wai
   ];
   testDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
-    hspec httpTypes HUnit liftedBase network networkConduit QuickCheck
-    simpleSendfile transformers unixCompat void wai
+    hspec httpAttoparsec httpTypes HUnit liftedBase network
+    networkConduit QuickCheck simpleSendfile transformers unixCompat
+    void wai
   ];
   meta = {
     homepage = "http://github.com/yesodweb/wai";

From aa4d6ca07d78c962109fa46c02062a8f59257e61 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:06 +0200
Subject: [PATCH 185/314] haskell-xss-sanitize: update to version 0.3.4

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

diff --git a/pkgs/development/libraries/haskell/xss-sanitize/default.nix b/pkgs/development/libraries/haskell/xss-sanitize/default.nix
index 89bdab65b17..d75f68818ef 100644
--- a/pkgs/development/libraries/haskell/xss-sanitize/default.nix
+++ b/pkgs/development/libraries/haskell/xss-sanitize/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xss-sanitize";
-  version = "0.3.3";
-  sha256 = "0xnyp8nwglh4waawijk1q5z8higf8mggh6hp0pp6ys4bm7gsp74a";
+  version = "0.3.4";
+  sha256 = "0xal75mk90a2hj70ipgcj95n6yw8hiki1r1vzad918aq2ihjqa53";
   buildDepends = [
     attoparsec cssText network tagsoup text utf8String
   ];

From 4c3f84b572be7730793b7e5eba062b1c810bd5e4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:06 +0200
Subject: [PATCH 186/314] haskell-yesod-bin: update to version 1.2.1

---
 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 717ca54d808..1a88ccfd223 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.0.1";
-  sha256 = "0dikjxs1wdqv87ng6iqnnc3pwi3hzgqfwnnj3bb1fpz4plv4bnbc";
+  version = "1.2.1";
+  sha256 = "0qag1phagcdn1zq3kgxbxynqdy5grj8icifz896v0n6bzjsn102b";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

From 928af0cb5532ecdef032ed7176cda3f6c5c74184 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:06 +0200
Subject: [PATCH 187/314] haskell-yesod-core: update to version 1.2.3

---
 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 d2188c68951..c725ef53d3d 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.2";
-  sha256 = "1fapqx1lrhhqjc9k9yc964sxnawj7ga62w83csbkkhwq3g5425yp";
+  version = "1.2.3";
+  sha256 = "0b7rs5w7s88mv2mwg778dpkvcdwawq10i9r176fqi321g3170iwk";
   buildDepends = [
     aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup
     caseInsensitive cereal clientsession conduit cookie dataDefault

From 9e6de5d8c7024baf35498f574ef2a45d93b3a3b3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:06 +0200
Subject: [PATCH 188/314] haskell-yesod-form: update to version 1.3.0.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 d693cd1d0a4..d41dcb64b1f 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.0";
-  sha256 = "1y729h61w30yi4mcva727317gdc70nhn6jzxb7fmc9hqgnh136nc";
+  version = "1.3.0.1";
+  sha256 = "02qkx148yx7dm059h05xrrahsifckcjwgcfxfq1kjdiik45j7xiz";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi
     dataDefault emailValidate hamlet network persistent resourcet

From 028dd8b25e9c130d215ff24f533829f97448d30e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:06 +0200
Subject: [PATCH 189/314] haskell-yesod: update to version 1.2.1.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 d2d0417da27..d195d59dd31 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.1";
-  sha256 = "19gwhav6sr6gd2kh92ga8a09hq9grllmnacdqkgasxwjsfxqa6zg";
+  version = "1.2.1.1";
+  sha256 = "1zx0r02k6znrm62wmhjcdlad3dil93kp6p862rvsvbkazwfy768a";
   buildDepends = [
     aeson blazeHtml blazeMarkup dataDefault hamlet monadControl
     networkConduit safe shakespeareCss shakespeareJs text transformers

From 66a0b56567d61f624f2fd45758f6edba181ec82b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:06 +0200
Subject: [PATCH 190/314] haskell-zeromq3-haskell: update to version 0.4

---
 .../libraries/haskell/zeromq3-haskell/default.nix    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix
index 3b4f9f8ff32..3711c66b8ca 100644
--- a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix
+++ b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix
@@ -1,12 +1,14 @@
-{ cabal, ansiTerminal, checkers, MonadCatchIOTransformers
-, QuickCheck, transformers, zeromq
+{ cabal, ansiTerminal, async, checkers, MonadCatchIOTransformers
+, QuickCheck, semigroups, transformers, zeromq
 }:
 
 cabal.mkDerivation (self: {
   pname = "zeromq3-haskell";
-  version = "0.3.1";
-  sha256 = "0wr157wl2qpnbfsqy4nlsnd6nbkl063387f7ab4qa07yhj5av80f";
-  buildDepends = [ MonadCatchIOTransformers transformers ];
+  version = "0.4";
+  sha256 = "0kwf4bzqp02vk78c9rphyamwbmvzff1z9hqp70dhfggm0q2d655s";
+  buildDepends = [
+    async MonadCatchIOTransformers semigroups transformers
+  ];
   testDepends = [
     ansiTerminal checkers MonadCatchIOTransformers QuickCheck
     transformers

From 6b58b32ad8275370536736424265954e2c906a33 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:06 +0200
Subject: [PATCH 191/314] haskell-hlint: update to version 1.8.47

---
 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 99b4ff3d1bc..f8e7492184d 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.46";
-  sha256 = "0mq25xv0lmxfp9099pj7akmmw5pi0adq2w286wb4lpli82v8nfzf";
+  version = "1.8.47";
+  sha256 = "0ljqkqjn0b3j9la1i51k0019pirg4j8ap5v5b01ch7lj3jqzr85f";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From df12e039e374717c82330af4df10d4b89c2338dc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:04:06 +0200
Subject: [PATCH 192/314] haskell-keter: update to version 0.4.0

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

diff --git a/pkgs/development/tools/haskell/keter/default.nix b/pkgs/development/tools/haskell/keter/default.nix
index f9d09abcc3f..7e8b3ea11ff 100644
--- a/pkgs/development/tools/haskell/keter/default.nix
+++ b/pkgs/development/tools/haskell/keter/default.nix
@@ -1,23 +1,23 @@
 { cabal, attoparsec, blazeBuilder, caseInsensitive, conduit
-, dataDefault, filepath, hinotify, httpConduit, httpReverseProxy
+, dataDefault, filepath, fsnotify, httpConduit, httpReverseProxy
 , httpTypes, mtl, network, networkConduit, networkConduitTls
 , random, regexTdfa, systemFileio, systemFilepath, tar, text, time
 , transformers, unixCompat, unixProcessConduit, wai, waiAppStatic
-, yaml, zlib
+, warp, warpTls, yaml, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "keter";
-  version = "0.3.6.1";
-  sha256 = "0jww64q74kx5h69mnv9wgc4kx0nlb06r7lf651gjkai8mf9dkqf2";
+  version = "0.4.0";
+  sha256 = "0ny8z2rfn090vci262xvyrdbkmdb7qjb4x15r81l2691ibf09ppv";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     attoparsec blazeBuilder caseInsensitive conduit dataDefault
-    filepath hinotify httpConduit httpReverseProxy httpTypes mtl
+    filepath fsnotify httpConduit httpReverseProxy httpTypes mtl
     network networkConduit networkConduitTls random regexTdfa
     systemFileio systemFilepath tar text time transformers unixCompat
-    unixProcessConduit wai waiAppStatic yaml zlib
+    unixProcessConduit wai waiAppStatic warp warpTls yaml zlib
   ];
   meta = {
     homepage = "http://www.yesodweb.com/";

From b8a44d72891238a5ee3b05a7f003042434fa04c3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:38:45 +0200
Subject: [PATCH 193/314] haskell-byteable: add version 0.1.1

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

diff --git a/pkgs/development/libraries/haskell/byteable/default.nix b/pkgs/development/libraries/haskell/byteable/default.nix
new file mode 100644
index 00000000000..6e527cc9958
--- /dev/null
+++ b/pkgs/development/libraries/haskell/byteable/default.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "byteable";
+  version = "0.1.1";
+  sha256 = "1qizg0kxxjqnd3cbrjhhidk5pbbciz0pb3z5kzikjjxnnnhk8fr4";
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-byteable";
+    description = "Type class for sequence of bytes";
+    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 f117bf9d05e..9d6803f45b4 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -627,6 +627,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   boomerang = callPackage ../development/libraries/haskell/boomerang {};
 
+  byteable = callPackage ../development/libraries/haskell/byteable {};
+
   bytedump = callPackage ../development/libraries/haskell/bytedump {};
 
   byteorder = callPackage ../development/libraries/haskell/byteorder {};

From 2ece8f76f5ea31535147bddb5cc70c69851327aa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:38:54 +0200
Subject: [PATCH 194/314] haskell-warp-tls: add version 1.4.1.3

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

diff --git a/pkgs/development/libraries/haskell/warp-tls/default.nix b/pkgs/development/libraries/haskell/warp-tls/default.nix
new file mode 100644
index 00000000000..5655ed9d8a1
--- /dev/null
+++ b/pkgs/development/libraries/haskell/warp-tls/default.nix
@@ -0,0 +1,20 @@
+{ cabal, certificate, conduit, cprngAes, cryptocipher
+, cryptoRandomApi, network, networkConduit, pem, tls, tlsExtra
+, transformers, wai, warp
+}:
+
+cabal.mkDerivation (self: {
+  pname = "warp-tls";
+  version = "1.4.1.3";
+  sha256 = "0g26cw86kjg61agplqskhjb41ywcydyfzb46pjjc38g77xlcm2wx";
+  buildDepends = [
+    certificate conduit cprngAes cryptocipher cryptoRandomApi network
+    networkConduit pem tls tlsExtra transformers wai warp
+  ];
+  meta = {
+    homepage = "http://github.com/yesodweb/wai";
+    description = "HTTP over SSL/TLS support for Warp via the TLS package";
+    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 9d6803f45b4..cec83917a14 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2042,6 +2042,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   warp = callPackage ../development/libraries/haskell/warp {};
 
+  warpTls = callPackage ../development/libraries/haskell/warp-tls {};
+
   WebBits_1_0 = callPackage ../development/libraries/haskell/WebBits/1.0.nix {
     parsec = self.parsec2;
   };

From 8bb29fb94ac2d3c792705a7ef7d4c6976b0ddaf5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:39:03 +0200
Subject: [PATCH 195/314] haskell-http-attoparsec: add version 0.1.0

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

diff --git a/pkgs/development/libraries/haskell/http-attoparsec/default.nix b/pkgs/development/libraries/haskell/http-attoparsec/default.nix
new file mode 100644
index 00000000000..9a7ad41de57
--- /dev/null
+++ b/pkgs/development/libraries/haskell/http-attoparsec/default.nix
@@ -0,0 +1,14 @@
+{ cabal, attoparsec, httpTypes }:
+
+cabal.mkDerivation (self: {
+  pname = "http-attoparsec";
+  version = "0.1.0";
+  sha256 = "1ncdjzgb5kv20y9kps4nawvbwaqnfil9g552if638vv8hag8cwq9";
+  buildDepends = [ attoparsec httpTypes ];
+  meta = {
+    homepage = "https://github.com/tlaitinen/http-attoparsec";
+    description = "Attoparsec parsers for http-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 cec83917a14..722b82e9353 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1123,6 +1123,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   HTTP_4000_2_8 = callPackage ../development/libraries/haskell/HTTP/4000.2.8.nix {};
   HTTP = self.HTTP_4000_2_8;
 
+  httpAttoparsec = callPackage ../development/libraries/haskell/http-attoparsec {};
+
   httpReverseProxy = callPackage ../development/libraries/haskell/http-reverse-proxy {};
 
   hackageDb = callPackage ../development/libraries/haskell/hackage-db {};

From d9a71f35c8e0f023477df0595258ddc674ed970a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 11:51:28 +0200
Subject: [PATCH 196/314] haskell-oeis: the test suite depends on network
 access

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

diff --git a/pkgs/development/libraries/haskell/oeis/default.nix b/pkgs/development/libraries/haskell/oeis/default.nix
index 74b355c522a..6236495a87a 100644
--- a/pkgs/development/libraries/haskell/oeis/default.nix
+++ b/pkgs/development/libraries/haskell/oeis/default.nix
@@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "1lp4mbsh98vnyfbnq9224n98hajv8q5prpzgbcw90bih0rbiw4w4";
   buildDepends = [ HTTP network ];
   testDepends = [ HUnit testFramework testFrameworkHunit ];
+  doCheck = false;
   meta = {
     description = "Interface to the Online Encyclopedia of Integer Sequences (OEIS)";
     license = self.stdenv.lib.licenses.bsd3;

From 8e95d2564dd2a91dc86d08b3545eabcfaf58128d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jul 2013 12:16:38 +0200
Subject: [PATCH 197/314] haskell-time: bring back version 1.1.2.4 to un-break
 Haskell Platform 2009.2.0.2

---
 .../development/libraries/haskell/time/1.1.2.4.nix | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  1 +
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/time/1.1.2.4.nix

diff --git a/pkgs/development/libraries/haskell/time/1.1.2.4.nix b/pkgs/development/libraries/haskell/time/1.1.2.4.nix
new file mode 100644
index 00000000000..56072676b67
--- /dev/null
+++ b/pkgs/development/libraries/haskell/time/1.1.2.4.nix
@@ -0,0 +1,14 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "time";
+  version = "1.1.2.4";
+  sha256 = "11dfcb9b5ca76428a7a31019928c3c1898320f774e5d3df8e4407580d074fad3";
+  meta = {
+    homepage = "http://semantic.org/TimeLib/";
+    description = "A time library";
+    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 722b82e9353..f92a67ed5b7 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1934,6 +1934,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   threads = callPackage ../development/libraries/haskell/threads {};
 
+  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
   # pass it explicitly in rare circumstances.

From 47931dcefa8a1f6ae92e4fb8d7e30e98753147cd Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Mon, 1 Jul 2013 14:27:18 +0200
Subject: [PATCH 198/314] dysnomia: Some updated meta information

---
 pkgs/tools/package-management/disnix/dysnomia/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix
index a2e2a78a46e..d932d0fa8b2 100644
--- a/pkgs/tools/package-management/disnix/dysnomia/default.nix
+++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix
@@ -16,7 +16,7 @@ assert enableSubversionRepository -> subversion != null;
 assert enableEjabberdDump -> ejabberd != null;
 
 stdenv.mkDerivation {
-  name = "disnix-activation-scripts-0.3predff2da00e2d29d15feb2b6b42931232d691f7f03";
+  name = "dysnomia-0.3predff2da00e2d29d15feb2b6b42931232d691f7f03";
   src = fetchurl {
     url = http://hydra.nixos.org/build/5430159/download/1/dysnomia-0.3predff2da00e2d29d15feb2b6b42931232d691f7f03.tar.gz;
     sha256 = "1y9qf14ygdgq2hjh1p6rf7hcgij02wv091s8wpsn36mrmc9zk6rf";
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
     ++ stdenv.lib.optional enableSubversionRepository subversion;
 
   meta = {
-    description = "Provides various activation types for Disnix";
+    description = "Automated deployment of mutable components and services for Disnix";
     license = "MIT";
     maintainers = [ stdenv.lib.maintainers.sander ];
   };

From cb534f1baa3ab0fb0d95dfb27a8703a1ac54e62a Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 1 Jul 2013 14:52:57 +0200
Subject: [PATCH 199/314] New package: Google Closure compiler version
 20130603.

A JavaScript optimizing compiler.
---
 .../development/compilers/closure/default.nix | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/compilers/closure/default.nix

diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix
new file mode 100644
index 00000000000..13c9f1c0350
--- /dev/null
+++ b/pkgs/development/compilers/closure/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, jre, gnutar, bash }:
+
+stdenv.mkDerivation rec {
+  name = "closure-compiler-${version}";
+  version = "20130603";
+
+  src = fetchurl {
+    url = "http://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
+    sha256 = "0bk0s8p9r9an5m0l8y23wjlx490k15i4zah0a384a2akzji8y095";
+  };
+
+  phases = [ "installPhase" ];
+
+  buildInputs = [ gnutar ];
+
+  installPhase = ''
+    mkdir -p $out/lib/java $out/bin
+    tar -xzf $src
+    cp -r compiler.jar $out/lib/java/
+    echo "#!${bash}/bin/bash" > $out/bin/closure-compiler
+    echo "${jre}/bin/java -jar $out/lib/java/compiler.jar \"\$@\"" >> $out/bin/closure-compiler
+    chmod +x $out/bin/closure-compiler
+  '';
+
+  meta = {
+    description = "A tool for making JavaScript download and run faster";
+    homepage = https://developers.google.com/closure/compiler/;
+    license = stdenv.lib.licenses.asl20;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2e11edd297c..bc6545833fa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2069,6 +2069,8 @@ let
 
   clean = callPackage ../development/compilers/clean { };
 
+  closurecompiler = callPackage ../development/compilers/closure { };
+
   cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { };
 
   cython = callPackage ../development/interpreters/cython { };

From 00df29c471d12b625f533e0adfafb17ea72432cc Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 1 Jul 2013 15:39:39 +0200
Subject: [PATCH 200/314] New package: lessc, version 1.4.0

Compiles LESS to CSS
---
 pkgs/development/compilers/lessc/default.nix | 28 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/compilers/lessc/default.nix

diff --git a/pkgs/development/compilers/lessc/default.nix b/pkgs/development/compilers/lessc/default.nix
new file mode 100644
index 00000000000..1d2bd5e7d0b
--- /dev/null
+++ b/pkgs/development/compilers/lessc/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchgit, nodejs }:
+
+stdenv.mkDerivation rec {
+  name = "lessc-${version}";
+  version = "1.4.0";
+
+  src = fetchgit {
+    url = https://github.com/less/less.js.git;
+    rev = "refs/tags/v${version}";
+    sha256 = "12nzaz7v1bnqzylh4zm1srrj7w7f45fqj4sihxyg0bknfvfwdc56";
+  };
+
+  phases = [ "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/bin $out/lib
+    cp -r $src/bin/* $out/bin/
+    cp -r $src/lib/* $out/lib/
+    substituteInPlace $out/bin/lessc --replace "/usr/bin/env node" ${nodejs}/bin/node
+  '';
+
+  meta = {
+    description = "LESS to CSS compiler";
+    homepage = http://lesscss.org/;
+    license = stdenv.lib.licenses.asl20;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bc6545833fa..b464e8bf007 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2683,6 +2683,8 @@ let
     fpc = fpc;
   };
 
+  lessc = callPackage ../development/compilers/lessc { };
+
   llvm = callPackage ../development/compilers/llvm {
     stdenv = if stdenv.isDarwin
       then stdenvAdapters.overrideGCC stdenv gccApple

From 070ddf83678df43e879ecfb66cc8d3ea30a26876 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 1 Jul 2013 16:14:52 +0200
Subject: [PATCH 201/314] New package: Twitter Bootstrap 2.3.2, a front-end
 framework for web development.

---
 .../web/twitter-bootstrap/default.nix         | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/web/twitter-bootstrap/default.nix

diff --git a/pkgs/development/web/twitter-bootstrap/default.nix b/pkgs/development/web/twitter-bootstrap/default.nix
new file mode 100644
index 00000000000..9df7e3126d5
--- /dev/null
+++ b/pkgs/development/web/twitter-bootstrap/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchgit, lessc, closurecompiler }:
+
+stdenv.mkDerivation rec {
+  name = "twitter-bootstrap-${version}";
+  version = "2.3.2";
+
+  src = fetchgit {
+    url = https://github.com/twitter/bootstrap.git;
+    rev = "refs/tags/v${version}";
+    sha256 = "093z4yxqhrr30vna67ksxz3bq146q2xr05hinh78pg2ls88k77la";
+  };  
+
+  buildInputs = [ lessc closurecompiler ];
+
+  phases = [ "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/css $out/js $out/img
+    cp $src/img/* $out/img/
+    closure-compiler --js $src/js/*.js > $out/js/bootstrap.js
+    lessc $src/less/bootstrap.less -O2 -x > $out/css/bootstrap.css
+  ''; 
+
+  meta = {
+    description = "Front-end framework for faster and easier web development";
+    homepage = http://getbootstrap.com/;
+    license = stdenv.lib.licenses.asl20;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b464e8bf007..e58efe6569a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1753,6 +1753,8 @@ let
 
   ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { };
 
+  twitterBootstrap = callPackage ../development/web/twitter-bootstrap {};
+
   txt2man = callPackage ../tools/misc/txt2man { };
 
   ucl = callPackage ../development/libraries/ucl { };

From 431cd91f01322853e2b1752833b1854f9c062cbd Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Mon, 1 Jul 2013 18:24:43 +0200
Subject: [PATCH 202/314] fixed requested changes

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

diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix
index 34987cd717e..8e2427d6139 100644
--- a/pkgs/tools/misc/aescrypt/default.nix
+++ b/pkgs/tools/misc/aescrypt/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   buildInputs = [];
  
   meta = {
-    description = "AES Crypt is a file encryption software available on several operating systems that uses the industry standard Advanced Encryption Standard (AES) to easily and securely encrypt files.";
+    description = "A file encryption util that uses the industry standard Advanced Encryption Standard (AES) to easily and securely encrypt files";
     homepage = http://www.aescrypt.com/;
     license = "GPLv2";
     platforms = stdenv.lib.platforms.all;

From e2e77c641a11d1e8e490c00301ff0db391ae1af6 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 1 Jul 2013 18:54:01 +0200
Subject: [PATCH 203/314] python-blivet: Update to upstream version 0.17-1.

Changes since 0.16-1:

 - Used Python type instead of variable name (hamzy)
 - Fix detection of valid EFI system partition during autopart. (dlehman)

Full changelog can be found in the spec file in the package or at:

https://git.fedorahosted.org/cgit/blivet.git/tree/python-blivet.spec

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 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 8993e467632..24630016729 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -453,12 +453,12 @@ pythonPackages = python.modules // rec {
 
   blivet = buildPythonPackage rec {
     name = "blivet-${version}";
-    version = "0.16-1";
+    version = "0.17-1";
 
     src = fetchurl {
       url = "https://git.fedorahosted.org/cgit/blivet.git/snapshot/"
           + "${name}.tar.bz2";
-      sha256 = "0gfxf86sc0mkpqjcainch6gqh3r7brgma85pbl4nfpzmylhzj5sg";
+      sha256 = "0b28q539657mqif0mn5dfqcpqv7gbyszg83gf2fv6z7q6206rnx5";
     };
 
     postPatch = ''

From 168115f610835654c1ed85a1bcf089f0919c9566 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 1 Jul 2013 18:59:24 +0200
Subject: [PATCH 204/314] python-nixpart: Update to new version 0.2.0.

This introduces the ability to mount filesystems (only). Also, the description
is now less kickstart specific as in the long term we want to move away from
kickstart syntax to Nix attribute sets.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 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 24630016729..5049d0628b5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2805,11 +2805,11 @@ pythonPackages = python.modules // rec {
 
   nixpart = buildPythonPackage rec {
     name = "nixpart-${version}";
-    version = "0.1";
+    version = "0.2.0";
 
     src = fetchurl {
       url = "https://github.com/aszlig/nixpart/archive/v${version}.tar.gz";
-      sha256 = "1gyk260qnv14w94f0ljfra4mmigq9i6cx0gy4ppf3fia5wfj2a6j";
+      sha256 = "1z94h76jn9igksgr84wwbi03fjamwb15hg432x189kgsld1ark4n";
     };
 
     propagatedBuildInputs = [ blivet ];
@@ -2817,7 +2817,7 @@ pythonPackages = python.modules // rec {
     doCheck = false;
 
     meta = {
-      description = "NixOS Anaconda Kickstart helper";
+      description = "NixOS storage manager/partitioner";
       license = pkgs.lib.licenses.gpl2Plus;
       maintainers = [ stdenv.lib.maintainers.aszlig ];
     };

From e969c941b3fab05fd35500b158cb1037c74dcc3d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jul 2013 19:55:33 +0200
Subject: [PATCH 205/314] thunderbird: Update to 17.0.7

---
 .../networking/mailreaders/thunderbird/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 95ae70810a1..7d537d3085d 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -12,14 +12,14 @@
   enableOfficialBranding ? false
 }:
 
-let version = "17.0.6"; in
+let version = "17.0.7"; in
 
 stdenv.mkDerivation {
   name = "thunderbird-${version}";
 
   src = fetchurl {
     url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2";
-    sha1 = "cb5cb5dbfe77179b5853345c826eaa2bc634d48c";
+    sha1 = "d6dca3e1cc4293f2e15d6b35056bd8dc319014ee";
   };
 
   enableParallelBuilding = false;

From 61fef700eeb7791450e2428564cbc2dc8eb50424 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Jul 2013 14:53:56 -0400
Subject: [PATCH 206/314] On linux-3.10, build in #! script support

Starting with 3.10, #! script handling can be built modularly (or not
at all). By default the nixpkgs builder sets everything modular, but
since our initird init is a #! script this creates a chicken-and-egg
problem on NixOS.

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/os-specific/linux/kernel/linux-3.10.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index 5e991d750ac..8c48a5b6c84 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -244,6 +244,9 @@ let
       # Easier debug of NFS issues
       SUNRPC_DEBUG y
 
+      # Our initrd init uses shebang scripts, so can't be modular
+      BINFMT_SCRIPT y
+
       ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
       ${extraConfig}
     '';

From ebe81d17d7cb59733bdf5a185c3df8f98f927d85 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Jul 2013 14:40:08 +0200
Subject: [PATCH 207/314] linux: Update to 3.2.48, 3.4.51

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
index c07448b43b5..36e97f15c2b 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix
@@ -240,7 +240,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.2.47";
+    version = "3.2.48";
 
     modDirVersion = version;
 
@@ -250,7 +250,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-      sha256 = "1554c7r32q87jxkkpggpgwg4rcc4zanahmrw30sg39krxbf2s7q1";
+      sha256 = "1i24vpv2q8va4ywac970hjisi4jyra7ik99g9zv3bmxmm86k7nqk";
     };
 
     config = configWithPlatform stdenv.platform;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix
index cd7e9f2b375..90df69dcf16 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix
@@ -246,7 +246,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.4.47";
+    version = "3.4.51";
     testing = false;
 
     preConfigure = ''
@@ -255,7 +255,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
-      sha256 = "0hdrwzhfnm3c26i2iaw2rfhi7rl89n7dpvbznn29k27p3ifi3rp6";
+      sha256 = "02msq95m2f73bw0y0sf2gsvg6yd7gfr6n1f2id77604mc6svb69s";
     };
 
     config = configWithPlatform stdenv.platform;

From 75e34854f667506ecffcc6b5f8ba51a1aa6e4d43 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Jul 2013 17:03:29 +0200
Subject: [PATCH 208/314] Remove redundant cifs option

---
 pkgs/build-support/vm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index b1eb82ed830..52b50adbfec 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -123,14 +123,14 @@ rec {
 
     echo "mounting Nix store..."
     mkdir -p /fs/nix/store
-    mount -t cifs //10.0.2.4/store /fs/nix/store -o guest,sec=none,sec=ntlm
+    mount -t cifs //10.0.2.4/store /fs/nix/store -o guest,sec=ntlm
 
     mkdir -p /fs/tmp
     mount -t tmpfs -o "mode=755" none /fs/tmp
 
     echo "mounting host's temporary directory..."
     mkdir -p /fs/tmp/xchg
-    mount -t cifs //10.0.2.4/xchg /fs/tmp/xchg -o guest,sec=none,sec=ntlm
+    mount -t cifs //10.0.2.4/xchg /fs/tmp/xchg -o guest,sec=ntlm
 
     mkdir -p /fs/proc
     mount -t proc none /fs/proc

From ac8eb2523bfa6990f75e9bf070f25317c35fb69a Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 2 Jul 2013 18:38:56 +0200
Subject: [PATCH 209/314] darktable: Update to 1.2.2

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

diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index 91c91dc3925..315e101857e 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -8,12 +8,12 @@
 assert stdenv ? glibc;
 
 stdenv.mkDerivation rec {
-  version = "1.2";
+  version = "1.2.2";
   name = "darktable-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/darktable/darktable/1.2/darktable-${version}.tar.xz";
-    sha256 = "0l2lrly46nda7b2y4gskqqxaajia34g487bgjcpd5ysxbhmmhlnw";
+    sha256 = "0nf85wjhlisbgwkfkc1wb8y7dpnx3v8zk9g3ghbd51gi7s62x40j";
   };
 
   buildInputs =

From c590a5b4c32329a678680b83c53716ddd47d6dce Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 3 Jul 2013 00:14:25 +0200
Subject: [PATCH 210/314] plone: updating 4.3.0 to 4.3.1, minor renaming of nix
 files

---
 .../web/plone/{4.1.6.nix => 4.1.nix}          |   0
 .../web/plone/{4.2.5.nix => 4.2.nix}          |   0
 .../web/plone/{4.3.0.nix => 4.3.nix}          | 405 ++++++++++--------
 pkgs/top-level/all-packages.nix               |   6 +-
 4 files changed, 240 insertions(+), 171 deletions(-)
 rename pkgs/development/web/plone/{4.1.6.nix => 4.1.nix} (100%)
 rename pkgs/development/web/plone/{4.2.5.nix => 4.2.nix} (100%)
 rename pkgs/development/web/plone/{4.3.0.nix => 4.3.nix} (93%)

diff --git a/pkgs/development/web/plone/4.1.6.nix b/pkgs/development/web/plone/4.1.nix
similarity index 100%
rename from pkgs/development/web/plone/4.1.6.nix
rename to pkgs/development/web/plone/4.1.nix
diff --git a/pkgs/development/web/plone/4.2.5.nix b/pkgs/development/web/plone/4.2.nix
similarity index 100%
rename from pkgs/development/web/plone/4.2.5.nix
rename to pkgs/development/web/plone/4.2.nix
diff --git a/pkgs/development/web/plone/4.3.0.nix b/pkgs/development/web/plone/4.3.nix
similarity index 93%
rename from pkgs/development/web/plone/4.3.0.nix
rename to pkgs/development/web/plone/4.3.nix
index 6dd85a17994..a0b0ff46153 100644
--- a/pkgs/development/web/plone/4.3.0.nix
+++ b/pkgs/development/web/plone/4.3.nix
@@ -1,7 +1,7 @@
 # DO NOT EDIT THIS FILE!
 #
 # Nix expressions autogenerated with:
-#   bin/pypi2nix -n plone43Packages -d Plone -d mailinglogger -d zc.recipe.egg -d plone.recipe.zope2instance -d Pillow -i setuptools -i zc_buildout -i pillow -e plone/4.3.0.json -p plone/4.3.0.txt -o plone/4.3.0.nix
+#   bin/pypi2nix -n plone43Packages -d Plone -d mailinglogger -d zc.recipe.egg -d plone.recipe.zope2instance -d plone.recipe.zeoserver -d plone.recipe.varnish -d Pillow -i setuptools -i zc_buildout -i pillow -e plone/4.3.1.json -p plone/4.3.1.txt -o plone/4.3.1.nix
 
 { pkgs, pythonPackages }:
 
@@ -10,10 +10,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   inherit (pkgs) fetchurl stdenv;
 
   plone_app_portlets = buildPythonPackage rec {
-    name = "plone.app.portlets-2.4.3";
+    name = "plone.app.portlets-2.4.4";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.portlets/plone.app.portlets-2.4.3.zip";
-      md5 = "2222bde82199670b40a6d1a242ce100a";
+      url = "https://pypi.python.org/packages/source/p/plone.app.portlets/plone.app.portlets-2.4.4.zip";
+      md5 = "c1144f7686cacf3d64fcd202ab2e5e2d";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ products_cmfdynamicviewfti zope_interface zope_traversing plone_app_form datetime zope_container zope_lifecycleevent zope_annotation five_customerize zope_i18nmessageid zope_publisher products_genericsetup plone_i18n feedparser zope_event zope_browser zope_contentprovider plone_memoize zope2 zope_schema acquisition transaction products_pluggableauthservice zope_site zope_component plone_app_vocabularies plone_portlets plone_app_i18n zope_configuration zope_formlib zodb3 five_formlib setuptools products_cmfcore ];
@@ -33,10 +33,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   zope2 = buildPythonPackage rec {
-    name = "Zope2-2.13.19";
+    name = "Zope2-2.13.20";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/Z/Zope2/Zope2-2.13.19.zip";
-      md5 = "26fee311aace7c12e406543ea91eb42a";
+      url = "http://pypi.python.org/packages/source/Z/Zope2/Zope2-2.13.20.zip";
+      md5 = "557b08fec37620c37e32f2dc01020f29";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ zope_testing zope_interface zope_traversing multimapping zope_size zope_contenttype zope_browserpage datetime zope_component zope_sendmail zope_lifecycleevent products_zctextindex products_standardcachemanagers persistence products_mimetools zope_i18nmessageid zope_publisher missing zope_viewlet zope_sequencesort zope_testbrowser docutils zope_event products_pythonscripts zope_browser zope_structuredtext zope_contentprovider zope_browsermenu zope_tal zope_exceptions products_mailhost products_btreefolder2 zopeundo zconfig record accesscontrol pytz products_ofsp zope_schema zexceptions zope_processlifetime acquisition extensionclass zope_proxy zope_site zope_container zope_pagetemplate zdaemon zope_browserresource zope_deferredimport initgroups zope_security zope_configuration zope_i18n products_zcatalog restrictedpython zodb3 documenttemplate setuptools zope_ptresource zlog tempstorage transaction zope_tales zope_location products_externalmethod ];
@@ -240,10 +240,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plone_app_locales = buildPythonPackage rec {
-    name = "plone.app.locales-4.3";
+    name = "plone.app.locales-4.3.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.locales/plone.app.locales-4.3.zip";
-      md5 = "932a31c6d6c7328dca87ed2fcf25f5a8";
+      url = "http://pypi.python.org/packages/source/p/plone.app.locales/plone.app.locales-4.3.1.zip";
+      md5 = "c88b2da05361a24a564bdef30fb371aa";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ setuptools ];
@@ -291,8 +291,8 @@ let plone43Packages = pythonPackages.python.modules // rec {
       url = "http://pypi.python.org/packages/source/P/Products.GenericSetup/Products.GenericSetup-1.7.3.tar.gz";
       md5 = "c48967c81c880ed33ee16a14caab3b11";
     };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ zope_formlib five_localsitemanager zope2 setuptools ];
+    buildInputs = [ eggtestinfo ];
+    propagatedBuildInputs = [ zope_formlib five_localsitemanager zope2 setuptools eggtestinfo ];
     doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
@@ -562,10 +562,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plone_app_theming = buildPythonPackage rec {
-    name = "plone.app.theming-1.1";
+    name = "plone.app.theming-1.1.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.theming/plone.app.theming-1.1.zip";
-      md5 = "be281b5b740f8e35c73ba15adcd0f98d";
+      url = "https://pypi.python.org/packages/source/p/plone.app.theming/plone.app.theming-1.1.1.zip";
+      md5 = "a694b7a050b6e7c25d720d1e99bb73fa";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ products_cmfplone plone_subrequest repoze_xmliter plone_app_registry plone_transformchain zope_traversing lxml docutils roman plone_resource setuptools five_globalrequest diazo plone_resourceeditor ];
@@ -797,8 +797,8 @@ let plone43Packages = pythonPackages.python.modules // rec {
       url = "http://pypi.python.org/packages/source/P/Products.CMFCore/Products.CMFCore-2.2.7.tar.gz";
       md5 = "9320a4023b8575097feacfd4a400e930";
     };
-    buildInputs = [  ];
-    propagatedBuildInputs = [ products_genericsetup zope_app_publication products_zsqlmethods zope2 setuptools five_localsitemanager ];
+    buildInputs = [ eggtestinfo ];
+    propagatedBuildInputs = [ products_genericsetup zope_app_publication products_zsqlmethods zope2 setuptools five_localsitemanager eggtestinfo ];
     doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
@@ -930,12 +930,12 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   zconfig = buildPythonPackage rec {
-    name = "ZConfig-2.9.0";
+    name = "ZConfig-2.9.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/Z/ZConfig/ZConfig-2.9.0.zip";
-      md5 = "5c932690a70c8907efd240cdd76a7bc4";
+      url = "http://pypi.python.org/packages/source/Z/ZConfig/ZConfig-2.9.1.tar.gz";
+      md5 = "4738de641d90b992de5b89ff1bc2fe49";
     };
-    buildInputs = [ pkgs.unzip ];
+    buildInputs = [  ];
     propagatedBuildInputs = [  ];
     doCheck = false;
     installCommand = ''
@@ -1022,10 +1022,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plone_outputfilters = buildPythonPackage rec {
-    name = "plone.outputfilters-1.9";
+    name = "plone.outputfilters-1.10";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.outputfilters/plone.outputfilters-1.9.zip";
-      md5 = "5ce62a45272c5501bf7d99325d2352c6";
+      url = "https://pypi.python.org/packages/source/p/plone.outputfilters/plone.outputfilters-1.10.zip";
+      md5 = "2c8ba3b7fd2bf18406eb49d01b478139";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ products_portaltransforms products_mimetypesregistry products_cmfcore setuptools products_genericsetup ];
@@ -1136,6 +1136,29 @@ let plone43Packages = pythonPackages.python.modules // rec {
     };
   };
 
+  zope_mkzeoinstance = buildPythonPackage rec {
+    name = "zope.mkzeoinstance-3.9.5";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.mkzeoinstance/zope.mkzeoinstance-3.9.5.tar.gz";
+      md5 = "2c2dcf7cc7de58f7d009ca3294f54377";
+    };
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zodb3 setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+    };
+  };
+
   repoze_xmliter = buildPythonPackage rec {
     name = "repoze.xmliter-0.5";
     src = fetchurl {
@@ -1205,6 +1228,29 @@ let plone43Packages = pythonPackages.python.modules // rec {
     };
   };
 
+  plone_recipe_varnish = buildPythonPackage rec {
+    name = "plone.recipe.varnish-1.2.2";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/plone.recipe.varnish/plone.recipe.varnish-1.2.2.zip";
+      md5 = "100f8bd4857926b8aa1c6decfd05626b";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zc_buildout setuptools ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+    };
+  };
+
   zodb3 = buildPythonPackage rec {
     name = "ZODB3-3.10.5";
     src = fetchurl {
@@ -1229,10 +1275,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plone_batching = buildPythonPackage rec {
-    name = "plone.batching-1.0b1";
+    name = "plone.batching-1.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.batching/plone.batching-1.0b1.zip";
-      md5 = "813a7d2d89fedf4f8e90e0c8da949c48";
+      url = "https://pypi.python.org/packages/source/p/plone.batching/plone.batching-1.0.zip";
+      md5 = "cabd58ccfec67cd384602343ce40dc7b";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ setuptools ];
@@ -1275,10 +1321,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plone_app_search = buildPythonPackage rec {
-    name = "plone.app.search-1.1.3";
+    name = "plone.app.search-1.1.4";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.search/plone.app.search-1.1.3.zip";
-      md5 = "396677c3fba762077360ed97b14071e6";
+      url = "https://pypi.python.org/packages/source/p/plone.app.search/plone.app.search-1.1.4.zip";
+      md5 = "fb24320380ed2ba11e6f20cc1fe3b6df";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ plone_app_contentlisting setuptools ];
@@ -1367,10 +1413,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   products_cmfdifftool = buildPythonPackage rec {
-    name = "Products.CMFDiffTool-2.0.2";
+    name = "Products.CMFDiffTool-2.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFDiffTool/Products.CMFDiffTool-2.0.2.zip";
-      md5 = "c12ba4fb9912a9a5a046b07b5b1cf69d";
+      url = "https://pypi.python.org/packages/source/P/Products.CMFDiffTool/Products.CMFDiffTool-2.1.zip";
+      md5 = "7513d954294e9f318182f9d61660abdb";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ zope2 products_genericsetup zope_interface setuptools products_cmfcore acquisition ];
@@ -1459,10 +1505,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plonetheme_classic = buildPythonPackage rec {
-    name = "plonetheme.classic-1.3.1";
+    name = "plonetheme.classic-1.3.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plonetheme.classic/plonetheme.classic-1.3.1.zip";
-      md5 = "8f78a3e79dce692a568c5fbc58ba742a";
+      url = "https://pypi.python.org/packages/source/p/plonetheme.classic/plonetheme.classic-1.3.2.zip";
+      md5 = "c77d4c34afaf7c02df44d4df72328155";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ setuptools ];
@@ -1620,10 +1666,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   products_passwordresettool = buildPythonPackage rec {
-    name = "Products.PasswordResetTool-2.0.13";
+    name = "Products.PasswordResetTool-2.0.14";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PasswordResetTool/Products.PasswordResetTool-2.0.13.zip";
-      md5 = "c87de8564cea91eb21c620669ef1a660";
+      url = "https://pypi.python.org/packages/source/P/Products.PasswordResetTool/Products.PasswordResetTool-2.0.14.zip";
+      md5 = "4267a5fef471d0ebe5ca848e86630702";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_interface plone_memoize datetime zope_component setuptools zope_i18n products_cmfcore acquisition ];
@@ -1758,10 +1804,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plone_portlet_collection = buildPythonPackage rec {
-    name = "plone.portlet.collection-2.1.4";
+    name = "plone.portlet.collection-2.1.5";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.portlet.collection/plone.portlet.collection-2.1.4.zip";
-      md5 = "00a139248309043e7b539dee5462e105";
+      url = "http://pypi.python.org/packages/source/p/plone.portlet.collection/plone.portlet.collection-2.1.5.zip";
+      md5 = "065f0d9141860229cf66d0ff2ed6d4ea";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ plone_memoize setuptools plone_app_vocabularies plone_app_form plone_portlets plone_app_portlets ];
@@ -1988,10 +2034,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plone_dexterity = buildPythonPackage rec {
-    name = "plone.dexterity-2.1.2";
+    name = "plone.dexterity-2.1.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.dexterity/plone.dexterity-2.1.2.zip";
-      md5 = "3404947376be89f18e54bbfb5c0d3595";
+      url = "https://pypi.python.org/packages/source/p/plone.dexterity/plone.dexterity-2.1.3.zip";
+      md5 = "7f6444a2c26488e4068217266fd243b7";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ products_cmfdynamicviewfti zope_interface plone_memoize zope_dottedname zope_container zope_lifecycleevent plone_synchronize zope_annotation plone_autoform plone_behavior plone_folder zope_publisher products_cmfdefault zope_filerepresentation zope_browser plone_rfc822 zope_size plone_alterego products_statusmessages zope_schema zope2 zope_component zope_location zope_security plone_z3cform zodb3 plone_supermodel plone_uuid setuptools products_cmfcore ];
@@ -2148,6 +2194,29 @@ let plone43Packages = pythonPackages.python.modules // rec {
     };
   };
 
+  plone_recipe_zeoserver = buildPythonPackage rec {
+    name = "plone.recipe.zeoserver-1.2.6";
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/p/plone.recipe.zeoserver/plone.recipe.zeoserver-1.2.6.zip";
+      md5 = "3e2b1634c850b76b0f485675799d0189";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_mkzeoinstance zopeundo zodb3 zc_buildout setuptools zc_recipe_egg ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+    };
+  };
+
   mailinglogger = buildPythonPackage rec {
     name = "mailinglogger-3.7.0";
     src = fetchurl {
@@ -2218,10 +2287,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   zope_tales = buildPythonPackage rec {
-    name = "zope.tales-3.5.2";
+    name = "zope.tales-3.5.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.tales/zope.tales-3.5.2.tar.gz";
-      md5 = "1c5060bd766a0a18632b7879fc9e4e1e";
+      url = "http://pypi.python.org/packages/source/z/zope.tales/zope.tales-3.5.3.tar.gz";
+      md5 = "a2dbc6e41140c29de81b66a4d703fc3f";
     };
     buildInputs = [  ];
     propagatedBuildInputs = [ zope_interface setuptools zope_tal ];
@@ -2287,10 +2356,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plone_i18n = buildPythonPackage rec {
-    name = "plone.i18n-2.0.6";
+    name = "plone.i18n-2.0.8";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.i18n/plone.i18n-2.0.6.zip";
-      md5 = "651e8cbc2cea201276777ab56337a3ee";
+      url = "https://pypi.python.org/packages/source/p/plone.i18n/plone.i18n-2.0.8.zip";
+      md5 = "572c21e86b99316a06dc9998454d7750";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ unidecode zope_publisher zope_interface zope_component setuptools zope_i18n ];
@@ -2402,10 +2471,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   archetypes_referencebrowserwidget = buildPythonPackage rec {
-    name = "archetypes.referencebrowserwidget-2.4.17";
+    name = "archetypes.referencebrowserwidget-2.4.18";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/a/archetypes.referencebrowserwidget/archetypes.referencebrowserwidget-2.4.17.zip";
-      md5 = "bb7552f5ccfddcd068649d7b8162020c";
+      url = "https://pypi.python.org/packages/source/a/archetypes.referencebrowserwidget/archetypes.referencebrowserwidget-2.4.18.zip";
+      md5 = "6eff85cbde401ff1566a76323792d514";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ plone_app_jquerytools zope_component zope_interface plone_app_form zope_formlib setuptools ];
@@ -2471,10 +2540,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plonetheme_sunburst = buildPythonPackage rec {
-    name = "plonetheme.sunburst-1.4.1";
+    name = "plonetheme.sunburst-1.4.4";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plonetheme.sunburst/plonetheme.sunburst-1.4.1.zip";
-      md5 = "e2008dae3dad458dd7bf3be10e95160b";
+      url = "https://pypi.python.org/packages/source/p/plonetheme.sunburst/plonetheme.sunburst-1.4.4.zip";
+      md5 = "f2cb3fdd66ecc14d1a542d2ca76252db";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ setuptools ];
@@ -2540,10 +2609,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   products_archetypes = buildPythonPackage rec {
-    name = "Products.Archetypes-1.8.7";
+    name = "Products.Archetypes-1.9.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.Archetypes/Products.Archetypes-1.8.7.zip";
-      md5 = "b8a6b04a2f01251e0da1681199511537";
+      url = "https://pypi.python.org/packages/source/P/Products.Archetypes/Products.Archetypes-1.9.1.zip";
+      md5 = "c2343539f9f3e485f0bc98b46c12cd85";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ products_cmfformcontroller zope_interface zope_contenttype datetime zope_component products_mimetypesregistry plone_app_folder zope2 zope_lifecycleevent zope_i18nmessageid zope_publisher products_genericsetup products_validation products_portaltransforms products_cmfquickinstallertool products_placelesstranslationservice zope_event acquisition products_dcworkflow products_cmfdefault zope_tal plone_folder products_zsqlmethods products_statusmessages zope_schema zope_viewlet products_cmfcalendar extensionclass zope_datetime products_marshall zope_site zope_deferredimport zodb3 plone_uuid setuptools transaction zope_i18n products_cmfcore ];
@@ -2609,10 +2678,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plone_scale = buildPythonPackage rec {
-    name = "plone.scale-1.3.1";
+    name = "plone.scale-1.3.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.scale/plone.scale-1.3.1.zip";
-      md5 = "05f3e5f79237ef9c318730a7c9b367be";
+      url = "https://pypi.python.org/packages/source/p/plone.scale/plone.scale-1.3.2.zip";
+      md5 = "584ccbf515aff9fef363c2cc8abac789";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ setuptools ];
@@ -2747,10 +2816,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plone_app_linkintegrity = buildPythonPackage rec {
-    name = "plone.app.linkintegrity-1.5.1";
+    name = "plone.app.linkintegrity-1.5.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.linkintegrity/plone.app.linkintegrity-1.5.1.zip";
-      md5 = "89701634d59c3b1a6fc61e5a21c4de52";
+      url = "https://pypi.python.org/packages/source/p/plone.app.linkintegrity/plone.app.linkintegrity-1.5.2.zip";
+      md5 = "f97c61da9f243391cafdfe3fe1cf6d6c";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ setuptools ];
@@ -2770,10 +2839,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   products_resourceregistries = buildPythonPackage rec {
-    name = "Products.ResourceRegistries-2.2.7";
+    name = "Products.ResourceRegistries-2.2.9";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ResourceRegistries/Products.ResourceRegistries-2.2.7.zip";
-      md5 = "954e31a168a1eb3153e2fd4e590bb9ba";
+      url = "https://pypi.python.org/packages/source/P/Products.ResourceRegistries/Products.ResourceRegistries-2.2.9.zip";
+      md5 = "8dd4f36eb894d868366b51941f6f0966";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ zope2 products_genericsetup zope_interface datetime plone_app_registry zope_component zodb3 setuptools zope_viewlet products_cmfcore acquisition ];
@@ -2862,10 +2931,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plone_app_z3cform = buildPythonPackage rec {
-    name = "plone.app.z3cform-0.7.2";
+    name = "plone.app.z3cform-0.7.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.z3cform/plone.app.z3cform-0.7.2.zip";
-      md5 = "aa8d1d45f8072ccfbfe0a608cd7144b6";
+      url = "https://pypi.python.org/packages/source/p/plone.app.z3cform/plone.app.z3cform-0.7.3.zip";
+      md5 = "deddc1af36efb26a6792c9803531c665";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ zope2 setuptools plone_z3cform zope_interface z3c_formwidget_query collective_z3cform_datetimewidget zope_component zope_browserpage plone_protect zope_traversing ];
@@ -2977,10 +3046,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plone_app_discussion = buildPythonPackage rec {
-    name = "plone.app.discussion-2.2.5";
+    name = "plone.app.discussion-2.2.6";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.discussion/plone.app.discussion-2.2.5.zip";
-      md5 = "a6c3a6e5590943f6ac63a49f8e075cdb";
+      url = "https://pypi.python.org/packages/source/p/plone.app.discussion/plone.app.discussion-2.2.6.zip";
+      md5 = "36cf9cd22119282f49facd03fb3c2632";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ plone_app_uuid zope_site plone_indexer collective_monkeypatcher zope_interface plone_app_z3cform zope_container plone_app_layout plone_z3cform plone_app_registry zope_component zodb3 zope_event setuptools z3c_form zope_lifecycleevent zope_annotation plone_registry ];
@@ -3023,10 +3092,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plone = buildPythonPackage rec {
-    name = "Plone-4.3";
+    name = "Plone-4.3.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Plone/Plone-4.3.zip";
-      md5 = "be27f5d87cf44338be6f209459b13b70";
+      url = "https://pypi.python.org/packages/source/P/Plone/Plone-4.3.1.zip";
+      md5 = "faefd5d2044a9f7660fd18388fd71a4e";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ products_cmfplone plone_app_caching plone_app_dexterity plone_app_theming setuptools products_cmfplacefulworkflow plone_app_openid plone_app_iterate wicked ];
@@ -3138,10 +3207,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plone_recipe_zope2instance = buildPythonPackage rec {
-    name = "plone.recipe.zope2instance-4.2.10";
+    name = "plone.recipe.zope2instance-4.2.11";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.recipe.zope2instance/plone.recipe.zope2instance-4.2.10.zip";
-      md5 = "787fad7fa44757de74a50a91e9bcfcb5";
+      url = "https://pypi.python.org/packages/source/p/plone.recipe.zope2instance/plone.recipe.zope2instance-4.2.11.zip";
+      md5 = "ac51fe0566b43866906181134a3c8a9e";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ zodb3 mailinglogger zc_buildout setuptools zope2 zc_recipe_egg ];
@@ -3161,10 +3230,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plone_supermodel = buildPythonPackage rec {
-    name = "plone.supermodel-1.2.1";
+    name = "plone.supermodel-1.2.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.supermodel/plone.supermodel-1.2.1.zip";
-      md5 = "b60d1553b297d41d9e2181afe15da4f4";
+      url = "https://pypi.python.org/packages/source/p/plone.supermodel/plone.supermodel-1.2.2.zip";
+      md5 = "6e829dc362d6ff8e3c7696277e11e322";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ lxml zope_deferredimport zope_interface zope_dottedname zope_component z3c_zcmlhook setuptools zope_schema ];
@@ -3184,10 +3253,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plone_app_registry = buildPythonPackage rec {
-    name = "plone.app.registry-1.2.2";
+    name = "plone.app.registry-1.2.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.registry/plone.app.registry-1.2.2.zip";
-      md5 = "d4659a2c4cfb3a66cd6c7ff1ca17be7f";
+      url = "https://pypi.python.org/packages/source/p/plone.app.registry/plone.app.registry-1.2.3.zip";
+      md5 = "b2269e10516e8f2faf83545e3d0163d8";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ zope_i18nmessageid lxml plone_registry products_genericsetup plone_supermodel plone_app_z3cform zope_dottedname zope_component zope2 setuptools zope_interface products_statusmessages plone_autoform products_cmfcore ];
@@ -3345,13 +3414,13 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plone_app_imaging = buildPythonPackage rec {
-    name = "plone.app.imaging-1.0.7";
+    name = "plone.app.imaging-1.0.9";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.imaging/plone.app.imaging-1.0.7.zip";
-      md5 = "27c24477bdcbcebeba6cd83419a57aa6";
+      url = "https://pypi.python.org/packages/source/p/plone.app.imaging/plone.app.imaging-1.0.9.zip";
+      md5 = "e680c5540021a70266343b935ac732a7";
     };
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ plone_scale setuptools ];
+    propagatedBuildInputs = [  ];
     doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
@@ -3483,10 +3552,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   pytz = buildPythonPackage rec {
-    name = "pytz-2012g";
+    name = "pytz-2013b";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pytz/pytz-2012g.zip";
-      md5 = "1a9b24da1ab6328074b48fc3d4525078";
+      url = "http://pypi.python.org/packages/source/p/pytz/pytz-2013b.zip";
+      md5 = "c70dc37ffe435dd77e3f967a0dffe928";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [  ];
@@ -3575,10 +3644,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plone_app_upgrade = buildPythonPackage rec {
-    name = "plone.app.upgrade-1.3.1";
+    name = "plone.app.upgrade-1.3.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.upgrade/plone.app.upgrade-1.3.1.zip";
-      md5 = "ebbfe71e31e40df535c8c1a2bc6133e6";
+      url = "https://pypi.python.org/packages/source/p/plone.app.upgrade/plone.app.upgrade-1.3.3.zip";
+      md5 = "1c45e809fba27bec11e8a40f686f0f5b";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ products_cmfformcontroller zope_interface products_cmfactionicons products_cmfeditions products_archetypes products_mimetypesregistry plone_app_folder products_cmfuid products_securemailhost zope_ramcache products_genericsetup products_cmfdifftool five_localsitemanager products_cmfquickinstallertool products_portaltransforms products_cmfdefault acquisition products_dcworkflow products_zcatalog borg_localrole products_contentmigration products_resourceregistries plone_portlets zope2 plone_app_portlets products_cmfcalendar products_plonepas transaction products_pluggableauthservice zope_site zope_component zope_location products_plonelanguagetool plone_session setuptools products_cmfcore ];
@@ -3621,10 +3690,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plone_resourceeditor = buildPythonPackage rec {
-    name = "plone.resourceeditor-1.0b4";
+    name = "plone.resourceeditor-1.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.resourceeditor/plone.resourceeditor-1.0b4.zip";
-      md5 = "6e419868c2ea94a322dd631a1b0b753c";
+      url = "https://pypi.python.org/packages/source/p/plone.resourceeditor/plone.resourceeditor-1.0.zip";
+      md5 = "443ff0a0ad83b94fc08cac46ee3b2ad4";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ plone_resource zope2 zope_publisher zope_interface zope_component setuptools zope_schema ];
@@ -3644,10 +3713,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   products_atcontenttypes = buildPythonPackage rec {
-    name = "Products.ATContentTypes-2.1.12";
+    name = "Products.ATContentTypes-2.1.13";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ATContentTypes/Products.ATContentTypes-2.1.12.zip";
-      md5 = "ef38ce0769a5f44e272623f8f118a669";
+      url = "https://pypi.python.org/packages/source/P/Products.ATContentTypes/Products.ATContentTypes-2.1.13.zip";
+      md5 = "093899fc74f5e2a83db464c96d0f5293";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ products_cmfdynamicviewfti zope_interface plone_memoize datetime products_archetypes products_mimetypesregistry plone_app_folder zope2 zope_i18nmessageid zope_publisher products_genericsetup plone_i18n products_portaltransforms products_cmfdefault products_atreferencebrowserwidget zope_tal zconfig archetypes_referencebrowserwidget transaction products_validation acquisition extensionclass zope_component plone_app_layout zodb3 setuptools zope_i18n products_cmfcore ];
@@ -3713,10 +3782,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plone_app_content = buildPythonPackage rec {
-    name = "plone.app.content-2.1.1";
+    name = "plone.app.content-2.1.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.content/plone.app.content-2.1.1.zip";
-      md5 = "96d9967254ea616783ca8b340a542d46";
+      url = "https://pypi.python.org/packages/source/p/plone.app.content/plone.app.content-2.1.2.zip";
+      md5 = "247eb174269b2ab03c05f318915f087e";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_publisher zope_container plone_batching zope_interface plone_memoize plone_i18n zope_component zope_event products_cmfcore setuptools zope_schema zope_lifecycleevent zope_i18n zope_viewlet acquisition products_cmfdefault ];
@@ -3759,10 +3828,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plone_autoform = buildPythonPackage rec {
-    name = "plone.autoform-1.3";
+    name = "plone.autoform-1.4";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.autoform/plone.autoform-1.3.zip";
-      md5 = "4cb2935ba9cda3eb3ee801ad8cda7c60";
+      url = "https://pypi.python.org/packages/source/p/plone.autoform/plone.autoform-1.4.zip";
+      md5 = "01e5ccb59253bfaaa02c1ab4be3f212f";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ z3c_form zope_interface zope_dottedname zope_security setuptools plone_supermodel zope_schema plone_z3cform ];
@@ -3782,10 +3851,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plone_app_contentrules = buildPythonPackage rec {
-    name = "plone.app.contentrules-3.0.1";
+    name = "plone.app.contentrules-3.0.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.contentrules/plone.app.contentrules-3.0.1.zip";
-      md5 = "08138cb6e3f15a2a9d43990f55fdae5f";
+      url = "https://pypi.python.org/packages/source/p/plone.app.contentrules/plone.app.contentrules-3.0.3.zip";
+      md5 = "518c1e22a9cfe187b6770e62be4f8bd8";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ zope_interface zope_traversing plone_app_form zope_component zope_lifecycleevent zope_annotation zope_i18nmessageid products_genericsetup zope_event products_cmfdefault zope_browser plone_uuid plone_memoize zope2 plone_stringinterp products_statusmessages plone_contentrules zope_schema acquisition transaction zope_site zope_container plone_app_vocabularies zope_publisher zope_formlib zodb3 five_formlib setuptools products_cmfcore ];
@@ -3851,10 +3920,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   products_plonetestcase = buildPythonPackage rec {
-    name = "Products.PloneTestCase-0.9.16";
+    name = "Products.PloneTestCase-0.9.17";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PloneTestCase/Products.PloneTestCase-0.9.16.zip";
-      md5 = "968a265bede995f485988158e4e6dd7f";
+      url = "https://pypi.python.org/packages/source/P/Products.PloneTestCase/Products.PloneTestCase-0.9.17.zip";
+      md5 = "2a5bfb94220a520961d710abc92280f2";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ products_cmfplone zope_testing zope2 products_genericsetup zope_site zope_interface products_atcontenttypes zope_component zodb3 setuptools products_cmfcore acquisition ];
@@ -3874,10 +3943,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plone_stringinterp = buildPythonPackage rec {
-    name = "plone.stringinterp-1.0.7";
+    name = "plone.stringinterp-1.0.10";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.stringinterp/plone.stringinterp-1.0.7.zip";
-      md5 = "81909716210c6ac3fd0ee87f45ea523d";
+      url = "https://pypi.python.org/packages/source/p/plone.stringinterp/plone.stringinterp-1.0.10.zip";
+      md5 = "595074e94944ad6860e2105a020a3b9a";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ zope_i18n products_cmfcore setuptools ];
@@ -3897,10 +3966,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plone_formwidget_namedfile = buildPythonPackage rec {
-    name = "plone.formwidget.namedfile-1.0.5";
+    name = "plone.formwidget.namedfile-1.0.6";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.formwidget.namedfile/plone.formwidget.namedfile-1.0.5.zip";
-      md5 = "7d39a5760d679c89d8e41abbc295240f";
+      url = "https://pypi.python.org/packages/source/p/plone.formwidget.namedfile/plone.formwidget.namedfile-1.0.6.zip";
+      md5 = "afd20f030906a72fca7548876bdcbb48";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ z3c_form plone_z3cform plone_namedfile setuptools ];
@@ -3943,10 +4012,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   products_cmfdynamicviewfti = buildPythonPackage rec {
-    name = "Products.CMFDynamicViewFTI-4.0.4";
+    name = "Products.CMFDynamicViewFTI-4.0.5";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFDynamicViewFTI/Products.CMFDynamicViewFTI-4.0.4.zip";
-      md5 = "0358cdcfcaaafd6ff407a49752c8066b";
+      url = "https://pypi.python.org/packages/source/P/Products.CMFDynamicViewFTI/Products.CMFDynamicViewFTI-4.0.5.zip";
+      md5 = "2d31b1700ed8b1441adc737b454af693";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ extensionclass products_genericsetup zope_browsermenu zope_interface zope_component zope2 setuptools products_cmfcore acquisition ];
@@ -4219,10 +4288,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   products_tinymce = buildPythonPackage rec {
-    name = "Products.TinyMCE-1.3.3";
+    name = "Products.TinyMCE-1.3.4";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.TinyMCE/Products.TinyMCE-1.3.3.zip";
-      md5 = "3a88b1d1cbd34b860fbe6b3de979e2ea";
+      url = "https://pypi.python.org/packages/source/P/Products.TinyMCE/Products.TinyMCE-1.3.4.zip";
+      md5 = "e697dfdd72f3b6238e26908bb455d39a";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ products_archetypes plone_app_imaging plone_namedfile plone_app_layout zope_schema products_resourceregistries zope_app_content plone_caching setuptools plone_outputfilters ];
@@ -4265,13 +4334,13 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   z3c_form = buildPythonPackage rec {
-    name = "z3c.form-3.0.0a3";
+    name = "z3c.form-3.0.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.form/z3c.form-3.0.0a3.zip";
-      md5 = "557032834c90b71cf55b1068ee41472b";
+      url = "https://pypi.python.org/packages/source/z/z3c.form/z3c.form-3.0.1.zip";
+      md5 = "7c9338dbe89b8c27ebba7441b14786ac";
     };
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ zope_i18nmessageid zope_publisher zope_site zope_pagetemplate zope_interface zope_browserresource six zope_security zope_configuration zope_component zope_event zope_traversing setuptools zope_schema zope_lifecycleevent zope_browser zope_i18n zope_location zope_contentprovider ];
+    propagatedBuildInputs = [ zope_i18nmessageid zope_publisher zope_site zope_pagetemplate zope_interface zope_browserresource six zope_security zope_configuration zope_component zope_browserpage zope_event zope_traversing setuptools zope_schema zope_lifecycleevent zope_browser zope_i18n zope_location zope_contentprovider ];
     doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
@@ -4495,13 +4564,13 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plone_app_dexterity = buildPythonPackage rec {
-    name = "plone.app.dexterity-2.0.7";
+    name = "plone.app.dexterity-2.0.8";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.dexterity/plone.app.dexterity-2.0.7.zip";
-      md5 = "3187fc0a9082847d773eeec9bce6d217";
+      url = "https://pypi.python.org/packages/source/p/plone.app.dexterity/plone.app.dexterity-2.0.8.zip";
+      md5 = "2e0ec48224a3a8afd51656c22d574359";
     };
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ collective_z3cform_datetimewidget zope_interface zope_component plone_dexterity plone_autoform plone_behavior lxml zope_publisher products_genericsetup plone_supermodel plone_namedfile plone_app_content plone_app_textfield plone_app_z3cform plone_rfc822 plone_formwidget_namedfile z3c_form plone_portlets plone_app_uuid zope_browserpage plone_contentrules products_cmfplone zope_schema products_atcontenttypes zope2 plone_app_layout plone_schemaeditor plone_z3cform setuptools products_cmfcore ];
+    propagatedBuildInputs = [ collective_z3cform_datetimewidget zope_interface zope_component plone_dexterity plone_autoform plone_app_z3cform plone_behavior lxml zope_publisher products_genericsetup plone_supermodel plone_namedfile plone_app_content z3c_form plone_app_textfield plone_rfc822 plone_formwidget_namedfile plone_portlets plone_app_uuid zope_browserpage plone_contentrules products_cmfplone zope_schema products_atcontenttypes zope2 plone_app_layout plone_schemaeditor plone_z3cform setuptools products_cmfcore ];
     doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
@@ -4541,10 +4610,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plone_app_layout = buildPythonPackage rec {
-    name = "plone.app.layout-2.3.4";
+    name = "plone.app.layout-2.3.5";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.layout/plone.app.layout-2.3.4.zip";
-      md5 = "817819f27ad46fcb8a9d66e988fa08f2";
+      url = "https://pypi.python.org/packages/source/p/plone.app.layout/plone.app.layout-2.3.5.zip";
+      md5 = "960665807ad60eb3e12c52a0cf092ceb";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ products_cmfdynamicviewfti zope_deprecation zope_interface plone_memoize zope_dottedname datetime zope_component zope_annotation zope_publisher plone_i18n products_cmfdefault plone_app_viewletmanager plone_portlets plone_app_portlets zope_schema zope_viewlet acquisition zope2 setuptools zope_i18n plone_locking products_cmfcore products_cmfeditions ];
@@ -4840,10 +4909,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plone_app_workflow = buildPythonPackage rec {
-    name = "plone.app.workflow-2.1.2";
+    name = "plone.app.workflow-2.1.5";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.workflow/plone.app.workflow-2.1.2.zip";
-      md5 = "8da95b396f3a9ec54895085ef12202a7";
+      url = "https://pypi.python.org/packages/source/p/plone.app.workflow/plone.app.workflow-2.1.5.zip";
+      md5 = "b3589b4def82201adc196b3075b54213";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ zope_i18nmessageid transaction products_genericsetup zope_site zope_interface plone_memoize zope_testing datetime zope_component products_statusmessages zope2 setuptools products_dcworkflow zope_schema zope_i18n products_cmfcore acquisition ];
@@ -4932,10 +5001,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plone_app_collection = buildPythonPackage rec {
-    name = "plone.app.collection-1.0.9";
+    name = "plone.app.collection-1.0.10";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.collection/plone.app.collection-1.0.9.zip";
-      md5 = "bde68dc585ca0a4715ab55d4b4afcf9a";
+      url = "https://pypi.python.org/packages/source/p/plone.app.collection/plone.app.collection-1.0.10.zip";
+      md5 = "1042ac059be2311d4758452a3fa4f82e";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ plone_portlet_collection zope_i18nmessageid transaction plone_app_contentlisting zope_component plone_app_vocabularies plone_app_form products_validation zope_configuration plone_portlets setuptools products_archetypes zope2 plone_app_portlets zope_interface zope_schema products_cmfquickinstallertool archetypes_querywidget products_cmfcore zope_formlib ];
@@ -4955,10 +5024,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   zc_lockfile = buildPythonPackage rec {
-    name = "zc.lockfile-1.0.0";
+    name = "zc.lockfile-1.0.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zc.lockfile/zc.lockfile-1.0.0.tar.gz";
-      md5 = "6cf83766ef9935c33e240b0904c7a45e";
+      url = "http://pypi.python.org/packages/source/z/zc.lockfile/zc.lockfile-1.0.2.tar.gz";
+      md5 = "f099d4cf2583a0c7bea0146a44dc4d59";
     };
     buildInputs = [  ];
     propagatedBuildInputs = [ setuptools ];
@@ -5001,10 +5070,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plone_contentrules = buildPythonPackage rec {
-    name = "plone.contentrules-2.0.2";
+    name = "plone.contentrules-2.0.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.contentrules/plone.contentrules-2.0.2.zip";
-      md5 = "a32370656c4fd58652fcd8a234db69c5";
+      url = "https://pypi.python.org/packages/source/p/plone.contentrules/plone.contentrules-2.0.3.zip";
+      md5 = "e743dca41b07b7ac1c2a65b652679201";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ zope_i18nmessageid zope_container zope_interface zope_testing zope_configuration zope_component zope_componentvocabulary setuptools zodb3 zope_schema zope_lifecycleevent zope_annotation ];
@@ -5070,10 +5139,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plone_app_caching = buildPythonPackage rec {
-    name = "plone.app.caching-1.1.3";
+    name = "plone.app.caching-1.1.4";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.caching/plone.app.caching-1.1.3.zip";
-      md5 = "1975506ecf8d42944946dbb2b8f8dc01";
+      url = "https://pypi.python.org/packages/source/p/plone.app.caching/plone.app.caching-1.1.4.zip";
+      md5 = "bbb46c9dc36f0ac6cc833ee152203a81";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ products_cmfdynamicviewfti z3c_form zope_interface plone_memoize zope_component plone_caching zope_publisher products_genericsetup plone_app_registry z3c_zcmlhook setuptools plone_app_z3cform products_statusmessages python_dateutil plone_cachepurging acquisition zope2 zope_pagetemplate zope_browserresource plone_protect plone_registry products_cmfcore ];
@@ -5093,10 +5162,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   products_cmfplone = buildPythonPackage rec {
-    name = "Products.CMFPlone-4.3";
+    name = "Products.CMFPlone-4.3.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFPlone/Products.CMFPlone-4.3.zip";
-      md5 = "25be0a93702c242ed5985cebde34f872";
+      url = "https://pypi.python.org/packages/source/P/Products.CMFPlone/Products.CMFPlone-4.3.1.zip";
+      md5 = "2fee0c66e0d9bdf28b513bcd6d95a602";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ products_cmfdynamicviewfti plone_app_blob products_dcworkflow products_extendedpathindex zope_dottedname datetime zope_traversing products_tinymce zope_publisher plonetheme_classic plone_batching plone_fieldsets products_cmfdefault acquisition plone_app_contentlisting products_externaleditor products_pluginregistry products_cmfeditions products_resourceregistries zope_tal plone_app_jquerytools products_genericsetup pillow five_localsitemanager plone_app_vocabularies zope_location zope_deferredimport products_plonelanguagetool borg_localrole zope_i18n plone_browserlayer plone_theme plone_memoize plone_app_contentmenu plone_app_i18n zope_component products_mimetypesregistry plone_app_customerize plone_app_folder plone_registry zope_i18nmessageid plone_app_upgrade products_cmfdifftool five_customerize plone_app_search products_portaltransforms plone_app_controlpanel plone_app_locales plone_app_linkintegrity zope2 plone_contentrules plone_app_portlets products_plonepas zope_pagetemplate zodb3 plone_locking products_cmfformcontroller zope_deprecation plone_app_form plone_app_layout products_cmfquickinstallertool archetypes_querywidget plone_app_redirector plone_i18n plone_app_registry products_placelesstranslationservice plone_app_users zope_interface zope_event plone_app_viewletmanager zope_structuredtext z3c_autoinclude zope_app_locales plone_portlets products_statusmessages products_cmfcalendar extensionclass products_pluggableauthservice plone_indexer products_cmfuid zope_container plone_app_workflow setuptools plone_portlet_collection plone_app_contentrules products_cmfactionicons products_archetypes plone_intelligenttext plone_app_collection products_passwordresettool plone_app_content plonetheme_sunburst plone_protect zope_tales plone_app_uuid archetypes_referencebrowserwidget products_atcontenttypes plone_app_jquery transaction zope_site plone_app_discussion plone_portlet_static plone_session products_cmfcore ];
@@ -5139,10 +5208,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plone_app_controlpanel = buildPythonPackage rec {
-    name = "plone.app.controlpanel-2.3.4";
+    name = "plone.app.controlpanel-2.3.6";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.controlpanel/plone.app.controlpanel-2.3.4.zip";
-      md5 = "d01b8c188498080a52275de2a50b25eb";
+      url = "https://pypi.python.org/packages/source/p/plone.app.controlpanel/plone.app.controlpanel-2.3.6.zip";
+      md5 = "ca5e0e0c8497d9860603e39e0eeba9b8";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ zope_testing zope_interface plone_memoize zope_component plone_app_workflow zope_annotation zope_ramcache zope_publisher products_portaltransforms plone_fieldsets zope_event products_cmfdefault zope_cachedescriptors plone_app_form setuptools products_statusmessages zope_schema zope2 acquisition products_plonepas zope_site plone_app_vocabularies zope_formlib zodb3 plone_protect zope_i18n plone_locking products_cmfcore ];
@@ -5162,10 +5231,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plone_app_redirector = buildPythonPackage rec {
-    name = "plone.app.redirector-1.2a1";
+    name = "plone.app.redirector-1.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.redirector/plone.app.redirector-1.2a1.zip";
-      md5 = "b63b6443b4bbc5562bddcb43600349f7";
+      url = "https://pypi.python.org/packages/source/p/plone.app.redirector/plone.app.redirector-1.2.zip";
+      md5 = "bc0508844f276ac7a7b9556d37281cc8";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ plone_memoize setuptools ];
@@ -5231,10 +5300,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plone_namedfile = buildPythonPackage rec {
-    name = "plone.namedfile-2.0.1";
+    name = "plone.namedfile-2.0.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.namedfile/plone.namedfile-2.0.1.zip";
-      md5 = "9739c2fe25977d7e050a85eaed9e776a";
+      url = "https://pypi.python.org/packages/source/p/plone.namedfile/plone.namedfile-2.0.2.zip";
+      md5 = "f6168ab9e38f3a171dc35483527b3e01";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ zope_traversing zope_security zope_component zope_browserpage setuptools plone_rfc822 ];
@@ -5369,10 +5438,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   products_zctextindex = buildPythonPackage rec {
-    name = "Products.ZCTextIndex-2.13.3";
+    name = "Products.ZCTextIndex-2.13.4";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ZCTextIndex/Products.ZCTextIndex-2.13.3.zip";
-      md5 = "bf95ea9fa2831237fa3c3d38fafdec96";
+      url = "http://pypi.python.org/packages/source/P/Products.ZCTextIndex/Products.ZCTextIndex-2.13.4.zip";
+      md5 = "8bbfa5fcd3609246990a9314d6f826b4";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ accesscontrol transaction zope_interface zexceptions zodb3 persistence setuptools acquisition ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b165dd78e95..0000d81b861 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5656,17 +5656,17 @@ let
     python = python27;
   });
 
-  plone41Packages = recurseIntoAttrs (import ../development/web/plone/4.1.6.nix {
+  plone41Packages = recurseIntoAttrs (import ../development/web/plone/4.1.nix {
     inherit pkgs;
     pythonPackages = python26Packages;
   });
 
-  plone42Packages = recurseIntoAttrs (import ../development/web/plone/4.2.5.nix {
+  plone42Packages = recurseIntoAttrs (import ../development/web/plone/4.2.nix {
     inherit pkgs;
     pythonPackages = python26Packages;
   });
 
-  plone43Packages = recurseIntoAttrs (import ../development/web/plone/4.3.0.nix {
+  plone43Packages = recurseIntoAttrs (import ../development/web/plone/4.3.nix {
     inherit pkgs;
     pythonPackages = python27Packages;
   });

From 79ec396f6ff3ee35804dad96e864c41f3ba45e6d Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 3 Jul 2013 02:32:01 +0200
Subject: [PATCH 211/314] plone: z3c.form downgraded to 3.0

---
 pkgs/development/web/plone/4.3.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/web/plone/4.3.nix b/pkgs/development/web/plone/4.3.nix
index a0b0ff46153..7da9a7a47c5 100644
--- a/pkgs/development/web/plone/4.3.nix
+++ b/pkgs/development/web/plone/4.3.nix
@@ -4334,10 +4334,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   z3c_form = buildPythonPackage rec {
-    name = "z3c.form-3.0.1";
+    name = "z3c.form-3.0";
     src = fetchurl {
-      url = "https://pypi.python.org/packages/source/z/z3c.form/z3c.form-3.0.1.zip";
-      md5 = "7c9338dbe89b8c27ebba7441b14786ac";
+      url = "https://pypi.python.org/packages/source/z/z3c.form/z3c.form-3.0.zip";
+      md5 = "f9fa3cf56c83722425b3b1be4467ce46";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ zope_i18nmessageid zope_publisher zope_site zope_pagetemplate zope_interface zope_browserresource six zope_security zope_configuration zope_component zope_browserpage zope_event zope_traversing setuptools zope_schema zope_lifecycleevent zope_browser zope_i18n zope_location zope_contentprovider ];

From 52dd19be1b38af9182f89ba62bbb56b3480ab39e Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 3 Jul 2013 02:47:14 +0200
Subject: [PATCH 212/314] plone: plone_recipe_varnish updated to 1.3dev to
 support varnish >= 3

---
 pkgs/development/web/plone/4.3.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/web/plone/4.3.nix b/pkgs/development/web/plone/4.3.nix
index 7da9a7a47c5..db209292442 100644
--- a/pkgs/development/web/plone/4.3.nix
+++ b/pkgs/development/web/plone/4.3.nix
@@ -1229,10 +1229,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plone_recipe_varnish = buildPythonPackage rec {
-    name = "plone.recipe.varnish-1.2.2";
+    name = "plone.recipe.varnish-1.3dev";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.recipe.varnish/plone.recipe.varnish-1.2.2.zip";
-      md5 = "100f8bd4857926b8aa1c6decfd05626b";
+      url = "https://github.com/collective/plone.recipe.varnish/archive/38ef4a86ce2e1c407e35ab36487bc1311c4eb1e3.zip";
+      md5 = "9aa448793ca115790d38df6f676bd7d8";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ zc_buildout setuptools ];

From bf540904debdfed09ff36ffd1f6f3280af253aee Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 3 Jul 2013 03:36:15 +0200
Subject: [PATCH 213/314] haproxy: update to 1.4.24 (set platform to linux, for
 now)

---
 pkgs/tools/networking/haproxy/default.nix | 26 +++++++++++++++--------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix
index 0a43251dc35..3d2c26b6df5 100644
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/pkgs/tools/networking/haproxy/default.nix
@@ -1,21 +1,29 @@
-{ stdenv, fetchurl }:
+{ stdenv, pkgs, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "haproxy-1.4.20";
+stdenv.mkDerivation rec {
+  version = "1.4.24";
+  name = "haproxy-${version}";
   
   src = fetchurl {
-    url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.20.tar.gz;
-    sha256 = "0gi81dg8k3ypljs7ifbppvpfrwrnbafjv41fjpwnyqfwbxa4j2gh";
+    url = "http://haproxy.1wt.eu/download/1.4/src/${name}.tar.gz";
+    sha256 = "1vy7jz7l8qdd6ah3y65zarz9x9pf3bs02icxnrckpgh1s3s2h2b8";
   };
 
-  buildInputs = [];
+  buildInputs = [ ];
 
+  # TODO: make it work on darwin/bsd as well
   preConfigure = ''
-    export makeFlags="TARGET=linux26 PREFIX=$out"
+    export makeFlags="TARGET=linux2628 PREFIX=$out"
   '';
-  
+
   meta = {
     description = "HAProxy is a free, very fast and reliable solution offering high availability, load balancing, and proxying for TCP and HTTP-based applications.";
-    homepage = http://haproxy.1wt.eu/;
+    homepage = "http://haproxy.1wt.eu";
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    platforms = stdenv.lib.platforms.linux;
+    license = [
+       pkgs.lib.licenses.gpl2
+       pkgs.lib.licenses.lgpl21
+    ];
   };
 }

From 0a527048eb9ccc230e76694f4ac1d33cebfd1627 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 3 Jul 2013 04:26:02 +0200
Subject: [PATCH 214/314] pythonPackages.genshi: update to 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 5049d0628b5..cba57b16739 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1877,11 +1877,11 @@ pythonPackages = python.modules // rec {
   };
 
   genshi = buildPythonPackage {
-    name = "genshi-0.6";
+    name = "genshi-0.7";
 
     src = fetchurl {
-      url = http://ftp.edgewall.com/pub/genshi/Genshi-0.6.tar.gz;
-      sha256 = "0jrajyppdzb3swcxv3w1mpp88vcy7400gy1v2h2gm3pq0dmggaij";
+      url = http://ftp.edgewall.com/pub/genshi/Genshi-0.7.tar.gz;
+      sha256 = "0lkkbp6fbwzv0zda5iqc21rr7rdldkwh3hfabfjl9i4bwq14858x";
     };
 
     # FAIL: test_sanitize_remove_script_elem (genshi.filters.tests.html.HTMLSanitizerTestCase)

From 7816aa4ada8968a79ade52f1a8c689cf5fdeecb3 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 3 Jul 2013 04:26:27 +0200
Subject: [PATCH 215/314] plone: adding collective_recipe_template package

---
 pkgs/development/web/plone/4.3.nix | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/plone/4.3.nix b/pkgs/development/web/plone/4.3.nix
index db209292442..f57b8e63817 100644
--- a/pkgs/development/web/plone/4.3.nix
+++ b/pkgs/development/web/plone/4.3.nix
@@ -1,7 +1,7 @@
 # DO NOT EDIT THIS FILE!
 #
 # Nix expressions autogenerated with:
-#   bin/pypi2nix -n plone43Packages -d Plone -d mailinglogger -d zc.recipe.egg -d plone.recipe.zope2instance -d plone.recipe.zeoserver -d plone.recipe.varnish -d Pillow -i setuptools -i zc_buildout -i pillow -e plone/4.3.1.json -p plone/4.3.1.txt -o plone/4.3.1.nix
+#   bin/pypi2nix -n plone43Packages -d Plone -d mailinglogger -d zc.recipe.egg -d plone.recipe.zope2instance -d plone.recipe.zeoserver -d plone.recipe.varnish -d collective.recipe.template -d Pillow -i setuptools -i zc_buildout -i pillow -e plone/4.3.1.json -p plone/4.3.1.txt -o plone/4.3.1.nix
 
 { pkgs, pythonPackages }:
 
@@ -837,6 +837,29 @@ let plone43Packages = pythonPackages.python.modules // rec {
     };
   };
 
+  collective_recipe_template = buildPythonPackage rec {
+    name = "collective.recipe.template-1.9";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/c/collective.recipe.template/collective.recipe.template-1.9.zip";
+      md5 = "f8b8eab3cf183ea92c2e50a54da228e8";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zc_buildout setuptools pythonPackages.genshi ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+    };
+  };
+
   zope_configuration = buildPythonPackage rec {
     name = "zope.configuration-3.7.4";
     src = fetchurl {
@@ -4336,7 +4359,7 @@ let plone43Packages = pythonPackages.python.modules // rec {
   z3c_form = buildPythonPackage rec {
     name = "z3c.form-3.0";
     src = fetchurl {
-      url = "https://pypi.python.org/packages/source/z/z3c.form/z3c.form-3.0.zip";
+      url = "http://pypi.python.org/packages/source/z/z3c.form/z3c.form-3.0.zip";
       md5 = "f9fa3cf56c83722425b3b1be4467ce46";
     };
     buildInputs = [ pkgs.unzip ];

From e84ba407f9ca49320d50e1a4db60923fb4062dfd Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 3 Jul 2013 04:44:01 +0200
Subject: [PATCH 216/314] plone: adding collective_recipe_filestorage package

---
 pkgs/development/web/plone/4.3.nix | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/web/plone/4.3.nix b/pkgs/development/web/plone/4.3.nix
index f57b8e63817..badd213daf6 100644
--- a/pkgs/development/web/plone/4.3.nix
+++ b/pkgs/development/web/plone/4.3.nix
@@ -1,7 +1,7 @@
 # DO NOT EDIT THIS FILE!
 #
 # Nix expressions autogenerated with:
-#   bin/pypi2nix -n plone43Packages -d Plone -d mailinglogger -d zc.recipe.egg -d plone.recipe.zope2instance -d plone.recipe.zeoserver -d plone.recipe.varnish -d collective.recipe.template -d Pillow -i setuptools -i zc_buildout -i pillow -e plone/4.3.1.json -p plone/4.3.1.txt -o plone/4.3.1.nix
+#   bin/pypi2nix -n plone43Packages -d Plone -d mailinglogger -d zc.recipe.egg -d plone.recipe.zope2instance -d plone.recipe.zeoserver -d plone.recipe.varnish -d collective.recipe.template -d collective.recipe.filestorage -d Pillow -i setuptools -i zc_buildout -i pillow -e plone/4.3.1.json -p plone/4.3.1.txt -o plone/4.3.1.nix
 
 { pkgs, pythonPackages }:
 
@@ -1504,6 +1504,29 @@ let plone43Packages = pythonPackages.python.modules // rec {
     };
   };
 
+  collective_recipe_filestorage = buildPythonPackage rec {
+    name = "collective.recipe.filestorage-0.6";
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/c/collective.recipe.filestorage/collective.recipe.filestorage-0.6.zip";
+      md5 = "c0d85a82a858a860dc665dd38303fedd";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zc_buildout setuptools plone_recipe_zope2instance ];
+    doCheck = false;
+    installCommand = ''
+      easy_install --always-unzip --no-deps --prefix="$out" .
+    '';
+    
+    meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
+      maintainers = [
+        stdenv.lib.maintainers.garbas
+        stdenv.lib.maintainers.iElectric
+      ];
+    };
+  };
+
   plone_intelligenttext = buildPythonPackage rec {
     name = "plone.intelligenttext-2.0.2";
     src = fetchurl {

From 72a771b6e4b3583a3f8b5ae118b60fc16b012ac9 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Wed, 3 Jul 2013 19:52:22 +1000
Subject: [PATCH 217/314] emacs24: fix build on darwin

---
 pkgs/applications/editors/emacs-24/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix
index a781cb37346..470d8f53cb8 100644
--- a/pkgs/applications/editors/emacs-24/default.nix
+++ b/pkgs/applications/editors/emacs-24/default.nix
@@ -44,7 +44,7 @@ EOF
 
   doCheck = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "GNU Emacs 24, the extensible, customizable text editor";
 
     longDescription = ''
@@ -67,7 +67,7 @@ EOF
     homepage = "http://www.gnu.org/software/emacs/";
     license = "GPLv3+";
 
-    maintainers = with stdenv.lib.maintainers; [ ludo simons chaoflow ];
-    platforms = stdenv.lib.platforms.all;
+    maintainers = with maintainers; [ chaoflow lovek323 ludo simons ];
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0000d81b861..134e2101043 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7232,6 +7232,12 @@ let
     alsaLib = null;
     imagemagick = null;
     texinfo = texinfo5;
+
+    # use gccApple on darwin to deal with: unexec: 'my_edata is not in section
+    # __data'
+    stdenv = if stdenv.isDarwin
+      then stdenvAdapters.overrideGCC stdenv gccApple
+      else stdenv;
   };
 
   emacsPackages = emacs: self: let callPackage = newScope self; in rec {

From bdf5a5c20e8912f3e8115b9c7f9176da91fcacf3 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Wed, 3 Jul 2013 19:52:46 +1000
Subject: [PATCH 218/314] liboil: fix build on darwin

* force --build=x86_64
---
 pkgs/development/libraries/liboil/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/liboil/default.nix b/pkgs/development/libraries/liboil/default.nix
index 45f75b4f805..de2ffdffca7 100644
--- a/pkgs/development/libraries/liboil/default.nix
+++ b/pkgs/development/libraries/liboil/default.nix
@@ -12,9 +12,15 @@ stdenv.mkDerivation rec {
 
   patches = [ ./x86_64-cpuid.patch ];
 
-  meta = {
-    homepage = http://liboil.freedesktop.org;
+  # fix "argb_paint_i386.c:53:Incorrect register `%rax' used with `l' suffix"
+  # errors
+  configureFlags = stdenv.lib.optional stdenv.isDarwin "--build=x86_64";
+
+  meta = with stdenv.lib; {
     description = "A library of simple functions that are optimized for various CPUs";
-    license = "BSD-2";
+    homepage    = http://liboil.freedesktop.org;
+    license     = libraries.bsd2;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.all;
   };
 }

From 80213cbb051f2e172be20c03e51069f122d8bb6c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 3 Jul 2013 12:41:27 +0200
Subject: [PATCH 219/314] meta.license is a list of strings (not attribute
 sets)

http://hydra.nixos.org/build/5453648
---
 pkgs/lib/licenses.nix                     | 21 ++++-----------------
 pkgs/tools/networking/haproxy/default.nix |  6 +++---
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix
index 0669bc3f5c3..f6c1fddfd14 100644
--- a/pkgs/lib/licenses.nix
+++ b/pkgs/lib/licenses.nix
@@ -4,8 +4,7 @@
    * add it to this list. The URL mentioned above is a good source for inspiration.
    */
 
-  agpl3 = {
-    shortName = "AGPLv3";
+  agpl3 = "AGPLv3";
     fullName = "GNU Affero General Public License version 3 only";
     url = https://www.gnu.org/licenses/agpl.html;
   };
@@ -76,11 +75,7 @@
     url = http://www.eclipse.org/legal/epl-v10.html;
   };
 
-  gpl2 = {
-    shortName = "GPLv2";
-    fullName = "GNU General Public License version 2 only";
-    url = http://www.gnu.org/licenses/old-licenses/gpl-2.0.html;
-  };
+  gpl2 = "GPLv2";
 
   gpl2Oss = {
     shortName = "GPLv2+OSS";
@@ -136,11 +131,7 @@
     url = https://fedoraproject.org/wiki/Licensing/libtiff;
   };
 
-  lgpl2 = {
-    shortName = "LGPLv2";
-    fullName = "GNU Library General Public License version 2";
-    url = http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html;
-  };
+  lgpl2 = "LGPLv2";
 
   lgpl2Plus = {
     shortName = "LGPLv2+";
@@ -148,11 +139,7 @@
     url = http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html;
   };
 
-  lgpl21 = {
-    shortName = "LGPLv2.1";
-    fullName = "GNU Lesser General Public License version 2.1 only";
-    url = http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html;
-  };
+  lgpl21 = "LGPLv2.1";
 
   lgpl21Plus = {
     shortName = "LGPLv2.1+";
diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix
index 3d2c26b6df5..d44c9f831f3 100644
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/pkgs/tools/networking/haproxy/default.nix
@@ -18,12 +18,12 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "HAProxy is a free, very fast and reliable solution offering high availability, load balancing, and proxying for TCP and HTTP-based applications.";
-    homepage = "http://haproxy.1wt.eu";
+    homepage = http://haproxy.1wt.eu;
     maintainers = [ stdenv.lib.maintainers.garbas ];
     platforms = stdenv.lib.platforms.linux;
     license = [
-       pkgs.lib.licenses.gpl2
-       pkgs.lib.licenses.lgpl21
+       stdenv.lib.licenses.gpl2
+       stdenv.lib.licenses.lgpl21
     ];
   };
 }

From 6307798b45347a298d39fa78ed79c7d69a8b9f15 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Wed, 3 Jul 2013 20:09:27 +1000
Subject: [PATCH 220/314] gnome.ORBit2: fix build on darwin

* add libintlOrEmpty to build inputs
---
 .../gnome-2/platform/ORBit2/default.nix       | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
index 22c22c6bcf5..94aaf30a49d 100644
--- a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
+++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl_gnome, pkgconfig, glib, libIDL}:
+{ stdenv, fetchurl_gnome, pkgconfig, glib, libIDL, libintlOrEmpty }:
 
 stdenv.mkDerivation rec {
   name = src.pkgname;
@@ -14,5 +14,24 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ pkgconfig ];
-  propagatedBuildInputs = [ glib libIDL ];
+  propagatedBuildInputs = [ glib libIDL ] ++ libintlOrEmpty;
+
+  meta = with stdenv.lib; {
+    homepage    = https://projects.gnome.org/ORBit2/;
+    description = "A a CORBA 2.4-compliant Object Request Broker";
+    platforms   = platforms.unix;
+    maintainers = with maintainers; [ lovek323 ];
+
+    longDescription = ''
+      ORBit2 is a CORBA 2.4-compliant Object Request Broker (ORB) featuring
+      mature C, C++ and Python bindings. Bindings (in various degrees of
+      completeness) are also available for Perl, Lisp, Pascal, Ruby, and TCL;
+      others are in-progress. It supports POA, DII, DSI, TypeCode, Any, IR and
+      IIOP. Optional features including INS and threading are available. ORBit2
+      is engineered for the desktop workstation environment, with a focus on
+      performance, low resource usage, and security. The core ORB is written in
+      C, and runs under Linux, UNIX (BSD, Solaris, HP-UX, ...), and Windows.
+      ORBit2 is developed and released as open source software under GPL/LGPL.
+    '';
+  };
 }

From 3b54af72b17c33bfafcd748156475f3f432bbdec Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Wed, 3 Jul 2013 22:00:52 +1000
Subject: [PATCH 221/314] cracklib: fix build on darwin

* add libintlOrEmpty to build inputs
---
 pkgs/development/libraries/cracklib/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix
index 32d1c478a49..7fb9089420d 100644
--- a/pkgs/development/libraries/cracklib/default.nix
+++ b/pkgs/development/libraries/cracklib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, libintlOrEmpty }:
 
 stdenv.mkDerivation rec {
   name = "cracklib-2.8.16";
@@ -8,8 +8,12 @@ stdenv.mkDerivation rec {
     sha256 = "1g3mchdvra9nihxlkl3rdz96as3xnfw5m59hmr5k17l7qa9a8fpw";
   };
 
-  meta = {
-    homepage = http://sourceforge.net/projects/cracklib;
+  buildInputs = libintlOrEmpty;
+
+  meta = with stdenv.lib; {
+    homepage    = http://sourceforge.net/projects/cracklib;
     description = "A library for checking the strength of passwords";
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.unix;
   };
 }

From 84f5d870f38e753b2e5de505aa2958b4ac2e8e23 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Wed, 3 Jul 2013 22:01:34 +1000
Subject: [PATCH 222/314] glib: remove unnecessary restrictions on darwin

---
 pkgs/development/libraries/glib/default.nix | 24 ++++++---------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 7469b07ce86..b500967af78 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -24,7 +24,7 @@ let
   '';
 in
 
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
   name = "glib-2.36.1";
 
   src = fetchurl {
@@ -41,10 +41,7 @@ stdenv.mkDerivation (rec {
 
   configureFlags = "--with-pcre=system --disable-fam";
 
-  postConfigure = "sed '/SANE_MALLOC_PROTOS/s,^,//,' -i config.h" # https://bugzilla.gnome.org/show_bug.cgi?id=698716 :-)
-    + stdenv.lib.optionalString stdenv.isDarwin ''
-      sed '24 i #include <Foundation/Foundation.h>'
-    '';
+  postConfigure = "sed '/SANE_MALLOC_PROTOS/s,^,//,' -i config.h";
 
   enableParallelBuilding = true;
 
@@ -55,12 +52,12 @@ stdenv.mkDerivation (rec {
      inherit flattenInclude;
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "GLib, a C library of programming buildings blocks";
     homepage    = http://www.gtk.org/;
-    license     = "LGPLv2+";
-    maintainers = with stdenv.lib.maintainers; [ raskin urkud lovek323 ];
-    platforms   = stdenv.lib.platforms.unix;
+    license     = licenses.lgpl2Plus;
+    maintainers = with maintainers; [ lovek323 raskin urkud ];
+    platforms   = platforms.unix;
 
     longDescription = ''
       GLib provides the core application building blocks for libraries
@@ -71,12 +68,3 @@ stdenv.mkDerivation (rec {
   };
 }
 
-//
-
-(stdenv.lib.optionalAttrs stdenv.isDarwin {
-  # XXX: Disable the NeXTstep back-end because stdenv.gcc doesn't support
-  # Objective-C.
-  postConfigure =
-    '' sed -i configure -e's/glib_have_cocoa=yes/glib_have_cocoa=no/g'
-    '';
-}))

From 216d47be0c39df07c4cd3bfcf4f05b01a8409a78 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Wed, 3 Jul 2013 22:02:40 +1000
Subject: [PATCH 223/314] gobject-introspection: fix build on darwin

* add otool expression (add otool to build inputs)
* add libintlOrEmpty to build inputs
---
 .../gobject-introspection/default.nix         | 24 ++++++++++----
 pkgs/development/tools/misc/otool/default.nix | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 51 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/tools/misc/otool/default.nix

diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index b96d5b25bb1..99a80640bb8 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -1,14 +1,17 @@
-{ stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python, gdk_pixbuf }:
+{ stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python, gdk_pixbuf
+, libintlOrEmpty, autoconf, automake, otool }:
 
 stdenv.mkDerivation rec {
   name = "gobject-introspection-1.34.2";
 
-  buildInputs = [ flex bison glib pkgconfig python gdk_pixbuf ];
+  buildInputs = [ flex bison glib pkgconfig python gdk_pixbuf ]
+    ++ libintlOrEmpty
+    ++ stdenv.lib.optional stdenv.isDarwin otool;
   propagatedBuildInputs = [ libffi ];
 
   # Tests depend on cairo, which is undesirable (it pulls in lots of
   # other dependencies).
-  configureFlags = "--disable-tests";
+  configureFlags = [ "--disable-tests" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/gobject-introspection/1.34/${name}.tar.xz";
@@ -18,8 +21,17 @@ stdenv.mkDerivation rec {
   postInstall = "rm -rf $out/share/gtk-doc";
 
   meta = with stdenv.lib; {
-    maintainers = [ maintainers.urkud ];
-    platforms = platforms.linux;
-    homepage = http://live.gnome.org/GObjectIntrospection;
+    description = "A middleware layer between C libraries and language bindings";
+    homepage    = http://live.gnome.org/GObjectIntrospection;
+    maintainers = with maintainers; [ lovek323 urkud ];
+    platforms   = platforms.unix;
+
+    longDescription = ''
+      GObject introspection is a middleware layer between C libraries (using
+      GObject) and language bindings. The C library can be scanned at compile
+      time and generate a metadata file, in addition to the actual native C
+      library. Then at runtime, language bindings can read this metadata and
+      automatically provide bindings to call into the C library.
+    '';
   };
 }
diff --git a/pkgs/development/tools/misc/otool/default.nix b/pkgs/development/tools/misc/otool/default.nix
new file mode 100644
index 00000000000..aa365fc29d5
--- /dev/null
+++ b/pkgs/development/tools/misc/otool/default.nix
@@ -0,0 +1,31 @@
+{ stdenv }:
+
+stdenv.mkDerivation {
+  name = "otool";
+
+  src = "/usr/bin/otool";
+
+  unpackPhase = "true";
+  configurePhase = "true";
+  buildPhase = "true";
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    cp /usr/bin/otool "$out/bin"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Object file displaying tool";
+    homepage    = https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man1/otool.1.html;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.darwin;
+
+    longDescription = ''
+      The otool command displays specified parts of object files or libraries.
+      If the, -m option is not used, the file arguments may be of the form
+      libx.a(foo.o), to request information about only that object file and not
+      the entire library.
+    '';
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 134e2101043..8bbe1e14cca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -444,6 +444,8 @@ let
 
   apg = callPackage ../tools/security/apg { };
 
+  otool = callPackage ../development/tools/misc/otool { };
+
   xcodeenv = callPackage ../development/mobile/xcodeenv { };
 
   titaniumenv_2_1 = import ../development/mobile/titaniumenv {

From 5cfa68ab50f49f73618c068724f6c590a0ae231a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 3 Jul 2013 14:38:56 +0200
Subject: [PATCH 224/314] Reinstate sec=none

Seems to be required, despite the subsequent sec=ntlm. But the NixOS
VM tests work fine without this flag :-S

http://hydra.nixos.org/build/5451901
---
 pkgs/build-support/vm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 52b50adbfec..b1eb82ed830 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -123,14 +123,14 @@ rec {
 
     echo "mounting Nix store..."
     mkdir -p /fs/nix/store
-    mount -t cifs //10.0.2.4/store /fs/nix/store -o guest,sec=ntlm
+    mount -t cifs //10.0.2.4/store /fs/nix/store -o guest,sec=none,sec=ntlm
 
     mkdir -p /fs/tmp
     mount -t tmpfs -o "mode=755" none /fs/tmp
 
     echo "mounting host's temporary directory..."
     mkdir -p /fs/tmp/xchg
-    mount -t cifs //10.0.2.4/xchg /fs/tmp/xchg -o guest,sec=ntlm
+    mount -t cifs //10.0.2.4/xchg /fs/tmp/xchg -o guest,sec=none,sec=ntlm
 
     mkdir -p /fs/proc
     mount -t proc none /fs/proc

From b9960211abaaaac044d9bfa0a8395fde46847d05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 3 Jul 2013 15:33:02 +0200
Subject: [PATCH 225/314] add GNU Guix

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

diff --git a/pkgs/tools/package-management/guix/default.nix b/pkgs/tools/package-management/guix/default.nix
new file mode 100644
index 00000000000..37957235629
--- /dev/null
+++ b/pkgs/tools/package-management/guix/default.nix
@@ -0,0 +1,73 @@
+{ fetchurl, stdenv, guile, libgcrypt, sqlite, bzip2, pkgconfig }:
+
+let
+  # Getting the bootstrap Guile binary.  This is normally performed by Guix's build system.
+  base_url = arch:
+    "http://alpha.gnu.org/gnu/guix/bootstrap/${arch}-linux/20130105/guile-2.0.7.tar.xz";
+  boot_guile = {
+    i686 = fetchurl {
+      url = base_url "i686";
+      sha256 = "f9a7c6f4c556eaafa2a69bcf07d4ffbb6682ea831d4c9da9ba095aca3ccd217c";
+    };
+    x86_64 = fetchurl {
+      url = base_url "x86_64";
+      sha256 = "bc43210dcd146d242bef4d354b0aeac12c4ef3118c07502d17ffa8d49e15aa2c";
+    };
+  };
+in stdenv.mkDerivation rec {
+  name = "guix-0.2";
+
+  src = fetchurl {
+    url = "ftp://alpha.gnu.org/gnu/guix/${name}.tar.gz";
+    sha256 = "140y0ywbgl6vxl4nwswz4vim2wwdiajxlksj24lnv40aw5hyvifr";
+  };
+
+  configureFlags =
+     [ "--localstatedir=/nix/var"
+       "--with-libgcrypt-prefix=${libgcrypt}"
+     ];
+
+  preBuild =
+    # Copy the bootstrap Guile tarballs like Guix's makefile normally does.
+    '' cp -v "${boot_guile.i686}" gnu/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz
+       cp -v "${boot_guile.x86_64}" gnu/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz
+    '';
+
+  preCheck =
+    # XXX: Skip this test (see commit 91fe0e20c7da2b706a1ac0e7b75235b6c1e6ed0a).
+    '' sed -i tests/guix-package.sh -e's/guix package --version/exit 0/'
+    '';
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ guile libgcrypt sqlite bzip2 ];
+
+  doCheck = true;
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Functional package manager with a Scheme interface";
+
+    longDescription = ''
+      GNU Guix is a purely functional package manager for the GNU system, and a distribution thereof.
+
+      In addition to standard package management features, Guix supports
+      transactional upgrades and roll-backs, unprivileged package management,
+      per-user profiles, and garbage collection. 
+
+      It provides Guile Scheme APIs, including high-level embedded
+      domain-specific languages (EDSLs), to describe how packages are built
+      and composed.
+
+      A user-land free software distribution for GNU/Linux comes as part of
+      Guix.
+
+      Guix is based on the Nix package manager.
+    '';
+
+    license = "GPLv3+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+
+    homepage = http://www.gnu.org/software/guix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0000d81b861..516fe0a2a56 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9448,6 +9448,8 @@ let
     x11Support = true;
   });
 
+  guix = callPackage ../tools/package-management/guix { };
+
   gxemul = callPackage ../misc/gxemul { };
 
   hatari = callPackage ../misc/emulators/hatari { };

From 2ddcab06170072d74c62070bc1ee50f1fb0459e3 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 2 Jul 2013 18:46:53 -0400
Subject: [PATCH 226/314] Updte nodePackages

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/top-level/node-packages-generated.nix | 165 ++++++++++++---------
 1 file changed, 93 insertions(+), 72 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index c4a6bbb7ca6..0d83b2b4f58 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -102,9 +102,9 @@
   }
   {
     baseName = "aws-sdk";
-    version = "1.2.0";
+    version = "1.3.1";
     fullName = "aws-sdk-*";
-    hash = "e2d4b32fba387b8f099c4180579b67554f875895a69e4c1ddb0a28546db9ba4c";
+    hash = "1c8c49435a4ddf5ceb29b0c9d130893a95de30207785c3dc9d902c9174362967";
     patchLatest = true;
     topLevel = true;
     dependencies = [
@@ -114,9 +114,9 @@
   }
   {
     baseName = "aws-sdk";
-    version = "1.2.0";
+    version = "1.3.1";
     fullName = "aws-sdk->=1.2.0 <2";
-    hash = "e2d4b32fba387b8f099c4180579b67554f875895a69e4c1ddb0a28546db9ba4c";
+    hash = "1c8c49435a4ddf5ceb29b0c9d130893a95de30207785c3dc9d902c9174362967";
     patchLatest = true;
     topLevel = false;
     dependencies = [
@@ -306,9 +306,9 @@
   }
   {
     baseName = "connect";
-    version = "2.7.11";
-    fullName = "connect-2.7.11";
-    hash = "8c9aaabcb7e6f0d733f82b876db59a37a6d711aab7ea2dead9f624d9282b1245";
+    version = "2.8.1";
+    fullName = "connect-2.8.1";
+    hash = "f838a4e8bccdf065cda7affe0118f018bdf1baa87375cd1df92e2cff29da2948";
     patchLatest = false;
     topLevel = false;
     dependencies = [
@@ -321,14 +321,15 @@
       { name = "bytes"; range = "0.2.0"; }
       { name = "fresh"; range = "0.1.0"; }
       { name = "pause"; range = "0.0.1"; }
+      { name = "uid2"; range = "0.0.2"; }
       { name = "debug"; range = "*"; }
     ];
   }
   {
     baseName = "connect";
-    version = "2.7.11";
+    version = "2.8.1";
     fullName = "connect-~2";
-    hash = "8c9aaabcb7e6f0d733f82b876db59a37a6d711aab7ea2dead9f624d9282b1245";
+    hash = "f838a4e8bccdf065cda7affe0118f018bdf1baa87375cd1df92e2cff29da2948";
     patchLatest = false;
     topLevel = false;
     dependencies = [
@@ -341,6 +342,7 @@
       { name = "bytes"; range = "0.2.0"; }
       { name = "fresh"; range = "0.1.0"; }
       { name = "pause"; range = "0.0.1"; }
+      { name = "uid2"; range = "0.0.2"; }
       { name = "debug"; range = "*"; }
     ];
   }
@@ -507,13 +509,13 @@
   }
   {
     baseName = "express";
-    version = "3.2.6";
+    version = "3.3.1";
     fullName = "express-*";
-    hash = "a0c9ee92fe1366daf166f30ae77f824aa65c2f5e121596fa2c4f439b518cde99";
+    hash = "8ca5ce06324343402e5186263c2dca3a28f055093bc6e7bd7270ce4a7356ae8b";
     patchLatest = false;
     topLevel = true;
     dependencies = [
-      { name = "connect"; range = "2.7.11"; }
+      { name = "connect"; range = "2.8.1"; }
       { name = "commander"; range = "0.6.1"; }
       { name = "range-parser"; range = "0.0.4"; }
       { name = "mkdirp"; range = "0.3.4"; }
@@ -521,7 +523,7 @@
       { name = "buffer-crc32"; range = "0.2.1"; }
       { name = "fresh"; range = "0.1.0"; }
       { name = "methods"; range = "0.0.1"; }
-      { name = "send"; range = "0.1.0"; }
+      { name = "send"; range = "0.1.1"; }
       { name = "cookie-signature"; range = "1.0.1"; }
       { name = "debug"; range = "*"; }
     ];
@@ -699,9 +701,9 @@
   }
   {
     baseName = "graceful-fs";
-    version = "1.2.1";
+    version = "1.2.2";
     fullName = "graceful-fs-1";
-    hash = "eeef3c36c6a6476059a7e7a32d0b87e62133b11392c540f5c8c68c87f65c7c59";
+    hash = "a23fe552c6b0a221fc961e1ef0ed567e081ad948f4fcac6be660fa6741c0dbd6";
     patchLatest = false;
     topLevel = false;
     dependencies = [
@@ -709,9 +711,9 @@
   }
   {
     baseName = "graceful-fs";
-    version = "1.2.1";
+    version = "1.2.2";
     fullName = "graceful-fs-~1";
-    hash = "eeef3c36c6a6476059a7e7a32d0b87e62133b11392c540f5c8c68c87f65c7c59";
+    hash = "a23fe552c6b0a221fc961e1ef0ed567e081ad948f4fcac6be660fa6741c0dbd6";
     patchLatest = false;
     topLevel = false;
     dependencies = [
@@ -719,9 +721,9 @@
   }
   {
     baseName = "graceful-fs";
-    version = "1.2.1";
+    version = "1.2.2";
     fullName = "graceful-fs-~1.2.0";
-    hash = "eeef3c36c6a6476059a7e7a32d0b87e62133b11392c540f5c8c68c87f65c7c59";
+    hash = "a23fe552c6b0a221fc961e1ef0ed567e081ad948f4fcac6be660fa6741c0dbd6";
     patchLatest = false;
     topLevel = false;
     dependencies = [
@@ -896,9 +898,9 @@
   }
   {
     baseName = "jshint";
-    version = "2.1.3";
+    version = "2.1.4";
     fullName = "jshint-*";
-    hash = "aaad18f3e6ec6e118d2990d8e627f62125c34ed28f864c9f3b6c46d4cf5d3288";
+    hash = "ff5afb38e1e82801b670a18033dc29a903fe883ca6073459360178871f8d71db";
     patchLatest = false;
     topLevel = true;
     dependencies = [
@@ -1026,16 +1028,6 @@
     dependencies = [
     ];
   }
-  {
-    baseName = "mime";
-    version = "1.2.6";
-    fullName = "mime-1.2.6";
-    hash = "7460134d6b4686d64fd1e7b878d34e2bdd258ad29b6665cf62e6d92659e81591";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
   {
     baseName = "mime";
     version = "1.2.9";
@@ -1102,6 +1094,16 @@
       { name = "sigmund"; range = "~1.0.0"; }
     ];
   }
+  {
+    baseName = "minimist";
+    version = "0.0.1";
+    fullName = "minimist-~0.0.1";
+    hash = "4afcfc7d9ed3d2ff113bf93d777507e2ff7ddfef7ed282e4573ab5dd8422b0d3";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "mkdirp";
     version = "0.3.5";
@@ -1142,16 +1144,6 @@
     dependencies = [
     ];
   }
-  {
-    baseName = "mkdirp";
-    version = "0.3.3";
-    fullName = "mkdirp-0.3.3";
-    hash = "b67a12855b7522c3cfb767e36b95f4eaaf9d423c5bd01f7f0449172259957df9";
-    patchLatest = false;
-    topLevel = false;
-    dependencies = [
-    ];
-  }
   {
     baseName = "mkdirp";
     version = "0.3.4";
@@ -1162,11 +1154,21 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "mkdirp";
+    version = "0.3.5";
+    fullName = "mkdirp-0.3.5";
+    hash = "8ae9c5107acb41110106224f5e7be2b50b00d15d062ea7941301c111b863fd26";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "mocha";
-    version = "1.10.0";
+    version = "1.12.0";
     fullName = "mocha-*";
-    hash = "d19c4fdcddb6498d0f303c3e5fd85401888a269f36ccdfcc92763dcc9e80bf97";
+    hash = "657b833347df35fc39cd1fb0e420f2713db57c4430cbebd10e2f6b37548e4f20";
     patchLatest = false;
     topLevel = true;
     dependencies = [
@@ -1175,7 +1177,7 @@
       { name = "jade"; range = "0.26.3"; }
       { name = "diff"; range = "1.0.2"; }
       { name = "debug"; range = "*"; }
-      { name = "mkdirp"; range = "0.3.3"; }
+      { name = "mkdirp"; range = "0.3.5"; }
       { name = "ms"; range = "0.3.0"; }
       { name = "glob"; range = "3.2.1"; }
     ];
@@ -1233,9 +1235,9 @@
   }
   {
     baseName = "node-gyp";
-    version = "0.10.0";
+    version = "0.10.4";
     fullName = "node-gyp-*";
-    hash = "9edecaa701601f07b15da7bd6e9de4fae98ef1acdd5a1fc6cc144451a68773dd";
+    hash = "b8bd44e4f5143fff5c22d5961982ae1504467dff17624be4525728c0500fd3a4";
     patchLatest = false;
     topLevel = true;
     dependencies = [
@@ -1249,7 +1251,7 @@
       { name = "osenv"; range = "0"; }
       { name = "request"; range = "2"; }
       { name = "rimraf"; range = "2"; }
-      { name = "semver"; range = "1"; }
+      { name = "semver"; range = "~2.0.7"; }
       { name = "tar"; range = "0"; }
       { name = "which"; range = "1"; }
     ];
@@ -1339,9 +1341,9 @@
   }
   {
     baseName = "npmlog";
-    version = "0.0.2";
+    version = "0.0.3";
     fullName = "npmlog-0";
-    hash = "ce98d4d3380390c0259695cce407e2e96d2970c5caee1461a62ecbd38e8caed4";
+    hash = "3214a04d9a54c588d2585b657c7068f9561dba34dd2323c4ac7ec98e69e3e9cd";
     patchLatest = false;
     topLevel = false;
     dependencies = [
@@ -1370,13 +1372,14 @@
   }
   {
     baseName = "optimist";
-    version = "0.5.2";
+    version = "0.6.0";
     fullName = "optimist-*";
-    hash = "838ad97b81beedb85fd0f0c4cd4740a940ddefb9a3db8e261f5fed7528693d3d";
+    hash = "a75df1152906f1b66583c957cbffba34aaead644547d4a0300b713281279d4cf";
     patchLatest = false;
     topLevel = true;
     dependencies = [
       { name = "wordwrap"; range = "~0.0.2"; }
+      { name = "minimist"; range = "~0.0.1"; }
     ];
   }
   {
@@ -1562,8 +1565,19 @@
   }
   {
     baseName = "rimraf";
-    version = "2.1.4";
+    version = "2.2.0";
     fullName = "rimraf-2";
+    hash = "4d250a91e5da8f0e839647149268d3682c868a65e920477ff5baae26591ebeb2";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "graceful-fs"; range = "~1"; }
+    ];
+  }
+  {
+    baseName = "rimraf";
+    version = "2.1.4";
+    fullName = "rimraf-~2.1.4";
     hash = "093154365aab3c09aea8e83dda7c5a7fd785c787ebbf1fcdc415cb5f74d1acac";
     patchLatest = false;
     topLevel = false;
@@ -1586,9 +1600,9 @@
   }
   {
     baseName = "sax";
-    version = "0.5.2";
-    fullName = "sax-0.5.2";
-    hash = "6bb7cd44e9dfea598997d4ba9d3279dafe75bed7b45904561ca9eb4d85cfd953";
+    version = "0.5.4";
+    fullName = "sax-0.5.x";
+    hash = "5c4f074b559f56a7170663142e4ccbcf8cbef229ad7eb787b6c6e0b79ddb936a";
     patchLatest = false;
     topLevel = false;
     dependencies = [
@@ -1606,9 +1620,9 @@
   }
   {
     baseName = "semver";
-    version = "1.1.4";
+    version = "2.0.8";
     fullName = "semver-*";
-    hash = "59c0180521d0d4cee57caa5f6ef190500b04099bfa5786edb3e21e364ae8e989";
+    hash = "7eefaea9185bc43025725a55179425f04abc80c33f9d90b10385e0bf54710876";
     patchLatest = false;
     topLevel = true;
     dependencies = [
@@ -1635,17 +1649,13 @@
     ];
   }
   {
-    baseName = "send";
-    version = "0.1.0";
-    fullName = "send-0.1.0";
-    hash = "28b5a6ec41b5072521eb792cc901b92cdbb6b743c578d7008727dbbd3eb717de";
+    baseName = "semver";
+    version = "2.0.8";
+    fullName = "semver-~2.0.7";
+    hash = "7eefaea9185bc43025725a55179425f04abc80c33f9d90b10385e0bf54710876";
     patchLatest = false;
     topLevel = false;
     dependencies = [
-      { name = "debug"; range = "*"; }
-      { name = "mime"; range = "1.2.6"; }
-      { name = "fresh"; range = "0.1.0"; }
-      { name = "range-parser"; range = "0.0.4"; }
     ];
   }
   {
@@ -1739,9 +1749,9 @@
   }
   {
     baseName = "source-map";
-    version = "0.1.22";
+    version = "0.1.25";
     fullName = "source-map-*";
-    hash = "6ebe1b2b3c730e5e206a34a25192aa43307b84dfe3aaaafd71c5c6b6a02a4700";
+    hash = "3ef1ff114aa3504871ad8b16a38ac744b293c6d8f37b0b6e673b44592a08626d";
     patchLatest = false;
     topLevel = true;
     dependencies = [
@@ -1807,12 +1817,13 @@
   }
   {
     baseName = "temp";
-    version = "0.5.0";
+    version = "0.5.1";
     fullName = "temp-*";
-    hash = "082285c060c7519b9d8a6dbc1a51e3caa7de43a807d3f7cec4eab220ad1207be";
+    hash = "04bb3c0bde8f3ffab53bc4935b5c1ca306735e4da8844c1dc25e74b0ae8f6540";
     patchLatest = false;
     topLevel = true;
     dependencies = [
+      { name = "rimraf"; range = "~2.1.4"; }
     ];
   }
   {
@@ -1825,6 +1836,16 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "uid2";
+    version = "0.0.2";
+    fullName = "uid2-0.0.2";
+    hash = "8a3b12223830ed536ce022271a4059cedfbb21d0f63149742347c4f7fc0ed442";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "underscore";
     version = "1.4.4";
@@ -1974,13 +1995,13 @@
   }
   {
     baseName = "xml2js";
-    version = "0.2.7";
+    version = "0.2.8";
     fullName = "xml2js-0.2.x";
-    hash = "ab3ae8402a8af36d93e1aa6e83102e365b82f03e605d1b8b8361dacc95e52397";
+    hash = "faa75fc23ae6346002555df236250c3612cf76dfac104aff131a5ab5de49b8de";
     patchLatest = false;
     topLevel = false;
     dependencies = [
-      { name = "sax"; range = "0.5.2"; }
+      { name = "sax"; range = "0.5.x"; }
     ];
   }
   {

From 47aafb73f877630e279673163d0eb046685a112f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 2 Jul 2013 18:55:45 -0400
Subject: [PATCH 227/314] Add stream-splitter-transform nodePackage

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/top-level/node-packages-generated.nix | 21 +++++++++++++++++++++
 pkgs/top-level/node-packages.json          |  1 +
 2 files changed, 22 insertions(+)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 0d83b2b4f58..1c4581256dd 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -210,6 +210,16 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "buffertools";
+    version = "1.1.1";
+    fullName = "buffertools->=1.1.1 <2.0.0";
+    hash = "f5962aec81246077a46ee075072d40fa533c31ada7a0ec18e1ff3600af2d8f3f";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "bunyan";
     version = "0.21.1";
@@ -1791,6 +1801,17 @@
       { name = "readable-stream"; range = "~1.0.2"; }
     ];
   }
+  {
+    baseName = "stream-splitter-transform";
+    version = "0.0.3";
+    fullName = "stream-splitter-transform-*";
+    hash = "613ca5994f2fe645cbb21dcac24f034ed8546d6cc49097d8ee0b4501e6d9a887";
+    patchLatest = false;
+    topLevel = true;
+    dependencies = [
+      { name = "buffertools"; range = ">=1.1.1 <2.0.0"; }
+    ];
+  }
   {
     baseName = "swig";
     version = "0.14.0";
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index 8116f769654..2d941fd1411 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -35,4 +35,5 @@
 , "ansi-remover"
 , "mkdirp"
 , "jshint"
+, "stream-splitter-transform"
 ]

From a42133a102a6c00d98de985b1d3073eed173c8aa Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Thu, 4 Jul 2013 00:21:46 +1000
Subject: [PATCH 228/314] gnome.GConf: fix build on darwin

* disable polkit
* add --enable-static to configureFlags
---
 pkgs/desktops/gnome-2/platform/GConf/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix
index 4769247a516..847983e2c49 100644
--- a/pkgs/desktops/gnome-2/platform/GConf/default.nix
+++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix
@@ -9,10 +9,16 @@ stdenv.mkDerivation {
     sha256 = "09ch709cb9fniwc4221xgkq0jf0x0lxs814sqig8p2dcll0llvzk";
   };
 
-  buildInputs = [ ORBit2 dbus_libs dbus_glib libxml2 polkit gtk ];
+  buildInputs = [ ORBit2 dbus_libs dbus_glib libxml2 gtk ]
+    # polkit requires pam, which requires shadow.h, which is not available on
+    # darwin
+    ++ stdenv.lib.optional (!stdenv.isDarwin) polkit;
+
   propagatedBuildInputs = [ glib ];
 
   nativeBuildInputs = [ pkgconfig intltool ];
 
-  configureFlags = "--with-gtk=2.0";
+  configureFlags = [ "--with-gtk=2.0" ]
+    # fixes the "libgconfbackend-oldxml.so is not portable" error on darwin
+    ++ stdenv.lib.optional stdenv.isDarwin [ "--enable-static" ];
 }

From 3e14bb6fdf3e079e58e8b3556a7cf751a79e8835 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Thu, 4 Jul 2013 00:25:53 +1000
Subject: [PATCH 229/314] gst-plugins-base: fix build on darwin

* remove alsaLib and cdparanoia from build inputs
* add cairo to build inputs
---
 .../gstreamer/gst-plugins-base/default.nix    | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
index 2ac325dc282..e29be91c34b 100644
--- a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
@@ -1,7 +1,5 @@
-{ fetchurl, stdenv, pkgconfig, python, gstreamer
-, xlibs, alsaLib, cdparanoia, libogg
-, libtheora, libvorbis, freetype, pango
-, liboil, glib
+{ fetchurl, stdenv, pkgconfig, python, gstreamer, xlibs, alsaLib, cdparanoia
+, libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo
 , # Whether to build no plugins that have external dependencies
   # (except the ALSA plugin).
   minimalDeps ? false
@@ -25,22 +23,25 @@ stdenv.mkDerivation rec {
 
   # TODO : v4l, libvisual
   buildInputs =
-    [ pkgconfig glib alsaLib ]
+    [ pkgconfig glib cairo ]
+    # can't build alsaLib on darwin
+    ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib
     ++ stdenv.lib.optionals (!minimalDeps)
-      [ xlibs.xlibs xlibs.libXv cdparanoia libogg libtheora libvorbis
-        freetype pango liboil
-      ];
+      [ xlibs.xlibs xlibs.libXv libogg libtheora libvorbis freetype pango
+        liboil ]
+    # can't build cdparanoia on darwin
+    ++ stdenv.lib.optional (!minimalDeps && !stdenv.isDarwin) cdparanoia;
 
   propagatedBuildInputs = [ gstreamer ];
  
   postInstall = "rm -rf $out/share/gtk-doc";
   
-  meta = {
-    homepage = http://gstreamer.freedesktop.org;
-
+  meta = with stdenv.lib; {
+    homepage    = http://gstreamer.freedesktop.org;
     description = "Base plug-ins for GStreamer";
-
-    license = "LGPLv2+";
+    license     = licences.lgpl2Plus;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.unix;
   };
 }
 

From d8f8d052c585fbcae5a2cc418428721cdc34e81e Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Wed, 3 Jul 2013 16:24:06 +0200
Subject: [PATCH 230/314] fixes two issues via patches to get knetwork
 compiling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

kopete-4.10.4-kopete-linphonemediaengine.patch
----------------------------------------------
patch copied from here:
  https://bugs.kde.org/show_bug.cgi?id=318825

kopete-4.10.4-kopete-stun.patch
-------------------------------
  when compiling kopete/protocols/jabber/googletalk/libjingle/talk/session/phone/channelmanager.cc
  it would produce this error:

  kopete/protocols/jabber/googletalk/libjingle/talk/p2p/base/stunrequest.h:91:9: error: ‘StunMessageType’ does not name a type

  problem:
    this is cased by a cyclic use of stun.h, stunrequest.h and channelmanager.cc with the outcome,
    that kdenetwork couldn't be compiled since kopete fails to build.

  solution:
    move the StunMessageType enum into its own #ifndef
---
 ...te-4.10.4-kopete-linphonemediaengine.patch | 22 +++++++++
 .../kopete-4.10.4-kopete-stun.patch           | 47 +++++++++++++++++++
 pkgs/desktops/kde-4.10/kdenetwork/kopete.nix  |  2 +
 3 files changed, 71 insertions(+)
 create mode 100644 pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-linphonemediaengine.patch
 create mode 100644 pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-stun.patch

diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-linphonemediaengine.patch b/pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-linphonemediaengine.patch
new file mode 100644
index 00000000000..ec003732344
--- /dev/null
+++ b/pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-linphonemediaengine.patch
@@ -0,0 +1,22 @@
+diff --git a/kopete/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc b/kopete/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
+index 88fdbd1..57c6c05 100644
+--- a/kopete/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
++++ b/kopete/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
+@@ -200,7 +200,7 @@ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector<AudioCodec>& codecs)
+       LOG(LS_INFO) << "Using " << i->name << "/" << i->clockrate;
+       pt_ = i->id;
+       audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, i->id, 250, 0); /* -1 means that function will choose some free port */
+-      port2 = rtp_session_get_local_port(audio_stream_->session);
++      port2 = rtp_session_get_local_port(audio_stream_->ms.session);
+       first = false;
+     }
+   }
+@@ -211,7 +211,7 @@ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector<AudioCodec>& codecs)
+     // working with a buggy client; let's try PCMU.
+     LOG(LS_WARNING) << "Received empty list of codces; using PCMU/8000";
+     audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, 0, 250, 0); /* -1 means that function will choose some free port */
+-    port2 = rtp_session_get_local_port(audio_stream_->session);
++    port2 = rtp_session_get_local_port(audio_stream_->ms.session);
+   }
+ 
+   return true;
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-stun.patch b/pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-stun.patch
new file mode 100644
index 00000000000..d6aa9515b76
--- /dev/null
+++ b/pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-stun.patch
@@ -0,0 +1,47 @@
+diff --git a/kopete/protocols/jabber/googletalk/libjingle/talk/p2p/base/stun.h b/kopete/protocols/jabber/googletalk/libjingle/talk/p2p/base/stun.h
+--- a/kopete/protocols/jabber/googletalk/libjingle/talk/p2p/base/stun.h
++++ b/kopete/protocols/jabber/googletalk/libjingle/talk/p2p/base/stun.h
+@@ -25,16 +25,8 @@
+  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+-#ifndef __STUN_H__
+-#define __STUN_H__
+-
+-// This file contains classes for dealing with the STUN and TURN protocols.
+-// Both protocols use the same wire format.
+-
+-#include "talk/base/basictypes.h"
+-#include "talk/base/bytebuffer.h"
+-#include <string>
+-#include <vector>
++#ifndef STUN__HH__IN__STUNREQUEST_CYCLIC_PROBLEM_FIX
++#define STUN__HH__IN__STUNREQUEST_CYCLIC_PROBLEM_FIX
+ 
+ namespace cricket {
+ 
+@@ -55,6 +47,23 @@
+   STUN_DATA_INDICATION              = 0x0115
+ };
+ 
++}
++
++#endif // STUN__HH__IN__STUNREQUEST_CYCLIC_PROBLEM_FIX
++
++#ifndef __STUN_H__
++#define __STUN_H__
++
++// This file contains classes for dealing with the STUN and TURN protocols.
++// Both protocols use the same wire format.
++
++#include "talk/base/basictypes.h"
++#include "talk/base/bytebuffer.h"
++#include <string>
++#include <vector>
++
++namespace cricket {
++
+ // These are the types of attributes defined in STUN & TURN.  Next to each is
+ // the name of the class (T is StunTAttribute) that implements that type.
+ enum StunAttributeType {
+
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix
index 3907b67c42a..7139c62981c 100644
--- a/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix
+++ b/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix
@@ -18,6 +18,8 @@ kde {
   patchPhase =
     ''
       cp -v ${./FindmsiLBC.cmake} kopete/cmake/modules/FindmsiLBC.cmake
+      patch -p1 < ${./kopete-4.10.4-kopete-linphonemediaengine.patch}
+      patch -p1 < ${./kopete-4.10.4-kopete-stun.patch}
     '';
 
   cmakeFlags = [ "-DBUILD_skypebuttons=TRUE" ];

From 074acec50bf58c4fed0fd5fe8ebeb1a341271e23 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 3 Jul 2013 16:35:13 +0200
Subject: [PATCH 231/314] Doh

---
 pkgs/lib/licenses.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix
index f6c1fddfd14..0dcdff0bee4 100644
--- a/pkgs/lib/licenses.nix
+++ b/pkgs/lib/licenses.nix
@@ -4,7 +4,8 @@
    * add it to this list. The URL mentioned above is a good source for inspiration.
    */
 
-  agpl3 = "AGPLv3";
+  agpl3 = {
+    shortName = "AGPLv3";
     fullName = "GNU Affero General Public License version 3 only";
     url = https://www.gnu.org/licenses/agpl.html;
   };

From 5bb91ac679f13191162c1defacbe8c3927c6c43a Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Wed, 3 Jul 2013 17:28:49 +0200
Subject: [PATCH 232/314] Added nodejs packages for: bcrypt, nconf, winston,
 jade, view-helpers, mongoose, passport, gzippo, walk, forever, kue, supertest
 and should

---
 pkgs/top-level/node-packages-generated.nix | 1738 ++++++++++++++++++++
 pkgs/top-level/node-packages.json          |   18 +
 2 files changed, 1756 insertions(+)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 1c4581256dd..ec40cc2cb5c 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -49,6 +49,17 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "apparatus";
+    version = "0.0.7";
+    fullName = "apparatus->= 0.0.4";
+    hash = "77ce711505bf1c65222b5dd01e055284b25cf52ee3229fcae7fcfa3e5664826c";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "sylvester"; range = ">= 0.0.8"; }
+    ];
+  }
   {
     baseName = "asn1";
     version = "0.1.11";
@@ -90,6 +101,36 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "async";
+    version = "0.1.22";
+    fullName = "async-0.1.x";
+    hash = "6fd2750cd519a754b0e32ef3423e64768055129e00a95d9297005bda29fdef18";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "async";
+    version = "0.2.9";
+    fullName = "async-0.2.x";
+    hash = "7215c94b63ccaa543b4b75c5dd9b820fd4839e1f9616b08a0334a8ac74939c53";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "async";
+    version = "0.2.9";
+    fullName = "async-~0.2.6";
+    hash = "7215c94b63ccaa543b4b75c5dd9b820fd4839e1f9616b08a0334a8ac74939c53";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "async";
     version = "0.2.9";
@@ -124,6 +165,16 @@
       { name = "xmlbuilder"; range = "*"; }
     ];
   }
+  {
+    baseName = "aws-sign";
+    version = "0.2.0";
+    fullName = "aws-sign-~0.2.0";
+    hash = "145962c6b9b4fe70f587fa745157522c2c6dac4c22bb6fdf3f6cb297f723647e";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "aws-sign";
     version = "0.3.0";
@@ -155,6 +206,37 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "bcrypt";
+    version = "0.7.6";
+    fullName = "bcrypt-*";
+    hash = "e7964429b2bc8aea9b9fb66b914cb3a7952a77029ae13a5a4c4cdbf837d40b2a";
+    patchLatest = false;
+    topLevel = true;
+    dependencies = [
+      { name = "bindings"; range = "1.0.0"; }
+    ];
+  }
+  {
+    baseName = "bindings";
+    version = "1.1.0";
+    fullName = "bindings-*";
+    hash = "9ce864c7ce347eb3f8728fc03bc5a01f5e6195b145e6b9674eb2b98c5c715865";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "bindings";
+    version = "1.0.0";
+    fullName = "bindings-1.0.0";
+    hash = "cb211ac856d135af5ee864762fae9e554225a613ea1fd815c20b8fdd1679c9ed";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "block-stream";
     version = "0.0.6";
@@ -166,6 +248,17 @@
       { name = "inherits"; range = "~1.0.0"; }
     ];
   }
+  {
+    baseName = "boom";
+    version = "0.3.8";
+    fullName = "boom-0.3.x";
+    hash = "0ea9787bd5c5df98a06a2c7b629d4768c712611032d9af162332e825f9131d8a";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "hoek"; range = "0.7.x"; }
+    ];
+  }
   {
     baseName = "boom";
     version = "0.4.2";
@@ -177,6 +270,36 @@
       { name = "hoek"; range = "0.9.x"; }
     ];
   }
+  {
+    baseName = "broadway";
+    version = "0.2.7";
+    fullName = "broadway-0.2.7";
+    hash = "b1ceb289fb1a6de82cddab0851fc905bb60e75167d0e37f32147f8985fa8d368";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "cliff"; range = "0.1.8"; }
+      { name = "eventemitter2"; range = "0.4.11"; }
+      { name = "nconf"; range = "0.6.7"; }
+      { name = "winston"; range = "0.6.2"; }
+      { name = "utile"; range = "0.1.7"; }
+    ];
+  }
+  {
+    baseName = "broadway";
+    version = "0.2.7";
+    fullName = "broadway-0.2.x";
+    hash = "b1ceb289fb1a6de82cddab0851fc905bb60e75167d0e37f32147f8985fa8d368";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "cliff"; range = "0.1.8"; }
+      { name = "eventemitter2"; range = "0.4.11"; }
+      { name = "nconf"; range = "0.6.7"; }
+      { name = "winston"; range = "0.6.2"; }
+      { name = "utile"; range = "0.1.7"; }
+    ];
+  }
   {
     baseName = "browserchannel";
     version = "1.0.4";
@@ -190,6 +313,36 @@
       { name = "request"; range = "~2"; }
     ];
   }
+  {
+    baseName = "bson";
+    version = "0.1.8";
+    fullName = "bson-0.1.8";
+    hash = "a9cbdee757f213b93aca860fc06143b1f9e9a983130616732beab452681bae17";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "bson";
+    version = "0.1.9";
+    fullName = "bson-0.1.9";
+    hash = "8bb768566c4e8063883d07d2c7965ce8e5380892fd5e34448729c7f44c5f42c8";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "buffer-crc32";
+    version = "0.1.1";
+    fullName = "buffer-crc32-0.1.1";
+    hash = "9e35b724e4e1fd7112e97a6856e7d52b2644761c184f1ed391f6a576fbbb80e1";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "buffer-crc32";
     version = "0.2.1";
@@ -200,6 +353,16 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "buffer-crc32";
+    version = "0.2.1";
+    fullName = "buffer-crc32-~0.2.1";
+    hash = "b6ea96d57411e37c15e18fb8ca600656399912ce16355f9af3c662f765507f01";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "buffertools";
     version = "1.1.1";
@@ -242,6 +405,16 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "character-parser";
+    version = "1.0.2";
+    fullName = "character-parser-1.0.2";
+    hash = "751edecb1143ea951e9cef5c7e1ac71526c712cfab538d09cbb2e90e56d76865";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "cli";
     version = "0.4.4-2";
@@ -253,6 +426,19 @@
       { name = "glob"; range = ">= 3.1.4"; }
     ];
   }
+  {
+    baseName = "cliff";
+    version = "0.1.8";
+    fullName = "cliff-0.1.8";
+    hash = "702f7ce79168e38b982eb3141485bd99e3a6480dac42f579365dc522c3950588";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "colors"; range = "0.x.x"; }
+      { name = "eyes"; range = "0.1.x"; }
+      { name = "winston"; range = "0.6.x"; }
+    ];
+  }
   {
     baseName = "clone";
     version = "0.1.5";
@@ -283,6 +469,36 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "colors";
+    version = "0.6.0-1";
+    fullName = "colors-0.6.0-1";
+    hash = "ca97f462664d77f5ae813029d020d4610ec9fd3f9eef3875e551d3665be7ab7d";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "colors";
+    version = "0.6.0-1";
+    fullName = "colors-0.6.x";
+    hash = "ca97f462664d77f5ae813029d020d4610ec9fd3f9eef3875e551d3665be7ab7d";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "colors";
+    version = "0.6.0-1";
+    fullName = "colors-0.x.x";
+    hash = "ca97f462664d77f5ae813029d020d4610ec9fd3f9eef3875e551d3665be7ab7d";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "combined-stream";
     version = "0.0.4";
@@ -314,6 +530,37 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "commander";
+    version = "1.2.0";
+    fullName = "commander-1.2.0";
+    hash = "caeda1cecf7c1b5bf505cdf8d34b984db6ebb307af3798f4af2efdb554d31a4b";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "keypress"; range = "0.1.x"; }
+    ];
+  }
+  {
+    baseName = "connect";
+    version = "2.7.5";
+    fullName = "connect-2.7.5";
+    hash = "0c36efa44c6fee030b617a57e52c23f92e7e3949ed01405ee0cb9804403d137f";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "qs"; range = "0.5.1"; }
+      { name = "formidable"; range = "1.0.11"; }
+      { name = "cookie-signature"; range = "1.0.0"; }
+      { name = "buffer-crc32"; range = "0.1.1"; }
+      { name = "cookie"; range = "0.0.5"; }
+      { name = "send"; range = "0.1.0"; }
+      { name = "bytes"; range = "0.2.0"; }
+      { name = "fresh"; range = "0.1.0"; }
+      { name = "pause"; range = "0.0.1"; }
+      { name = "debug"; range = "*"; }
+    ];
+  }
   {
     baseName = "connect";
     version = "2.8.1";
@@ -335,6 +582,27 @@
       { name = "debug"; range = "*"; }
     ];
   }
+  {
+    baseName = "connect-flash";
+    version = "0.1.1";
+    fullName = "connect-flash-*";
+    hash = "3a0a9ac9d73695abcf67a88cb1bc433cc67c55aeca3b515eb922453c7ba0c393";
+    patchLatest = false;
+    topLevel = true;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "connect-mongo";
+    version = "0.3.2";
+    fullName = "connect-mongo-*";
+    hash = "1f37b52d7816769f33dfa94fad0323f8685139a3a01d738b7a29531f172f86b6";
+    patchLatest = false;
+    topLevel = true;
+    dependencies = [
+      { name = "mongodb"; range = "1.2.x"; }
+    ];
+  }
   {
     baseName = "connect";
     version = "2.8.1";
@@ -366,6 +634,17 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "constantinople";
+    version = "1.0.1";
+    fullName = "constantinople-~1.0.1";
+    hash = "3740bec1b48ee60653c946ab295fecefb9c08b47e1a495330757b415c7cd402f";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "uglify-js"; range = "~2.3.6"; }
+    ];
+  }
   {
     baseName = "cookie";
     version = "0.0.5";
@@ -386,6 +665,16 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "cookie-jar";
+    version = "0.2.0";
+    fullName = "cookie-jar-~0.2.0";
+    hash = "eeb643c638f828e39dfc9f44ad8d8e5376930868fdcaf3818ff316806e65af6d";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "cookie-jar";
     version = "0.3.0";
@@ -396,6 +685,16 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "cookie-signature";
+    version = "1.0.0";
+    fullName = "cookie-signature-1.0.0";
+    hash = "990a69fb94e6504390dd0fe935b9fe380f925e1a8360e200e97baa908fca86c6";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "cookie-signature";
     version = "1.0.1";
@@ -406,6 +705,27 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "cookiejar";
+    version = "1.3.0";
+    fullName = "cookiejar-1.3.0";
+    hash = "3bf00caf0e2f9dcd03c7175dcf6c5d700fa6d6f6f7ed77875b986e3c1a606ba7";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "cryptiles";
+    version = "0.1.3";
+    fullName = "cryptiles-0.1.x";
+    hash = "bac017be67d2b33c01a9b625726b3f8e1e1786711f3132a3cc6f85779ee1d103";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "boom"; range = "0.3.x"; }
+    ];
+  }
   {
     baseName = "cryptiles";
     version = "0.2.1";
@@ -417,6 +737,48 @@
       { name = "boom"; range = "0.4.x"; }
     ];
   }
+  {
+    baseName = "css-parse";
+    version = "1.0.4";
+    fullName = "css-parse-1.0.4";
+    hash = "3d7dcc526083cc1dc584d10c179100a199a82e93991c8bdc92b96ee4bfb7ccac";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "css-stringify";
+    version = "1.0.5";
+    fullName = "css-stringify-1.0.5";
+    hash = "ef45a473b200f24e4cb2f0a97da70b629261ae8a54482e49e1eabc3e4cc36c0e";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "css";
+    version = "1.0.8";
+    fullName = "css-~1.0.8";
+    hash = "535bcca2a3635e315a5add3536d2b97fe5636bbee5d039e4fadd8cd422912b8b";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "css-parse"; range = "1.0.4"; }
+      { name = "css-stringify"; range = "1.0.5"; }
+    ];
+  }
+  {
+    baseName = "cssom";
+    version = "0.2.5";
+    fullName = "cssom-0.2.x";
+    hash = "22594077e4241c81038cdaac23fcb5ed7f8329a1dc5645286fa55db45c8ac13b";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "ctype";
     version = "0.5.0";
@@ -437,6 +799,16 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "cycle";
+    version = "1.0.2";
+    fullName = "cycle-1.0.x";
+    hash = "ee5dd9af8f0a59624bb32bb6a6f67c13710e180112dba5a578f3d427a3268748";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "debug";
     version = "0.7.2";
@@ -457,6 +829,26 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "debug";
+    version = "0.7.2";
+    fullName = "debug-~0.7.2";
+    hash = "f9142856b1c2652a11e50f2aca068edbad7598f50d9e6d003b8ee85b2a333d63";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "deep-equal";
+    version = "0.0.0";
+    fullName = "deep-equal-*";
+    hash = "6a5666d4bfa5d2786a9f86ede2eaa8252f783edb9d78e69cba645f7cb6e153b8";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "deep-equal";
     version = "0.0.0";
@@ -487,6 +879,16 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "director";
+    version = "1.1.10";
+    fullName = "director-1.1.10";
+    hash = "292c96d0d5bf8276a498595c576a6cfc832247703f2b75f09ad37c19caa5fca6";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "dtrace-provider";
     version = "0.2.8";
@@ -497,6 +899,16 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "emitter-component";
+    version = "1.0.0";
+    fullName = "emitter-component-1.0.0";
+    hash = "1ffc29fc11b2e4ccbac6064443e65a606a21d826e313886932596bf11784dcdb";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "escape-html";
     version = "1.0.0";
@@ -507,6 +919,37 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "event-stream";
+    version = "0.5.3";
+    fullName = "event-stream-~0.5";
+    hash = "988f4ee3e8f86d6f5f267b56de88bf733e05fe6f1adc0e135090c308822e9e86";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "optimist"; range = "0.2"; }
+    ];
+  }
+  {
+    baseName = "eventemitter2";
+    version = "0.4.11";
+    fullName = "eventemitter2-0.4.11";
+    hash = "2825d48a2313f703dfb6829e8a3bc89fe6442272b7dbec9d9c51e4794da81a83";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "eventemitter2";
+    version = "0.4.12";
+    fullName = "eventemitter2-~0.4.11";
+    hash = "466b3aa03fe384b46c8384ec7cc42248117a70e9b48c0e20706889b97edcdeac";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "events.node";
     version = "0.4.9";
@@ -538,6 +981,27 @@
       { name = "debug"; range = "*"; }
     ];
   }
+  {
+    baseName = "express";
+    version = "3.1.2";
+    fullName = "express-~3.1.1";
+    hash = "d72eb1b799ddfe78afc369168881bfef866213baf5cd47a56902fd732dbbd2b6";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "connect"; range = "2.7.5"; }
+      { name = "commander"; range = "0.6.1"; }
+      { name = "range-parser"; range = "0.0.4"; }
+      { name = "mkdirp"; range = "~0.3.4"; }
+      { name = "cookie"; range = "0.0.5"; }
+      { name = "buffer-crc32"; range = "~0.2.1"; }
+      { name = "fresh"; range = "0.1.0"; }
+      { name = "methods"; range = "0.0.1"; }
+      { name = "send"; range = "0.1.0"; }
+      { name = "cookie-signature"; range = "1.0.0"; }
+      { name = "debug"; range = "*"; }
+    ];
+  }
   {
     baseName = "extend";
     version = "1.1.3";
@@ -568,6 +1032,16 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "eyes";
+    version = "0.1.8";
+    fullName = "eyes-0.1.x";
+    hash = "4fa6db8f2c9926fb39a211c622d7eb3a76efbc4878559f9bd155d647a6963735";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "faye-websocket";
     version = "0.6.0";
@@ -589,6 +1063,64 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "flatiron";
+    version = "0.3.5";
+    fullName = "flatiron-0.3.5";
+    hash = "8f1e074d3f678fe3d4720e27b260f95ee9d69deb2ab3059c6b9854531d8b247f";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "broadway"; range = "0.2.7"; }
+      { name = "optimist"; range = "0.3.5"; }
+      { name = "prompt"; range = "0.2.9"; }
+      { name = "director"; range = "1.1.10"; }
+      { name = "pkginfo"; range = "0.3.0"; }
+    ];
+  }
+  {
+    baseName = "forEachAsync";
+    version = "2.2.0";
+    fullName = "forEachAsync-~2.2";
+    hash = "43367e7aad92f59595f22ad3e586ba2b370fd03b7f55da381503494528693e05";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "sequence"; range = ">= 2.2.1"; }
+    ];
+  }
+  {
+    baseName = "forever";
+    version = "0.10.8";
+    fullName = "forever-*";
+    hash = "858a7405a72d55fea21a3f3396d34ad0cfb35f15dd6ded76e2856b828ff20cae";
+    patchLatest = false;
+    topLevel = true;
+    dependencies = [
+      { name = "colors"; range = "0.6.0-1"; }
+      { name = "cliff"; range = "0.1.8"; }
+      { name = "flatiron"; range = "0.3.5"; }
+      { name = "forever-monitor"; range = "1.2.2"; }
+      { name = "nconf"; range = "0.6.7"; }
+      { name = "nssocket"; range = "~0.5.1"; }
+      { name = "optimist"; range = "0.4.0"; }
+      { name = "pkginfo"; range = "0.3.0"; }
+      { name = "timespan"; range = "2.0.1"; }
+      { name = "watch"; range = "0.7.0"; }
+      { name = "utile"; range = "0.1.7"; }
+      { name = "winston"; range = "0.7.1"; }
+    ];
+  }
+  {
+    baseName = "forever-agent";
+    version = "0.2.0";
+    fullName = "forever-agent-~0.2.0";
+    hash = "d6fac115c60bb3aa6b5b653ea6612e9c1c1d172e08c98251fcfd2d066c1fcda3";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "forever-agent";
     version = "0.5.0";
@@ -599,6 +1131,22 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "forever-monitor";
+    version = "1.2.2";
+    fullName = "forever-monitor-1.2.2";
+    hash = "ff2f10f179ec6003278a250f76dd53ebaaace37c3c2409478b7b36ecee650a0c";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "broadway"; range = "0.2.x"; }
+      { name = "minimatch"; range = "0.0.x"; }
+      { name = "pkginfo"; range = "0.x.x"; }
+      { name = "ps-tree"; range = "0.0.x"; }
+      { name = "watch"; range = "0.5.x"; }
+      { name = "utile"; range = "0.1.x"; }
+    ];
+  }
   {
     baseName = "form-data";
     version = "0.0.8";
@@ -612,6 +1160,29 @@
       { name = "async"; range = "~0.2.7"; }
     ];
   }
+  {
+    baseName = "form-data";
+    version = "0.0.10";
+    fullName = "form-data-~0.0.3";
+    hash = "d49669b81c27dd6c7e359ee9892880c6741dae6c325b617ab3eb5a78bf103822";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "combined-stream"; range = "~0.0.4"; }
+      { name = "mime"; range = "~1.2.2"; }
+      { name = "async"; range = "~0.2.7"; }
+    ];
+  }
+  {
+    baseName = "formidable";
+    version = "1.0.11";
+    fullName = "formidable-1.0.11";
+    hash = "39b345d14d69c27fe262e12f16900cef6be220510788866e0a12c9fedd03766e";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "formidable";
     version = "1.0.13";
@@ -632,6 +1203,16 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "formidable";
+    version = "1.0.9";
+    fullName = "formidable-1.0.9";
+    hash = "3b54deef3897d910d1e6dedd81fa2f4a65b7e93b5dd5cf1c8c098b63260c214c";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "fresh";
     version = "0.1.0";
@@ -749,6 +1330,17 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "gzippo";
+    version = "0.2.0";
+    fullName = "gzippo-*";
+    hash = "844f214312ef8ec2dee4543e6da383728ae081e96961f5ccb6786f0eed8474ab";
+    patchLatest = false;
+    topLevel = true;
+    dependencies = [
+      { name = "send"; range = "*"; }
+    ];
+  }
   {
     baseName = "hat";
     version = "0.0.3";
@@ -759,6 +1351,20 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "hawk";
+    version = "0.10.2";
+    fullName = "hawk-~0.10.2";
+    hash = "a55c7f967a8e01b6307185abc796320b54a9d6126952e41281dca3c1841affb8";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "hoek"; range = "0.7.x"; }
+      { name = "boom"; range = "0.3.x"; }
+      { name = "cryptiles"; range = "0.1.x"; }
+      { name = "sntp"; range = "0.1.x"; }
+    ];
+  }
   {
     baseName = "hawk";
     version = "0.13.1";
@@ -773,6 +1379,27 @@
       { name = "sntp"; range = "0.2.x"; }
     ];
   }
+  {
+    baseName = "hiredis";
+    version = "0.1.15";
+    fullName = "hiredis-*";
+    hash = "621bb738d1ef8335fe2f373d5446a4817a62bf8ab6e956fb6a7aa4932f8ccb08";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "bindings"; range = "*"; }
+    ];
+  }
+  {
+    baseName = "hoek";
+    version = "0.7.6";
+    fullName = "hoek-0.7.x";
+    hash = "135068c73cf7f0db625d95461991db113b9b4a09c6d118a80f4b33d1cad41d9b";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "hoek";
     version = "0.8.5";
@@ -793,6 +1420,16 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "hooks";
+    version = "0.2.1";
+    fullName = "hooks-0.2.1";
+    hash = "65b9c6940a0edc5324e9c7f2422cdf2700436a1d2e9008e2a9f5dcc732cd46bd";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "htdigest";
     version = "1.0.7";
@@ -854,6 +1491,16 @@
       { name = "ctype"; range = "0.5.2"; }
     ];
   }
+  {
+    baseName = "i";
+    version = "0.3.1";
+    fullName = "i-0.3.x";
+    hash = "9dbd68b705366f5bdda60b9cf80149c89255d444649e21cc12556b14fb7ee784";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "inherits";
     version = "1.0.0";
@@ -884,6 +1531,43 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "ini";
+    version = "1.1.0";
+    fullName = "ini-1.x.x";
+    hash = "307ecc5f8664773587a0d74165d1dbdb226754b638542596b7a1e2ed0a578a28";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "is-promise";
+    version = "1.0.0";
+    fullName = "is-promise-~1";
+    hash = "65806ec461b83060a8857d2571c84bd66451db0683969ed3f9180f8a2c1a915f";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "jade";
+    version = "0.32.0";
+    fullName = "jade-*";
+    hash = "25bd8ad332bdf7dba4bcd2bf38b6f5ff49e1a9401668a4c4edf50e1277031e2d";
+    patchLatest = false;
+    topLevel = true;
+    dependencies = [
+      { name = "commander"; range = "1.2.0"; }
+      { name = "mkdirp"; range = "0.3.x"; }
+      { name = "transformers"; range = "2.0.1"; }
+      { name = "character-parser"; range = "1.0.2"; }
+      { name = "monocle"; range = "0.1.48"; }
+      { name = "with"; range = "~1.1.0"; }
+      { name = "constantinople"; range = "~1.0.1"; }
+    ];
+  }
   {
     baseName = "jade";
     version = "0.26.3";
@@ -931,6 +1615,16 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "json-stringify-safe";
+    version = "3.0.0";
+    fullName = "json-stringify-safe-~3.0.0";
+    hash = "77580345a4d3d5db0e530757c86a6bd032b69b31f509f58a8d1232abc14690c0";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "json-stringify-safe";
     version = "4.0.0";
@@ -974,6 +1668,26 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "kerberos";
+    version = "0.0.3";
+    fullName = "kerberos-*";
+    hash = "40300bf5e4ca224127b7e88586dce003c58e59cf4972f699fdc95079135a76fe";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "keypress";
+    version = "0.1.0";
+    fullName = "keypress-0.1.x";
+    hash = "2e43d67e9df19176f874e1a44693f2ea802df77e255d3fc272a0de8124f83be5";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "knox";
     version = "0.8.3";
@@ -988,6 +1702,32 @@
       { name = "stream-counter"; range = "~0.1.0"; }
     ];
   }
+  {
+    baseName = "kue";
+    version = "0.6.2";
+    fullName = "kue-*";
+    hash = "c52cb0ebc11226bff8d1fb8068cc4cc562c3970d1d24c201d8a8ed68847b9115";
+    patchLatest = false;
+    topLevel = true;
+    dependencies = [
+      { name = "redis"; range = "0.7.2"; }
+      { name = "express"; range = "~3.1.1"; }
+      { name = "jade"; range = "0.26.3"; }
+      { name = "stylus"; range = "0.27.2"; }
+      { name = "nib"; range = "0.5.0"; }
+      { name = "reds"; range = "0.1.4"; }
+    ];
+  }
+  {
+    baseName = "lazy";
+    version = "1.0.11";
+    fullName = "lazy-~1.0.11";
+    hash = "05a9685292102599629d3212fbd04102ff71b0cf306cee9773ab1602c75a4ab0";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "lru-cache";
     version = "2.3.0";
@@ -1018,6 +1758,16 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "lru-cache";
+    version = "1.0.6";
+    fullName = "lru-cache-~1.0.2";
+    hash = "f3a419d4989d9db292a7207f04b6108eed6d8316553d888a462cccd4c9e8855e";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "methods";
     version = "0.0.1";
@@ -1038,6 +1788,26 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "mime";
+    version = "1.2.5";
+    fullName = "mime-1.2.5";
+    hash = "ccf05a6c47146e8acb9d0671eee09d2eb077cf9ddd1f7e8eccf49dbf969d6c72";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "mime";
+    version = "1.2.6";
+    fullName = "mime-1.2.6";
+    hash = "7460134d6b4686d64fd1e7b878d34e2bdd258ad29b6665cf62e6d92659e81591";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "mime";
     version = "1.2.9";
@@ -1058,6 +1828,16 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "mime";
+    version = "1.2.9";
+    fullName = "mime-~1.2.7";
+    hash = "60120b9859a92a94480a76327a9406b4a72a34f2317bc7fa33dcb99b9c72678a";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "mime";
     version = "1.2.9";
@@ -1080,6 +1860,17 @@
       { name = "sigmund"; range = "~1.0.0"; }
     ];
   }
+  {
+    baseName = "minimatch";
+    version = "0.0.5";
+    fullName = "minimatch-0.0.x";
+    hash = "063694baa9f9ab077e687ff59031f461998ef38fda656ec7c3475931177ccf36";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "lru-cache"; range = "~1.0.2"; }
+    ];
+  }
   {
     baseName = "minimatch";
     version = "0.2.12";
@@ -1092,6 +1883,18 @@
       { name = "sigmund"; range = "~1.0.0"; }
     ];
   }
+  {
+    baseName = "minimatch";
+    version = "0.2.12";
+    fullName = "minimatch->=0.2.4";
+    hash = "205cff8b4ba926e86ff0e6f7f566553906113892028083ea221989a42500c246";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "lru-cache"; range = "2"; }
+      { name = "sigmund"; range = "~1.0.0"; }
+    ];
+  }
   {
     baseName = "minimatch";
     version = "0.2.12";
@@ -1174,6 +1977,36 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "mkdirp";
+    version = "0.3.5";
+    fullName = "mkdirp-0.3.x";
+    hash = "8ae9c5107acb41110106224f5e7be2b50b00d15d062ea7941301c111b863fd26";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "mkdirp";
+    version = "0.3.5";
+    fullName = "mkdirp-0.x.x";
+    hash = "8ae9c5107acb41110106224f5e7be2b50b00d15d062ea7941301c111b863fd26";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "mkdirp";
+    version = "0.3.5";
+    fullName = "mkdirp-~0.3.4";
+    hash = "8ae9c5107acb41110106224f5e7be2b50b00d15d062ea7941301c111b863fd26";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "mocha";
     version = "1.12.0";
@@ -1192,6 +2025,89 @@
       { name = "glob"; range = "3.2.1"; }
     ];
   }
+  {
+    baseName = "mongodb";
+    version = "1.2.14";
+    fullName = "mongodb-1.2.x";
+    hash = "011e76d49fb99a58659db12e55d340c4731184dd635b769717db374db3f701a0";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "bson"; range = "0.1.8"; }
+    ];
+  }
+  {
+    baseName = "mongodb";
+    version = "1.3.10";
+    fullName = "mongodb-1.3.10";
+    hash = "ea6f279c0bebedec94f0d757fef775302dba6dd4a3792f59696d094bd2c2f113";
+    patchLatest = true;
+    topLevel = false;
+    dependencies = [
+      { name = "bson"; range = "0.1.9"; }
+      { name = "kerberos"; range = "*"; }
+    ];
+  }
+  {
+    baseName = "mongoose";
+    version = "3.6.13";
+    fullName = "mongoose-*";
+    hash = "b6d79ace01b4acbabb0c07d4c053f6fdf4a6b7252cc506ccbbc7a6db5e6bbe36";
+    patchLatest = false;
+    topLevel = true;
+    dependencies = [
+      { name = "hooks"; range = "0.2.1"; }
+      { name = "mongodb"; range = "1.3.10"; }
+      { name = "ms"; range = "0.1.0"; }
+      { name = "sliced"; range = "0.0.3"; }
+      { name = "muri"; range = "0.3.1"; }
+      { name = "mpromise"; range = "0.2.1"; }
+      { name = "mpath"; range = "0.1.1"; }
+      { name = "regexp-clone"; range = "0.0.1"; }
+    ];
+  }
+  {
+    baseName = "monocle";
+    version = "0.1.48";
+    fullName = "monocle-0.1.48";
+    hash = "3a94a890f37ff135ea82f640d8e693f10a11bca3d30c3ec7456a9f97683f15d5";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "readdirp"; range = "~0.2.3"; }
+    ];
+  }
+  {
+    baseName = "mpath";
+    version = "0.1.1";
+    fullName = "mpath-0.1.1";
+    hash = "23e83ac6c4b3d67cc34dc1ba05d1085a3d9ef8243caa756b1ca4af12b4370751";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "mpromise";
+    version = "0.2.1";
+    fullName = "mpromise-0.2.1";
+    hash = "56d035a66b1a19a8ad64e99354355e128b18394f69d545597bb5a25fe80147bf";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "sliced"; range = "0.0.4"; }
+    ];
+  }
+  {
+    baseName = "ms";
+    version = "0.1.0";
+    fullName = "ms-0.1.0";
+    hash = "474bcdb7965551c5a111be2fcdb5e4607491c70a601d04d818ec7e1e1c2ff88b";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "ms";
     version = "0.3.0";
@@ -1202,6 +2118,26 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "muri";
+    version = "0.3.1";
+    fullName = "muri-0.3.1";
+    hash = "5e1b7ac7790350f6043fc8fa1b18f85818fefe0adda18d0c058460413757f959";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "mute-stream";
+    version = "0.0.3";
+    fullName = "mute-stream-~0.0.2";
+    hash = "7bb2401ad9afaa6f04bc1d2d9411a6e41d7a6198de929d4522e95eeae78b1082";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "mv";
     version = "0.0.5";
@@ -1212,6 +2148,57 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "natural";
+    version = "0.0.69";
+    fullName = "natural-0.0.69";
+    hash = "1cd394575cbeba7963378fc572a85a3279c4359b75740f9062dddb5b64d6c402";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "sylvester"; range = ">= 0.0.12"; }
+      { name = "apparatus"; range = ">= 0.0.4"; }
+      { name = "underscore"; range = "*"; }
+    ];
+  }
+  {
+    baseName = "nconf";
+    version = "0.6.7";
+    fullName = "nconf-*";
+    hash = "1ec390b8fa439e1160e432edc0f9ccec544b8216dfaba3db7002d38351ccfa1c";
+    patchLatest = false;
+    topLevel = true;
+    dependencies = [
+      { name = "async"; range = "0.1.x"; }
+      { name = "ini"; range = "1.x.x"; }
+      { name = "optimist"; range = "0.3.x"; }
+      { name = "pkginfo"; range = "0.2.x"; }
+    ];
+  }
+  {
+    baseName = "nconf";
+    version = "0.6.7";
+    fullName = "nconf-0.6.7";
+    hash = "1ec390b8fa439e1160e432edc0f9ccec544b8216dfaba3db7002d38351ccfa1c";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "async"; range = "0.1.x"; }
+      { name = "ini"; range = "1.x.x"; }
+      { name = "optimist"; range = "0.3.x"; }
+      { name = "pkginfo"; range = "0.2.x"; }
+    ];
+  }
+  {
+    baseName = "ncp";
+    version = "0.2.7";
+    fullName = "ncp-0.2.x";
+    hash = "9bae6495de613c5adb418348224512b9dc42f2b74c7a2fabecf02f8b7d08343d";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "negotiator";
     version = "0.2.5";
@@ -1222,6 +2209,16 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "nib";
+    version = "0.5.0";
+    fullName = "nib-0.5.0";
+    hash = "9e3ebce2cfb055b8eadcb2fcac3e49570e429a5262ce5a59844857fbcb27f4c7";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "nijs";
     version = "0.0.8";
@@ -1316,6 +2313,16 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "nodemon";
+    version = "0.7.8";
+    fullName = "nodemon-*";
+    hash = "123a54f51297e5186061846a5dae5117c2a218a8a477364055828a0c2ea39bed";
+    patchLatest = false;
+    topLevel = true;
+    dependencies = [
+    ];
+  }
   {
     baseName = "nopt";
     version = "2.1.1";
@@ -1360,6 +2367,28 @@
       { name = "ansi"; range = "~0.1.2"; }
     ];
   }
+  {
+    baseName = "nssocket";
+    version = "0.5.1";
+    fullName = "nssocket-~0.5.1";
+    hash = "aaf06b612cd99bf9e5790b2bf9b0f1963c2b605eaf3529b905c1fbdc1dee5333";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "eventemitter2"; range = "~0.4.11"; }
+      { name = "lazy"; range = "~1.0.11"; }
+    ];
+  }
+  {
+    baseName = "oauth-sign";
+    version = "0.2.0";
+    fullName = "oauth-sign-~0.2.0";
+    hash = "ef91b4266c71c68478dd7c50767085210006ebfb9e9263c72d42f47972991580";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "oauth-sign";
     version = "0.3.0";
@@ -1392,6 +2421,61 @@
       { name = "minimist"; range = "~0.0.1"; }
     ];
   }
+  {
+    baseName = "optimist";
+    version = "0.2.8";
+    fullName = "optimist-0.2";
+    hash = "5ee9f3bbd03239903831ccc33c6c365251550cbfd88d9fb92011feac4376cf84";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "wordwrap"; range = ">=0.0.1 <0.1.0"; }
+    ];
+  }
+  {
+    baseName = "optimist";
+    version = "0.3.5";
+    fullName = "optimist-0.3.5";
+    hash = "a407715c9745c9242923f282a70d55947e21f5c4800c99b09d2eb6e48735a09d";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "wordwrap"; range = "~0.0.2"; }
+    ];
+  }
+  {
+    baseName = "optimist";
+    version = "0.3.7";
+    fullName = "optimist-0.3.x";
+    hash = "ba534aa013072a9650a18da311de8025d73b58b71dcea7c7ade4d8e8f274dd33";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "wordwrap"; range = "~0.0.2"; }
+    ];
+  }
+  {
+    baseName = "optimist";
+    version = "0.4.0";
+    fullName = "optimist-0.4.0";
+    hash = "bbbd3c9e8c1e8f59e7097271a78fa628c6dc76de894a02fc625872b72bc99555";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "wordwrap"; range = "~0.0.2"; }
+    ];
+  }
+  {
+    baseName = "optimist";
+    version = "0.3.7";
+    fullName = "optimist-~0.3.5";
+    hash = "ba534aa013072a9650a18da311de8025d73b58b71dcea7c7ade4d8e8f274dd33";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "wordwrap"; range = "~0.0.2"; }
+    ];
+  }
   {
     baseName = "optparse";
     version = "1.0.4";
@@ -1422,6 +2506,42 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "passport";
+    version = "0.1.17";
+    fullName = "passport-*";
+    hash = "65c15a1666abc16a86d586233f40b89b68b50bf88107809878742973af8b516e";
+    patchLatest = false;
+    topLevel = true;
+    dependencies = [
+      { name = "pkginfo"; range = "0.2.x"; }
+      { name = "pause"; range = "0.0.1"; }
+    ];
+  }
+  {
+    baseName = "passport-local";
+    version = "0.1.6";
+    fullName = "passport-local-*";
+    hash = "de7dbe29a63fc648686425ba4ef23b99195372ae322037977864db08657e262d";
+    patchLatest = false;
+    topLevel = true;
+    dependencies = [
+      { name = "pkginfo"; range = "0.2.x"; }
+      { name = "passport"; range = "~0.1.1"; }
+    ];
+  }
+  {
+    baseName = "passport";
+    version = "0.1.17";
+    fullName = "passport-~0.1.1";
+    hash = "65c15a1666abc16a86d586233f40b89b68b50bf88107809878742973af8b516e";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "pkginfo"; range = "0.2.x"; }
+      { name = "pause"; range = "0.0.1"; }
+    ];
+  }
   {
     baseName = "pause";
     version = "0.0.1";
@@ -1432,6 +2552,46 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "pkginfo";
+    version = "0.2.3";
+    fullName = "pkginfo-0.2.x";
+    hash = "0685c2cd94db8515a95b8127d1ab4e2a82d37deb4f808b41c9e0c033e34fe77f";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "pkginfo";
+    version = "0.3.0";
+    fullName = "pkginfo-0.3.0";
+    hash = "e55f5e0f767cabc55b638808736f952d6d74157938a87192106ce83c66a195a5";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "pkginfo";
+    version = "0.3.0";
+    fullName = "pkginfo-0.3.x";
+    hash = "e55f5e0f767cabc55b638808736f952d6d74157938a87192106ce83c66a195a5";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "pkginfo";
+    version = "0.3.0";
+    fullName = "pkginfo-0.x.x";
+    hash = "e55f5e0f767cabc55b638808736f952d6d74157938a87192106ce83c66a195a5";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "posix-getopt";
     version = "1.0.0";
@@ -1442,6 +2602,53 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "promise";
+    version = "2.0.0";
+    fullName = "promise-~2.0";
+    hash = "ccc3f345cd6facd0bcb0e599320e1da06b447ee573982b04f6b615a3da1ba7df";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "is-promise"; range = "~1"; }
+    ];
+  }
+  {
+    baseName = "prompt";
+    version = "0.2.9";
+    fullName = "prompt-0.2.9";
+    hash = "2444c21920d4169c51cae11fafed129c09df11f4bdda8e7ad76ea626a8828878";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "pkginfo"; range = "0.x.x"; }
+      { name = "read"; range = "1.0.x"; }
+      { name = "revalidator"; range = "0.1.x"; }
+      { name = "utile"; range = "0.1.x"; }
+      { name = "winston"; range = "0.6.x"; }
+    ];
+  }
+  {
+    baseName = "ps-tree";
+    version = "0.0.3";
+    fullName = "ps-tree-0.0.x";
+    hash = "d6af58e1062457f3aa92306c8eb970f32d2d52b93ecca4920c7409afd419a78d";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "event-stream"; range = "~0.5"; }
+    ];
+  }
+  {
+    baseName = "qs";
+    version = "0.5.1";
+    fullName = "qs-0.5.1";
+    hash = "85bf27180b586499902d4e2bea83974b337924c870f6b790a23e6bfeb982c2e5";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "qs";
     version = "0.5.5";
@@ -1462,6 +2669,16 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "qs";
+    version = "0.5.6";
+    fullName = "qs-~0.5.4";
+    hash = "3c7b49a51d52e5c8b988c2a53f8605d03a18d5e29b55b4f187c6a0fc714d00e9";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "qs";
     version = "0.6.5";
@@ -1492,6 +2709,17 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "read";
+    version = "1.0.4";
+    fullName = "read-1.0.x";
+    hash = "8be269afeaa7cc62feb4672e8e61e5133152266dc5347b23cf5b05bc40789601";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "mute-stream"; range = "~0.0.2"; }
+    ];
+  }
   {
     baseName = "readable-stream";
     version = "1.0.2";
@@ -1502,6 +2730,70 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "readdirp";
+    version = "0.2.5";
+    fullName = "readdirp-~0.2.3";
+    hash = "22d8e0e38c0d358c951221d0051d1e9e1eafeaf2136ac7fe0aa3bfd36238052c";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "minimatch"; range = ">=0.2.4"; }
+    ];
+  }
+  {
+    baseName = "redis";
+    version = "0.8.4";
+    fullName = "redis-*";
+    hash = "077932b14c6b0a4985b7a41cf20e4495463c693c7b9932ebc46e0144918ff3c3";
+    patchLatest = false;
+    topLevel = true;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "redis";
+    version = "0.7.2";
+    fullName = "redis-0.7.2";
+    hash = "d56d99e15dd35f6fabf545d9e91545553d60eaeb32ecf5caa1f357458df161ab";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "hiredis"; range = "*"; }
+    ];
+  }
+  {
+    baseName = "redis";
+    version = "0.8.4";
+    fullName = "redis->= 0.6.6";
+    hash = "077932b14c6b0a4985b7a41cf20e4495463c693c7b9932ebc46e0144918ff3c3";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "reds";
+    version = "0.1.4";
+    fullName = "reds-0.1.4";
+    hash = "3166c2f0f82efc624dac4e9058bc0ffa3bb864499785a746c461b813b90640ac";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "natural"; range = "0.0.69"; }
+      { name = "redis"; range = ">= 0.6.6"; }
+    ];
+  }
+  {
+    baseName = "regexp-clone";
+    version = "0.0.1";
+    fullName = "regexp-clone-0.0.1";
+    hash = "e11276212cce9fa15aa07276b800f750ec7d9c25e76ace7cf07f3e713d6d79e0";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "request";
     version = "2.21.0";
@@ -1524,6 +2816,37 @@
       { name = "form-data"; range = "0.0.8"; }
     ];
   }
+  {
+    baseName = "request";
+    version = "2.16.6";
+    fullName = "request-2.16.x";
+    hash = "9424cb952b4c5723678d0c5a6daf3ea6fa76ccad4cbd175f0a489dc54c6e1453";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "form-data"; range = "~0.0.3"; }
+      { name = "mime"; range = "~1.2.7"; }
+      { name = "hawk"; range = "~0.10.2"; }
+      { name = "node-uuid"; range = "~1.4.0"; }
+      { name = "cookie-jar"; range = "~0.2.0"; }
+      { name = "aws-sign"; range = "~0.2.0"; }
+      { name = "oauth-sign"; range = "~0.2.0"; }
+      { name = "forever-agent"; range = "~0.2.0"; }
+      { name = "tunnel-agent"; range = "~0.2.0"; }
+      { name = "json-stringify-safe"; range = "~3.0.0"; }
+      { name = "qs"; range = "~0.5.4"; }
+    ];
+  }
+  {
+    baseName = "request";
+    version = "2.9.203";
+    fullName = "request-2.9.x";
+    hash = "2af8f83a63c7227383fbdd6114e470e0921af86a037c4e82f42883120f35f836";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "request";
     version = "2.21.0";
@@ -1573,6 +2896,26 @@
       { name = "dtrace-provider"; range = "0.2.8"; }
     ];
   }
+  {
+    baseName = "revalidator";
+    version = "0.1.5";
+    fullName = "revalidator-0.1.x";
+    hash = "54938a414b54882f9459e93b9bfd5d267c41985c1191a9a913c713e369ec639e";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "rimraf";
+    version = "1.0.9";
+    fullName = "rimraf-1.x.x";
+    hash = "3ef93e5f75d1fc4778b8f5409e07c72510ee2f86c926abe4e9acff9825f14c5b";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "rimraf";
     version = "2.2.0";
@@ -1668,6 +3011,34 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "send";
+    version = "0.1.1";
+    fullName = "send-*";
+    hash = "4d237af8bc86148952d0577bed44bd41928a4422c9a6e25e45fc35103aa6e872";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "debug"; range = "*"; }
+      { name = "mime"; range = "~1.2.9"; }
+      { name = "fresh"; range = "0.1.0"; }
+      { name = "range-parser"; range = "0.0.4"; }
+    ];
+  }
+  {
+    baseName = "send";
+    version = "0.1.0";
+    fullName = "send-0.1.0";
+    hash = "28b5a6ec41b5072521eb792cc901b92cdbb6b743c578d7008727dbbd3eb717de";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "debug"; range = "*"; }
+      { name = "mime"; range = "1.2.6"; }
+      { name = "fresh"; range = "0.1.0"; }
+      { name = "range-parser"; range = "0.0.4"; }
+    ];
+  }
   {
     baseName = "send";
     version = "0.1.1";
@@ -1682,6 +3053,16 @@
       { name = "range-parser"; range = "0.0.4"; }
     ];
   }
+  {
+    baseName = "sequence";
+    version = "2.2.1";
+    fullName = "sequence->= 2.2.1";
+    hash = "f14e1262b6a234acc3f50fdd5bd28c02f0cc8cbf882922b5af994babf4206b62";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "shelljs";
     version = "0.1.4";
@@ -1692,6 +3073,16 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "should";
+    version = "1.2.2";
+    fullName = "should-*";
+    hash = "af7916b687bf54b95bd8ff2837f430ab2758f1db22b5cde5b4ae30dac472f330";
+    patchLatest = false;
+    topLevel = true;
+    dependencies = [
+    ];
+  }
   {
     baseName = "sigmund";
     version = "1.0.0";
@@ -1702,6 +3093,26 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "sliced";
+    version = "0.0.3";
+    fullName = "sliced-0.0.3";
+    hash = "ce5765e669217d4c9500d79d6ffaf8d22b6507e826fd1dc0bb05bb746ab6227c";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "sliced";
+    version = "0.0.4";
+    fullName = "sliced-0.0.4";
+    hash = "b9320aec8a9c5796d34b4c95b1289912548fcc8682fe9fed09749847b7dc0d85";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "smartdc";
     version = "7.0.0";
@@ -1734,6 +3145,17 @@
       { name = "vasync"; range = "1.3.3"; }
     ];
   }
+  {
+    baseName = "sntp";
+    version = "0.1.4";
+    fullName = "sntp-0.1.x";
+    hash = "5fc290630e8a4599dfb1ee4ed67fdc3c94fc97c6c0cbbc188691669ff55dcb4f";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "hoek"; range = "0.7.x"; }
+    ];
+  }
   {
     baseName = "sntp";
     version = "0.2.4";
@@ -1768,6 +3190,17 @@
       { name = "amdefine"; range = ">=0.0.4"; }
     ];
   }
+  {
+    baseName = "source-map";
+    version = "0.1.25";
+    fullName = "source-map-~0.1.7";
+    hash = "3ef1ff114aa3504871ad8b16a38ac744b293c6d8f37b0b6e673b44592a08626d";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "amdefine"; range = ">=0.0.4"; }
+    ];
+  }
   {
     baseName = "spdy";
     version = "1.7.1";
@@ -1790,6 +3223,16 @@
       { name = "posix-getopt"; range = "1.0.0"; }
     ];
   }
+  {
+    baseName = "stack-trace";
+    version = "0.0.6";
+    fullName = "stack-trace-0.0.x";
+    hash = "398b3307d34c25b9249049229cd4a340ce8587dc3e3ab5cec830af19031c10a4";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "stream-counter";
     version = "0.1.0";
@@ -1812,6 +3255,48 @@
       { name = "buffertools"; range = ">=1.1.1 <2.0.0"; }
     ];
   }
+  {
+    baseName = "stylus";
+    version = "0.27.2";
+    fullName = "stylus-0.27.2";
+    hash = "8e18cc51592e04e42096e324d3409a132dbb3b40b0a606a746c4c57268bb63ea";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "cssom"; range = "0.2.x"; }
+      { name = "mkdirp"; range = "0.3.x"; }
+      { name = "debug"; range = "*"; }
+    ];
+  }
+  {
+    baseName = "superagent";
+    version = "0.15.1";
+    fullName = "superagent-0.15.1";
+    hash = "8306a3c7476e9f9d61ffe33117ffcf2a4fba6c9fcc59a2b8eee059f57d7d5614";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "qs"; range = "0.6.5"; }
+      { name = "formidable"; range = "1.0.9"; }
+      { name = "mime"; range = "1.2.5"; }
+      { name = "emitter-component"; range = "1.0.0"; }
+      { name = "methods"; range = "0.0.1"; }
+      { name = "cookiejar"; range = "1.3.0"; }
+      { name = "debug"; range = "~0.7.2"; }
+    ];
+  }
+  {
+    baseName = "supertest";
+    version = "0.7.1";
+    fullName = "supertest-*";
+    hash = "85246177740d16565f6ed4a932f0c85aca55c897ae352e3bb404da0cdad60a16";
+    patchLatest = false;
+    topLevel = true;
+    dependencies = [
+      { name = "superagent"; range = "0.15.1"; }
+      { name = "methods"; range = "0.0.1"; }
+    ];
+  }
   {
     baseName = "swig";
     version = "0.14.0";
@@ -1823,6 +3308,26 @@
       { name = "underscore"; range = ">=1.1.7"; }
     ];
   }
+  {
+    baseName = "sylvester";
+    version = "0.0.21";
+    fullName = "sylvester->= 0.0.12";
+    hash = "8b97514fbb01de0f73b9104091bb79e835d227eb4c2ca88a843696b22f347022";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "sylvester";
+    version = "0.0.21";
+    fullName = "sylvester->= 0.0.8";
+    hash = "8b97514fbb01de0f73b9104091bb79e835d227eb4c2ca88a843696b22f347022";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "tar";
     version = "0.1.17";
@@ -1847,6 +3352,39 @@
       { name = "rimraf"; range = "~2.1.4"; }
     ];
   }
+  {
+    baseName = "timespan";
+    version = "2.0.1";
+    fullName = "timespan-2.0.1";
+    hash = "2c9693ac1c16e4bf0061904f487ab5fbf13f3d35817de1575dbfd9eaf85d452c";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "transformers";
+    version = "2.0.1";
+    fullName = "transformers-2.0.1";
+    hash = "503430f608716eb2d55764c27f1417e363049aadd08988ad9e26ecb2daa33cb9";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "promise"; range = "~2.0"; }
+      { name = "css"; range = "~1.0.8"; }
+      { name = "uglify-js"; range = "~2.2.5"; }
+    ];
+  }
+  {
+    baseName = "tunnel-agent";
+    version = "0.2.0";
+    fullName = "tunnel-agent-~0.2.0";
+    hash = "d5c7fe6b4cd377ac54ff994f3b53b368fb4c0edafceddcf0e575402aa2451808";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "tunnel-agent";
     version = "0.3.0";
@@ -1857,6 +3395,44 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "uglify-js";
+    version = "2.3.6";
+    fullName = "uglify-js-2.3.6";
+    hash = "a361bc8092c8400d99d73d071c46fcfceb7156a557effd82abd8ca8a5c5ad09e";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "async"; range = "~0.2.6"; }
+      { name = "source-map"; range = "~0.1.7"; }
+      { name = "optimist"; range = "~0.3.5"; }
+    ];
+  }
+  {
+    baseName = "uglify-js";
+    version = "2.2.5";
+    fullName = "uglify-js-~2.2.5";
+    hash = "f9d166cda4c881a396b53f8b8892b17bb1bc09ffb531ba1fa16e7bf9022a2ca2";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "source-map"; range = "~0.1.7"; }
+      { name = "optimist"; range = "~0.3.5"; }
+    ];
+  }
+  {
+    baseName = "uglify-js";
+    version = "2.3.6";
+    fullName = "uglify-js-~2.3.6";
+    hash = "a361bc8092c8400d99d73d071c46fcfceb7156a557effd82abd8ca8a5c5ad09e";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "async"; range = "~0.2.6"; }
+      { name = "source-map"; range = "~0.1.7"; }
+      { name = "optimist"; range = "~0.3.5"; }
+    ];
+  }
   {
     baseName = "uid2";
     version = "0.0.2";
@@ -1918,6 +3494,38 @@
       { name = "events.node"; range = ">= 0.4.0"; }
     ];
   }
+  {
+    baseName = "utile";
+    version = "0.1.7";
+    fullName = "utile-0.1.7";
+    hash = "5e5dc150fa657729c288a211389cdf47419b73f4f8b4304a0c84dc584bf804b5";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "async"; range = "0.1.x"; }
+      { name = "deep-equal"; range = "*"; }
+      { name = "i"; range = "0.3.x"; }
+      { name = "mkdirp"; range = "0.x.x"; }
+      { name = "ncp"; range = "0.2.x"; }
+      { name = "rimraf"; range = "1.x.x"; }
+    ];
+  }
+  {
+    baseName = "utile";
+    version = "0.1.7";
+    fullName = "utile-0.1.x";
+    hash = "5e5dc150fa657729c288a211389cdf47419b73f4f8b4304a0c84dc584bf804b5";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "async"; range = "0.1.x"; }
+      { name = "deep-equal"; range = "*"; }
+      { name = "i"; range = "0.3.x"; }
+      { name = "mkdirp"; range = "0.x.x"; }
+      { name = "ncp"; range = "0.2.x"; }
+      { name = "rimraf"; range = "1.x.x"; }
+    ];
+  }
   {
     baseName = "vasync";
     version = "1.3.3";
@@ -1963,6 +3571,47 @@
       { name = "extsprintf"; range = "1.0.2"; }
     ];
   }
+  {
+    baseName = "view-helpers";
+    version = "0.1.2";
+    fullName = "view-helpers-*";
+    hash = "b9605b3acd8da98a68a34840061b7dde70eac65529667666014b38b03d198439";
+    patchLatest = false;
+    topLevel = true;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "walk";
+    version = "2.2.1";
+    fullName = "walk-*";
+    hash = "ed78c4a01a936c69c43eac60dde1a54a918fed66681671bf4cfdfa090b49a8ad";
+    patchLatest = false;
+    topLevel = true;
+    dependencies = [
+      { name = "forEachAsync"; range = "~2.2"; }
+    ];
+  }
+  {
+    baseName = "watch";
+    version = "0.5.1";
+    fullName = "watch-0.5.x";
+    hash = "1c7497c12e6ad97e194b3527ee6fa919e8f9045e588d9f810592dfec58f1d965";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
+  {
+    baseName = "watch";
+    version = "0.7.0";
+    fullName = "watch-0.7.0";
+    hash = "8cebd59e96b3c8a25dce0de0204d29cb94f8bd99c7e0c6772f07eb309fd22c54";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "websocket-driver";
     version = "0.2.1";
@@ -1983,6 +3632,95 @@
     dependencies = [
     ];
   }
+  {
+    baseName = "winston";
+    version = "0.7.2";
+    fullName = "winston-*";
+    hash = "562d3a3d8dc0ba580bfdfb167e16297940d3386ac4b82e65ad09f4859c4af181";
+    patchLatest = false;
+    topLevel = true;
+    dependencies = [
+      { name = "async"; range = "0.2.x"; }
+      { name = "colors"; range = "0.6.x"; }
+      { name = "cycle"; range = "1.0.x"; }
+      { name = "eyes"; range = "0.1.x"; }
+      { name = "pkginfo"; range = "0.3.x"; }
+      { name = "request"; range = "2.16.x"; }
+      { name = "stack-trace"; range = "0.0.x"; }
+    ];
+  }
+  {
+    baseName = "winston";
+    version = "0.6.2";
+    fullName = "winston-0.6.2";
+    hash = "bfe4e73f8b42e1521a1c5dbdc50150fc80d508148376c4dfc925caa6516b2a81";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "async"; range = "0.1.x"; }
+      { name = "colors"; range = "0.x.x"; }
+      { name = "cycle"; range = "1.0.x"; }
+      { name = "eyes"; range = "0.1.x"; }
+      { name = "pkginfo"; range = "0.2.x"; }
+      { name = "request"; range = "2.9.x"; }
+      { name = "stack-trace"; range = "0.0.x"; }
+    ];
+  }
+  {
+    baseName = "winston";
+    version = "0.6.2";
+    fullName = "winston-0.6.x";
+    hash = "bfe4e73f8b42e1521a1c5dbdc50150fc80d508148376c4dfc925caa6516b2a81";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "async"; range = "0.1.x"; }
+      { name = "colors"; range = "0.x.x"; }
+      { name = "cycle"; range = "1.0.x"; }
+      { name = "eyes"; range = "0.1.x"; }
+      { name = "pkginfo"; range = "0.2.x"; }
+      { name = "request"; range = "2.9.x"; }
+      { name = "stack-trace"; range = "0.0.x"; }
+    ];
+  }
+  {
+    baseName = "winston";
+    version = "0.7.1";
+    fullName = "winston-0.7.1";
+    hash = "8504626efcd7b629a69500b0ab70b964fbabb53d6ebb506fdf3e1ecc6f2ca294";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "async"; range = "0.2.x"; }
+      { name = "colors"; range = "0.6.x"; }
+      { name = "cycle"; range = "1.0.x"; }
+      { name = "eyes"; range = "0.1.x"; }
+      { name = "pkginfo"; range = "0.3.x"; }
+      { name = "request"; range = "2.16.x"; }
+      { name = "stack-trace"; range = "0.0.x"; }
+    ];
+  }
+  {
+    baseName = "with";
+    version = "1.1.0";
+    fullName = "with-~1.1.0";
+    hash = "884c829a32f2b9d79d62bc455fd363cc307cf8b5284b822b550221c319ee6db4";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+      { name = "uglify-js"; range = "2.3.6"; }
+    ];
+  }
+  {
+    baseName = "wordwrap";
+    version = "0.0.2";
+    fullName = "wordwrap->=0.0.1 <0.1.0";
+    hash = "66a2fa688509738922c3ad62a6159fe3c93268bd3bca2bff24df4bc02cc31582";
+    patchLatest = false;
+    topLevel = false;
+    dependencies = [
+    ];
+  }
   {
     baseName = "wordwrap";
     version = "0.0.2";
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index 2d941fd1411..1cf0d169dbd 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -36,4 +36,22 @@
 , "mkdirp"
 , "jshint"
 , "stream-splitter-transform"
+, "bcrypt"
+, "nconf"
+, "winston"
+, "jade"
+, "view-helpers"
+, "redis"
+, "mongoose"
+, "connect-mongo"
+, "connect-flash"
+, "passport"
+, "passport-local"
+, "gzippo"
+, "walk"
+, "forever"
+, "kue"
+, "supertest"
+, "should"
+, "nodemon"
 ]

From d36c91568670ebac62d17058a7181fe6f9bda6d1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Jul 2013 16:59:32 +0200
Subject: [PATCH 233/314] haskell-oeis: update to version 0.3.3

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

diff --git a/pkgs/development/libraries/haskell/oeis/default.nix b/pkgs/development/libraries/haskell/oeis/default.nix
index 6236495a87a..09e7b00fb74 100644
--- a/pkgs/development/libraries/haskell/oeis/default.nix
+++ b/pkgs/development/libraries/haskell/oeis/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "oeis";
-  version = "0.3.2";
-  sha256 = "1lp4mbsh98vnyfbnq9224n98hajv8q5prpzgbcw90bih0rbiw4w4";
+  version = "0.3.3";
+  sha256 = "0a0h7wmyy11iqb121w4i6d8masd0xi77dnihickrhlblpbbwq0xn";
   buildDepends = [ HTTP network ];
   testDepends = [ HUnit testFramework testFrameworkHunit ];
   doCheck = false;

From 4d8327877c7bbde455a025604683c43de1efc1dc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Jul 2013 16:59:32 +0200
Subject: [PATCH 234/314] haskell-shakespeare-css: update to version 1.0.6.1

---
 .../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 a18df3062e2..89a6a0970e8 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.5.1";
-  sha256 = "06x57cm9ni7cgdizdwzqzpqdmgzhchax7c4mbqvk3ymgf3lybrss";
+  version = "1.0.6.1";
+  sha256 = "1hzq7z7yhb80f4qqnjjky5kva0j1lk4jp4h50j822jyn9xn783vw";
   buildDepends = [ parsec shakespeare text transformers ];
   testDepends = [ hspec HUnit shakespeare text ];
   meta = {

From d31b934ad2021a260e7369f0bde11ce2fb77c6d3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Jul 2013 16:59:32 +0200
Subject: [PATCH 235/314] haskell-shelly: update to version 1.3.0.2

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

diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix
index a61dfec8b7e..639d913e040 100644
--- a/pkgs/development/libraries/haskell/shelly/default.nix
+++ b/pkgs/development/libraries/haskell/shelly/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shelly";
-  version = "1.3.0.1";
-  sha256 = "0xcx6cxlb13wrn5wfnnb070h8cj3lnk285fxmigi6x97b9rjdl8w";
+  version = "1.3.0.2";
+  sha256 = "1vhjqm2y6hfaq88k4qz0gdjic1316c5p1gyzgz19r0iwry6msrh2";
   buildDepends = [
     mtl systemFileio systemFilepath text time unixCompat
   ];

From b3a3f0f521eea3714f534d1ba2e189d3159cff87 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Jul 2013 16:59:33 +0200
Subject: [PATCH 236/314] haskell-yaml: update to version 0.8.3

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

diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix
index fe40fb785c9..1324a2137b1 100644
--- a/pkgs/development/libraries/haskell/yaml/default.nix
+++ b/pkgs/development/libraries/haskell/yaml/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yaml";
-  version = "0.8.2.4";
-  sha256 = "0gk2h3wfx818jibj51jh5ksrrkghx4ykvdqfji4lrh1mv08ah3d0";
+  version = "0.8.3";
+  sha256 = "1lbf0dgc3qvcdiyzk8zkpkga7f7g4i2rxriwdvwbxx199xr4apx3";
   buildDepends = [
     aeson attoparsec conduit resourcet text transformers
     unorderedContainers vector

From e533af98e45bb6b48d2f3e3b2f6ae1097b062dad Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Jul 2013 17:24:03 +0200
Subject: [PATCH 237/314] git-annex: enable web-related features

---
 .../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 f0c8c94437c..7b56d8f92da 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
@@ -34,8 +34,8 @@ cabal.mkDerivation (self: {
                     -fWebDAV
                     -fInotify
                     -fDbus
-                    -f-Assistant
-                    -f-Webapp
+                    -fAssistant
+                    -fWebapp
                     -fPairing
                     -fXMPP
                     -fDNS

From cb31653acbfa3cfb7d14a57c9e15172932e5e6e4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Jul 2013 18:55:51 +0200
Subject: [PATCH 238/314] boost: add version 1.54.0

---
 pkgs/development/libraries/boost/1.54.nix | 91 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  3 +-
 2 files changed, 93 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/boost/1.54.nix

diff --git a/pkgs/development/libraries/boost/1.54.nix b/pkgs/development/libraries/boost/1.54.nix
new file mode 100644
index 00000000000..ba4252feaa5
--- /dev/null
+++ b/pkgs/development/libraries/boost/1.54.nix
@@ -0,0 +1,91 @@
+{ stdenv, fetchurl, icu, expat, zlib, bzip2, python
+, enableRelease ? true
+, enableDebug ? false
+, enableSingleThreaded ? false
+, enableMultiThreaded ? true
+, enableShared ? true
+, enableStatic ? false
+, enablePIC ? false
+, enableExceptions ? false
+, taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic))
+}:
+
+let
+
+  variant = stdenv.lib.concatStringsSep ","
+    (stdenv.lib.optional enableRelease "release" ++
+     stdenv.lib.optional enableDebug "debug");
+
+  threading = stdenv.lib.concatStringsSep ","
+    (stdenv.lib.optional enableSingleThreaded "single" ++
+     stdenv.lib.optional enableMultiThreaded "multi");
+
+  link = stdenv.lib.concatStringsSep ","
+    (stdenv.lib.optional enableShared "shared" ++
+     stdenv.lib.optional enableStatic "static");
+
+  # To avoid library name collisions
+  layout = if taggedLayout then "tagged" else "system";
+
+  cflags = if enablePIC && enableExceptions then
+             "cflags=\"-fPIC -fexceptions\" cxxflags=-fPIC linkflags=-fPIC"
+           else if enablePIC then
+             "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC"
+           else if enableExceptions then
+             "cflags=-fexceptions"
+           else
+             "";
+in
+
+stdenv.mkDerivation {
+  name = "boost-1.54.0";
+
+  meta = {
+    homepage = "http://boost.org/";
+    description = "Boost C++ Library Collection";
+    license = "boost-license";
+
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.simons ];
+  };
+
+  src = fetchurl {
+    url = "mirror://sourceforge/boost/boost_1_54_0.tar.bz2";
+    sha256 = "07df925k56pbz3gvhxpx54aij34qd40a7sxw4im11brnwdyr4zh4";
+  };
+
+  enableParallelBuilding = true;
+
+  buildInputs = [icu expat zlib bzip2 python];
+
+  configureScript = "./bootstrap.sh";
+  configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python";
+
+  buildPhase = "./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install";
+
+  # normal install does not install bjam, this is a separate step
+  installPhase = ''
+    cd tools/build/v2
+    sh bootstrap.sh
+    ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install
+  '';
+
+  crossAttrs = rec {
+    buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ];
+    # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to
+    # override them.
+    propagatedBuildInputs = buildInputs;
+    # We want to substitute the contents of configureFlags, removing thus the
+    # usual --build and --host added on cross building.
+    preConfigure = ''
+      export configureFlags="--prefix=$out --without-icu"
+    '';
+    buildPhase = ''
+      set -x
+      cat << EOF > user-config.jam
+      using gcc : cross : $crossConfig-g++ ;
+      EOF
+      ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.crossDrv}/include -sEXPAT_LIBPATH=${expat.crossDrv}/lib --layout=${layout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install
+    '';
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 516fe0a2a56..8b3642e48ce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3700,7 +3700,8 @@ let
   boost144 = callPackage ../development/libraries/boost/1.44.nix { };
   boost149 = callPackage ../development/libraries/boost/1.49.nix { };
   boost153 = callPackage ../development/libraries/boost/1.53.nix { };
-  boost = boost153;
+  boost154 = callPackage ../development/libraries/boost/1.54.nix { };
+  boost = boost154;
 
   boostHeaders153 = callPackage ../development/libraries/boost/1.53-headers.nix { };
   boostHeaders = boostHeaders153;

From ea04555518f69a303ef63289ec79fabba1854982 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Jul 2013 21:26:31 +0200
Subject: [PATCH 239/314] boost-headers: update to version 1.54.0

---
 .../boost/{1.53-headers.nix => 1.54-headers.nix}          | 8 ++++----
 pkgs/top-level/all-packages.nix                           | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename pkgs/development/libraries/boost/{1.53-headers.nix => 1.54-headers.nix} (65%)

diff --git a/pkgs/development/libraries/boost/1.53-headers.nix b/pkgs/development/libraries/boost/1.54-headers.nix
similarity index 65%
rename from pkgs/development/libraries/boost/1.53-headers.nix
rename to pkgs/development/libraries/boost/1.54-headers.nix
index 04bad16bd70..c50833b12a3 100644
--- a/pkgs/development/libraries/boost/1.53-headers.nix
+++ b/pkgs/development/libraries/boost/1.54-headers.nix
@@ -1,18 +1,18 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "boost-headers-1.53.0";
+  name = "boost-headers-1.54.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/boost/boost_1_53_0.tar.bz2";
-    sha256 = "15livg6y1l3gdsg6ybvp3y4gp0w3xh1rdcq5bjf0qaw804dh92pq";
+    url = "mirror://sourceforge/boost/boost_1_54_0.tar.bz2";
+    sha256 = "07df925k56pbz3gvhxpx54aij34qd40a7sxw4im11brnwdyr4zh4";
   };
 
   phases = [ "installPhase" ];
 
   installPhase = ''
     mkdir -p $out/include
-    tar xf $src -C $out/include --strip-components=1 boost_1_53_0/boost
+    tar xf $src -C $out/include --strip-components=1 boost_1_54_0/boost
   '';
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8b3642e48ce..342e5736ccc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3703,8 +3703,8 @@ let
   boost154 = callPackage ../development/libraries/boost/1.54.nix { };
   boost = boost154;
 
-  boostHeaders153 = callPackage ../development/libraries/boost/1.53-headers.nix { };
-  boostHeaders = boostHeaders153;
+  boostHeaders154 = callPackage ../development/libraries/boost/1.54-headers.nix { };
+  boostHeaders = boostHeaders154;
 
   botan = callPackage ../development/libraries/botan { };
 

From 9e98650f8d32ed25fe04de141f17391490a1477d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Jul 2013 21:38:34 +0200
Subject: [PATCH 240/314] boost: generalize the header-only expression

The 'header-only-wrapper' expression can now wrap any version of boost
that's passed to it as an argument.
---
 .../{1.54-headers.nix => header-only-wrapper.nix}   | 13 +++++++++----
 pkgs/top-level/all-packages.nix                     |  3 +--
 2 files changed, 10 insertions(+), 6 deletions(-)
 rename pkgs/development/libraries/boost/{1.54-headers.nix => header-only-wrapper.nix} (59%)

diff --git a/pkgs/development/libraries/boost/1.54-headers.nix b/pkgs/development/libraries/boost/header-only-wrapper.nix
similarity index 59%
rename from pkgs/development/libraries/boost/1.54-headers.nix
rename to pkgs/development/libraries/boost/header-only-wrapper.nix
index c50833b12a3..d32462d3720 100644
--- a/pkgs/development/libraries/boost/1.54-headers.nix
+++ b/pkgs/development/libraries/boost/header-only-wrapper.nix
@@ -1,10 +1,15 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, boost }:
+
+let
+  version = stdenv.lib.removePrefix "boost-" boost.name;
+  pkgid = stdenv.lib.replaceChars ["-" "."] ["_" "_"] boost.name;
+in
 
 stdenv.mkDerivation {
-  name = "boost-headers-1.54.0";
+  name = "boost-headers-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/boost/boost_1_54_0.tar.bz2";
+    url = "mirror://sourceforge/boost/${pkgid}.tar.bz2";
     sha256 = "07df925k56pbz3gvhxpx54aij34qd40a7sxw4im11brnwdyr4zh4";
   };
 
@@ -12,7 +17,7 @@ stdenv.mkDerivation {
 
   installPhase = ''
     mkdir -p $out/include
-    tar xf $src -C $out/include --strip-components=1 boost_1_54_0/boost
+    tar xf $src -C $out/include --strip-components=1 ${pkgid}/boost
   '';
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 342e5736ccc..6a85db38225 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3703,8 +3703,7 @@ let
   boost154 = callPackage ../development/libraries/boost/1.54.nix { };
   boost = boost154;
 
-  boostHeaders154 = callPackage ../development/libraries/boost/1.54-headers.nix { };
-  boostHeaders = boostHeaders154;
+  boostHeaders = callPackage ../development/libraries/boost/header-only-wrapper.nix { };
 
   botan = callPackage ../development/libraries/botan { };
 

From 67e5eb909ba6e5cf59d88dd7310b0a193ebabf82 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Thu, 4 Jul 2013 08:48:55 +1000
Subject: [PATCH 241/314] llvm: fix build on darwin

* add DYLD_LIBRARY_PATH
* don't build with shared libs
---
 pkgs/development/compilers/llvm/default.nix | 22 ++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 59e2bdc5509..2385332e05c 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -18,19 +18,23 @@ stdenv.mkDerivation {
   propagatedBuildInputs = [ libffi ];
   buildInputs = [ perl groff cmake python ]; # 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'';
+  # created binaries need to be run before installation... I coudn't find a
+  # better way
+  preBuild = ( if stdenv.isDarwin
+               then "export DYLD_LIBRARY_PATH='$DYLD_LIBRARY_PATH:'`pwd`/lib"
+               else "export LD_LIBRARY_PATH='$LD_LIBRARY_PATH:'`pwd`/lib" );
 
-  cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DBUILD_SHARED_LIBS=ON" ];
+  cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]
+    ++ stdenv.lib.optional (!stdenv.isDarwin) [ "-DBUILD_SHARED_LIBS=ON" ];
 
   enableParallelBuilding = true;
-  #doCheck = true; # tests are broken, don't know why
+  doCheck = true; # tests are broken, don't know why
 
-  meta = {
-    homepage = http://llvm.org/;
+  meta = with stdenv.lib; {
     description = "Collection of modular and reusable compiler and toolchain technologies";
-    license = "BSD";
-    maintainers = with stdenv.lib.maintainers; [viric shlevy raskin];
-    platforms = with stdenv.lib.platforms; all;
+    homepage    = http://llvm.org/;
+    license     = licenses.bsd;
+    maintainers = with maintainers; [ lovek323 raskin shlevy viric ];
+    platforms   = platforms.all;
   };
 }

From 3babc55ae29fba3a6981a5722fa86186924aebfd Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Thu, 4 Jul 2013 08:49:30 +1000
Subject: [PATCH 242/314] wxGTK29: fix build on darwin

* use clang to compile
* add configure flags to enable building for 64-bit
* add setFile to build inputs
---
 .../libraries/wxGTK-2.9/default.nix           | 32 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  5 +++
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/wxGTK-2.9/default.nix b/pkgs/development/libraries/wxGTK-2.9/default.nix
index fca5a4a278e..e8a661a3389 100644
--- a/pkgs/development/libraries/wxGTK-2.9/default.nix
+++ b/pkgs/development/libraries/wxGTK-2.9/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
-, gstreamer, gst_plugins_base, GConf
+, gstreamer, gst_plugins_base, GConf, setFile
 , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true,
 }:
 
@@ -18,19 +18,23 @@ stdenv.mkDerivation {
     sha256 = "04jda4bns7cmp7xy68qz112yg0lribpc6xs5k9gilfqcyhshqlvc";
   };
 
-  buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf ]
-    ++ optional withMesa mesa;
+  buildInputs =
+    [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer
+      gst_plugins_base GConf ]
+    ++ optional withMesa mesa
+    ++ optional stdenv.isDarwin setFile;
 
   nativeBuildInputs = [ pkgconfig ];
 
-  configureFlags = [
-    "--enable-gtk2"
-    (if compat24 then "--enable-compat24" else "--disable-compat24")
-    (if compat26 then "--enable-compat26" else "--disable-compat26")
-    "--disable-precomp-headers"
-    (if unicode then "--enable-unicode" else "")
-    "--enable-mediactrl"
-  ] ++ optional withMesa "--with-opengl";
+  configureFlags =
+    [ "--enable-gtk2" "--disable-precomp-headers" "--enable-mediactrl"
+      (if compat24 then "--enable-compat24" else "--disable-compat24")
+      (if compat26 then "--enable-compat26" else "--disable-compat26") ]
+    ++ optional unicode "--enable-unicode"
+    ++ optional withMesa "--with-opengl"
+    ++ optionals stdenv.isDarwin
+      # allow building on 64-bit
+      [ "--with-cocoa" "--enable-universal-binaries" ];
 
   SEARCH_LIB = optionalString withMesa "${mesa}/lib";
 
@@ -38,7 +42,11 @@ stdenv.mkDerivation {
     substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE='
     substituteInPlace configure --replace 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB='
     substituteInPlace configure --replace /usr /no-such-path
-  ";
+  " + optionalString stdenv.isDarwin ''
+    substituteInPlace configure --replace \
+      'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \
+      'ac_cv_prog_SETFILE="${setFile}/bin/SetFile"'
+  '';
 
   postInstall = "
     (cd $out/include && ln -s wx-*/* .)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8bbe1e14cca..c584c195c79 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5475,6 +5475,11 @@ let
   wxGTK29 = callPackage ../development/libraries/wxGTK-2.9/default.nix {
     inherit (gnome) GConf;
     withMesa = lib.elem system lib.platforms.mesaPlatforms;
+
+    # use for Objective-C++ compiler
+    stdenv = if stdenv.isDarwin
+      then clangStdenv
+      else stdenv;
   };
 
   wtk = callPackage ../development/libraries/wtk { };

From c2901da1b829a51f6490a2d0927fd4d668e45311 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Thu, 4 Jul 2013 08:50:37 +1000
Subject: [PATCH 243/314] setFile: add expression

---
 .../tools/misc/setFile/default.nix            | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/tools/misc/setFile/default.nix

diff --git a/pkgs/development/tools/misc/setFile/default.nix b/pkgs/development/tools/misc/setFile/default.nix
new file mode 100644
index 00000000000..9f86184634f
--- /dev/null
+++ b/pkgs/development/tools/misc/setFile/default.nix
@@ -0,0 +1,31 @@
+{ stdenv }:
+
+stdenv.mkDerivation {
+  name = "setFile";
+
+  src = "/usr/bin/SetFile";
+
+  unpackPhase = "true";
+  configurePhase = "true";
+  buildPhase = "true";
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    cp $src "$out/bin"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Set attributes of files and directories";
+    homepage    = "http://developer.apple.com/library/mac/#documentation/Darwin/Reference/ManPages/man1/setfile.1.html";
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.darwin;
+
+    longDescription = ''
+      SetFile is a tool to set the file attributes on files in an HFS+
+      directory. It attempts to be similar to the setfile command in MPW. It can
+      apply rules to more than one file with the options apply- ing to all files
+      listed.
+    '';
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c584c195c79..b3a5b35ac47 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -446,6 +446,8 @@ let
 
   otool = callPackage ../development/tools/misc/otool { };
 
+  setFile = callPackage ../development/tools/misc/setFile { };
+
   xcodeenv = callPackage ../development/mobile/xcodeenv { };
 
   titaniumenv_2_1 = import ../development/mobile/titaniumenv {

From 4c9cff322adbf2c8ea12b6b3d3f7a21e7b4ac511 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Thu, 4 Jul 2013 08:51:25 +1000
Subject: [PATCH 244/314] gnuplot: fix build on darwin

* add readline to build inputs
* don't use wxGTK
---
 pkgs/tools/graphics/gnuplot/default.nix | 22 +++++++++++++---------
 pkgs/top-level/all-packages.nix         |  5 +++++
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix
index 485edf7335d..5dee1079ae2 100644
--- a/pkgs/tools/graphics/gnuplot/default.nix
+++ b/pkgs/tools/graphics/gnuplot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, gd, texinfo, makeWrapper
+{ stdenv, fetchurl, zlib, gd, texinfo, makeWrapper, readline
 , texLive ? null
 , lua ? null
 , emacs ? null
@@ -10,9 +10,9 @@
 , pango ? null
 , cairo ? null
 , pkgconfig ? null
-, readline
-, fontconfig ? null, gnused ? null, coreutils ? null
-}:
+, fontconfig ? null
+, gnused ? null
+, coreutils ? null }:
 
 assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null);
 
@@ -26,11 +26,14 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ zlib gd texinfo readline emacs lua texLive libX11 libXt libXpm libXaw
-      wxGTK pango cairo pkgconfig makeWrapper
-    ];
+      pango cairo pkgconfig makeWrapper ]
+    # compiling with wxGTK causes a malloc (double free) error on darwin
+    ++ stdenv.lib.optional (!stdenv.isDarwin) wxGTK;
 
   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' \
@@ -39,9 +42,10 @@ stdenv.mkDerivation rec {
        --run '. ${./set-gdfontpath-from-fontconfig.sh}'
   '';
 
-  meta = {
-    homepage = "http://www.gnuplot.info";
+  meta = with stdenv.lib; {
+    homepage    = http://www.gnuplot.info;
     description = "A portable command-line driven graphing utility for many platforms";
-    platforms = stdenv.lib.platforms.all;
+    platforms   = platforms.all;
+    maintainers = with maintainers; [ lovek323 ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3a5b35ac47..bff4b0ef896 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -917,6 +917,11 @@ let
   gnuplot = callPackage ../tools/graphics/gnuplot {
     texLive = null;
     lua = null;
+
+    # use gccApple to compile on darwin, seems to resolve a malloc error
+    stdenv = if stdenv.isDarwin
+      then stdenvAdapters.overrideGCC stdenv gccApple
+      else stdenv;
   };
 
   gnused = callPackage ../tools/text/gnused { };

From 7ccf7c1529dceaeac130417daf4e3f20e1936eee Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Thu, 4 Jul 2013 09:12:39 +1000
Subject: [PATCH 245/314] ncmpcpp: fix build on darwin

* add libiconvOrEmpty to build inputs
---
 pkgs/applications/audio/ncmpcpp/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix
index b6ac7f26d60..186c5265433 100644
--- a/pkgs/applications/audio/ncmpcpp/default.nix
+++ b/pkgs/applications/audio/ncmpcpp/default.nix
@@ -1,4 +1,5 @@
-{stdenv, fetchurl, ncurses, curl, taglib, fftw, mpd_clientlib, pkgconfig}:
+{ stdenv, fetchurl, ncurses, curl, taglib, fftw, mpd_clientlib, pkgconfig
+, libiconvOrEmpty }:
 
 stdenv.mkDerivation rec {
   version = "0.5.10";
@@ -9,14 +10,15 @@ stdenv.mkDerivation rec {
     sha256 = "ff6d5376a2d9caba6f5bb78e68af77cefbdb2f04cd256f738e39f8ac9a79a4a8";
   };
 
-  buildInputs = [ ncurses curl taglib fftw mpd_clientlib pkgconfig ];
+  buildInputs = [ ncurses curl taglib fftw mpd_clientlib pkgconfig ]
+    ++ libiconvOrEmpty;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Curses-based interface for MPD (music player daemon)";
-    homepage = http://unkart.ovh.org/ncmpcpp/;
-    license = "GPLv2+";
-    maintainers = [ stdenv.lib.maintainers.mornfall ];
-    platforms = stdenv.lib.platforms.all;
+    homepage    = http://unkart.ovh.org/ncmpcpp/;
+    license     = licenses.gpl2Plus;
+    maintainers = with maintainers; [ lovek323 mornfall ];
+    platforms   = platforms.all;
   };
 }
 

From 2a21046f246b9c3b1351d116c5193980477bc19e Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Thu, 4 Jul 2013 19:01:47 +1000
Subject: [PATCH 246/314] otool & setFile: only allow on darwin

---
 pkgs/development/tools/misc/otool/default.nix   | 3 +++
 pkgs/development/tools/misc/setFile/default.nix | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/pkgs/development/tools/misc/otool/default.nix b/pkgs/development/tools/misc/otool/default.nix
index aa365fc29d5..21eb2b591c2 100644
--- a/pkgs/development/tools/misc/otool/default.nix
+++ b/pkgs/development/tools/misc/otool/default.nix
@@ -1,5 +1,8 @@
 { stdenv }:
 
+# this tool only exists on darwin
+assert stdenv.isDarwin;
+
 stdenv.mkDerivation {
   name = "otool";
 
diff --git a/pkgs/development/tools/misc/setFile/default.nix b/pkgs/development/tools/misc/setFile/default.nix
index 9f86184634f..e3fbd2cbc6d 100644
--- a/pkgs/development/tools/misc/setFile/default.nix
+++ b/pkgs/development/tools/misc/setFile/default.nix
@@ -1,5 +1,8 @@
 { stdenv }:
 
+# this tool only exists on darwin
+assert stdenv.isDarwin;
+
 stdenv.mkDerivation {
   name = "setFile";
 

From 3b490b7ccbb365088feef242518af46d6dd3a19a Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Thu, 4 Jul 2013 19:02:40 +1000
Subject: [PATCH 247/314] llvm: re-disabling tests

accidentally re-enabled doCheck, which isn't working yet
---
 pkgs/development/compilers/llvm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 2385332e05c..c06abe0db94 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
     ++ stdenv.lib.optional (!stdenv.isDarwin) [ "-DBUILD_SHARED_LIBS=ON" ];
 
   enableParallelBuilding = true;
-  doCheck = true; # tests are broken, don't know why
+  # doCheck = true; # tests are broken, don't know why
 
   meta = with stdenv.lib; {
     description = "Collection of modular and reusable compiler and toolchain technologies";

From bd3c2c76c7fceda8853503f3f62b4fb10b643af3 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Sun, 30 Jun 2013 08:20:47 +1000
Subject: [PATCH 248/314] subversion: fix build on darwin

* remove useless -no-cpp-precomp flags
---
 pkgs/applications/version-management/subversion/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index 42503b97440..c5a74042590 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -49,6 +49,8 @@ stdenv.mkDerivation rec {
 
   preBuild = ''
     makeFlagsArray=(APACHE_LIBEXECDIR=$out/modules)
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace configure --replace "-no-cpp-precomp" ""
   '';
 
   postInstall = ''
@@ -74,7 +76,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A version control system intended to be a compelling replacement for CVS in the open source community";
     homepage = http://subversion.apache.org/;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
+    maintainers = with stdenv.lib.maintainers; [ eelco lovek323 ];
     platforms = stdenv.lib.platforms.all;
   };
 }

From cf3364bdb634380ad7f190e085946874f4f16064 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Thu, 4 Jul 2013 19:12:26 +1000
Subject: [PATCH 249/314] libspotify: add darwin library

---
 .../libraries/libspotify/default.nix          | 77 ++++++++++++-------
 1 file changed, 50 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/libraries/libspotify/default.nix b/pkgs/development/libraries/libspotify/default.nix
index 1972a4be653..86007920d0e 100644
--- a/pkgs/development/libraries/libspotify/default.nix
+++ b/pkgs/development/libraries/libspotify/default.nix
@@ -1,25 +1,56 @@
-{ stdenv, fetchurl, libspotify, alsaLib, readline, pkgconfig, apiKey }:
+{ stdenv, fetchurl, libspotify, alsaLib, readline, pkgconfig, apiKey, unzip }:
 
 let version = "12.1.51"; in
 
-if stdenv.system != "x86_64-linux" then throw ''
-  Check https://developer.spotify.com/technologies/libspotify/ for a tarball for your system and add it here
-'' else stdenv.mkDerivation {
+if (stdenv.system == "x86_64-linux" && stdenv.system != "x86_64-darwin")
+then throw "Check https://developer.spotify.com/technologies/libspotify/ for a tarball for your system and add it here"
+else stdenv.mkDerivation {
   name = "libspotify-${version}";
 
-  src = fetchurl {
-    url = "https://developer.spotify.com/download/libspotify/libspotify-${version}-Linux-x86_64-release.tar.gz";
-
-    sha256 = "0n0h94i4xg46hfba95n3ypah93crwb80bhgsg00f6sms683lx8a3";
-  };
+  src =
+    if stdenv.system == "x86_64-linux" then
+      fetchurl {
+        url    = "https://developer.spotify.com/download/libspotify/libspotify-${version}-Linux-x86_64-release.tar.gz";
+        sha256 = "0n0h94i4xg46hfba95n3ypah93crwb80bhgsg00f6sms683lx8a3";
+      }
+    else if stdenv.system == "x86_64-darwin" then
+      fetchurl {
+        url    = "https://developer.spotify.com/download/libspotify/libspotify-${version}-Darwin-universal.zip";
+        sha256 = "1gcgrc8arim3hnszcc886lmcdb4iigc08abkaa02l6gng43ky1c0";
+      }
+    else
+      null;
 
+  # common
   buildPhase = "true";
+  # no patch or build phase for darwin
+  phases = [ "unpackPhase" "installPhase" ]
+    ++ stdenv.lib.optionals (stdenv.system == "x86_64-linux")
+      [ "patchPhase" "buildPhase" ];
+  installPhase = if (stdenv.system == "x86_64-linux")
+    then "installPhase"
+    else ''
+      mkdir -p "$out"/include/libspotify
+      mv -v libspotify.framework/Versions/Current/Headers/api.h \
+        "$out"/include/libspotify
+      mkdir -p "$out"/lib
+      mv -v libspotify.framework/Versions/Current/libspotify \
+        "$out"/lib/libspotify.dylib
+      mkdir -p "$out"/share/man
+      mv -v man3 "$out"/share/man
+    '';
+ 
 
-  installFlags = "prefix=$(out)";
+  # darwin-specific
+  buildInputs = stdenv.lib.optional (stdenv.system == "x86_64-darwin") unzip;
 
-  postInstall = "mv -v share $out";
-
-  patchPhase = "sed -i 's/ldconfig//' Makefile";
+  # linux-specific
+  installFlags = stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
+    "prefix=$(out)";
+  patchPhase = stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
+    "sed -i 's/ldconfig//' Makefile";
+  postInstall = stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
+    "mv -v share $out";
 
   passthru = {
     samples = if apiKey == null
@@ -27,35 +58,27 @@ if stdenv.system != "x86_64-linux" then throw ''
         Please visit ${libspotify.meta.homepage} to get an api key then set config.libspotify.apiKey accordingly
       '' else stdenv.mkDerivation {
         name = "libspotify-samples-${version}";
-
         src = libspotify.src;
-
-        buildInputs = [ pkgconfig libspotify alsaLib readline ];
-
+        buildInputs = [ pkgconfig libspotify readline ]
+          ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
         postUnpack = "sourceRoot=$sourceRoot/share/doc/libspotify/examples";
-
         patchPhase = "cp ${apiKey} appkey.c";
-
         installPhase = ''
           mkdir -p $out/bin
           install -m 755 jukebox/jukebox $out/bin
           install -m 755 spshell/spshell $out/bin
           install -m 755 localfiles/posix_stu $out/bin
         '';
-
         meta = libspotify.meta // { description = "Spotify API library samples"; };
       };
 
     inherit apiKey;
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Spotify API library";
-
-    homepage = https://developer.spotify.com/technologies/libspotify;
-
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
-
-    license = stdenv.lib.licenses.unfree;
+    homepage    = https://developer.spotify.com/technologies/libspotify;
+    maintainers = with maintainers; [ lovek323 shlevy ];
+    license     = licenses.unfree;
   };
 }

From 16bc5e12aa6b204dbb4b2413487d4c83351d7006 Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Thu, 4 Jul 2013 09:21:27 +1000
Subject: [PATCH 250/314] mopidy: update to latest version (0.14.2)

---
 pkgs/applications/audio/mopidy/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix
index d79ef44cabe..a8c33329227 100644
--- a/pkgs/applications/audio/mopidy/default.nix
+++ b/pkgs/applications/audio/mopidy/default.nix
@@ -5,12 +5,11 @@
 pythonPackages.buildPythonPackage rec {
   name = "mopidy-${version}";
 
-  version = "0.14.1";
+  version = "0.14.2";
 
   src = fetchgit {
-    url = "https://github.com/mopidy/mopidy.git";
-    rev = "refs/tags/v${version}";
-    sha256 = "0lgd8dpiri9m6sigpf1g1qzvz25lkb38lskgwvb8j7x64y104z0v";
+    url = "https://github.com/mopidy/mopidy/archive/v${version}.tar.gz";
+    sha256 = "0fqx7lk9g61d744b951cwx0szqbyji58dhw2ravnq9785nkhi7i4";
   };
 
   propagatedBuildInputs = with pythonPackages; [

From dff980733aa0f63bf8105f131dda5bc145f50112 Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Sun, 30 Jun 2013 11:49:24 +1000
Subject: [PATCH 251/314] add au debian mirror

---
 pkgs/build-support/fetchurl/mirrors.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 70a06735e68..b7461678fea 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -159,6 +159,7 @@ rec {
 
   # Debian.
   debian = [
+    ftp://ftp.au.debian.org/debian/
     ftp://ftp.de.debian.org/debian/
     ftp://ftp.es.debian.org/debian/
     ftp://ftp.fr.debian.org/debian/

From bd61c42d223864e6582584f7ac1c5db0a3987150 Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Sun, 30 Jun 2013 08:39:32 +1000
Subject: [PATCH 252/314] tk: fix build on darwin

---
 pkgs/development/libraries/tk/default.nix | 11 +++++++++--
 pkgs/top-level/all-packages.nix           |  4 +++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/tk/default.nix b/pkgs/development/libraries/tk/default.nix
index 290580e5212..5cfd0d178eb 100644
--- a/pkgs/development/libraries/tk/default.nix
+++ b/pkgs/development/libraries/tk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, tcl, x11 }:
+{ stdenv, fetchurl, tcl, x11, libX11 }:
 
 stdenv.mkDerivation {
   name = "tk-8.5.7";
@@ -16,11 +16,18 @@ stdenv.mkDerivation {
   
   preConfigure = "cd unix";
 
-  buildInputs = [tcl x11];
+  buildInputs = [ tcl x11 libX11 ];
   
   inherit tcl;
 
   passthru = {
     libPrefix = "tk8.5";
   };
+
+  meta = {
+    description = "A widget toolkit that provides a library of basic elements for building a GUI in many different programming languages";
+    homepage = http://www.tcl.tk/;
+    maintainers = with stdenv.lib.maintainers; [ eelco lovek323 ];
+    platforms = stdenv.lib.platforms.all;
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 543e28c08d2..e0318190777 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5376,7 +5376,9 @@ let
 
   tinyxml2 = callPackage ../development/libraries/tinyxml/2.6.2.nix { };
 
-  tk = callPackage ../development/libraries/tk { };
+  tk = callPackage ../development/libraries/tk {
+    libX11 = xlibs.libX11;
+  };
 
   tnt = callPackage ../development/libraries/tnt { };
 

From 9007e57f281cc692c7ac2682c088d5e48b161d76 Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Sun, 30 Jun 2013 09:49:55 +1000
Subject: [PATCH 253/314] python27: compile with tkinterp on darwin

---
 pkgs/development/interpreters/python/2.7/default.nix | 5 ++---
 pkgs/development/libraries/tk/default.nix            | 2 +-
 pkgs/top-level/all-packages.nix                      | 4 +++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index ccb423ef32e..76ef7399812 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2
-, sqlite, tcl, tk, x11, openssl, readline, db4, ncurses, gdbm
-}:
+, sqlite, tcl, tk, x11, openssl, readline, db4, ncurses, gdbm, libX11 }:
 
 assert zlibSupport -> zlib != null;
 
@@ -179,7 +178,7 @@ let
 
     tkinter = buildInternalPythonModule {
       moduleName = "tkinter";
-      deps = [ tcl tk x11 ];
+      deps = [ tcl tk x11 libX11 ];
     };
 
     readline = buildInternalPythonModule {
diff --git a/pkgs/development/libraries/tk/default.nix b/pkgs/development/libraries/tk/default.nix
index 5cfd0d178eb..a45c4217c7b 100644
--- a/pkgs/development/libraries/tk/default.nix
+++ b/pkgs/development/libraries/tk/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A widget toolkit that provides a library of basic elements for building a GUI in many different programming languages";
     homepage = http://www.tcl.tk/;
-    maintainers = with stdenv.lib.maintainers; [ eelco lovek323 ];
+    maintainers = with stdenv.lib.maintainers; [ lovek323 ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e0318190777..61690974366 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3094,7 +3094,9 @@ let
 
   python = python27;
   python26 = callPackage ../development/interpreters/python/2.6 { };
-  python27 = callPackage ../development/interpreters/python/2.7 { };
+  python27 = callPackage ../development/interpreters/python/2.7 {
+    libX11 = xlibs.libX11;
+  };
 
   pythonFull = python27Full;
   python26Full = callPackage ../development/interpreters/python/wrapper.nix {

From 1f9005a3f6bb6586c809e0feb71a5b39e5690499 Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Mon, 24 Jun 2013 14:32:02 +0200
Subject: [PATCH 254/314] php53: add imap option

---
 pkgs/development/interpreters/php/5.3.nix | 21 ++++++++-------------
 pkgs/tools/networking/uwimap/default.nix  |  4 +++-
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix
index 347a374ffcc..d879a611c2a 100644
--- a/pkgs/development/interpreters/php/5.3.nix
+++ b/pkgs/development/interpreters/php/5.3.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison
 , apacheHttpd, mysql, libxml2, readline, zlib, curl, gd, postgresql, gettext
 , openssl, pkgconfig, sqlite, config, libjpeg, libpng, freetype, libxslt
-, libmcrypt, bzip2, icu, libssh2, makeWrapper, libiconvOrEmpty, libiconv }:
+, libmcrypt, bzip2, icu, libssh2, makeWrapper, libiconvOrEmpty, libiconv, uwimap
+, pam }:
 
 let
   libmcryptOverride = libmcrypt.override { disablePosixThreads = true; };
@@ -132,6 +133,11 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
         buildInputs = [gettext];
       };
 
+      imap = {
+        configureFlags = [ "--with-imap=${uwimap}" "--with-imap-ssl" ];
+        buildInputs = [ uwimap openssl pam ];
+      };
+
       intl = {
         configureFlags = ["--enable-intl"];
         buildInputs = [icu];
@@ -163,18 +169,6 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
       ftp = {
         configureFlags = ["--enable-ftp"];
       };
-
-      /*
-         php is build within this derivation in order to add the xdebug lines to the php.ini.
-         So both Apache and command line php both use xdebug without having to configure anything.
-         Xdebug could be put in its own derivation.
-      * /
-        meta = {
-                description = "debugging support for PHP";
-                homepage = http://xdebug.org;
-                license = "based on the PHP license - as is";
-                };
-      */
     };
 
   cfg = {
@@ -186,6 +180,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
     ftpSupport = config.php.ftp or true;
     gdSupport = config.php.gd or true;
     gettextSupport = config.php.gettext or true;
+    imapSupport = config.php.imap or false;
     intlSupport = config.php.intl or true;
     libxml2Support = config.php.libxml2 or true;
     mbstringSupport = config.php.mbstring or true;
diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix
index 8c8c0241204..be3153ba281 100644
--- a/pkgs/tools/networking/uwimap/default.nix
+++ b/pkgs/tools/networking/uwimap/default.nix
@@ -8,7 +8,9 @@ stdenv.mkDerivation {
     sha256 = "0a2a00hbakh0640r2wdpnwr8789z59wnk7rfsihh3j0vbhmmmqak";
   };
 
-  makeFlags = "lnp"; # Linux with PAM modules
+  makeFlags = "lnp" # Linux with PAM modules
+    # -fPIC is required to compile php with imap on x86_64 systems
+    + stdenv.lib.optionalString stdenv.isx86_64 " EXTRACFLAGS=-fPIC";
 
   buildInputs = [ pam openssl ];
 

From 91855156111c56b4e8726e2ae8eb1e27e21bdfd4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 4 Jul 2013 11:35:57 +0200
Subject: [PATCH 255/314] R: add various features

 * Ensure that R can link blas, liblapack, and libgfortran at run-time.
 * Ensure that R can run the Tcl/Tk interpreter.
 * Add Java support.
 * Install texinfo and PDF documentation.
---
 pkgs/applications/science/math/R/default.nix  | 57 ++++++++++++++++++-
 .../math/R/no-usr-local-search-paths.patch    | 24 ++++++++
 2 files changed, 78 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/applications/science/math/R/no-usr-local-search-paths.patch

diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 5ceefb87af0..fd391b988c9 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, blas, bzip2, gfortran, liblapack, libX11, libXmu, libXt
 , libjpeg, libpng, libtiff, ncurses, pango, pcre, perl, readline, tcl
-, texLive, tk, xz, zlib, less, texinfo, graphviz
+, texLive, tk, xz, zlib, less, texinfo, graphviz, icu, pkgconfig, bison
+, imake, which, jdk, atlas
 }:
 
 stdenv.mkDerivation rec {
@@ -13,15 +14,65 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ blas bzip2 gfortran liblapack libX11 libXmu libXt
     libXt libjpeg libpng libtiff ncurses pango pcre perl readline tcl
-    texLive tk xz zlib less texinfo graphviz ];
+    texLive tk xz zlib less texinfo graphviz icu pkgconfig bison imake
+    which jdk atlas
+  ];
+
+  patches = [ ./no-usr-local-search-paths.patch ];
+
+  preConfigure = ''
+    configureFlagsArray=(
+      --disable-lto
+      --with-blas="-L${atlas}/lib -lf77blas -latlas"
+      --with-lapack="-L${liblapack}/lib -llapack"
+      --with-readline
+      --with-tcltk --with-tcl-config="${tcl}/lib/tclConfig.sh" --with-tk-config="${tk}/lib/tkConfig.sh"
+      --with-cairo
+      --with-libpng
+      --with-jpeglib
+      --with-libtiff
+      --with-system-zlib
+      --with-system-bzlib
+      --with-system-pcre
+      --with-system-xz
+      --with-ICU
+      R_SHELL="${stdenv.shell}"
+      JAVA_HOME="${jdk}"
+      LDFLAGS="-L${gfortran.gcc}/lib"
+    )
+    echo "TCLLIBPATH=${tk}/lib" >>etc/Renviron.in
+  '';
+
+  installTargets = [ "install" "install-info" "install-pdf" ];
+
+  doCheck = true;
 
   enableParallelBuilding = true;
 
   meta = {
-    description = "a free software environment for statistical computing and graphics";
     homepage = "http://www.r-project.org/";
+    description = "a free software environment for statistical computing and graphics";
     license = stdenv.lib.licenses.gpl2Plus;
 
+    longDescription = ''
+      GNU R is a language and environment for statistical computing and
+      graphics that provides a wide variety of statistical (linear and
+      nonlinear modelling, classical statistical tests, time-series
+      analysis, classification, clustering, ...) and graphical
+      techniques, and is highly extensible. One of R's strengths is the
+      ease with which well-designed publication-quality plots can be
+      produced, including mathematical symbols and formulae where
+      needed. R is an integrated suite of software facilities for data
+      manipulation, calculation and graphical display. It includes an
+      effective data handling and storage facility, a suite of operators
+      for calculations on arrays, in particular matrices, a large,
+      coherent, integrated collection of intermediate tools for data
+      analysis, graphical facilities for data analysis and display
+      either on-screen or on hardcopy, and a well-developed, simple and
+      effective programming language which includes conditionals, loops,
+      user-defined recursive functions and input and output facilities.
+    '';
+
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.simons ];
   };
diff --git a/pkgs/applications/science/math/R/no-usr-local-search-paths.patch b/pkgs/applications/science/math/R/no-usr-local-search-paths.patch
new file mode 100644
index 00000000000..6c7f6d4ee02
--- /dev/null
+++ b/pkgs/applications/science/math/R/no-usr-local-search-paths.patch
@@ -0,0 +1,24 @@
+diff -ubr R-3.0.1-orig/configure R-3.0.1/configure
+--- R-3.0.1-orig/configure	2013-07-04 10:46:42.336133947 +0200
++++ R-3.0.1/configure	2013-07-04 10:46:17.181919960 +0200
+@@ -3800,13 +3800,13 @@
+ : ${LIBnn=$libnn}
+ ## We provide these defaults so that headers and libraries in
+ ## '/usr/local' are found (by the native tools, mostly).
+-if test -f "/sw/etc/fink.conf"; then
+-  : ${CPPFLAGS="-I/sw/include -I/usr/local/include"}
+-  : ${LDFLAGS="-L/sw/lib -L/usr/local/lib"}
+-else
+-  : ${CPPFLAGS="-I/usr/local/include"}
+-  : ${LDFLAGS="-L/usr/local/${LIBnn}"}
+-fi
++# if test -f "/sw/etc/fink.conf"; then
++#   : ${CPPFLAGS="-I/sw/include -I/usr/local/include"}
++#   : ${LDFLAGS="-L/sw/lib -L/usr/local/lib"}
++# else
++#   : ${CPPFLAGS="-I/usr/local/include"}
++#   : ${LDFLAGS="-L/usr/local/${LIBnn}"}
++# fi
+ 
+ ## take care not to  override the command-line setting
+ if test "${libdir}" = '${exec_prefix}/lib'; then

From 3df0409cb6b36466817bf8eb4e9e8c5509770d15 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 4 Jul 2013 13:26:34 +0200
Subject: [PATCH 256/314] liblapack: propagate the 'shared' flag to atlas

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

diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix
index 029deecb93a..e54eaba4f15 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, gfortran, atlas, cmake, python, shared ? false }:
-let 
-  atlasMaybeShared = if shared then atlas.override {shared=true;} else atlas;
+let
+  atlasMaybeShared = atlas.override { inherit shared; };
   usedLibExtension = if shared then ".so" else ".a";
 in
 stdenv.mkDerivation {

From 70a437e4a770fb6b646958a10d0e69bd545ec113 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 4 Jul 2013 14:12:42 +0200
Subject: [PATCH 257/314] editres: add version 1.0.6

The tool doesn't seem to work well for me. Not sure whether I'm building
it wrong, maybe?
---
 pkgs/tools/graphics/editres/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  5 +++++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/tools/graphics/editres/default.nix

diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/tools/graphics/editres/default.nix
new file mode 100644
index 00000000000..50f81c3ea4d
--- /dev/null
+++ b/pkgs/tools/graphics/editres/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, libXt, libXaw, libXres, utilmacros }:
+
+stdenv.mkDerivation rec {
+  name = "editres-1.0.6";
+
+  src = fetchurl {
+    url = "http://xorg.freedesktop.org/releases/individual/app/${name}.tar.gz";
+    sha256 = "06kv7dmw6pzlqc46dbh8k9xpb6sn4ihh0bcpxq0zpvw2lm66dx45";
+  };
+
+  buildInputs = [ pkgconfig libXt libXaw libXres utilmacros ];
+
+  preConfigure = "configureFlags=--with-appdefaultdir=$out/share/X11/app-defaults/editres";
+
+  meta = {
+    homepage = "http://cgit.freedesktop.org/xorg/app/editres/";
+    description = "a dynamic resource editor for X Toolkit applications";
+
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.simons ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 61690974366..13131781b39 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -755,6 +755,11 @@ let
 
   ecryptfs = callPackage ../tools/security/ecryptfs { };
 
+  editres = callPackage ../tools/graphics/editres {
+    inherit (xlibs) libXt libXaw;
+    inherit (xorg) utilmacros;
+  };
+
   edk2 = callPackage ../development/compilers/edk2 { };
 
   efibootmgr = callPackage ../tools/system/efibootmgr { };

From e2874236d38666436d4147ee7682284cf35f3e9f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 4 Jul 2013 17:47:02 +0200
Subject: [PATCH 258/314] llvm: fix meta.license attribute

---
 pkgs/development/compilers/llvm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index c06abe0db94..1e53256a240 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description = "Collection of modular and reusable compiler and toolchain technologies";
     homepage    = http://llvm.org/;
-    license     = licenses.bsd;
+    license     = licenses.bsd3;
     maintainers = with maintainers; [ lovek323 raskin shlevy viric ];
     platforms   = platforms.all;
   };

From f0738b3c1648a8f627e3029ba43ff6fd44c3c98c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 4 Jul 2013 17:38:56 +0200
Subject: [PATCH 259/314] haskell-oeis: update to version 0.3.4

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

diff --git a/pkgs/development/libraries/haskell/oeis/default.nix b/pkgs/development/libraries/haskell/oeis/default.nix
index 09e7b00fb74..0b26de00e05 100644
--- a/pkgs/development/libraries/haskell/oeis/default.nix
+++ b/pkgs/development/libraries/haskell/oeis/default.nix
@@ -2,11 +2,10 @@
 
 cabal.mkDerivation (self: {
   pname = "oeis";
-  version = "0.3.3";
-  sha256 = "0a0h7wmyy11iqb121w4i6d8masd0xi77dnihickrhlblpbbwq0xn";
+  version = "0.3.4";
+  sha256 = "15xn7cybk43lk8wjd22l3zwvkyrmlixpfyrxsy3rnvh0vmn0r25d";
   buildDepends = [ HTTP network ];
   testDepends = [ HUnit testFramework testFrameworkHunit ];
-  doCheck = false;
   meta = {
     description = "Interface to the Online Encyclopedia of Integer Sequences (OEIS)";
     license = self.stdenv.lib.licenses.bsd3;

From cfbae2de737f3ac95e107bdf599b2095e3df24f7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 4 Jul 2013 17:38:57 +0200
Subject: [PATCH 260/314] haskell-shelly: update to version 1.3.0.3

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

diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix
index 639d913e040..7bb9466864e 100644
--- a/pkgs/development/libraries/haskell/shelly/default.nix
+++ b/pkgs/development/libraries/haskell/shelly/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shelly";
-  version = "1.3.0.2";
-  sha256 = "1vhjqm2y6hfaq88k4qz0gdjic1316c5p1gyzgz19r0iwry6msrh2";
+  version = "1.3.0.3";
+  sha256 = "0izfxv45b5j9p3q2nrlxdn9g4vfmzghl4ab7zisn07gx381wk9qq";
   buildDepends = [
     mtl systemFileio systemFilepath text time unixCompat
   ];

From 4a0952d2fa1389a41a09684d7d1ab267c2315983 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 18:13:20 +0200
Subject: [PATCH 261/314] fix bad "licence" names

Mostly what I merged from @lovek323.
Such errors can be easily checked by
  nix-env -f . -qa \* --meta --xml --drv-path --show-trace >/dev/null
---
 pkgs/applications/audio/abcde/default.nix                     | 2 +-
 pkgs/applications/audio/cd-discid/default.nix                 | 4 ++--
 .../science/molecular-dynamics/gromacs/default.nix            | 2 +-
 pkgs/development/interpreters/renpy/default.nix               | 2 +-
 .../libraries/gstreamer/gst-plugins-base/default.nix          | 2 +-
 pkgs/development/libraries/liboil/default.nix                 | 2 +-
 pkgs/development/python-modules/pygame/default.nix            | 2 +-
 pkgs/os-specific/linux/latencytop/default.nix                 | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix
index e8c37d25694..c6b5e9da0dd 100644
--- a/pkgs/applications/audio/abcde/default.nix
+++ b/pkgs/applications/audio/abcde/default.nix
@@ -61,7 +61,7 @@ in
 
     meta = {
       homepage = "http://lly.org/~rcw/abcde/page/";
-      licence = "GPLv2+";
+      license = "GPLv2+";
       description = "A Better CD Encoder (ABCDE)";
 
       longDescription = ''
diff --git a/pkgs/applications/audio/cd-discid/default.nix b/pkgs/applications/audio/cd-discid/default.nix
index 24e0be5eac0..c67830a94e7 100644
--- a/pkgs/applications/audio/cd-discid/default.nix
+++ b/pkgs/applications/audio/cd-discid/default.nix
@@ -19,7 +19,7 @@ in
 
     meta = {
       homepage = http://lly.org/~rcw/cd-discid/;
-      licence = "GPLv2+";
+      license = "GPLv2+";
       description = "cd-discid, a command-line utility to retrieve a disc's CDDB ID";
 
       longDescription = ''
@@ -28,4 +28,4 @@ in
         abcde), but can be used for any purpose requiring CDDB data.
       '';
     };
-  }
\ No newline at end of file
+  }
diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
index c687fd5908c..de4bb171497 100644
--- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
+++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage    = "http://www.gromacs.org";
-    licence     = "GPLv2";
+    license     = "GPLv2";
     description = "The GROMACS molecular dynamics software package";
     longDescription = ''
       GROMACS is a versatile package to perform molecular dynamics,
diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix
index 9b34f9a1fef..f7d8b93f966 100644
--- a/pkgs/development/interpreters/renpy/default.nix
+++ b/pkgs/development/interpreters/renpy/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Ren'Py Visual Novel Engine";
     homepage = "http://renpy.org/";
-    licence = "MIT";
+    license = "MIT";
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
index e29be91c34b..da861dda12d 100644
--- a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage    = http://gstreamer.freedesktop.org;
     description = "Base plug-ins for GStreamer";
-    license     = licences.lgpl2Plus;
+    license     = licenses.lgpl2Plus;
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.unix;
   };
diff --git a/pkgs/development/libraries/liboil/default.nix b/pkgs/development/libraries/liboil/default.nix
index de2ffdffca7..66d07b547c5 100644
--- a/pkgs/development/libraries/liboil/default.nix
+++ b/pkgs/development/libraries/liboil/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A library of simple functions that are optimized for various CPUs";
     homepage    = http://liboil.freedesktop.org;
-    license     = libraries.bsd2;
+    license     = licenses.bsd2;
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.all;
   };
diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix
index 912642e3ea9..a6efb8bdc2b 100644
--- a/pkgs/development/python-modules/pygame/default.nix
+++ b/pkgs/development/python-modules/pygame/default.nix
@@ -32,6 +32,6 @@ stdenv.mkDerivation {
   meta = {
     description = "Python library for games";
     homepage = "http://www.pygame.org/";
-    licences = "LGPLv2.1+";
+    license = "LGPLv2.1+";
   };
 }
diff --git a/pkgs/os-specific/linux/latencytop/default.nix b/pkgs/os-specific/linux/latencytop/default.nix
index d5c857cf4c9..eb776dcb86d 100644
--- a/pkgs/os-specific/linux/latencytop/default.nix
+++ b/pkgs/os-specific/linux/latencytop/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://latencytop.org;
     description = "Tool to show kernel reports on latencies (LATENCYTOP option)";
-    licence = "GPLv2";
+    license = "GPLv2";
     maintainers = [ stdenv.lib.maintainers.viric ];
     platforms = stdenv.lib.platforms.linux;
   };

From 9da1586d7529af32337b3ec8de261d60d1312a4a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Jul 2013 16:52:43 +0200
Subject: [PATCH 262/314] qemu: Update to 1.5.1

---
 pkgs/applications/virtualization/qemu/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 434ec180203..bfbc9a8ab72 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -2,11 +2,11 @@
 , attr, libcap, vde2 }:
 
 stdenv.mkDerivation rec {
-  name = "qemu-1.4.0";
+  name = "qemu-1.5.1";
 
   src = fetchurl {
     url = "http://wiki.qemu.org/download/${name}.tar.bz2";
-    sha256 = "1a7d11vjs1p6i1ck2ff9annmkhpkbjl73hl9i1cbg3s0fznrfqh6";
+    sha256 = "1s7316pgizpayr472la8p8a4vhv7ymmzd5qlbkmq6y9q5zpa25ac";
   };
 
   buildInputs = [
@@ -22,9 +22,10 @@ stdenv.mkDerivation rec {
   ];
 
   meta = {
-    description = "QEmu processor emulator";
+    homepage = http://www.qemu.org/;
+    description = "A generic and open source machine emulator and virtualizer";
     license = "GPLv2+";
-    maintainers = with stdenv.lib.maintainers; [ viric shlevy ];
-    platforms = with stdenv.lib.platforms; linux;
+    maintainers = with stdenv.lib.maintainers; [ viric shlevy eelco ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From e3e35c1f15730f861aa70707236ce304bd7c90b7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Jul 2013 17:35:52 +0200
Subject: [PATCH 263/314] spice-protocol: Update to 0.12.6

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

diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix
index 25f42275644..e281b1fcf9d 100644
--- a/pkgs/development/libraries/spice-protocol/default.nix
+++ b/pkgs/development/libraries/spice-protocol/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "spice-protocol-0.12.2";
+  name = "spice-protocol-0.12.6";
 
   src = fetchurl {
     url = "http://www.spice-space.org/download/releases/${name}.tar.bz2";
-    sha256 = "0v6msf6gbl8g69qamp97dggz148zpc3ncbfgbq3b472wszjdkclb";
+    sha256 = "16r5x2sppiaa6pzawkrvk5q4hmw7ynmlp2xr38f1vaxj5rh4aiwx";
   };
 
   meta = {

From e638620100989bc00d645fd4ff0641766cb3e108 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Jul 2013 17:36:02 +0200
Subject: [PATCH 264/314] spice: Update to 0.12.3

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

diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix
index 2bcb9e593b8..bcbe60ffa6d 100644
--- a/pkgs/development/libraries/spice/default.nix
+++ b/pkgs/development/libraries/spice/default.nix
@@ -1,20 +1,20 @@
 { stdenv, fetchurl, pkgconfig, pixman, celt, alsaLib, openssl
 , libXrandr, libXfixes, libXext, libXrender, libXinerama, libjpeg, zlib
-, spice_protocol, python, pyparsing }:
+, spice_protocol, python, pyparsing, glib }:
 
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "spice-0.12.0";
+  name = "spice-0.12.3";
 
   src = fetchurl {
     url = "http://www.spice-space.org/download/releases/${name}.tar.bz2";
-    sha256 = "15mp6nz467h4l5jg3vk51si6r5w7g329jvsy61f2gl3yabwcxmva";
+    sha256 = "0il50hcw87mzs3dw80a9gkidmhgf9s8691xmki3gj9358qf5xmmz";
   };
 
   buildInputs = [ pixman celt alsaLib openssl libjpeg zlib
                   libXrandr libXfixes libXrender libXext libXinerama
-                  python pyparsing ];
+                  python pyparsing glib ];
 
   nativeBuildInputs = [ pkgconfig spice_protocol ];
 

From d199fe766a6f96d8739b5e8d1a9d9211d5f795e8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Jul 2013 17:44:44 +0200
Subject: [PATCH 265/314] qemu: Merge stuff from qemu-kvm

---
 .../virtualization/qemu/default.nix           | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index bfbc9a8ab72..91d803fb026 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -1,5 +1,9 @@
-{ stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses, perl, pixman
-, attr, libcap, vde2 }:
+{ stdenv, fetchurl, python, zlib, pkgconfig, glib, ncurses, perl, pixman
+, attr, libcap, vde2, alsaLib, texinfo, libuuid
+, sdlSupport ? true, SDL
+, vncSupport ? true, libjpeg, libpng
+, spiceSupport ? false, spice, spice_protocol
+}:
 
 stdenv.mkDerivation rec {
   name = "qemu-1.5.1";
@@ -9,17 +13,21 @@ stdenv.mkDerivation rec {
     sha256 = "1s7316pgizpayr472la8p8a4vhv7ymmzd5qlbkmq6y9q5zpa25ac";
   };
 
-  buildInputs = [
-    python zlib pkgconfig glib SDL ncurses perl pixman attr libcap
-    vde2
-  ];
+  buildInputs =
+    [ python zlib pkgconfig glib ncurses perl pixman attr libcap
+      vde2 alsaLib texinfo libuuid
+    ]
+    ++ stdenv.lib.optionals sdlSupport [ SDL ]
+    ++ stdenv.lib.optionals vncSupport [ libjpeg libpng ]
+    ++ stdenv.lib.optionals spiceSupport [ spice_protocol spice ];
 
   enableParallelBuilding = true;
 
-  configureFlags = [
-    "--enable-virtfs"
-    "--enable-vde"
-  ];
+  configureFlags =
+    [ "--audio-drv-list=alsa"
+      "--smbd=smbd"  # use `smbd' from $PATH
+    ]
+    ++ stdenv.lib.optional spiceSupport "--enable-spice";
 
   meta = {
     homepage = http://www.qemu.org/;

From b625a16068f0142fd3c90d772c8111d549b35dac Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Jul 2013 17:45:37 +0200
Subject: [PATCH 266/314] qemu: Merge qemu-kvm dependencies

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

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 91d803fb026..76783957d57 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   configureFlags =
     [ "--audio-drv-list=alsa"
-      "--smbd=smbd"  # use `smbd' from $PATH
+      "--smbd=smbd" # use `smbd' from $PATH
     ]
     ++ stdenv.lib.optional spiceSupport "--enable-spice";
 

From abc10b47158c2be67aafb4f29f259665c7b94a8e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Jul 2013 18:01:11 +0200
Subject: [PATCH 267/314] qemu: Allow building only the x86 emulator

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

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 76783957d57..91050619e43 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -3,6 +3,7 @@
 , sdlSupport ? true, SDL
 , vncSupport ? true, libjpeg, libpng
 , spiceSupport ? false, spice, spice_protocol
+, x86Only ? false
 }:
 
 stdenv.mkDerivation rec {
@@ -27,7 +28,8 @@ stdenv.mkDerivation rec {
     [ "--audio-drv-list=alsa"
       "--smbd=smbd" # use `smbd' from $PATH
     ]
-    ++ stdenv.lib.optional spiceSupport "--enable-spice";
+    ++ stdenv.lib.optional spiceSupport "--enable-spice"
+    ++ stdenv.lib.optional x86Only "--target-list=i386-softmmu,x86_64-softmmu";
 
   meta = {
     homepage = http://www.qemu.org/;

From 7afc1149d9fd506dc682faebf23de9813fba3357 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Jul 2013 18:23:25 +0200
Subject: [PATCH 268/314] testRPMImage: Use x86_64 image

---
 pkgs/build-support/vm/test.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/vm/test.nix b/pkgs/build-support/vm/test.nix
index e59bc934d4b..eed7cd017c4 100644
--- a/pkgs/build-support/vm/test.nix
+++ b/pkgs/build-support/vm/test.nix
@@ -8,7 +8,7 @@ rec {
   buildPatchelfInVM = runInLinuxVM patchelf;
 
 
-  testRPMImage = makeImageTestScript diskImages.fedora16i386;
+  testRPMImage = makeImageTestScript diskImages.fedora16x86_64;
 
 
   buildPatchelfRPM = buildRPM {

From f5a130b6b3ccd7c44c23357e32573cb2ab466c5a Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Sun, 2 Jun 2013 16:27:00 +1000
Subject: [PATCH 269/314] newsbeuter: add expression

---
 .../feedreaders/newsbeuter/default.nix        | 41 ++++++++++
 pkgs/development/libraries/ncurses/5_4.nix    | 75 +++++++++++++++++++
 pkgs/development/libraries/stfl/default.nix   | 37 +++++++++
 pkgs/top-level/all-packages.nix               | 18 ++++-
 4 files changed, 170 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/networking/feedreaders/newsbeuter/default.nix
 create mode 100644 pkgs/development/libraries/ncurses/5_4.nix
 create mode 100644 pkgs/development/libraries/stfl/default.nix

diff --git a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix
new file mode 100644
index 00000000000..db29c4f22ea
--- /dev/null
+++ b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, sqlite, curl, pkgconfig, libxml2, stfl, json_c, ncurses
+, gettext, libiconvOrEmpty, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "newsbeuter-2.6";
+
+  src = fetchurl {
+    url = "http://www.newsbeuter.org/downloads/${name}.tar.gz";
+    sha256 = "1hywz5206k0ykjklkjvnfy9fm4jfv9phz8dkzzwhfcjvqv9zv29i";
+  };
+
+  buildInputs
+    # use gettext instead of libintlOrEmpty so we have access to the msgfmt
+    # command
+    = [ pkgconfig sqlite curl libxml2 stfl json_c ncurses gettext ]
+      ++ libiconvOrEmpty
+      ++ stdenv.lib.optional stdenv.isDarwin makeWrapper;
+
+  preBuild = ''
+    sed -i -e 104,108d config.sh
+    export LDFLAGS=-lncursesw
+  '';
+
+  installPhase = ''
+    DESTDIR=$out prefix=\"\" make install
+  ''
+    + stdenv.lib.optionalString stdenv.isDarwin ''
+      for prog in $out/bin/*; do
+        wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib"
+      done
+    '';
+
+  meta = {
+    homepage    = http://www.newsbeuter.org;
+    description = "An open-source RSS/Atom feed reader for text terminals";
+    maintainers = with stdenv.lib.maintainers; [ lovek323 ];
+    license     = stdenv.lib.licenses.mit;
+    platforms   = stdenv.lib.platforms.unix;
+  };
+}
+
diff --git a/pkgs/development/libraries/ncurses/5_4.nix b/pkgs/development/libraries/ncurses/5_4.nix
new file mode 100644
index 00000000000..1cf08bd30c6
--- /dev/null
+++ b/pkgs/development/libraries/ncurses/5_4.nix
@@ -0,0 +1,75 @@
+{stdenv, fetchurl, unicode ? true}:
+
+let
+  /* C++ bindings fail to build on `i386-pc-solaris2.11' with GCC 3.4.3:
+     <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6395191>.
+     It seems that it could be worked around by #including <wchar.h> in the
+     right place, according to
+     <http://mail.python.org/pipermail/python-bugs-list/2006-September/035362.html>,
+     but this is left as an exercise to the reader.
+     So disable them for now.  */
+  cxx = stdenv.system != "i686-solaris";
+in
+stdenv.mkDerivation (rec {
+  name = "ncurses-5.4";
+
+  src = fetchurl {
+    url = "mirror://gnu/ncurses/${name}.tar.gz";
+    sha256 = "0div11f5flig67v702fd3sj362zagrnaj0d8wvs905s3rxiy1g2s";
+  };
+
+  configureFlags = ''
+    --with-shared --includedir=''${out}/include --without-debug
+    ${if unicode then "--enable-widec" else ""}${if cxx then "" else "--without-cxx-binding"}
+  '';
+
+  selfNativeBuildInput = true;
+
+  enableParallelBuilding = true;
+
+  preBuild =
+    # On Darwin, we end up using the native `sed' during bootstrap, and it
+    # fails to run this command, which isn't needed anyway.
+    stdenv.lib.optionalString (!stdenv.isDarwin)
+    ''sed -e "s@\([[:space:]]\)sh @\1''${SHELL} @" -i */Makefile Makefile'';
+
+  # When building a wide-character (Unicode) build, create backward
+  # compatibility links from the the "normal" libraries to the
+  # wide-character libraries (e.g. libncurses.so to libncursesw.so).
+  postInstall = if unicode then ''
+    ${if cxx then "chmod 644 $out/lib/libncurses++w.a" else ""}
+    for lib in curses ncurses form panel menu; do
+      if test -e $out/lib/lib''${lib}w.a; then
+        rm -f $out/lib/lib$lib.so
+        echo "INPUT(-l''${lib}w)" > $out/lib/lib$lib.so
+        ln -svf lib''${lib}w.a $out/lib/lib$lib.a
+        ln -svf lib''${lib}w.so.5 $out/lib/lib$lib.so.5
+      fi
+    done;
+  '' else "";
+
+  meta = {
+    description = "GNU Ncurses, a free software emulation of curses in SVR4 and more";
+
+    longDescription = ''
+      The Ncurses (new curses) library is a free software emulation of
+      curses in System V Release 4.0, and more.  It uses Terminfo
+      format, supports pads and color and multiple highlights and
+      forms characters and function-key mapping, and has all the other
+      SYSV-curses enhancements over BSD Curses.
+
+      The ncurses code was developed under GNU/Linux.  It has been in
+      use for some time with OpenBSD as the system curses library, and
+      on FreeBSD and NetBSD as an external package.  It should port
+      easily to any ANSI/POSIX-conforming UNIX.  It has even been
+      ported to OS/2 Warp!
+    '';
+
+    homepage = http://www.gnu.org/software/ncurses/;
+
+    license = "X11";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.all;
+  };
+} // ( if stdenv.isDarwin then { postFixup = "rm $out/lib/*.so"; } else { } ) )
diff --git a/pkgs/development/libraries/stfl/default.nix b/pkgs/development/libraries/stfl/default.nix
new file mode 100644
index 00000000000..9e3f749ca8f
--- /dev/null
+++ b/pkgs/development/libraries/stfl/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, ncurses, libiconvOrEmpty }:
+
+stdenv.mkDerivation rec {
+  name = "stfl-0.22";
+
+  src = fetchurl {
+    url = "http://www.clifford.at/stfl/${name}.tar.gz";
+    sha256 = "062lqlf3qhp8bcapbpc0k3wym7x6ngncql8jmx5x06p6679szp9d";
+  };
+
+  buildInputs = [ ncurses ] ++ libiconvOrEmpty;
+
+  buildPhase = ''
+    sed -i s%ncursesw/ncurses.h%ncurses.h% stfl_internals.h
+  '' + ( stdenv.lib.optionalString stdenv.isDarwin ''
+    sed -i 's/LDLIBS += -lncursesw/LDLIBS += -lncursesw -liconv/' Makefile
+    sed -i s/-soname/-install_name/ Makefile
+  '' ) + ''
+    make
+  '';
+
+  installPhase = ''
+    DESTDIR=$out prefix=\"\" make install
+
+    # some programs rely on libstfl.so.0 to be present, so link it
+    ln -s $out/lib/libstfl.so.0.22 $out/lib/libstfl.so.0
+  '';
+
+  meta = {
+    homepage    = http://www.clifford.at/stfl/;
+    description = "A library which implements a curses-based widget set for text terminals";
+    maintainers = with stdenv.lib.maintainers; [ lovek323 ];
+    license     = stdenv.lib.licenses.lgpl3;
+    platforms   = stdenv.lib.platforms.unix;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 13131781b39..ad6a1032d9b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1319,6 +1319,8 @@ let
 
   networkmanagerapplet = newScope gnome ../tools/networking/network-manager-applet { };
 
+  newsbeuter = callPackage ../applications/networking/feedreaders/newsbeuter { };
+
   pa_applet = callPackage ../tools/audio/pa-applet { };
 
   nilfs_utils = callPackage ../tools/filesystems/nilfs-utils {};
@@ -4982,7 +4984,14 @@ let
 
   mythes = callPackage ../development/libraries/mythes { };
 
-  ncurses = makeOverridable (import ../development/libraries/ncurses) {
+  ncurses_5_4 = makeOverridable (import ../development/libraries/ncurses/5_4.nix) {
+    inherit fetchurl;
+    unicode = system != "i686-cygwin";
+    stdenv = if stdenv.isDarwin
+      then allStdenvs.stdenvNative
+      else stdenv;
+  };
+  ncurses_5_9 = makeOverridable (import ../development/libraries/ncurses) {
     inherit fetchurl;
     unicode = system != "i686-cygwin";
     stdenv =
@@ -4993,6 +5002,7 @@ let
       then allStdenvs.stdenvNative
       else stdenv;
   };
+  ncurses = ncurses_5_9;
 
   neon = callPackage ../development/libraries/neon {
     compressionSupport = true;
@@ -5339,6 +5349,12 @@ let
     inherit readline ncurses;
   });
 
+  stfl = callPackage ../development/libraries/stfl {
+    stdenv = if stdenv.isDarwin
+      then overrideGCC stdenv gccApple
+      else stdenv;
+  };
+
   stlink = callPackage ../development/tools/misc/stlink { };
 
   stlport = callPackage ../development/libraries/stlport { };

From 061462aef95dcdbc33391b571ffa1f90768744e1 Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Thu, 4 Jul 2013 04:06:39 +0200
Subject: [PATCH 270/314] newsbeuter: fix perl shebang

---
 .../networking/feedreaders/newsbeuter/default.nix            | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix
index db29c4f22ea..3bca5cc91da 100644
--- a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, sqlite, curl, pkgconfig, libxml2, stfl, json_c, ncurses
-, gettext, libiconvOrEmpty, makeWrapper }:
+, gettext, libiconvOrEmpty, makeWrapper, perl }:
 
 stdenv.mkDerivation rec {
   name = "newsbeuter-2.6";
@@ -12,12 +12,13 @@ stdenv.mkDerivation rec {
   buildInputs
     # use gettext instead of libintlOrEmpty so we have access to the msgfmt
     # command
-    = [ pkgconfig sqlite curl libxml2 stfl json_c ncurses gettext ]
+    = [ pkgconfig sqlite curl libxml2 stfl json_c ncurses gettext perl ]
       ++ libiconvOrEmpty
       ++ stdenv.lib.optional stdenv.isDarwin makeWrapper;
 
   preBuild = ''
     sed -i -e 104,108d config.sh
+    sed -i "1 s%^.*$%#!${perl}/bin/perl%" txt2h.pl
     export LDFLAGS=-lncursesw
   '';
 

From 5597e9a2a5dfd7423d6ef480e9dfec4a0ba2202b Mon Sep 17 00:00:00 2001
From: Jonas Hoersch <coroa@online.de>
Date: Thu, 4 Jul 2013 16:45:56 +0200
Subject: [PATCH 271/314] aria2: update to version 1.17.1 and add sqlite
 support

also add missing pkgconfig dependency, so that the buildInputs zlib,
openssl, and sqlite are properly found.
---
 pkgs/tools/networking/aria2/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix
index 383a2963ff2..75b6492a851 100644
--- a/pkgs/tools/networking/aria2/default.nix
+++ b/pkgs/tools/networking/aria2/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, openssl, libxml2, zlib }:
+{ stdenv, fetchurl, pkgconfig, openssl, libxml2, sqlite, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "aria2-1.10.8";
+  name = "aria2-1.17.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/aria2/stable/${name}/${name}.tar.bz2";
-    sha256 = "1cbcrxwdc6gp4l4zqg2i18zdg5ry5f9r3zj66kx6l5plwfjv9fdc";
+    sha256 = "0v0cdbv6v7fb4870rz5s9vscsj74fzbj70gsa2y4hysai4a0im3y";
   };
 
-  buildInputs = [ openssl libxml2 zlib ];
+  buildInputs = [ pkgconfig openssl libxml2 sqlite zlib ];
 
   meta = {
     homepage = http://aria2.sourceforge.net/;

From f925c5ae7f00f0b70f2d8021465d7b3add09f32a Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Mon, 1 Jul 2013 20:22:34 +0200
Subject: [PATCH 272/314] fix bash completion for perf

---
 pkgs/os-specific/linux/kernel/perf.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix
index ebbf9557245..cc5ec7f2f24 100644
--- a/pkgs/os-specific/linux/kernel/perf.nix
+++ b/pkgs/os-specific/linux/kernel/perf.nix
@@ -12,6 +12,7 @@ stdenv.mkDerivation {
   preConfigure = ''
     cd tools/perf
     sed -i s,/usr/include/elfutils,$elfutils/include/elfutils, Makefile
+    sed -i 's,^have perf,_have perf,' bash_completion
     export makeFlags="DESTDIR=$out $makeFlags"
   '';
 

From c222c31745ae7044148c35ca3456ab43137d07e9 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Mon, 1 Jul 2013 21:04:46 +0200
Subject: [PATCH 273/314] do not patch non-existent bash_completion for old
 kernels

---
 pkgs/os-specific/linux/kernel/perf.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix
index cc5ec7f2f24..83de0effcec 100644
--- a/pkgs/os-specific/linux/kernel/perf.nix
+++ b/pkgs/os-specific/linux/kernel/perf.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   preConfigure = ''
     cd tools/perf
     sed -i s,/usr/include/elfutils,$elfutils/include/elfutils, Makefile
-    sed -i 's,^have perf,_have perf,' bash_completion
+    -f bash_completion && sed -i 's,^have perf,_have perf,' bash_completion
     export makeFlags="DESTDIR=$out $makeFlags"
   '';
 

From 53f6bd73ad27d21131aa315efa91a6c6aa60fa8b Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Thu, 4 Jul 2013 20:26:06 +0200
Subject: [PATCH 274/314] plone: updating plone.app.discussion to 2.2.7

---
 pkgs/development/web/plone/4.3.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/web/plone/4.3.nix b/pkgs/development/web/plone/4.3.nix
index badd213daf6..0eac538951d 100644
--- a/pkgs/development/web/plone/4.3.nix
+++ b/pkgs/development/web/plone/4.3.nix
@@ -3092,10 +3092,10 @@ let plone43Packages = pythonPackages.python.modules // rec {
   };
 
   plone_app_discussion = buildPythonPackage rec {
-    name = "plone.app.discussion-2.2.6";
+    name = "plone.app.discussion-2.2.7";
     src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/plone.app.discussion/plone.app.discussion-2.2.6.zip";
-      md5 = "36cf9cd22119282f49facd03fb3c2632";
+      url = "https://pypi.python.org/packages/source/p/plone.app.discussion/plone.app.discussion-2.2.7.tar.gz";
+      md5 = "47e2713140dbbcd6dd9c3fa6dbd17fd0";
     };
     buildInputs = [ pkgs.unzip ];
     propagatedBuildInputs = [ plone_app_uuid zope_site plone_indexer collective_monkeypatcher zope_interface plone_app_z3cform zope_container plone_app_layout plone_z3cform plone_app_registry zope_component zodb3 zope_event setuptools z3c_form zope_lifecycleevent zope_annotation plone_registry ];

From d1c3c10d95d7f92bed31c60c16823d745a1c478e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 4 Jul 2013 21:29:52 +0200
Subject: [PATCH 275/314] R: delete obsolete version 2.x from Nixpkgs

---
 .../interpreters/r-lang/default.nix           | 37 -------------------
 pkgs/top-level/all-packages.nix               |  4 --
 2 files changed, 41 deletions(-)
 delete mode 100644 pkgs/development/interpreters/r-lang/default.nix

diff --git a/pkgs/development/interpreters/r-lang/default.nix b/pkgs/development/interpreters/r-lang/default.nix
deleted file mode 100644
index 43219899380..00000000000
--- a/pkgs/development/interpreters/r-lang/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, fetchurl, readline, perl, gfortran, libX11, libpng, libXt, zlib
-, withBioconductor ? false
-}:
-
-stdenv.mkDerivation {
-  name = "r-lang";
-  version = "2.12.0";
-  src = fetchurl {
-    url = http://cran.r-project.org/src/base/R-2/R-2.12.0.tar.gz;
-    sha256 = "93d72d845b01c6cd00e58f04b5e78fd6c83de96a8620505ad2a016772af02179";
-  };
-
-  bioconductor = if withBioconductor then import ../development/libraries/science/biology/bioconductor { inherit fetchurl stdenv readline; } else null;
-
-  postUnpack = ''
-    gunzip R-2.12.0/src/library/Recommended/Matrix_0.999375-44.tar.gz
-    tar --file=R-2.12.0/src/library/Recommended/Matrix_0.999375-44.tar --delete Matrix/src/dummy.cpp
-    gzip R-2.12.0/src/library/Recommended/Matrix_0.999375-44.tar
-  '';
-
-  buildInputs = [readline perl gfortran libpng libX11 libXt zlib];
-  configureFlags = ["--enable-R-shlib"] ;
-
-  meta = {
-    description = "R is a language and environment for statistical computing and graphics";
-    license     = "GPL2";
-    homepage    = http://www.r-project.org/;
-    longDescription = ''
-      R is a language and environment for statistical computing and
-      graphics. It is a GNU project which is similar to the S language.
-      R provides a wide variety of statistical (linear and nonlinear
-      modelling, classical statistical tests, time-series analysis,
-      classification, clustering, ...) and graphical techniques, and is
-      highly extensible.
-    '';
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad6a1032d9b..00428a2ad7b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3154,10 +3154,6 @@ let
 
   rubySqlite3 = callPackage ../development/ruby-modules/sqlite3 { };
 
-  rLang = callPackage ../development/interpreters/r-lang {
-    withBioconductor = config.rLang.withBioconductor or false;
-  };
-
   rubygemsFun = ruby: builderDefsPackage (import ../development/interpreters/ruby/rubygems.nix) {
     inherit ruby makeWrapper;
   };

From 7a2daf2db718829989ecd89ba41b1ec9dc3df858 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Thu, 4 Jul 2013 23:36:29 +0200
Subject: [PATCH 276/314] update xdg-utils to 1.1.0-rc1, fixes problems with
 generic xdg-open code

---
 pkgs/tools/X11/xdg-utils/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix
index df5d59c7b57..52ddb5a0f6b 100644
--- a/pkgs/tools/X11/xdg-utils/default.nix
+++ b/pkgs/tools/X11/xdg-utils/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, file }:
 
 stdenv.mkDerivation rec {
-  name = "xdg-utils-1.0.2";
+  name = "xdg-utils-1.1.0-rc1";
   
   src = fetchurl {
-    url = "http://portland.freedesktop.org/download/${name}.tgz";
-    sha256 = "1b019d3r1379b60p33d6z44kx589xjgga62ijz9vha95dg8vgbi1";
+    url = "http://portland.freedesktop.org/download/${name}.tar.gz";
+    sha256 = "00lisw4x43sp189lb7dz46j2l09y5v2fijk3d0sxx3mvwj55a1bv";
   };
 
   postInstall = ''

From 400d4a03b082207020cca30cd0d577cd791012e9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 4 Jul 2013 23:41:22 +0200
Subject: [PATCH 277/314] Update references to 'rLang' to the new name 'R'.

---
 pkgs/desktops/kde-4.10/kdeedu/cantor.nix      |  4 ++--
 .../science/biology/biolib/default.nix        | 21 +++++++++----------
 pkgs/top-level/release-python.nix             |  2 +-
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/pkgs/desktops/kde-4.10/kdeedu/cantor.nix b/pkgs/desktops/kde-4.10/kdeedu/cantor.nix
index d2a1b095b82..4563012ac67 100644
--- a/pkgs/desktops/kde-4.10/kdeedu/cantor.nix
+++ b/pkgs/desktops/kde-4.10/kdeedu/cantor.nix
@@ -1,7 +1,7 @@
-{ kde, kdelibs, libspectre, analitza, rLang, pkgconfig, gfortran, libqalculate }:
+{ kde, kdelibs, libspectre, analitza, R, pkgconfig, gfortran, libqalculate }:
 kde {
 
-  buildInputs = [ kdelibs libspectre analitza rLang gfortran libqalculate];
+  buildInputs = [ kdelibs libspectre analitza R gfortran libqalculate];
 
   nativeBuildInputs = [ pkgconfig ];
 
diff --git a/pkgs/development/libraries/science/biology/biolib/default.nix b/pkgs/development/libraries/science/biology/biolib/default.nix
index b12366c0142..4e4c3c55361 100644
--- a/pkgs/development/libraries/science/biology/biolib/default.nix
+++ b/pkgs/development/libraries/science/biology/biolib/default.nix
@@ -1,26 +1,25 @@
-{ stdenv, fetchurl, cmake, rLang, zlib }:
+{ stdenv, fetchurl, cmake, R, zlib }:
 
 stdenv.mkDerivation rec {
   name = "biolib-${version}";
-  
+
   version = "0.0.1";
-  
+
   src = fetchurl {
     url = "http://bio3.xparrot.eu/download/nix-biology/biolib-${version}.tar.gz";
     sha256 = "1la639rs0v4f3ayvarqv0yxwlnwn188bb1v71d2ybw1xr6gdy688";
   };
 
-  buildInputs = [cmake rLang zlib];
+  buildInputs = [cmake R zlib];
 
   meta = {
+    homepage = "http://biolib.open-bio.org/";
     description = "BioLib";
-    longDescription =
-      ''
-        BioLib brings together a set of opensource libraries written
-        in C/C++ and makes them available for major Bio* languages:
-        BioPerl, BioRuby, BioPython
-      '';
     license = "GPL2";
-    homepage = http://biolib.open-bio.org/; 
+    longDescription = ''
+      BioLib brings together a set of opensource libraries written
+      in C/C++ and makes them available for major Bio* languages:
+      BioPerl, BioRuby, BioPython
+    '';
   };
 }
diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix
index ad2f8e901c1..9cde018632f 100644
--- a/pkgs/top-level/release-python.nix
+++ b/pkgs/top-level/release-python.nix
@@ -1522,7 +1522,7 @@ in
   rhpl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   rigsofrods = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   rili = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
-  rLang = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
+  R = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   rockbox_utility = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   rpm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   rrdtool = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };

From ed37a6b465cb75d86ecf2265a8a8869717e05739 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Jul 2013 18:30:26 +0200
Subject: [PATCH 278/314] VM builds: Use qemu instead of the obsolete qemu-kvm

---
 pkgs/build-support/vm/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index b1eb82ed830..492c7f3e818 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -16,7 +16,9 @@ rec {
   # in parallel).  So apply a patch to increase the timeout to 120s.
   kernel = assert pkgs.linux.features.cifsTimeout; linuxKernel;
 
-  kvm = pkgs.qemu_kvm;
+  kvm = pkgs.qemu;
+
+  qemuProg = "${kvm}/bin/qemu-system-" + (if stdenv.system == "x86_64-linux" then "x86_64" else "i386");
 
 
   modulesClosure = makeModulesClosure {
@@ -195,7 +197,8 @@ rec {
 
 
   qemuCommandLinux = ''
-    ${kvm}/bin/qemu-kvm \
+    ${qemuProg} \
+      -enable-kvm \
       ${lib.optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \
       -nographic -no-reboot \
       -net nic,model=virtio \
@@ -393,7 +396,8 @@ rec {
 
   qemuCommandGeneric = ''
     PATH="${samba}/sbin:$PATH" \
-    ${kvm}/bin/qemu-kvm \
+    ${qemuProg} \
+      -enable-kvm \
       -nographic -no-reboot \
       -smb $(pwd) -hda $diskImage \
       $QEMU_OPTS

From 5f8571405baa596c598d3b9a5a70bbf50cfc1810 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Jul 2013 19:01:25 +0200
Subject: [PATCH 279/314] VM builds: Use ext4 instead of ext2

---
 pkgs/build-support/vm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 492c7f3e818..9d76f40afd4 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -2,7 +2,7 @@
 , linuxKernel ? pkgs.linux_3_9
 , img ? "bzImage"
 , rootModules ?
-    [ "cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8" "ext2" "ext3"
+    [ "cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8"
       "ext4" "unix" "hmac" "md4" "ecb" "des_generic" "sha256"
     ]
 }:
@@ -297,8 +297,8 @@ rec {
 
   defaultCreateRootFS = ''
     mkdir /mnt
-    ${e2fsprogs}/sbin/mke2fs -F /dev/${hd}
-    ${utillinux}/bin/mount -t ext2 /dev/${hd} /mnt
+    ${e2fsprogs}/sbin/mkfs.ext4 /dev/${hd}
+    ${utillinux}/bin/mount -t ext4 /dev/${hd} /mnt
 
     if test -e /mnt/.debug; then
       exec ${bash}/bin/sh

From 2321f2d55c6742fae0830142023816439ad83690 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Jul 2013 23:35:31 +0200
Subject: [PATCH 280/314] VM builds: Panic on OOM

---
 pkgs/build-support/vm/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 9d76f40afd4..eb585f2bc50 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -80,6 +80,8 @@ rec {
     mount -t proc none /proc
     mount -t sysfs none /sys
 
+    echo 2 > /proc/sys/vm/panic_on_oom
+
     for o in $(cat /proc/cmdline); do
       case $o in
         mountDisk=1)

From 9efe759dd8fb8fd85368483923a77f832b8805c6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Jul 2013 23:36:17 +0200
Subject: [PATCH 281/314] VM builds: Increase the default memory size to 512 MB

---
 pkgs/build-support/vm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index eb585f2bc50..8065e5fa910 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -324,7 +324,7 @@ rec {
      `preVM' can optionally contain a shell command to be evaluated
      *before* the VM is started (i.e., on the host).  The attribute
      `memSize' specifies the memory size of the VM in megabytes,
-     defaulting to 256.  The attribute `diskImage' can optionally
+     defaulting to 512.  The attribute `diskImage' can optionally
      specify a file system image to be attached to /dev/sda.  (Note
      that currently we expect the image to contain a filesystem, not a
      full disk image with a partition table etc.)
@@ -339,7 +339,7 @@ rec {
     args = ["-e" (vmRunCommand qemuCommandLinux)];
     origArgs = attrs.args;
     origBuilder = attrs.builder;
-    QEMU_OPTS = "-m ${toString (if attrs ? memSize then attrs.memSize else 256)}";
+    QEMU_OPTS = "-m ${toString (if attrs ? memSize then attrs.memSize else 512)}";
   });
 
 

From 0e386d0c1373809d3459d09532ad36be0faf6dfb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Jul 2013 00:06:08 +0200
Subject: [PATCH 282/314] VM builds: Use 9p/virtfs instead of CIFS

9p (with caching enabled) is much faster than CIFS and doesn't require
Samba or virtual networking.  For instance, building GNU Hello with
CIFS takes ~323s on my laptop, but with 9p it takes 54s.

More measurements will be needed to see if "cache=fscache" is really
faster than "cache=loose" (the former seems to be a little bit
faster).
---
 pkgs/build-support/vm/default.nix           | 71 +++------------------
 pkgs/build-support/vm/test.nix              | 10 ++-
 pkgs/os-specific/linux/kernel/linux-3.9.nix |  4 ++
 3 files changed, 21 insertions(+), 64 deletions(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 8065e5fa910..4e02118edff 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1,21 +1,14 @@
 { pkgs
-, linuxKernel ? pkgs.linux_3_9
+, kernel ? pkgs.linux_3_9
 , img ? "bzImage"
 , rootModules ?
-    [ "cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8"
-      "ext4" "unix" "hmac" "md4" "ecb" "des_generic" "sha256"
-    ]
+    [ "virtio_pci" "virtio_blk" "virtio_balloon" "ext4" "unix" "9p" "9pnet_virtio" ]
 }:
 
 with pkgs;
 
 rec {
 
-  # The 15 second CIFS timeout is too short if the host if heavily
-  # loaded (e.g., in the Hydra build farm when it's running many jobs
-  # in parallel).  So apply a patch to increase the timeout to 120s.
-  kernel = assert pkgs.linux.features.cifsTimeout; linuxKernel;
-
   kvm = pkgs.qemu;
 
   qemuProg = "${kvm}/bin/qemu-system-" + (if stdenv.system == "x86_64-linux" then "x86_64" else "i386");
@@ -99,21 +92,13 @@ rec {
     done
 
     for i in $(cat ${modulesClosure}/insmod-list); do
-      args=
-      case $i in
-        */cifs.ko)
-          args="CIFSMaxBufSize=4194304"
-          ;;
-      esac
       echo "loading module $(basename $i .ko)"
-      insmod $i $args
+      insmod $i
     done
 
     mount -t tmpfs none /dev
     ${createDeviceNodes "/dev"}
 
-    ifconfig eth0 up 10.0.2.15
-
     mkdir /fs
 
     if test -z "$mountDisk"; then
@@ -127,14 +112,14 @@ rec {
 
     echo "mounting Nix store..."
     mkdir -p /fs/nix/store
-    mount -t cifs //10.0.2.4/store /fs/nix/store -o guest,sec=none,sec=ntlm
+    mount -t 9p store /fs/nix/store -o trans=virtio,version=9p2000.L,msize=262144,cache=fscache
 
     mkdir -p /fs/tmp
     mount -t tmpfs -o "mode=755" none /fs/tmp
 
     echo "mounting host's temporary directory..."
     mkdir -p /fs/tmp/xchg
-    mount -t cifs //10.0.2.4/xchg /fs/tmp/xchg -o guest,sec=none,sec=ntlm
+    mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,msize=262144,cache=fscache
 
     mkdir -p /fs/proc
     mount -t proc none /fs/proc
@@ -203,9 +188,8 @@ rec {
       -enable-kvm \
       ${lib.optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \
       -nographic -no-reboot \
-      -net nic,model=virtio \
-      -chardev socket,id=samba,path=./samba \
-      -net user,guestfwd=tcp:10.0.2.4:445-chardev:samba \
+      -virtfs local,path=/nix/store,security_model=none,mount_tag=store \
+      -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \
       -drive file=$diskImage,if=virtio,cache=writeback,werror=report \
       -kernel ${kernel}/${img} \
       -initrd ${initrd}/initrd \
@@ -214,40 +198,6 @@ rec {
   '';
 
 
-  startSamba =
-    ''
-      export WHO=`whoami`
-      mkdir -p $TMPDIR/xchg
-
-      cat > $TMPDIR/smb.conf <<SMB
-      [global]
-        private dir = $TMPDIR
-        smb ports = 0
-        socket address = 127.0.0.1
-        pid directory = $TMPDIR
-        lock directory = $TMPDIR
-        log file = $TMPDIR/log.smbd
-        smb passwd file = $TMPDIR/smbpasswd
-        security = share
-      [store]
-        force user = $WHO
-        path = /nix/store
-        read only = no
-        guest ok = yes
-      [xchg]
-        force user = $WHO
-        path = $TMPDIR/xchg
-        read only = no
-        guest ok = yes
-      $EXTRA_SAMBA_CONF
-      SMB
-
-      rm -f ./samba
-      ${socat}/bin/socat unix-listen:./samba exec:"${utillinux}/bin/setsid ${samba}/sbin/smbd -s $TMPDIR/smb.conf",nofork > /dev/null 2>&1 &
-      while [ ! -e ./samba ]; do sleep 0.1; done # ugly
-    '';
-
-
   vmRunCommand = qemuCommand: writeText "vm-run" ''
     export > saved-env
 
@@ -267,7 +217,6 @@ rec {
     diskImage=$diskImage
     TMPDIR=$TMPDIR
     cd $TMPDIR
-    ${startSamba}
     ${qemuCommand}
     EOF
 
@@ -314,9 +263,9 @@ rec {
 
   /* Run a derivation in a Linux virtual machine (using Qemu/KVM).  By
      default, there is no disk image; the root filesystem is a tmpfs,
-     and /nix/store is shared with the host (via the CIFS protocol to
-     a Samba instance automatically started by Qemu).  Thus, any pure
-     Nix derivation should run unmodified, e.g. the call
+     and /nix/store is shared with the host (via the 9P protocol).
+     Thus, any pure Nix derivation should run unmodified, e.g. the
+     call
 
        runInLinuxVM patchelf
 
diff --git a/pkgs/build-support/vm/test.nix b/pkgs/build-support/vm/test.nix
index eed7cd017c4..798c283a177 100644
--- a/pkgs/build-support/vm/test.nix
+++ b/pkgs/build-support/vm/test.nix
@@ -7,6 +7,10 @@ rec {
   # Run the PatchELF derivation in a VM.
   buildPatchelfInVM = runInLinuxVM patchelf;
 
+  buildHelloInVM = runInLinuxVM hello;
+
+  buildPanInVM = runInLinuxVM pan;
+
 
   testRPMImage = makeImageTestScript diskImages.fedora16x86_64;
 
@@ -17,10 +21,10 @@ rec {
     diskImage = diskImages.fedora16x86_64;
   };
 
-  
+
   testUbuntuImage = makeImageTestScript diskImages.ubuntu810i386;
 
-  
+
   buildInDebian = runInLinuxImage (stdenv.mkDerivation {
     name = "deb-compile";
     src = patchelf.src;
@@ -65,6 +69,6 @@ rec {
       make install
     '';
   };
-*/  
+*/
 
 }
diff --git a/pkgs/os-specific/linux/kernel/linux-3.9.nix b/pkgs/os-specific/linux/kernel/linux-3.9.nix
index 3c9976868bd..7803504d91e 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.9.nix
@@ -246,6 +246,10 @@ let
       # Easier debug of NFS issues
       SUNRPC_DEBUG y
 
+      # Enable the 9P cache to speed up NixOS VM tests.
+      9P_FSCACHE y
+      9P_FS_POSIX_ACL y
+
       ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
       ${extraConfig}
     '';

From 9f5f30a7e6efe42b2e6ccddebaf710706dd6a73c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Jul 2013 00:11:47 +0200
Subject: [PATCH 283/314] Remove runInGenericVM

It's not used anywhere and probably doesn't work anymore.
---
 pkgs/build-support/vm/default.nix | 50 -------------------------------
 pkgs/build-support/vm/test.nix    | 35 ----------------------
 2 files changed, 85 deletions(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 4e02118edff..097fcf21c1b 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -345,56 +345,6 @@ rec {
     });
 
 
-  qemuCommandGeneric = ''
-    PATH="${samba}/sbin:$PATH" \
-    ${qemuProg} \
-      -enable-kvm \
-      -nographic -no-reboot \
-      -smb $(pwd) -hda $diskImage \
-      $QEMU_OPTS
-  '';
-
-
-  /* Run a command in an x86 virtual machine image containing an
-     arbitrary OS.  The VM should be configured to do the following:
-
-     - Write log output to the serial port.
-
-     - Mount //10.0.2.4/qemu via SMB.
-
-     - Execute the command "cmd" on the SMB share.  It can access the
-       original derivation attributes in "saved-env" on the share.
-
-     - Produce output under "out" on the SMB share.
-
-     - Write an exit code to "in-vm-exit" on the SMB share ("0"
-       meaning success).
-
-     - Power-off or reboot the machine.
-  */
-  runInGenericVM = drv: lib.overrideDerivation drv (attrs: {
-    requiredSystemFeatures = [ "kvm" ];
-    builder = "${bash}/bin/sh";
-    args = ["-e" (vmRunCommand qemuCommandGeneric)];
-    QEMU_OPTS = "-m ${toString (if attrs ? memSize then attrs.memSize else 256)}";
-
-    preVM = ''
-      diskImage=$(pwd)/disk-image.qcow2
-      origImage=${attrs.diskImage}
-      if test -d "$origImage"; then origImage="$origImage/disk-image.qcow2"; fi
-      ${kvm}/bin/qemu-img create -b "$origImage" -f qcow2 $diskImage
-
-      echo "$buildCommand" > cmd
-
-      eval "$postPreVM"
-    '';
-
-    postVM = ''
-      cp -prvd out $out
-    '';
-  });
-
-
   /* Like runInLinuxVM, but run the build not using the stdenv from
      the Nix store, but using the tools provided by /bin, /usr/bin
      etc. from the specified filesystem image, which typically is a
diff --git a/pkgs/build-support/vm/test.nix b/pkgs/build-support/vm/test.nix
index 798c283a177..d0d85fce366 100644
--- a/pkgs/build-support/vm/test.nix
+++ b/pkgs/build-support/vm/test.nix
@@ -36,39 +36,4 @@ rec {
     '';
   });
 
-/*
-  testFreeBSD = runInGenericVM {
-    name = "aterm-freebsd";
-    src = aterm242fixes.src;
-    diskImage = "/tmp/freebsd-7.0.qcow";
-
-    postPreVM = ''
-      cp $src aterm.tar.bz2
-    '';
-
-    buildCommand = ''
-      set > /tmp/my-env
-      . /mnt/saved-env
-      . /tmp/my-env
-      unset TEMP
-      unset TEMPDIR
-      unset TMP
-      unset TMPDIR
-
-      set -x
-
-      echo "Hello World!!!"
-      mkdir /mnt/out
-      echo "bar" > /mnt/out/foo
-
-      cd /tmp
-      tar xvf /mnt/aterm.tar.bz2
-      cd aterm-*
-      ./configure --prefix=/mnt/out
-      make
-      make install
-    '';
-  };
-*/
-
 }

From 8938d57025f9e5b46ecec62376e97a7b3836bb98 Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Wed, 3 Jul 2013 09:13:28 +0000
Subject: [PATCH 284/314] heroku gem: add expression

---
 .../interpreters/ruby/generated.nix           | 130 ++++++++++++++++++
 1 file changed, 130 insertions(+)

diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix
index 2e899128252..77464bdce37 100644
--- a/pkgs/development/interpreters/ruby/generated.nix
+++ b/pkgs/development/interpreters/ruby/generated.nix
@@ -28,6 +28,7 @@ g: # Get dependencies from patched gems
     erubis = g.erubis_2_7_0;
     eventmachine = g.eventmachine_1_0_3;
     eventmachine_tail = g.eventmachine_tail_0_6_4;
+    excon = g.excon_0_25_0;
     execjs = g.execjs_1_4_0;
     fakes3 = g.fakes3_0_1_5;
     faraday = g.faraday_0_8_7;
@@ -36,6 +37,8 @@ g: # Get dependencies from patched gems
     file_tail = g.file_tail_1_0_12;
     foreman = g.foreman_0_62_0;
     gettext = g.gettext_2_3_9;
+    heroku = g.heroku_2_39_4;
+    heroku_api = g.heroku_api_0_3_13;
     highline = g.highline_1_6_16;
     hike = g.hike_1_2_1;
     hoe = g.hoe_3_1_0;
@@ -46,6 +49,7 @@ g: # Get dependencies from patched gems
     jsduck = g.jsduck_4_7_1;
     json = g.json_1_7_7;
     json_pure = g.json_pure_1_7_7;
+    launchy = g.launchy_2_3_0;
     libv8 = g.libv8_3_3_10_4;
     locale = g.locale_2_0_8;
     lockfile = g.lockfile_2_1_0;
@@ -57,6 +61,7 @@ g: # Get dependencies from patched gems
     multipart_post = g.multipart_post_1_2_0;
     net_sftp = g.net_sftp_2_0_5;
     net_ssh = g.net_ssh_2_6_6;
+    netrc = g.netrc_0_7_7;
     nix = g.nix_0_1_1;
     nokogiri = g.nokogiri_1_5_9;
     papertrail = g.papertrail_0_9_7;
@@ -72,9 +77,11 @@ g: # Get dependencies from patched gems
     railties = g.railties_3_2_13;
     rake = g.rake_10_0_4;
     rb_fsevent = g.rb_fsevent_0_9_3;
+    rb_readline = g.rb_readline_0_5_0;
     rdiscount = g.rdiscount_2_0_7_1;
     rdoc = g.rdoc_3_12_2;
     remote_syslog = g.remote_syslog_1_6_13;
+    rest_client = g.rest_client_1_6_7;
     right_aws = g.right_aws_3_0_5;
     right_http_connection = g.right_http_connection_1_3_0;
     rjb = g.rjb_1_4_6;
@@ -222,6 +229,20 @@ adds support for IRIs and URI templates.
       requiredGems = [  ];
       sha256 = ''0nn583ba8kq4hhpr4lr2zzpm4r0mga0zfalxxpa6a4v27q71v5hh'';
     };
+    addressable_2_3_5 = {
+      basename = ''addressable'';
+      meta = {
+        description = ''URI Implementation'';
+        homepage = ''http://addressable.rubyforge.org/'';
+        longDescription = ''Addressable is a replacement for the URI implementation that is part of
+Ruby's standard library. It more closely conforms to the relevant RFCs and
+adds support for IRIs and URI templates.
+'';
+      };
+      name = ''addressable-2.3.5'';
+      requiredGems = [  ];
+      sha256 = ''11hv69v6h39j7m4v51a4p7my7xwjbhxbsg3y7ja156z7by10wkg7'';
+    };
     arel_3_0_2 = {
       basename = ''arel'';
       meta = {
@@ -504,6 +525,17 @@ using TCP/IP, especially if custom protocols are required.'';
       requiredGems = [ g.eventmachine_1_0_3 ];
       sha256 = ''1pvlb34vdzd81kf9f3xyibb4f55xjqm7lqqy28dgyci5cyv50y61'';
     };
+    excon_0_25_0 = {
+      basename = ''excon'';
+      meta = {
+        description = ''speed, persistence, http(s)'';
+        homepage = ''https://github.com/geemus/excon'';
+        longDescription = ''EXtended http(s) CONnections'';
+      };
+      name = ''excon-0.25.0'';
+      requiredGems = [  ];
+      sha256 = ''0wv5bc7d138xw2v608ywl9cwhq7d7gl1l2hzdh96ia2a06hf4rry'';
+    };
     execjs_1_4_0 = {
       basename = ''execjs'';
       meta = {
@@ -593,6 +625,28 @@ So you can use GNU gettext tools for maintaining.
       requiredGems = [ g.locale_2_0_8 g.text_1_2_1 ];
       sha256 = ''1i4kzkan7mnyr1ihphx0sqs3k4qj9i1ldg4a1cwf5h2fz657wvjj'';
     };
+    heroku_2_39_4 = {
+      basename = ''heroku'';
+      meta = {
+        description = ''Client library and CLI to deploy apps on Heroku.'';
+        homepage = ''http://heroku.com/'';
+        longDescription = ''Client library and command-line tool to deploy and manage apps on Heroku.'';
+      };
+      name = ''heroku-2.39.4'';
+      requiredGems = [ g.heroku_api_0_3_13 g.netrc_0_7_7 g.rest_client_1_6_7 g.launchy_2_3_0 g.rubyzip_0_9_9 g.rb_readline_0_5_0 ];
+      sha256 = ''1dhj529kqk6q66406f7iwlxwsifndlzcm0513i0hzlhc4lbkbf4x'';
+    };
+    heroku_api_0_3_13 = {
+      basename = ''heroku_api'';
+      meta = {
+        description = ''Ruby Client for the Heroku API'';
+        homepage = ''http://github.com/heroku/heroku.rb'';
+        longDescription = ''Ruby Client for the Heroku API'';
+      };
+      name = ''heroku-api-0.3.13'';
+      requiredGems = [ g.excon_0_25_0 ];
+      sha256 = ''179asf4rxjyg59zh5s7lcrnj7rrz9ymz1km24hdydgyay7px0yvi'';
+    };
     highline_1_6_16 = {
       basename = ''highline'';
       meta = {
@@ -753,6 +807,17 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
       requiredGems = [  ];
       sha256 = ''0jxp0amx9xhka0ixnhvfgwc5ydr82hkxp81pvw32z31arx7jrwl6'';
     };
+    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'';
+    };
     libv8_3_3_10_4 = {
       basename = ''libv8'';
       meta = {
@@ -841,6 +906,38 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp
       requiredGems = [  ];
       sha256 = ''1qmx53a2kqk0nnhjbfvbc213wsxiprl0wqm7f2xvcsh253ld91iw'';
     };
+    mime_types_1_23 = {
+      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.23 that adds the ability to enumerate over the
+collection of MIME types and updates the sources of a few MIME types. The
+identification of MIME content type is based on a file's filename extensions.
+
+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
+provides the ability for detailed information about MIME entities (provided as
+a set of MIME::Type objects) to be determined and used programmatically. There
+are many types defined by RFCs and vendors, so the list is long but not
+complete; don't hesitate to ask to add additional information. This library
+follows the IANA collection of MIME types (see below for reference).
+
+MIME::Types for Ruby was originally based on and synchronized with MIME::Types
+for Perl by Mark Overmeer, copyright 2001 - 2009. As of version 1.15, the data
+format for the MIME::Type list has changed and the synchronization will no
+longer happen.
+
+MIME::Types is built to conform to the MIME types of RFCs 2045 and 2231. It
+follows the official {IANA registry}[http://www.iana.org/assignments/media-types/]
+({ftp}[ftp://ftp.iana.org/assignments/media-types]) with some unofficial types
+added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp].'';
+      };
+      name = ''mime-types-1.23'';
+      requiredGems = [  ];
+      sha256 = ''1ch5ngx67nhbq6j1y79c88gzk6i8pzqi860iwfpxp9c0bwf6fags'';
+    };
     minitar_0_5_3 = {
       basename = ''minitar'';
       meta = {
@@ -907,6 +1004,17 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp
       requiredGems = [  ];
       sha256 = ''00fdnwv3jf311jjcc51lq8w26r62vzma91i79h5hj8i1ylrilx51'';
     };
+    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 = {
@@ -1129,6 +1237,17 @@ request helpers feature.'';
       requiredGems = [  ];
       sha256 = ''0bdnxwdxj4r1kdxfi5nszbsb126njrr81p912g64xxs2bgxd1bp1'';
     };
+    rb_readline_0_5_0 = {
+      basename = ''rb_readline'';
+      meta = {
+        description = ''Pure-Ruby Readline Implementation'';
+        homepage = ''http://github.com/luislavena/rb-readline'';
+        longDescription = ''The readline library provides a pure Ruby implementation of the GNU readline C library, as well as the Readline extension that ships as part of the standard library.'';
+      };
+      name = ''rb-readline-0.5.0'';
+      requiredGems = [  ];
+      sha256 = ''1aixbqpwrlzvrii4c80982jih4syanc2jl0lfcbibqvjasy9h9c8'';
+    };
     rdiscount_2_0_7_1 = {
       basename = ''rdiscount'';
       meta = {
@@ -1165,6 +1284,17 @@ See RDoc for a description of RDoc's markup and basic use.'';
       requiredGems = [ g.servolux_0_10_0 g.file_tail_1_0_12 g.eventmachine_1_0_3 g.eventmachine_tail_0_6_4 g.syslog_protocol_0_9_2 g.em_resolv_replace_1_1_3 ];
       sha256 = ''0q35j02k2l3fw3fdzq0i3rd6chsqr982gj13f3m3lsxm7kms03nw'';
     };
+    rest_client_1_6_7 = {
+      basename = ''rest_client'';
+      meta = {
+        description = ''Simple HTTP and REST client for Ruby, inspired by microframework syntax for specifying actions.'';
+        homepage = ''http://github.com/archiloque/rest-client'';
+        longDescription = ''A simple HTTP and REST client for Ruby, inspired by the Sinatra microframework style of specifying actions: get, put, post, delete.'';
+      };
+      name = ''rest-client-1.6.7'';
+      requiredGems = [ g.mime_types_1_23 ];
+      sha256 = ''0nn7zalgidz2yj0iqh3xvzh626krm2al79dfiij19jdhp0rk8853'';
+    };
     right_aws_3_0_5 = {
       basename = ''right_aws'';
       meta = {

From 6f5e5cfe06d57db31c815b8b3c9d80be07dd2b9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 5 Jul 2013 14:22:01 +0200
Subject: [PATCH 285/314] kde4: unify used libcanberra

I wondered why I'm getting two versions in the closure of KDE apps.
---
 pkgs/desktops/kde-4.10/kde-runtime.nix | 11 +----------
 pkgs/desktops/kde-4.7/kde-runtime.nix  |  2 +-
 pkgs/desktops/kde-4.8/kde-runtime.nix  |  2 +-
 pkgs/top-level/all-packages.nix        |  6 ++++++
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/pkgs/desktops/kde-4.10/kde-runtime.nix b/pkgs/desktops/kde-4.10/kde-runtime.nix
index 2282ee57c2c..a2fef65d75c 100644
--- a/pkgs/desktops/kde-4.10/kde-runtime.nix
+++ b/pkgs/desktops/kde-4.10/kde-runtime.nix
@@ -3,19 +3,10 @@
 , networkmanager, kactivities, kdepimlibs, openexr, ilmbase, config
 }:
 
-let libcanberraWithoutGTK = if (config ? kde_runtime && config.kde_runtime ? libcanberraWithoutGTK)
-                            then config.kde_runtime.libcanberraWithoutGTK
-                            else true;
-
-    canberra = if libcanberraWithoutGTK
-               then libcanberra.override { gtk = null; }
-               else libcanberra;
-in
-
 kde {
   buildInputs = [
     kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack
-    qca2 samba canberra pulseaudio
+    qca2 samba libcanberra pulseaudio
     networkmanager kactivities kdepimlibs openexr
 #todo: add openslp
   ];
diff --git a/pkgs/desktops/kde-4.7/kde-runtime.nix b/pkgs/desktops/kde-4.7/kde-runtime.nix
index 9b25e77b083..b82ec2f6678 100644
--- a/pkgs/desktops/kde-4.7/kde-runtime.nix
+++ b/pkgs/desktops/kde-4.7/kde-runtime.nix
@@ -5,7 +5,7 @@
 kde {
   buildInputs =
     [ kdelibs shared_desktop_ontologies bzip2 libssh exiv2 attica
-      samba (libcanberra.override { gtk = null; }) ntrack libjpeg
+      samba libcanberra ntrack libjpeg
     ];
 
   passthru.propagatedUserEnvPackages = [ virtuoso ];
diff --git a/pkgs/desktops/kde-4.8/kde-runtime.nix b/pkgs/desktops/kde-4.8/kde-runtime.nix
index f8246190462..b8f9afff7b3 100644
--- a/pkgs/desktops/kde-4.8/kde-runtime.nix
+++ b/pkgs/desktops/kde-4.8/kde-runtime.nix
@@ -6,7 +6,7 @@
 kde {
   buildInputs =
     [ kdelibs shared_desktop_ontologies bzip2 libssh exiv2 attica xz networkmanager
-      samba (libcanberra.override { gtk = null; }) ntrack libjpeg qca2 pulseaudio
+      samba libcanberra ntrack libjpeg qca2 pulseaudio
     ];
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 00428a2ad7b..44df80361af 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4410,6 +4410,9 @@ let
   libcaca = callPackage ../development/libraries/libcaca { };
 
   libcanberra = callPackage ../development/libraries/libcanberra { };
+  libcanberra_kde = if (config.kde_runtime.libcanberraWithoutGTK or true)
+    then libcanberra.override { gtk = null; }
+    else libcanberra;
 
   libcello = callPackage ../development/libraries/libcello {};
 
@@ -9038,6 +9041,7 @@ let
       eigen = eigen2;
       libotr = libotr_3_2;
       libgphoto2 = libgphoto2_4;
+      libcanberra = libcanberra_kde;
     }) ../desktops/kde-4.7;
 
   kde48 = kdePackagesFor (pkgs.kde48 // {
@@ -9045,6 +9049,7 @@ let
       eigen = eigen2;
       libotr = libotr_3_2;
       libgphoto2 = libgphoto2_4;
+      libcanberra = libcanberra_kde;
     }) ../desktops/kde-4.8;
 
   kde410 = kdePackagesFor (pkgs.kde410 // {
@@ -9053,6 +9058,7 @@ let
       libotr = libotr_3_2;
       libusb = libusb1;
       ffmpeg = ffmpeg_1;
+      libcanberra = libcanberra_kde;
     }) ../desktops/kde-4.10;
 
   kdePackagesFor = self: dir:

From 355092dcdc450507e28e4d39e7ff1b2933b71c9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 3 Apr 2013 16:07:01 +0200
Subject: [PATCH 286/314] kile: minor update

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

diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/applications/editors/kile/default.nix
index 6b14b40a2c9..b428289b95d 100644
--- a/pkgs/applications/editors/kile/default.nix
+++ b/pkgs/applications/editors/kile/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, kdelibs, cmake, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "kile-2.1.2";
+  name = "kile-2.1.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/kile/${name}.tar.bz2";
-    sha256 = "0nx5fmjrxrndnzvknxnybd8qh15jzfxzbny2rljq3amjw02y9lc2";
+    sha256 = "18nfi37s46v9xav7vyki3phasddgcy4m7nywzxis198vr97yqqx0";
   };
 
   nativeBuildInputs = [ cmake gettext ];

From 6726776c74019b8ee6c47c2cf35473db0908237b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 5 Jul 2013 13:09:43 +0200
Subject: [PATCH 287/314] kdiff3: maintenance update

---
 pkgs/tools/text/kdiff3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix
index fc8813e7cec..52781ed3792 100644
--- a/pkgs/tools/text/kdiff3/default.nix
+++ b/pkgs/tools/text/kdiff3/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, cmake, kdelibs, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "kdiff3-0.9.96";
+  name = "kdiff3-0.9.97";
   src = fetchurl {
     url = "mirror://sourceforge/kdiff3/${name}.tar.gz";
-    sha256 = "14fnflp5ansi7b59h8vn81mb8pdqpbanz0qzyw9sxk2pgp24xrqh";
+    sha256 = "0ajsnzfr0aqzdiv5wqssxsgfv87v4g5c2zl16264v0cw8jxiddz3";
   };
 
   buildInputs = [ kdelibs ];

From 51a22a8f8ac56ad4c827ff89616d068315187689 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 5 Jul 2013 15:02:43 +0200
Subject: [PATCH 288/314] Add loopback network device and localhost entry to
 /etc/hosts for VM tests.

---
 pkgs/build-support/vm/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 097fcf21c1b..c184e8af0fa 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -99,6 +99,8 @@ rec {
     mount -t tmpfs none /dev
     ${createDeviceNodes "/dev"}
 
+    ifconfig lo up
+
     mkdir /fs
 
     if test -z "$mountDisk"; then
@@ -129,6 +131,7 @@ rec {
 
     mkdir -p /fs/etc
     ln -sf /proc/mounts /fs/etc/mtab
+    echo "127.0.0.1 localhost" > /fs/etc/hosts
 
     echo "Now running: $command"
     test -n "$command"

From 7853c0c60a529ddb05774c7a8c2a5759b9688c81 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Jul 2013 17:05:19 +0400
Subject: [PATCH 289/314] Update acpi-call for Linux 3.10 compatibility

---
 pkgs/os-specific/linux/acpi-call/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix
index 43902aded67..9fd8168948d 100644
--- a/pkgs/os-specific/linux/acpi-call/default.nix
+++ b/pkgs/os-specific/linux/acpi-call/default.nix
@@ -5,13 +5,13 @@ stdenv.mkDerivation {
 
   src = fetchgit {
     url = "git://github.com/mkottman/acpi_call.git";
-    rev = "b570c3b6c7016174107558464e864391d8bbd176";
-    sha256 = "a89c62d391b721bb87a094f81cefc77d9c80de4bb314bb6ea449c3ef2decad5e";
+    rev = "46dd97e115ddc7219c88b0818c4d5b235162fe6e";
+    sha256 = "1bi0azd7xxhrivjhnmxllj2sfj12br56mxii20mnqdpqwyz0rhni";
   };
   
   preBuild = ''
-    sed -e 's/break/true/' -i test_off.sh
-    sed -e 's@/bin/bash@.bin/sh@' -i test_off.sh
+    sed -e 's/break/true/' -i examples/turn_off_gpu.sh
+    sed -e 's@/bin/bash@.bin/sh@' -i examples/turn_off_gpu.sh
     sed -e "s@/lib/modules/\$(.*)@${kernelDev}/lib/modules/${kernelDev.modDirVersion}@" -i Makefile
   '';
  
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     mkdir -p $out/lib/modules/${kernelDev.modDirVersion}/misc
     cp acpi_call.ko $out/lib/modules/${kernelDev.modDirVersion}/misc
     mkdir -p $out/bin
-    cp test_off.sh $out/bin/test_discrete_video_off.sh
+    cp examples/turn_off_gpu.sh $out/bin/test_discrete_video_off.sh
     chmod a+x $out/bin/test_discrete_video_off.sh
   '';
 

From b2e912fd8d0a5dd0a0d1cb941b8606220d49a4c6 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 5 Jul 2013 18:20:01 +0400
Subject: [PATCH 290/314] Update fdm

---
 pkgs/tools/networking/fdm/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/fdm/default.nix b/pkgs/tools/networking/fdm/default.nix
index 052367400ef..a6700284af5 100644
--- a/pkgs/tools/networking/fdm/default.nix
+++ b/pkgs/tools/networking/fdm/default.nix
@@ -11,10 +11,10 @@ let
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="fdm";
-    version="1.6";
+    version="1.7";
     name="${baseName}-${version}";
-    url="http://downloads.sourceforge.net/${baseName}/${name}.tar.gz";
-    hash="01ipxay4rv52ra2zzybf92x6n1hyklib94ncsg04k3rp4w5a8sbj";
+    url="mirror://sourceforge/${baseName}/${baseName}/${name}.tar.gz";
+    hash="0apg1jasn4m5j3vh0v9lr2l3lyzy35av1ylxr0wf8k0j9w4p8i28";
   };
 in
 rec {
@@ -26,7 +26,7 @@ rec {
   inherit (sourceInfo) name version;
   inherit buildInputs;
 
-  phaseNames = ["fixInstall" "doMakeInstall"];
+  phaseNames = ["doConfigure" "fixInstall" "doMakeInstall"];
   makeFlags = ["PREFIX=$out"];
   fixInstall = a.fullDepEntry (''
     sed -i */Makefile -i Makefile -e 's@ -g bin @ @'

From 20301af4975fe19942fbe37c9153fcc65cdd7b90 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Jul 2013 17:29:04 +0200
Subject: [PATCH 291/314] testdisk: Add to channel

---
 pkgs/tools/misc/testdisk/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/testdisk/default.nix b/pkgs/tools/misc/testdisk/default.nix
index 6ccfea50482..47734b4cd69 100644
--- a/pkgs/tools/misc/testdisk/default.nix
+++ b/pkgs/tools/misc/testdisk/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation {
   name = "testdisk-6.13";
-  
+
   src = fetchurl {
     url = http://www.cgsecurity.org/testdisk-6.13.tar.bz2;
     sha256 = "087jrn41z3ymf1b6njl2bg99pr79v8l1f63f7rn5ni69vz6mq9s8";
@@ -13,6 +13,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://www.cgsecurity.org/wiki/TestDisk;
     license = "GPLv2+";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
     longDescription = ''
       TestDisk is a program for data recovery, primarily designed to
       help recover lost partitions and/or make non-booting disks

From da7db90068a435c754110f6aea315c7b6aca772b Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 5 Jul 2013 17:52:42 +0200
Subject: [PATCH 292/314] Add CentOS 6.4 to vm images

---
 pkgs/build-support/vm/default.nix | 46 +++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index c184e8af0fa..66998b34130 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -989,6 +989,30 @@ rec {
       packages = commonOpenSUSEPackages;
     };
 
+    centos64i386 = {
+      name = "centos-6.4-i386";
+      fullName = "CentOS 6.4 (i386)";
+      packagesList = fetchurl {
+        url = http://mirror.centos.org/centos/6.4/os/i386/repodata/87aa4c4e19f9a3ec93e3d820f1ea6b6ece8810cb45f117a16354465e57a1b50d-primary.xml.gz;
+        sha256 = "03dml5bmwijlcfhigwa5rc88ikkfdgmg286qwf9yr8zr3574ral7";
+      };
+      urlPrefix = http://mirror.centos.org/centos/6.4/os/i386/ ;
+      archs = ["noarch" "i386"];
+      packages = commonCentOSPackages;
+    };
+
+    centos64x86_64 = {
+      name = "centos-6.4-x86_64";
+      fullName = "CentOS 6.4 (x86_64)";
+      packagesList = fetchurl {
+        url = http://mirror.centos.org/centos/6.4/os/x86_64/repodata/4d4030b92f010f466eb4f004312b9f532b9e85e60c5e6421e8b429c180ac1efe-primary.xml.gz;
+        sha256 = "1zhymj0c2adlx0hn8phcws2rwaskkwmk217hnip4c3q15ywk0h2d";
+      };
+      urlPrefix = http://mirror.centos.org/centos/6.4/os/x86_64/ ;
+      archs = ["noarch" "x86_64"];
+      packages = commonCentOSPackages;
+    };
+
   };
 
 
@@ -1417,6 +1441,28 @@ rec {
     "unzip"
   ];
 
+  commonCentOSPackages = [
+    "autoconf"
+    "automake"
+    "basesystem"
+    "bzip2"
+    "curl"
+    "diffutils"
+    "centos-release"
+    "findutils"
+    "gawk"
+    "gcc-c++"
+    "gzip"
+    "make"
+    "patch"
+    "perl"
+    "pkgconfig"
+    "procps"
+    "rpm"
+    "rpm-build"
+    "tar"
+    "unzip"
+  ];
 
   /* Common packages for openSUSE images. */
   commonOpenSUSEPackages = [

From 2da7f32b2527df7f8535c6502588da8b35460b68 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Thu, 4 Jul 2013 19:13:36 +1000
Subject: [PATCH 293/314] install_name_tool: add expression

---
 .../darwin/install_name_tool/default.nix      | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 pkgs/top-level/python-packages.nix            |  3 +-
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/darwin/install_name_tool/default.nix

diff --git a/pkgs/os-specific/darwin/install_name_tool/default.nix b/pkgs/os-specific/darwin/install_name_tool/default.nix
new file mode 100644
index 00000000000..6a7e6caaa26
--- /dev/null
+++ b/pkgs/os-specific/darwin/install_name_tool/default.nix
@@ -0,0 +1,29 @@
+{ stdenv }:
+
+assert stdenv.isDarwin;
+
+stdenv.mkDerivation {
+  name = "install_name_tool";
+  src = "/usr/bin/install_name_tool";
+  unpackPhase = "true";
+  configurePhase = "true";
+  buildPhase = "true";
+
+  installPhase = ''
+    mkdir -p "$out"/bin
+    ln -s "$src" "$out"/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Change dynamic shared library install names";
+    homepage    = https://developer.apple.com/library/mac/documentation/Darwin/Reference/Manpages/man1/install_name_tool.1.html;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.darwin;
+
+    longDescription = ''
+      Install_name_tool changes the dynamic shared library install names and or
+      adds, changes or deletes the rpaths recorded in a Mach-O binary.
+    '';
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6a85db38225..e7ff0d7b047 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -444,6 +444,8 @@ let
 
   apg = callPackage ../tools/security/apg { };
 
+  install_name_tool = callPackage ../os-specific/darwin/install_name_tool { };
+
   xcodeenv = callPackage ../development/mobile/xcodeenv { };
 
   titaniumenv_2_1 = import ../development/mobile/titaniumenv {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cba57b16739..9f4a2780301 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6190,7 +6190,8 @@ pythonPackages = python.modules // rec {
       sha256 = "1rvgrviwn6f037m8vq395chz6a1119dbsdhfwdbv5ambi0bak6ll";
     };
   
-    buildInputs = [ pkgs.libspotify ];
+    buildInputs = [ pkgs.libspotify ]
+      ++ stdenv.lib.optional stdenv.isDarwin pkgs.install_name_tool;
   
     # python zip complains about old timestamps
     preConfigure = ''

From 0f4f212adc498f57c5ff1f952fb93822efa48582 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Thu, 4 Jul 2013 19:14:32 +1000
Subject: [PATCH 294/314] pyspotify: fix build on darwin

* use install_name_tool to have _spotify.so point to the correct library
---
 pkgs/top-level/python-packages.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9f4a2780301..2e56a26ec88 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6197,14 +6197,24 @@ pythonPackages = python.modules // rec {
     preConfigure = ''
       find -print0 | xargs -0 touch
     '';
+
+    postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+      find "$out" -name _spotify.so -exec \
+          install_name_tool -change \
+          @loader_path/../Frameworks/libspotify.framework/libspotify \
+          ${pkgs.libspotify}/lib/libspotify.dylib \
+          {} \;
+    '';
   
     # There are no tests
     doCheck = false;
   
-    meta = {
-      homepage = http://pyspotify.mopidy.com;
+    meta = with stdenv.lib; {
+      homepage    = http://pyspotify.mopidy.com;
       description = "A Python interface to Spotify’s online music streaming service";
-      maintainers = [ stdenv.lib.maintainers.rickynils ];
+      license     = licenses.unfree;
+      maintainers = with maintainers; [ lovek323 rickynils ];
+      platforms   = platforms.unix;
     };
   };
 

From 1aad70826e8b4736d8d8a3dc4a67696c2338bb94 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Sat, 6 Jul 2013 16:45:33 +1000
Subject: [PATCH 295/314] pyspotify: update to latest version

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2e56a26ec88..2a65c8e8ecf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6182,12 +6182,11 @@ pythonPackages = python.modules // rec {
   pyspotify = buildPythonPackage rec {
     name = "pyspotify-${version}";
   
-    version = "1.10";
+    version = "1.11";
   
-    src = fetchgit {
-      url = "https://github.com/mopidy/pyspotify.git";
-      rev = "refs/tags/v${version}";
-      sha256 = "1rvgrviwn6f037m8vq395chz6a1119dbsdhfwdbv5ambi0bak6ll";
+    src = fetchurl {
+      url = "https://github.com/mopidy/pyspotify/archive/v1.11.tar.gz";
+      sha256 = "089ml6pqr3f2d15n70jpzbaqjp5pjgqlyv4algkxw92xscjw2izg";
     };
   
     buildInputs = [ pkgs.libspotify ]

From cd5f3dc1fa16a20f8bd909e80c1fe8f7cf148b1b Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Sat, 6 Jul 2013 17:56:54 +1000
Subject: [PATCH 296/314] portaudio: fix build on darwin

* remove alsaLib from build inputs
* add --build=x86_64 to configure flags
* add --without-oss to configure flags
* add --enable-static to configure flags
* add --enable-shared to configure flags
* add framework header files
* disable failed tests
* copy all headers on install
* build with gccApple
---
 .../libraries/portaudio/default.nix           | 37 ++++++++++++++++---
 pkgs/top-level/all-packages.nix               |  8 +++-
 2 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix
index 89361bf3121..36e2e10ee08 100644
--- a/pkgs/development/libraries/portaudio/default.nix
+++ b/pkgs/development/libraries/portaudio/default.nix
@@ -8,13 +8,40 @@ stdenv.mkDerivation rec {
     sha256 = "168vmcag3c5y3zwf7h5298ydh83g72q5bznskrw9cr2h1lrx29lw";
   };
 
-  buildInputs = [ alsaLib pkgconfig ];
-  
-  meta = {
+  buildInputs = [ pkgconfig ]
+    ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
+
+  configureFlags = stdenv.lib.optionals stdenv.isDarwin
+    [ "--build=x86_64" "--without-oss" "--enable-static" "--enable-shared" ];
+
+  preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
+    sed -i '50 i\
+      #include <CoreAudio/AudioHardware.h>\
+      #include <CoreAudio/AudioHardwareBase.h>\
+      #include <CoreAudio/AudioHardwareDeprecated.h>' \
+      include/pa_mac_core.h
+
+    # disable two tests that don't compile
+    sed -i -e 105d Makefile
+    sed -i -e 107d Makefile
+  '';
+
+  # not sure why, but all the headers seem to be installed by the make install
+  installPhase = if stdenv.isDarwin then ''
+    mkdir -p "$out"
+    cp -r include "$out"
+    cp -r lib "$out"
+  '' else ''
+    make install
+  '';
+
+  meta = with stdenv.lib; {
     description = "Portable cross-platform Audio API";
-    homepage = http://www.portaudio.com/;
+    homepage    = http://www.portaudio.com/;
     # Not exactly a bsd license, but alike
-    license = "BSD";
+    license     = licenses.bsd;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.unix;
   };
 
   passthru = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 44df80361af..eb7a79c7f69 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5149,7 +5149,13 @@ let
 
   popt = callPackage ../development/libraries/popt { };
 
-  portaudio = callPackage ../development/libraries/portaudio { };
+  portaudio = callPackage ../development/libraries/portaudio {
+    # resolves a variety of compile-time errors
+    stdenv = if stdenv.isDarwin
+      then clangStdenv
+      else stdenv;
+  };
+
   portaudioSVN = callPackage ../development/libraries/portaudio/svn-head.nix { };
 
   prison = callPackage ../development/libraries/prison { };

From 5e45773df121f6262d5e8c89b0ed41476a7eff7d Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Sat, 6 Jul 2013 18:00:45 +1000
Subject: [PATCH 297/314] pyaudio: fix build on darwin

* build with '--static-link' flag
* set 'PORTAUDIO_PATH' environment variable
---
 pkgs/top-level/python-packages.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cba57b16739..535949eb8f5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3481,10 +3481,14 @@ pythonPackages = python.modules // rec {
 
     buildInputs = [ python pkgs.portaudio ];
 
-    installPhase = ''
-      python setup.py install --prefix=$out
+    buildPhase = if stdenv.isDarwin then ''
+      PORTAUDIO_PATH="${pkgs.portaudio}" python setup.py build --static-link
+    '' else ''
+      python setup.py build
     '';
 
+    installPhase = "python setup.py install --prefix=$out";
+
     meta = {
       description = "Python bindings for PortAudio";
       homepage = "http://people.csail.mit.edu/hubert/pyaudio/";

From c979360b528d927fc19539ed720ebb6b56a15ffd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sun, 30 Jun 2013 14:32:36 +0200
Subject: [PATCH 298/314] Adding a wrapper for sflphone-gnome (to find gtk3
 schema files)

---
 .../networking/instant-messengers/sflphone/default.nix   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/sflphone/default.nix b/pkgs/applications/networking/instant-messengers/sflphone/default.nix
index 79b554798ee..2401d796bfd 100644
--- a/pkgs/applications/networking/instant-messengers/sflphone/default.nix
+++ b/pkgs/applications/networking/instant-messengers/sflphone/default.nix
@@ -2,7 +2,7 @@
 , commoncpp2, ccrtp, libzrtpcpp, dbus, dbus_cplusplus, expat, pcre, gsm, speex, ilbc, libopus
 , autoconf, automake, libtool, gettext, perl
 , cmake, qt4
-, gtk, glib, dbus_glib, libnotify, intltool }:
+, gtk, glib, dbus_glib, libnotify, intltool, makeWrapper }:
 
 let
   name = "sflphone-1.2.3";
@@ -74,6 +74,11 @@ rec {
       cd gnome
     '';
 
-    buildInputs = [ daemon pkgconfig gtk glib dbus_glib libnotify intltool ];
+    # gtk3 programs have the runtime dependency on XDG_DATA_DIRS
+    postInstall = ''
+      wrapProgram $out/bin/sflphone* --prefix XDG_DATA_DIRS ":" ${gtk}/share
+    '';
+
+    buildInputs = [ daemon pkgconfig gtk glib dbus_glib libnotify intltool makeWrapper ];
   };
 }

From be2dfd1b7225f96de63094ae2ea34b7bf787d5d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 6 Jul 2013 14:33:32 +0200
Subject: [PATCH 299/314] Updating libzrtpcpp to 2.3.4.

I think it fixes the security threats exposed in:
http://blog.azimuthsecurity.com/2013/06/attacking-crypto-phones-weaknesses-in.html
---
 pkgs/development/libraries/libzrtpcpp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libzrtpcpp/default.nix b/pkgs/development/libraries/libzrtpcpp/default.nix
index e6c4cafcd55..b18aa6848bf 100644
--- a/pkgs/development/libraries/libzrtpcpp/default.nix
+++ b/pkgs/development/libraries/libzrtpcpp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, openssl, pkgconfig, ccrtp }:
 
 stdenv.mkDerivation rec {
-  name = "libzrtpcpp-2.3.3";
+  name = "libzrtpcpp-2.3.4";
 
   src = fetchurl {
     url = "mirror://gnu/ccrtp/${name}.tar.gz";
-    sha256 = "1p8i3qb4j1r64r7miva8hamaszk42kncpy1x5xlq1l0465h01rvg";
+    sha256 = "020hfyrh8qdwkqdg1r1n65wdzj5i01ba9dzjghbm9lbz93gd9r83";
   };
 
   # We disallow 'lib64', or pkgconfig will not find it.

From 525a6856f237add6fa07da4c19d7e7b6e5366dce Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Sun, 7 Jul 2013 18:54:33 +1000
Subject: [PATCH 300/314] otool and setfile: cleanup

---
 pkgs/development/libraries/wxGTK-2.9/default.nix            | 6 +++---
 .../tools/misc => os-specific/darwin}/otool/default.nix     | 3 ++-
 .../misc/setFile => os-specific/darwin/setfile}/default.nix | 5 +++--
 pkgs/top-level/all-packages.nix                             | 4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)
 rename pkgs/{development/tools/misc => os-specific/darwin}/otool/default.nix (93%)
 rename pkgs/{development/tools/misc/setFile => os-specific/darwin/setfile}/default.nix (91%)

diff --git a/pkgs/development/libraries/wxGTK-2.9/default.nix b/pkgs/development/libraries/wxGTK-2.9/default.nix
index e8a661a3389..f61c7eafd73 100644
--- a/pkgs/development/libraries/wxGTK-2.9/default.nix
+++ b/pkgs/development/libraries/wxGTK-2.9/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
-, gstreamer, gst_plugins_base, GConf, setFile
+, gstreamer, gst_plugins_base, GConf, setfile
 , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true,
 }:
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
     [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer
       gst_plugins_base GConf ]
     ++ optional withMesa mesa
-    ++ optional stdenv.isDarwin setFile;
+    ++ optional stdenv.isDarwin setfile;
 
   nativeBuildInputs = [ pkgconfig ];
 
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
   " + optionalString stdenv.isDarwin ''
     substituteInPlace configure --replace \
       'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \
-      'ac_cv_prog_SETFILE="${setFile}/bin/SetFile"'
+      'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"'
   '';
 
   postInstall = "
diff --git a/pkgs/development/tools/misc/otool/default.nix b/pkgs/os-specific/darwin/otool/default.nix
similarity index 93%
rename from pkgs/development/tools/misc/otool/default.nix
rename to pkgs/os-specific/darwin/otool/default.nix
index 21eb2b591c2..c998253d148 100644
--- a/pkgs/development/tools/misc/otool/default.nix
+++ b/pkgs/os-specific/darwin/otool/default.nix
@@ -14,12 +14,13 @@ stdenv.mkDerivation {
 
   installPhase = ''
     mkdir -p "$out/bin"
-    cp /usr/bin/otool "$out/bin"
+    ln -s $src "$out/bin"
   '';
 
   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;
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.darwin;
 
diff --git a/pkgs/development/tools/misc/setFile/default.nix b/pkgs/os-specific/darwin/setfile/default.nix
similarity index 91%
rename from pkgs/development/tools/misc/setFile/default.nix
rename to pkgs/os-specific/darwin/setfile/default.nix
index e3fbd2cbc6d..94320c94bc0 100644
--- a/pkgs/development/tools/misc/setFile/default.nix
+++ b/pkgs/os-specific/darwin/setfile/default.nix
@@ -4,7 +4,7 @@
 assert stdenv.isDarwin;
 
 stdenv.mkDerivation {
-  name = "setFile";
+  name = "setfile";
 
   src = "/usr/bin/SetFile";
 
@@ -14,12 +14,13 @@ stdenv.mkDerivation {
 
   installPhase = ''
     mkdir -p "$out/bin"
-    cp $src "$out/bin"
+    ln -s $src "$out/bin"
   '';
 
   meta = with stdenv.lib; {
     description = "Set attributes of files and directories";
     homepage    = "http://developer.apple.com/library/mac/#documentation/Darwin/Reference/ManPages/man1/setfile.1.html";
+    license     = licenses.unfree;
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.darwin;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 44df80361af..e51251cea6c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -444,9 +444,9 @@ let
 
   apg = callPackage ../tools/security/apg { };
 
-  otool = callPackage ../development/tools/misc/otool { };
+  otool = callPackage ../os-specific/darwin/otool { };
 
-  setFile = callPackage ../development/tools/misc/setFile { };
+  setfile = callPackage ../os-specific/darwin/setfile { };
 
   xcodeenv = callPackage ../development/mobile/xcodeenv { };
 

From 03f716d05e3a1d377459a3922ea12fe7a9ed66be Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Sun, 7 Jul 2013 19:21:45 +1000
Subject: [PATCH 301/314] autojump: fix build on darwin

* remove install.sh shell check
---
 pkgs/tools/misc/autojump/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix
index 459c9c86ce4..9b9155a1edb 100644
--- a/pkgs/tools/misc/autojump/default.nix
+++ b/pkgs/tools/misc/autojump/default.nix
@@ -16,6 +16,9 @@ in
     dontBuild = true;
 
     installPhase = ''
+      # don't check shell support (we're running with bash anyway)
+      sed -i -e 150,153d install.sh
+
       bash ./install.sh -d $out
 
       mkdir -p "$out/etc/bash_completion.d"

From 0dd6c441834fbca7b916a50265ddd4257877fb58 Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Sun, 7 Jul 2013 20:51:41 +1000
Subject: [PATCH 302/314] portaudio: fix license (fix #728)

---
 pkgs/development/libraries/portaudio/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix
index 36e2e10ee08..34d5bac6adb 100644
--- a/pkgs/development/libraries/portaudio/default.nix
+++ b/pkgs/development/libraries/portaudio/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     description = "Portable cross-platform Audio API";
     homepage    = http://www.portaudio.com/;
     # Not exactly a bsd license, but alike
-    license     = licenses.bsd;
+    license     = licenses.mit;
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.unix;
   };

From ec9f54602e761c2a6b7ac7dd6ce58de907bd0ec9 Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Sun, 7 Jul 2013 20:35:25 +1000
Subject: [PATCH 303/314] avahi: fix build on darwin

---
 pkgs/development/libraries/avahi/default.nix | 29 ++++++++++++--------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix
index 39a03e0b002..9c6c5b3f85a 100644
--- a/pkgs/development/libraries/avahi/default.nix
+++ b/pkgs/development/libraries/avahi/default.nix
@@ -1,5 +1,6 @@
 { fetchurl, stdenv, pkgconfig, libdaemon, dbus, perl, perlXMLParser
-, expat, gettext, intltool, glib, qt4 ? null, libiconvOrEmpty
+, expat, gettext, intltool, glib, libiconvOrEmpty
+, qt4 ? null
 , qt4Support ? false
 , withLibdnssdCompat ? false }:
 
@@ -25,23 +26,29 @@ stdenv.mkDerivation rec {
     [ "--disable-qt3" "--disable-gdbm" "--disable-mono"
       "--disable-gtk" "--disable-gtk3"
       "--${if qt4Support then "enable" else "disable"}-qt4"
-      "--disable-python"
-      "--with-distro=none" "--localstatedir=/var"
-    ] ++ stdenv.lib.optional withLibdnssdCompat "--enable-compat-libdns_sd";
+      "--disable-python" "--localstatedir=/var" "--with-distro=none" ]
+    ++ stdenv.lib.optional withLibdnssdCompat "--enable-compat-libdns_sd"
+    # autoipd won't build on darwin
+    ++ stdenv.lib.optional stdenv.isDarwin "--disable-autoipd";
 
-  meta = {
+  preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
+    sed -i '20 i\
+    #define __APPLE_USE_RFC_2292' \
+    avahi-core/socket.c
+  '';
+
+  meta = with stdenv.lib; {
     description = "Avahi, an mDNS/DNS-SD implementation";
+    homepage    = http://avahi.org;
+    license     = licenses.lgpl2Plus;
+    platforms   = platforms.unix;
+    maintainers = with maintainers; [ lovek323 ludo ];
+
     longDescription = ''
       Avahi is a system which facilitates service discovery on a local
       network.  It is an implementation of the mDNS (for "Multicast
       DNS") and DNS-SD (for "DNS-Based Service Discovery")
       protocols.
     '';
-
-    homepage = http://avahi.org;
-    license = "LGPLv2+";
-
-    platforms = stdenv.lib.platforms.linux;  # arbitrary choice
-    maintainers = [ stdenv.lib.maintainers.ludo ];
   };
 }

From 3fe02f7c8b5b06b33ff037466d992aad44c7d817 Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Sun, 7 Jul 2013 19:16:00 +1000
Subject: [PATCH 304/314] aescrypt: fix build on darwin

* add libiconvOrEmpty to build inputs
* add '-liconv' to LDFLAGS
---
 pkgs/tools/misc/aescrypt/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix
index 8e2427d6139..bec0840490d 100644
--- a/pkgs/tools/misc/aescrypt/default.nix
+++ b/pkgs/tools/misc/aescrypt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, libiconvOrEmpty }:
  
 stdenv.mkDerivation rec {
   version = "3.0.9";
@@ -19,14 +19,16 @@ stdenv.mkDerivation rec {
     cp aescrypt_keygen $out/bin
   '';
  
-  buildInputs = [];
+  buildInputs = [ libiconvOrEmpty ];
+
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv";
  
-  meta = {
+  meta = with stdenv.lib; {
     description = "A file encryption util that uses the industry standard Advanced Encryption Standard (AES) to easily and securely encrypt files";
-    homepage = http://www.aescrypt.com/;
-    license = "GPLv2";
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.qknight ];
+    homepage    = http://www.aescrypt.com/;
+    license     = licenses.gpl2;
+    maintainers = with maintainers; [ lovek323 qknight ];
+    platforms   = stdenv.lib.platforms.all;
   };
 }
 

From ccb7715de88f3bef875b6e9bae7994e1f72fa910 Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Sun, 7 Jul 2013 19:02:56 +1000
Subject: [PATCH 305/314] apacheHttpd_2_4: fix build on darwin

---
 pkgs/servers/http/apache-httpd/2.4.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index da353212657..bbf84a852b8 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     optional libxml2Support libxml2;
 
   # Required for ‘pthread_cancel’.
-  NIX_LDFLAGS = "-lgcc_s";
+  NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
 
   configureFlags = ''
     --with-apr=${apr}
@@ -58,11 +58,11 @@ stdenv.mkDerivation rec {
     inherit apr aprutil sslSupport proxySupport ldapSupport;
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Apache HTTPD, the world's most popular web server";
-    homepage = "http://httpd.apache.org/";
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    homepage    = http://httpd.apache.org/;
+    license     = licenses.asl20;
+    platforms   = stdenv.lib.platforms.unix;
+    maintainers = with maintainers; [ lovek323 simons ];
   };
 }

From 24f6c85096e2b8096285467c92fef280b1accd65 Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Sun, 7 Jul 2013 18:19:39 +1000
Subject: [PATCH 306/314] eyeD3: add expression

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index be9089b49c0..7fdb2f187df 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -732,6 +732,28 @@ pythonPackages = python.modules // rec {
   });
 
 
+  cogapp = buildPythonPackage rec {
+    version = "2.3";
+    name    = "cogapp-${version}";
+
+    src = fetchurl {
+      url    = "https://pypi.python.org/packages/source/c/cogapp/${name}.tar.gz";
+      sha256 = "0gzmzbsk54r1qa6wd0yg4zzdxvn2f19ciprr2acldxaknzrpllnn";
+    };
+
+    # there are no tests
+    doCheck = false;
+
+    meta = with stdenv.lib; {
+      description = "A code generator for executing Python snippets in source files";
+      homepage    = http://nedbatchelder.com/code/cog;
+      license     = licenses.mit;
+      maintainers = with maintainers; [ lovek323 ];
+      platforms   = platforms.unix;
+    };
+  };
+
+
   colorama = buildPythonPackage rec {
     name = "clientform-0.2.10";
 
@@ -1045,6 +1067,41 @@ pythonPackages = python.modules // rec {
     };
   };
 
+
+  eyeD3 = buildPythonPackage rec {
+    version = "0.7.2";
+    name    = "eyeD3-${version}";
+
+    src = fetchurl {
+      url = http://eyed3.nicfit.net/releases/eyeD3-0.7.2.tgz;
+      sha256 = "1r0vxdflrj83s8jc5f2qg4p00k37pskn3djym0w73bvq167vkxar";
+    };
+
+    buildInputs = [ paver ];
+
+    postInstall = ''
+      for prog in $out/bin/*; do
+        wrapProgram "$prog" --prefix PYTHONPATH : "$PYTHONPATH"
+      done
+    '';
+
+    meta = with stdenv.lib; {
+      description = "A Python module and command line program for processing ID3 tags";
+      homepage    = http://eyed3.nicfit.net/;
+      license     = licenses.gpl2;
+      maintainers = with maintainers; [ lovek323 ];
+      platforms   = platforms.unix;
+
+      longDescription = ''
+        eyeD3 is a Python module and command line program for processing ID3
+        tags. Information about mp3 files (i.e bit rate, sample frequency, play
+        time, etc.) is also provided. The formats supported are ID3 v1.0/v1.1
+        and v2.3/v2.4.
+      '';
+    };
+  };
+
+
   fabric = buildPythonPackage rec {
     name = "fabric-1.6.1";
     src = fetchurl {
@@ -1077,6 +1134,31 @@ pythonPackages = python.modules // rec {
   };
 
 
+  paver = buildPythonPackage rec {
+    version = "1.2.1";
+    name    = "Paver-${version}";
+
+    src = fetchurl {
+      url    = "https://pypi.python.org/packages/source/P/Paver/Paver-${version}.tar.gz";
+      sha256 = "1b1023jks1gi1rwphdy3y2zx7dh4bvwk2050kclp95j7xym1ya0y";
+    };
+
+    buildInputs = [ cogapp mock virtualenv ];
+
+    propagatedBuildInputs = [ nose ];
+
+    # the tests do not pass
+    doCheck = false;
+
+    meta = with stdenv.lib; {
+      description = "A Python-based build/distribution/deployment scripting tool";
+      homepage    = http://github.com/paver/paver;
+      matinainers = with maintainers; [ lovek323 ];
+      platforms   = platforms.unix;
+    };
+  };
+
+
   peppercorn = buildPythonPackage rec {
     name = "peppercorn-0.4";
 

From f43003237a497a56c8e74d51e138d009475ea0be Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 7 Jul 2013 22:44:58 +0200
Subject: [PATCH 307/314] linux-3.9: upgrade to 3.9.9

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.9.nix b/pkgs/os-specific/linux/kernel/linux-3.9.nix
index 7803504d91e..c0441982dd3 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.9.nix
@@ -258,7 +258,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.9.8";
+    version = "3.9.9";
     testing = false;
 
     preConfigure = ''
@@ -267,7 +267,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
-      sha256 = "0dfk3yrc6kcgywjgrj16lyi0m80847mn2l5sib8n5h2zadbdy0qy";
+      sha256 = "1zrw65m8kvxjkqfj708s418qdm87x0axjm0mr6c2zas5fnla981k";
     };
 
     config = configWithPlatform stdenv.platform;

From ad8a3b86abc1cef7e3180f3f0e3b7ac099077c33 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 7 Jul 2013 22:40:20 +0200
Subject: [PATCH 308/314] linux-3.10: forward-port 9p speedup from 3.9

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index 8c48a5b6c84..bcf555201a2 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -247,6 +247,10 @@ let
       # Our initrd init uses shebang scripts, so can't be modular
       BINFMT_SCRIPT y
 
+      # Enable the 9P cache to speed up NixOS VM tests.
+      9P_FSCACHE y
+      9P_FS_POSIX_ACL y
+
       ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
       ${extraConfig}
     '';

From e41456cebec86993d1f987faa2b5cedac784827b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 7 Jul 2013 15:32:29 +0200
Subject: [PATCH 309/314] python-gevent: new package

gevent is a coroutine-based Python networking library that uses greenlet
to provide a high-level synchronous API on top of the libevent event
loop.

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cba57b16739..e4a4b526283 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1903,6 +1903,27 @@ pythonPackages = python.modules // rec {
     };
   };
 
+  gevent = buildPythonPackage rec {
+    name = "gevent-0.13.8";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/g/gevent/${name}.tar.gz";
+      sha256 = "0plmxnb53qbxxf6macq84dvclsiyrpv3xrm32q4qqh6f01ix5f2l";
+    };
+
+    buildInputs = [ pkgs.libevent ];
+    propagatedBuildInputs = [ greenlet ];
+
+    meta = with stdenv.lib; {
+      description = "Coroutine-based networking library";
+      homepage = http://www.gevent.org/;
+      license = licenses.mit;
+      platforms = platforms.linux;
+      maintainers = [ maintainers.bjornfor ];
+    };
+  };
+
+
   genzshcomp = buildPythonPackage {
     name = "genzshcomp-0.2.2";
 

From 30bb106aa9fe616553f428ca84a19cee87334d93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 7 Jul 2013 19:12:46 +0200
Subject: [PATCH 310/314] python-pyodbc: new package

The pyodbc module enables python programs to connect to almost any
database using ODBC.

Build and "import pyodbc" tested, but I haven't tried connecting to any
database yet.
---
 pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e4a4b526283..ef8d2adaf41 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3800,6 +3800,26 @@ pythonPackages = python.modules // rec {
   };
 
 
+  pyodbc = buildPythonPackage rec {
+    name = "pyodbc-3.0.6";
+
+    src = fetchurl {
+      url = "https://pyodbc.googlecode.com/files/${name}.zip";
+      sha256 = "0v9nymllw5zq5294rqp8ip3l0g6l3l3mljwhxn5jajyzxlnz39z5";
+    };
+
+    buildInputs = [ pkgs.unzip pkgs.libiodbc ];
+
+    meta = with stdenv.lib; {
+      description = "Python ODBC module to connect to almost any database";
+      homepage = https://code.google.com/p/pyodbc/;
+      license = licenses.mit;
+      platforms = platforms.linux;
+      maintainers = [ maintainers.bjornfor ];
+    };
+  };
+
+
   pyparsing = buildPythonPackage rec {
     name = "pyparsing-1.5.6";
 

From 0a0b15321a20f9ef84dd6d060205b60c36b72fa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 7 Jul 2013 19:23:10 +0200
Subject: [PATCH 311/314] python-construct: new package

Construct is a powerful declarative parser (and builder) for binary
data.

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ef8d2adaf41..f39d1846bbb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -814,6 +814,27 @@ pythonPackages = python.modules // rec {
     };
   });
 
+
+  construct = buildPythonPackage rec {
+    name = "construct-2.5.1";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/c/construct/${name}.tar.gz";
+      sha256 = "08qksl87vr6g2wjxwsyrjh4w6v8bfmcgrcgln7irqvw5vv7qgqss";
+    };
+
+    propagatedBuildInputs = [ six ];
+
+    meta = with stdenv.lib; {
+      description = "Powerful declarative parser (and builder) for binary data";
+      homepage = http://construct.readthedocs.org/;
+      license = licenses.mit;
+      platforms = platforms.linux;
+      maintainers = [ maintainers.bjornfor ];
+    };
+  };
+
+
   coverage = buildPythonPackage rec {
     name = "coverage-3.6";
 

From 5dd026a063eb6e1d38c5f838cfb644233715a3b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 7 Jul 2013 19:39:36 +0200
Subject: [PATCH 312/314] python-bitstring: new package

bitstring is a python module for binary data manipulation.

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f39d1846bbb..dd7b65faf4d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -451,6 +451,29 @@ pythonPackages = python.modules // rec {
   };
 
 
+  bitstring = buildPythonPackage rec {
+    name = "bitstring-3.1.2";
+
+    src = fetchurl {
+      url = "https://python-bitstring.googlecode.com/files/${name}.zip";
+      sha256 = "1i1p3rkj4ad108f23xyib34r4rcy571gy65paml6fk77knh0k66p";
+    };
+
+    buildInputs = [ pkgs.unzip ];
+
+    # error: invalid command 'test'
+    doCheck = false;
+
+    meta = with stdenv.lib; {
+      description = "Module for binary data manipulation";
+      homepage = https://code.google.com/p/python-bitstring/;
+      license = licenses.mit;
+      platforms = platforms.linux;
+      maintainers = [ maintainers.bjornfor ];
+    };
+  };
+
+
   blivet = buildPythonPackage rec {
     name = "blivet-${version}";
     version = "0.17-1";

From 0360d4bfb63ded586430e7d64f2ec7941f13160c Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Mon, 8 Jul 2013 00:47:03 +0200
Subject: [PATCH 313/314] alot: updated to latest revision

---
 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 7fdb2f187df..e4ffbd010d9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -197,13 +197,13 @@ pythonPackages = python.modules // rec {
 
 
   alot = buildPythonPackage rec {
-    rev = "d3c1880a60ddd8ded397d92cddf310a948b97fdc";
+    rev = "0711cf8efaf1a4cca24617c3406210a415006457";
     name = "alot-0.3.4_${rev}";
 
     src = fetchurl {
       url = "https://github.com/pazz/alot/tarball/${rev}";
       name = "${name}.tar.bz";
-      sha256 = "049fzxs83zry5xr3al5wjvh7bcjq63wilf9wxh2c6sjmg96kpvvl";
+      sha256 = "1rxkx9cjajsv9x1dl4xp1r3vr0kb66sglxaqzjiwaknqzahmmji5";
     };
 
     # error: invalid command 'test'

From 6b6eaf3bf373d9b3fdaa0be43f5866bc21292f0b Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Mon, 8 Jul 2013 01:18:12 +0200
Subject: [PATCH 314/314] i3lock: updating to 2.5

---
 pkgs/applications/window-managers/i3/lock.nix | 8 ++++----
 pkgs/top-level/all-packages.nix               | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix
index 2331b1eaf81..c37ed0d85f2 100644
--- a/pkgs/applications/window-managers/i3/lock.nix
+++ b/pkgs/applications/window-managers/i3/lock.nix
@@ -1,16 +1,16 @@
 { fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutilimage,
-  pam, libX11, libev, cairo }:
+  pam, libX11, libev, cairo, libxkbcommon, libxkbfile }:
 
 stdenv.mkDerivation rec {
-  name = "i3lock-2.4.1";
+  name = "i3lock-2.5";
 
   src = fetchurl {
     url = "http://i3wm.org/i3lock/${name}.tar.bz2";
-    sha256 = "4d29e66841138de562e71903d31ecaaefd8ecffe5e68da0d6c8d560ed543047c";
+    sha256 = "0xqdklvfcn2accwdbzsly7add0f3rh9sxjnahawas4zwwk4p49xc";
   };
 
   buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11
-    libev cairo ];
+    libev cairo libxkbcommon libxkbfile ];
 
   makeFlags = "all";
   installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 78858e10634..f44a70f2211 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7692,6 +7692,7 @@ let
   i3 = callPackage ../applications/window-managers/i3 { };
 
   i3lock = callPackage ../applications/window-managers/i3/lock.nix {
+    inherit (xorg) libxkbfile;
     cairo = cairo.override { xcbSupport = true; };
   };