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

* Disable some stuff.

Browse Source 
* Use GNU make 3.80 for StrategoXT.
* Updated octave.

svn path=/nixpkgs/trunk/; revision=5502
This commit is contained in:
Eelco Dolstra 2006-06-23 14:04:32 +00:00
parent e7edecc78f
commit 3042581b2a
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/strategoxt/strategoxt-0.16.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, aterm, sdf, pkgconfig}: {stdenv, fetchurl, aterm, sdf, pkgconfig, make}:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -11,5 +11,5 @@ stdenv.mkDerivation {
}; };
inherit aterm sdf; inherit aterm sdf;
buildInputs = [pkgconfig aterm sdf]; buildInputs = [pkgconfig aterm sdf make];
} }

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

@ -4,10 +4,10 @@ assert readline != null && ncurses != null && flex != null;
assert g77.langF77; assert g77.langF77;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "octave-2.9.0"; name = "octave-2.9.6";
src = fetchurl { src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/octave-2.9.0.tar.bz2; url = ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-2.9.6.tar.bz2;
md5 = "687a09033bc68f09810e947010bc8f29"; md5 = "10f07dbc0951a7318502a9f1e51e6388";
}; };
buildInputs = [g77 readline ncurses perl flex]; buildInputs = [g77 readline ncurses perl flex];
configureFlags = "--enable-readline --enable-dl --disable-static --enable-shared"; configureFlags = "--enable-readline --enable-dl --disable-static --enable-shared";

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

@ -777,6 +777,7 @@ rec {
strategoxt = (import ../development/compilers/strategoxt) { strategoxt = (import ../development/compilers/strategoxt) {
inherit fetchurl stdenv pkgconfig sdf aterm; inherit fetchurl stdenv pkgconfig sdf aterm;
make = gnumake380;
}; };
strategoxtUtils = (import ../development/compilers/strategoxt/utils) { strategoxtUtils = (import ../development/compilers/strategoxt/utils) {

4
pkgs/top-level/build-for-release.nix
View File

@ -55,7 +55,7 @@ let {
grub grub
gzip gzip
hello hello
inkscape # inkscape
jakartaregexp jakartaregexp
jetty jetty
jikes jikes
@ -91,7 +91,7 @@ let {
# qtparted # qtparted
quake3demo quake3demo
readline readline
rssglx # rssglx
screen screen
sdf sdf
spidermonkey spidermonkey