diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-11-08 15:15:07 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-11-08 15:15:07 +0000 |
| commit | 172c52f9e9d329c9523fe97a590a9bfa066757ea (patch) | |
| tree | d8e82f7b6ab134244ddaedae55ebbbc2b6c6b32a | |
| parent | b26931a48060fc6d2198a0398fac2932a8d7f1ca (diff) | |
| download | nixlib-172c52f9e9d329c9523fe97a590a9bfa066757ea.tar nixlib-172c52f9e9d329c9523fe97a590a9bfa066757ea.tar.gz nixlib-172c52f9e9d329c9523fe97a590a9bfa066757ea.tar.bz2 nixlib-172c52f9e9d329c9523fe97a590a9bfa066757ea.tar.lz nixlib-172c52f9e9d329c9523fe97a590a9bfa066757ea.tar.xz nixlib-172c52f9e9d329c9523fe97a590a9bfa066757ea.tar.zst nixlib-172c52f9e9d329c9523fe97a590a9bfa066757ea.zip | |
* Per the coding guidelines, put different AUFS versions in the same
directory. svn path=/nixpkgs/trunk/; revision=30324
| -rw-r--r-- | pkgs/os-specific/linux/aufs-util/2.1.nix (renamed from pkgs/os-specific/linux/aufs2.1-util/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/aufs-util/2.nix (renamed from pkgs/os-specific/linux/aufs2-util/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/aufs-util/3.nix (renamed from pkgs/os-specific/linux/aufs3-util/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/aufs/2.1.nix (renamed from pkgs/os-specific/linux/aufs2.1/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/aufs/2.nix (renamed from pkgs/os-specific/linux/aufs2/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/aufs/3.nix (renamed from pkgs/os-specific/linux/aufs3/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 12 |
7 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/aufs2.1-util/default.nix b/pkgs/os-specific/linux/aufs-util/2.1.nix index b399378924ae..b399378924ae 100644 --- a/pkgs/os-specific/linux/aufs2.1-util/default.nix +++ b/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 index 501dcbf4b94b..501dcbf4b94b 100644 --- a/pkgs/os-specific/linux/aufs2-util/default.nix +++ b/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 index 8eefc1b0f4ae..8eefc1b0f4ae 100644 --- a/pkgs/os-specific/linux/aufs3-util/default.nix +++ b/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 index 9d2081346e04..9d2081346e04 100644 --- a/pkgs/os-specific/linux/aufs2.1/default.nix +++ b/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 index 696ed57b8603..696ed57b8603 100644 --- a/pkgs/os-specific/linux/aufs2/default.nix +++ b/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 index ec3c5aec85ba..ec3c5aec85ba 100644 --- a/pkgs/os-specific/linux/aufs3/default.nix +++ b/pkgs/os-specific/linux/aufs/3.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f47b7a9564b..5f91d8418213 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 { |