* octavefront removed

* rna removed
* octave-2.1.57 added

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

pkgs/development/interpreters/octave/builder.sh

@@ -1,6 +1,6 @@
 set -x
 
-buildinputs="$autoconf $g77 $texinfo $bison $flex $gperf $rna $aterm"
+buildinputs="$autoconf $g77 $texinfo $bison $flex $gperf"
 . $stdenv/setup
 
 g77orig=$(cat $g77/nix-support/orig-gcc)
@@ -10,9 +10,9 @@ export NIX_STRIP_DEBUG=
 export NIX_CFLAGS_COMPILE="-g $NIX_CFLAGS_COMPILE"
 
 tar xvfz $src
-cd octavefront-*
+cd octave-*
 ./autogen.sh
-./configure --prefix=$out --disable-readline --enable-rna=$rna --enable-aterm
+./configure --prefix=$out --disable-readline
 make
 make install
 #strip -S $out/lib/*/*.a

pkgs/development/interpreters/octave/default.nix

@@ -0,0 +1,15 @@
+{ stdenv, fetchurl, autoconf, g77, texinfo, bison, flex, gperf }:
+
+assert autoconf != null && texinfo != null
+  && bison != null && flex != null && gperf != null;
+assert g77.langF77;
+
+stdenv.mkDerivation {
+  name = "octave-2.1.57";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-2.1.57.tar.gz ;
+    md5 = "a0171814e005ce6d77365e7d831eef45";
+  };
+  inherit autoconf g77 texinfo bison flex gperf;
+}

pkgs/development/libraries/rna/builder.sh

@@ -1,15 +0,0 @@
-buildinputs="$zlib"
-. $stdenv/setup
-
-export NIX_STRIP_DEBUG=
-export NIX_CFLAGS_COMPILE="-g $NIX_CFLAGS_COMPILE"
-
-tar xvfz $src
-cd rna-*
-./configure --prefix=$out
-make
-make install
-strip -S $out/lib/*.a
-
-mkdir $out/nix-support
-echo "$zlib" > $out/nix-support/propagated-build-inputs

pkgs/development/libraries/rna/default.nix

@@ -1,13 +0,0 @@
-{stdenv, fetchurl, zlib}:
-
-assert zlib != null;
-
-stdenv.mkDerivation {
-  name = "rna-0.14c";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = ftp://ftp.radionetworkprocessor.com/pub/radionetworkprocessor/rna-0.14c.tar.gz;
-    md5 = "1e2947caf8a680e93cac55bffe2d6ec6";
-  };
-  inherit zlib;
-}

pkgs/development/tools/misc/octavefront/default.nix

@@ -1,18 +0,0 @@
-{ stdenv, fetchurl, autoconf, g77, texinfo, bison, flex, gperf
-, rna, aterm
-}:
-
-assert autoconf != null && texinfo != null
-  && bison != null && flex != null && gperf != null
-  && rna != null && aterm != null;
-assert g77.langF77;
-
-stdenv.mkDerivation {
-  name = "octavefront-0.2";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = ftp://ftp.radionetworkprocessor.com/pub/radionetworkprocessor/octavefront-0.2.tar.gz;
-    md5 = "14e02d060fd6afc6752dbba0a7445ff2";
-  };
-  inherit autoconf g77 texinfo bison flex gperf rna aterm;
-}

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;

pkgs/system/populate-cache.nix

@@ -24,7 +24,7 @@ let {
     gnum4
     valgrind
     texinfo
-    octavefront
+    octave
     gnumake
     bisonnew
     flexnew