From 0d623346931a30b05bce89dfc6037e8619ce1b71 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 8 Oct 2008 08:47:20 +0000
Subject: [PATCH] * 1.4.11.nix -> default.nix.

svn path=/nixpkgs/branches/stdenv-updates/; revision=12997
---
 pkgs/development/tools/misc/gnum4/1.4.11.nix  | 42 -------------------
 pkgs/development/tools/misc/gnum4/default.nix | 37 +++++++++++++---
 pkgs/top-level/all-packages.nix               |  4 --
 3 files changed, 32 insertions(+), 51 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/gnum4/1.4.11.nix

diff --git a/pkgs/development/tools/misc/gnum4/1.4.11.nix b/pkgs/development/tools/misc/gnum4/1.4.11.nix
deleted file mode 100644
index bafa7f11a44..00000000000
--- a/pkgs/development/tools/misc/gnum4/1.4.11.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation rec {
-  name = "m4-1.4.11";
-  src = fetchurl {
-    url = "mirror://gnu/m4/${name}.tar.bz2";
-    sha256 = "1bcakymxddxykg5vbll3d9xq17m5sa3r6cprf1k27x5k4mjnhz0b";
-  };
-
-  patches = [ ./SIGPIPE.patch ];
-
-  # XXX: Work around Gnulib bug.  See:
-  # http://thread.gmane.org/gmane.comp.gnu.m4.bugs/2478 .
-  configureFlags="gl_cv_func_strtod_works=no";
-
-  doCheck = true;
-
-  meta = {
-    homepage = http://www.gnu.org/software/m4/;
-    description = "GNU M4, a macro processor";
-
-    longDescription = ''
-      GNU M4 is an implementation of the traditional Unix macro
-      processor.  It is mostly SVR4 compatible although it has some
-      extensions (for example, handling more than 9 positional
-      parameters to macros).  GNU M4 also has built-in functions for
-      including files, running shell commands, doing arithmetic, etc.
-
-      GNU M4 is a macro processor in the sense that it copies its
-      input to the output expanding macros as it goes.  Macros are
-      either builtin or user-defined and can take any number of
-      arguments.  Besides just doing macro expansion, m4 has builtin
-      functions for including named files, running UNIX commands,
-      doing integer arithmetic, manipulating text in various ways,
-      recursion etc...  m4 can be used either as a front-end to a
-      compiler or as a macro processor in its own right.
-    '';
-
-    license = "GPLv3+";
-  };
-
-}
diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix
index af682ed9f13..4f1c2f8c362 100644
--- a/pkgs/development/tools/misc/gnum4/default.nix
+++ b/pkgs/development/tools/misc/gnum4/default.nix
@@ -1,15 +1,42 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "gnum4-1.4.11";
-  
+stdenv.mkDerivation rec {
+  name = "m4-1.4.11";
   src = fetchurl {
-    url = mirror://gnu/m4/m4-1.4.11.tar.bz2;
+    url = "mirror://gnu/m4/${name}.tar.bz2";
     sha256 = "1bcakymxddxykg5vbll3d9xq17m5sa3r6cprf1k27x5k4mjnhz0b";
   };
 
+  patches = [ ./SIGPIPE.patch ];
+
+  # XXX: Work around Gnulib bug.  See:
+  # http://thread.gmane.org/gmane.comp.gnu.m4.bugs/2478 .
+  configureFlags = "gl_cv_func_strtod_works=no";
+
+  doCheck = true;
+
   meta = {
     homepage = http://www.gnu.org/software/m4/;
-    description = "An implementation of the traditional Unix macro processor";
+    description = "GNU M4, a macro processor";
+
+    longDescription = ''
+      GNU M4 is an implementation of the traditional Unix macro
+      processor.  It is mostly SVR4 compatible although it has some
+      extensions (for example, handling more than 9 positional
+      parameters to macros).  GNU M4 also has built-in functions for
+      including files, running shell commands, doing arithmetic, etc.
+
+      GNU M4 is a macro processor in the sense that it copies its
+      input to the output expanding macros as it goes.  Macros are
+      either builtin or user-defined and can take any number of
+      arguments.  Besides just doing macro expansion, m4 has builtin
+      functions for including named files, running UNIX commands,
+      doing integer arithmetic, manipulating text in various ways,
+      recursion etc...  m4 can be used either as a front-end to a
+      compiler or as a macro processor in its own right.
+    '';
+
+    license = "GPLv3+";
   };
+
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b39ec884d46..6d6dca60f48 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2259,10 +2259,6 @@ let
     inherit fetchurl stdenv;
   };
 
-  gnum4_1411 = import ../development/tools/misc/gnum4/1.4.11.nix {
-    inherit fetchurl stdenv;
-  };
-
   gnumake = import ../development/tools/build-managers/gnumake {
     inherit fetchurl stdenv;
     log2xmlSupport = getConfig [ "gnuMake" "log2xmlSupport" ] true;