svn merge ^/nixpkgs/trunk, one simple conflict in jruby

svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
2012-01-19 21:31:51 +00:00 · 2012-01-19 21:31:51 +00:00 · 84c0185038
commit 84c0185038
parent 3980444b2b b94fef3cba
69 changed files with 763 additions and 352 deletions
--- a/pkgs/applications/editors/emacs-modes/org/default.nix
+++ b/pkgs/applications/editors/emacs-modes/org/default.nix
@ -1,11 +1,11 @@
 { fetchurl, stdenv, emacs, texinfo, which }:

 stdenv.mkDerivation rec {
-  name = "org-7.5";
+  name = "org-7.8";

  src = fetchurl {
    url = "http://orgmode.org/${name}.tar.gz";
-    sha256 = "978822bc4c5f9f67450fbaa8572f1d4217406b7e28551278c9f23f7e9515cd4b";
+    sha256 = "0idxsxdr5p0bvnjmhvpdkfwhlpkxmihnaljf43k0311g9z3k22qz";
  };

  buildInputs = [ emacs texinfo ];
--- a/pkgs/applications/editors/zile/default.nix
+++ b/pkgs/applications/editors/zile/default.nix
@ -1,11 +1,11 @@
 { fetchurl, stdenv, ncurses, boehmgc, perl, help2man }:

 stdenv.mkDerivation rec {
-  name = "zile-2.4.2";
+  name = "zile-2.4.3";

  src = fetchurl {
    url = "mirror://gnu/zile/${name}.tar.gz";
-    sha256 = "0ia91c18fyssnhabfb22npmidjkx32rqfkjgxxjibvdwfja25d3k";
+    sha256 = "0rygkc3i9bngzn49kq9fnrbz80d8pa2yjy8iz7vjlc4ayc2akvc3";
  };

  buildInputs = [ ncurses boehmgc ];
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@ -1,28 +1,26 @@
 { stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen,
-kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, kdeedu,
+lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, libjpeg, libtiff,
 liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost,
-shared_desktop_ontologies, marble }:
+shared_desktop_ontologies, marble, clapack, mysql }:

 stdenv.mkDerivation rec {
-  name = "digikam-2.4.1";
+  name = "digikam-2.5.0";

  src = fetchurl {
    url = "mirror://sourceforge/digikam/${name}.tar.bz2";
-    sha256 = "0fyyhc26syd1d1m8jqyg2i66hwd523mh419ln8y944jkrjj6gadc";
+    sha256 = "06l52j8i45vyfj3b81ivifqsqdjlcj4g68d8w06c5lhzniwjqaam";
  };

-  buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen
-    lcms jasper libgphoto2 kdepimlibs gettext soprano kdeedu liblqr1 lensfun
-    pkgconfig qjson libkdcraw opencv libkexiv2 libkipi boost shared_desktop_ontologies
-    marble ];
+  buildNativeInputs = [ cmake automoc4 pkgconfig ];

-  KDEDIRS=kdeedu;
+  buildInputs = [ qt4 kdelibs phonon qimageblitz qca2 eigen lcms libjpeg libtiff
+    jasper libgphoto2 kdepimlibs gettext soprano liblqr1 lensfun qjson libkdcraw
+    opencv libkexiv2 libkipi boost shared_desktop_ontologies marble mysql ];

  # Make digikam find some FindXXXX.cmake
-  preConfigure = ''
-    cp ${qjson}/share/apps/cmake/modules/FindQJSON.cmake cmake/modules;
-    cp ${marble}/share/apps/cmake/modules/FindMarble.cmake cmake/modules;
-  '';
+  KDEDIRS="${marble}:${qjson}";
+
+  patches = [ ./libkvkontakte-not-topdir.patch ./ftbfs-libkipi.patch ];

  meta = {
    description = "Photo Management Program";
--- a/pkgs/applications/graphics/digikam/ftbfs-libkipi.patch
+++ b/pkgs/applications/graphics/digikam/ftbfs-libkipi.patch
@ -0,0 +1,68 @@
+commit 25cc9c9876a5233bd630105d0110319892d4e18c
+Author: Gilles Caulier <caulier.gilles@gmail.com>
+Date:   Tue Jan 3 15:16:37 2012 +0100
+
+    enable checkall and clearall buttons only with libkipi version 1.4.0
+    BUGS: 290496
+
+diff --git a/core/utilities/setup/setupplugins.cpp b/utilities/setup/setupplugins.cpp
+index 0f4030a..b8efb35 100644
+--- a/core/utilities/setup/setupplugins.cpp
+++ b/core/utilities/setup/setupplugins.cpp
+@@ -6,8 +6,8 @@
+  * Date        : 2004-01-02
+  * Description : setup Kipi plugins tab.
+  *
+- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
+- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com>
+ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
+  *
+  * This program is free software; you can redistribute it
+  * and/or modify it under the terms of the GNU General
+@@ -100,6 +100,11 @@ SetupPlugins::SetupPlugins(QWidget* parent)
+ 
+     panel->setLayout(mainLayout);
+ 
+#if KIPI_VERSION < 0x010400
+    d->checkAllBtn->setVisible(false);
+    d->clearBtn->setVisible(false);
+#endif
+
+     initPlugins();
+ 
+     // --------------------------------------------------------
+@@ -158,14 +163,18 @@ void SetupPlugins::applyPlugins()
+ void SetupPlugins::slotCheckAll()
+ {
+     QApplication::setOverrideCursor(Qt::WaitCursor);
+#if KIPI_VERSION >= 0x010400
+     d->kipiConfig->slotCheckAll();
+#endif
+     QApplication::restoreOverrideCursor();
+ }
+ 
+ void SetupPlugins::slotClear()
+ {
+     QApplication::setOverrideCursor(Qt::WaitCursor);
+#if KIPI_VERSION >= 0x010400
+     d->kipiConfig->slotClear();
+#endif
+     QApplication::restoreOverrideCursor();
+ }
+ 
+diff --git a/core/utilities/setup/setupplugins.h b/utilities/setup/setupplugins.h
+index 271a569..114e0fa 100644
+--- a/core/utilities/setup/setupplugins.h
+++ b/core/utilities/setup/setupplugins.h
+@@ -6,8 +6,8 @@
+  * Date        : 2004-01-02
+  * Description : setup Kipi plugins tab.
+  *
+- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
+- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com>
+ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
+  *
+  * This program is free software; you can redistribute it
+  * and/or modify it under the terms of the GNU General
--- a/pkgs/applications/graphics/digikam/libkvkontakte-not-topdir.patch
+++ b/pkgs/applications/graphics/digikam/libkvkontakte-not-topdir.patch
@ -0,0 +1,33 @@
+commit 0f0cfa14805519cfd9e0b97ee9668dc4f86379de
+Author: Yury G. Kudryashov <urkud.urkud@gmail.com>
+Date:   Wed Jan 18 05:07:13 2012 +0400
+
+    Use CMAKE_CURRENT_{SOURCE,BINARY}_DIR
+    
+    Some projects (e.g., digikam) include snapshots of this library into their
+    release tarballs, so the libkvkontakte_SOURCE_DIR != CMAKE_SOURCE_DIR.
+
+diff --git a/extra/libkvkontakte/CMakeLists.txt b/extra/libkvkontakte/CMakeLists.txt
+index f19b28b..4310a74 100644
+--- a/extra/libkvkontakte/CMakeLists.txt
+++ b/extra/libkvkontakte/CMakeLists.txt
+@@ -21,7 +21,7 @@ set(INCLUDE_INSTALL_DIR include )
+ 
+ 
+ # === Closer to the code, close to the body ===
+-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
+ find_package(KDE4 REQUIRED)
+ include(KDE4Defaults)
+ include(MacroLibrary)
+@@ -35,8 +35,8 @@ macro_log_feature(QJSON_FOUND "QJSON" "Qt library for handling JSON data" "http:
+ add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+ 
+ include_directories(
+-  ${CMAKE_SOURCE_DIR}
+-  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+   ${KDE4_INCLUDES}
+   ${QJSON_INCLUDE_DIR}
+ )
--- a/pkgs/applications/networking/p2p/gnunet/default.nix
+++ b/pkgs/applications/networking/p2p/gnunet/default.nix
@ -7,11 +7,11 @@
 assert gtkSupport -> (gtk != null) && (libglade != null);

 stdenv.mkDerivation rec {
-  name = "gnunet-0.9.0";
+  name = "gnunet-0.9.1";

  src = fetchurl {
    url = "mirror://gnu/gnunet/${name}.tar.gz";
-    sha256 = "1a0faq2j20dxhpdq0lpi8mjhddwmscbaa1bsxk460p5mj8n55i3p";
+    sha256 = "0ipx027lzcgdv70adfk8f4h0zrzm9mlhy3vj9cgc0ck8x52llfpq";
  };

  buildInputs = [
@ -41,9 +41,18 @@ stdenv.mkDerivation rec {
    done
  '';

-  # XXX: There are several test failures, forwarded to bug-gnunet@gnu.org.
  doCheck = false;

+  /* FIXME: Tests must be run this way, but there are still a couple of
+     failures.
+
+  postInstall =
+    '' export GNUNET_PREFIX="$out"
+       export PATH="$out/bin:$PATH"
+       make -k check
+    '';
+  */
+
  meta = {
    description = "GNUnet, GNU's decentralized anonymous and censorship-resistant P2P framework";

--- a/pkgs/applications/networking/p2p/ktorrent/default.nix
+++ b/pkgs/applications/networking/p2p/ktorrent/default.nix
@ -5,14 +5,14 @@ stdenv.mkDerivation rec {
  name = pname + "-" + version;

  pname = "ktorrent";
-  version = "4.1.1";
+  version = "4.1.3";

  src = fetchurl {
    url = "${meta.homepage}/downloads/${version}/${name}.tar.bz2";
-    sha256 = "1h0fqh344sfwfbvnwhn00k8czb14568flapjf4754zss6bxpw4g4";
+    sha256 = "0ih68bml6ic3mxk5l4ypgmxwyg9mglp57gw5igrnm5yszm7jz19g";
  };

-  patches = [ ./find-workspace.diff ];
+  patches = [ ./find-workspace.diff ./drop-taskmanager-dependency.patch ];

  KDEDIRS = libktorrent;

--- a/pkgs/applications/networking/p2p/ktorrent/drop-taskmanager-dependency.patch
+++ b/pkgs/applications/networking/p2p/ktorrent/drop-taskmanager-dependency.patch
@ -0,0 +1,175 @@
+commit 6d4a6ae51692966862ccb20d17cb217717519d40
+Author: Joris Guisson <joris.guisson@gmail.com>
+Date:   Wed Nov 23 20:17:08 2011 +0100
+
+    Use dbus to show ktorrent window from plasma applet. This removes the dependency on libtaskmanager.
+    
+    BUG: 287309
+Changelog removed by Yury G. Kudryashov
+
+diff --git a/plasma/applet/CMakeLists.txt b/plasma/applet/CMakeLists.txt
+index 3a72241..4307cf2 100644
+--- a/plasma/applet/CMakeLists.txt
+++ b/plasma/applet/CMakeLists.txt
+@@ -5,25 +5,15 @@ if(NOT QT_VERSION_OK)
+ 
+ else(NOT QT_VERSION_OK)
+ 	
+-	set(TASKMANAGER_FOUND FALSE)
+-	FIND_PATH(TASKMANAGER_INCLUDE_DIR NAMES taskmanager.h  PATHS ${KDE4_INCLUDE_DIR}/taskmanager ${INCLUDE_INSTALL_DIR}/taskmanager.h)
+-	FIND_LIBRARY(TASKMANAGER_LIBRARY NAMES taskmanager PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
+-
+-	if(TASKMANAGER_INCLUDE_DIR AND TASKMANAGER_LIBRARY)
+-		set(TASKMANAGER_FOUND TRUE)
+-		message(STATUS "Found libtaskmanager: ${TASKMANAGER_LIBRARY} ")
+-		include_directories(${TASKMANAGER_INCLUDE_DIR})
+-		set(ktapplet_SRCS applet.cpp chunkbar.cpp fadingitem.cpp fadingnavigationwidget.cpp)
+-		
+-		kde4_add_ui_files(ktapplet_SRCS appletconfig.ui)
+-		
+-		kde4_add_plugin(plasma_applet_ktorrent ${ktapplet_SRCS})
+-		target_link_libraries(plasma_applet_ktorrent  ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${TASKMANAGER_LIBRARY} ${LIBKTORRENT_LIBRARIES} ktcore)
+-		
+-		install(TARGETS plasma_applet_ktorrent DESTINATION ${PLUGIN_INSTALL_DIR})
+-		install(FILES plasma-applet-ktorrent.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+-	endif(TASKMANAGER_INCLUDE_DIR AND TASKMANAGER_LIBRARY)
+-
+-	macro_log_feature(TASKMANAGER_FOUND "libtaskmanager" "libtaskmanager library and header files" "http://www.kde.org/" FALSE "" "libtaskmanager is needed for KTorrent Plasmoid")
+	
+	set(ktapplet_SRCS applet.cpp chunkbar.cpp fadingitem.cpp fadingnavigationwidget.cpp)
+	
+	kde4_add_ui_files(ktapplet_SRCS appletconfig.ui)
+	
+	kde4_add_plugin(plasma_applet_ktorrent ${ktapplet_SRCS})
+	target_link_libraries(plasma_applet_ktorrent  ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${LIBKTORRENT_LIBRARIES} ktcore)
+	
+	install(TARGETS plasma_applet_ktorrent DESTINATION ${PLUGIN_INSTALL_DIR})
+	install(FILES plasma-applet-ktorrent.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+ 
+ endif(NOT QT_VERSION_OK)
+diff --git a/plasma/applet/applet.cpp b/plasma/applet/applet.cpp
+index 59e7191..bf09479 100644
+--- a/plasma/applet/applet.cpp
+++ b/plasma/applet/applet.cpp
+@@ -21,6 +21,9 @@
+ #include "applet.h"
+ #include <QFile>
+ #include <QGraphicsLinearLayout>
+#include <QDBusConnection>
+#include <QDBusConnectionInterface>
+#include <QDBusMessage>
+ #include <KConfigDialog>
+ #include <KLocale>
+ #include <KRun>
+@@ -31,12 +34,11 @@
+ #include <Plasma/IconWidget>
+ #endif
+ #include <Plasma/Label>
+-#include <taskmanager/taskmanager.h>
+-#include <taskmanager/task.h>
+ #include <util/functions.h>
+ #include "chunkbar.h"
+ #include "fadingnavigationwidget.h"
+ 
+
+ using namespace bt;
+ 
+ namespace ktplasma
+@@ -174,7 +176,8 @@ namespace ktplasma
+ 		}
+ 	}
+ 
+-	void Applet::updateNavigation() {
+	void Applet::updateNavigation() 
+	{
+ 		navigation->setEnabled(connected_to_app && !sources.empty()
+ 			&& (sources.count() > 1 || !sources.contains(current_source)));
+ 	}
+@@ -193,12 +196,14 @@ namespace ktplasma
+ 		}
+ 	}
+ 	
+-	void Applet::updateSources() {
+	void Applet::updateSources() 
+	{
+ 		sources = engine->sources();
+ 		sources.removeOne("core");
+ 	}
+ 
+-	void Applet::setSource(QString source) {
+	void Applet::setSource(QString source) 
+	{
+ 		if (!current_source.isEmpty())
+ 			engine->disconnectSource(current_source,this);
+ 		clearData();
+@@ -340,20 +345,39 @@ namespace ktplasma
+ 
+ 	void Applet::iconClicked()
+ 	{
+-		TaskManager::TaskDict tasks = TaskManager::TaskManager::self()->tasks();
+-		for (TaskManager::TaskDict::iterator i = tasks.begin();i != tasks.end();i ++)
+		QDBusConnection session_bus = QDBusConnection::sessionBus();
+		QDBusConnectionInterface* dbus_service = session_bus.interface();
+		if (!session_bus.isConnected() || !dbus_service || !dbus_service->isServiceRegistered("org.ktorrent.ktorrent"))
+ 		{
+-			if (i.value()->className() == "ktorrent")
+-			{
+-				KWindowSystem::activateWindow(i.key());
+-				return;
+-			}
+			// can't find the window, try launching it
+			KUrl::List empty;
+			KRun::run("ktorrent", empty, 0);
+		}
+		else
+		{
+			QDBusMessage msg = QDBusMessage::createMethodCall("org.ktorrent.ktorrent", "/ktorrent/MainWindow_1", "org.kde.KMainWindow", "winId");
+			QDBusPendingCall call = session_bus.asyncCall(msg, 5000);
+			QDBusPendingCallWatcher* watcher = new QDBusPendingCallWatcher(call ,this);
+			connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)), this, SLOT(dbusCallFinished(QDBusPendingCallWatcher*)));
+ 		}
+-
+-		// can't find the window, try launching it
+-		KUrl::List empty;
+-		KRun::run("ktorrent", empty, 0);
+ 	}
+	
+	void Applet::dbusCallFinished(QDBusPendingCallWatcher* self)
+	{
+		if (self->isError())
+		{
+			// call failed, try launching it
+			KUrl::List empty;
+			KRun::run("ktorrent", empty, 0);
+		}
+		else
+		{
+			QDBusPendingReply<qlonglong> reply = *self;
+			KWindowSystem::activateWindow(reply.value());		
+		}
+		self->deleteLater();
+	}
+
+ 
+ 	void Applet::clearData()
+ 	{		
+diff --git a/plasma/applet/applet.h b/plasma/applet/applet.h
+index 29b3265..d396118 100644
+--- a/plasma/applet/applet.h
+++ b/plasma/applet/applet.h
+@@ -27,6 +27,7 @@
+ #include "fadingnavigationwidget.h"
+ 
+ class QGraphicsLinearLayout;
+class QDBusPendingCallWatcher;
+ 
+ namespace Plasma
+ {
+@@ -68,6 +69,7 @@ namespace ktplasma
+ 		void iconClicked();
+ 		void selectPrev();
+ 		void selectNext();
+		void dbusCallFinished(QDBusPendingCallWatcher* self);
+ 		
+ 	private:
+ 		void updateTorrentCombo();
--- a/pkgs/applications/networking/p2p/ktorrent/find-workspace.diff
+++ b/pkgs/applications/networking/p2p/ktorrent/find-workspace.diff
@ -1,19 +1,4 @@
-Fix finding taskmanager.h and kworkspace.h
-diff --git a/plasma/applet/CMakeLists.txt b/plasma/applet/CMakeLists.txt
-index 3a72241..69b1205 100644
--- a/plasma/applet/CMakeLists.txt
-+++ b/plasma/applet/CMakeLists.txt
-@@ -6,7 +6,9 @@ if(NOT QT_VERSION_OK)
- else(NOT QT_VERSION_OK)
- 	
- 	set(TASKMANAGER_FOUND FALSE)
-	FIND_PATH(TASKMANAGER_INCLUDE_DIR NAMES taskmanager.h  PATHS ${KDE4_INCLUDE_DIR}/taskmanager ${INCLUDE_INSTALL_DIR}/taskmanager.h)
-+	FIND_PATH(TASKMANAGER_INCLUDE_DIR
-+		NAMES taskmanager/taskmanager.h
-+		HINTS ${KDE4_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR})
- 	FIND_LIBRARY(TASKMANAGER_LIBRARY NAMES taskmanager PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
- 
- 	if(TASKMANAGER_INCLUDE_DIR AND TASKMANAGER_LIBRARY)
+Fix finding kworkspace.h
 diff --git a/plugins/shutdown/CMakeLists.txt b/plugins/shutdown/CMakeLists.txt
 index 59e5470..5b932ff 100644
 --- a/plugins/shutdown/CMakeLists.txt
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@ -1,17 +1,26 @@
 { stdenv, fetchurl, perl
 , enableACLs ? true, acl ? null
+, enableCopyDevicesPatch ? false
 }:

 assert enableACLs -> acl != null;

-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
  name = "rsync-3.0.9";

-  src = fetchurl {
+  mainSrc = fetchurl {
    url = http://rsync.samba.org/ftp/rsync/src/rsync-3.0.9.tar.gz;
    sha256 = "01bw4klqsrlhh3i9lazd485sd9qx5djvnwa21lj2h3a9sn6hzw9h";
  };

+  patchesSrc = fetchurl {
+    url = http://rsync.samba.org/ftp/rsync/rsync-patches-3.0.9.tar.gz;
+    sha256 = "0c1e9b56e99667dfc47641124460bac61a04c5d2ee89f575c6bc78c7a69005a9";
+  };
+
+  srcs = [mainSrc] ++ stdenv.lib.optional enableCopyDevicesPatch patchesSrc;
+  patches = [] ++ stdenv.lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff";
+
  buildInputs = stdenv.lib.optional enableACLs acl;
  buildNativeInputs = [perl];

--- a/pkgs/desktops/kde-4.8/kdebindings/pykde-purity.patch
+++ b/pkgs/desktops/kde-4.8/kdebindings/pykde-purity.patch
@ -1,40 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c853e38..5df3253 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -232,7 +232,7 @@ _pkg_config = {
-     'pykde_kde_sip_flags':  '${_SIP_TAGS} ${_SIP_X} ${SIP_EXTRA_OPTIONS}',
-     'pykde_mod_dir':        '${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyKDE4',
-     'pykde_modules':        '${PYKDE_MODULES}',
-    'pykde_sip_dir':        '${SIP_DEFAULT_SIP_DIR}/PyKDE4',
-+    'pykde_sip_dir':        '${CMAKE_INSTALL_PREFIX}/share/sip/PyKDE4',
-     'pykde_version':        kde_version_hex,
-     'pykde_version_str':    '${KDE_VERSION}'
- }
-@@ -244,7 +244,7 @@ PYTHON_INSTALL(${CMAKE_CURRENT_BINARY_DIR}/pykdeconfig.py ${PYTHON_SITE_PACKAGES
- 
- # Install the .sip files for anyone that wants to build bindings on top of PyKDE4.
- # (Don't forget the / at the end of sip/.)
-INSTALL(DIRECTORY sip/ DESTINATION ${SIP_DEFAULT_SIP_DIR}/PyKDE4
-+INSTALL(DIRECTORY sip/ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/sip/PyKDE4
-     PATTERN "*~" EXCLUDE    # This sucks, why can't I just whitelist what I _do_ want?
-     PATTERN ".svn" EXCLUDE
-     PATTERN "*.in" EXCLUDE)
-diff --git a/kpythonpluginfactory/CMakeLists.txt b/kpythonpluginfactory/CMakeLists.txt
-index 41fa0fe..642d867 100644
--- a/kpythonpluginfactory/CMakeLists.txt
-+++ b/kpythonpluginfactory/CMakeLists.txt
-@@ -3,7 +3,12 @@
- set(kpythonpluginfactory_SRCS
-     kpythonpluginfactory.cpp)
- 
-GET_FILENAME_COMPONENT(LIB_PYTHON ${PYTHON_LIBRARY} NAME)
-+option(HARDCODE_LIB_PYTHON_PATH "Whether the path to libpython.so should be hardcoded" OFF)
-+if(HARDCODE_LIB_PYTHON_PATH)
-+	get_filename_component(LIB_PYTHON ${PYTHON_LIBRARY} REALPATH)
-+else(HARDCODE_LIB_PYTHON_PATH)
-+    get_filename_component(LIB_PYTHON ${PYTHON_LIBRARY} NAME)
-+endif(HARDCODE_LIB_PYTHON_PATH)
- ADD_DEFINITIONS(-DLIB_PYTHON=\\"${LIB_PYTHON}\\")
- ADD_DEFINITIONS(-DKDE_DEFAULT_DEBUG_AREA=15000)
- 
--- a/pkgs/desktops/kde-4.8/kdebindings/pykde4-hardcode-lib-python.patch
+++ b/pkgs/desktops/kde-4.8/kdebindings/pykde4-hardcode-lib-python.patch
@ -0,0 +1,18 @@
+diff --git a/kpythonpluginfactory/CMakeLists.txt b/kpythonpluginfactory/CMakeLists.txt
+index 41fa0fe..642d867 100644
+--- a/kpythonpluginfactory/CMakeLists.txt
+++ b/kpythonpluginfactory/CMakeLists.txt
+@@ -3,7 +3,12 @@
+ set(kpythonpluginfactory_SRCS
+     kpythonpluginfactory.cpp)
+ 
+-GET_FILENAME_COMPONENT(LIB_PYTHON ${PYTHON_LIBRARY} NAME)
+option(HARDCODE_LIB_PYTHON_PATH "Whether the path to libpython.so should be hardcoded" OFF)
+if(HARDCODE_LIB_PYTHON_PATH)
+	get_filename_component(LIB_PYTHON ${PYTHON_LIBRARY} REALPATH)
+else(HARDCODE_LIB_PYTHON_PATH)
+    get_filename_component(LIB_PYTHON ${PYTHON_LIBRARY} NAME)
+endif(HARDCODE_LIB_PYTHON_PATH)
+ ADD_DEFINITIONS(-DLIB_PYTHON=\\"${LIB_PYTHON}\\")
+ ADD_DEFINITIONS(-DKDE_DEFAULT_DEBUG_AREA=15000)
+ 
--- a/pkgs/desktops/kde-4.8/kdebindings/pykde4.nix
+++ b/pkgs/desktops/kde-4.8/kdebindings/pykde4.nix
@ -8,11 +8,9 @@ kde {

  propagatedBuildInputs = [ pyqt4 sip ];

-#NIX_CFLAGS_COMPILE = "-I${phonon}/include/phonon";
+  patches = [ ./pykde4-hardcode-lib-python.patch ];

-  patches = [ ./pykde-purity.patch ];
-
-  cmakeFlags = "-DHARDCODE_LIB_PYTHON_PATH=ON";
+  cmakeFlags = "-DHARDCODE_LIB_PYTHON_PATH=ON ";

  preConfigure =
    ''
@ -21,6 +19,7 @@ kde {
      # needs to install a plugin.
      mkdir -pv $out/${pydir}
      ${lndir}/bin/lndir ${pyqt4}/${pydir} $out/${pydir}
+      cmakeFlagsArray=( "-DSIP_DEFAULT_SIP_DIR=$prefix/share/sip" )
    '';

  meta = {
--- a/pkgs/desktops/kde-4.8/kdenetwork/log-feature.diff
+++ b/pkgs/desktops/kde-4.8/kdenetwork/log-feature.diff
@ -1,60 +0,0 @@
--- a/kget/CMakeLists.txt	2010-08-16 19:08:36.000000000 +0400
-+++ b/kget/CMakeLists.txt	2010-08-16 22:04:24.000000000 +0400
-@@ -53,21 +53,20 @@
- add_subdirectory(desktop)
- add_subdirectory(plasma)
- 
-# find kworkspace library to allow the shutdown after downloads completed option
-find_library(KDE4_KWORKSPACE_LIBRARY NAMES kworkspace PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
-if(KDE4_KWORKSPACE_LIBRARY)
-    set(KDE4_KWORKSPACE_LIBS ${kworkspace_LIB_DEPENDS} ${KDE4_KWORKSPACE_LIBRARY})
-+macro_optional_find_package(KDE4Workspace)
-+macro_log_feature(KDE4WORKSPACE_FOUND "KDE4Workspace" "KDE4 workspace libraries, part of kdebase-workspace" "http://www.kde.org" FALSE "" "Allows 'shutdown after downloads completed' in kget")
-+if(KDE4WORKSPACE_FOUND)
-     add_definitions(-DHAVE_KWORKSPACE)
-    set(KWORKSPACE_FOUND true)
-endif(KDE4_KWORKSPACE_LIBRARY)
-+	include_directories(${KDE4WORKSPACE_INCLUDE_DIR})
-+endif(KDE4WORKSPACE_FOUND)
- 
- # find libkonq to allow actions and open with options in the context menu of a transfer
-find_library(KDE4_KONQUEROR_LIBRARY NAMES konq PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
-if(KDE4_KONQUEROR_LIBRARY)
-    set(KDE4_KONQUEROR_LIBS ${konq_LIB_DEPENDS} ${KDE4_KONQUEROR_LIBRARY})
-+macro_optional_find_package(LibKonq)
-+macro_log_feature(LIBKONQ_FOUND "libkonq" "KDE4 Konqueror library" "http://www.kde.org" FALSE "" "Needed to build actions and open with options in the context menu of a transfer")
-+if(LIBKONQ_FOUND)
-     add_definitions(-DHAVE_KONQUEROR)
-    set(KONQUEROR_FOUND true)
-endif(KDE4_KONQUEROR_LIBRARY)
-+	include_directories(${LIBKONQ_INCLUDE_DIR})
-+endif(LIBKONQ_FOUND)
- 
- 
- include_directories(
-@@ -142,9 +141,9 @@
- 
- target_link_libraries(kgetcore ${KDE4_KIO_LIBS})
- 
-if (KWORKSPACE_FOUND)
-    target_link_libraries(kgetcore ${KDE4_KWORKSPACE_LIBS})
-endif (KWORKSPACE_FOUND)
-+if (KDE4WORKSPACE_FOUND)
-+    target_link_libraries(kgetcore ${KDE4WORKSPACE_KWORKSPACE_LIBS})
-+endif (KDE4WORKSPACE_FOUND)
- 
- if (HAVE_NEPOMUK)
-   target_link_libraries(kgetcore ${SOPRANO_LIBRARIES} ${NEPOMUK_LIBRARIES})
-@@ -294,9 +293,9 @@
-   target_link_libraries(kget ${SOPRANO_LIBRARIES} ${NEPOMUK_LIBRARIES})
- endif (HAVE_NEPOMUK)
- 
-if (KONQUEROR_FOUND)
-  target_link_libraries(kget ${KDE4_KONQUEROR_LIBS})
-endif (KONQUEROR_FOUND)
-+if (LIBKONQ_FOUND)
-+  target_link_libraries(kget ${LIBKONQ_LIBRARY})
-+endif (LIBKONQ_FOUND)
- 
- if (QGPGME_FOUND)
-   target_link_libraries(kget ${QGPGME_LIBRARIES})
--- a/pkgs/desktops/kde-4.8/kdesdk/optional-docs.diff
+++ b/pkgs/desktops/kde-4.8/kdesdk/optional-docs.diff
@ -1,39 +0,0 @@
-diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
-index 63cdef8..0c5b50a 100644
--- a/doc/CMakeLists.txt
-+++ b/doc/CMakeLists.txt
-@@ -3,22 +3,30 @@ if( UNIX )
-     add_subdirectory(cervisia)
-   endif()
- endif( UNIX )
-add_subdirectory(kapptemplate)
-+if(BUILD_kapptemplate)
-+  add_subdirectory(kapptemplate)
-+endif()
- if(BUILD_kbugbuster)
-   add_subdirectory(kbugbuster)
- endif()
- if(BUILD_kcachegrind)
-   add_subdirectory(kcachegrind)
- endif()
-add_subdirectory(kmtrace)
-+if(BUILD_kmtrace)
-+  add_subdirectory(kmtrace)
-+endif()
- if(BUILD_kompare)
-   add_subdirectory(kompare)
- endif()
- if(BUILD_lokalize)
-   add_subdirectory(lokalize)
- endif()
-add_subdirectory(poxml)
-add_subdirectory(scripts)
-+if(BUILD_poxml)
-+  add_subdirectory(poxml)
-+endif()
-+if(BUILD_scripts)
-+  add_subdirectory(scripts)
-+endif()
- 
- if(LIBXSLT_FOUND AND LIBXML2_FOUND)
-   if(BUILD_umbrello)
--- a/pkgs/development/compilers/gwt/2.4.0.nix
+++ b/pkgs/development/compilers/gwt/2.4.0.nix
@ -0,0 +1,21 @@
+{stdenv, fetchurl, unzip}:
+
+stdenv.mkDerivation {
+  name = "gwt-java-2.4.0";
+  src = fetchurl { 
+    url=http://google-web-toolkit.googlecode.com/files/gwt-2.4.0.zip; 
+    sha1 = "a91ac20db0ddd5994ac3cbfb0e8061d5bbf66f88"; 
+  };
+  buildInputs = [unzip]; 
+
+  installPhase = ''
+    ensureDir $out
+    unzip $src
+    mv gwt-2.4.0 $out/bin
+  '';
+
+  meta = {
+    homepage = http://code.google.com/webtoolkit/;
+    description = "Google Web Toolkit (GWT) is a development toolkit for building and optimizing complex browser-based applications.";
+  };
+ }
--- a/pkgs/development/compilers/uhc/default.nix
+++ b/pkgs/development/compilers/uhc/default.nix
@ -3,7 +3,7 @@
 }:

 let
-  revision = "2381";
+  revision = "2399";
 in
 stdenv.mkDerivation {
  name = "uhc-svn-${revision}";
@ -11,7 +11,7 @@ stdenv.mkDerivation {
  src = fetchsvn {
     url = "https://subversion.cs.uu.nl/repos/project.UHC.pub/trunk/EHC";
     rev = revision;
-     sha256 = "37598f49cda8ff67b0b4d1c75b0bf50bfcd29a92b08ea427c5071080e368c4bc";
+     sha256 = "f4e87dbf95f90b021994b0840f27e042dd4e785df7efedcf567f3e2c7ce32621";
  };

  propagatedBuildInputs = [mtl network binary fgl syb];
--- a/pkgs/development/interpreters/jruby/default.nix
+++ b/pkgs/development/interpreters/jruby/default.nix
@ -1,18 +1,30 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, makeWrapper, jre }:

 stdenv.mkDerivation {
-  name = "jruby-1.1.6";
+  name = "jruby-1.6.5.1";

  src = fetchurl {
-    url = http://dist.codehaus.org/jruby/1.1.6RC1/jruby-bin-1.1.6RC1.tar.gz;
-    sha256 = "1q3cjshxk484i8gqxm682bxcrps7205nl9vlim4s6z827bjlmc4a";
+    url = http://jruby.org.s3.amazonaws.com/downloads/1.6.5.1/jruby-bin-1.6.5.1.tar.gz;
+    sha256 = "1j0iv1q950lyir9vqfgg2533f1q28jaz7vnxqswsaix1mjhm29qd";
  };

-  installPhase = '' mkdir -p $out; cp -r * $out '';
+  buildInputs = [ makeWrapper ];
+
+  installPhase = ''
+     mkdir -pv $out
+     mv * $out
+     rm $out/bin/*.{bat,dll,exe,sh}
+     mv $out/README $out/docs
+
+     for i in $out/bin/*; do
+       wrapProgram $i \
+         --set JAVA_HOME ${jre}
+     done
+  '';

  meta = { 
    description = "Ruby interpreter written in Java";
-    homepage = http://jruby.codehaus.org/;
+    homepage = http://jruby.org/;
    license = "CPL-1.0 GPL-2 LGPL-2.1"; # one of those
  };
 }
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@ -5,11 +5,11 @@ assert guileBindings -> guile != null;

 stdenv.mkDerivation rec {

-  name = "gnutls-3.0.8";
+  name = "gnutls-3.0.11";

  src = fetchurl {
    url = "mirror://gnu/gnutls/${name}.tar.xz";
-    sha256 = "0qcp7jm8c2fyk5kdb4fgyrv9hb745mcf066vwmlb8dchx15ijkms";
+    sha256 = "1l8k96hms7891zl43qjd7lngjh23kxdq22l6ahm1ham7fyhhrh9r";
  };

  configurePhase = ''
--- a/pkgs/development/libraries/haskell/aeson-native/default.nix
+++ b/pkgs/development/libraries/haskell/aeson-native/default.nix
@ -4,15 +4,15 @@

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

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

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

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

 cabal.mkDerivation (self: {
  pname = "data-object";
-  version = "0.3.1.8";
-  sha256 = "0v7kn6rv71fhf2l7ll7plzr90irm2fyp25lskv2zwazp4swhw52x";
+  version = "0.3.1.9";
+  sha256 = "0z8m23kw8mj6hhy1r8y1vvlxxpwl273dhanszig2673a1sw0l98l";
  buildDepends = [ failure text time ];
  meta = {
    homepage = "http://github.com/snoyberg/data-object/tree/master";
-    description = "Represent hierachichal structures, called objects in JSON";
+    description = "Represent hierachichal structures, called objects in JSON. (deprecated)";
    license = self.stdenv.lib.licenses.bsd3;
    platforms = self.ghc.meta.platforms;
    maintainers = [
--- a/pkgs/development/libraries/haskell/ghc-mod/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix
@ -0,0 +1,30 @@
+{ cabal, attoparsec, attoparsecEnumerator, ghcPaths, hlint, regexPosix, emacs, emacs23Packages }:
+
+cabal.mkDerivation (self: {
+  pname = "ghc-mod";
+  version = "1.0.6";
+  sha256 = "c075314de03209827a0e59ee3e63a4d21bc8edb024a1e36721eea248805b38ba";
+  buildDepends = [
+    attoparsec attoparsecEnumerator ghcPaths hlint regexPosix
+  ];
+#  buildTools = [emacs emacs23];
+  propagatedBuildInputs = [emacs emacs23Packages.haskellMode];
+  isExecutable = true;
+  postInstall = ''
+    cd $out/share/$pname-$version
+    make
+    rm Makefile
+    cd ..
+    ensureDir "$out/share/emacs"
+    mv $pname-$version emacs/site-lisp
+  '';
+
+  meta = {
+    description = "Happy Haskell programming on Emacs";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.bluescreen303
+    ];
+  };
+})
--- a/pkgs/development/libraries/haskell/hamlet/default.nix
+++ b/pkgs/development/libraries/haskell/hamlet/default.nix
@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "hamlet";
-  version = "0.10.6";
-  sha256 = "0ai00jwbq5nnrgcfhz3sxm2jm2jvz7qbj56lr0wlc3z818a22ams";
+  version = "0.10.7.1";
+  sha256 = "0ll9pp0qnvw903ncpfgrc67jg385jzla3j9l0yfm9qqnn38sqhqv";
  buildDepends = [
    blazeBuilder blazeHtml failure parsec shakespeare text
  ];
--- a/pkgs/development/libraries/haskell/http-enumerator/default.nix
+++ b/pkgs/development/libraries/haskell/http-enumerator/default.nix
@ -7,8 +7,8 @@

 cabal.mkDerivation (self: {
  pname = "http-enumerator";
-  version = "0.7.2.4";
-  sha256 = "0gnbyhjs28rwdaypa9zhyja3bakr74if68cgivn1s56wbhrhc70s";
+  version = "0.7.2.5";
+  sha256 = "1sck3z1x73qbak6p11745bywxwz91nk635jvv4wmgq4ifyfkbabb";
  isLibrary = true;
  isExecutable = true;
  buildDepends = [
--- a/pkgs/development/libraries/haskell/jsonEnumerator/default.nix
+++ b/pkgs/development/libraries/haskell/jsonEnumerator/default.nix
@ -4,15 +4,15 @@

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

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

 cabal.mkDerivation (self: {
  pname = "shakespeare-css";
-  version = "0.10.5";
-  sha256 = "1cnv9qgp1llrrvcqp64mq207wdsxpqza9yq5nzlsgrh6qlzvm4hs";
+  version = "0.10.6";
+  sha256 = "18hcrsmw7xg2cdzyb413rc1bg507y4kr6q1l3mbxgnzqnffik6d7";
  buildDepends = [ parsec shakespeare text ];
  meta = {
    homepage = "http://www.yesodweb.com/book/templates";
--- a/pkgs/development/libraries/haskell/vault/default.nix
+++ b/pkgs/development/libraries/haskell/vault/default.nix
@ -0,0 +1,17 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "vault";
+  version = "0.1.0.0";
+  sha256 = "02gki0g9mwmvvizxhk6myfg3dmlqpcjjiz5c8693a060hkr0grqq";
+  meta = {
+    homepage = "https://github.com/HeinrichApfelmus/vault";
+    description = "a typed, persistent store for values of arbitrary types";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
--- a/pkgs/development/libraries/haskell/web-routes-quasi/default.nix
+++ b/pkgs/development/libraries/haskell/web-routes-quasi/default.nix
@ -2,14 +2,14 @@

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

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

 cabal.mkDerivation (self: {
  pname = "xml-conduit";
-  version = "0.5.1.1";
-  sha256 = "0md6fkjn8j1dsbhlwh64x2990kvsmks6plppa63v9nwc9142ajim";
+  version = "0.5.1.2";
+  sha256 = "0ww018aj4fy0hngjsj1lc5m7sw36kdc1z2p8nxp4pgsmhj0ccm36";
  buildDepends = [
    attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
    conduit dataDefault failure systemFilepath text transformers
--- a/pkgs/development/libraries/libassuan/default.nix
+++ b/pkgs/development/libraries/libassuan/default.nix
@ -1,11 +1,11 @@
 { fetchurl, stdenv, pth, libgpgerror }:

 stdenv.mkDerivation rec {
-  name = "libassuan-2.0.2";
+  name = "libassuan-2.0.3";

  src = fetchurl {
    url = "mirror://gnupg/libassuan/${name}.tar.bz2";
-    sha256 = "1n5lfpafq9sjb3r06lw7vrrjmbs3p035zfakx7ff5bfb7niwpq31";
+    sha256 = "06xckkvxxlx7cj77803m8x58gxksap4k8yhspc5cqsy7fhinimds";
  };

  propagatedBuildInputs = [ pth libgpgerror ];
--- a/pkgs/development/libraries/libidn/default.nix
+++ b/pkgs/development/libraries/libidn/default.nix
@ -1,11 +1,11 @@
 { fetchurl, stdenv }:

 stdenv.mkDerivation rec {
-  name = "libidn-1.23";
+  name = "libidn-1.24";

  src = fetchurl {
    url = "mirror://gnu/libidn/${name}.tar.gz";
-    sha256 = "0sjy1k35x3r5vfkd5j21gy0xdlzg9svm74wn3hpfbfhyhmsjvd15";
+    sha256 = "1zrmbwxvgmv7d37sdnlfn4lf3pxc7vgng3lhl18pkjry0v30h5ys";
  };

  doCheck = ! stdenv.isDarwin;
--- a/pkgs/development/libraries/libktorrent/default.nix
+++ b/pkgs/development/libraries/libktorrent/default.nix
@ -1,18 +1,22 @@
 { stdenv, fetchurl, kdelibs, cmake, gmp, qca2, boost, gettext, qt4, automoc4
 , phonon, libgcrypt }:

+let
+  mp_ = "1.3";
+  version = "1.${mp_}";
+  version4 = "4.${mp_}";
+in
 stdenv.mkDerivation rec {
  name = pname + "-" + version;
  pname = "libktorrent";
-  version = "1.1.1";

  src = fetchurl {
-    url = "http://ktorrent.org/downloads/4.1.1/${name}.tar.bz2";
-    sha256 = "06d93xpshxawz49hqh6pvypir4ygm1f781hs7yim5k6b7shivfs1";
+    url = "http://ktorrent.org/downloads/${version4}/${name}.tar.bz2";
+    sha256 = "0mvvx6mdfy0pyhk6lwwmmbd3pd2ai6n2rf5kdjqhpkm9wbrck85n";
  };

-  buildInputs =
-    [ cmake kdelibs qt4 automoc4 phonon gmp qca2 boost libgcrypt gettext ];
+  buildNativeInputs = [ cmake automoc4 gettext ];
+  buildInputs = [ kdelibs phonon gmp qca2 boost libgcrypt ];

  enableParallelBuilding = true;

--- a/pkgs/development/libraries/ucommon/default.nix
+++ b/pkgs/development/libraries/ucommon/default.nix
@ -1,11 +1,11 @@
 { fetchurl, stdenv, gnutls, pkgconfig, zlib, libgcrypt }:

 stdenv.mkDerivation rec {
-  name = "ucommon-5.0.7";
+  name = "ucommon-5.1.2";

  src = fetchurl {
-    url = mirror://gnu/commoncpp/ucommon-5.0.7.tar.gz;
-    sha256 = "0zr4zjwb62dpq7aa88vclhv2y8j7glkq693kwmb8agfx0fv8nkny";
+    url = mirror://gnu/commoncpp/ucommon-5.1.2.tar.gz;
+    sha256 = "1a6wfvrqpkk4w3l33jx5bdj38ljlyr92041aakvwmajpkczjf2q3";
  };

  buildInputs = [ pkgconfig gnutls zlib ];
--- a/pkgs/development/libraries/v8/default.nix
+++ b/pkgs/development/libraries/v8/default.nix
@ -1,35 +1,36 @@
-{ stdenv, fetchsvn, python, scons, makeWrapper }:
+{ stdenv, fetchsvn, python, scons, readline, makeWrapper }:
+
+assert readline != null;

 let
  system = stdenv.system;
-  arch = if system == "i686-linux" then "ia32" else if system == "x86_64-linux" then "x64" else ""; 
+  arch = if system == "i686-linux" then "ia32" else if system == "x86_64-linux" then "x64" else "";
+  version = "3.6.6.17";
 in
 assert system == "i686-linux" || system == "x86_64-linux";
 stdenv.mkDerivation rec {
-    name = "v8-r${toString src.rev}";
+    name = "v8-${version}";
    src = fetchsvn {
-      url = http://v8.googlecode.com/svn/trunk ;
-      sha256 = "1p51zh1l9c2gq3g4qk713n6qki9by3llx4p46inncvqfrimgshxb";
-      rev = 5865;
+      url = "http://v8.googlecode.com/svn/tags/${version}";
+      sha256 = "7080d53b9d3aefc591c2e181dcf97d538ce36177284fc658eca6420ea36a926f";
    };
-    
-    buildInputs = [python scons makeWrapper];
-    
+
+    buildInputs = [python scons readline makeWrapper];
+
    buildPhase = ''
      export CXX=`type -p g++`
-      scons snapshot=on importenv=PATH arch=${arch}
-      scons snapshot=on library=shared importenv=PATH arch=${arch}
-      scons sample=shell snapshot=on importenv=PATH arch=${arch} 
+      export CPPPATH=${readline}/include
+      export LIBPATH=${readline}/lib
+      scons snapshot=on console=readline library=shared importenv=PATH arch=${arch} library d8
    '';
-    
+
    installPhase = ''
      mkdir -p $out/bin
      mkdir -p $out/lib
-      
+
      cp -v libv8.* $out/lib
-      cp -v shell $out/bin/v8-shell
+      cp -v d8 $out/bin/d8
      cp -vR include $out/
-      wrapProgram $out/bin/v8-shell --set LD_LIBRARY_PATH $out/lib  
-     
+      wrapProgram $out/bin/d8 --set LD_LIBRARY_PATH $out/lib
    '';
 }
--- a/pkgs/development/tools/build-managers/leiningen/builder.sh
+++ b/pkgs/development/tools/build-managers/leiningen/builder.sh
@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -e
+
+source $stdenv/setup
+
+mkdir -pv $out/bin $out/lib
+
+out_bin=$out/bin/lein
+
+cp -v $src $out_bin
+cp -v $jarsrc $out/lib
+cp -v $clojuresrc $out/lib
+
+patch --verbose $out_bin -p0 < $patches
+chmod -v 755 $out_bin
+
+echo "Testing out \"lein version\"..."
+$out_bin version
+echo "Success."
--- a/pkgs/development/tools/build-managers/leiningen/default.nix
+++ b/pkgs/development/tools/build-managers/leiningen/default.nix
@ -0,0 +1,36 @@
+{stdenv, fetchurl, openjdk}:
+
+stdenv.mkDerivation rec {
+  pname = "leiningen";
+  version = "1.6.2";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://raw.github.com/technomancy/leiningen/stable/bin/lein-pkg";
+    sha256 = "e177a493ed0c4a7874f1391d5cc72cc1e541e55ed3d6e075feec87b5da6f8277";
+  };
+
+  jarsrc = fetchurl {
+    url = "https://github.com/downloads/technomancy/leiningen/leiningen-1.6.2-standalone.jar";
+    sha256 = "e35272556ece82d9a6a54b86266626da1b5f990ff556639dd7dd1025d6ed4226";
+  };
+
+  clojuresrc = fetchurl {
+    url = "http://build.clojure.org/releases/org/clojure/clojure/1.2.1/clojure-1.2.1.jar";
+    sha256 = "b38853254a2df9138b2e2c12be0dca3600fa7e2a951fed05fc3ba2d9141a3fb0";
+  };
+
+  patches = [ ./lein.patch ];
+
+  builder = ./builder.sh;
+
+  propagatedBuildInputs = [ openjdk ];
+
+  meta = {
+    homepage = https://github.com/technomancy/leiningen;
+    description = "Project automation for Clojure";
+    license = "EPL";
+
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
--- a/pkgs/development/tools/build-managers/leiningen/lein.patch
+++ b/pkgs/development/tools/build-managers/leiningen/lein.patch
@ -0,0 +1,36 @@
+--- lein-pkg	2012-01-09 20:47:44.000000000 -0800
+++ lein-pkg-nix	2012-01-09 20:45:01.000000000 -0800
+@@ -70,7 +70,7 @@
+ LEIN_PLUGIN_PATH="$(echo "$DEV_PLUGINS" | tr \\n :)"
+ LEIN_USER_PLUGIN_PATH="$(echo "$(unique_user_plugins)" | tr \\n :)"
+ CLASSPATH="$CLASSPATH:$LEIN_PLUGIN_PATH:$LEIN_USER_PLUGIN_PATH:test/:src/:resources/"
+-CLOJURE_JAR="/usr/share/java/clojure-1.2.jar:/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar"
+CLOJURE_JAR="$(dirname $0)/../lib/*clojure-1.2.1.jar"
+ NULL_DEVICE=/dev/null
+ 
+ # apply context specific CLASSPATH entries
+@@ -78,23 +78,7 @@
+     CLASSPATH="`cat .lein-classpath`:$CLASSPATH"
+ fi
+ 
+-SHARE_JARS="ant ant-launcher classworlds clojure-1.2 clojure-contrib \
+-lucene-memory maven-ant-tasks maven-artifact maven-artifact-manager \
+-maven-error-diagnostics maven-model maven-settings maven-project maven-profile \
+-maven-repository-metadata plexus-container-default-alpha plexus-interpolation \
+-plexus-utils wagon-file wagon-http-lightweight wagon-http-shared wagon-provider-api \
+-xml-apis lucene-core lucene-highlighter clucy robert-hooke lancet \
+-backport-util-concurrent" # NFI why that last one is necessary
+-for JAR in $SHARE_JARS; do
+-    CLASSPATH="$CLASSPATH":"/usr/share/java/$JAR.jar"
+-done
+-
+-# Do not use installed leiningen jar during self-compilation
+-if ! { [ "$1" = "compile" ] &&
+-       grep -qsE 'defproject leiningen[[:space:]]+"[[:digit:].]+"' \
+-         project.clj ;}; then
+-    CLASSPATH="$CLASSPATH":/usr/share/java/leiningen-$LEIN_VERSION.jar
+-fi
+CLASSPATH="$CLASSPATH:$(dirname $0)/../lib/*"
+ 
+ if [ $DEBUG ]; then
+     echo $CLASSPATH
--- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix
@ -1,7 +1,7 @@
 {stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? true}:

 stdenv.mkDerivation rec {
-  name = "automake-1.11.1";
+  name = "automake-1.11.2";

  # TODO: Remove the `aclocal' wrapper when $ACLOCAL_PATH support is
  # available upstream; see
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "mirror://gnu/automake/${name}.tar.bz2";
-    sha256 = "1bn7jl11wbkyy4ivgja92zkyjj8w3agwp2xnf7g8f7qa1qy9s5av";
+    sha256 = "06476qbd16dlasz29drmljqmr4gwx4qgcl075033b2hc73wx2ijg";
  };

  buildInputs = [perl autoconf makeWrapper];
@ -27,8 +27,6 @@ stdenv.mkDerivation rec {
  # "fixed" path in generated files!
  dontPatchShebangs = true;

-  patches = [ ./more-robust-silent-tests.patch ];
-
  meta = {
    homepage = http://www.gnu.org/software/automake/;
    description = "GNU Automake, a GNU standard-compliant makefile generator";
--- a/pkgs/development/tools/misc/automake/more-robust-silent-tests.patch
+++ b/pkgs/development/tools/misc/automake/more-robust-silent-tests.patch
@ -1,45 +0,0 @@
-Make these tests more robust.  Previously, they would fail if the name
-of the build directory contains `mv', which can very well happen with Nix.
-
--- automake-1.11.1/tests/silent.test	2009-12-08 19:02:32.000000000 +0100
-+++ automake-1.11.1/tests/silent.test	2010-07-05 13:15:20.000000000 +0200
-@@ -1,9 +1,9 @@
- #!/bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
-+# Copyright (C) 2009, 2010  Free Software Foundation, Inc.
- #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
- # the Free Software Foundation; either version 2, or (at your option)
- # any later version.
- #
- # This program is distributed in the hope that it will be useful,
-@@ -65,7 +65,7 @@ $MAKE >stdout || { cat stdout; Exit 1; }
- cat stdout
- grep ' -c' stdout && Exit 1
- grep ' -o foo' stdout && Exit 1
-grep mv stdout && Exit 1
-+grep '\<mv\>' stdout && Exit 1
- grep 'CC    .*foo\.' stdout
- grep 'CC .*bar\.' stdout
- grep 'CC .*baz\.' stdout
-
--- automake-1.11.1/tests/silent2.test	2009-12-08 19:02:32.000000000 +0100
-+++ automake-1.11.1/tests/silent2.test	2010-07-05 15:42:08.000000000 +0200
-@@ -1,5 +1,5 @@
- #!/bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
-+# Copyright (C) 2009, 2010  Free Software Foundation, Inc.
- #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -67,7 +67,7 @@ $MAKE >stdout || { cat stdout; Exit 1; }
- cat stdout
- grep ' -c' stdout && Exit 1
- grep ' -o foo' stdout && Exit 1
-grep mv stdout && Exit 1
-+grep '\<mv\>' stdout && Exit 1
- grep 'CC .*foo\.' stdout
- grep 'CC .*bar\.' stdout
- grep 'CC .*baz\.' stdout
-
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, python, zlib }:
+{ stdenv, fetchurl, openssl, python, zlib, v8 }:

 stdenv.mkDerivation rec {
  version = "0.6.6";
@ -12,13 +12,16 @@ stdenv.mkDerivation rec {
  configureFlags = [
    "--openssl-includes=${openssl}/include"
    "--openssl-libpath=${openssl}/lib"
+    "--shared-v8"
+    "--shared-v8-includes=${v8}/includes"
+    "--shared-v8-libpath=${v8}/lib"
  ];

  patchPhase = ''
    sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i tools/{*.py,waf-light,node-waf}
  '';

-  buildInputs = [ python openssl zlib ];
+  buildInputs = [ python openssl v8 zlib];

  meta = with stdenv.lib; {
    description = "Event-driven I/O framework for the V8 JavaScript engine";
--- a/pkgs/lib/customisation.nix
+++ b/pkgs/lib/customisation.nix
@ -42,6 +42,8 @@ rec {
    in newDrv //
      { meta = if drv ? meta then drv.meta else {};
        passthru = if drv ? passthru then drv.passthru else {};
+        hostDrv = overrideDerivation drv.hostDrv f;
+        buildDrv = overrideDerivation drv.buildDrv f;
      };


--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@ -8,6 +8,7 @@
  andres = "Andres Loeh <ksnixos@andres-loeh.de>";
  astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>";
  bjg = "Brian Gough <bjg@gnu.org>";
+  bluescreen303 = "Mathijs Kwik <mathijs@bluescreen303.nl>";
  chaoflow = "Florian Friesdorf <flo@chaoflow.net>";
  eelco = "Eelco Dolstra <e.dolstra@tudelft.nl>";
  goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
--- a/pkgs/lib/platforms.nix
+++ b/pkgs/lib/platforms.nix
@ -12,5 +12,5 @@ rec {
  unix = linux ++ darwin ++ freebsd ++ openbsd;
  all = linux ++ darwin ++ cygwin ++ freebsd ++ openbsd;
  allBut = platform: lists.filter (x: platform != x) all;
-  mesaPlatforms = linux ++ darwin ++ freebsd;
+  mesaPlatforms = linux;
 }
--- a/pkgs/os-specific/linux/udisks/default.nix
+++ b/pkgs/os-specific/linux/udisks/default.nix
@ -1,6 +1,7 @@
 { stdenv, fetchurl, pkgconfig, sg3_utils, udev, glib, dbus, dbus_glib
 , polkit, parted, lvm2, libatasmart, intltool, libuuid, mdadm
-, libxslt, docbook_xsl, utillinux, automake, autoconf }:
+, libxslt, docbook_xsl, utillinux
+, automake, autoconf, libtool, gtkdoc }:

 stdenv.mkDerivation rec {
  name = "udisks-1.0.4";
@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
      lvm2 libatasmart intltool libuuid libxslt docbook_xsl
    ];

-  buildNativeInputs = [ automake autoconf pkgconfig ];
+  buildNativeInputs = [ automake autoconf libtool gtkdoc pkgconfig ];

  configureFlags = "--localstatedir=/var --enable-lvm2";

@ -34,7 +35,9 @@ stdenv.mkDerivation rec {
        "/sbin:/bin:/usr/sbin:/usr/bin" \
        "${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin"

-      automake
+      # The patch above modifies Makefile.am, so redo the whole thing.
+      # FIXME: Remove that ASAP---e.g., by writing the patch differently.
+      autoreconf -vfi
    '';

  meta = {
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@ -32,7 +32,15 @@ in
    url = "http://w1.fi/gitweb/gitweb.cgi?p=hostap-07.git;a=commitdiff_plain;h=b80b5639935d37b95d00f86b57f2844a9c775f57";
    name = "wpa_supplicant-nm-0.9.patch";
    sha256 = "1pqba0l4rfhba5qafvvbywi9x1qmphs944p704bh1flnx7cz6ya8";
-    }) ];
+    })
+    # wpa_supplicant crashes when controlled through dbus (wicd/nm)
+    # see: https://bugzilla.redhat.com/show_bug.cgi?id=678625
+    (fetchurl {
+      url = "https://bugzilla.redhat.com/attachment.cgi?id=491018";
+      name = "dbus-assertion-fix.patch";
+      sha256 = "6206d79bcd800d56cae73e2a01a27ac2bee961512f77e5d62a59256a9919077a";
+    })
+  ];

  postInstall = ''
    mkdir -p $out/share/man/man5 $out/share/man/man8
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/pkgs/servers/nosql/mongodb/default.nix
@ -0,0 +1,44 @@
+{ stdenv, fetchurl, scons, which, boost, gnutar, v8 ? null, useV8 ? false}:
+
+assert useV8 -> v8 != null;
+
+stdenv.mkDerivation rec {
+  name = "mongodb-2.0.2";
+
+  src = fetchurl {
+    url = "http://downloads.mongodb.org/src/mongodb-src-r2.0.2.tar.gz";
+    sha256 = "13xcwaz9rqn0xgh5jijpqxhz1q2qjl8x18bymbl7092k6p29i974";
+  };
+
+  buildInputs = [scons which boost] ++ stdenv.lib.optional useV8 v8;
+
+  enableParallelBuilding = true;
+
+  patchPhase = ''
+    substituteInPlace SConstruct --replace "Environment( MSVS_ARCH=msarch , tools = [\"default\", \"gch\"], toolpath = '.' )" "Environment( MSVS_ARCH=msarch , tools = [\"default\", \"gch\"], toolpath = '.', ENV = os.environ )"
+    substituteInPlace SConstruct --replace "../v8" "${v8}"
+    substituteInPlace SConstruct --replace "LIBPATH=[\"${v8}/\"]" "LIBPATH=[\"${v8}/lib\"]"
+  '';
+
+  buildPhase = ''
+    export TERM=""
+    scons all --cc=`which gcc` --cxx=`which g++` --libpath=${boost}/lib --cpppath=${boost}/include ${if useV8 then "--usev8" else ""}
+  '';
+
+  installPhase = ''
+    scons install --cc=`which gcc` --cxx=`which g++` --libpath=${boost}/lib --cpppath=${boost}/include --full --prefix=$out
+    if [ -d $out/lib64 ]; then
+      mv $out/lib64 $out/lib
+    fi
+  '';
+
+  meta = {
+    description = "a scalable, high-performance, open source NoSQL database";
+    homepage = http://www.mongodb.org;
+    license = "AGPLv3";
+
+    maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
+
--- a/pkgs/servers/sip/sipwitch/default.nix
+++ b/pkgs/servers/sip/sipwitch/default.nix
@ -1,11 +1,11 @@
 { fetchurl, stdenv, pkgconfig, ucommon, libosip, libexosip, gnutls, zlib }:

 stdenv.mkDerivation rec {
-  name = "sipwitch-1.1.3";
+  name = "sipwitch-1.2.1";

  src = fetchurl {
    url = "mirror://gnu/sipwitch/${name}.tar.gz";
-    sha256 = "0g1vx8xsmna0c7sqck8pv44312r4qrk82ky3j99p82ckbqj1sqjv";
+    sha256 = "01364q67gyxpxx5fxrmf9kns3qgivnp41kzhi81jdq8sa48c7qbq";
  };

  buildInputs = [ pkgconfig ucommon libosip libexosip gnutls zlib ];
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@ -1568,11 +1568,11 @@ let
  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
    
  xf86videointel = (stdenv.mkDerivation ((if overrides ? xf86videointel then overrides.xf86videointel else x: x) {
-    name = "xf86-video-intel-2.14.0";
+    name = "xf86-video-intel-2.15.0";
    builder = ./builder.sh;
    src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-intel-2.14.0.tar.bz2;
-      sha256 = "1pq7nm6whc2nmrizf774q042580cfms6yp6yd5p52q59g6jkg371";
+      url = mirror://xorg/individual/driver/xf86-video-intel-2.15.0.tar.bz2;
+      sha256 = "080pkhjp910wy36crpgi0dmcwpcx8w2r3k4s0dz6v14bmgly2xy3";
    };
    buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ];
  })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ;};
--- a/pkgs/servers/x11/xorg/tarballs-7.6.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.6.list
@ -137,7 +137,7 @@ mirror://xorg/X11R7.6/src/everything/xf86-video-glide-1.1.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-glint-1.2.5.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-i128-1.3.4.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-i740-1.3.2.tar.bz2
-mirror://xorg/individual/driver/xf86-video-intel-2.14.0.tar.bz2
+mirror://xorg/individual/driver/xf86-video-intel-2.15.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-mach64-6.8.2.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-mga-1.4.13.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-neomagic-1.2.5.tar.bz2
--- a/pkgs/tools/X11/xnee/default.nix
+++ b/pkgs/tools/X11/xnee/default.nix
@ -2,11 +2,11 @@
 , gtk, libXi, inputproto, pkgconfig, recordproto, texinfo }:

 stdenv.mkDerivation rec {
-  name = "xnee-3.10";
+  name = "xnee-3.11";

  src = fetchurl {
    url = "mirror://gnu/xnee/${name}.tar.gz";
-    sha256 = "0mkbp0gikm1mv9g2v0vs7krinkz392p1crvaira8ml9q94py0q32";
+    sha256 = "1x4frrf5ayslbkmr5cwll7psssxk11r4acnadp4qdvd218x50xrq";
  };

  patchPhase =
--- a/pkgs/tools/filesystems/btrfsprogs/default.nix
+++ b/pkgs/tools/filesystems/btrfsprogs/default.nix
@ -33,7 +33,7 @@ rec {

  doEnsureBtrfsImage = a.fullDepEntry (''
    if ! grep 'progs = ' Makefile | grep btrfs-image; then
-      sed -e 's/progs = .*/& btrfs-image/' -i Makefile
+      sed -e 's/progs = \(.*\)\\/progs = \1btrfs-image \\/' -i Makefile
    fi
  '') ["minInit" "doUnpack"];

--- a/pkgs/tools/misc/expect/default.nix
+++ b/pkgs/tools/misc/expect/default.nix
@ -1,14 +1,14 @@
-{stdenv, fetchurl, tcl, tk, autoconf, xproto, libX11}:
+{stdenv, fetchurl, tcl, tk, xproto, libX11}:

 stdenv.mkDerivation {
  name = "expect-5.44.1";
-  
+
  src = fetchurl {
    url = http://expect.nist.gov/old/expect-5.44.1.tar.gz;
    sha256 = "13zxqiclzk1paxc0mr2vwp9nhfyr2mkwk9gs73fg0l3iss16n6p4";
  };

-  buildInputs = [tcl tk autoconf xproto libX11];
+  buildInputs = [tcl tk xproto libX11];

  #NIX_CFLAGS_COMPILE = "-DHAVE_UNISTD_H";

@ -22,9 +22,9 @@ stdenv.mkDerivation {
    sed -e '1i\#include <tclInt.h>' -i exp_inter.c
    export NIX_LDFLAGS="-rpath $out/lib $NIX_LDFLAGS"
  '';
-  
-  configureFlags = ["--with-tcl=${tcl}/lib" 
-    "--with-tclinclude=${tcl}/include" 
+
+  configureFlags = ["--with-tcl=${tcl}/lib"
+    "--with-tclinclude=${tcl}/include"
    "--with-tk=${tk}/lib"
    "--exec-prefix=$out"];

--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl }:

 stdenv.mkDerivation rec {
-  name = "parallel-20111122";
+  name = "parallel-20111222";

  src = fetchurl {
    url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "1czcflprhbhyj3mj7dc986gll0kfc6n8qiqazclph172rbq3acpd";
+    sha256 = "0rip8hnby1c2kcz7w7h6c2kf0y63hyw8bwprsd8fnqw96lgypf1b";
  };

  patchPhase =
--- a/pkgs/tools/misc/recutils/default.nix
+++ b/pkgs/tools/misc/recutils/default.nix
@ -1,11 +1,11 @@
 { fetchurl, stdenv, gettext, emacs, curl, check, bc }:

 stdenv.mkDerivation rec {
-  name = "recutils-1.4";
+  name = "recutils-1.5";

  src = fetchurl {
    url = "mirror://gnu/recutils/${name}.tar.gz";
-    sha256 = "1kakmzmkdkgqmvqfzrpkwjjkg492rk3k7xfgnwcjacap9l79z9pv";
+    sha256 = "1v2xzwwwhc5j5kmvg4sv6baxjpsfqh8ln7ilv4mgb1408rs7xmky";
  };

  doCheck = true;
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@ -0,0 +1,31 @@
+{stdenv, fetchgit, python}:
+
+let pkgname = "youtube-dl";
+    pkgver  = "2011.12.08";
+    
+in
+stdenv.mkDerivation {
+  name = "${pkgname}-${pkgver}";
+
+  src = fetchgit {
+    url = "git://github.com/rg3/${pkgname}";
+    rev = "661a807c65a154eccdddb875b45e4782ca86132c";
+    sha256 = "32fd193b867b122400e9d5d32f6dfaf15704f837a9dc2ff809e1ce06712857ba";
+  };
+
+  buildInputs = [python];
+  buildPhase = "sed -i 's|#!/usr/bin/env python|#!#{python}/bin/python|' youtube-dl";
+
+  installPhase = ''
+    ensureDir $out/bin
+    cp youtube-dl $out/bin
+  '';
+
+  meta = {
+    description = "A small command-line program to download videos from YouTube.com and a few more sites";
+    homepage = http://rg3.github.com/youtube-dl/;
+    maintainers = [
+      stdenv.lib.maintainers.bluescreen303
+    ];
+  };
+}
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@ -1,20 +1,19 @@
-{stdenv, fetchurl, iproute, lzo, openssl, nettools}:
+{stdenv, fetchurl, iproute, lzo, openssl}:

 stdenv.mkDerivation rec {
-  name = "openvpn-2.2.0";
+  name = "openvpn-2.2.2";

  src = fetchurl {
    url = "http://swupdate.openvpn.net/community/releases/${name}.tar.gz";
-    sha256 = "0rr59b3ybqr2j5jxl2fdzmm5qbh0hvwi03xfaha6s7k4l6mymsvi";
+    sha256 = "005cpvdvh8pvsn3bc96lrznlkcccbz5jqa62hipb58rf1qk8pjjl";
  };

  buildInputs = [ iproute lzo openssl ];

  configureFlags = ''
    --enable-password-save
-    --with-ifconfig-path=${nettools}/sbin/ifconfig
+    --enable-iproute2
    --with-iproute-path=${iproute}/sbin/ip
-    --with-route-path=${nettools}/sbin/route
  '';

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

  meta = {
--- a/pkgs/tools/package-management/nix/custom.nix
+++ b/pkgs/tools/package-management/nix/custom.nix
@ -44,7 +44,7 @@ stdenv.mkDerivation {
  preConfigure = 
    (lib.concatMapStrings (script:
      ''
-        sed -e '/bin_SCRIPTS/a${script} \\' -i scripts/Makefile.am
+        sed -e '/bin_SCRIPTS = /a${script} \\' -i scripts/Makefile.am
      ''
    ) enableScripts)
    + preConfigure
--- a/pkgs/tools/system/ddrescue/default.nix
+++ b/pkgs/tools/system/ddrescue/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl }:

 stdenv.mkDerivation rec {
-  name = "ddrescue-1.14";
+  name = "ddrescue-1.15";

  src = fetchurl {
    url = "mirror://gnu/ddrescue/${name}.tar.gz";
-    sha256 = "01m9m8lisf7ly7xl97plqnl5dj253ms1gbk1bbpwv3nnchnvj5yd";
+    sha256 = "0y1dxkbl82nli6xjlg2kaq5kxd19480rvpay4ydbb9av01i17q3m";
  };

  doCheck = true;
--- a/pkgs/tools/system/freeipmi/default.nix
+++ b/pkgs/tools/system/freeipmi/default.nix
@ -1,11 +1,11 @@
 { fetchurl, stdenv, libgcrypt, readline }:

 stdenv.mkDerivation rec {
-  name = "freeipmi-1.0.9";
+  name = "freeipmi-1.1.1";

  src = fetchurl {
    url = "mirror://gnu/freeipmi/${name}.tar.gz";
-    sha256 = "00ix8cigf6nl5kg95hla43kf27jkb3lljhcihbfriwq0wrghcfx4";
+    sha256 = "03q6wg1wdmr94dxh81lxllb53nmab0d637wgh2s1xn6rfmxf7ypf";
  };

  buildInputs = [ libgcrypt readline ];
--- a/pkgs/tools/text/source-highlight/default.nix
+++ b/pkgs/tools/text/source-highlight/default.nix
@ -2,14 +2,14 @@

 let
  name = "source-highlight";
-  version = "3.1.5";
+  version = "3.1.6";
 in
 stdenv.mkDerivation {
  name = "${name}-${version}";

  src = fetchurl {
      url = "mirror://gnu/src-highlite/${name}-${version}.tar.gz";
-      sha256 = "16a2ybd0i7gk926ipp7c63mxcfwklbb20fw65npyrjzr94z1agwx";
+      sha256 = "0a5zh876nc1gig8z586b953r8ahh9zbs1lmi8vxjrkwp6zqzf4xm";
    };

  configureFlags = [ "--with-boost=${boost}" ];
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -1622,6 +1622,8 @@ let

  xtreemfs = callPackage ../tools/filesystems/xtreemfs {};

+  youtubeDL = callPackage ../tools/misc/youtube-dl { };
+
  zbar = callPackage ../tools/graphics/zbar {};

  zdelta = callPackage ../tools/compression/zdelta { };
@ -2271,6 +2273,7 @@ let
    inherit (gtkLibs) glib gtk pango atk;
    libstdcpp5 = gcc33.gcc;
  };
+  gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { };

  ikarus = callPackage ../development/compilers/ikarus { };

@ -2780,7 +2783,7 @@ let

  jdtsdk = callPackage ../development/eclipse/jdt-sdk { };

-  jruby116 = callPackage ../development/interpreters/jruby { };
+  jruby165 = callPackage ../development/interpreters/jruby { };

  guileCairo = callPackage ../development/guile-modules/guile-cairo { };

@ -3008,6 +3011,8 @@ let

  lcov = callPackage ../development/tools/analysis/lcov { };

+  leiningen = callPackage ../development/tools/build-managers/leiningen { };
+
  libtool = libtool_2;

  libtool_1_5 = callPackage ../development/tools/misc/libtool { };
@ -5069,6 +5074,8 @@ let

  monetdb = callPackage ../servers/sql/monetdb { };

+  mongodb = callPackage ../servers/nosql/mongodb { useV8 = (getConfig ["mongodb" "useV8"] false); };
+
  mysql4 = import ../servers/sql/mysql {
    inherit fetchurl stdenv ncurses zlib perl;
    ps = procps; /* !!! Linux only */
@ -6132,7 +6139,9 @@ let
  udev173 = callPackage ../os-specific/linux/udev/173.nix { };
  udev = pkgs.udev173;

-  udisks = callPackage ../os-specific/linux/udisks { };
+  udisks = callPackage ../os-specific/linux/udisks {
+    inherit (gnome) gtkdoc;
+  };

  uml = import ../os-specific/linux/kernel/linux-2.6.29.nix {
    inherit fetchurl stdenv perl mktemp module_init_tools;
@ -7351,6 +7360,7 @@ let

  rsync = callPackage ../applications/networking/sync/rsync {
    enableACLs = !(stdenv.isDarwin || stdenv.isSunOS);
+    enableCopyDevicesPatch = (getConfig ["rsync" "enableCopyDevicesPatch"] false);
  };

  rxvt = callPackage ../applications/misc/rxvt { };
@ -8597,6 +8607,12 @@ let
    ruby = ruby18;
  };

+  texLiveFull = lib.setName "texlive-full" (texLiveAggregationFun {
+    paths = [ texLive texLiveExtra lmodern texLiveCMSuper texLiveLatexXColor
+              texLivePGF texLiveBeamer texLiveModerncv ];
+
+  });
+
  /* Look in configurations/misc/raskin.nix for usage example (around revisions
  where TeXLive was added)

--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@ -672,6 +672,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);

  ghcEvents = callPackage ../development/libraries/haskell/ghc-events {};

+  ghcMod = callPackage ../development/libraries/haskell/ghc-mod {};
+
  ghcMtl = callPackage ../development/libraries/haskell/ghc-mtl {};

  ghcPaths = callPackage ../development/libraries/haskell/ghc-paths {};
@ -1339,6 +1341,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);

  vacuumCairo = callPackage ../development/libraries/haskell/vacuum-cairo {};

+  vault = callPackage ../development/libraries/haskell/vault {};
+
  Vec = callPackage ../development/libraries/haskell/Vec {};

  vector = callPackage ../development/libraries/haskell/vector {};
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@ -2021,10 +2021,10 @@ rec {
  };

  JSON = buildPerlPackage rec {
-    name = "JSON-2.21";
+    name = "JSON-2.53";
    src = fetchurl {
      url = "mirror://cpan/authors/id/M/MA/MAKAMAKA/${name}.tar.gz";
-      sha256 = "1dz00922yq7pz8hb9bbk8pqkwh0brf595lklsind62lf5f247vj7";
+      sha256 = "0rfms17d0pkai26kqyzaylbr5wxcrrhyjkyshq85l41xb0g1iplh";
    };
    propagatedBuildInputs = [JSONXS];
  };
@ -2047,10 +2047,10 @@ rec {
  };

  JSONXS = buildPerlPackage rec {
-    name = "JSON-XS-2.29";
+    name = "JSON-XS-2.32";
    src = fetchurl {
      url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz";
-      sha256 = "1gl8x2rc3krpj6cs1dg0g28iqqfbn9zyq4nz9mbngv0lccc0y5vy";
+      sha256 = "012bf324pf5lnrf6ck2y167i1q1zzzc0w43b381qfnk7v5fcvaik";
    };
    buildInputs = [CommonSense];
  };