* Sync with the trunk.

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

5 files changed, 35 insertions, 14 deletions

diff --git a/pkgs/applications/editors/emacs-modes/php/builder.sh b/pkgs/applications/editors/emacs-modes/php/builder.sh
new file mode 100644
index 00000000000..85c44848057
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/php/builder.sh
@@ -0,0 +1,7 @@
+source $stdenv/setup
+
+mkdir -p $out/share/emacs/site-lisp
+cd $out/share/emacs/site-lisp
+tar xvfz $src
+mv php-mode-*/* .
+rmdir php-mode-*
diff --git a/pkgs/applications/editors/emacs-modes/php/default.nix b/pkgs/applications/editors/emacs-modes/php/default.nix
new file mode 100644
index 00000000000..ec160dccd9f
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/php/default.nix
@@ -0,0 +1,12 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+  name = "php-mode-1.5.0";
+
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/php-mode/${name}.tar.gz";
+    sha256 = "1bffgg4rpiggxqc1hvjcby24sfyzj5728zg7r6f4v6a126a7kcfq";
+  };
+
+  builder = ./builder.sh;
+}
diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix
index 14de436379b..24d01dae059 100644
--- a/pkgs/applications/misc/adobe-reader/default.nix
+++ b/pkgs/applications/misc/adobe-reader/default.nix
@@ -3,13 +3,13 @@
 assert stdenv.system == "i686-linux";
 
 stdenv.mkDerivation {
-  name = "adobe-reader-9.3.3-1";
+  name = "adobe-reader-9.4-1";
   
   builder = ./builder.sh;
   
   src = fetchurl {
-    url = http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.3.3/enu/AdbeRdr9.3.3-1_i486linux_enu.tar.bz2;
-    sha256 = "1qssbdjy3v07agyh55bhsmvzakq9bs3hd6dw032ikwbpvb2gs807";
+    url = http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.4.0/enu/AdbeRdr9.4-1_i486linux_enu.tar.bz2;
+    sha256 = "093msw0b5k3ab0vv7bh4n81fxp51s2lynvsm076i5jvlp71l8adf";
   };
 
   # !!! Adobe Reader contains copies of OpenSSL, libcurl, and libicu.
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index f63e03e9ad9..a804d9f84e6 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -1,7 +1,7 @@
 # TODO:
 # - coqide compilation should be optional or (better) separate;
 
-{stdenv, fetchurl, ocaml, camlp5, lablgtk, ncurses}:
+{stdenv, fetchurl, ocaml, findlib, camlp5, lablgtk, ncurses}:
 
 let
   version = "8.3";
@@ -15,15 +15,17 @@ stdenv.mkDerivation {
     sha256 = "02iy4rxz1n1kc85fb3vs4xpxqfxjw87y2gvmi39fxrj8742qx0dx";
   };
 
-  buildInputs = [ ocaml camlp5 ncurses lablgtk ];
+  buildInputs = [ ocaml findlib camlp5 ncurses lablgtk ];
 
   prefixKey = "-prefix ";
 
-  configureFlags =
-    "-camldir ${ocaml}/bin " +
-    "-camlp5dir ${camlp5}/lib/ocaml/camlp5 " +
-    "-lablgtkdir ${lablgtk}/lib/ocaml/lablgtk2 " +
-    "-opt -coqide opt";
+  preConfigure = ''
+    configureFlagsArray=(
+      -camldir ${ocaml}/bin
+      -camlp5dir $(ocamlfind query camlp5)
+      -lablgtkdir ${lablgtk}/lib/ocaml/lablgtk2 -opt -coqide opt
+    )
+  '';
 
   buildFlags = "world"; # Debug with "world VERBOSE=1";
 
diff --git a/pkgs/applications/version-management/veracity/src-for-default.nix b/pkgs/applications/version-management/veracity/src-for-default.nix
index 06a3ad3a2f4..010c3acd929 100644
--- a/pkgs/applications/version-management/veracity/src-for-default.nix
+++ b/pkgs/applications/version-management/veracity/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="0.5.5.10349";
-   name="veracity-0.5.5.10349";
-   hash="1059cf0p0kpmylk9228an1kvz49s3d6sd3ncz6dw804z79q16s66";
+   version="0.5.5.10353";
+   name="veracity-0.5.5.10353";
+   hash="06clsn9li6bxdihmzcjd6ch5n6n5wgydd0sw76mk0ljy7s9ylhjr";
    url="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-${version}.tar.gz";
-   advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.5.5.10349.tar.gz";
+   advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.5.5.10353.tar.gz";
   
   
 }