Merge pull request #35337 from dtzWill/feature/release-cross-minor-cleanup

release-cross: minor cleanup, add aarch64-musl

Changed files
+13 -20
pkgs
top-level
+13 -20
pkgs/top-level/release-cross.nix
···
buildPackages.binutils = darwin;
};
+
rpiCommon = linuxCommon // {
+
vim = nativePlatforms;
+
unzip = nativePlatforms;
+
ddrescue = nativePlatforms;
+
lynx = nativePlatforms;
+
patchelf = nativePlatforms;
+
buildPackages.binutils = nativePlatforms;
+
mpg123 = nativePlatforms;
+
};
in
{
···
fuloongminipc = mapTestOnCross lib.systems.examples.fuloongminipc linuxCommon;
/* Linux on Raspberrypi */
-
rpi = mapTestOnCross lib.systems.examples.raspberryPi (linuxCommon // {
-
vim = nativePlatforms;
-
unzip = nativePlatforms;
-
ddrescue = nativePlatforms;
-
lynx = nativePlatforms;
-
patchelf = nativePlatforms;
-
buildPackages.binutils = nativePlatforms;
-
mpg123 = nativePlatforms;
-
});
+
rpi = mapTestOnCross lib.systems.examples.raspberryPi rpiCommon;
+
rpi-musl = mapTestOnCross lib.systems.examples.muslpi rpiCommon;
/* Linux on Aarch64 (TODO make android for real) */
-
android = mapTestOnCross lib.systems.examples.aarch64-multiplatform (linuxCommon // {
-
});
+
android = mapTestOnCross lib.systems.examples.aarch64-multiplatform linuxCommon;
+
aarch64-musl = mapTestOnCross lib.systems.examples.aarch64-multiplatform-musl linuxCommon;
x86_64-musl = mapTestOnCross lib.systems.examples.musl64 linuxCommon;
-
rpi-musl = mapTestOnCross lib.systems.examples.muslpi (linuxCommon // {
-
vim = nativePlatforms;
-
unzip = nativePlatforms;
-
ddrescue = nativePlatforms;
-
lynx = nativePlatforms;
-
patchelf = nativePlatforms;
-
buildPackages.binutils = nativePlatforms;
-
mpg123 = nativePlatforms;
-
});
/* Cross-built bootstrap tools for every supported platform */
bootstrapTools = let