15 files changed, 392 insertions, 59 deletions
diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix
index d3a2a5a66f7..7961448428d 100644
--- a/pkgs/servers/ftp/vsftpd/default.nix
+++ b/pkgs/servers/ftp/vsftpd/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "vsftpd-2.0.5";
   src = fetchurl {
     url = "ftp://vsftpd.beasts.org/users/cevans/${name}.tar.gz";
-	sha256 = "0nzsxknnaqnfk853yjsmi31sl02jf5ydix9wxbldv4i7vzqfnqjl";
+    sha256 = "0nzsxknnaqnfk853yjsmi31sl02jf5ydix9wxbldv4i7vzqfnqjl";
   };
   
   NIX_LDFLAGS = "-lcrypt -lssl -lcrypto -lpam -lcap";
diff --git a/pkgs/servers/http/apache-httpd/builder.sh b/pkgs/servers/http/apache-httpd/builder.sh
deleted file mode 100644
index 3a5ccd846ee..00000000000
--- a/pkgs/servers/http/apache-httpd/builder.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-buildInputs="$openssl $db4 $expat $perl"
-source $stdenv/setup
-
-configureFlags="\
- --with-expat=$expat \
- --with-z=$zlib \
- --enable-mods-shared=all \
- --enable-authn-alias \
- --without-gdbm \
- --enable-threads \
- --with-devrandom=/dev/urandom"
-
-if test $db4Support; then
-    configureFlags="--with-berkeley-db=$db4 $configureFlags"
-fi
-
-if test $sslSupport; then
-    configureFlags="--enable-ssl --with-ssl=$openssl $configureFlags"
-fi
-
-
-postInstall() {
-    echo "removing manual"
-    rm -rf $out/manual
-}
-postInstall=postInstall
-
-
-genericBuild
diff --git a/pkgs/servers/http/apache-httpd/default.nix b/pkgs/servers/http/apache-httpd/default.nix
index 76865cf3426..4e2af7ff900 100644
--- a/pkgs/servers/http/apache-httpd/default.nix
+++ b/pkgs/servers/http/apache-httpd/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, openssl, db4, expat, perl, zlib
-, sslSupport, db4Support
+, sslSupport, db4Support, proxySupport ? true
 }:
 
 assert sslSupport -> openssl != null;
@@ -7,19 +7,36 @@ assert db4Support -> db4 != null;
 assert expat != null && perl != null;
 
 stdenv.mkDerivation {
-  name = "apache-httpd-2.2.8";
+  name = "apache-httpd-2.2.8x";
 
-  builder = ./builder.sh;
   src = fetchurl {
     url = http://archive.apache.org/dist/httpd/httpd-2.2.8.tar.bz2;
     md5 = "76d2598a4797163d07cd50e5304aa7cd";
   };
 
-  inherit sslSupport db4Support;
+  #inherit sslSupport db4Support;
 
-  inherit perl expat zlib;
-  openssl = if sslSupport then openssl else null;
-  db4 = if db4Support then db4 else null;
+  buildInputs = [expat perl] ++
+    stdenv.lib.optional sslSupport openssl ++
+    stdenv.lib.optional db4Support db4;
+
+  configureFlags = ''
+    --with-expat=${expat}
+    --with-z=${zlib}
+    --enable-mods-shared=all
+    --enable-authn-alias
+    ${if proxySupport then "--enable-proxy" else ""}
+    --without-gdbm
+    --enable-threads
+    --with-devrandom=/dev/urandom
+    ${if sslSupport then "--enable-ssl --with-ssl=${openssl}" else ""}
+    ${if db4Support then "--with-berkeley-db=${db4}" else ""}
+  '';
+
+  postInstall = ''
+    echo "removing manual"
+    rm -rf $out/manual
+  '';
 
   # For now, disable detection of epoll to ensure that Apache still
   # runs on Linux 2.4 kernels.  Once we've dropped support for 2.4 in
@@ -27,8 +44,13 @@ stdenv.mkDerivation {
   # detects characteristics of the build system's kernel to decide
   # what to use at runtime, since it's impure.
   apr_cv_epoll = "no";
+
+  passthru = {
+    inherit expat sslSupport db4Support proxySupport;
+  };
   
   meta = {
     description = "Apache HTTPD, the world's most popular web server";
+    homepage = http://httpd.apache.org/;
   };
 }
diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix
index 16d247fe8dc..4c83070e9ca 100644
--- a/pkgs/servers/http/apache-modules/mod_python/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_python/default.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchurl, apacheHttpd, python}:
 
 stdenv.mkDerivation {
-  name = "mod_python-3.2.10";
+  name = "mod_python-3.3.1";
 
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://apache.surfnet.nl/httpd/modpython/mod_python-3.2.10.tgz;
-    md5 = "cc6439f546a6e70cfff7ca51b8c62541";
+    url = http://archive.eu.apache.org/dist/httpd/modpython/mod_python-3.3.1.tgz;
+    sha256 = "0sss2xi6l1a2z8y6ji0cp8vgyvnhq8zrg0ilkvpj1mygbzyk28xd";
   };
 
   patches = [./install.patch];
diff --git a/pkgs/servers/http/tomcat/axis2/builder.sh b/pkgs/servers/http/tomcat/axis2/builder.sh
new file mode 100644
index 00000000000..fa58a9e5292
--- /dev/null
+++ b/pkgs/servers/http/tomcat/axis2/builder.sh
@@ -0,0 +1,15 @@
+buildInputs="$unzip $apacheAnt $jdk"
+source $stdenv/setup
+
+unzip $src
+cd axis2-*
+ensureDir $out/share/java/axis2
+cp lib/* $out/share/java/axis2
+cd webapp
+ant
+ensureDir $out/webapps
+cp ../dist/axis2.war $out/webapps
+cd $out/webapps
+mkdir axis2
+cd axis2
+unzip ../axis2.war
diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/servers/http/tomcat/axis2/default.nix
new file mode 100644
index 00000000000..aeb103c0e7d
--- /dev/null
+++ b/pkgs/servers/http/tomcat/axis2/default.nix
@@ -0,0 +1,15 @@
+{stdenv, fetchurl, apacheAnt, jdk, unzip}:
+
+stdenv.mkDerivation {
+
+  name = "axis2-1.3";
+
+  builder = ./builder.sh;
+
+  src = fetchurl {
+    url = http://apache.hippo.nl/ws/axis2/1_3/axis2-1.3-bin.zip;
+    md5 = "ab2bc77452288ebf80d861270734a83e";
+  };
+
+  inherit apacheAnt jdk unzip;
+}
diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix
index fab06b6540c..629ac2a31b8 100644
--- a/pkgs/servers/samba/default.nix
+++ b/pkgs/servers/samba/default.nix
@@ -12,7 +12,12 @@ stdenv.mkDerivation rec {
   configureFlags = ''--with-pam --with-smbmount --datadir=$out/share
   --with-aio-support ''
   + (if (stdenv.gcc.libc != null) then "--with-libiconv=${stdenv.gcc.libc}" else "");
-
   postUnpack = "sourceRoot=\$sourceRoot/source";
-  postInstall = ''rm -rf $out/var ; ln -s /var/samba $out/var '';
+  
+  configFile = ./smb.conf;
+  postInstall = ''
+  rm -rf $out/var
+  ln -s /var/samba $out/var
+  cp ${configFile} $out/lib/smb.conf
+  '';
 }
diff --git a/pkgs/servers/samba/smb.conf b/pkgs/servers/samba/smb.conf
new file mode 100644
index 00000000000..c9da0d2cbb5
--- /dev/null
+++ b/pkgs/servers/samba/smb.conf
@@ -0,0 +1,271 @@
+# This is the main Samba configuration file. You should read the
+# smb.conf(5) manual page in order to understand the options listed
+# here. Samba has a huge number of configurable options (perhaps too
+# many!) most of which are not shown in this example
+#
+# For a step to step guide on installing, configuring and using samba, 
+# read the Samba-HOWTO-Collection. This may be obtained from:
+#  http://www.samba.org/samba/docs/Samba-HOWTO-Collection.pdf
+#
+# Many working examples of smb.conf files can be found in the 
+# Samba-Guide which is generated daily and can be downloaded from: 
+#  http://www.samba.org/samba/docs/Samba-Guide.pdf
+#
+# Any line which starts with a ; (semi-colon) or a # (hash) 
+# is a comment and is ignored. In this example we will use a #
+# for commentry and a ; for parts of the config file that you
+# may wish to enable
+#
+# NOTE: Whenever you modify this file you should run the command "testparm"
+# to check that you have not made any basic syntactic errors. 
+#
+#======================= Global Settings =====================================
+[global]
+
+# workgroup = NT-Domain-Name or Workgroup-Name, eg: MIDEARTH
+   workgroup = NIXOSGROUP
+
+# server string is the equivalent of the NT Description field
+   server string = Samba Server
+
+# Security mode. Defines in which mode Samba will operate. Possible 
+# values are share, user, server, domain and ads. Most people will want 
+# user level security. See the Samba-HOWTO-Collection for details.
+   security = user
+
+# This option is important for security. It allows you to restrict
+# connections to machines which are on your local network. The
+# following example restricts access to two C class networks and
+# the "loopback" interface. For more examples of the syntax see
+# the smb.conf man page
+;   hosts allow = 192.168.1. 192.168.2. 127.
+
+# If you want to automatically load your printer list rather
+# than setting them up individually then you'll need this
+   load printers = yes
+
+# you may wish to override the location of the printcap file
+;   printcap name = /etc/printcap
+
+# on SystemV system setting printcap name to lpstat should allow
+# you to automatically obtain a printer list from the SystemV spool
+# system
+;   printcap name = lpstat
+
+# It should not be necessary to specify the print system type unless
+# it is non-standard. Currently supported print systems include:
+# bsd, cups, sysv, plp, lprng, aix, hpux, qnx
+;   printing = cups
+
+# Uncomment this if you want a guest account, you must add this to /etc/passwd
+# otherwise the user "nobody" is used
+  guest account = smbguest
+
+# this tells Samba to use a separate log file for each machine
+# that connects
+   log file = /var/samba/sambalog/log.%m
+
+# Put a capping on the size of the log files (in Kb).
+   max log size = 50
+
+# Use password server option only with security = server
+# The argument list may include:
+#   password server = My_PDC_Name [My_BDC_Name] [My_Next_BDC_Name]
+# or to auto-locate the domain controller/s
+#   password server = *
+;   password server = <NT-Server-Name>
+
+# Use the realm option only with security = ads
+# Specifies the Active Directory realm the host is part of
+;   realm = MY_REALM
+
+# Backend to store user information in. New installations should 
+# use either tdbsam or ldapsam. smbpasswd is available for backwards 
+# compatibility. tdbsam requires no further configuration.
+   passdb backend = tdbsam:/var/samba/passdb.tdb
+
+# Using the following line enables you to customise your configuration
+# on a per machine basis. The %m gets replaced with the netbios name
+# of the machine that is connecting.
+# Note: Consider carefully the location in the configuration file of
+#       this line.  The included file is read at that point.
+;   include = /usr/local/samba/lib/smb.conf.%m
+
+# Configure Samba to use multiple interfaces
+# If you have multiple network interfaces then you must list them
+# here. See the man page for details.
+;   interfaces = 192.168.12.2/24 192.168.13.2/24 
+
+# Browser Control Options:
+# set local master to no if you don't want Samba to become a master
+# browser on your network. Otherwise the normal election rules apply
+;   local master = no
+
+# OS Level determines the precedence of this server in master browser
+# elections. The default value should be reasonable
+;   os level = 33
+
+# Domain Master specifies Samba to be the Domain Master Browser. This
+# allows Samba to collate browse lists between subnets. Don't use this
+# if you already have a Windows NT domain controller doing this job
+;   domain master = yes 
+
+# Preferred Master causes Samba to force a local browser election on startup
+# and gives it a slightly higher chance of winning the election
+;   preferred master = yes
+
+# Enable this if you want Samba to be a domain logon server for 
+# Windows95 workstations. 
+;   domain logons = yes
+
+# if you enable domain logons then you may want a per-machine or
+# per user logon script
+# run a specific logon batch file per workstation (machine)
+;   logon script = %m.bat
+# run a specific logon batch file per username
+;   logon script = %U.bat
+
+# Where to store roving profiles (only for Win95 and WinNT)
+#        %L substitutes for this servers netbios name, %U is username
+#        You must uncomment the [Profiles] share below
+;   logon path = \\%L\Profiles\%U
+
+# Windows Internet Name Serving Support Section:
+# WINS Support - Tells the NMBD component of Samba to enable it's WINS Server
+;   wins support = yes
+
+# WINS Server - Tells the NMBD components of Samba to be a WINS Client
+#	Note: Samba can be either a WINS Server, or a WINS Client, but NOT both
+;   wins server = w.x.y.z
+
+# WINS Proxy - Tells Samba to answer name resolution queries on
+# behalf of a non WINS capable client, for this to work there must be
+# at least one	WINS Server on the network. The default is NO.
+;   wins proxy = yes
+
+# DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names
+# via DNS nslookups. The default is NO.
+   dns proxy = no 
+
+# These scripts are used on a domain controller or stand-alone 
+# machine to add or delete corresponding unix accounts
+;  add user script = /usr/sbin/useradd %u
+;  add group script = /usr/sbin/groupadd %g
+;  add machine script = /usr/sbin/adduser -n -g machines -c Machine -d /dev/null -s /bin/false %u
+;  delete user script = /usr/sbin/userdel %u
+;  delete user from group script = /usr/sbin/deluser %u %g
+;  delete group script = /usr/sbin/groupdel %g
+
+
+#============================ Share Definitions ==============================
+[homes]
+   comment = Home Directories
+   browseable = yes
+   writable = yes
+
+# Un-comment the following and create the netlogon directory for Domain Logons
+; [netlogon]
+;   comment = Network Logon Service
+;   path = /usr/local/samba/lib/netlogon
+;   guest ok = yes
+;   writable = no
+;   share modes = no
+
+
+# Un-comment the following to provide a specific roving profile share
+# the default is to use the user's home directory
+;[Profiles]
+;    path = /usr/local/samba/profiles
+;    browseable = no
+;    guest ok = yes
+
+
+# NOTE: If you have a BSD-style print system there is no need to 
+# specifically define each individual printer
+[printers]
+   comment = All Printers
+   path = /usr/spool/samba
+   browseable = no
+# Set public = yes to allow user 'guest account' to print
+   guest ok = no
+   writable = no
+   printable = yes
+
+# This one is useful for people to share files
+;[tmp]
+;   comment = Temporary file space
+;   path = /tmp
+;   read only = no
+;   public = yes
+
+# A publicly accessible directory, but read only, except for people in
+# the "staff" group
+;[public]
+;   comment = Public Stuff
+;   path = /home/samba
+;   public = yes
+;   writable = yes
+;   printable = no
+;   write list = @staff
+
+# Other examples. 
+#
+# A private printer, usable only by fred. Spool data will be placed in fred's
+# home directory. Note that fred must have write access to the spool directory,
+# wherever it is.
+;[fredsprn]
+;   comment = Fred's Printer
+;   valid users = fred
+;   path = /homes/fred
+;   printer = freds_printer
+;   public = no
+;   writable = no
+;   printable = yes
+
+# A private directory, usable only by fred. Note that fred requires write
+# access to the directory.
+;[fredsdir]
+;   comment = Fred's Service
+;   path = /usr/somewhere/private
+;   valid users = fred
+;   public = no
+;   writable = yes
+;   printable = no
+
+# a service which has a different directory for each machine that connects
+# this allows you to tailor configurations to incoming machines. You could
+# also use the %U option to tailor it by user name.
+# The %m gets replaced with the machine name that is connecting.
+;[pchome]
+;  comment = PC Directories
+;  path = /usr/pc/%m
+;  public = no
+;  writable = yes
+
+# A publicly accessible directory, read/write to all users. Note that all files
+# created in the directory by users will be owned by the default user, so
+# any user with access can delete any other user's files. Obviously this
+# directory must be writable by the default user. Another user could of course
+# be specified, in which case all files would be owned by that user instead.
+;[public]
+;   path = /usr/somewhere/else/public
+;   public = yes
+;   only guest = yes
+;   writable = yes
+;   printable = no
+
+# The following two entries demonstrate how to share a directory so that two
+# users can place files there that will be owned by the specific users. In this
+# setup, the directory should be writable by both users and should have the
+# sticky bit set on it to prevent abuse. Obviously this could be extended to
+# as many users as required.
+;[myshare]
+;   comment = Mary's and Fred's stuff
+;   path = /usr/somewhere/shared
+;   valid users = mary fred
+;   public = no
+;   writable = yes
+;   printable = no
+;   create mask = 0765
+
+
diff --git a/pkgs/servers/sql/mysql5/default.nix b/pkgs/servers/sql/mysql5/default.nix
index d76a81184d2..89107d10864 100644
--- a/pkgs/servers/sql/mysql5/default.nix
+++ b/pkgs/servers/sql/mysql5/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ps, ncurses, zlib ? null, perl}:
+args: with args;
 
 # Note: zlib is not required; MySQL can use an internal zlib.
 
@@ -10,7 +10,8 @@ stdenv.mkDerivation {
     sha256 = "e4443d8dc859ed53bd9f3bef143ce30c7f5dee66a02748e9a003136be25e0060";
   };
 
-  buildInputs = [ps ncurses zlib perl];
+  buildInputs = [ps ncurses zlib perl openssl];
+  postInstall = "ln -s mysqld_safe $out/bin/mysqld";
 
-  configureFlags = "--enable-thread-safe-client";
+  configureFlags = "--enable-thread-safe-client --with-embedded-server --disable-static --with-openssl=${openssl} --with-berkeley-db";
 }
diff --git a/pkgs/servers/sql/postgresql/8.2.6.nix b/pkgs/servers/sql/postgresql/8.2.6.nix
new file mode 100644
index 00000000000..f5ce8741f86
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/8.2.6.nix
@@ -0,0 +1,14 @@
+args: with args;
+
+stdenv.mkDerivation rec {
+  name = "postgresql-" + version;
+  LC_ALL = "en_US";
+
+  src = fetchurl {
+    url = "ftp://ftp.de.postgresql.org/mirror/postgresql/source/v${version}/${name}.tar.bz2";
+    sha256="056ixbsfmdwhniryc0mr1kl66jywkqqhqvjdi7i3v4qzh9z34hgf";
+  };
+
+  passthru = { inherit readline; };
+  buildInputs = [zlib ncurses readline];
+}
diff --git a/pkgs/servers/sql/postgresql/8.3.0.nix b/pkgs/servers/sql/postgresql/8.3.0.nix
new file mode 100644
index 00000000000..04244fff85b
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/8.3.0.nix
@@ -0,0 +1,14 @@
+args: with args;
+
+stdenv.mkDerivation rec {
+  name = "postgresql-" + version;
+  LC_ALL = "en_US";
+
+  src = fetchurl {
+    url = "ftp://ftp.de.postgresql.org/mirror/postgresql/source/v${version}/${name}.tar.bz2";
+    sha256="19kf0q45d5zd1rxffin0iblizckk8cp6fpgb52sipqkpnmm6sdc5";
+  };
+
+  passthru = { inherit readline; };
+  buildInputs = [zlib ncurses readline];
+}
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index a46f99e454b..d04712d3418 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -5,14 +5,21 @@ assert ncurses != null;
 assert readline != null;
 
 stdenv.mkDerivation {
-  name = "postgresql-8.2.6";
-  builder = ./builder.sh;
+  name = "postgresql-8.3.0";
 
   src = fetchurl {
-    url = ftp://ftp.de.postgresql.org/mirror/postgresql/source/v8.2.6/postgresql-8.2.6.tar.bz2;
-    sha256="056ixbsfmdwhniryc0mr1kl66jywkqqhqvjdi7i3v4qzh9z34hgf";
+    url = http://ftp2.nl.postgresql.org/source/v8.3.0/postgresql-8.3.0.tar.bz2;
+    sha256 = "19kf0q45d5zd1rxffin0iblizckk8cp6fpgb52sipqkpnmm6sdc5";
   };
 
   inherit readline;
+  
   buildInputs = [zlib ncurses readline];
+
+  LANG = "en_US"; # is this needed anymore?
+
+  meta = {
+    description = "The world's most advanced open source database";
+    homepage = http://www.postgresql.org/;
+  };
 }
diff --git a/pkgs/servers/x11/xorg/builder.sh b/pkgs/servers/x11/xorg/builder.sh
index 0a145cc0a6c..8bde2867e10 100644
--- a/pkgs/servers/x11/xorg/builder.sh
+++ b/pkgs/servers/x11/xorg/builder.sh
@@ -4,13 +4,11 @@ source $stdenv/setup
 
 # After installation, automatically add all "Requires" fields in the
 # pkgconfig files (*.pc) to the propagated build inputs.
-if test -n "$postInstall"; then
-	postInstall="$postInstall; autoPropagateBuildInputs"
-else
-	postInstall=autoPropagateBuildInputs
-fi
+origPostInstall=$postInstall
+postInstall=postInstall
+postInstall() {
+    if test -n "$origPostInstall"; then eval "$origPostInstall"; fi
 
-autoPropagateBuildInputs() {
     local r p requires
     requires=$(grep "Requires:" $out/lib/pkgconfig/*.pc | \
         sed "s/Requires://" | sed "s/,/ /g")
diff --git a/pkgs/servers/xmpp/ejabberd/builder.sh b/pkgs/servers/xmpp/ejabberd/builder.sh
index 4abf8da0682..3d746054f38 100644
--- a/pkgs/servers/xmpp/ejabberd/builder.sh
+++ b/pkgs/servers/xmpp/ejabberd/builder.sh
@@ -3,7 +3,7 @@ buildInputs="$expat $erlang $zlib $openssl"
 source $stdenv/setup
 
 tar xfvz $src
-cd $name/src
+cd ejabberd-*/src
 ./configure --prefix=$out
 make
 make install
diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix
index 8ce1b0912de..c3c88337c5d 100644
--- a/pkgs/servers/xmpp/ejabberd/default.nix
+++ b/pkgs/servers/xmpp/ejabberd/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, expat, erlang, zlib, openssl}:
 
 stdenv.mkDerivation {
-  name = "ejabberd-1.1.4";
+  name = "ejabberd-2.0.0-rc1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.process-one.net/downloads/ejabberd/1.1.4/ejabberd-1.1.4.tar.gz;
-    md5 = "65e9cd346f11a28afbacfe1d7be3a33b";
+    url = http://www.process-one.net/downloads/ejabberd/2.0.0-rc1/ejabberd-2.0.0-rc1.tar.gz;
+    sha256 = "02ldssvsy0rkvxm96018fpk5lc3iqgkrira9cw1ym2snas0k8nzy";
   };
   inherit expat erlang zlib openssl;
 }