diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-08-29 17:27:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-29 17:27:26 +0100 |
| commit | d6305a5bec497b9e4b3e8d40aa2e7a8446855465 (patch) | |
| tree | 1c4bba05d3169d366f9388d079d8f58e37c8a523 /pkgs/development | |
| parent | 18eb2a07a6650a4cceba86d1f8edc6a3745433e8 (diff) | |
| parent | 03d5065c064c671d2cd618afe0dcfac88bd99e30 (diff) | |
| download | nixlib-d6305a5bec497b9e4b3e8d40aa2e7a8446855465.tar nixlib-d6305a5bec497b9e4b3e8d40aa2e7a8446855465.tar.gz nixlib-d6305a5bec497b9e4b3e8d40aa2e7a8446855465.tar.bz2 nixlib-d6305a5bec497b9e4b3e8d40aa2e7a8446855465.tar.lz nixlib-d6305a5bec497b9e4b3e8d40aa2e7a8446855465.tar.xz nixlib-d6305a5bec497b9e4b3e8d40aa2e7a8446855465.tar.zst nixlib-d6305a5bec497b9e4b3e8d40aa2e7a8446855465.zip | |
Merge pull request #45755 from Ekleog/kcov-36
kcov: 35 -> 36
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/tools/analysis/kcov/aarch64_nt_prstatus.patch | 12 | ||||
| -rw-r--r-- | pkgs/development/tools/analysis/kcov/default.nix | 6 |
2 files changed, 2 insertions, 16 deletions
diff --git a/pkgs/development/tools/analysis/kcov/aarch64_nt_prstatus.patch b/pkgs/development/tools/analysis/kcov/aarch64_nt_prstatus.patch deleted file mode 100644 index d5c3662e9abf..000000000000 --- a/pkgs/development/tools/analysis/kcov/aarch64_nt_prstatus.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/engines/ptrace.cc b/src/engines/ptrace.cc -index 59b615f..e02cddf 100644 ---- a/src/engines/ptrace.cc -+++ b/src/engines/ptrace.cc -@@ -21,6 +21,7 @@ - - #if defined(__aarch64__) - # include <sys/uio.h> -+# include <elf.h> - #endif - - #include <map> diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index 7d75d9a34e1a..af20165d155f 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "kcov-${version}"; - version = "35"; + version = "36"; src = fetchFromGitHub { owner = "SimonKagstrom"; repo = "kcov"; rev = "v${version}"; - sha256 = "1da9vm87pi5m9ika0q1f1ai85w3vwlap8yln147yr9sc37jp5jcw"; + sha256 = "1q1mw5mxz041lr6qc2v4280rmx13pg1bx5r3bxz9bzs941r405r3"; }; preConfigure = "patchShebangs src/bin-to-c-source.py"; @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { buildInputs = [ zlib curl elfutils python libiberty libopcodes ]; - patches = [ ./aarch64_nt_prstatus.patch ]; - enableParallelBuilding = true; meta = with stdenv.lib; { |