From df7bf1764399517b58d622d9b76f87c9561b3b99 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 1 Oct 2023 23:53:15 +0300 Subject: bootstrap-tools-cross: remove bootstrap files for systems which are not used in stdenv/linux/default.nix --- pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 5 ----- 1 file changed, 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index e67b5aef95c56..c66acea685c3d 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -13,7 +13,6 @@ let }; in lib.mapAttrs (n: make) (with lib.systems.examples; { armv5tel = sheevaplug; - pogoplug4 = pogoplug4; armv6l = raspberryPi; armv7l = armv7l-hf-multiplatform; aarch64 = aarch64-multiplatform; @@ -21,12 +20,8 @@ in lib.mapAttrs (n: make) (with lib.systems.examples; { armv6l-musl = muslpi; aarch64-musl = aarch64-multiplatform-musl; riscv64 = riscv64; - loongarch64-linux = loongarch64-linux; 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; }) -- cgit 1.4.1 From a1c2c50cbc481337294c9b75b85df36720ebee00 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 1 Oct 2023 23:54:39 +0300 Subject: bootstrap-tools-cross: sort --- pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index c66acea685c3d..1aebb898b64f7 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -12,16 +12,19 @@ let pkgs = releaseLib.pkgsForCross crossSystem system; }; in lib.mapAttrs (n: make) (with lib.systems.examples; { + # Sort following the sorting in `pkgs/stdenv/linux/default.nix` `bootstrapFiles` argument. armv5tel = sheevaplug; armv6l = raspberryPi; armv7l = armv7l-hf-multiplatform; aarch64 = aarch64-multiplatform; - x86_64-musl = musl64; - armv6l-musl = muslpi; - aarch64-musl = aarch64-multiplatform-musl; - riscv64 = riscv64; + mipsel-linux-gnu = mipsel-linux-gnu; mips64el-linux-gnuabin32 = mips64el-linux-gnuabin32; mips64el-linux-gnuabi64 = mips64el-linux-gnuabi64; - mipsel-linux-gnu = mipsel-linux-gnu; powerpc64le = powernv; + riscv64 = riscv64; + + # musl + aarch64-musl = aarch64-multiplatform-musl; + armv6l-musl = muslpi; + x86_64-musl = musl64; }) -- cgit 1.4.1 From 46ecf91843ed7cf4c16ce9073f8aa0a25ff6704a Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 30 Sep 2023 23:21:52 +0300 Subject: stdenv: remove unused loongson2f bootstrap files The last use of it was removed in (linux/default.nix: use mipsel.nix instead of longson.nix for mips32)[e8b10284f32b32469d5f54433e5c5a75448b327b]. --- pkgs/stdenv/linux/bootstrap-files/loongson2f.nix | 44 ------------------------ 1 file changed, 44 deletions(-) delete mode 100644 pkgs/stdenv/linux/bootstrap-files/loongson2f.nix (limited to 'pkgs') diff --git a/pkgs/stdenv/linux/bootstrap-files/loongson2f.nix b/pkgs/stdenv/linux/bootstrap-files/loongson2f.nix deleted file mode 100644 index 8e22a274974a1..0000000000000 --- a/pkgs/stdenv/linux/bootstrap-files/loongson2f.nix +++ /dev/null @@ -1,44 +0,0 @@ -let - - fetch = { file, sha256 }: import { - 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"; - }; -} -- cgit 1.4.1 From 0848edf7a091235297aacb6de04677c1d70de1c4 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 2 Oct 2023 01:30:11 +0300 Subject: bootstrap-tools-cross: Add a note about what should be here --- pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 1aebb898b64f7..b5e1b6c7a4718 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -12,7 +12,9 @@ let pkgs = releaseLib.pkgsForCross crossSystem system; }; in lib.mapAttrs (n: make) (with lib.systems.examples; { - # Sort following the sorting in `pkgs/stdenv/linux/default.nix` `bootstrapFiles` argument. + # NOTE: Only add platforms for which there are files in `./bootstrap-files`. + # Sort following the sorting in `./default.nix` `bootstrapFiles` argument. + armv5tel = sheevaplug; armv6l = raspberryPi; armv7l = armv7l-hf-multiplatform; -- cgit 1.4.1