about summary refs log tree commit diff
path: root/pkgs/development/interpreters/octave
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2012-02-21 11:34:57 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2012-02-21 11:34:57 +0000
commita81366984eddd197fc41cbc5ec881ade59273c53 (patch)
tree77df0f77cafbc037d0b986edab559ac2fd70f887 /pkgs/development/interpreters/octave
parent4e76d21c848d19eb3f7074e87689ed120bd5c9fb (diff)
Updating octave to 3.6.0
svn path=/nixpkgs/trunk/; revision=32451
Diffstat (limited to 'pkgs/development/interpreters/octave')
-rw-r--r--pkgs/development/interpreters/octave/default.nix22
1 files changed, 14 insertions, 8 deletions
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index f873f4e747542..1bb8cbe247bcf 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -1,13 +1,19 @@
 {stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull,
-libX11, graphicsmagick}:
+libX11, graphicsmagick, pcre, blas, clapack, texLive }:
 
-stdenv.mkDerivation {
-  name = "octave-3.2.4";
+stdenv.mkDerivation rec {
+  name = "octave-3.6.0";
   src = fetchurl {
-    url = ftp://ftp.octave.org/pub/octave/octave-3.2.4.tar.bz2;
-    sha256 = "0iyivx7qz7cvwz7qczqrl4ysqivlhn5ax92z9md0m77dqw2isis8";
+    url = "mirror://gnu/octave/${name}.tar.bz2";
+    sha256 = "1mwj5pbbdzfbmcqyk0vx6si7mh8yhayppwnb1i63v871gxy775z5";
   };
-  buildInputs = [gfortran readline ncurses perl flex texinfo qhull libX11
-    graphicsmagick ];
-  configureFlags = "--enable-readline --enable-dl";
+
+  buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11
+    graphicsmagick pcre blas clapack texLive ];
+
+  NIX_LDFLAGS = "-lf2c"; # For clapack
+
+  enableParallelBuilding = true;
+
+  configureFlags = "--enable-readline --enable-dl --disable-docs";
 }