Merge branch 'master' into x-updates

Conflicts (systemd version is split on x-updates):
	pkgs/os-specific/linux/systemd/default.nix

13 files changed, 130 insertions, 127 deletions

diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix
index d9413c031546..1408a1775ee5 100644
--- a/pkgs/applications/audio/linuxsampler/default.nix
+++ b/pkgs/applications/audio/linuxsampler/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
       have questions on the subject, that are not yet covered by the
       FAQ, please contact us.
     ''; 
-    license = licenses.proprietary;
+    license = licenses.unfree;
     maintainers = [ maintainers.goibhniu ];
     platforms = platforms.linux;
   };
diff --git a/pkgs/applications/editors/emacs-modes/prolog/default.nix b/pkgs/applications/editors/emacs-modes/prolog/default.nix
index b89951e65355..237b1ac14834 100644
--- a/pkgs/applications/editors/emacs-modes/prolog/default.nix
+++ b/pkgs/applications/editors/emacs-modes/prolog/default.nix
@@ -1,19 +1,21 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
 
-stdenv.mkDerivation
-{
-  name = "prolog-mode-1.22";
-  src = fetchurl
-  {
-    url = "http://bruda.ca/emacs-prolog/prolog.el";
-    sha256 = "f46915b2436642bb3302cb38cc457d3c121d0c3e95aecdf128fedc2ae5ea0c87";
+stdenv.mkDerivation {
+  name = "prolog-mode-1.25";
+
+  src = fetchurl {
+    url = "http://bruda.ca/_media/emacs/prolog.el";
+    sha256 = "0hfd2dr3xc5qxgvc08nkb2l5a05hfldahdc6ymi9vd8798cc46yh";
   };
 
-  buildCommand = "install -v -D -m644 $src $out/share/emacs/site-lisp/prolog.el";
+  buildCommand = ''
+    mkdir -p $out/share/emacs/site-lisp/
+    cp $src $out/share/emacs/site-lisp/prolog.el
+  '';
 
   meta = {
-    homepage = "http://turing.ubishops.ca/home/bruda/emacs-prolog/";
+    homepage = "http://bruda.ca/emacs/prolog_mode_for_emacs/";
     description = "Prolog mode for Emacs";
-    license = "GPL";
+    license = stdenv.lib.licenses.gpl2Plus;
   };
 }
diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix
index bbdbd4cfeb8a..b1f145bbbe8e 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 = "27.0.1453.12";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.12.tar.xz";
-    sha256 = "1b2vkcynljl799m41aabdsj9k2plchiga6bi4ah3hc0mwyj0lyl7";
+    version = "27.0.1453.47";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.47.tar.xz";
+    sha256 = "0dyyxdn75a6b35a7wv9xqzcnskbcxj19bmfd7cq9ya5jdhcvy9j9";
   };
   beta = {
-    version = "27.0.1453.15";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.15.tar.xz";
-    sha256 = "19y9pbipi4y61avrsgb7y4b1xl8d29v34l403xdghk0d3z2rg65m";
+    version = "27.0.1453.47";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.47.tar.xz";
+    sha256 = "0dyyxdn75a6b35a7wv9xqzcnskbcxj19bmfd7cq9ya5jdhcvy9j9";
   };
   stable = {
-    version = "26.0.1410.43";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.43.tar.xz";
-    sha256 = "110x9cs88gqvqya71bqspx2s7ph6ca0als7sp5fbf911cj0iy0ii";
+    version = "26.0.1410.63";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.63.tar.xz";
+    sha256 = "0gsb0dgk7p04997wlw7swxnnpf5ix9drn0wn07pgsalr8l3zgy3s";
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
index b202a0f09db8..e51798502371 100644
--- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
@@ -57,7 +57,7 @@ in stdenv.mkDerivation {
   meta = {
     description = "HipChat Desktop Client";
     homepage = http://www.hipchat.com;
-    license = stdenv.lib.licenses.proprietary;
+    license = stdenv.lib.licenses.unfree;
     platforms = [ "i686-linux" "x86_64-linux" ];
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/silc-client/default.nix b/pkgs/applications/networking/instant-messengers/silc-client/default.nix
new file mode 100644
index 000000000000..a4035604168f
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/silc-client/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, perl, pkgconfig, glib, ncurses
+, enablePlugin ? false }:
+
+# Enabling the plugin and using it with a recent irssi, segafults on join:
+# http://marc.info/?l=silc-devel&m=125610477802211
+
+let
+  basename = "silc-client-1.1.8";
+in
+stdenv.mkDerivation {
+  name = basename + stdenv.lib.optionalString enablePlugin "-irssi-plugin";
+
+  src = fetchurl {
+    url = "http://silcnet.org/download/client/sources/${basename}.tar.bz2";
+    sha256 = "1qnk35g8sbnfps3bq2k9sy0ymlsijh5n8z59m2ccq4pkmqbfqgv2";
+  };
+
+  dontDisableStatic = true;
+
+  patches = [ ./server_setup.patch ];
+
+  configureFlags = "--with-ncurses=${ncurses}";
+
+  preConfigure = stdenv.lib.optionalString enablePlugin ''
+    configureFlags="$configureFlags --with-silc-plugin=$out/lib/irssi"
+  '';
+
+  buildInputs = [ perl pkgconfig glib ncurses ];
+
+  meta = {
+    homepage = http://silcnet.org/;
+    description = "Secure Internet Live Conferencing server";
+    license = "GPLv2";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/applications/networking/instant-messengers/silc-client/server_setup.patch b/pkgs/applications/networking/instant-messengers/silc-client/server_setup.patch
new file mode 100644
index 000000000000..466194c0a8fe
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/silc-client/server_setup.patch
@@ -0,0 +1,28 @@
+Add function to replace the behaviour of server_setup_find_port which was removed from irssi on revision 5125. Fixes bug #577501.
+--- a/apps/irssi/src/silc/core/client_ops.c
++++ b/apps/irssi/src/silc/core/client_ops.c
+@@ -2790,6 +2790,15 @@
+   silc_free(a);
+ }
+ 
++/* helper function to emulate server_setup_find_port */
++static SERVER_SETUP_REC *silc_server_setup_find_port(const char *address,
++						     int port) {
++  SERVER_SETUP_REC *rec;
++
++  rec = server_setup_find(address, port, NULL);
++  return (rec == NULL || rec->port != port) ? NULL : rec;
++}
++
+ /* Find authentication data by hostname and port. The hostname may be IP
+    address as well.*/
+ 
+@@ -2811,7 +2820,7 @@
+ 
+   /* Check whether we find the password for this server in our
+      configuration.  If it's set, always send it server. */
+-  setup = server_setup_find_port(hostname, port);
++  setup = silc_server_setup_find_port(hostname, port);
+   if (setup && setup->password) {
+     completion(SILC_AUTH_PASSWORD, setup->password, strlen(setup->password),
+ 	       context);
diff --git a/pkgs/applications/networking/irc/irssi/fish/default.nix b/pkgs/applications/networking/irc/irssi/fish/default.nix
new file mode 100644
index 000000000000..98d5afa0ba9f
--- /dev/null
+++ b/pkgs/applications/networking/irc/irssi/fish/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, irssi, gmp, automake, autoconf, libtool, openssl, glib, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "fish-irssi-20130413-e98156bebd";
+  
+  src = fetchurl {
+    url = https://github.com/falsovsky/FiSH-irssi/tarball/e98156bebd;
+    name = "${name}.tar.gz";
+    sha256 = "1ndr51qrg66h1mfzacwzl1vd6lj39pdc4p4z5iihrj4r2f6gk11a";
+  };
+
+  preConfigure = ''
+    tar xf ${irssi.src}
+    configureFlags="$configureFlags --with-irssi-source=`pwd`/${irssi.name}"
+
+    ./regen.sh
+  '';
+
+  installPhase = ''
+    ensureDir $out/lib/irssi/modules
+    cp src/.libs/libfish.so $out/lib/irssi/modules
+  '';
+  
+  buildInputs = [ gmp automake autoconf libtool openssl glib pkgconfig ];
+  
+  meta = {
+    homepage = https://github.com/falsovsky/FiSH-irssi;
+    license = "unfree"; # I can't find any mention of license
+    maintainers = with stdenv.lib.maintainers; [viric];
+  };
+}
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 697e7d3b42e0..cf53ce3191e5 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
@@ -10,14 +10,14 @@
 }:
 
 let
-  version = "4.20130314";
+  version = "4.20130405";
 in
 stdenv.mkDerivation {
   name = "git-annex-${version}";
 
   src = fetchurl {
     url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=${version}";
-    sha256 = "0rwirg9qdbd75c7wl6413blv9045sbxmw20idvbm47qc4q14gzv9";
+    sha256 = "13lzkvk5095qj8026lc1p56w0q1c95v7nx8g9p9zrf8mhx6yxb9n";
     name = "git-annex-${version}.tar.gz";
   };
 
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index a7cce109fdfe..3c96cd134181 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation rec {
   name = "vlc-${version}";
-  version = "2.0.5";
+  version = "2.0.6";
 
   src = fetchurl {
     url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz";
-    sha256 = "0vkbv477a7z0v55sigz6c3abxljz7jyysp7z8s29zk8vhq0fpyfz";
+    sha256 = "0qqrpry41vawihhggcx00vibbn73hxdal1gim1qnrqrcbq1rik1i";
   };
 
   buildInputs =
diff --git a/pkgs/applications/virtualization/virtualbox/build_fix_3.9.0.patch b/pkgs/applications/virtualization/virtualbox/build_fix_3.9.0.patch
deleted file mode 100644
index 2c3cdebacde8..000000000000
--- a/pkgs/applications/virtualization/virtualbox/build_fix_3.9.0.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit d725168153e3dc5a383b12e0bf9af9b6244ad3eb
-Author: vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>
-Date:   Thu Feb 28 13:46:12 2013 +0000
-
-    Linux 3.9.0 rc0 compile fix
-
-    git-svn-id: http://www.virtualbox.org/svn/vbox/trunk@44867 cfe28804-0f27-0410-a406-dd0f0b0b656f
-
-diff --git a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
-index ec9b502..7a208d1 100644
---- a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
-+++ b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
-@@ -90,6 +90,9 @@
- #include <linux/slab.h>
- #include <linux/time.h>
- #include <linux/sched.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
-+# include <linux/sched/rt.h>
-+#endif
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 7)
- # include <linux/jiffies.h>
- #endif
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index d385d431fa39..3dd020dfa105 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -11,8 +11,8 @@ with stdenv.lib;
 
 let
 
-  version = "4.2.8";
-  extpackRevision = "83876";
+  version = "4.2.12";
+  extpackRevision = "84980";
 
   forEachModule = action: ''
     for mod in \
@@ -35,7 +35,7 @@ let
     name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}"
          + ".vbox-extpack";
     # Has to be base16 because it's used as an input to VBoxExtPackHelperApp!
-    sha256 = "fa579416f382b58c4e93d3740d076ceba728e28d987e51aced5865a46cb9111c";
+    sha256 = "ad15a92e49095c2115bd1793b3b957d3eaf44af0f5d24bb53d6b4fc81c3e2fc4";
     url = "https://www.virtualbox.org/wiki/Downloads";
   };
 
@@ -44,7 +44,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
-    sha256 = "f336af12244db74e6564dc22e438bbcba70f994aaf0d117fdf70caca9fab1b78";
+    sha256 = "eb65ecac94f63d6292a967d39cb5e28326404c10d0e8c2c50399eedb59c17ee6";
   };
 
   buildInputs =
@@ -54,11 +54,6 @@ in stdenv.mkDerivation {
     ++ optional javaBindings jdk
     ++ optional pythonBindings python;
 
-  patches = [
-    ./strict_types.patch
-    ./build_fix_3.9.0.patch
-  ];
-
   prePatch = ''
     set -x
     MODULES_BUILD_DIR=`echo ${kernelDev}/lib/modules/*/build`
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 20ef5c66997b..f3d7c18a2c69 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -2,14 +2,14 @@
 , libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor
 , dbus }:
 
-let version = "4.2.8"; in
+let version = "4.2.12"; in
 
 stdenv.mkDerivation {
   name = "VirtualBox-GuestAdditions-${version}-${kernelDev.version}";
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "04a5402d8dcdefc83ffb2785351ddc57758781a3759137974469189392ae4ad5";
+    sha256 = "aed4730b643aca8daa0829e1122b7c8d592b9f6cea902a98e390c4d22373dfb8";
   };
 
   KERN_DIR = "${kernelDev}/lib/modules/*/build";
diff --git a/pkgs/applications/virtualization/virtualbox/strict_types.patch b/pkgs/applications/virtualization/virtualbox/strict_types.patch
deleted file mode 100644
index 18ccc77f9b16..000000000000
--- a/pkgs/applications/virtualization/virtualbox/strict_types.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --git a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
-index 9cc124c..d86da0c 100644
---- a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
-+++ b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
-@@ -253,7 +253,11 @@ static struct platform_device gPlatformDevice =
- DECLINLINE(RTUID) vboxdrvLinuxUid(void)
- {
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
-+# ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS
-+    return from_kuid(current_user_ns(), current_uid());
-+# else
-     return current->cred->uid;
-+# endif
- #else
-     return current->uid;
- #endif
-@@ -262,7 +266,11 @@ DECLINLINE(RTUID) vboxdrvLinuxUid(void)
- DECLINLINE(RTGID) vboxdrvLinuxGid(void)
- {
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
-+# ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS
-+    return from_kgid(current_user_ns(), current_gid());
-+# else
-     return current->cred->gid;
-+# endif
- #else
-     return current->gid;
- #endif
-@@ -271,7 +279,11 @@ DECLINLINE(RTGID) vboxdrvLinuxGid(void)
- DECLINLINE(RTUID) vboxdrvLinuxEuid(void)
- {
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
-+# ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS
-+    return from_kuid(current_user_ns(), current_euid());
-+# else
-     return current->cred->euid;
-+# endif
- #else
-     return current->euid;
- #endif
-diff --git a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c b/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
-index 575f739..8909e79 100644
---- a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
-+++ b/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
-@@ -429,7 +429,11 @@ int vboxPciOsDevDetachHostDriver(PVBOXRAWPCIINS pIns)
-         if (!pNewCreds)
-                 goto done;
- 
-+# ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS
-+        pNewCreds->fsuid = GLOBAL_ROOT_UID;;
-+# else
-         pNewCreds->fsuid = 0;
-+# endif
-         pOldCreds = override_creds(pNewCreds);
- #endif
- 
-@@ -539,7 +543,11 @@ int vboxPciOsDevReattachHostDriver(PVBOXRAWPCIINS pIns)
-         if (!pNewCreds)
-             goto done;
- 
-+# ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS
-+        pNewCreds->fsuid = GLOBAL_ROOT_UID;;
-+# else
-         pNewCreds->fsuid = 0;
-+# endif
-         pOldCreds = override_creds(pNewCreds);
- #endif
-         RTStrPrintf(szFileBuf, cMaxBuf,