diff options
| author | Adam Joseph <adam@westernsemico.com> | 2023-11-02 03:40:19 -0700 |
|---|---|---|
| committer | Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com> | 2023-11-04 05:57:34 +0000 |
| commit | 72c279f477f42f66cf7013d5a01762d32d215bff (patch) | |
| tree | 151167b20a449814692c8d13110b9f9fa16de602 | |
| parent | af016cfe8ff7e41638d1da6a3278a3e1020ac753 (diff) | |
lib.systems, test.cross.sanity: add test case for #264989
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.
| -rw-r--r-- | lib/systems/examples.nix | 1 | ||||
| -rw-r--r-- | pkgs/test/cross/default.nix | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 0e704b7d7de0d..75578b9749454 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -115,6 +115,7 @@ rec { }; gnu64 = { config = "x86_64-unknown-linux-gnu"; }; + gnu64_simplekernel = gnu64 // platforms.pc_simplekernel; # see test/cross/default.nix gnu32 = { config = "i686-unknown-linux-gnu"; }; musl64 = { config = "x86_64-unknown-linux-musl"; }; diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix index f844fc2b8ec55..124f6eec10ae6 100644 --- a/pkgs/test/cross/default.nix +++ b/pkgs/test/cross/default.nix @@ -134,6 +134,7 @@ let pkgs.pkgsMusl.stdenv pkgs.pkgsLLVM.stdenv pkgs.pkgsStatic.bash + #pkgs.pkgsCross.gnu64_simplekernel.bash # https://github.com/NixOS/nixpkgs/issues/264989 pkgs.pkgsCross.arm-embedded.stdenv pkgs.pkgsCross.sheevaplug.stdenv # for armv5tel pkgs.pkgsCross.raspberryPi.stdenv # for armv6l |