Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby

Conflicts:
	pkgs/applications/version-management/git-and-tools/default.nix
	pkgs/applications/version-management/git-and-tools/hub/default.nix
	pkgs/tools/audio/mpdcron/default.nix

37 files changed, 476 insertions, 119 deletions

diff --git a/pkgs/servers/dict/dictd-wiktionary.nix b/pkgs/servers/dict/dictd-wiktionary.nix
index 370bfd39137a..42eb3c0757e3 100644
--- a/pkgs/servers/dict/dictd-wiktionary.nix
+++ b/pkgs/servers/dict/dictd-wiktionary.nix
@@ -17,7 +17,6 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/dictd/
     cd $out/share/dictd
 
-    export LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive
     python -O ${convert} ${data}
     dictzip wiktionary-en.dict
     echo en_US.UTF-8 > locale
diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix
index ea91993e7231..5d5939f83bef 100644
--- a/pkgs/servers/etcd/default.nix
+++ b/pkgs/servers/etcd/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "0.5.0-alpha.4";
+  version = "2.0.0-rc.1";
   name = "etcd-${version}";
 
   src = import ./deps.nix {
diff --git a/pkgs/servers/etcd/deps.nix b/pkgs/servers/etcd/deps.nix
index 1cd8309ad5d0..b07ee1d74892 100644
--- a/pkgs/servers/etcd/deps.nix
+++ b/pkgs/servers/etcd/deps.nix
@@ -8,8 +8,8 @@ let
       src = fetchFromGitHub {
         owner = "coreos";
         repo = "etcd";
-        rev = "d01d6119e54f729f54e9776ad5729277fcf38668";
-        sha256 = "0h9d6rc8yx7vyv2ggvzsddyng03pjhyb7avm9wrc805qr7p8nhns";
+        rev = "221abdcb3b755b36d1e7d70149f6de3450351619";
+        sha256 = "1wkd238ap9gp5irrb3f6nnh83rzizwfrfac76j0dvqdka35l247k";
       };
     }
   ];
diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix
index 0e7146175446..54412d2ab400 100644
--- a/pkgs/servers/http/couchdb/default.nix
+++ b/pkgs/servers/http/couchdb/default.nix
@@ -13,6 +13,18 @@ stdenv.mkDerivation rec {
   buildInputs = [ erlang icu openssl spidermonkey curl help2man sphinx which
     file pkgconfig ];
 
+  /* This patch removes the `-Werror` flag as there are warnings due to
+   * _BSD_SOURCE being deprecated in glibc >= 2.20
+   */
+  patchPhase = ''
+    patch src/couchdb/priv/Makefile.in <<EOF
+    392c392
+    < couchjs_CFLAGS = -g -Wall -Werror -D_BSD_SOURCE \$(CURL_CFLAGS) \$(JS_CFLAGS)
+    ---
+    > couchjs_CFLAGS = -g -Wall -D_BSD_SOURCE \$(CURL_CFLAGS) \$(JS_CFLAGS)
+    EOF
+  '';
+
   postInstall = ''
     sed -i -e "s|\`getopt|\`${getopt}/bin/getopt|" $out/bin/couchdb
   '';
diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix
index 8803b8134f7a..f564cb0d483c 100644
--- a/pkgs/servers/http/lighttpd/default.nix
+++ b/pkgs/servers/http/lighttpd/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, pkgconfig, pcre, libxml2, zlib, attr, bzip2, which, file
-, openssl, enableMagnet ? false, lua5 ? null
+, openssl, enableMagnet ? false, lua5_1 ? null
 , enableMysql ? false, mysql ? null
 }:
 
-assert enableMagnet -> lua5 != null;
+assert enableMagnet -> lua5_1 != null;
 assert enableMysql -> mysql != null;
 
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ pkgconfig pcre libxml2 zlib attr bzip2 which file openssl ]
-             ++ stdenv.lib.optional enableMagnet lua5
+             ++ stdenv.lib.optional enableMagnet lua5_1
              ++ stdenv.lib.optional enableMysql mysql;
 
   configureFlags = [ "--with-openssl" ]
diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix
index 1d2887bcc210..5d6405f5fe78 100644
--- a/pkgs/servers/http/nginx/default.nix
+++ b/pkgs/servers/http/nginx/default.nix
@@ -33,8 +33,8 @@ let
   syslog-ext = fetchFromGitHub {
     owner = "yaoweibin";
     repo = "nginx_syslog_patch";
-    rev = "v0.25";
-    sha256 = "0734f884838wcjyrrddn8wzj834wid1zffrk093jrx18447cryxl";
+    rev = "3ca5ba65541637f74467038aa032e2586321d0cb";
+    sha256 = "0y8dxkx8m1jw4v5zsvw1gfah9vh3ryq0hfmrcbjzcmwp5b5lb1i8";
   };
 
   moreheaders-ext = fetchFromGitHub {
diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix
index 009b091d15f1..e01b6ac25575 100644
--- a/pkgs/servers/http/nginx/unstable.nix
+++ b/pkgs/servers/http/nginx/unstable.nix
@@ -10,10 +10,10 @@
 with stdenv.lib;
 
 let
-  version = "1.7.8";
+  version = "1.7.9";
   mainSrc = fetchurl {
     url = "http://nginx.org/download/nginx-${version}.tar.gz";
-    sha256 = "1rg8c2z6df6flz5vz6k7iixm4f3d27svnncf810vilyk0b1mxxqj";
+    sha256 = "12lg64jrdy8qc8fjdy4nr165h2nf854w295ssj3amp9hypqcgbqs";
   };
 
   rtmp-ext = fetchFromGitHub {
diff --git a/pkgs/servers/http/nix-binary-cache/nix-binary-cache-start.in b/pkgs/servers/http/nix-binary-cache/nix-binary-cache-start.in
index 2a2356f39ab2..13b62a8829da 100644
--- a/pkgs/servers/http/nix-binary-cache/nix-binary-cache-start.in
+++ b/pkgs/servers/http/nix-binary-cache/nix-binary-cache-start.in
@@ -39,6 +39,10 @@ parse_opts () {
         echo "PORT=$1"
         shift;
         ;;
+      --ipv6)
+        shift;
+	echo "USE_IPV6=enable"
+	;;
       --help)
         cat <<EOF >&2
 "$0": start the Nix binary cache serving the Nix store dynamically.
@@ -57,6 +61,8 @@ Recognized options:
 --nix-remote     'daemon' or empty string '' - whether to use daemon for store
                    operations
 
+--ipv6           enable ipv6
+
 --help           show help and exit
 EOF
 	exit 1;
@@ -82,6 +88,12 @@ cgi.assign = ( \".cgi\" => \"@shell@\" )
 setenv.add-request-header = ( \"NIX_BINARY_CACHE_CONFIG\" => \"$workingdir/nix-binary-cache.conf\" )
 " > lighttpd.conf
 
+test -n "$USE_IPV6" && echo "
+\$SERVER[\"socket\"] == \"[::]:$PORT\" {
+server.use-ipv6 = \"enable\"
+}
+" >> lighttpd.conf
+
 cp @out@/nix-binary-cache.cgi . 
 cp @out@/nix-binary-cache.cgi ./nix-bc.cgi 
 
diff --git a/pkgs/servers/http/nix-binary-cache/nix-binary-cache.cgi.in b/pkgs/servers/http/nix-binary-cache/nix-binary-cache.cgi.in
index 1afe8854fed1..890e68765b40 100644
--- a/pkgs/servers/http/nix-binary-cache/nix-binary-cache.cgi.in
+++ b/pkgs/servers/http/nix-binary-cache/nix-binary-cache.cgi.in
@@ -10,13 +10,18 @@ KEYNAME=na
 export NIX_REMOTE=daemon
 
 config="${NIX_BINARY_CACHE_CONFIG:-${HTTP_NIX_BINARY_CACHE_CONFIG:-/etc/nix/nix-binary-cache.cgi.conf}}"
-config="$(cd "$(@coreutils@/dirname "$config")"; 
+config="$(cd "$(@coreutils@/dirname "$config")";
   @coreutils@/pwd)/$(@coreutils@/basename "$config")"
 @coreutils@/test -e "$config" && . "$config"
 
 header(){
 	echo "Content-Type: text/plain; charset=utf-8"
-	echo 
+	echo
+}
+
+header404(){
+	echo "Status: 404 Not Found"
+	echo
 }
 
 clean_path() {
@@ -28,12 +33,12 @@ storeq(){
 }
 
 sign(){
-	test -n "$1" && 
-	  @coreutils@/sha256sum | @gnused@/sed -e 's/ .*//' | 
+	test -n "$1" &&
+	  @coreutils@/sha256sum | @gnused@/sed -e 's/ .*//' |
 	  @openssl@/openssl rsautl -sign -inkey "$@" | @coreutils@/base64 -w 0
 }
 
-case "$QUERY_STRING" in 
+case "$QUERY_STRING" in
 	"")
 		header
 		echo "Hello, this is a dynamically-generated Nix binary cache"
@@ -61,9 +66,9 @@ case "$QUERY_STRING" in
 			echo "Compression: $COMPRESSION"
 			echo "NarHash: $(storeq --hash "$path")"
 			echo "NarSize: $(storeq --size "$path")"
-			echo "References: $(storeq --references "$path" | 
+			echo "References: $(storeq --references "$path" |
 			  @coreutils@/tac | clean_path )"
-			echo "Deriver: $(storeq --deriver "$path" | 
+			echo "Deriver: $(storeq --deriver "$path" |
 			  clean_path )"
 			)"
 			signature="$(echo "$info" | sign "$KEY")"
@@ -72,6 +77,7 @@ case "$QUERY_STRING" in
 			echo "Signature: 1;$KEYNAME;$signature"
 
 		else
+			header404
 			exit 1
 		fi
 		;;
@@ -81,6 +87,7 @@ case "$QUERY_STRING" in
 			header
 			@nix@/nix-store --dump "$path" | @xz@/xz
 		else
+			header404
 			exit 1
 		fi
 		;;
@@ -91,6 +98,7 @@ case "$QUERY_STRING" in
 			header
 			@nix@/nix-store --dump "$path" | @bzip2@/bzip2
 		else
+			header404
 			exit 1
 		fi
 		;;
diff --git a/pkgs/servers/http/pshs/default.nix b/pkgs/servers/http/pshs/default.nix
new file mode 100644
index 000000000000..141f58417fb6
--- /dev/null
+++ b/pkgs/servers/http/pshs/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, libevent, file, qrencode }:
+
+let
+  version = "0.2.6";
+in stdenv.mkDerivation {
+  name = "pshs-${version}";
+
+  src = fetchurl {
+    url = "https://www.bitbucket.org/mgorny/pshs/downloads/pshs-${version}.tar.bz2";
+    sha256 = "0n8l5sjnwjqjmw0jzg3hb93n6npg2wahmdg1zrpsw8fyh9ggjg4g";
+  };
+
+  buildInputs = [ pkgconfig libevent file qrencode ];
+
+  # TODO: enable ssl once dependencies
+  # (libssl libcrypto libevent >= 2.1 libevent_openssl) can be met
+  configureFlags = "--disable-ssl";
+
+  meta = {
+    description = "Pretty small HTTP server - a command-line tool to share files";
+    homepage = "https://bitbucket.org/mgorny/pshs/";
+    license = stdenv.lib.licenses.bsd3;
+    maintainers = [ stdenv.lib.maintainers.eduarrrd ];
+  };
+}
diff --git a/pkgs/servers/http/yaws/default.nix b/pkgs/servers/http/yaws/default.nix
index 933df2d0e360..8d160fc958cc 100644
--- a/pkgs/servers/http/yaws/default.nix
+++ b/pkgs/servers/http/yaws/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "yaws-${version}";
-  version = "1.98";
+  version = "1.99";
 
   src = fetchurl {
     url = "http://yaws.hyber.org/download/${name}.tar.gz";
-    sha256 = "0c88da7gxha7an3c82j5a3r1y0j7cjq66zqfrzjihg8pwp618zfl";
+    sha256 = "057ymg84ji4pfi3xai6kis3mk8zks2ynbiam0x68cb4cb1yfzwcl";
   };
 
   # The tarball includes a symlink yaws -> yaws-1.95, which seems to be
diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix
new file mode 100644
index 000000000000..f2ed57b4eb7d
--- /dev/null
+++ b/pkgs/servers/ldap/389/default.nix
@@ -0,0 +1,56 @@
+{ stdenv, fetchurl, pkgconfig, perl, pam, nspr, nss, openldap, db, cyrus_sasl
+, svrcore, icu, net_snmp, kerberos, pcre, perlPackages
+}:
+let
+  version = "1.3.3.5";
+in
+stdenv.mkDerivation rec {
+  name = "389-ds-base-${version}";
+
+  src = fetchurl {
+    url = "http://directory.fedoraproject.org/binaries/${name}.tar.bz2";
+    sha256 = "09w81salyr56njsvq9p96ijrrs0vwsczd43jf6384ylzj1jrxxl5";
+  };
+
+  buildInputs = [
+    pkgconfig perl pam nspr nss openldap db cyrus_sasl svrcore icu
+    net_snmp kerberos pcre
+  ] ++ (with perlPackages; [ MozillaLdap NetAddrIP DBFile ]);
+
+  # TODO: Fix bin/ds-logpipe.py, bin/logconv, bin/cl-dump
+
+  patches = [ ./no-etc.patch ./perl-path.patch ];
+
+  preConfigure = ''
+    # Create perl paths for library imports in perl scripts
+    PERLPATH=""
+    for P in $(echo $PERL5LIB | sed 's/:/ /g'); do
+      PERLPATH="$PERLPATH $(echo $P/*/*)"
+    done
+    export PERLPATH
+  '';
+
+  configureFlags = [
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+    "--with-openldap=${openldap}"
+    "--with-db=${db}"
+    "--with-sasl=${cyrus_sasl}"
+    "--with-netsnmp=${net_snmp}"
+  ];
+  
+  preInstall = ''
+    # The makefile doesn't create this directory for whatever reason
+    mkdir -p $out/lib/dirsrv
+  '';
+
+  passthru.version = version;
+
+  meta = with stdenv.lib; {
+    homepage = https://directory.fedoraproject.org/;
+    description = "enterprise-class Open Source LDAP server for Linux";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ wkennington ];
+  };
+}
diff --git a/pkgs/servers/ldap/389/no-etc.patch b/pkgs/servers/ldap/389/no-etc.patch
new file mode 100644
index 000000000000..a894ffd40056
--- /dev/null
+++ b/pkgs/servers/ldap/389/no-etc.patch
@@ -0,0 +1,62 @@
+From bcdd781b01beba59b9f6993355732070b9487603 Mon Sep 17 00:00:00 2001
+From: "William A. Kennington III" <william@wkennington.com>
+Date: Fri, 9 Jan 2015 14:51:46 -0800
+Subject: [PATCH 1/2] Makefile: Don't install files to /etc or /var
+
+---
+ Makefile.in | 17 ++++++++---------
+ 1 file changed, 8 insertions(+), 9 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 24a9ddf..c97d1e1 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -169,15 +169,14 @@ am__uninstall_files_from_dir = { \
+ am__installdirs = "$(DESTDIR)$(serverdir)" \
+ 	"$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" \
+ 	"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" \
+-	"$(DESTDIR)$(initdir)" "$(DESTDIR)$(sbindir)" \
++	"$(DESTDIR)$(sbindir)" \
+ 	"$(DESTDIR)$(taskdir)" "$(DESTDIR)$(updatedir)" \
+ 	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)" \
+-	"$(DESTDIR)$(configdir)" "$(DESTDIR)$(infdir)" \
+-	"$(DESTDIR)$(initconfigdir)" "$(DESTDIR)$(mibdir)" \
++	"$(DESTDIR)$(infdir)" \
++	"$(DESTDIR)$(mibdir)" \
+ 	"$(DESTDIR)$(propertydir)" "$(DESTDIR)$(perldir)" \
+ 	"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(propertydir)" \
+ 	"$(DESTDIR)$(pythondir)" "$(DESTDIR)$(sampledatadir)" \
+-	"$(DESTDIR)$(schemadir)" "$(DESTDIR)$(systemdsystemunitdir)" \
+ 	"$(DESTDIR)$(updatedir)" "$(DESTDIR)$(serverincdir)"
+ LTLIBRARIES = $(server_LTLIBRARIES) $(serverplugin_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+@@ -10207,7 +10206,7 @@ check: $(BUILT_SOURCES)
+ all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \
+ 		$(MANS) $(DATA) $(HEADERS) config.h
+ installdirs:
+-	for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(initconfigdir)" "$(DESTDIR)$(mibdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(pythondir)" "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(systemdsystemunitdir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(serverincdir)"; do \
++	for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(mibdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(pythondir)" "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(serverincdir)"; do \
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: $(BUILT_SOURCES)
+@@ -10363,13 +10362,13 @@ info: info-am
+ 
+ info-am:
+ 
+-install-data-am: install-configDATA install-infDATA \
+-	install-initSCRIPTS install-initconfigDATA install-man \
++install-data-am: install-infDATA \
++	install-man \
+ 	install-mibDATA install-nodist_propertyDATA install-perlDATA \
+ 	install-pkgconfigDATA install-propertyDATA install-pythonDATA \
+-	install-sampledataDATA install-schemaDATA \
++	install-sampledataDATA \
+ 	install-serverLTLIBRARIES install-serverincHEADERS \
+-	install-serverpluginLTLIBRARIES install-systemdsystemunitDATA \
++	install-serverpluginLTLIBRARIES \
+ 	install-taskSCRIPTS install-updateDATA install-updateSCRIPTS
+ 
+ install-dvi: install-dvi-am
+-- 
+2.1.4
+
diff --git a/pkgs/servers/ldap/389/perl-path.patch b/pkgs/servers/ldap/389/perl-path.patch
new file mode 100644
index 000000000000..73af83a9d6aa
--- /dev/null
+++ b/pkgs/servers/ldap/389/perl-path.patch
@@ -0,0 +1,34 @@
+From 78a814e4d5e8708893b6ed8b673a4577abae05f4 Mon Sep 17 00:00:00 2001
+From: "William A. Kennington III" <william@wkennington.com>
+Date: Fri, 9 Jan 2015 14:52:11 -0800
+Subject: [PATCH 2/2] Makefile: Add PERLPATH to perl files
+
+---
+ Makefile.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index c97d1e1..763bf3b 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -2870,7 +2870,7 @@ rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBS
+ @BUNDLE_FALSE@	-e 's,@CONSOLE_VERSION\@,$(CONSOLE_VERSION),g' \
+ @BUNDLE_FALSE@	-e 's,@BUILDNUM\@,$(BUILDNUM),g' \
+ @BUNDLE_FALSE@	-e 's,@NQBUILD_NUM\@,$(NQBUILDNUM),g' \
+-@BUNDLE_FALSE@	-e 's,@perlpath\@,$(perldir),g' \
++@BUNDLE_FALSE@	-e 's,@perlpath\@,$(perldir) $(PERLPATH),g' \
+ @BUNDLE_FALSE@	-e 's,@defaultuser\@,$(defaultuser),g' \
+ @BUNDLE_FALSE@	-e 's,@defaultgroup\@,$(defaultgroup),g' \
+ @BUNDLE_FALSE@	-e 's,@with_fhs_opt\@,@with_fhs_opt@,g' \
+@@ -2947,7 +2947,7 @@ rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBS
+ @BUNDLE_TRUE@	-e 's,@CONSOLE_VERSION\@,$(CONSOLE_VERSION),g' \
+ @BUNDLE_TRUE@	-e 's,@BUILDNUM\@,$(BUILDNUM),g' \
+ @BUNDLE_TRUE@	-e 's,@NQBUILD_NUM\@,$(NQBUILDNUM),g' \
+-@BUNDLE_TRUE@	-e 's,@perlpath\@,$(perldir) $(libdir)/perl/arch $(libdir)/perl,g' \
++@BUNDLE_TRUE@	-e 's,@perlpath\@,$(perldir) $(PERLPATH) $(libdir)/perl/arch $(libdir)/perl,g' \
+ @BUNDLE_TRUE@	-e 's,@defaultuser\@,$(defaultuser),g' \
+ @BUNDLE_TRUE@	-e 's,@defaultgroup\@,$(defaultgroup),g' \
+ @BUNDLE_TRUE@	-e 's,@with_fhs_opt\@,@with_fhs_opt@,g' \
+-- 
+2.1.4
+
diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix
index 5f779c754723..bd179490c18b 100644
--- a/pkgs/servers/mail/dovecot/default.nix
+++ b/pkgs/servers/mail/dovecot/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "dovecot-2.1.17";
 
-  buildInputs = [openssl pam bzip2 zlib inotifyTools openldap];
+  buildInputs = [openssl bzip2 zlib openldap] ++ stdenv.lib.optionals stdenv.isLinux [pam inotifyTools];
 
   src = fetchurl {
     url = "http://dovecot.org/releases/2.1/${name}.tar.gz";
diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix
index 5c3938c1b6e8..b6a6ef8f3bb7 100644
--- a/pkgs/servers/monitoring/bosun/default.nix
+++ b/pkgs/servers/monitoring/bosun/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, go }:
 stdenv.mkDerivation rec {
   name = "bosun-${version}";
-  version = "20141204222654";
+  version = "20141215200935";
   src = fetchurl {
     url = "https://github.com/bosun-monitor/bosun/archive/${version}.tar.gz";
-    sha256 = "1jwhfwf24zhncrirna3q1vhap4f955bqx3sws3ryk5gp1w99l36n";
+    sha256 = "1py4plx5wi4mp05g4c1aa1wa8ny538kp2p4fzhalz33zm2qxbbx9";
   };
   buildInputs = [ go ];
 
diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix
new file mode 100644
index 000000000000..b7dbdb893f1a
--- /dev/null
+++ b/pkgs/servers/monitoring/cadvisor/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, lib, go, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "cadvisor-${version}";
+  version = "0.7.1";
+
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "cadvisor";
+    rev = "${version}";
+    sha256 = "1vc9fydi6wra45khxsmfw5mx2qyggi7cg6kgajzw518rqa52ivmg";
+  };
+
+  buildInputs = [ go ];
+
+  buildPhase = ''
+    mkdir -p Godeps/_workspace/src/github.com/google/
+    ln -s $(pwd) Godeps/_workspace/src/github.com/google/cadvisor
+    GOPATH=$(pwd)/Godeps/_workspace go build -v -o cadvisor github.com/google/cadvisor
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mv cadvisor $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Analyzes resource usage and performance characteristics of running docker containers.";
+    homepage = https://github.com/google/cadvisor;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ offline ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix
index b671fbf877ac..51eda757e3c2 100644
--- a/pkgs/servers/monitoring/munin/default.nix
+++ b/pkgs/servers/monitoring/munin/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeWrapper, which, coreutils, rrdtool, perl, perlPackages
-, python, ruby, openjdk, nettools
+, python, ruby, jre, nettools
 }:
 
 stdenv.mkDerivation rec {
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     perlPackages.DBDPg
     python
     ruby
-    openjdk
+    jre
     # tests
     perlPackages.TestLongString
     perlPackages.TestDifferences
@@ -91,11 +91,14 @@ stdenv.mkDerivation rec {
     PERL=${perl}/bin/perl
     PYTHON=${python}/bin/python
     RUBY=${ruby}/bin/ruby
-    JAVARUN=${openjdk}/bin/java
+    JAVARUN=${jre}/bin/java
     PLUGINUSER=munin
   '';
 
   postFixup = ''
+    echo "Removing references to /usr/{bin,sbin}/ from munin plugins..."
+    find "$out/lib/plugins" -type f -print0 | xargs -0 -L1 sed -i -e "s|/usr/bin/||g" -e "s|/usr/sbin/||g"
+
     if test -e $out/nix-support/propagated-native-build-inputs; then
         ln -s $out/nix-support/propagated-native-build-inputs $out/nix-support/propagated-user-env-packages
     fi
diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix
index 9e3ebc3795d8..efc61b9fd6b2 100644
--- a/pkgs/servers/monitoring/net-snmp/default.nix
+++ b/pkgs/servers/monitoring/net-snmp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoreconfHook, file, openssl, perl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "net-snmp-5.7.2.1";
+  name = "net-snmp-5.7.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/net-snmp/${name}.zip";
-    sha256 = "1nj3b2x4fhsh82nra99128vqp2lfw5wx91ka8nqwzxvik59hb4dc";
+    sha256 = "0gkss3zclm23zwpqfhddca8278id7pk6qx1mydpimdrrcndwgpz8";
   };
 
   preConfigure =
@@ -24,16 +24,18 @@ stdenv.mkDerivation rec {
       "--with-sys-contact=root@unknown"
       "--with-logfile=/var/log/net-snmpd.log"
       "--with-persistent-directory=/var/lib/net-snmp"
+      "--with-openssl=${openssl}"
     ];
 
-  buildInputs = [ autoreconfHook file perl unzip ];
-  propagatedBuildInputs = [ openssl ];
+  buildInputs = [ autoreconfHook file perl unzip openssl ];
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Clients and server for the SNMP network monitoring protocol";
     homepage = http://net-snmp.sourceforge.net/;
-    license = "bsd";
+    license = licenses.bsd3;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ wkennington ];
   };
 }
diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix
index 95b433abbf5c..7a4a053d4ae9 100644
--- a/pkgs/servers/monitoring/riemann/default.nix
+++ b/pkgs/servers/monitoring/riemann/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "riemann-${version}";
-  version = "0.2.6";
+  version = "0.2.7";
 
   src = fetchurl {
     url = "http://aphyr.com/riemann/${name}.tar.bz2";
-    sha256 = "1m1vkvdcpcc93ipzpdlq0lig81yw172qfiqbxlrbjyb0x6j1984d";
+    sha256 = "1hnjikm24jlfi5qav7gam078k5gynca36xbxr3b3lbhw17kyknwg";
   };
 
   phases = [ "unpackPhase" "installPhase" ];
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index 4b1e8569cd91..df7d61d24972 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -18,6 +18,8 @@
 , mpg123Support ? true, mpg123
 , aacSupport ? true, faad2
 , pulseaudioSupport ? true, pulseaudio
+, jackSupport ? true, jack2
+, gmeSupport ? true, game-music-emu
 , icuSupport ? true, icu
 }:
 
@@ -57,6 +59,8 @@ in stdenv.mkDerivation rec {
     ++ opt aacSupport faad2
     ++ opt zipSupport zziplib
     ++ opt pulseaudioSupport pulseaudio
+    ++ opt jackSupport jack2
+    ++ opt gmeSupport game-music-emu
     ++ opt icuSupport icu;
 
   configureFlags =
@@ -80,8 +84,10 @@ in stdenv.mkDerivation rec {
       (mkFlag mpg123Support "mpg123")
       (mkFlag aacSupport "aac")
       (mkFlag pulseaudioSupport "pulse")
+      (mkFlag jackSupport "jack")
       (mkFlag stdenv.isDarwin "osx")
       (mkFlag icuSupport "icu")
+      (mkFlag gmeSupport "gme")
       "--enable-debug"
     ]
     ++ opt stdenv.isLinux
diff --git a/pkgs/servers/nosql/cassandra/default.nix b/pkgs/servers/nosql/cassandra/default.nix
index fd263cad5d5a..6d2f5ed91ca4 100644
--- a/pkgs/servers/nosql/cassandra/default.nix
+++ b/pkgs/servers/nosql/cassandra/default.nix
@@ -8,13 +8,13 @@
 , getopt
 }:
 
-let version = "2.1.0";
+let version = "2.1.2";
 in stdenv.mkDerivation rec {
   name = "cassandra-${version}";
 
   src = fetchurl {
     url = "http://apache.cs.utah.edu/cassandra/${version}/apache-${name}-bin.tar.gz";
-    sha256 = "da99c4ebc8de925dc6b493443b70d2183cf3090b1aad6b6b918efa9565f264dd";
+    sha256 = "1glpv3d1c63ccqnfjzz76cxb508qyvbgva26h5j7k8dd5av84lcr";
   };
 
   buildInputs = [ makeWrapper ];
@@ -34,10 +34,11 @@ in stdenv.mkDerivation rec {
     wrapProgram $out/bin/cqlsh --prefix PATH : ${python}/bin
     '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://cassandra.apache.org/;
     description = "A massively scalable open source NoSQL database";
-    platforms = stdenv.lib.platforms.all;
-    license = stdenv.lib.licenses.asl20;
+    platforms = with platforms; all;
+    license = with licenses; asl20;
+    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/servers/nosql/hyperdex/default.nix b/pkgs/servers/nosql/hyperdex/default.nix
index 036a3412b864..44cc0752088a 100644
--- a/pkgs/servers/nosql/hyperdex/default.nix
+++ b/pkgs/servers/nosql/hyperdex/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, makeWrapper, unzip, autoconf, automake, libtool,
   python, sodium, pkgconfig, popt, glog, xz, json_c, gperf, yacc,
-  flex, haskellPackages, help2man, autoconf-archive, callPackage }:
+  flex, pandoc, help2man, autoconf-archive, callPackage }:
 
 assert stdenv.isLinux;
 
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     yacc
     flex
     help2man
-    haskellPackages.pandoc
+    pandoc
   ];
   preConfigure = "autoreconf -fi";
 
diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index b9c2e83d5828..833a17246fc9 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "redis-2.8.17";
+  name = "redis-2.8.19";
 
   src = fetchurl {
     url = "http://download.redis.io/releases/${name}.tar.gz";
-    sha256 = "19rnwapbsvfhd9pwdjdshrpqimf1ms0pzakvgnjrywkijmiwrisk";
+    sha256 = "29bb08abfc3d392b2f0c3e7f48ec46dd09ab1023f9a5575fc2a93546f4ca5145";
   };
 
   makeFlags = "PREFIX=$(out)";
diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix
index 5c1b2c16c6d6..09c6468956f2 100644
--- a/pkgs/servers/openafs-client/default.nix
+++ b/pkgs/servers/openafs-client/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, which, autoconf, automake, flex, yacc,
-  kernel, glibc, ncurses, perl, krb5 }:
+  kernel, glibc, ncurses, perl, kerberos }:
 
 assert stdenv.isLinux;
 assert builtins.substring 0 4 kernel.version != "3.18";
@@ -11,8 +11,8 @@ stdenv.mkDerivation {
     url = http://www.openafs.org/dl/openafs/1.6.9/openafs-1.6.9-src.tar.bz2;
     sha256 = "1isgw7znp10w0mr3sicnjzbc12bd1gdwfqqr667w6p3syyhs6bkv";
   };
- 
-  patches = [ 
+
+  patches = [
    ./f3c0f74186f4a323ffc5f125d961fe384d396cac.patch
    ./ae86b07f827d6f3e2032a412f5f6cb3951a27d2d.patch
    ./I5558c64760e4cad2bd3dc648067d81020afc69b6.patch
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   buildInputs = [ autoconf automake flex yacc ncurses perl which ];
 
   preConfigure = ''
-    ln -s ${kernel.dev}/lib/modules/*/build $TMP/linux
+    ln -s "${kernel.dev}/lib/modules/"*/build $TMP/linux
 
     patchShebangs .
     for i in `grep -l -R '/usr/\(include\|src\)' .`; do
@@ -34,11 +34,13 @@ stdenv.mkDerivation {
 
     ./regen.sh
 
-    export KRB5_CONFIG=${krb5}/bin/krb5-config
+    ${stdenv.lib.optionalString (kerberos != null) ''
+      export KRB5_CONFIG=${kerberos}/bin/krb5-config"
+    ''}
 
     configureFlagsArray=(
       "--with-linux-kernel-build=$TMP/linux"
-      "--with-krb5"
+      ${stdenv.lib.optionalString (kerberos != null) "--with-krb5"}
       "--sysconfdir=/etc/static"
     )
   '';
diff --git a/pkgs/servers/s6/default.nix b/pkgs/servers/s6/default.nix
index 491dc625cf21..1452f82573e9 100644
--- a/pkgs/servers/s6/default.nix
+++ b/pkgs/servers/s6/default.nix
@@ -1,26 +1,32 @@
-{ stdenv
-, execline
-, fetchurl
-, skalibs
-, skarnetConfCompile
-}:
+{ stdenv, execline, fetchgit, skalibs }:
 
 let
 
-  version = "1.1.3.2";
+  version = "2.0.1.0";
 
 in stdenv.mkDerivation rec {
 
   name = "s6-${version}";
 
-  src = fetchurl {
-    url = "http://www.skarnet.org/software/s6/${name}.tar.gz";
-    sha256 = "0djxdd3d3mlp63sjqqs0ilf8p68m86c1s98d82fl0kgaaibpsikp";
+  src = fetchgit {
+    url = "git://git.skarnet.org/s6";
+    rev = "refs/tags/v${version}";
+    sha256 = "1x7za0b1a2i6xn06grpb5j361s9bl4524bp5mz3zcdg8s9nil50d";
   };
 
-  buildInputs = [ skalibs execline skarnetConfCompile ];
+  dontDisableStatic = true;
 
-  sourceRoot = "admin/${name}";
+  enableParallelBuilding = true;
+
+  configureFlags = [
+    "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
+    "--with-include=${skalibs}/include"
+    "--with-include=${execline}/include"
+    "--with-lib=${skalibs}/lib"
+    "--with-lib=${execline}/lib"
+    "--with-dynlib=${skalibs}/lib"
+    "--with-dynlib=${execline}/lib"
+  ] ++ stdenv.lib.optional stdenv.isDarwin [ "--disable-shared" ];
 
   preBuild = ''
     substituteInPlace "src/daemontools-extras/s6-log.c" \
diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/3.x.nix
index b0b1b152e9b7..b0b1b152e9b7 100644
--- a/pkgs/servers/samba/default.nix
+++ b/pkgs/servers/samba/3.x.nix
diff --git a/pkgs/servers/samba/4.x-no-persistent-install.patch b/pkgs/servers/samba/4.x-no-persistent-install.patch
new file mode 100644
index 000000000000..68d0cf76aa55
--- /dev/null
+++ b/pkgs/servers/samba/4.x-no-persistent-install.patch
@@ -0,0 +1,18 @@
+diff --git a/dynconfig/wscript b/dynconfig/wscript
+index aa4e66e..d53f433 100755
+--- a/dynconfig/wscript
++++ b/dynconfig/wscript
+@@ -379,9 +379,9 @@ def build(bld):
+                         cflags=cflags)
+ 
+     # install some extra empty directories
+-    bld.INSTALL_DIRS("", "${CONFIGDIR} ${PRIVATE_DIR} ${LOGFILEBASE}");
+-    bld.INSTALL_DIRS("", "${PRIVATE_DIR} ${PRIVILEGED_SOCKET_DIR}")
+-    bld.INSTALL_DIRS("", "${STATEDIR} ${CACHEDIR}");
++    #bld.INSTALL_DIRS("", "${CONFIGDIR} ${PRIVATE_DIR} ${LOGFILEBASE}");
++    #bld.INSTALL_DIRS("", "${PRIVATE_DIR} ${PRIVILEGED_SOCKET_DIR}")
++    #bld.INSTALL_DIRS("", "${STATEDIR} ${CACHEDIR}");
+ 
+     # these might be on non persistent storage
+-    bld.INSTALL_DIRS("", "${LOCKDIR} ${PIDDIR} ${SOCKET_DIR}")
++    #bld.INSTALL_DIRS("", "${LOCKDIR} ${PIDDIR} ${SOCKET_DIR}")
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
new file mode 100644
index 000000000000..1ecbdf097b3b
--- /dev/null
+++ b/pkgs/servers/samba/4.x.nix
@@ -0,0 +1,110 @@
+{ stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl_ns
+, docbook_xml_dtd_42, readline, talloc, ntdb, tdb, tevent, ldb, popt, iniparser
+, pythonPackages
+
+# source3/wscript optionals
+, heimdal ? null # Samba only supports heimdal for kerberos although mit-krb5 is being worked on
+, openldap ? null
+, cups ? null
+, pam ? null
+, avahi ? null
+, acl ? null
+, libaio ? null
+, fam ? null
+, ctdb ? null
+, ceph ? null
+, glusterfs ? null
+
+# buildtools/wafsamba/wscript optionals
+, libiconv ? null
+, gettext ? null
+
+# source4/lib/tls/wscript optionals
+, gnutls ? null
+, libgcrypt ? null
+, libgpgerror ? null
+
+# other optionals
+, zlib ? null
+, ncurses ? null
+, libcap ? null
+}:
+
+stdenv.mkDerivation rec {
+  name = "samba-4.1.14";
+
+  src = fetchurl {
+    url = "http://samba.org/samba/ftp/stable/${name}.tar.gz";
+    sha256 = "1ficvglapxcw4zrgwkmmjbprsqrxks3ii29nblsr4wlrram4p8ay";
+  };
+
+  patches = [ ./4.x-no-persistent-install.patch ];
+
+  buildInputs = [
+    python pkgconfig perl libxslt docbook_xsl_ns docbook_xml_dtd_42
+    readline talloc ntdb tdb tevent ldb popt iniparser pythonPackages.subunit
+
+    heimdal openldap cups pam avahi acl libaio fam ctdb ceph glusterfs
+
+    libiconv gettext
+
+    gnutls libgcrypt libgpgerror
+
+    zlib ncurses libcap
+  ];
+
+  enableParallelBuilding = true;
+
+  configureFlags = [
+    # source3/wscript options
+    "--with-static-modules=NONE"
+    "--with-shared-modules=ALL"
+    "--with-winbind"
+  ] ++ (if heimdal != null then [ "--with-ads" ] else [ "--without-ads" ])
+    ++ (if openldap != null then [ "--with-ldap" ] else [ "--without-ldap" ])
+    ++ (if cups != null then [ "--enable-cups" ] else [ "--disable-cups" ])
+    ++ (if pam != null then [ "--with-pam" "--with-pam_smbpass" ]
+        else [ "--without-pam" "--without-pam_smbpass" ]) ++ [
+    "--with-quotas"
+    "--with-sendfile-support"
+    "--with-utmp"
+    "--enable-pthreadpool"
+  ] ++ (if avahi != null then [ "--enable-avahi" ] else [ "--disable-avahi" ]) ++ [
+    "--with-iconv"
+  ] ++ (if acl != null then [ "--with-acl-support" ] else [ "--without-acl-support" ]) ++ [
+    "--with-dnsupdate"
+    "--with-syslog"
+    "--with-automount"
+  ] ++ (if libaio != null then [ "--with-aio-support" ] else [ "--without-aio-support" ])
+    ++ (if fam != null then [ "--with-fam" ] else [ "--without-fam" ])
+    ++ (if ctdb != null then [ "--with-cluster-support" "--with-ctdb-dir=${ctdb}" ]
+        else [ "--without-cluster-support" ])
+    ++ (if ceph != null then [ "--with-libcephfs=${ceph}" ] else [ ])
+    ++ (if glusterfs != null then [ "--enable-glusterfs" ] else [ "--disable-glusterfs" ]) ++ [
+    # dynconfig/wscript options
+    "--enable-fhs"
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+
+    # buildtools/wafsamba/wscript options
+    "--bundled-libraries=${if heimdal != null then "NONE" else "com_err"}"
+    "--private-libraries=NONE"
+    "--builtin-libraries=replace"
+  ] ++ (if libiconv != null then [ "--with-libiconv=${libiconv}" ] else [ ])
+    ++ (if gettext != null then [ "--with-gettext=${gettext}" ] else [ "--without-gettext" ]) ++ [
+    # source4/lib/tls/wscript options
+  ] ++ (if gnutls != null && libgcrypt != null && libgpgerror != null
+        then [ "--enable-gnutls" ] else [ "--disable-gnutls" ]) ++ [
+    # wscript options
+  ] ++ stdenv.lib.optional (heimdal == null) "--without-ad-dc";
+
+  stripAllList = [ "bin" "sbin" ];
+
+  meta = with stdenv.lib; {
+    homepage = http://www.samba.org/;
+    description = "The standard Windows interoperability suite of programs for Linux and Unix";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ wkennington ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix
index 29ffee2f73a3..a90b52923c2b 100644
--- a/pkgs/servers/search/elasticsearch/default.nix
+++ b/pkgs/servers/search/elasticsearch/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "elasticsearch-1.3.4";
+  name = "elasticsearch-1.4.2";
 
   src = fetchurl {
     url = "https://download.elasticsearch.org/elasticsearch/elasticsearch/${name}.tar.gz";
-    sha256 = "0c6klwag17npmr1f0zv4syn0d9ir3zm595x3vb42ni4b72f65bqq";
+    sha256 = "0g5mffzx15y8sj0gsn6kd5l1v15hg2vm4j7r071dmxs5jw26rp9i";
   };
 
   patches = [ ./es-home.patch ];
diff --git a/pkgs/servers/search/elasticsearch/es-home.patch b/pkgs/servers/search/elasticsearch/es-home.patch
index 9b96149e5ad8..b4ecbb5a7097 100644
--- a/pkgs/servers/search/elasticsearch/es-home.patch
+++ b/pkgs/servers/search/elasticsearch/es-home.patch
@@ -34,5 +34,5 @@ index a8c796a..daf7b99 100755
    shift
  done
  
--exec $JAVA $JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home="$ES_HOME" $properties -cp "$ES_HOME/lib/*" org.elasticsearch.plugins.PluginManager $args
-+exec $JAVA $JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home="$ES_HOME" $properties -cp "$ES_CLASSPATH/lib/*" org.elasticsearch.plugins.PluginManager $args
+-exec "$JAVA" $JAVA_OPTS $ES_JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home="$ES_HOME" $properties -cp "$ES_HOME/lib/*" org.elasticsearch.plugins.PluginManager $args
++exec "$JAVA" $JAVA_OPTS $ES_JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home="$ES_HOME" $properties -cp "$ES_CLASSPATH/lib/*" org.elasticsearch.plugins.PluginManager $args
diff --git a/pkgs/servers/sql/postgresql/9.4beta2.nix b/pkgs/servers/sql/postgresql/9.4.x.nix
index 2608dcae5042..4e2d77ac6da4 100644
--- a/pkgs/servers/sql/postgresql/9.4beta2.nix
+++ b/pkgs/servers/sql/postgresql/9.4.x.nix
@@ -2,14 +2,14 @@
 
 with stdenv.lib;
 
-let version = "9.4beta2"; in
+let version = "9.4.0"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
 
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "131q3b9hv4pw02xhjsfi5is9i7pp5f4srxwfdn8ifs9qb37hcx2n";
+    sha256 = "7a35c3cb77532f7b15702e474d7ef02f0f419527ee80a4ca6036fffb551625a5";
   };
 
   buildInputs = [ zlib readline ] ++ optionals (!stdenv.isDarwin) [ libossp_uuid ];
diff --git a/pkgs/servers/sql/postgresql/9.4beta3.nix b/pkgs/servers/sql/postgresql/9.4beta3.nix
deleted file mode 100644
index d446a4ab75b7..000000000000
--- a/pkgs/servers/sql/postgresql/9.4beta3.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, fetchurl, zlib, readline, libossp_uuid }:
-
-with stdenv.lib;
-
-let version = "9.4beta3"; in
-
-stdenv.mkDerivation rec {
-  name = "postgresql-${version}";
-
-  src = fetchurl {
-    url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "0pdawsmrzwgf2c4g18xlgzv6q34kd8q2p1nxag0xaw4sbdmdilas";
-  };
-
-  buildInputs = [ zlib readline ] ++ optionals (!stdenv.isDarwin) [ libossp_uuid ];
-
-  enableParallelBuilding = true;
-
-  makeFlags = [ "world" ];
-
-  configureFlags = optional (!stdenv.isDarwin)
-    ''
-      --with-ossp-uuid
-    '';
-
-  patches = [ ./disable-resolve_symlinks-94.patch ./less-is-more.patch ];
-
-  installTargets = [ "install-world" ];
-
-  LC_ALL = "C";
-
-  passthru = {
-    inherit readline;
-    psqlSchema = "9.4";
-  };
-
-  meta = {
-    homepage = http://www.postgresql.org/ ;
-    description = "A powerful, open source object-relational database system";
-    license = stdenv.lib.licenses.postgresql;
-    maintainers = with stdenv.lib.maintainers; [ aristid ocharles ];
-    hydraPlatforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/servers/squid/squids.nix b/pkgs/servers/squid/squids.nix
index 859cf703d0e3..587c17a3ceea 100644
--- a/pkgs/servers/squid/squids.nix
+++ b/pkgs/servers/squid/squids.nix
@@ -40,15 +40,26 @@ rec {
   };
 
   squid34 = squid30.merge rec {
-    name = "squid-3.4.9";
+    name = "squid-3.4.11";
     src = args.fetchurl {
       url = "http://www.squid-cache.org/Versions/v3/3.4/${name}.tar.bz2";
-      sha256 = "0rnf0awf54mpbwnx45r5rivgz260jn20hacspbjf2yb6xnzzzwj2";
+      sha256 = "0p9dbsz541cpcc88albwpgq15jgpczv12j9b9g5xw6d3i977qm1h";
     };
     buildInputs = [openldap pam db cyrus_sasl libcap expat libxml2
       libtool openssl];
     configureFlags = ["--enable-ssl" "--enable-ssl-crtd"];
   };
 
-  latest = squid34;
+  squid35 = squid30.merge rec {
+    name = "squid-3.5.1";
+    src = args.fetchurl {
+      url = "http://www.squid-cache.org/Versions/v3/3.5/${name}.tar.bz2";
+      sha256 = "0rfv1v5vkk7l08v4j16l0lz2grrzd8qf2n25i73qd7c8rgwd6a3x";
+    };
+    buildInputs = [openldap pam db cyrus_sasl libcap expat libxml2
+      libtool openssl];
+    configureFlags = ["--with-openssl" "--enable-ssl-crtd"];
+  };
+
+  latest = squid35;
 }
diff --git a/pkgs/servers/unfs3/default.nix b/pkgs/servers/unfs3/default.nix
index ee566c32def5..4304dc229e35 100644
--- a/pkgs/servers/unfs3/default.nix
+++ b/pkgs/servers/unfs3/default.nix
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.bsd3;
     platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix
index 98fe2a51cc24..3e9e7cb779ee 100644
--- a/pkgs/servers/x11/xquartz/default.nix
+++ b/pkgs/servers/x11/xquartz/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, buildEnv, makeFontsConf, gnused, writeScript, xorg, bashInteractive, substituteAll, xterm, makeWrapper, ruby
 , openssl, quartz-wm, fontconfig, xkeyboard_config, xlsfonts, xfontsel
-, ttf_bitstream_vera, freefont_ttf, liberation_ttf
+, ttf_bitstream_vera, freefont_ttf, liberation_ttf_binary
 , shell ? "${bashInteractive}/bin/bash"
 }:
 
@@ -66,7 +66,7 @@ let
     xorg.fontbhlucidatypewriter75dpi
     ttf_bitstream_vera
     freefont_ttf
-    liberation_ttf
+    liberation_ttf_binary
     xorg.fontbh100dpi
     xorg.fontmiscmisc
     xorg.fontcursormisc
diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix
index 1d85984a7b95..abe0116ef90d 100644
--- a/pkgs/servers/xmpp/prosody/default.nix
+++ b/pkgs/servers/xmpp/prosody/default.nix
@@ -10,11 +10,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "0.9.6";
+  version = "0.9.7";
   name = "prosody-${version}";
   src = fetchurl {
     url = "http://prosody.im/downloads/source/${name}.tar.gz";
-    sha256 = "1rs0aqn1rkddgfq9pm7mi7xm5lbvxjpf8d8ijc085fc90zwqq8bm";
+    sha256 = "001fgslg3h7zfrfpkmqixnz5ircq6l0kr4wci5aj0i3nk6rrjjyx";
   };
 
   communityModules = fetchhg {