diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2021-01-04 13:51:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-04 13:51:49 +0100 |
| commit | f6e519f39e4d6ee694c2a3d5de8f3f263c57980b (patch) | |
| tree | c8bf52fd4d1c791e40582242bd56776d9e3d9de9 /pkgs/development/tools | |
| parent | dd23fc0ca20389fecceb6b946ba7741b05efadfb (diff) | |
| parent | 08b12f6385b3ed72061891bbdf480278b41491d8 (diff) | |
| download | nixpkgs-f6e519f39e4d6ee694c2a3d5de8f3f263c57980b.tar nixpkgs-f6e519f39e4d6ee694c2a3d5de8f3f263c57980b.tar.gz nixpkgs-f6e519f39e4d6ee694c2a3d5de8f3f263c57980b.tar.bz2 nixpkgs-f6e519f39e4d6ee694c2a3d5de8f3f263c57980b.tar.lz nixpkgs-f6e519f39e4d6ee694c2a3d5de8f3f263c57980b.tar.xz nixpkgs-f6e519f39e4d6ee694c2a3d5de8f3f263c57980b.tar.zst nixpkgs-f6e519f39e4d6ee694c2a3d5de8f3f263c57980b.zip | |
Merge pull request #96495 from Mindavi/lcov-1.15
lcov: 1.14 -> 1.15
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/analysis/lcov/default.nix | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix index 6ac778180b7..c6faeaa72f2 100644 --- a/pkgs/development/tools/analysis/lcov/default.nix +++ b/pkgs/development/tools/analysis/lcov/default.nix @@ -1,24 +1,16 @@ - {stdenv, fetchurl, fetchpatch, perl, perlPackages, makeWrapper }: + {stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper }: stdenv.mkDerivation rec { - name = "lcov-1.14"; - - src = fetchurl { - url = "mirror://sourceforge/ltp/${name}.tar.gz"; - sha256 = "06h7ixyznf6vz1qvksjgy5f3q2nw9akf6zx59npf0h3l32cmd68l"; + pname = "lcov"; + version = "1.15"; + + src = fetchFromGitHub { + owner = "linux-test-project"; + repo = "lcov"; + rev = "v${version}"; + sha256 = "1kvc7fkp45w48f0bxwbxvxkicnjrrydki0hllg294n1wrp80zzyk"; }; - patches = - [ (fetchpatch { - url = "https://github.com/linux-test-project/lcov/commit/ebfeb3e179e450c69c3532f98cd5ea1fbf6ccba7.patch"; - sha256 = "0dalkqbjb6a4vp1lcsxd39dpn5fzdf7ihsjbiviq285s15nxdj1j"; - }) - (fetchpatch { - url = "https://github.com/linux-test-project/lcov/commit/75fbae1cfc5027f818a0bb865bf6f96fab3202da.patch"; - sha256 = "0v1hn0511dxqbf50ppwasc6vmg0m6rns7ydbdy2rdbn0j7gxw30x"; - }) - ]; - buildInputs = [ perl makeWrapper ]; preBuild = '' @@ -28,6 +20,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/lcov --set PERL5LIB ${perlPackages.makeFullPerlPath [ perlPackages.PerlIOgzip perlPackages.JSON ]} + wrapProgram $out/bin/genpng --set PERL5LIB ${perlPackages.makeFullPerlPath [ perlPackages.GD ]} ''; meta = with stdenv.lib; { |