Porting changes from stdenv-updates into this branch.

This comes from:
svn diff  ^/nixpkgs/trunk/@18255 ^/nixpkgs/branches/stdenv-updates/ > diff
patch -p0 < diff
and then adding into svn all files new from the patch.

trunk@18255 comes from the last time I updated stdenv-updates from trunk.


svn path=/nixpkgs/stdenv-updates2/; revision=18272

1 files changed, 26 insertions, 6 deletions

diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index 10dd08214aff..138b4e01f78b 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -1,15 +1,35 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "gawk-3.1.6";
-  
+stdenv.mkDerivation rec {
+  name = "gawk-3.1.7";
+
   src = fetchurl {
-    url = mirror://gnu/gawk/gawk-3.1.6.tar.bz2;
-    sha256 = "0v6ba4hxfiiy3bny5japd3zmzxlh8vdkmswk96yngd6i1dddsgsi";
+    url = "mirror://gnu/gawk/${name}.tar.bz2";
+    sha256 = "0wfyiqc28cxb5wjbdph4y33h1fdf56nj6cm7as546niwjsw7cazi";
   };
 
+  doCheck = true;
+
   meta = {
     homepage = http://www.gnu.org/software/gawk/;
-    description = "GNU implementation of the AWK programming language";
+    description = "GNU implementation of the Awk programming language";
+
+    longDescription = ''
+      Many computer users need to manipulate text files: extract and then
+      operate on data from parts of certain lines while discarding the rest,
+      make changes in various text files wherever certain patterns appear,
+      and so on.  To write a program to do these things in a language such as
+      C or Pascal is a time-consuming inconvenience that may take many lines
+      of code.  The job is easy with awk, especially the GNU implementation:
+      Gawk.
+
+      The awk utility interprets a special-purpose programming language that
+      makes it possible to handle many data-reformatting jobs with just a few
+      lines of code.
+    '';
+
+    license = "GPLv3+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
   };
 }