* lcov 1.7.

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

pkgs/development/tools/analysis/lcov/builder.sh

@@ -1,7 +0,0 @@
-source $stdenv/setup
-
-
-preInstall() {
-}
-
-genericBuild

pkgs/development/tools/analysis/lcov/default.nix

@@ -1,18 +1,13 @@
 {stdenv, fetchurl, perl}:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
-  name = "lcov-1.6";
+  name = "lcov-1.7";
   
   src = fetchurl {
-    url = mirror://sourceforge/ltp/lcov-1.6.tar.gz;
+    url = "mirror://sourceforge/ltp/${name}.tar.gz";
-    sha256 = "0d6lb0vlj3lvqmm678jic9h25q4dnlkbv37wg5yj311hdr9ls1kx";
+    sha256 = "1cx3haizs0rw6wjsn486qcn50f3qpybflkkb1780cg6s8jzcwdin";
   };
 
-  patches = [
-    # http://ltp.cvs.sourceforge.net/ltp/utils/analysis/lcov/bin/geninfo?revision=1.33&view=markup&pathrev=HEAD
-    ./string.patch
-  ];
-
   preBuild = ''
     makeFlagsArray=(PREFIX=$out BIN_DIR=$out/bin MAN_DIR=$out/share/man)
   '';
@@ -31,5 +26,4 @@ stdenv.mkDerivation {
     description = "A code coverage tool for Linux";
     homepage = http://ltp.sourceforge.net/coverage/lcov.php;
   };
-
 }

pkgs/development/tools/analysis/lcov/string.patch

@@ -1,10 +0,0 @@
---- a/bin/geninfo	2007/10/04 08:18:07	1.32
-+++ b/bin/geninfo	2007/11/01 16:29:39	1.33
-@@ -1478,6 +1478,7 @@
- 					}
- 					next;
- 				}
-+				last if ($length == 0);
- 				($blocks, $string) =
- 					read_gcno_string(*INPUT, $endianness);
- 				if (defined($string))