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

* Fix some evaluation errors.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=14960
This commit is contained in:
Eelco Dolstra 2009-04-09 09:48:14 +00:00
parent 71a16052ba
commit b22899a7cb
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,6 @@
{stdenv, fetchurl, g77, readline, ncurses, perl, flex}: {stdenv, fetchurl, gfortran, readline, ncurses, perl, flex}:
assert readline != null && ncurses != null && flex != null; assert readline != null && ncurses != null && flex != null;
assert g77.langFortran;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "octave-2.9.6"; name = "octave-2.9.6";
@ -9,6 +8,6 @@ stdenv.mkDerivation {
url = ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-2.9.6.tar.bz2; url = ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-2.9.6.tar.bz2;
md5 = "10f07dbc0951a7318502a9f1e51e6388"; md5 = "10f07dbc0951a7318502a9f1e51e6388";
}; };
buildInputs = [g77 readline ncurses perl flex]; buildInputs = [gfortran readline ncurses perl flex];
configureFlags = "--enable-readline --enable-dl --disable-static --enable-shared"; configureFlags = "--enable-readline --enable-dl --disable-static --enable-shared";
} }

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

@ -2053,8 +2053,7 @@ let
}; };
octave = import ../development/interpreters/octave { octave = import ../development/interpreters/octave {
inherit stdenv fetchurl readline ncurses perl flex; inherit stdenv fetchurl readline ncurses perl flex gfortran;
g77 = gfortran;
}; };
# mercurial (hg) bleeding edge version # mercurial (hg) bleeding edge version

6
pkgs/top-level/release.nix
View File

@ -170,7 +170,7 @@ in {
lhs2tex = ghcSupported; lhs2tex = ghcSupported;
libsmbios = linux; libsmbios = linux;
libtool = all; libtool = all;
libtool2 = all; libtool_2 = all;
libxml2 = all; libxml2 = all;
libxslt = all; libxslt = all;
lout = linux; lout = linux;
@ -366,7 +366,7 @@ in {
sdf = all; sdf = all;
strategoxt = all; strategoxt = all;
javafront = all; javafront = all;
dryad = all; dryad = linux;
}; };
xorg = { xorg = {
@ -384,7 +384,7 @@ in {
xauth = linux; xauth = linux;
xf86inputkeyboard = linux; xf86inputkeyboard = linux;
xf86inputmouse = linux; xf86inputmouse = linux;
xf86videoi810 = linux; xf86videointel = linux;
xf86videovesa = linux; xf86videovesa = linux;
xkbcomp = linux; xkbcomp = linux;
xorgserver = linux; xorgserver = linux;