Merged with trunk again

svn path=/nixpkgs/branches/stdenv-updates/; revision=10267

pkgs/servers/http/apache-modules/tomcat-connectors/builder.sh

@@ -0,0 +1,8 @@
+source $stdenv/setup
+
+tar xfvz $src
+cd tomcat-connectors-*-src/native
+./configure --with-apxs=$apacheHttpd/bin/apxs --with-java-home=$jdk
+make
+ensureDir $out/modules
+cp apache-2.0/mod_jk.so $out/modules

pkgs/servers/http/apache-modules/tomcat-connectors/default.nix

@@ -0,0 +1,14 @@
+{stdenv, fetchurl, apacheHttpd, jdk}:
+
+stdenv.mkDerivation {
+  name = "tomcat-connectors-1.2.26";
+  builder = ./builder.sh;
+
+  src = fetchurl {
+    url = http://apache.proserve.nl/tomcat/tomcat-connectors/jk/source/jk-1.2.26/tomcat-connectors-1.2.26-src.tar.gz;
+    md5 = "feaec245136bc4d99a9dde95a00ea93c";
+  };
+
+  inherit apacheHttpd;
+  buildInputs = [apacheHttpd jdk];
+}

pkgs/servers/http/jboss/builder.sh

@@ -0,0 +1,18 @@
+buildInputs="$jdk5"
+source $stdenv/setup
+
+export JDK_HOME=$jdk5
+export JAVA_HOME=$jdk5
+
+tar xfvz $src
+cd jboss-*
+cd build
+sh build.sh
+ensureDir $out
+cp -av output/jboss-*/* $out
+
+# Insert JAVA_HOME variable to make sure the latest JRE is used and not version 5
+sed -i -e "/GREP/aJAVA_HOME=$jdk" $out/bin/run.sh
+
+# Change the deploy directory to the nix profile
+sed -i -e "s|deploy/|/nix/var/nix/profiles/default/server/default/deploy/|" $out/server/default/conf/jboss-service.xml

pkgs/servers/http/jboss/default.nix

@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, jdk5, jdk }:
+
+stdenv.mkDerivation {
+  name = "jboss-4.2.2.GA";
+
+  builder = ./builder.sh;
+  src = 
+    fetchurl {
+      url = http://garr.dl.sourceforge.net/sourceforge/jboss/jboss-4.2.2.GA-src.tar.gz;
+      md5 = "2a626cdccabe712628555676d67ad44a";
+    };
+
+  inherit jdk5 jdk;
+
+  meta = {
+    homepage = "http://www.jboss.org/";
+    description = "JBoss, Open Source J2EE application server";
+    license = "GPL/LGPL";
+  };
+}

pkgs/servers/sql/postgresql/default.nix

@@ -5,12 +5,12 @@ assert ncurses != null;
 assert readline != null;
 
 stdenv.mkDerivation {
-  name = "postgresql-8.0.6";
+  name = "postgresql-8.2.6";
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = ftp://ftp2.nl.postgresql.org/mirror/postgresql/source/v8.0.6/postgresql-8.0.6.tar.bz2;
-    md5 = "f3b27b8171267f9a87592f931c09f0ee";
+    url = ftp://ftp.de.postgresql.org/mirror/postgresql/source/v8.2.6/postgresql-8.2.6.tar.bz2;
+    sha256="056ixbsfmdwhniryc0mr1kl66jywkqqhqvjdi7i3v4qzh9z34hgf";
   };
 
   inherit readline;

pkgs/servers/xmpp/ejabberd/builder.sh

@@ -0,0 +1,9 @@
+buildInputs="$expat $erlang $zlib $openssl"
+
+source $stdenv/setup
+
+tar xfvz $src
+cd $name/src
+./configure --prefix=$out
+make
+make install

pkgs/servers/xmpp/ejabberd/default.nix

@@ -0,0 +1,11 @@
+{stdenv, fetchurl, expat, erlang, zlib, openssl}:
+
+stdenv.mkDerivation {
+  name = "ejabberd-1.1.4";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.process-one.net/downloads/ejabberd/1.1.4/ejabberd-1.1.4.tar.gz;
+    md5 = "65e9cd346f11a28afbacfe1d7be3a33b";
+  };
+  inherit expat erlang zlib openssl;
+}