* Sync with the trunk.

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

pkgs/servers/dico/default.nix

@@ -0,0 +1,43 @@
+{ fetchurl, stdenv, libtool, gettext, zlib, readline, guile, python }:
+
+stdenv.mkDerivation rec {
+  name = "dico-2.0";
+
+  src = fetchurl {
+    url = "mirror://gnu/dico/${name}.tar.gz";
+    sha256 = "03cpg16jbsv5xh9mvyjj7myvpdpb82354a1yjrhcy0k5w8faa9kv";
+  };
+
+  # XXX: Add support for GNU SASL.
+  buildInputs = [ libtool gettext zlib readline guile python ];
+
+  doCheck = true;
+
+  meta = {
+    description = "GNU Dico, a flexible dictionary server and client implementing RFC 2229";
+
+    longDescription = ''
+      GNU Dico is a flexible modular implementation of DICT server
+      (RFC 2229).  In contrast to another existing servers, it does
+      not depend on particular database format, instead it handles
+      database accesses using loadable modules.
+
+      The package includes several loadable modules for interfacing
+      with various database formats, among them a module for dict.org
+      databases and a module for transparently accessing Wikipedia or
+      Wiktionary sites as a dictionary database.
+
+      New modules can easily be written in C, Guile or Python.  The
+      module API is mature and well documented.
+
+      A web interface serving several databases is available.
+
+      The package also includes a console client program for querying
+      remote dictionary servers.
+    '';
+
+    homepage = http://www.gnu.org/software/dico/;
+
+    license = "GPLv3+";
+  };
+}

pkgs/servers/http/nginx/default.nix

@@ -4,7 +4,7 @@ let
   fetchurl = args.fetchurl;
   FullDepEntry = args.FullDepEntry;
 
-  version = lib.getAttr ["version"] "0.7.23" args; 
+  version = lib.getAttr ["version"] "0.7.47" args; 
   buildInputs = with args; [
     openssl zlib pcre libxml2 libxslt
   ];
@@ -12,7 +12,7 @@ in
 rec {
   src = fetchurl {
     url = "http://sysoev.ru/nginx/nginx-${version}.tar.gz";
-    sha256 = "1fygkagzclfqygipgi140jf3aiwqn8yqxjmk181i31p4di5m46rk";
+    sha256 = "0wcb5qmvlp2b9vfz8b897gk783bwp55kprxg4gss1i9r72jdp16a";
   };
 
   inherit buildInputs;

pkgs/servers/samba/default.nix

@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "samba-3.2.7";
+  name = "samba-3.3.3";
 
   src = fetchurl {
-    url = http://us3.samba.org/samba/ftp/stable/samba-3.3.2.tar.gz;
-    sha256 = "1b4fa9fbe7ccced6cca449c4b0b9fba65ffd2ad63b1f0bf2507e943281461477";
+    url = "http://us3.samba.org/samba/ftp/stable/${name}.tar.gz";
+    sha256 = "08x3ng7ls5c1a95v7djx362i55wdlmnvarpr7rhng5bb55s9n5qn";
   };
 
   buildInputs = [readline pam openldap kerberos popt iniparser libunwind fam acl];
@@ -21,8 +21,11 @@ stdenv.mkDerivation rec {
   
   configureFlags = ''
     --with-pam
-    --with-smbmount
+    --with-cifsmount
     --with-aio-support
-    ${if (stdenv.gcc.libc != null) then "--with-libiconv=${stdenv.gcc.libc}" else ""}
+    --with-pam_smbpass
+    --disable-swat
+    --enable-shared-libs
+    ${if stdenv.gcc.libc != null then "--with-libiconv=${stdenv.gcc.libc}" else ""}
   '';
 }

pkgs/servers/sql/mysql5/default.nix

@@ -1,4 +1,4 @@
-args: with args;
+{stdenv, fetchurl, ps, ncurses, zlib, perl, openssl}:
 
 # Note: zlib is not required; MySQL can use an internal zlib.
 
@@ -11,7 +11,17 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ps ncurses zlib perl openssl];
-  postInstall = "ln -s mysqld_safe $out/bin/mysqld";
+  
+  configureFlags = "--enable-thread-safe-client --disable-static --with-openssl=${openssl} --with-berkeley-db --with-embedded-server";
 
-  configureFlags = "--enable-thread-safe-client --with-embedded-server --disable-static --with-openssl=${openssl} --with-berkeley-db";
+  postInstall =
+    ''
+      ln -s mysqld_safe $out/bin/mysqld
+      rm -rf $out/mysql-test $out/sql-bench $out/share/info
+    '';
+
+  meta = {
+    homepage = http://www.mysql.com/;
+    description = "The world's most popular open source database";
+  };
 }