From 3042581b2a8a7a08a0922b76b880826c4f0a7ec4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Fri, 23 Jun 2006 14:04:32 +0000 Subject: [PATCH] * Disable some stuff. * Use GNU make 3.80 for StrategoXT. * Updated octave. svn path=/nixpkgs/trunk/; revision=5502 --- pkgs/development/compilers/strategoxt/strategoxt-0.16.nix | 4 ++-- pkgs/development/interpreters/octave/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 1 + pkgs/top-level/build-for-release.nix | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/strategoxt/strategoxt-0.16.nix b/pkgs/development/compilers/strategoxt/strategoxt-0.16.nix index e87afc3bdc04..717048c42180 100644 --- a/pkgs/development/compilers/strategoxt/strategoxt-0.16.nix +++ b/pkgs/development/compilers/strategoxt/strategoxt-0.16.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, aterm, sdf, pkgconfig}: +{stdenv, fetchurl, aterm, sdf, pkgconfig, make}: stdenv.mkDerivation { @@ -11,5 +11,5 @@ stdenv.mkDerivation { }; inherit aterm sdf; - buildInputs = [pkgconfig aterm sdf]; + buildInputs = [pkgconfig aterm sdf make]; } diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 713a2d88b074..787682f1e2c0 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -4,10 +4,10 @@ assert readline != null && ncurses != null && flex != null; assert g77.langF77; stdenv.mkDerivation { - name = "octave-2.9.0"; + name = "octave-2.9.6"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/octave-2.9.0.tar.bz2; - md5 = "687a09033bc68f09810e947010bc8f29"; + url = ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-2.9.6.tar.bz2; + md5 = "10f07dbc0951a7318502a9f1e51e6388"; }; buildInputs = [g77 readline ncurses perl flex]; configureFlags = "--enable-readline --enable-dl --disable-static --enable-shared"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dbc20b22f979..016317241791 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -777,6 +777,7 @@ rec { strategoxt = (import ../development/compilers/strategoxt) { inherit fetchurl stdenv pkgconfig sdf aterm; + make = gnumake380; }; strategoxtUtils = (import ../development/compilers/strategoxt/utils) { diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix index d6243d9320aa..74a475e402b5 100644 --- a/pkgs/top-level/build-for-release.nix +++ b/pkgs/top-level/build-for-release.nix @@ -55,7 +55,7 @@ let { grub gzip hello - inkscape +# inkscape jakartaregexp jetty jikes @@ -91,7 +91,7 @@ let { # qtparted quake3demo readline - rssglx +# rssglx screen sdf spidermonkey