* Sync with the trunk once more.

* Turn on everything in Hydra. svn path=/nixpkgs/branches/stdenv-updates/; revision=14806
2009-03-31 15:30:47 +00:00
parent 9455f37ce9 1f9740e01c
commit d27514cb28
84 changed files with 1751 additions and 634 deletions
--- a/pkgs/development/libraries/botan/default.nix
+++ b/pkgs/development/libraries/botan/default.nix
@@ -0,0 +1,28 @@
+a :  
+let 
+  fetchurl = a.fetchurl;
+
+  version = a.lib.getAttr ["version"] "1.8.1" a; 
+  buildInputs = with a; [
+    perl
+  ];
+in
+rec {
+  src = fetchurl {
+    url = "http://files.randombit.net/botan/Botan-${version}.tbz";
+    sha256 = "1lgqkg7q0qpzh647zmzay149myrjihcx4jp3rrz6gw17rgn11v98";
+  };
+
+  inherit buildInputs;
+  configureFlags = [];
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doConfigure" "doMakeInstall"];
+
+  configureCommand = "perl ./configure.pl";
+  
+  name = "botan-" + version;
+  meta = {
+    description = "Cryptographic algorithms library";
+  };
+}
--- a/pkgs/development/libraries/lzo/default.nix
+++ b/pkgs/development/libraries/lzo/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:

 stdenv.mkDerivation rec {
-  name = "lzo-2.02";
+  name = "lzo-2.03";
  
  src = fetchurl {
    url = "${meta.homepage}/download/${name}.tar.gz";
-    sha256 = "1i9g9bdrmyn6546rnck3kkh8nssfaw75m2rxir4sn7bwvnsfryx2";
+    sha256 = "8b1b0da8f757b9ac318e1c15a0eac8bdb56ca902a2dd25beda06c0f265f22591";
  };
  
  configureFlags = "--enable-shared --disable-static";
@@ -13,5 +13,6 @@ stdenv.mkDerivation rec {
  meta = {
    description = "A data compresion library suitable for real-time data de-/compression";
    homepage = http://www.oberhumer.com/opensource/lzo;
+    license = "GPLv2+";
  };
 }
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
    ++ (if qt4Support then [qt4] else []);

  configureFlags = "--enable-shared --disable-static --enable-exceptions
-    --enable-cairo --enable-splash --enable-poppler-glib --enable-zlib "
+    --enable-cairo --enable-splash --enable-poppler-glib --enable-zlib
+    --enable-xpdf-headers "
    + (if qt4Support then "--enable-qt-poppler" else "--disable-qt-poppler");

  patches = [ ./GDir-const.patch ./use_exceptions.patch ];
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, readline}:
+{stdenv, fetchurl, readline, static ? false}:

 stdenv.mkDerivation rec {
  name = "sqlite-3.6.10";
@@ -12,7 +12,10 @@ stdenv.mkDerivation rec {

  buildInputs = [readline];

-  configureFlags = "--disable-static --with-readline-inc=-I${readline}/include";
+  configureFlags = ''
+    ${if static then "--disable-shared --enable-static" else "--disable-static"}
+    --with-readline-inc=-I${readline}/include
+  '';

  postInstall = ''
    gcc -L$out/lib -I$out/include tool/genfkey.c -lsqlite3 -o $out/bin/genfkey
--- a/pkgs/development/libraries/ucl/default.nix
+++ b/pkgs/development/libraries/ucl/default.nix
@@ -0,0 +1,15 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "ucl-1.0.3";
+  src = fetchurl {
+    url = http://www.oberhumer.com/opensource/ucl/download/ucl-1.03.tar.gz;
+    sha256 = "b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348";
+  };
+
+  meta = {
+    homepage = http://www.oberhumer.com/opensource/ucl/;
+    description = "Portable lossless data compression library";
+    license = "GPLv2";
+  };
+}
--- a/pkgs/development/libraries/wtk/builder.sh
+++ b/pkgs/development/libraries/wtk/builder.sh
@@ -0,0 +1,42 @@
+source $stdenv/setup
+
+if ! test -e "$pathname"; then
+    echo ""
+    echo "SORRY!"
+    echo "You should download \`$(basename $pathname)' from Sun and place it in $(dirname $pathname)."
+    echo "Blame Sun, not us."
+    echo ""
+    exit 1
+fi
+
+actual=$(md5sum -b $pathname | cut -c1-32)
+if test "$actual" != "$md5"; then
+    echo "hash is $actual, expected $md5"
+    exit 1
+fi
+
+mkdir unzipped
+pushd unzipped
+unzip $pathname || true
+popd
+
+ensureDir $out
+mv unzipped/* $out/
+
+# Remove crap in the root directory.
+for file in $out/*
+do
+  if test -f $file ; then
+    rm $file
+  fi
+done
+
+# Set the dynamic linker.
+rpath=
+for i in $libraries; do
+    rpath=$rpath${rpath:+:}$i/lib
+done
+find $out -type f -perm +100 \
+    -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" {} \;
+find $out -type f -perm +100 \
+    -exec patchelf --set-rpath "$rpath" {} \;
--- a/pkgs/development/libraries/wtk/default.nix
+++ b/pkgs/development/libraries/wtk/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, unzip, xlibs }:
+
+assert stdenv.system == "i686-linux";
+
+stdenv.mkDerivation {
+  name = "sun-java-wtk-2.5.2_01";
+
+  pathname = "/tmp/sun_java_wireless_toolkit-2.5.2_01-linuxi486.bin.sh";
+  md5 = "6b70b6e6d426eac121db8a087991589f";
+
+  builder = ./builder.sh;
+
+  buildInputs = [ unzip ];
+
+  libraries = [ xlibs.libXpm xlibs.libXt xlibs.libX11 xlibs.libICE xlibs.libSM stdenv.gcc.gcc ];
+
+  meta = {
+    homepage = http://java.sun.com/products/sjwtoolkit/download.html;
+    description = "Sun Java Wireless Toolkit 2.5.2_01 for CLDC";
+    license = "unfree";
+  };
+}
--- a/pkgs/development/libraries/wxGTK-2.8/default.nix
+++ b/pkgs/development/libraries/wxGTK-2.8/default.nix
@@ -9,11 +9,11 @@ assert gtk.libpng != null;
 assert gtk.libpng.zlib != null;

 stdenv.mkDerivation {
-  name = "wxGTK-2.8.4";
+  name = "wxGTK-2.8.10";

  src = fetchurl {
-    url = mirror://sourceforge/wxwindows/wxGTK-2.8.4.tar.gz;
-    sha256 = "177hls125f3zjsymsww9jjkd2idb6jmp4ylwg94dsyzygsvyj58k";
+    url = mirror://sourceforge/wxwindows/wxGTK-2.8.10.tar.gz;
+    sha256 = "1hygkrwa71kzdbz029igkxsqyb14y6vsllqafjgm9b7v91nq49r8";
  };

  buildInputs = [
--- a/pkgs/development/perl-modules/DBD-SQLite/default.nix
+++ b/pkgs/development/perl-modules/DBD-SQLite/default.nix
@@ -16,4 +16,8 @@ buildPerlPackage {
    # Prevent segfaults in case of timeouts.
    ./reset.patch
  ];
+
+  # Disabled because the tests can randomly fail due to timeouts
+  # (e.g. "database is locked(5) at dbdimp.c line 402 at t/07busy.t").
+  doCheck = false;
 }
--- a/pkgs/development/tools/misc/xxdiff/3.2.nix
+++ b/pkgs/development/tools/misc/xxdiff/3.2.nix
@@ -30,7 +30,7 @@ rec {
    cd ..
  '') ["minInit" "doMake" "defEnsureDir" "addInputs"];
      
-  name = "xxdiff" + version;
+  name = "xxdiff-" + version;
  meta = {
    description = "Interactive merge tool";
  };
--- a/pkgs/development/tools/profiling/oprofile/default.nix
+++ b/pkgs/development/tools/profiling/oprofile/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
  # FIXME: Add optional Qt support.
  buildInputs = [ binutils popt makeWrapper gawk which gnugrep ];

-  configureFlags = "--with-kernel-support";
+  configureFlags = "--with-kernel-support --disable-shared";

  postInstall = ''
    wrapProgram "$out/bin/opcontrol"					\
@@ -43,4 +43,4 @@ stdenv.mkDerivation rec {
    license = "GPLv2";
    homepage = http://oprofile.sourceforge.net/;
  };
-}
+}
--- a/pkgs/development/tools/selenium/remote-control/default.nix
+++ b/pkgs/development/tools/selenium/remote-control/default.nix
@@ -1,23 +1,47 @@
 args: with args;
-stdenv.mkDerivation {
-  name = "selenium-rc-0.8.3-binary";
+# let version = "1.0-beta-2";
+let version = "1.0-SNAPSHOT-standalone";
+in stdenv.mkDerivation {
+    /*

-  src = fetchurl {
-    url = http://release.openqa.org/cgi-bin/selenium-remote-control-redirect.zip;
-    sha256 = "694b46a8440011bcedc4fdc6d01fd91c8b4b4b62b7c6629ace4e745ef47f583e";
-  };
+    Use this if there is another release..

-  phases = "installPhase";
-  installPhase = "
-  ensureDir \$out/lib
-  cp selenium-server-*/*.jar \$out/lib
-  ";
+    name = "selenium-remote-control-${version}-dist";
+    src = fetchurl {
+      url = "http://release.seleniumhq.org/selenium-remote-control/${version}/selenium-remote-control-${version}-dist.zip";
+      sha256 = "0ciyfqvnv0117l2rhw9dclv85mcf3czpimvybj38v3syl7m7yk41";
+    };
+    buildInputs = [unzip];
+    phases = "unpackPhase buildPhase";
+    buildPhase = ''
+      ensureDir $out/{bin,lib}
+      mv * $out/lib
+      bin="$out/bin/selenium-remote-control"
+      cat >> "$bin" << EOF
+      #!/bin/sh
+      exec ${jre}/bin/java -jar $out/lib/selenium-server-${version}/selenium-server.jar "\$@"
+      EOF
+      chmod +x "$bin" 
+    '';
+    */

-  buildInputs = [unzip];
-
-  meta = { 
-      description = "test tool for web applications";
-      homepage = http://www.openqa.org/selenium-c;
-      license = "";
-  };
+    # this snapshot version starts a firefox from a script file. It only issues a warning about it
+    # you still have to pass -DfirefoxDefaultPath=/home/marc/.nix-profile/bin/firefox or such..
+    name = "selenium-remote-control-${version}-dist";
+    # this dist file has been created using  mvn package  -Dmaven.test.skip=true based on svn rev 2639 
+    src = fetchurl {
+      url = "http://mawercer.de/~nix/selenium-server-1.0-SNAPSHOT-standalone.jar";
+      sha256 = "1g59g5y8lyjjj3fda30cm9gmjncdz70slrp03rqmnrkzp7z6khnc";
+    };
+    phases = "buildPhase";
+    buildPhase = ''
+      ensureDir $out/{bin,lib}
+      cp $src $out/lib/
+      bin="$out/bin/selenium-remote-control"
+      cat >> "$bin" << EOF
+      #!/bin/sh
+      exec ${jre}/bin/java -jar "$out/lib/$(basename $src)" "\$@"
+      EOF
+      chmod +x "$bin" 
+    '';
 }