jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #62090 from c0bw3b/pkg/compactor

Browse Source 
libtins: 4.0 -> 4.2 / compactor: 0.11.1 -> 0.12.2
This commit is contained in:
Silvan Mosberger 2019-05-27 17:53:36 +02:00 committed by GitHub
commit e1736387fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/applications/networking/compactor/default.nix
View File

@ -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;

17
pkgs/development/libraries/libtins/default.nix
View File

@ -1,14 +1,14 @@
{ boost, cmake, fetchFromGitHub, gtest, libpcap, openssl, stdenv }:
stdenv.mkDerivation rec {
name = "libtins-${version}";
version = "4.0";
pname = "libtins";
version = "4.2";
src = fetchFromGitHub {
owner = "mfontanini";
repo = "libtins";
repo = pname;
rev = "v${version}";
sha256 = "13sdqad976j7gq2k1il6g51yxwr8rlqdkzf1kj9mzhihjq8541qs";
sha256 = "0gv661gdf018zk1sr6fnvcmd5akqjihs4h6zzxv6881v6yhhglrz";
};
postPatch = ''
@ -32,14 +32,15 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
doCheck = true;
preCheck = ''
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib
export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$PWD/lib
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD${placeholder "out"}/lib
export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$PWD${placeholder "out"}/lib
'';
checkTarget = "tests test";
meta = with stdenv.lib; {
description = "High-level, multiplatform C++ network packet sniffing and crafting library";
homepage = https://libtins.github.io/;
homepage = "https://libtins.github.io/";
changelog = "https://raw.githubusercontent.com/mfontanini/${pname}/v${version}/CHANGES.md";
license = stdenv.lib.licenses.bsd2;
maintainers = with maintainers; [ fdns ];
platforms = stdenv.lib.platforms.unix;