* Sync with the trunk.

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

pkgs/development/compilers/ocaml/default.nix

@@ -1,7 +1,8 @@
 args:
-args.stdenv.lib.listOfListsToAttrs [
-	[ "3.08.0" (import ./3.08.0.nix args) ]
-	[ "3.09.1" (import ./3.09.1.nix args) ]
-	[ "3.10.0" (import ./3.10.0.nix args) ]
-	[ "default" (import ./3.09.1.nix args) ]
+
+builtins.listToAttrs [
+  { name = "3.08.0"; value = import ./3.08.0.nix args; }
+  { name = "3.09.1"; value = import ./3.09.1.nix args; }
+  { name = "3.10.0"; value = import ./3.10.0.nix args; }
+  { name = "default"; value = import ./3.09.1.nix args; }
 ]

pkgs/development/interpreters/python-new/2.5/default.nix

@@ -124,7 +124,7 @@ in
       buildPhase = ''python setup.py $setupFlags build'';
       installPhase = ''python setup.py $setupFlags install --prefix=$out'';
       mergeAttrBy = {
-        setupFlags = lib.concatList;
+        setupFlags = lib.concat;
       };
     };
 
@@ -219,8 +219,8 @@ in
         done
       '';
       mergeAttrBy = {
-        phases = lib.concatList;
-        pySrcs = lib.concatList;
+        phases = lib.concat;
+        pySrcs = lib.concat;
         pyCheck = x : y : "${x}\n${y}";
       };
     }

pkgs/development/libraries/acl/default.nix

@@ -4,10 +4,12 @@ stdenv.mkDerivation {
   name = "acl-2.2.47";
 
   src = fetchurl {
-    url = ftp://oss.sgi.com/projects/xfs/cmd_tars/acl_2.2.47-1.tar.gz;
+    # The file cannot be downloaded from sgi.com.
+    #url = ftp://oss.sgi.com/projects/xfs/cmd_tars/acl_2.2.47-1.tar.gz;
+    url = "http://gentoo.chem.wisc.edu/gentoo/distfiles/acl_2.2.47-1.tar.gz";
     sha256 = "1j39g62fki0iyji9s62slgwdfskpkqy7rmjlqcnmsvsnxbxhc294";
   };
-  
+
   buildInputs = [gettext attr libtool];
 
   configureFlags = "MAKE=make LIBTOOL=libtool MSGFMT=msgfmt MSGMERGE=msgmerge XGETTEXT=xgettext ZIP=gzip ECHO=echo SED=sed AWK=gawk";

pkgs/development/libraries/attr/default.nix

@@ -4,13 +4,15 @@ stdenv.mkDerivation {
   name = "attr-2.4.41";
 
   src = fetchurl {
-    url = ftp://oss.sgi.com/projects/xfs/cmd_tars/attr_2.4.41-1.tar.gz;
+    # The file cannot be downloaded from sgi.com.
+    #url = ftp://oss.sgi.com/projects/xfs/cmd_tars/attr_2.4.41-1.tar.gz;
+    url = "http://gentoo.chem.wisc.edu/gentoo/distfiles/attr_2.4.41-1.tar.gz";
     sha256 = "0dc286g8vr402aca6wg945sdm92bys8a142vrkwx6bkjz4bwz6gp";
   };
 
   buildInputs = [libtool gettext];
-  
+
   configureFlags = "MAKE=make LIBTOOL=libtool MSGFMT=msgfmt MSGMERGE=msgmerge XGETTEXT=xgettext ECHO=echo SED=sed AWK=gawk";
-  
+
   installTargets = "install install-lib install-dev";
 }

pkgs/development/libraries/boost/1.38.0.nix

@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, icu, expat, zlib, bzip2, python, version }:
+
+assert version == "1.38.0";
+
+stdenv.mkDerivation {
+  name = "boost-1.38.0";
+  meta = {
+    homepage = "http://boost.org/";
+    description = "Boost C++ Library Collection";
+    license = "boost-license";
+  };
+  src = fetchurl {
+    url = "mirror://sourceforge/boost/boost_1_38_0.tar.bz2";
+    sha256 = "0rk044s4m7l4sma6anml34vxcd9w0fzcy1cy7csbzynjyida9qry";
+  };
+  buildInputs = [icu expat zlib bzip2 python];
+  preConfigure =
+    "sed -e 's@^BJAM_CONFIG=\"\"@BJAM_CONFIG=\"-sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=system variant=debug,release threading=single,multi link=shared,static\"@g' -i configure";
+  configureFlags = "--with-icu=${icu} --with-python=${python}";
+}

pkgs/development/libraries/eventlog/default.nix

@@ -0,0 +1,15 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "eventlog-0.2.9";
+  src = fetchurl {
+    url = "http://www.balabit.com/downloads/files/eventlog/0.2/eventlog_0.2.9.tar.gz";
+    sha256 = "1cairmv47b66blrxwrgf4qwabfflak9b1dwkiyxnc9rj5svnq50m";
+  };
+
+  meta = {
+    description = "A new API to format and send structured log messages.";
+    homepage = "http://www.balabit.com/support/community/products/";
+    license = "BSD";
+  };
+}

pkgs/development/libraries/libpcap/default.nix

@@ -1,16 +1,23 @@
 {stdenv, fetchurl, flex, bison}:
 
 stdenv.mkDerivation rec {
-  name = "libpcap-0.9.4";
+  name = "libpcap-1.0.0";
   src = fetchurl {
       url = [
        "mirror://tcpdump/release/${name}.tar.gz"
        "http://www.sfr-fresh.com/unix/misc/${name}.tar.gz"
       ];
-      sha256 = "0q0cnn607kfa4y4rbz3glg5lfr8r08s8l08w8fwrr3d6njjzd71p";
+      sha256 = "1h3kmj485qz1i08xs4sc3a0bmhs1rvq0h7gycs7paap2szhw8552";
   };
   buildInputs = [flex bison];
-  configureFlags = "
-    ${if stdenv.system == "i686-linux" then "--with-pcap=linux" else ""}
-  ";
+  configureFlags = [
+      "${if stdenv.system == "i686-linux" then "--with-pcap=linux" else ""}"
+       "--with-pcap=linux"
+  ];
+
+  preInstall = ''ensureDir $out/bin'';
+  patches = if stdenv.system == "i686-linux"
+      then []
+      else [ ./libpcap_amd64.patch ];
+
 }

pkgs/development/libraries/log4cxx/default.nix

@@ -1,11 +1,11 @@
-args: with args;
+{stdenv, fetchurl, autoconf, automake, libtool, libxml2, cppunit, boost,
+ apr, aprutil, db45, expat}:
 
 stdenv.mkDerivation {
-	name = "log4cxx-0.9.7";
-	src = fetchurl {
-		url = http://archive.apache.org/dist/logging/log4cxx/log4cxx-0.9.7.tar.gz;
-		sha256 = "1ikyxd8jgf7b2cqjk5lidl7cffs114iiblaczaqbv5bm4vyb4hav";
-	};
-	buildInputs = [ autoconf automake libtool libxml2 cppunit boost ];
-	patchPhase = "sh autogen.sh; sed -e 's/DOMConfigurator::subst/subst/' -i include/log4cxx/xml/domconfigurator.h";
+  name = "log4cxx-0.10.0";
+  src = fetchurl {
+    url = http://apache.mirrors.hoobly.com/logging/log4cxx/0.10.0/apache-log4cxx-0.10.0.tar.gz;    
+    sha256 = "130cjafck1jlqv92mxbn47yhxd2ccwwnprk605c6lmm941i3kq0d";
+  };
+  buildInputs = [ autoconf automake libtool libxml2 cppunit boost apr aprutil db45 expat];
 }

pkgs/development/libraries/qt-4/default.nix

@@ -1,13 +1,15 @@
 args: with args;
+
 stdenv.mkDerivation {
-  name = "qt-4.4.0";
+  name = "qt-4.4.3";
   
   src = fetchurl {
-    url = ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.4.0.tar.bz2;
-    sha256 = "871dc71c6c905212f2fea7e6598362114a3b6097c220b0b251f8d159ee7d706e";
+    url = ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.4.3.tar.bz2;
+    sha256 = "1nfdf1aj6vb7qyacsnjyjxrnaf44hz7vzykf6zra2znd87pglz51";
   };
   
-  setupHook = ./setup-hook.sh;  
+  setupHook = ./setup-hook.sh;
+  
   propagatedBuildInputs = [
     libXft 
     libXrender 
@@ -37,14 +39,32 @@ stdenv.mkDerivation {
     glib 
     libtiff
   ];
+  
   prefixKey = "-prefix ";
-  configureFlags = "
+  
+  configureFlags = ''
     -v -no-separate-debug-info -release
     -system-zlib -system-libpng -system-libjpeg -fast
     -qt-gif -confirm-license
     -opengl -xrender -xrandr -xinerama -xcursor -qt-sql-mysql
     -qdbus -cups -glib -xfixes
-    -fontconfig -I${freetype}/include/freetype2";
+    -fontconfig -I${freetype}/include/freetype2
+  '';
 
-  patchPhase = "sed -e 's@/bin/pwd@pwd@' -i configure; sed -e 's@/usr@/FOO@' -i config.tests/*/*.test -i mkspecs/*/*.conf";
+  patchPhase = ''
+    substituteInPlace configure --replace /bin/pwd pwd
+    sed -e 's@/usr@/FOO@' -i config.tests/*/*.test -i mkspecs/*/*.conf
+  '';
+
+  # Remove the documentation: it takes up >= 130 MB, which is more
+  # than half of the installed size.  Ideally we should put this in a
+  # separate package (as well as the Qt Designer).
+  postInstall = ''
+    rm -rf $out/share/doc
+  '';
+
+  meta = {
+    homepage = http://www.qtsoftware.com/downloads/opensource/appdev/linux-x11-cpp;
+    description = "A cross-platform application framework for C++";
+  };
 }

pkgs/development/libraries/qt-4/setup-hook.sh

@@ -1,6 +1,7 @@
 export QTDIR=@out@
+
 if [ -n $qt4BadIncludes ]; then
-	for d in @out@/include/*; do
-		export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$d";
-	done;
+    for d in @out@/include/*; do
+	export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$d";
+    done;
 fi

pkgs/development/libraries/vtk/default.nix

@@ -0,0 +1,16 @@
+{stdenv, fetchurl, cmake, mesa, libX11, xproto, libXt }:
+
+stdenv.mkDerivation {
+  name = "vtk-5.2.1";
+  src = fetchurl {
+    url = http://www.vtk.org/files/release/5.2/vtk-5.2.1.tar.gz;
+    sha256 = "c81521b3767a044745336212cbde500d6e97a1f8ba647bc590857e36f57003bb";
+  };
+  buildInputs = [ cmake mesa libX11 xproto libXt ];
+
+  meta = {
+    description = "Open source libraries for 3D computer graphics, image processing and visualization";
+    homepage = http://www.vtk.org/;
+    license = "BSD";
+  };
+}

pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix

@@ -0,0 +1,20 @@
+{fetchurl, buildPerlPackage, zlib}:
+
+buildPerlPackage rec {
+  name = "Compress-Raw-Zlib-2.015";
+    
+  src = fetchurl {
+    url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
+    sha256 = "0g6kz73jxqjfln2pi500y7rr96mhad16hrp5wy6542fapamv4xcd";
+  };
+    
+  preConfigure = ''
+    cat > config.in <<EOF
+      BUILD_ZLIB   = False
+      INCLUDE      = ${zlib}/include
+      LIB          = ${zlib}/lib
+      OLD_ZLIB     = False
+      GZIP_OS_CODE = AUTO_DETECT
+    EOF
+  '';
+}

pkgs/development/perl-modules/generic/builder.sh

@@ -2,14 +2,10 @@ source $stdenv/setup
 
 PERL5LIB="$PERL5LIB${PERL5LIB:+:}$out/lib/site_perl"
 
-oldIFS=$IFS
-IFS=:
 perlFlags=
-for i in $PERL5LIB; do
+for i in $(IFS=:; echo $PERL5LIB); do
     perlFlags="$perlFlags -I$i"
 done
-IFS=$oldIFS
-echo "Perl flags: $perlFlags"
 
 oldPreConfigure="$preConfigure"
 preConfigure=preConfigure
@@ -42,6 +38,15 @@ postFixup() {
     if test -e $out/nix-support/propagated-build-inputs; then
         ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages
     fi
+
+    # Some (broken?) packages install in $out/lib/${perlVersion}
+    # instead of $out/lib/site_perl/${perlVersion}.  Try to fix that
+    # automatically.
+    if ! test -e $out/lib/site_perl; then
+        echo "fixing wrong Perl installation path..."
+        ensureDir $out/lib/site_perl
+        mv $out/lib/5.* $out/lib/site_perl
+    fi
 }
 
 if test -n "$perlPreHook"; then

pkgs/development/perl-modules/generic/default.nix

@@ -2,8 +2,17 @@ perl:
 
 attrs:
 
-perl.stdenv.mkDerivation (attrs // {
-  name = "perl-" + attrs.name;
-  builder = ./builder.sh;
-  buildInputs = [(if attrs ? buildInputs then attrs.buildInputs else []) perl];
-})
+perl.stdenv.mkDerivation (
+  {
+    doCheck = true;
+    checkTarget = "test";
+  }
+  //
+  attrs
+  //
+  {
+    name = "perl-" + attrs.name;
+    builder = ./builder.sh;
+    buildInputs = [(if attrs ? buildInputs then attrs.buildInputs else []) perl];
+  }
+)

pkgs/development/tools/misc/lsof/default.nix

@@ -1,14 +1,15 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "lsof-4.80";
+  name = "lsof-4.81";
 
   src = fetchurl {
     urls = [
-      ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.80.tar.bz2
-      ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/OLD/lsof_4.80.tar.bz2
+      http://ftp.uni-bayreuth.de/packages/tools/lsof/lsof_4.81.tar.bz2
+      ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.81.tar.bz2
+      ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/OLD/lsof_4.81.tar.bz2
     ];
-    sha256 = "1q0k3c9ajpdxkhqq793pl4fdfnrwl5hgwk9556gvcj96hllssgbr";
+    sha256 = "1fcamd8qpczgb3kz9b2rhflbq6lyd3lic4i7xl7n99fx76ha1n19";
   };
 
   unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); ";