From b22899a7cbab8aaab9e448ba303ec3fd448eaa02 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 9 Apr 2009 09:48:14 +0000
Subject: [PATCH] * Fix some evaluation errors.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14960
---
 pkgs/development/interpreters/octave/default.nix | 5 ++---
 pkgs/top-level/all-packages.nix                  | 3 +--
 pkgs/top-level/release.nix                       | 6 +++---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index aed71da946d..b075712523a 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -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 g77.langFortran;
 
 stdenv.mkDerivation {
   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;
     md5 = "10f07dbc0951a7318502a9f1e51e6388";
   };
-  buildInputs = [g77 readline ncurses perl flex];
+  buildInputs = [gfortran 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 bbdd9028016..73f44b400a1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2053,8 +2053,7 @@ let
   };
 
   octave = import ../development/interpreters/octave {
-    inherit stdenv fetchurl readline ncurses perl flex;
-    g77 = gfortran;
+    inherit stdenv fetchurl readline ncurses perl flex gfortran;
   };
 
   # mercurial (hg) bleeding edge version
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index d1fcf46aace..1dc421985a3 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -170,7 +170,7 @@ in {
   lhs2tex = ghcSupported;
   libsmbios = linux;
   libtool = all;
-  libtool2 = all;
+  libtool_2 = all;
   libxml2 = all;
   libxslt = all;
   lout = linux;
@@ -366,7 +366,7 @@ in {
     sdf = all;
     strategoxt = all;
     javafront = all;
-    dryad = all;
+    dryad = linux;
   };
   
   xorg = {
@@ -384,7 +384,7 @@ in {
     xauth = linux;
     xf86inputkeyboard = linux;
     xf86inputmouse = linux;
-    xf86videoi810 = linux;
+    xf86videointel = linux;
     xf86videovesa = linux;
     xkbcomp = linux;
     xorgserver = linux;