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

Revert "Merge pull request #9543 from NixOS/staging.post-15.06"

Browse Source 
This reverts commit f61176c539, reversing
changes made to a27ca029ee.

Conflicts:
	pkgs/development/libraries/ncurses/default.nix
This commit is contained in:
Eelco Dolstra
2015-10-06 15:24:20 +02:00
parent fe195af944
commit 741bf840da
53 changed files with 385 additions and 652 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/ids/daq/default.nix
+2 -4
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, flex, bison, libpcap, libdnet, libnfnetlink, libnetfilter_queue}:
{stdenv, fetchurl, flex, bison, libpcap}:
stdenv.mkDerivation rec {
name = "daq-2.0.5";
@@ -9,9 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0vdwb0r9kdlgj4g0i0swafbc7qik0zmks17mhqji8cl7hpdva13p";
};
buildInputs = [ flex bison libpcap libdnet libnfnetlink libnetfilter_queue];
configureFlags = "--enable-nfq-module=yes --with-dnet-includes=${libdnet}/includes --with-dnet-libraries=${libdnet}/lib";
buildInputs = [ flex bison libpcap ];
meta = {
description = "Data AcQuisition library (DAQ), for packet I/O";
pkgs/applications/networking/ids/snort/default.nix
+2 -10
View File
@@ -1,4 +1,4 @@
{stdenv, makeWrapper, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison}:
{stdenv, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison}:
stdenv.mkDerivation rec {
version = "2.9.7.2";
@@ -10,15 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1gmlrh9ygpd5h6nnrr4090wk5n2yq2yrvwi7q6xbm6lxj4rcamyv";
};
buildInputs = [ makeWrapper libpcap pcre libdnet daq zlib flex bison ];
enableParallelBuilding = true;
configureFlags = "--disable-static-daq --enable-control-socket --with-daq-includes=${daq}/includes --with-daq-libraries=${daq}/lib --dynamic-preprocessor-lib-dir $out/lib/snort_dynamicpreprocessor/ --dynamic-engine-lib-dir $out/lib/snort_dynamicengine";
postInstall = ''
wrapProgram $out/bin/snort --add-flags "--daq-dir ${daq}/lib/daq"
'';
buildInputs = [ libpcap pcre libdnet daq zlib flex bison ];
meta = {
description = "Network intrusion prevention and detection system (IDS/IPS)";