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

* Sync with the trunk.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=14965
This commit is contained in:
Eelco Dolstra
2009-04-09 12:19:57 +00:00
parent b22899a7cb f2867f237b
commit 2eb05cf933
74 changed files with 993 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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";
}

12
pkgs/development/interpreters/octave/hg.nix
View File

@@ -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 ];