* Refactoring: let linuxPackages.aufs and linuxPackages.aufs_util

  evaluate to right AUFS for the kernel in question.

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

7 files changed, 35 insertions, 35 deletions

diff --git a/pkgs/os-specific/linux/aufs2-util/default.nix b/pkgs/os-specific/linux/aufs2-util/default.nix
index 50031b7351cf..501dcbf4b94b 100644
--- a/pkgs/os-specific/linux/aufs2-util/default.nix
+++ b/pkgs/os-specific/linux/aufs2-util/default.nix
@@ -1,16 +1,18 @@
-{ stdenv, fetchurl, kernel, aufs2 }:
+{ stdenv, fetchurl, kernel, aufs }:
+
+assert aufs != null;
 
 let version = "20100506"; in
 
 stdenv.mkDerivation {
-  name = "aufs2-util-${version}";
+  name = "aufs2-util-${version}-${kernel.version}";
 
   src = fetchurl {
     url = "http://nixos.org/tarballs/aufs2-util-git-${version}.tar.bz2";
     sha256 = "0ly0c3p8fjxqbk8k5rmm1a91wg8wcrvhi1lv4aawalkkk8rqbnwk";
   };
 
-  buildInputs = [ aufs2 ];
+  buildInputs = [ aufs ];
 
   makeFlags =
     [ "KDIR=${kernel}/lib/modules/${kernel.version}/build"
diff --git a/pkgs/os-specific/linux/aufs2.1-util/default.nix b/pkgs/os-specific/linux/aufs2.1-util/default.nix
index a12a0900ca40..b399378924ae 100644
--- a/pkgs/os-specific/linux/aufs2.1-util/default.nix
+++ b/pkgs/os-specific/linux/aufs2.1-util/default.nix
@@ -1,9 +1,11 @@
-{ stdenv, fetchgit, kernel, aufs2_1 }:
+{ stdenv, fetchgit, kernel, aufs }:
+
+assert aufs != null;
 
 let version = "20110217"; in
 
 stdenv.mkDerivation {
-  name = "aufs2.1-util-${version}";
+  name = "aufs2.1-util-${version}-${kernel.version}";
 
   src = fetchgit {
     url = "git://git.c3sl.ufpr.br/aufs/aufs2-util.git";
@@ -11,7 +13,7 @@ stdenv.mkDerivation {
     sha256 = "0fce5601b67efe8b5652a813ae612348bf4503aa71056cd31a5ed0406632e364";
   };
 
-  buildInputs = [ aufs2_1 ];
+  buildInputs = [ aufs ];
 
   makeFlags =
     [ "KDIR=${kernel}/lib/modules/${kernel.version}/build"
diff --git a/pkgs/os-specific/linux/aufs2.1/default.nix b/pkgs/os-specific/linux/aufs2.1/default.nix
index d118f1f74871..9d2081346e04 100644
--- a/pkgs/os-specific/linux/aufs2.1/default.nix
+++ b/pkgs/os-specific/linux/aufs2.1/default.nix
@@ -8,7 +8,7 @@ let version =
   else "20110408"; in
 
 stdenv.mkDerivation {
-  name = "aufs2.1-${version}";
+  name = "aufs2.1-${version}-${kernel.version}";
 
   src =
   if (builtins.lessThan (builtins.compareVersions kernel.version "2.6.38") 0) 
diff --git a/pkgs/os-specific/linux/aufs2/default.nix b/pkgs/os-specific/linux/aufs2/default.nix
index c755b993ec89..696ed57b8603 100644
--- a/pkgs/os-specific/linux/aufs2/default.nix
+++ b/pkgs/os-specific/linux/aufs2/default.nix
@@ -5,7 +5,7 @@ assert kernel.features ? aufsBase;
 let version = "20100522"; in
 
 stdenv.mkDerivation {
-  name = "aufs2-${version}";
+  name = "aufs2-${version}-${kernel.version}";
 
   src = 
   if (builtins.lessThan (builtins.compareVersions kernel.version "2.6.35") 0) then
diff --git a/pkgs/os-specific/linux/aufs3-util/default.nix b/pkgs/os-specific/linux/aufs3-util/default.nix
index 00c3e99c4577..8eefc1b0f4ae 100644
--- a/pkgs/os-specific/linux/aufs3-util/default.nix
+++ b/pkgs/os-specific/linux/aufs3-util/default.nix
@@ -1,15 +1,17 @@
-{ stdenv, fetchgit, kernel, aufs3 }:
+{ stdenv, fetchgit, kernel, aufs }:
+
+assert aufs != null;
 
 stdenv.mkDerivation {
-  name = "aufs3-util-${aufs3.patch.version}";
+  name = "aufs3-util-${aufs.patch.version}-${kernel.version}";
 
   src = fetchgit {
     url = git://aufs.git.sourceforge.net/gitroot/aufs/aufs-util.git;
-    rev = aufs3.patch.utilRev;
-    sha256 = aufs3.patch.utilHash;
+    rev = aufs.patch.utilRev;
+    sha256 = aufs.patch.utilHash;
   };
 
-  buildInputs = [ aufs3 ];
+  buildInputs = [ aufs ];
 
   makeFlags =
     [ "KDIR=${kernel}/lib/modules/${kernel.modDirVersion}/build"
diff --git a/pkgs/os-specific/linux/aufs3/default.nix b/pkgs/os-specific/linux/aufs3/default.nix
index bf73e6510f7f..ec3c5aec85ba 100644
--- a/pkgs/os-specific/linux/aufs3/default.nix
+++ b/pkgs/os-specific/linux/aufs3/default.nix
@@ -12,7 +12,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "aufs3-${patch.version}";
+  name = "aufs3-${patch.version}-${kernel.version}";
 
   src = patch.patch.src;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0b653fae8103..0f47b7a9564b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5638,30 +5638,24 @@ let
 
     ati_drivers_x11 = callPackage ../os-specific/linux/ati-drivers { };
 
-    aufs2 = if kernel.features ? aufs2 then
-      callPackage ../os-specific/linux/aufs2 { }
+    aufs =
+      if kernel.features ? aufs2 then
+        callPackage ../os-specific/linux/aufs2 { }
+      else if kernel.features ? aufs2_1 then
+        callPackage ../os-specific/linux/aufs2.1 { }
+      else if kernel.features ? aufs3 then
+        callPackage ../os-specific/linux/aufs3 { }
       else null;
 
-    aufs2_1 = if kernel.features ? aufs2_1 then
-      callPackage ../os-specific/linux/aufs2.1 { }
+    aufs_util = 
+      if kernel.features ? aufs2 then
+        callPackage ../os-specific/linux/aufs2-util { }
+      else if kernel.features ? aufs2_1 then
+        callPackage ../os-specific/linux/aufs2.1-util { }
+      else if kernel.features ? aufs3 then
+        callPackage ../os-specific/linux/aufs3-util { }
       else null;
-
-    aufs3 = if kernel.features ? aufs3 then
-      callPackage ../os-specific/linux/aufs3 { }
-      else null;
-
-    aufs2_util = if kernel.features ? aufs2 then
-      callPackage ../os-specific/linux/aufs2-util { }
-      else null;
-
-    aufs2_1_util = if kernel.features ? aufs2_1 then
-      callPackage ../os-specific/linux/aufs2.1-util { }
-      else null;
-
-    aufs3_util = if kernel.features ? aufs3 then
-      callPackage ../os-specific/linux/aufs3-util { }
-      else null;
-
+      
     blcr = callPackage ../os-specific/linux/blcr {
       #libtool = libtool_1_5; # libtool 2 causes a fork bomb
     };