* Sync with the trunk.

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

2 files changed, 11 insertions, 13 deletions

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index b075712523a60..703028064ff2e 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -1,13 +1,11 @@
-{stdenv, fetchurl, gfortran, readline, ncurses, perl, flex}:
-
-assert readline != null && ncurses != null && flex != null;
+{stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull}:
 
 stdenv.mkDerivation {
-  name = "octave-2.9.6";
+  name = "octave-3.0.4";
   src = fetchurl {
-    url = ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-2.9.6.tar.bz2;
-    md5 = "10f07dbc0951a7318502a9f1e51e6388";
+    url = ftp://ftp.octave.org/pub/octave/octave-3.0.4.tar.bz2;
+    sha256 = "1rkpzig0r0zrm73avxgai0zqkz9hv4js57i1xxdzcm22qw22szaj";
   };
-  buildInputs = [gfortran readline ncurses perl flex];
+  buildInputs = [gfortran readline ncurses perl flex texinfo qhull];
   configureFlags = "--enable-readline --enable-dl --disable-static --enable-shared";
 }
diff --git a/pkgs/development/interpreters/octave/hg.nix b/pkgs/development/interpreters/octave/hg.nix
index 43d4358d11c02..9e7d1d4654965 100644
--- a/pkgs/development/interpreters/octave/hg.nix
+++ b/pkgs/development/interpreters/octave/hg.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, g77, readline, ncurses, perl, flex,
- bison, autoconf, automake, sourceByName, getConfig, lib, atlas, gperf, python, glibc, gnuplot, texinfo, texLive}:
+ bison, autoconf, automake, sourceByName, getConfig, lib, atlas, gperf, python, glibc, gnuplot, texinfo, texLive, qhull, libX11}:
 
 assert readline != null && ncurses != null && flex != null;
 assert g77.langFortran;
 
-let commonBuildInputs = [g77 readline ncurses perl glibc]; in
+let commonBuildInputs = [g77 readline ncurses perl glibc qhull libX11 texinfo]; in
 
 stdenv.mkDerivation ({
   NIX_LDFLAGS = "-lpthread";
@@ -26,7 +26,7 @@ stdenv.mkDerivation ({
         ./autogen.sh
         export HOME=$TMP
         '';
-    buildInputs = commonBuildInputs ++ [ flex bison autoconf automake gperf gnuplot texinfo texLive ]
+    buildInputs = commonBuildInputs ++ [ flex bison autoconf automake gperf gnuplot texLive ]
                   ++ lib.optionals (getConfig ["octave" "atlas"] true) [ python atlas ];
     # it does build, but documentation doesn't.. So just remove that directory
     # from the buildfile
@@ -38,10 +38,10 @@ stdenv.mkDerivation ({
       make
     '';
   } else {
-    name = "octave-3.1.51";
+    name = "octave-3.1.55";
     src =  fetchurl {
-      url = ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-3.1.51.tar.bz2;
-      sha256 = "0v0khhpmydyimvdl2rswfd0jrcqa9rhd3cyi60zhqv2hi0bhmkh8";
+      url = ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-3.1.55.tar.bz2;
+      sha256 = "1lm4v85kdic4n5yxwzrdb0v6dc6nw06ljgx1q8hfkmi146kpg7s6";
     };
     buildInputs = commonBuildInputs ++ [ flex bison autoconf automake python ]
                   ++ lib.optionals (getConfig ["octave" "atlas"] true) [ python atlas ];