diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-18 00:03:09 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-18 00:03:09 +0000 |
| commit | 691557fc473dc925c64c9b09056b637048c2d097 (patch) | |
| tree | c4f09985a42d68366f7304570dcba2ce188554fd /pkgs/stdenv | |
| parent | 739cf04cb74bc5c7982f8a7c65978eaaa513b068 (diff) | |
| parent | 928d6360d340fff71e2140de76b2edf381e6d2b1 (diff) | |
| download | nixpkgs-691557fc473dc925c64c9b09056b637048c2d097.tar nixpkgs-691557fc473dc925c64c9b09056b637048c2d097.tar.gz nixpkgs-691557fc473dc925c64c9b09056b637048c2d097.tar.bz2 nixpkgs-691557fc473dc925c64c9b09056b637048c2d097.tar.lz nixpkgs-691557fc473dc925c64c9b09056b637048c2d097.tar.xz nixpkgs-691557fc473dc925c64c9b09056b637048c2d097.tar.zst nixpkgs-691557fc473dc925c64c9b09056b637048c2d097.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index 0d328d98ba1..25a593c6743 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -53,6 +53,7 @@ in armv8m-linux = stagesLinux; aarch64-linux = stagesLinux; mipsel-linux = stagesLinux; + mips64el-linux = stagesLinux; powerpc-linux = /* stagesLinux */ stagesNative; powerpc64-linux = stagesLinux; powerpc64le-linux = stagesLinux; diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index d8ab96952b7..a21f677f117 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -17,6 +17,8 @@ in lib.mapAttrs (n: make) (with lib.systems.examples; { armv6l-musl = muslpi; aarch64-musl = aarch64-multiplatform-musl; riscv64 = riscv64; + mips64el-linux-gnuabin32 = lib.systems.platforms.mips64el-linux-gnuabin32; + mips64el-linux-gnuabi64 = lib.systems.platforms.mips64el-linux-gnuabi64; powerpc64 = ppc64; powerpc64-musl = ppc64-musl; powerpc64le = powernv; |