public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updating octave to 3.6.0

Browse Source 
svn path=/nixpkgs/trunk/; revision=32451
This commit is contained in:
Lluís Batlle i Rossell 2012-02-21 11:34:57 +00:00
parent 4e76d21c84
commit a81366984e
3 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/development/interpreters/octave/default.nix
View File

@ -1,13 +1,19 @@
{stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull, {stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull,
libX11, graphicsmagick}: libX11, graphicsmagick, pcre, blas, clapack, texLive }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "octave-3.2.4"; name = "octave-3.6.0";
src = fetchurl { src = fetchurl {
url = ftp://ftp.octave.org/pub/octave/octave-3.2.4.tar.bz2; url = "mirror://gnu/octave/${name}.tar.bz2";
sha256 = "0iyivx7qz7cvwz7qczqrl4ysqivlhn5ax92z9md0m77dqw2isis8"; sha256 = "1mwj5pbbdzfbmcqyk0vx6si7mh8yhayppwnb1i63v871gxy775z5";
}; };
buildInputs = [gfortran readline ncurses perl flex texinfo qhull libX11
graphicsmagick ]; buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11
configureFlags = "--enable-readline --enable-dl"; graphicsmagick pcre blas clapack texLive ];
NIX_LDFLAGS = "-lf2c"; # For clapack
enableParallelBuilding = true;
configureFlags = "--enable-readline --enable-dl --disable-docs";
} }

11
pkgs/development/libraries/clapack/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, cmake}: {stdenv, fetchurl, cmake, withPIC ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "clapack-3.2.1"; name = "clapack-3.2.1";
@ -16,8 +16,13 @@ stdenv.mkDerivation rec {
cp ../INCLUDE/* $out/include cp ../INCLUDE/* $out/include
''; '';
doCheck = true; cmakeFlags = if withPIC then "-DCMAKE_C_FLAGS=-fPIC" else "";
checkPhase = "ctest";
# We disable the test phase, because some tests fail.
# Forums say it's normal for some to fail:
# http://icl.cs.utk.edu/lapack-forum/viewtopic.php?f=2&t=167
# doCheck = true;
# checkPhase = "ctest";
meta = { meta = {
homepage = http://www.netlib.org/clapack/; homepage = http://www.netlib.org/clapack/;

7
pkgs/top-level/all-packages.nix
View File

@ -2665,10 +2665,9 @@ let
maude = callPackage ../development/interpreters/maude { }; maude = callPackage ../development/interpreters/maude { };
octave = callPackage ../development/interpreters/octave { octave = callPackage ../development/interpreters/octave {
# Needed because later gm versions require an initialization the actual octave is not clapack = clapack.override {
# doing. withPIC = true;
# http://www-old.cae.wisc.edu/pipermail/octave-maintainers/2010-February/015295.html };
graphicsmagick = graphicsmagick137;
}; };
# mercurial (hg) bleeding edge version # mercurial (hg) bleeding edge version