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

Merge pull request #4903 from NixOS/revert-4900-conntrack

Browse Source 
Revert "Add conntrack-tools and missing dependencies."
This commit is contained in:
Arseniy Seroka 2014-11-09 02:12:14 +03:00
commit 81c2ce0524
4 changed files with 0 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/development/libraries/libnetfilter_cthelper/default.nix
View File

@ -1,25 +0,0 @@
{ stdenv, fetchurl, pkgconfig, libmnl }:
stdenv.mkDerivation rec {
name = "libnetfilter_cthelper-1.0.0";
src = fetchurl {
url = "http://netfilter.org/projects/libnetfilter_cthelper/files/${name}.tar.bz2";
sha256 = "07618e71c4d9a6b6b3dc1986540486ee310a9838ba754926c7d14a17d8fccf3d";
};
buildInputs = [ pkgconfig libmnl ];
meta = {
description = "Userspace library that provides the programming interface to the user-space connection tracking helper infrastructure.";
longDescription = ''
libnetfilter_cthelper is the userspace library that provides the programming interface
to the user-space helper infrastructure available since Linux kernel 3.6. With this
library, you register, configure, enable and disable user-space helpers. This library
is used by conntrack-tools.
'';
homepage = http://www.netfilter.org/projects/libnetfilter_cthelper/;
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
};
}

25
pkgs/development/libraries/libnetfilter_cttimeout/default.nix
View File

@ -1,25 +0,0 @@
{ stdenv, fetchurl, pkgconfig, libmnl }:
stdenv.mkDerivation rec {
name = "libnetfilter_cttimeout-1.0.0";
src = fetchurl {
url = "http://netfilter.org/projects/libnetfilter_cttimeout/files/${name}.tar.bz2";
sha256 = "aeab12754f557cba3ce2950a2029963d817490df7edb49880008b34d7ff8feba";
};
buildInputs = [ pkgconfig libmnl ];
meta = {
description = "Userspace library that provides the programming interface to the connection tracking timeout infrastructure.";
longDescription = ''
libnetfilter_cttimeout is the userspace library that provides the programming
interface to the fine-grain connection tracking timeout infrastructure.
With this library, you can create, update and delete timeout policies that can
be attached to traffic flows. This library is used by conntrack-tools.
'';
homepage = http://netfilter.org/projects/libnetfilter_cttimeout/;
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
};
}

23
pkgs/os-specific/linux/conntrack-tools/default.nix
View File

@ -1,23 +0,0 @@
{ fetchurl, stdenv, flex, bison, pkgconfig, libmnl, libnfnetlink
, libnetfilter_conntrack, libnetfilter_queue, libnetfilter_cttimeout
, libnetfilter_cthelper }:
stdenv.mkDerivation rec {
name = "conntrack-tools-1.4.2";
src = fetchurl {
url = "http://www.netfilter.org/projects/conntrack-tools/files/${name}.tar.bz2";
sha256 = "e5c423dc077f9ca8767eaa6cf40446943905711c6a8fe27f9cc1977d4d6aa11e";
};
buildInputs = [ libmnl libnfnetlink libnetfilter_conntrack libnetfilter_queue
libnetfilter_cttimeout libnetfilter_cthelper ];
nativeBuildInputs = [ flex bison pkgconfig ];
meta = with stdenv.lib; {
homepage = http://conntrack-tools.netfilter.org/;
description = "Connection tracking userspace tools";
platforms = platforms.linux;
license = licenses.gpl2Plus;
};
}

6
pkgs/top-level/all-packages.nix
View File

@ -6000,10 +6000,6 @@ let
libnetfilter_conntrack = callPackage ../development/libraries/libnetfilter_conntrack { };
libnetfilter_cthelper = callPackage ../development/libraries/libnetfilter_cthelper { };
libnetfilter_cttimeout = callPackage ../development/libraries/libnetfilter_cttimeout { };
libnetfilter_queue = callPackage ../development/libraries/libnetfilter_queue { };
libnfnetlink = callPackage ../development/libraries/libnfnetlink { };
@ -7892,8 +7888,6 @@ let
weatherXoap = config.conky.weatherXoap or false;
};
conntrack_tools = callPackage ../os-specific/linux/conntrack-tools { };
cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { };
cryopid = callPackage ../os-specific/linux/cryopid { };