From cf0010d3388c425eb154bf4c75947116e1fd8f32 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 28 Mar 2009 15:22:52 +0000
Subject: [PATCH] Gateway6 client update

svn path=/nixpkgs/trunk/; revision=14746
---
 pkgs/os-specific/linux/gw6c/{5.1.nix => default.nix} | 9 +++++----
 pkgs/top-level/all-packages.nix                      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)
 rename pkgs/os-specific/linux/gw6c/{5.1.nix => default.nix} (83%)

diff --git a/pkgs/os-specific/linux/gw6c/5.1.nix b/pkgs/os-specific/linux/gw6c/default.nix
similarity index 83%
rename from pkgs/os-specific/linux/gw6c/5.1.nix
rename to pkgs/os-specific/linux/gw6c/default.nix
index 68797e3d26f..a11037c0ebe 100644
--- a/pkgs/os-specific/linux/gw6c/5.1.nix
+++ b/pkgs/os-specific/linux/gw6c/default.nix
@@ -1,9 +1,10 @@
 args : with args; 
+let version = "6.0"; in
 rec {
   src = fetchurl {
-    url = http://go6.net/4105/file.asp?file_id=150;
-    sha256 = "07svw71wad1kwip7vnsdwcvlhhknqlx8v8kmdnrw11f6xg76w2ln";
-    name = "gateway6-client-5.1.tar.gz";
+    url = http://go6.net/4105/file.asp?file_id=158;
+    sha256 = "0cnxqyw8rdr0sii77n2pv97f0c00dx6ykvnb3mf2acyrarh04nq8";
+    name = "gateway6-client-${version}.tar.gz";
   };
 
   buildInputs = [nettools openssl procps];
@@ -14,7 +15,7 @@ rec {
   /* doConfigure should be specified separately */
   phaseNames = ["preBuild" "doMakeInstall"];
 
-  goSrcDir = "cd ../tspc-advanced";
+  goSrcDir = "cd tspc-advanced";
 
   preBuild = FullDepEntry (''
     sed -e 's@/dev/net/tun@/dev/tun@' -i platform/linux/tsp_tun.c;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 87c45599bb6..ed7a20dc703 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7262,7 +7262,7 @@ let
     inherit fetchurl stdenv;
   };
 
-  gw6c = builderDefsPackage (selectVersion ../os-specific/linux/gw6c "5.1") {
+  gw6c = builderDefsPackage (import ../os-specific/linux/gw6c) {
     inherit fetchurl stdenv nettools openssl procps iproute;
   };