From 670256dc399ab637fa94df9a90fb13f275c39f8a Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 15 Dec 2016 17:05:39 -0500 Subject: [PATCH] linux stdenv: Rename the `bootstrap` directory to `bootstrap-files` --- .../{bootstrap => bootstrap-files}/armv5tel.nix | 0 .../linux/{bootstrap => bootstrap-files}/armv6l.nix | 0 .../linux/{bootstrap => bootstrap-files}/armv7l.nix | 0 .../linux/{bootstrap => bootstrap-files}/i686.nix | 0 .../{bootstrap => bootstrap-files}/loongson2f.nix | 0 .../linux/{bootstrap => bootstrap-files}/x86_64.nix | 0 pkgs/stdenv/linux/default.nix | 12 ++++++------ 7 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/stdenv/linux/{bootstrap => bootstrap-files}/armv5tel.nix (100%) rename pkgs/stdenv/linux/{bootstrap => bootstrap-files}/armv6l.nix (100%) rename pkgs/stdenv/linux/{bootstrap => bootstrap-files}/armv7l.nix (100%) rename pkgs/stdenv/linux/{bootstrap => bootstrap-files}/i686.nix (100%) rename pkgs/stdenv/linux/{bootstrap => bootstrap-files}/loongson2f.nix (100%) rename pkgs/stdenv/linux/{bootstrap => bootstrap-files}/x86_64.nix (100%) diff --git a/pkgs/stdenv/linux/bootstrap/armv5tel.nix b/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix similarity index 100% rename from pkgs/stdenv/linux/bootstrap/armv5tel.nix rename to pkgs/stdenv/linux/bootstrap-files/armv5tel.nix diff --git a/pkgs/stdenv/linux/bootstrap/armv6l.nix b/pkgs/stdenv/linux/bootstrap-files/armv6l.nix similarity index 100% rename from pkgs/stdenv/linux/bootstrap/armv6l.nix rename to pkgs/stdenv/linux/bootstrap-files/armv6l.nix diff --git a/pkgs/stdenv/linux/bootstrap/armv7l.nix b/pkgs/stdenv/linux/bootstrap-files/armv7l.nix similarity index 100% rename from pkgs/stdenv/linux/bootstrap/armv7l.nix rename to pkgs/stdenv/linux/bootstrap-files/armv7l.nix diff --git a/pkgs/stdenv/linux/bootstrap/i686.nix b/pkgs/stdenv/linux/bootstrap-files/i686.nix similarity index 100% rename from pkgs/stdenv/linux/bootstrap/i686.nix rename to pkgs/stdenv/linux/bootstrap-files/i686.nix diff --git a/pkgs/stdenv/linux/bootstrap/loongson2f.nix b/pkgs/stdenv/linux/bootstrap-files/loongson2f.nix similarity index 100% rename from pkgs/stdenv/linux/bootstrap/loongson2f.nix rename to pkgs/stdenv/linux/bootstrap-files/loongson2f.nix diff --git a/pkgs/stdenv/linux/bootstrap/x86_64.nix b/pkgs/stdenv/linux/bootstrap-files/x86_64.nix similarity index 100% rename from pkgs/stdenv/linux/bootstrap/x86_64.nix rename to pkgs/stdenv/linux/bootstrap-files/x86_64.nix diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 34196359f52..a39ff61a8b5 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -7,12 +7,12 @@ , system, platform, crossSystem, config , bootstrapFiles ? - 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/armv7l.nix - else if system == "mips64el-linux" then import ./bootstrap/loongson2f.nix + if system == "i686-linux" then import ./bootstrap-files/i686.nix + else if system == "x86_64-linux" then import ./bootstrap-files/x86_64.nix + else if system == "armv5tel-linux" then import ./bootstrap-files/armv5tel.nix + else if system == "armv6l-linux" then import ./bootstrap-files/armv6l.nix + else if system == "armv7l-linux" then import ./bootstrap-files/armv7l.nix + else if system == "mips64el-linux" then import ./bootstrap-files/loongson2f.nix else abort "unsupported platform for the pure Linux stdenv" }: