From 417216aa57481d48fe3807e57785b753d5325bc6 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <jagajaga@users.noreply.github.com>
Date: Sun, 9 Nov 2014 02:12:04 +0300
Subject: Revert "Add conntrack-tools and missing dependencies."

---
 .../libraries/libnetfilter_cthelper/default.nix    | 25 ----------------------
 .../libraries/libnetfilter_cttimeout/default.nix   | 25 ----------------------
 pkgs/os-specific/linux/conntrack-tools/default.nix | 23 --------------------
 pkgs/top-level/all-packages.nix                    |  6 ------
 4 files changed, 79 deletions(-)
 delete mode 100644 pkgs/development/libraries/libnetfilter_cthelper/default.nix
 delete mode 100644 pkgs/development/libraries/libnetfilter_cttimeout/default.nix
 delete mode 100644 pkgs/os-specific/linux/conntrack-tools/default.nix

diff --git a/pkgs/development/libraries/libnetfilter_cthelper/default.nix b/pkgs/development/libraries/libnetfilter_cthelper/default.nix
deleted file mode 100644
index c4648a56f3f..00000000000
--- a/pkgs/development/libraries/libnetfilter_cthelper/default.nix
+++ /dev/null
@@ -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;
-  };
-}
diff --git a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix
deleted file mode 100644
index 85586ca19c6..00000000000
--- a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix
+++ /dev/null
@@ -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;
-  };
-}
diff --git a/pkgs/os-specific/linux/conntrack-tools/default.nix b/pkgs/os-specific/linux/conntrack-tools/default.nix
deleted file mode 100644
index 98414e054d8..00000000000
--- a/pkgs/os-specific/linux/conntrack-tools/default.nix
+++ /dev/null
@@ -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;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 65a06c70510..8dc5b292ac2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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 { };
-- 
cgit 1.4.1