* Sync with the trunk.

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

8 files changed, 32 insertions, 44 deletions

diff --git a/pkgs/servers/dict/1.9.15.nix b/pkgs/servers/dict/1.9.15.nix
index 2886bb24ae9..9eb0fe3dff9 100644
--- a/pkgs/servers/dict/1.9.15.nix
+++ b/pkgs/servers/dict/1.9.15.nix
@@ -16,9 +16,7 @@ stdenv.mkDerivation rec {
                 (textClosure localDefs 
                         [doConfigure doMakeInstall doForceShare doPropagate]);
         meta = {
-                description = "
-                Dict protocol server and client.
-";
+                description = "Dict protocol server and client";
                 inherit src;
         };
 }
diff --git a/pkgs/servers/dict/dictd-db.nix b/pkgs/servers/dict/dictd-db.nix
index 9eb89361c35..6b981f0c4de 100644
--- a/pkgs/servers/dict/dictd-db.nix
+++ b/pkgs/servers/dict/dictd-db.nix
@@ -23,9 +23,7 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs 
 			[doInstall doForceShare doPropagate]);
 	meta = {
-		description = "
-		${name} dictionary for dictd.
-";
+		description = "${name} dictionary for dictd";
 		inherit src;
 	};
 };
diff --git a/pkgs/servers/gpm/1.20.3pre6.nix b/pkgs/servers/gpm/1.20.6.nix
index fd7a5a2382f..6343234803d 100644
--- a/pkgs/servers/gpm/1.20.3pre6.nix
+++ b/pkgs/servers/gpm/1.20.6.nix
@@ -1,8 +1,8 @@
 args : with args; 
 rec {
   src = fetchurl {
-    url = http://linux.schottelius.org/gpm/archives/releases-2008/gpm-1.20.3pre6.tar.lzma;
-    sha256 = "0sps9987w7daxfkbavzyi694n7ggf1wd5lh81nwka87m90q7rah7";
+    url = http://linux.schottelius.org/gpm/archives/gpm-1.20.6.tar.lzma;
+    sha256 = "13w61bh9nyjaa0n5a7qq1rvbqxjbxpqz5qmdmqqpqgrd2jlviar7";
   };
 
   buildInputs = [lzma flex bison ncurses];
diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix
index 572cc28e55b..e428f4d649f 100644
--- a/pkgs/servers/irc/ircd-hybrid/default.nix
+++ b/pkgs/servers/irc/ircd-hybrid/default.nix
@@ -1,4 +1,5 @@
 args: with args;
+
 stdenv.mkDerivation {
   name = "ircd-hybrid-7.2.2";
 
@@ -9,15 +10,12 @@ stdenv.mkDerivation {
 
   buildInputs = [openssl zlib];
 
-  configureFlags =  ["--with-nicklen=100" 
-	"--with-topiclen=360" 
-	("--enable-openssl=" + openssl)];
+  configureFlags =
+    "--with-nicklen=100 --with-topiclen=360 --enable-openssl=${openssl}";
 
   preInstall = "mkdir -p \${out}/ ; ln -s /home/ircd \${out}/logs;";
 
   meta = {
-    description = "
-	An IPv6-capable IRC server.
-";
+    description = "An IPv6-capable IRC server";
   };
 }
diff --git a/pkgs/servers/sql/mysql5/default.nix b/pkgs/servers/sql/mysql5/default.nix
index 89107d10864..d8f3559ed35 100644
--- a/pkgs/servers/sql/mysql5/default.nix
+++ b/pkgs/servers/sql/mysql5/default.nix
@@ -3,11 +3,11 @@ args: with args;
 # Note: zlib is not required; MySQL can use an internal zlib.
 
 stdenv.mkDerivation {
-  name = "mysql-5.0.45";
+  name = "mysql-5.0.77";
 
   src = fetchurl {
-    url = http://downloads.mysql.com/archives/mysql-5.0/mysql-5.0.45.tar.gz;
-    sha256 = "e4443d8dc859ed53bd9f3bef143ce30c7f5dee66a02748e9a003136be25e0060";
+    url = http://downloads.mysql.com/archives/mysql-5.0/mysql-5.0.77.tar.gz;
+    sha256 = "1s0m991aynim8ny28cfwhjw0ly8j5d72xi00461w6yc2hlaijcd9";
   };
 
   buildInputs = [ps ncurses zlib perl openssl];
diff --git a/pkgs/servers/squid/squids.nix b/pkgs/servers/squid/squids.nix
index beffef17336..45d289537ce 100644
--- a/pkgs/servers/squid/squids.nix
+++ b/pkgs/servers/squid/squids.nix
@@ -1,38 +1,36 @@
 args: with args;
 let edf = composableDerivation.edf; in
 rec {
-  squid30 = composableDerivation.composableDerivation {
-    initial = {
-      name = "squid-3.0-stable5";
+  squid30 = composableDerivation.composableDerivation {} {
+    name = "squid-3.0-stable5";
 
-      buildInputs = [perl];
+    buildInputs = [perl];
 
-      src = args.fetchurl {
-        url = http://www.squid-cache.org/Versions/v3/3.0/squid-3.0.STABLE5.tar.bz2;
-        sha256 = "1m4ccpjw30q9vwsycmgg9dmhly0mpznvxrch6f7dxgfzpjp26l7w";
-      };
-
-      configureFlags = ["--enable-ipv6"];
+    src = args.fetchurl {
+      url = http://www.squid-cache.org/Versions/v3/3.0/squid-3.0.STABLE5.tar.bz2;
+      sha256 = "1m4ccpjw30q9vwsycmgg9dmhly0mpznvxrch6f7dxgfzpjp26l7w";
+    };
 
-      meta = {
-        description = "http-proxy";
-        homepage = "http://www.squid-cache.org";
-        license = "GPL2";
-      };
+    configureFlags = ["--enable-ipv6"];
 
+    meta = {
+      description = "http-proxy";
+      homepage = "http://www.squid-cache.org";
+      license = "GPL2";
     };
+
   };
 
-  squid3Beta = squid30.passthru.funMerge {
+  squid3Beta = squid30.merge {
     name = "squid-3.1-beta";
     src = args.fetchurl {
-      url = http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.0.3.tar.bz2;
-      sha256 = "0khc4w9sbdwzxw8285z60ymz15q5qjy7b8yvvfnzfkihdacs735x";
+      url = http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.0.6.tar.bz2;
+      sha256 = "0crkfd5kc677baq0v6kfnwh0rc7h2a1083yh0sccy7g02vd7z3q5";
     };
     configureFlags = ["--enable-ipv6"];
   };
 
-  squid3Head = squid3Beta.passthru.funMerge {
+  squid3Head = squid3Beta.merge {
     name = "squid-3.1-HEAD";
     src = args.fetchurl {
       url = http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.0.3-20081221.tar.bz2;
diff --git a/pkgs/servers/xmpp/openfire/3.4.5.nix b/pkgs/servers/xmpp/openfire/3.4.5.nix
index 3bb69b37341..a8d7360d8d6 100644
--- a/pkgs/servers/xmpp/openfire/3.4.5.nix
+++ b/pkgs/servers/xmpp/openfire/3.4.5.nix
@@ -26,9 +26,7 @@ stdenv.mkDerivation rec {
     (textClosure localDefs 
       [ installPhase doForceShare doPropagate]);
   meta = {
-    description = "
-    XMPP server in Java.
-";
-		inherit src;
+    description = "XMPP server in Java";
+    inherit src;
   };
 }
diff --git a/pkgs/servers/xmpp/openfire/3.5.2.nix b/pkgs/servers/xmpp/openfire/3.5.2.nix
index 23f6f348a11..30e44b5771f 100644
--- a/pkgs/servers/xmpp/openfire/3.5.2.nix
+++ b/pkgs/servers/xmpp/openfire/3.5.2.nix
@@ -26,9 +26,7 @@ stdenv.mkDerivation rec {
     (textClosure localDefs 
       [ installPhase doForceShare doPropagate]);
   meta = {
-    description = "
-    XMPP server in Java.
-";
-		inherit src;
+    description = "XMPP server in Java";
+    inherit src;
   };
 }