Commit 5c4fa41d authored by John Ericson's avatar John Ericson
Browse files

Merge a lib change into staging

parents bfb7ef86 02464668

lib/systems/inspect.nix

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ rec { 
    "64bit"      = { cpu = { bits = 64; }; };

    i686         = { cpu = cpuTypes.i686; };

    x86_64       = { cpu = cpuTypes.x86_64; };

    PowerPC      = { cpu = cpuTypes.powerpc; };

    x86          = { cpu = { family = "x86"; }; };

    Arm          = { cpu = { family = "arm"; }; };

    Mips         = { cpu = { family = "mips"; }; };

lib/systems/parse.nix

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ rec { 
    i686     = { bits = 32; significantByte = littleEndian; family = "x86"; };

    x86_64   = { bits = 64; significantByte = littleEndian; family = "x86"; };

    mips64el = { bits = 32; significantByte = littleEndian; family = "mips"; };

    powerpc  = { bits = 32; significantByte = bigEndian;    family = "powerpc"; };

    powerpc  = { bits = 32; significantByte = bigEndian;    family = "power"; };

  };



  isVendor = isType "vendor";