cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

lib.systems, test.cross.sanity: add test case for #264989

Browse source 
We have several cross-compilation bugs that show up if
hostPlatform!=buildPlatform yet
hostPlatform.config==buildPlatform.config.

These bugs have appeared and disappeared as we've fiddled with the
definition of equality for platform objects.  This commit adds a
clear-cut case where they are *not* equal and never will be, so we
can test it.
This commit is contained in:
Adam Joseph 2023-11-02 03:40:19 -07:00 committed by Adam Joseph
parent af016cfe8f
commit 72c279f477
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/systems/examples.nix
View file

@ -115,6 +115,7 @@ rec {
}; };
gnu64 = { config = "x86_64-unknown-linux-gnu"; }; gnu64 = { config = "x86_64-unknown-linux-gnu"; };
gnu64_simplekernel = gnu64 // platforms.pc_simplekernel; # see test/cross/default.nix
gnu32 = { config = "i686-unknown-linux-gnu"; }; gnu32 = { config = "i686-unknown-linux-gnu"; };
musl64 = { config = "x86_64-unknown-linux-musl"; }; musl64 = { config = "x86_64-unknown-linux-musl"; };

1
pkgs/test/cross/default.nix
View file

@ -134,6 +134,7 @@ let
pkgs.pkgsMusl.stdenv pkgs.pkgsMusl.stdenv
pkgs.pkgsLLVM.stdenv pkgs.pkgsLLVM.stdenv
pkgs.pkgsStatic.bash pkgs.pkgsStatic.bash
#pkgs.pkgsCross.gnu64_simplekernel.bash # https://github.com/NixOS/nixpkgs/issues/264989
pkgs.pkgsCross.arm-embedded.stdenv pkgs.pkgsCross.arm-embedded.stdenv
pkgs.pkgsCross.sheevaplug.stdenv # for armv5tel pkgs.pkgsCross.sheevaplug.stdenv # for armv5tel
pkgs.pkgsCross.raspberryPi.stdenv # for armv6l pkgs.pkgsCross.raspberryPi.stdenv # for armv6l