compactor: 0.11.1 -> 0.12.2
This commit is contained in:
parent
863e1bde7c
commit
80ef0e2112
@ -1,14 +1,16 @@
|
||||
{ autoconf, automake, boost, cbor-diag, cddl, fetchFromGitHub, file, libpcap, libtins, libtool, lzma, openssl, pkgconfig, stdenv, tcpdump, wireshark-cli }:
|
||||
{ autoconf, automake, boost, cbor-diag, cddl, fetchFromGitHub, file, libctemplate, libmaxminddb
|
||||
, libpcap, libtins, libtool, lzma, openssl, pkgconfig, stdenv, tcpdump, wireshark-cli
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "compactor-${version}";
|
||||
version = "0.11.1";
|
||||
pname = "compactor";
|
||||
version = "0.12.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dns-stats";
|
||||
repo = "compactor";
|
||||
rev = "${version}";
|
||||
sha256 = "0bd82956nkpdmfj8f05z37hy7f33cd2nfdxr7s9fgz1xi5flnzjc";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "17p9wsslsh6ifnadvyygr0cgir4q4iirxfz9zpkpbhh76cx2qnay";
|
||||
};
|
||||
|
||||
# cbor-diag, cddl and wireshark-cli are only used for tests.
|
||||
@ -19,14 +21,16 @@ stdenv.mkDerivation rec {
|
||||
openssl
|
||||
libtins
|
||||
lzma
|
||||
libctemplate
|
||||
libmaxminddb
|
||||
];
|
||||
|
||||
patchPhase = ''
|
||||
prePatch = ''
|
||||
patchShebangs test-scripts/
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
sh autogen.sh
|
||||
${stdenv.shell} autogen.sh
|
||||
substituteInPlace configure \
|
||||
--replace "/usr/bin/file" "${file}/bin/file"
|
||||
'';
|
||||
@ -35,16 +39,19 @@ stdenv.mkDerivation rec {
|
||||
"--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)
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Tools to capture DNS traffic and record it in C-DNS files";
|
||||
homepage = http://dns-stats.org/;
|
||||
homepage = "http://dns-stats.org/";
|
||||
changelog = "https://github.com/dns-stats/${pname}/raw/${version}/ChangeLog.txt";
|
||||
license = [ licenses.boost licenses.mpl20 licenses.openssl ];
|
||||
maintainers = with maintainers; [ fdns ];
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
|
Loading…
Reference in New Issue
Block a user