From 670256dc399ab637fa94df9a90fb13f275c39f8a Mon Sep 17 00:00:00 2001
From: John Ericson <jericson@galois.com>
Date: Thu, 15 Dec 2016 17:05:39 -0500
Subject: linux stdenv: Rename the `bootstrap` directory to `bootstrap-files`

---
 pkgs/stdenv/linux/bootstrap-files/armv5tel.nix   | 12 +++++++
 pkgs/stdenv/linux/bootstrap-files/armv6l.nix     | 12 +++++++
 pkgs/stdenv/linux/bootstrap-files/armv7l.nix     | 12 +++++++
 pkgs/stdenv/linux/bootstrap-files/i686.nix       | 12 +++++++
 pkgs/stdenv/linux/bootstrap-files/loongson2f.nix | 44 ++++++++++++++++++++++++
 pkgs/stdenv/linux/bootstrap-files/x86_64.nix     |  9 +++++
 pkgs/stdenv/linux/bootstrap/armv5tel.nix         | 12 -------
 pkgs/stdenv/linux/bootstrap/armv6l.nix           | 12 -------
 pkgs/stdenv/linux/bootstrap/armv7l.nix           | 12 -------
 pkgs/stdenv/linux/bootstrap/i686.nix             | 12 -------
 pkgs/stdenv/linux/bootstrap/loongson2f.nix       | 44 ------------------------
 pkgs/stdenv/linux/bootstrap/x86_64.nix           |  9 -----
 pkgs/stdenv/linux/default.nix                    | 12 +++----
 13 files changed, 107 insertions(+), 107 deletions(-)
 create mode 100644 pkgs/stdenv/linux/bootstrap-files/armv5tel.nix
 create mode 100644 pkgs/stdenv/linux/bootstrap-files/armv6l.nix
 create mode 100644 pkgs/stdenv/linux/bootstrap-files/armv7l.nix
 create mode 100644 pkgs/stdenv/linux/bootstrap-files/i686.nix
 create mode 100644 pkgs/stdenv/linux/bootstrap-files/loongson2f.nix
 create mode 100644 pkgs/stdenv/linux/bootstrap-files/x86_64.nix
 delete mode 100644 pkgs/stdenv/linux/bootstrap/armv5tel.nix
 delete mode 100644 pkgs/stdenv/linux/bootstrap/armv6l.nix
 delete mode 100644 pkgs/stdenv/linux/bootstrap/armv7l.nix
 delete mode 100644 pkgs/stdenv/linux/bootstrap/i686.nix
 delete mode 100644 pkgs/stdenv/linux/bootstrap/loongson2f.nix
 delete mode 100644 pkgs/stdenv/linux/bootstrap/x86_64.nix

(limited to 'pkgs/stdenv')

diff --git a/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix b/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix
new file mode 100644
index 000000000000..9781414895b8
--- /dev/null
+++ b/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix
@@ -0,0 +1,12 @@
+{
+  busybox = import <nix/fetchurl.nix> {
+    url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv5tel/busybox;
+    sha256 = "03i90dwkly1j2a7i12qixkybjz2b24ixjrl7zsr17s1sv6m27zba";
+    executable = true;
+  };
+
+  bootstrapTools = import <nix/fetchurl.nix> {
+    url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv5tel/bootstrap-tools.tar.xz;
+    sha256 = "1sikiydjlbv8v35fgjvr5swgvj6bc83gmrbjrhpi0hyzyfcinxbn";
+  };
+}
diff --git a/pkgs/stdenv/linux/bootstrap-files/armv6l.nix b/pkgs/stdenv/linux/bootstrap-files/armv6l.nix
new file mode 100644
index 000000000000..76fe900b9ae9
--- /dev/null
+++ b/pkgs/stdenv/linux/bootstrap-files/armv6l.nix
@@ -0,0 +1,12 @@
+{
+  busybox = import <nix/fetchurl.nix> {
+    url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv6l/busybox;
+    sha256 = "1vl1nx7ccalp2w8d5ymj6i2vs0s9w80xvxpsxl2l24k5ibbspcy0";
+    executable = true;
+  };
+
+  bootstrapTools = import <nix/fetchurl.nix> {
+    url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv6l/bootstrap-tools.tar.xz;
+    sha256 = "106f3r1ndl9h1cbxn44vwn3kkhgi8a937xx1v9n40zfx6dzzfv25";
+  };
+}
diff --git a/pkgs/stdenv/linux/bootstrap-files/armv7l.nix b/pkgs/stdenv/linux/bootstrap-files/armv7l.nix
new file mode 100644
index 000000000000..91452d639c47
--- /dev/null
+++ b/pkgs/stdenv/linux/bootstrap-files/armv7l.nix
@@ -0,0 +1,12 @@
+{
+  busybox = import <nix/fetchurl.nix> {
+    url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv7l/busybox;
+    sha256 = "0kb439p37rzlascp6ldm4kwf5kwd6p3lv17c41zwj20wbv8sdilq";
+    executable = true;
+  };
+
+  bootstrapTools = import <nix/fetchurl.nix> {
+    url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv7l/bootstrap-tools.tar.xz;
+    sha256 = "0h75xbpkyzhvmjzhj9i598p0cq60py7v0b8lryrvcqw7qjlbgrsd";
+  };
+}
diff --git a/pkgs/stdenv/linux/bootstrap-files/i686.nix b/pkgs/stdenv/linux/bootstrap-files/i686.nix
new file mode 100644
index 000000000000..cf484fd92533
--- /dev/null
+++ b/pkgs/stdenv/linux/bootstrap-files/i686.nix
@@ -0,0 +1,12 @@
+{
+  busybox = import <nix/fetchurl.nix> {
+    url = http://tarballs.nixos.org/stdenv-linux/i686/4907fc9e8d0d82b28b3c56e3a478a2882f1d700f/busybox;
+    sha256 = "ef4c1be6c7ae57e4f654efd90ae2d2e204d6769364c46469fa9ff3761195cba1";
+    executable = true;
+  };
+
+  bootstrapTools = import <nix/fetchurl.nix> {
+    url = http://tarballs.nixos.org/stdenv-linux/i686/4907fc9e8d0d82b28b3c56e3a478a2882f1d700f/bootstrap-tools.tar.xz;
+    sha256 = "cf920d26d94335f5cb46e247455d0e5389765d16a2b8fc233b792a655b5b58aa";
+  };
+}
diff --git a/pkgs/stdenv/linux/bootstrap-files/loongson2f.nix b/pkgs/stdenv/linux/bootstrap-files/loongson2f.nix
new file mode 100644
index 000000000000..8e22a274974a
--- /dev/null
+++ b/pkgs/stdenv/linux/bootstrap-files/loongson2f.nix
@@ -0,0 +1,44 @@
+let
+
+  fetch = { file, sha256 }: import <nix/fetchurl.nix> {
+    url = "http://tarballs.nixos.org/stdenv-linux/loongson2f/r22849/${file}";
+    inherit sha256;
+    executable = true;
+  };
+
+in {
+  sh = fetch {
+    file = "sh";
+    sha256 = "02jjl49wdq85pgh61aqf78yaknn9mi3rcspbpk7hs9c4mida2rhf";
+  };
+
+  bzip2 = fetch {
+    file = "bzip2";
+    sha256 = "1qn27y3amj9c6mnjk2kyb59y0d2w4yv16z9apaxx91hyq19gf29z";
+  };
+
+  mkdir = fetch {
+    file = "mkdir";
+    sha256 = "1vbp2bv9hkyb2fwl8hjrffpywn1wrl1kc4yrwi2lirawlnc6kymh";
+  };
+
+  cpio = fetch {
+    file = "cpio";
+    sha256 = "0mqxwdx0sl7skxx6049mk35l7d0fnibqsv174284kdp4p7iixwa0";
+  };
+
+  ln = fetch {
+    file = "ln";
+    sha256 = "05lwx8qvga3yv8xhs8bjgsfygsfrcxsfck0lxw6gsdckx25fgi7s";
+  };
+
+  curl = fetch {
+    file = "curl.bz2";
+    sha256 = "0iblnz4my54gryac04i64fn3ksi9g3dx96yjq93fj39z6kx6151c";
+  };
+
+  bootstrapTools = {
+    url = "http://tarballs.nixos.org/stdenv-linux/loongson2f/r22849/cross-bootstrap-tools.cpio.bz2";
+    sha256 = "00aavbk76qjj2gdlmpaaj66r8nzl4d7pyl8cv1gigyzgpbr5vv3j";
+  };
+}
diff --git a/pkgs/stdenv/linux/bootstrap-files/x86_64.nix b/pkgs/stdenv/linux/bootstrap-files/x86_64.nix
new file mode 100644
index 000000000000..69d08c5e981a
--- /dev/null
+++ b/pkgs/stdenv/linux/bootstrap-files/x86_64.nix
@@ -0,0 +1,9 @@
+# Use busybox for i686-linux since it works on x86_64-linux as well.
+(import ./i686.nix) //
+
+{
+  bootstrapTools = import <nix/fetchurl.nix> {
+    url = http://tarballs.nixos.org/stdenv-linux/x86_64/4907fc9e8d0d82b28b3c56e3a478a2882f1d700f/bootstrap-tools.tar.xz;
+    sha256 = "abe3f0727dd771a60b7922892d308da1bc7b082afc13440880862f0c8823c09f";
+  };
+}
diff --git a/pkgs/stdenv/linux/bootstrap/armv5tel.nix b/pkgs/stdenv/linux/bootstrap/armv5tel.nix
deleted file mode 100644
index 9781414895b8..000000000000
--- a/pkgs/stdenv/linux/bootstrap/armv5tel.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  busybox = import <nix/fetchurl.nix> {
-    url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv5tel/busybox;
-    sha256 = "03i90dwkly1j2a7i12qixkybjz2b24ixjrl7zsr17s1sv6m27zba";
-    executable = true;
-  };
-
-  bootstrapTools = import <nix/fetchurl.nix> {
-    url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv5tel/bootstrap-tools.tar.xz;
-    sha256 = "1sikiydjlbv8v35fgjvr5swgvj6bc83gmrbjrhpi0hyzyfcinxbn";
-  };
-}
diff --git a/pkgs/stdenv/linux/bootstrap/armv6l.nix b/pkgs/stdenv/linux/bootstrap/armv6l.nix
deleted file mode 100644
index 76fe900b9ae9..000000000000
--- a/pkgs/stdenv/linux/bootstrap/armv6l.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  busybox = import <nix/fetchurl.nix> {
-    url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv6l/busybox;
-    sha256 = "1vl1nx7ccalp2w8d5ymj6i2vs0s9w80xvxpsxl2l24k5ibbspcy0";
-    executable = true;
-  };
-
-  bootstrapTools = import <nix/fetchurl.nix> {
-    url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv6l/bootstrap-tools.tar.xz;
-    sha256 = "106f3r1ndl9h1cbxn44vwn3kkhgi8a937xx1v9n40zfx6dzzfv25";
-  };
-}
diff --git a/pkgs/stdenv/linux/bootstrap/armv7l.nix b/pkgs/stdenv/linux/bootstrap/armv7l.nix
deleted file mode 100644
index 91452d639c47..000000000000
--- a/pkgs/stdenv/linux/bootstrap/armv7l.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  busybox = import <nix/fetchurl.nix> {
-    url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv7l/busybox;
-    sha256 = "0kb439p37rzlascp6ldm4kwf5kwd6p3lv17c41zwj20wbv8sdilq";
-    executable = true;
-  };
-
-  bootstrapTools = import <nix/fetchurl.nix> {
-    url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv7l/bootstrap-tools.tar.xz;
-    sha256 = "0h75xbpkyzhvmjzhj9i598p0cq60py7v0b8lryrvcqw7qjlbgrsd";
-  };
-}
diff --git a/pkgs/stdenv/linux/bootstrap/i686.nix b/pkgs/stdenv/linux/bootstrap/i686.nix
deleted file mode 100644
index cf484fd92533..000000000000
--- a/pkgs/stdenv/linux/bootstrap/i686.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  busybox = import <nix/fetchurl.nix> {
-    url = http://tarballs.nixos.org/stdenv-linux/i686/4907fc9e8d0d82b28b3c56e3a478a2882f1d700f/busybox;
-    sha256 = "ef4c1be6c7ae57e4f654efd90ae2d2e204d6769364c46469fa9ff3761195cba1";
-    executable = true;
-  };
-
-  bootstrapTools = import <nix/fetchurl.nix> {
-    url = http://tarballs.nixos.org/stdenv-linux/i686/4907fc9e8d0d82b28b3c56e3a478a2882f1d700f/bootstrap-tools.tar.xz;
-    sha256 = "cf920d26d94335f5cb46e247455d0e5389765d16a2b8fc233b792a655b5b58aa";
-  };
-}
diff --git a/pkgs/stdenv/linux/bootstrap/loongson2f.nix b/pkgs/stdenv/linux/bootstrap/loongson2f.nix
deleted file mode 100644
index 8e22a274974a..000000000000
--- a/pkgs/stdenv/linux/bootstrap/loongson2f.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-let
-
-  fetch = { file, sha256 }: import <nix/fetchurl.nix> {
-    url = "http://tarballs.nixos.org/stdenv-linux/loongson2f/r22849/${file}";
-    inherit sha256;
-    executable = true;
-  };
-
-in {
-  sh = fetch {
-    file = "sh";
-    sha256 = "02jjl49wdq85pgh61aqf78yaknn9mi3rcspbpk7hs9c4mida2rhf";
-  };
-
-  bzip2 = fetch {
-    file = "bzip2";
-    sha256 = "1qn27y3amj9c6mnjk2kyb59y0d2w4yv16z9apaxx91hyq19gf29z";
-  };
-
-  mkdir = fetch {
-    file = "mkdir";
-    sha256 = "1vbp2bv9hkyb2fwl8hjrffpywn1wrl1kc4yrwi2lirawlnc6kymh";
-  };
-
-  cpio = fetch {
-    file = "cpio";
-    sha256 = "0mqxwdx0sl7skxx6049mk35l7d0fnibqsv174284kdp4p7iixwa0";
-  };
-
-  ln = fetch {
-    file = "ln";
-    sha256 = "05lwx8qvga3yv8xhs8bjgsfygsfrcxsfck0lxw6gsdckx25fgi7s";
-  };
-
-  curl = fetch {
-    file = "curl.bz2";
-    sha256 = "0iblnz4my54gryac04i64fn3ksi9g3dx96yjq93fj39z6kx6151c";
-  };
-
-  bootstrapTools = {
-    url = "http://tarballs.nixos.org/stdenv-linux/loongson2f/r22849/cross-bootstrap-tools.cpio.bz2";
-    sha256 = "00aavbk76qjj2gdlmpaaj66r8nzl4d7pyl8cv1gigyzgpbr5vv3j";
-  };
-}
diff --git a/pkgs/stdenv/linux/bootstrap/x86_64.nix b/pkgs/stdenv/linux/bootstrap/x86_64.nix
deleted file mode 100644
index 69d08c5e981a..000000000000
--- a/pkgs/stdenv/linux/bootstrap/x86_64.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-# Use busybox for i686-linux since it works on x86_64-linux as well.
-(import ./i686.nix) //
-
-{
-  bootstrapTools = import <nix/fetchurl.nix> {
-    url = http://tarballs.nixos.org/stdenv-linux/x86_64/4907fc9e8d0d82b28b3c56e3a478a2882f1d700f/bootstrap-tools.tar.xz;
-    sha256 = "abe3f0727dd771a60b7922892d308da1bc7b082afc13440880862f0c8823c09f";
-  };
-}
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 34196359f525..a39ff61a8b54 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"
 }:
 
-- 
cgit 1.4.1