From 172c52f9e9d329c9523fe97a590a9bfa066757ea Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Nov 2011 15:15:07 +0000
Subject: [PATCH] * Per the coding guidelines, put different AUFS versions in
 the same   directory.

svn path=/nixpkgs/trunk/; revision=30324
---
 .../{aufs2.1-util/default.nix => aufs-util/2.1.nix}  |  0
 .../{aufs2-util/default.nix => aufs-util/2.nix}      |  0
 .../{aufs3-util/default.nix => aufs-util/3.nix}      |  0
 .../linux/{aufs2.1/default.nix => aufs/2.1.nix}      |  0
 .../linux/{aufs2/default.nix => aufs/2.nix}          |  0
 .../linux/{aufs3/default.nix => aufs/3.nix}          |  0
 pkgs/top-level/all-packages.nix                      | 12 ++++++------
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename pkgs/os-specific/linux/{aufs2.1-util/default.nix => aufs-util/2.1.nix} (100%)
 rename pkgs/os-specific/linux/{aufs2-util/default.nix => aufs-util/2.nix} (100%)
 rename pkgs/os-specific/linux/{aufs3-util/default.nix => aufs-util/3.nix} (100%)
 rename pkgs/os-specific/linux/{aufs2.1/default.nix => aufs/2.1.nix} (100%)
 rename pkgs/os-specific/linux/{aufs2/default.nix => aufs/2.nix} (100%)
 rename pkgs/os-specific/linux/{aufs3/default.nix => aufs/3.nix} (100%)

diff --git a/pkgs/os-specific/linux/aufs2.1-util/default.nix b/pkgs/os-specific/linux/aufs-util/2.1.nix
similarity index 100%
rename from pkgs/os-specific/linux/aufs2.1-util/default.nix
rename to pkgs/os-specific/linux/aufs-util/2.1.nix
diff --git a/pkgs/os-specific/linux/aufs2-util/default.nix b/pkgs/os-specific/linux/aufs-util/2.nix
similarity index 100%
rename from pkgs/os-specific/linux/aufs2-util/default.nix
rename to pkgs/os-specific/linux/aufs-util/2.nix
diff --git a/pkgs/os-specific/linux/aufs3-util/default.nix b/pkgs/os-specific/linux/aufs-util/3.nix
similarity index 100%
rename from pkgs/os-specific/linux/aufs3-util/default.nix
rename to pkgs/os-specific/linux/aufs-util/3.nix
diff --git a/pkgs/os-specific/linux/aufs2.1/default.nix b/pkgs/os-specific/linux/aufs/2.1.nix
similarity index 100%
rename from pkgs/os-specific/linux/aufs2.1/default.nix
rename to pkgs/os-specific/linux/aufs/2.1.nix
diff --git a/pkgs/os-specific/linux/aufs2/default.nix b/pkgs/os-specific/linux/aufs/2.nix
similarity index 100%
rename from pkgs/os-specific/linux/aufs2/default.nix
rename to pkgs/os-specific/linux/aufs/2.nix
diff --git a/pkgs/os-specific/linux/aufs3/default.nix b/pkgs/os-specific/linux/aufs/3.nix
similarity index 100%
rename from pkgs/os-specific/linux/aufs3/default.nix
rename to pkgs/os-specific/linux/aufs/3.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0f47b7a9564..5f91d841821 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5640,20 +5640,20 @@ let
 
     aufs =
       if kernel.features ? aufs2 then
-        callPackage ../os-specific/linux/aufs2 { }
+        callPackage ../os-specific/linux/aufs/2.nix { }
       else if kernel.features ? aufs2_1 then
-        callPackage ../os-specific/linux/aufs2.1 { }
+        callPackage ../os-specific/linux/aufs/2.1.nix { }
       else if kernel.features ? aufs3 then
-        callPackage ../os-specific/linux/aufs3 { }
+        callPackage ../os-specific/linux/aufs/3.nix { }
       else null;
 
     aufs_util = 
       if kernel.features ? aufs2 then
-        callPackage ../os-specific/linux/aufs2-util { }
+        callPackage ../os-specific/linux/aufs-util/2.nix { }
       else if kernel.features ? aufs2_1 then
-        callPackage ../os-specific/linux/aufs2.1-util { }
+        callPackage ../os-specific/linux/aufs-util/2.1.nix { }
       else if kernel.features ? aufs3 then
-        callPackage ../os-specific/linux/aufs3-util { }
+        callPackage ../os-specific/linux/aufs-util/3.nix { }
       else null;
       
     blcr = callPackage ../os-specific/linux/blcr {