Merge pull request #258476 from Artturin/bootstrapthingies2

2 files changed, 10 insertions, 54 deletions

diff --git a/pkgs/stdenv/linux/bootstrap-files/loongson2f.nix b/pkgs/stdenv/linux/bootstrap-files/loongson2f.nix
deleted file mode 100644
index 8e22a274974..00000000000
--- a/pkgs/stdenv/linux/bootstrap-files/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/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index e67b5aef95c..b5e1b6c7a47 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -12,21 +12,21 @@ let
     pkgs = releaseLib.pkgsForCross crossSystem system;
   };
 in lib.mapAttrs (n: make) (with lib.systems.examples; {
+  # NOTE: Only add platforms for which there are files in `./bootstrap-files`.
+  # Sort following the sorting in `./default.nix` `bootstrapFiles` argument.
+
   armv5tel   = sheevaplug;
-  pogoplug4  = pogoplug4;
   armv6l     = raspberryPi;
   armv7l     = armv7l-hf-multiplatform;
   aarch64    = aarch64-multiplatform;
-  x86_64-musl  = musl64;
-  armv6l-musl  = muslpi;
-  aarch64-musl = aarch64-multiplatform-musl;
-  riscv64 = riscv64;
-  loongarch64-linux = loongarch64-linux;
+  mipsel-linux-gnu         = mipsel-linux-gnu;
   mips64el-linux-gnuabin32 = mips64el-linux-gnuabin32;
   mips64el-linux-gnuabi64  = mips64el-linux-gnuabi64;
-  mipsel-linux-gnu         = mipsel-linux-gnu;
-  powerpc64 = ppc64;
-  powerpc64-musl = ppc64-musl;
   powerpc64le = powernv;
-  powerpc64le-musl = musl-power;
+  riscv64 = riscv64;
+
+  # musl
+  aarch64-musl = aarch64-multiplatform-musl;
+  armv6l-musl  = muslpi;
+  x86_64-musl  = musl64;
 })