From f1328839d414f438cf551e1cece9888c2029d5b1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 9 Oct 2008 10:10:49 +0000
Subject: [PATCH] maudeUnstable: updated full-maude to latest alpha release

svn path=/nixpkgs/trunk/; revision=13017
---
 .../interpreters/maude/unstable.nix            | 11 ++++++-----
 pkgs/top-level/all-packages.nix                | 18 +++++++++---------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/interpreters/maude/unstable.nix b/pkgs/development/interpreters/maude/unstable.nix
index 8e351a7954b..43bfc08fe17 100644
--- a/pkgs/development/interpreters/maude/unstable.nix
+++ b/pkgs/development/interpreters/maude/unstable.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, flex, bison, ncurses, buddy, tecla, libsigsegv, gmp }:
+{ stdenv, fetchurl, flex, bison, ncurses, buddy, tecla, libsigsegv, gmp, unzip }:
 
 stdenv.mkDerivation rec {
   name = "maude-2.4-alpha-91c";
@@ -12,21 +12,22 @@ stdenv.mkDerivation rec {
     sha256 = "0z25rrmg1b317xba2aqir5719js2ig3k20n1pvq3qvlzg51b6wp1";
   };
   fullMaude = fetchurl {
-    url = "http://www.lcc.uma.es/~duran/FullMaude/FM23j/full-maude.maude";
-    sha256 = "1x25ckfh1dzn8pg5spzj7f23bkz0favybnaxww8qs29r3lsrl1ib";
+    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 libsigsegv];
+  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/
-    cp ${fullMaude} $out/share/maude/full-maude.maude
+    unzip -aa ${fullMaude}
+    mv full-maude.maude $out/share/maude/full-maude.maude
 
     ensureDir $out/share/doc/maude
     tar xf ${docs}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 976cef28687..fefabfdad4d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -73,7 +73,7 @@ let
   pkgsOrig = pkgsFun {}; # the un-overriden packages, passed to packageOverrides
   pkgsOverriden = pkgsFun __overrides; # the overriden, final packages
   pkgs = pkgsOverriden;
-  
+
 
   # The package compositions.  Yes, this isn't properly indented.
   pkgsFun = __overrides: rec {
@@ -85,7 +85,7 @@ let
   # For convenience, allow callers to get the path to Nixpkgs.
   path = ./..;
 
-  
+
   ### Symbolic names.
 
 
@@ -102,7 +102,7 @@ let
 
 
   inherit lib config getConfig;
-  
+
   # Override the compiler in stdenv for specific packages.
   overrideGCC = stdenv: gcc: stdenv //
     { mkDerivation = args: stdenv.mkDerivation (args // { NIX_GCC = gcc; });
@@ -308,7 +308,7 @@ let
     { function = newArgsFun: makeOverridable f (origArgs // (newArgsFun origArgs));
     };
 
-    
+
   ### STANDARD ENVIRONMENT
 
 
@@ -1961,7 +1961,7 @@ let
   };
 
   maudeUnstable = lowPrio (import ../development/interpreters/maude/unstable.nix {
-    inherit fetchurl stdenv flex bison ncurses buddy tecla gmp libsigsegv;
+    inherit fetchurl stdenv flex bison ncurses buddy tecla gmp libsigsegv unzip;
   });
 
   octave = import ../development/interpreters/octave {
@@ -3283,7 +3283,7 @@ let
 
   libvncserver = builderDefsPackage (import ../development/libraries/libvncserver) {
     inherit libtool libjpeg openssl zlib;
-    inherit (xlibs) xproto libX11 damageproto libXdamage 
+    inherit (xlibs) xproto libX11 damageproto libXdamage
       libXext xextproto fixesproto libXfixes xineramaproto
       libXinerama libXrandr randrproto libXtst;
   };
@@ -6103,7 +6103,7 @@ let
   dwm = import ../applications/window-managers/dwm {
     inherit fetchurl stdenv;
     inherit (xlibs) libX11 libXinerama;
-  }; 
+  };
 
   # building eclipise from source
   # experimental tested on x86_64-linux only
@@ -6527,7 +6527,7 @@ let
   };
 
   midori = builderDefsPackage (import ../applications/networking/browsers/midori) {
-    inherit imagemagick intltool python pkgconfig webkit libxml2 
+    inherit imagemagick intltool python pkgconfig webkit libxml2
       which gettext makeWrapper file;
     inherit (gtkLibs) gtk glib;
     inherit (gnome) gtksourceview;
@@ -7050,7 +7050,7 @@ let
   };
 
   /* Doesn't work yet
-  
+
   xen = builderDefsPackage (import ../applications/virtualization/xen) {
     inherit python e2fsprogs gnutls pkgconfig libjpeg
       ncurses SDL libvncserver zlib;