From 20ab6cfbf75d2b218b4ac0f145e6a97e21f899e4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 27 Oct 2011 15:35:43 +0000
Subject: [PATCH] * Move perl-5.8 and perl-5.10 into perl/ per the coding
 conventions.

svn path=/nixpkgs/branches/stdenv-updates/; revision=30055
---
 .../interpreters/{perl-5.10 => perl/5.10}/default.nix         | 0
 .../interpreters/{perl-5.10 => perl/5.10}/no-sys-dirs.patch   | 0
 .../interpreters/{perl-5.10 => perl/5.10}/setup-hook.sh       | 0
 .../interpreters/{perl-5.8 => perl/5.8}/default.nix           | 0
 .../interpreters/{perl-5.8 => perl/5.8}/gcc-4.2.patch         | 0
 .../interpreters/{perl-5.8 => perl/5.8}/no-sys-dirs.patch     | 0
 .../interpreters/{perl-5.8 => perl/5.8}/setup-hook.sh         | 0
 pkgs/top-level/all-packages.nix                               | 4 ++--
 8 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/development/interpreters/{perl-5.10 => perl/5.10}/default.nix (100%)
 rename pkgs/development/interpreters/{perl-5.10 => perl/5.10}/no-sys-dirs.patch (100%)
 rename pkgs/development/interpreters/{perl-5.10 => perl/5.10}/setup-hook.sh (100%)
 rename pkgs/development/interpreters/{perl-5.8 => perl/5.8}/default.nix (100%)
 rename pkgs/development/interpreters/{perl-5.8 => perl/5.8}/gcc-4.2.patch (100%)
 rename pkgs/development/interpreters/{perl-5.8 => perl/5.8}/no-sys-dirs.patch (100%)
 rename pkgs/development/interpreters/{perl-5.8 => perl/5.8}/setup-hook.sh (100%)

diff --git a/pkgs/development/interpreters/perl-5.10/default.nix b/pkgs/development/interpreters/perl/5.10/default.nix
similarity index 100%
rename from pkgs/development/interpreters/perl-5.10/default.nix
rename to pkgs/development/interpreters/perl/5.10/default.nix
diff --git a/pkgs/development/interpreters/perl-5.10/no-sys-dirs.patch b/pkgs/development/interpreters/perl/5.10/no-sys-dirs.patch
similarity index 100%
rename from pkgs/development/interpreters/perl-5.10/no-sys-dirs.patch
rename to pkgs/development/interpreters/perl/5.10/no-sys-dirs.patch
diff --git a/pkgs/development/interpreters/perl-5.10/setup-hook.sh b/pkgs/development/interpreters/perl/5.10/setup-hook.sh
similarity index 100%
rename from pkgs/development/interpreters/perl-5.10/setup-hook.sh
rename to pkgs/development/interpreters/perl/5.10/setup-hook.sh
diff --git a/pkgs/development/interpreters/perl-5.8/default.nix b/pkgs/development/interpreters/perl/5.8/default.nix
similarity index 100%
rename from pkgs/development/interpreters/perl-5.8/default.nix
rename to pkgs/development/interpreters/perl/5.8/default.nix
diff --git a/pkgs/development/interpreters/perl-5.8/gcc-4.2.patch b/pkgs/development/interpreters/perl/5.8/gcc-4.2.patch
similarity index 100%
rename from pkgs/development/interpreters/perl-5.8/gcc-4.2.patch
rename to pkgs/development/interpreters/perl/5.8/gcc-4.2.patch
diff --git a/pkgs/development/interpreters/perl-5.8/no-sys-dirs.patch b/pkgs/development/interpreters/perl/5.8/no-sys-dirs.patch
similarity index 100%
rename from pkgs/development/interpreters/perl-5.8/no-sys-dirs.patch
rename to pkgs/development/interpreters/perl/5.8/no-sys-dirs.patch
diff --git a/pkgs/development/interpreters/perl-5.8/setup-hook.sh b/pkgs/development/interpreters/perl/5.8/setup-hook.sh
similarity index 100%
rename from pkgs/development/interpreters/perl-5.8/setup-hook.sh
rename to pkgs/development/interpreters/perl/5.8/setup-hook.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1caf577dec1..dab1460816e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2559,11 +2559,11 @@ let
   # mercurial (hg) bleeding edge version
   octaveHG = callPackage ../development/interpreters/octave/hg.nix { };
 
-  perl58 = callPackage ../development/interpreters/perl-5.8 {
+  perl58 = callPackage ../development/interpreters/perl/5.8 {
     impureLibcPath = if stdenv.isLinux then null else "/usr";
   };
 
-  perl510 = callPackage ../development/interpreters/perl-5.10 {
+  perl510 = callPackage ../development/interpreters/perl/5.10 {
     fetchurl = fetchurlBoot;
   };