* octavefront removed

* rna removed
* octave-2.1.57 added

svn path=/nixpkgs/trunk/; revision=1228

1 files changed, 2 insertions, 6 deletions

diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 8194bb9f362..1540e296a89 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -194,8 +194,8 @@ rec {
     inherit fetchurl stdenv;
   };
 
-  octavefront = (import ../development/tools/misc/octavefront) {
-    inherit fetchurl stdenv autoconf g77 texinfo flex gperf rna aterm;
+  octave = (import ../development/interpreters/octave) {
+    inherit fetchurl stdenv autoconf g77 texinfo flex gperf;
     bison = bisonnew;
   };
 
@@ -504,10 +504,6 @@ rec {
     inherit fetchurl stdenv;
   };
 
-  rna = (import ../development/libraries/rna) {
-    inherit fetchurl stdenv zlib;
-  };
-
   xlibs = (import ../development/libraries/xlibs) {
     inherit fetchurl stdenv pkgconfig freetype expat;
     patch = gnupatch;