Various changes to Atheros driver. Supports binary patched 2756 revision now for 5006EG. Latest SVN release and stable are also supported.

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

4 files changed, 60 insertions, 3 deletions

diff --git a/pkgs/os-specific/linux/atheros/0.9.3.3.nix b/pkgs/os-specific/linux/atheros/0.9.3.3.nix
index 245d75e0998..d5c207bf188 100644
--- a/pkgs/os-specific/linux/atheros/0.9.3.3.nix
+++ b/pkgs/os-specific/linux/atheros/0.9.3.3.nix
@@ -9,12 +9,12 @@ args : with args;
 		buildInputs = [];
 		configureFlags = [];
 		makeFlags = [''KERNELPATH=${kernel}/lib/modules/*/build'' ''DESTDIR=$out''];
-		patchAR2425x86 = (if args ? pci001c_rev01 && args.pci001c_rev01 then
+		patchAR2425x86 = ""; /*(if args ? pci001c_rev01 && args.pci001c_rev01 then
 		fetchurl {
 			url = http://madwifi.org/attachment/ticket/1679/madwifi-ng-0933.ar2425.20071130.i386.patch?format=raw;
 			name = "madwifi-AR2425-x86.patch";
 			sha256 = "11xpx5g9w7ilagvj60prc3s8a3x0n5n4mr0b7nh0lxwrbjdgjjfg";
-		} else "");
+		} else "")*/;
 	} null; /* null is a terminator for sumArgs */
 let 
 doPatch = FullDepEntry (if patchAR2425x86 !="" then ''
diff --git a/pkgs/os-specific/linux/atheros/r2756.nix b/pkgs/os-specific/linux/atheros/r2756.nix
new file mode 100644
index 00000000000..8309b785865
--- /dev/null
+++ b/pkgs/os-specific/linux/atheros/r2756.nix
@@ -0,0 +1,35 @@
+args : with args;
+	with builderDefs {
+		src = /* put a fetchurl here */
+		fetchurl {
+			url = http://snapshots.madwifi.org/madwifi-ng/madwifi-ng-r2756-20071018.tar.gz;
+			sha256 = "0mm1kx9pjvvla792rv7k48yhsa0fpzvd1717g9xzazjsz2mqwzyv";
+		};
+
+		buildInputs = [];
+		configureFlags = [];
+		makeFlags = [''KERNELPATH=${kernel}/lib/modules/*/build'' ''DESTDIR=$out''];
+		patchAR2425x86 = (if args ? pci001c_rev01 && args.pci001c_rev01 then
+		fetchurl {
+			url = http://madwifi.org/attachment/ticket/1679/madwifi-ng-0933.ar2425.20071130.i386.patch?format=raw;
+			name = "madwifi-AR2425-x86.patch";
+			sha256 = "11xpx5g9w7ilagvj60prc3s8a3x0n5n4mr0b7nh0lxwrbjdgjjfg";
+		} else "");
+	} null; /* null is a terminator for sumArgs */
+let 
+doPatch = FullDepEntry (if patchAR2425x86 !="" then ''
+	cd hal
+	patch -Np1 -i ${patchAR2425x86}
+	cd ..
+'' else "") [minInit doUnpack];
+in
+stdenv.mkDerivation rec {
+	name = "atheros-"+version;
+	builder = writeScript (name + "-builder")
+		(textClosure [doPatch doMakeInstall doForceShare doPropagate]);
+	meta = {
+		description = "
+		Atheros WiFi driver.
+";
+	};
+}
diff --git a/pkgs/os-specific/linux/atheros/r3122.nix b/pkgs/os-specific/linux/atheros/r3122.nix
new file mode 100644
index 00000000000..c82b4021544
--- /dev/null
+++ b/pkgs/os-specific/linux/atheros/r3122.nix
@@ -0,0 +1,22 @@
+args : with args;
+	with builderDefs {
+		src = /* put a fetchurl here */
+		fetchurl {
+			url = http://snapshots.madwifi.org/madwifi-ng/madwifi-ng-r3122-20080109.tar.gz;
+			sha256 = "188258c6q96n8lb57c0cqsvxp47psninirdax13w4yd07v1rymwd";
+		};
+
+		buildInputs = [];
+		configureFlags = [];
+		makeFlags = [''KERNELPATH=${kernel}/lib/modules/*/build'' ''DESTDIR=$out''];
+	} null; /* null is a terminator for sumArgs */
+stdenv.mkDerivation rec {
+	name = "atheros-"+version;
+	builder = writeScript (name + "-builder")
+		(textClosure [doMakeInstall doForceShare doPropagate]);
+	meta = {
+		description = "
+		Atheros WiFi driver.
+";
+	};
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1d601998573..8748aa22528 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3000,7 +3000,7 @@ rec {
     inherit fetchurl stdenv builderDefs;
   };
 
-  atherosVersion = "0.9.3.3";
+  atherosVersion = "r3122";
 
   atherosFunCurrent = theKernel: (atherosFun {
     version = atherosVersion;