Unverified Commit 8d77d21c authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-nixos

parents a7053228 e778006a

lib/systems/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -300,6 +300,8 @@ let 
            "powerpc"

          else if final.isRiscV then

            "riscv"

          else if final.isSh4 then

            "sh"

          else if final.isS390 then

            "s390"

          else if final.isLoongArch64 then

lib/systems/doubles.nix

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ let 
    "i686-linux"

    "loongarch64-linux"

    "m68k-linux"

    "sh4-linux"

    "microblaze-linux"

    "microblazeel-linux"

    "mips-linux"
@@ -145,6 +146,7 @@ in 
  or1k = filterDoubles predicates.isOr1k;

  m68k = filterDoubles predicates.isM68k;

  arc = filterDoubles predicates.isArc;

  sh4 = filterDoubles predicates.isSh4;

  s390 = filterDoubles predicates.isS390;

  s390x = filterDoubles predicates.isS390x;

  loongarch64 = filterDoubles predicates.isLoongArch64;

lib/systems/examples.nix

+4 −0
Original line number Diff line number Diff line
@@ -243,6 +243,10 @@ rec { 
    config = "arc-unknown-linux-gnu";

  };



  sh4 = {

    config = "sh4-unknown-linux-gnu";

  };



  s390 = {

    config = "s390-unknown-linux-gnu";

  };

lib/systems/inspect.nix

+5 −0
Original line number Diff line number Diff line
@@ -234,6 +234,11 @@ rec { 
        family = "arc";

      };

    };

    isSh4 = {

      cpu = {

        family = "sh";

      };

    };

    isS390 = {

      cpu = {

        family = "s390";

lib/systems/parse.nix

+6 −0
Original line number Diff line number Diff line
@@ -284,6 +284,12 @@ rec { 
        family = "m68k";

      };



      sh4 = {

        bits = 32;

        significantByte = littleEndian;

        family = "sh";

      };



      powerpc = {

        bits = 32;

        significantByte = bigEndian;