pyrox.dev / nixpkgs
lol
fork atom

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.

Adam Joseph 72c279f4 af016cfe

options
unified split
Changed files
+2
lib
systems
examples.nix
pkgs
test
cross
default.nix
+1
lib/systems/examples.nix 
···

       
115

       
115

       
 

       
  };


     

       
116

       
116

       
 

       



     

       
117

       
117

       
 

       
  gnu64 = { config = "x86_64-unknown-linux-gnu"; };


     

       

       
118

       
+

       
  gnu64_simplekernel = gnu64 // platforms.pc_simplekernel; # see test/cross/default.nix


     

       
118

       
119

       
 

       
  gnu32  = { config = "i686-unknown-linux-gnu"; };


     

       
119

       
120

       
 

       



     

       
120

       
121

       
 

       
  musl64 = { config = "x86_64-unknown-linux-musl"; };
+1
pkgs/test/cross/default.nix 
···

       
134

       
134

       
 

       
    pkgs.pkgsMusl.stdenv


     

       
135

       
135

       
 

       
    pkgs.pkgsLLVM.stdenv


     

       
136

       
136

       
 

       
    pkgs.pkgsStatic.bash


     

       

       
137

       
+

       
    #pkgs.pkgsCross.gnu64_simplekernel.bash   # https://github.com/NixOS/nixpkgs/issues/264989


     

       
137

       
138

       
 

       
    pkgs.pkgsCross.arm-embedded.stdenv


     

       
138

       
139

       
 

       
    pkgs.pkgsCross.sheevaplug.stdenv  # for armv5tel


     

       
139

       
140

       
 

       
    pkgs.pkgsCross.raspberryPi.stdenv  # for armv6l