Merge branch 'master' into staging

108 files changed, 3996 insertions, 1127 deletions

diff --git a/pkgs/applications/backup/crashplan/CrashPlanDesktop.patch b/pkgs/applications/backup/crashplan/CrashPlanDesktop.patch
deleted file mode 100644
index 7fa68ba4a388..000000000000
--- a/pkgs/applications/backup/crashplan/CrashPlanDesktop.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./scripts/CrashPlanDesktop	2016-03-02 21:01:58.000000000 -0500
-+++ ./scripts/CrashPlanDesktop-1	2016-03-18 20:52:10.117686266 -0400
-@@ -11,7 +11,7 @@
- cd ${TARGETDIR}
- 
- if [ "_${VERSION_5_UI}" == "_true" ]; then
--	${TARGETDIR}/electron/crashplan > ${TARGETDIR}/log/ui_output.log 2> ${TARGETDIR}/log/ui_error.log &
-+	${TARGETDIR}/electron/crashplan &
- else
--	${JAVACOMMON} ${GUI_JAVA_OPTS} -classpath "./lib/com.backup42.desktop.jar:./lang:./skin" com.backup42.desktop.CPDesktop > ${TARGETDIR}/log/ui_output.log 2> ${TARGETDIR}/log/ui_error.log &
-+	${JAVACOMMON} ${GUI_JAVA_OPTS} -classpath "./lib/com.backup42.desktop.jar:./lang:./skin" com.backup42.desktop.CPDesktop &
- fi
diff --git a/pkgs/applications/backup/crashplan/CrashPlanEngine.patch b/pkgs/applications/backup/crashplan/CrashPlanEngine.patch
deleted file mode 100644
index de2afe2da684..000000000000
--- a/pkgs/applications/backup/crashplan/CrashPlanEngine.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- ./scripts/CrashPlanEngine	2014-02-19 23:17:19.000000000 +0000
-+++ ./scripts/CrashPlanEngine.1	2014-07-24 17:36:37.330333581 +0100
-@@ -11,7 +11,7 @@
- 	
- 	cd $TARGETDIR
- 		
--	nice -n 19 $JAVACOMMON $SRV_JAVA_OPTS -classpath $FULL_CP com.backup42.service.CPService > $TARGETDIR/log/engine_output.log 2> $TARGETDIR/log/engine_error.log & 
-+	nice -n 19 $JAVACOMMON $SRV_JAVA_OPTS -classpath $FULL_CP com.backup42.service.CPService > $VARDIR/log/engine_output.log 2> $VARDIR/log/engine_error.log & 
- 	
- 	if [[ $! -gt 0 ]]; then
- 		echo $! > $PIDFILE
-@@ -26,7 +26,7 @@
- 
- 	echo "Using Ubuntu 9.04 startup"
- 	
--	start-stop-daemon -v --pidfile $PIDFILE --make-pidfile --background --chdir $TARGETDIR --start --nicelevel 19 --exec $JAVACOMMON -- $SRV_JAVA_OPTS -classpath $FULL_CP com.backup42.service.CPService > $TARGETDIR/log/engine_output.log 2> $TARGETDIR/log/engine_error.log
-+	start-stop-daemon -v --pidfile $PIDFILE --make-pidfile --background --chdir $TARGETDIR --start --nicelevel 19 --exec $JAVACOMMON -- $SRV_JAVA_OPTS -classpath $FULL_CP com.backup42.service.CPService > $VARDIR/log/engine_output.log 2> $VARDIR/log/engine_error.log
- 	
- 	# This test isn't as useful as one might like; start-stop-daemon can't accurately report the state of child processes when --background is used.
- 	# We use this mainly to report the specific error value returned by start-stop-daemon if something goes wrong, but be aware that a return value
-@@ -91,7 +91,6 @@
- DESC="CrashPlan Engine"
- NAME=CrashPlanEngine
- DAEMON=$TARGETDIR/lib/com.backup42.desktop.jar
--PIDFILE="$TARGETDIR/${NAME}.pid"
- 
- if [[ -f $TARGETDIR/install.vars ]]; then
- 	. $TARGETDIR/install.vars
-@@ -100,6 +99,8 @@
- 	exit 1
- fi
- 
-+PIDFILE="$VARDIR/${NAME}.pid"
-+
- if [[ ! -f $DAEMON ]]; then
- 	echo "Could not find JAR file $DAEMON"
- 	exit 0
diff --git a/pkgs/applications/backup/crashplan/crashplan-small-business.nix b/pkgs/applications/backup/crashplan/crashplan-small-business.nix
deleted file mode 100644
index 5db4badeb6c0..000000000000
--- a/pkgs/applications/backup/crashplan/crashplan-small-business.nix
+++ /dev/null
@@ -1,103 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, getopt, jre, cpio, gawk, gnugrep, gnused,
-  procps, which, gtk2, atk, glib, pango, gdk-pixbuf, cairo, freetype,
-  fontconfig, dbus, gconf, nss, nspr, alsaLib, cups, expat, udev,
-  libX11, libxcb, libXi, libXcursor, libXdamage, libXrandr, libXcomposite,
-  libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nodePackages,
-  maxRam ? "1024m" }:
-
-stdenv.mkDerivation rec {
-  version = "6.7.0";
-  rev = "1512021600670_4503";
-  pname = "CrashPlanSmb";
-  name = "${pname}_${version}_${rev}";
-
-  src = fetchurl {
-    url = "https://web-eam-msp.crashplanpro.com/client/installers/${name}_Linux.tgz";
-    sha256 = "0f7ykfxaqjlvv4hv12yc5z8y1vjsysdblv53byml7i1fy1r0q26q";
-  };
-
-  nativeBuildInputs = [ makeWrapper cpio nodePackages.asar ];
-  buildInputs = [ getopt which ];
-
-  vardir = "/var/lib/crashplan";
-  manifestdir = "${vardir}/manifest";
-
-  postPatch = ''
-    # patch scripts/CrashPlanEngine
-    substituteInPlace scripts/CrashPlanEngine \
-      --replace /bin/ps ${procps}/bin/ps \
-      --replace awk ${gawk}/bin/awk \
-      --replace '`sed' '`${gnused}/bin/sed' \
-      --replace grep ${gnugrep}/bin/grep \
-      --replace TARGETDIR/log VARDIR/log \
-      --replace TARGETDIR/\''${NAME} VARDIR/\''${NAME} \
-      --replace \$TARGETDIR/bin/run.conf $out/bin/run.conf \
-      --replace \$VARDIR ${vardir}
-
-    # patch scripts/CrashPlanDesktop
-    substituteInPlace scripts/CrashPlanDesktop \
-      --replace awk ${gawk}/bin/awk \
-      --replace "\"\$SCRIPTDIR/..\"" "$out" \