diff options
author | Renaud <c0bw3b@users.noreply.github.com> | 2022-01-20 19:30:47 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-20 19:30:47 +0100 |
commit | 2d53e621110df164456003475369e010c38dd0f9 (patch) | |
tree | b48e5d1f5ca56fe2993bf72c3116095c99ce3b10 /pkgs/applications | |
parent | f49e3bf8f63ed597350a24acf309cfd35be2ac49 (diff) |
compactor: 1.1.0 -> 1.2.0
* compactor: 1.1.0 -> 1.2.0 (#155711) and disable checks on Darwin platforms
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/networking/compactor/default.nix | 54 |
1 files changed, 33 insertions, 21 deletions
diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix index f4535c9120cdf..459b5652089cf 100644 --- a/pkgs/applications/networking/compactor/default.nix +++ b/pkgs/applications/networking/compactor/default.nix @@ -1,59 +1,71 @@ -{ autoconf, automake, boost, cbor-diag, cddl, fetchFromGitHub, file, libctemplate, libmaxminddb -, libpcap, libtins, libtool, xz, openssl, pkg-config, lib, stdenv, tcpdump, wireshark-cli +{ lib, stdenv, fetchFromGitHub +, asciidoctor, autoreconfHook, pkg-config +, boost, libctemplate, libmaxminddb, libpcap, libtins, openssl, protobuf, xz, zlib +, cbor-diag, cddl, diffutils, file, mktemp, netcat, tcpdump, wireshark-cli }: stdenv.mkDerivation rec { pname = "compactor"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "dns-stats"; repo = pname; rev = version; - sha256 = "0qykdnwi2q9sajkkc2sl5f00lvxjfymqjzqm0limsziykanh87c0"; + fetchSubmodules = true; + hash = "sha256-AUNPUk70VwJ0nZgMPLMU258nqkL4QP6km0USrZi2ea0="; }; - # cbor-diag, cddl and wireshark-cli are only used for tests. - nativeBuildInputs = [ autoconf automake libtool pkg-config cbor-diag cddl wireshark-cli ]; + nativeBuildInputs = [ + asciidoctor + autoreconfHook + pkg-config + ]; buildInputs = [ boost + libctemplate + libmaxminddb libpcap - openssl libtins + openssl + protobuf xz - libctemplate - libmaxminddb + zlib ]; - prePatch = '' + postPatch = '' patchShebangs test-scripts/ ''; preConfigure = '' - ${stdenv.shell} autogen.sh substituteInPlace configure \ --replace "/usr/bin/file" "${file}/bin/file" ''; - CXXFLAGS = "-std=c++11"; + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" "--with-boost=${boost.dev}" ]; enableParallelBuilding = true; - doCheck = true; - preCheck = '' - substituteInPlace test-scripts/check-live-pcap.sh \ - --replace "/usr/sbin/tcpdump" "${tcpdump}/bin/tcpdump" - rm test-scripts/same-tshark-output.sh - ''; # TODO: https://github.com/dns-stats/compactor/issues/49 (failing test) + doCheck = !stdenv.isDarwin; # check-dnstap.sh failing on Darwin + checkInputs = [ + cbor-diag + cddl + diffutils + file + mktemp + netcat + tcpdump + wireshark-cli + ]; meta = with lib; { description = "Tools to capture DNS traffic and record it in C-DNS files"; - homepage = "http://dns-stats.org/"; + homepage = "https://dns-stats.org/"; changelog = "https://github.com/dns-stats/${pname}/raw/${version}/ChangeLog.txt"; - license = [ licenses.boost licenses.mpl20 licenses.openssl ]; + license = licenses.mpl20; maintainers = with maintainers; [ fdns ]; - platforms = lib.platforms.unix; + platforms = platforms.unix; }; } |