completely removed gw6c. use gogoclient.

svn path=/nixpkgs/trunk/; revision=32989

4 files changed, 1 insertions, 47 deletions

diff --git a/pkgs/os-specific/linux/gw6c/default.nix b/pkgs/os-specific/linux/gw6c/default.nix
deleted file mode 100644
index 5c8c6d8c953..00000000000
--- a/pkgs/os-specific/linux/gw6c/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-args : with args; 
-let version = "6.0"; in
-rec {
-  src = fetchurl {
-    url = http://go6.net/4105/file.asp?file_id=166;
-    sha256 = "e6b345f11398026c8be17e0c26fc22632a6a1053bbf18b5303e514cf44b52c4a";
-    name = "gateway6-client-${version}.tar";
-  };
-
-  buildInputs = [nettools openssl procps];
-  configureFlags = [];
-  makeFlags = ["target=linux"];
-  installFlags = ["installdir=$out"];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["preBuild" "doMakeInstall"];
-
-  goSrcDir = "cd tspc-advanced";
-
-  preBuild = fullDepEntry (''
-    sed -e 's@/dev/net/tun@/dev/tun@' -i platform/linux/tsp_tun.c;
-    sed -e 's@/sbin/ifconfig@${nettools}/sbin/ifconfig@' -i template/linux.sh
-    sed -e 's@/sbin/route@${nettools}/sbin/route@' -i template/linux.sh
-    sed -e 's@/sbin/ip@${iproute}/sbin/ip@' -i template/linux.sh
-    sed -e 's@/sbin/sysctl@${procps}/sbin/sysctl@' -i template/linux.sh
-  '') ["minInit" "addInputs" "doUnpack"];
-      
-  name = "gateway6-client-" + version;
-  meta = {
-    description = "Gateway6 client - provides IPv6 tunnel";
-    longDescription = "
-      This package provides Gateway6 client (gw6c) daemon,
-      which connects to so called tunnel broker via IPv4 
-      network, and tunnels IPv6 packets through broker,
-      thus giving global IPv6 connectivity. You may need 
-      tun, ipv6 and sit modules.
-    ";
-    homepage = http://go6.net ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a167f36fd90..89c9191be9b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5857,10 +5857,6 @@ let
 
   gogoclient = callPackage ../os-specific/linux/gogoclient { };
 
-  gw6c = builderDefsPackage (import ../os-specific/linux/gw6c) {
-    inherit fetchurl stdenv nettools openssl procps iproute;
-  };
-
   nss_ldap = callPackage ../os-specific/linux/nss_ldap { };
 
   pam = callPackage ../os-specific/linux/pam { };
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index f56f6cf357d..ba9f4def75f 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -71,11 +71,11 @@ with (import ./release-lib.nix);
   gnused = all;
   gnutar = all;
   gnutls = linux;
+  gogoclient = linux;
   grub = linux;
   grub2 = linux;
   gsl = linux;
   guile = linux;  # tests fail on Cygwin
-  gw6c = linux;
   gzip = all;
   hal = linux;
   hal_info = linux;
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 6fd5f51fdbc..57cc538c70c 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -137,7 +137,6 @@ with (import ./release-lib.nix);
   gsl = linux;
   guile = linux;  # tests fail on Cygwin
   gv = linux;
-  gw6c = linux;
   gzip = all;
   hal = linux;
   hal_info = linux;