2 files changed, 15 insertions, 47 deletions
diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix
index dd6a82c3def6..0b76c2fa2c8e 100644
--- a/pkgs/development/interpreters/maude/default.nix
+++ b/pkgs/development/interpreters/maude/default.nix
@@ -1,31 +1,37 @@
-{ stdenv, fetchurl, flex, bison, ncurses, buddy, tecla, gmp }:
+{ stdenv, fetchurl, flex, bison, ncurses, buddy, tecla, libsigsegv, gmp, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "maude-2.3";
+  name = "maude-2.4";
   meta = {
     homepage = "http://maude.cs.uiuc.edu/";
     description = "Maude -- a high-level specification language";
     license = "GPLv2";
   };
   src = fetchurl {
-    url = "http://maude.cs.uiuc.edu/download/current/Maude-2.3.tar.gz";
-    sha256 = "1nzxj8x1379nxsdvldqy55wl513hdi4xwf8i2bhngz7s8228vs37";
+    url = "http://maude.cs.uiuc.edu/download/current/Maude-2.4.tar.gz";
+    sha256 = "0bydkf8fd5v267bfak4mm5lmm3vvnr6ir1jr7gimgyzqygdk0in2";
+  };
+  fullMaude = fetchurl {
+    url = "http://www.lcc.uma.es/~duran/FullMaude/FM23l/full-maude.maude.zip";
+    sha256 = "08m54dskj2c6x00a5l5x1my88na4x8wmm048g0srsknhv5j91lf2";
   };
   docs = fetchurl {
     url = "http://mirror.switch.ch/mirror/gentoo/distfiles/maude-2.3.0-extras.tar.bz2";
     sha256 = "0kd5623k1wwj1rk4b6halrm3sdvd9kbiwg1hi2c3qim1nlfdgl0d";
   };
-  buildInputs = [flex bison ncurses buddy tecla gmp];
+  buildInputs = [flex bison unzip ncurses buddy tecla gmp libsigsegv];
   configurePhase = ''./configure --disable-dependency-tracking --prefix=$out TECLA_LIBS="-ltecla -lncursesw" CFLAGS="-O3" CXXFLAGS="-O3"'';
-  # Regression test suite says:
-  #   FAIL: metaWellFormed
-  doCheck = false;
+  doCheck = true;
   postInstall =
   ''
     ensureDir $out/share/maude
+    cp src/Main/*.maude $out/share/maude/
+    unzip -aa ${fullMaude}
+    mv full-maude.maude $out/share/maude/full-maude.maude
+
     ensureDir $out/share/doc/maude
     tar xf ${docs}
-    mv src/Main/*.maude maude-2.3.0-extras/*.maude $out/share/maude/
+    rm -f maude-2.3.0-extras/full-maude.maude
     mv maude-2.3.0-extras/pdfs $out/share/doc/maude/pdf
     mv maude-2.3.0-extras/* $out/share/doc/maude/
   '';
diff --git a/pkgs/development/interpreters/maude/unstable.nix b/pkgs/development/interpreters/maude/unstable.nix
deleted file mode 100644
index 98bc60bb77ee..000000000000
--- a/pkgs/development/interpreters/maude/unstable.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchurl, flex, bison, ncurses, buddy, tecla, libsigsegv, gmp, unzip }:
-
-stdenv.mkDerivation rec {
-  name = "maude-2.4-alpha-91d";
-  meta = {
-    homepage = "http://maude.cs.uiuc.edu/";
-    description = "Maude -- a high-level specification language";
-    license = "GPLv2";
-  };
-  src = fetchurl {
-    url = "http://www.csl.sri.com/users/eker/Maude/Alpha91d/Maude-2.4.tar.gz";
-    sha256 = "0bydkf8fd5v267bfak4mm5lmm3vvnr6ir1jr7gimgyzqygdk0in2";
-  };
-  fullMaude = fetchurl {
-    url = "http://www.lcc.uma.es/~duran/FullMaude/FM23l/full-maude.maude.zip";
-    sha256 = "08m54dskj2c6x00a5l5x1my88na4x8wmm048g0srsknhv5j91lf2";
-  };
-  docs = fetchurl {
-    url = "http://mirror.switch.ch/mirror/gentoo/distfiles/maude-2.3.0-extras.tar.bz2";
-    sha256 = "0kd5623k1wwj1rk4b6halrm3sdvd9kbiwg1hi2c3qim1nlfdgl0d";
-  };
-  buildInputs = [flex bison unzip ncurses buddy tecla gmp libsigsegv];
-  configurePhase = ''./configure --disable-dependency-tracking --prefix=$out TECLA_LIBS="-ltecla -lncursesw" CFLAGS="-O3" CXXFLAGS="-O3"'';
-  doCheck = true;
-  postInstall =
-  ''
-    ensureDir $out/share/maude
-    cp src/Main/*.maude $out/share/maude/
-    unzip -aa ${fullMaude}
-    mv full-maude.maude $out/share/maude/full-maude.maude
-
-    ensureDir $out/share/doc/maude
-    tar xf ${docs}
-    rm -f maude-2.3.0-extras/full-maude.maude
-    mv maude-2.3.0-extras/pdfs $out/share/doc/maude/pdf
-    mv maude-2.3.0-extras/* $out/share/doc/maude/
-  '';
-}