Updating from trunk. I had to resolve the pcre and some stdenv2 in all-packages

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

pkgs/tools/networking/nss-mdns/default.nix

@@ -1,25 +1,24 @@
-{ fetchurl, stdenv, avahi }:
+{ fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
   name = "nss-mdns-0.10";
+
   src = fetchurl {
     url = "http://0pointer.de/lennart/projects/nss-mdns/${name}.tar.gz";
     sha256 = "0vgs6j0qsl0mwzh5a0m0bykr7x6bx79vnbyn0r3q289rghp3qs0y";
   };
 
-  configureFlags = "--enable-avahi";
-
   # Note: Although `nss-mdns' works by talking to `avahi-daemon', it
   # doesn't depend on the Avahi libraries.  Instead, it contains
   # hand-written D-Bus code to talk to the Avahi daemon.
 
-  buildInput = [ avahi ];
+  configureFlags =
+    [ # Try to use the Avahi daemon before resolving on our own.
+      "--enable-avahi"
 
-  patchPhase = ''
-    substituteInPlace "src/Makefile.in"						\
-      --replace 'AVAHI_SOCKET=\"$(localstatedir)/run/avahi-daemon/socket\"'	\
-                'AVAHI_SOCKET=\"${avahi}/var/run/avahi-daemon/socket\"'
-  '';
+      # Connect to the daemon at `/var/run/avahi-daemon/socket'.
+      "--localstatedir=/var"
+    ];
 
   meta = {
     description = "The mDNS Name Service Switch (NSS) plug-in";
@@ -33,5 +32,10 @@ stdenv.mkDerivation rec {
 
     homepage = http://0pointer.de/lennart/projects/nss-mdns/;
     license = "LGPLv2+";
+
+    # Supports both the GNU and FreeBSD NSS.
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.freebsd;
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
   };
 }

pkgs/tools/networking/ntp/default.nix

@@ -3,11 +3,11 @@
 assert stdenv.isLinux -> libcap != null;
  
 stdenv.mkDerivation rec {
-  name = "ntp-4.2.6";
+  name = "ntp-4.2.6p2";
   
   src = fetchurl {
     url = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz";
-    sha256 = "04cam5l804ws6cs0ihlmx26n39vpap5wb39i1vxfff01mri4q38b";
+    sha256 = "1n79scfvgjk8hn1fr4q2kkk6xm83k68r4p488ai09nm20dwqp2a2";
   };
   
   configureFlags = ''

pkgs/tools/networking/x11-ssh-askpass/default.nix

@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation {
   name = "x11-ssh-askpass-1.2.4.1";
- 
+
   src = fetchurl {
     url = http://www.jmknoble.net/software/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1.tar.gz;
     sha1 = "78c992951685d4dbffb77536f37b83ae2a6eafc7";
@@ -15,4 +15,12 @@ stdenv.mkDerivation {
   buildPhase = "xmkmf; make includes; make";
 
   buildInputs = [x11 imake];
+
+  meta = {
+    homepage = "http://www.jmknoble.net/software/x11-ssh-askpass/";
+    description = "Lightweight passphrase dialog for OpenSSH or other open variants of SSH";
+
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [];
+  };
 }