Move files

pkgs/stdenv/linux/bootstrap/armv6l.nix

@@ -1,5 +1,5 @@
 # Use the static tools for armv5tel-linux.
-(import ../armv5tel) //
+(import ./armv5tel.nix) //
 
 {
   bootstrapTools = {

pkgs/stdenv/linux/bootstrap/armv7l/default.nix

@@ -1,3 +0,0 @@
-# rely on ARM backward compatibility to build armv7l binaries with the
-# bootstrap tools of armv5tel.
-import ../armv5tel

pkgs/stdenv/linux/bootstrap/x86_64.nix

@@ -1,6 +1,6 @@
 # Use the static tools for i686-linux.  They work on x86_64-linux
 # machines as well.
-(import ../i686) //
+(import ./i686.nix) //
 
 {
   bootstrapTools = {

pkgs/stdenv/linux/default.nix

@@ -14,12 +14,12 @@ rec {
   lib = import ../../../lib;
 
   bootstrapFiles =
-    if system == "i686-linux" then import ./bootstrap/i686
-    else if system == "x86_64-linux" then import ./bootstrap/x86_64
-    else if system == "armv5tel-linux" then import ./bootstrap/armv5tel
-    else if system == "armv6l-linux" then import ./bootstrap/armv6l
-    else if system == "armv7l-linux" then import ./bootstrap/armv6l
-    else if system == "mips64el-linux" then import ./bootstrap/loongson2f
+    if system == "i686-linux" then import ./bootstrap/i686.nix
+    else if system == "x86_64-linux" then import ./bootstrap/x86_64.nix
+    else if system == "armv5tel-linux" then import ./bootstrap/armv5tel.nix
+    else if system == "armv6l-linux" then import ./bootstrap/armv6l.nix
+    else if system == "armv7l-linux" then import ./bootstrap/armv6l.nix
+    else if system == "mips64el-linux" then import ./bootstrap/loongson2f.nix
     else abort "unsupported platform for the pure Linux stdenv";