fix: nix cannot support uint64

Reduces the size of various fields from `uint` or `uint64` as an integer in Nix is always signed.

Where required for true `uint64` values, we hex encode them instead.

For other fields, I have made educated guesses as to their appropriate sizes.

Signed-off-by: Brian McGee <[email protected]>

Author: brianmcgee

pkg/build/build.go

@@ -10,5 +10,5 @@ var (
 	// It is set via Nix to match the Nixpkgs system.
 	System = ""
 	// ReportVersion is used to indicate significant changes in the report output and is embedded JSON report produced.
-	ReportVersion uint = 1
+	ReportVersion uint16 = 1
 )

pkg/facter/facter.go

@@ -17,7 +17,7 @@ import (
 type Report struct {
 	// Version is a monotonically increasing number,
 	// used to indicate breaking changes or new features in the report output.
-	Version uint `json:"version"`
+	Version uint16 `json:"version"`
 
 	// System indicates the system architecture e.g. x86_64-linux.
 	System string `json:"system"`

pkg/hwinfo/detail.go

@@ -90,15 +90,15 @@ func NewDetail(detail *C.hd_detail_t) (Detail, error) {
 }
 
 type MemoryRange struct {
-	Start uint   `json:"start"`
-	Size  uint   `json:"size"`
+	Start string `json:"start"`
+	Size  string `json:"size"`
 	Data  string `json:"-"` // hex encoded
 }
 
 func NewMemoryRange(mem C.memory_range_t) MemoryRange {
 	return MemoryRange{
-		Start: uint(mem.start),
-		Size:  uint(mem.size),
+		Start: fmt.Sprintf("0x%x", uint(mem.start)),
+		Size:  fmt.Sprintf("0x%x", uint(mem.size)),
 		Data:  hex.EncodeToString(C.GoBytes(unsafe.Pointer(&mem.data), C.int(mem.size))), //nolint:gocritic
 	}
 }

pkg/hwinfo/detail_bios.go

@@ -13,16 +13,16 @@ bool bios_info_has_lba_support(bios_info_t *info) { return info->lba_support; }
 import "C"
 
 type ApmInfo struct {
-	Supported  bool `json:"supported"`
-	Enabled    bool `json:"enabled"`
-	Version    uint `json:"version"`
-	SubVersion uint `json:"sub_version"`
-	BiosFlags  uint `json:"bios_flags"`
+	Supported  bool   `json:"supported"`
+	Enabled    bool   `json:"enabled"`
+	Version    uint8  `json:"version"`
+	SubVersion uint8  `json:"sub_version"`
+	BiosFlags  uint32 `json:"bios_flags"`
 }
 
 type VbeInfo struct {
-	Version     uint `json:"version"`
-	VideoMemory uint `json:"video_memory"`
+	Version     uint16 `json:"version"`
+	VideoMemory uint32 `json:"video_memory"`
 }
 
 type DetailBios struct {
@@ -31,14 +31,14 @@ type DetailBios struct {
 	VbeInfo VbeInfo    `json:"vbe_info"`
 
 	// todo par and ser ports
-	PnP           bool `json:"pnp"`
-	PnPId         uint `json:"pnp_id"` // it is still in big endian format
-	LbaSupport    bool `json:"lba_support"`
-	LowMemorySize uint `json:"low_memory_size"`
+	PnP           bool   `json:"pnp"`
+	PnPId         uint   `json:"pnp_id"` // it is still in big endian format
+	LbaSupport    bool   `json:"lba_support"`
+	LowMemorySize uint32 `json:"low_memory_size"`
 	// todo smp info
 	// todo vbe info
 
-	SmbiosVersion uint `json:"smbios_version"`
+	SmbiosVersion uint32 `json:"smbios_version"`
 
 	// todo lcd
 	// todo mouse
@@ -58,18 +58,18 @@ func NewDetailBios(dev C.hd_detail_bios_t) (*DetailBios, error) {
 		ApmInfo: ApmInfo{
 			Supported:  bool(C.bios_info_is_apm_supported(data)),
 			Enabled:    bool(C.bios_info_is_apm_enabled(data)),
-			Version:    uint(data.apm_ver),
-			SubVersion: uint(data.apm_subver),
-			BiosFlags:  uint(data.apm_bios_flags),
+			Version:    uint8(data.apm_ver),
+			SubVersion: uint8(data.apm_subver),
+			BiosFlags:  uint32(data.apm_bios_flags),
 		},
 		VbeInfo: VbeInfo{
-			Version:     uint(data.vbe_ver),
-			VideoMemory: uint(data.vbe_video_mem),
+			Version:     uint16(data.vbe_ver),
+			VideoMemory: uint32(data.vbe_video_mem),
 		},
 		PnP:           bool(C.bios_info_is_pnp_bios(data)),
 		PnPId:         uint(data.pnp_id),
 		LbaSupport:    bool(C.bios_info_has_lba_support(data)),
-		LowMemorySize: uint(data.low_mem_size),
-		SmbiosVersion: uint(data.smbios_ver),
+		LowMemorySize: uint32(data.low_mem_size),
+		SmbiosVersion: uint32(data.smbios_ver),
 	}, nil
 }

pkg/hwinfo/detail_cpu.go

@@ -10,7 +10,11 @@ bool cpu_info_fpu_exception(cpu_info_t *info) { return info->fpu_exception; }
 bool cpu_info_write_protect(cpu_info_t *info) { return info->write_protect; }
 */
 import "C"
-import "regexp"
+
+import (
+	"fmt"
+	"regexp"
+)
 
 //go:generate enumer -type=CPUArch -json -transform=snake -trimprefix CPUArch -output=./detail_enum_cpu_arch.go
 type CPUArch uint //nolint:recvcheck
@@ -36,8 +40,8 @@ const (
 )
 
 type AddressSizes struct {
-	Physical uint `json:"physical,omitempty"`
-	Virtual  uint `json:"virtual,omitempty"`
+	Physical string `json:"physical,omitempty"`
+	Virtual  string `json:"virtual,omitempty"`
 }
 
 type DetailCPU struct {
@@ -48,9 +52,9 @@ type DetailCPU struct {
 	VendorName string `json:"vendor_name,omitempty"`
 	ModelName  string `json:"model_name,omitempty"`
 
-	Family   uint `json:"family"`
-	Model    uint `json:"model"`
-	Stepping uint `json:"stepping"`
+	Family   uint16 `json:"family"`
+	Model    uint16 `json:"model"`
+	Stepping uint32 `json:"stepping"`
 
 	Platform string `json:"platform,omitempty"`
 
@@ -59,21 +63,21 @@ type DetailCPU struct {
 	PowerManagement []string `json:"power_management,omitempty"`
 
 	Bogo  float64 `json:"bogo"`
-	Cache uint    `json:"cache,omitempty"`
-	Units uint    `json:"units,omitempty"`
+	Cache uint32  `json:"cache,omitempty"`
+	Units uint32  `json:"units,omitempty"`
 	Clock uint    `json:"-"`
 
 	// x86 only fields
-	PhysicalID     uint         `json:"physical_id"`
-	Siblings       uint         `json:"siblings,omitempty"`
-	Cores          uint         `json:"cores,omitempty"`
-	CoreID         uint         `json:"-"`
+	PhysicalID     uint16       `json:"physical_id"`
+	Siblings       uint16       `json:"siblings,omitempty"`
+	Cores          uint16       `json:"cores,omitempty"`
+	CoreID         uint16       `json:"-"`
 	Fpu            bool         `json:"fpu"`
 	FpuException   bool         `json:"fpu_exception"`
-	CpuidLevel     uint         `json:"cpuid_level,omitempty"`
+	CpuidLevel     uint8        `json:"cpuid_level,omitempty"`
 	WriteProtect   bool         `json:"write_protect"`
-	TlbSize        uint         `json:"tlb_size,omitempty"`
-	ClflushSize    uint         `json:"clflush_size,omitempty"`
+	TlbSize        uint16       `json:"tlb_size,omitempty"`
+	ClflushSize    uint16       `json:"clflush_size,omitempty"`
 	CacheAlignment int          `json:"cache_alignment,omitempty"`
 	AddressSizes   AddressSizes `json:"address_sizes,omitempty"`
 	Apicid         uint         `json:"-"`
@@ -97,9 +101,9 @@ func NewDetailCPU(cpu C.hd_detail_cpu_t) (*DetailCPU, error) {
 		VendorName:   C.GoString(data.vend_name),
 		ModelName:    stripCPUFreq(C.GoString(data.model_name)),
 
-		Family:   uint(data.family),
-		Model:    uint(data.model),
-		Stepping: uint(data.stepping),
+		Family:   uint16(data.family),
+		Model:    uint16(data.model),
+		Stepping: uint32(data.stepping),
 
 		Platform: C.GoString(data.platform),
 
@@ -109,25 +113,25 @@ func NewDetailCPU(cpu C.hd_detail_cpu_t) (*DetailCPU, error) {
 
 		Clock: uint(data.clock),
 		Bogo:  float64(data.bogo),
-		Cache: uint(data.cache),
-		Units: uint(data.units),
+		Cache: uint32(data.cache),
+		Units: uint32(data.units),
 
-		PhysicalID:     uint(data.physical_id),
-		Siblings:       uint(data.siblings),
-		Cores:          uint(data.cores),
-		CoreID:         uint(data.core_id),
+		PhysicalID:     uint16(data.physical_id),
+		Siblings:       uint16(data.siblings),
+		Cores:          uint16(data.cores),
+		CoreID:         uint16(data.core_id),
 		Apicid:         uint(data.apicid),
 		ApicidInitial:  uint(data.apicid_initial),
 		Fpu:            bool(C.cpu_info_fpu(data)),
 		FpuException:   bool(C.cpu_info_fpu_exception(data)),
-		CpuidLevel:     uint(data.cpuid_level),
+		CpuidLevel:     uint8(data.cpuid_level),
 		WriteProtect:   bool(C.cpu_info_write_protect(data)),
-		TlbSize:        uint(data.tlb_size),
-		ClflushSize:    uint(data.clflush_size),
+		TlbSize:        uint16(data.tlb_size),
+		ClflushSize:    uint16(data.clflush_size),
 		CacheAlignment: int(data.cache_alignment),
 		AddressSizes: AddressSizes{
-			Physical: uint(data.address_size_physical),
-			Virtual:  uint(data.address_size_virtual),
+			Physical: fmt.Sprintf("0x%x", uint(data.address_size_physical)),
+			Virtual:  fmt.Sprintf("0x%x", uint(data.address_size_virtual)),
 		},
 	}, nil
 }

pkg/hwinfo/detail_isa_pnp_dev.go

@@ -64,8 +64,8 @@ func NewIsaPnpCard(card *C.isapnp_card_t) (*IsaPnpCard, error) {
 type DetailIsaPnpDevice struct {
 	Type   DetailType  `json:"-"`
 	Card   *IsaPnpCard `json:"card"`
-	Device int         `json:"device"`
-	Flags  uint        `json:"flags"`
+	Device uint32      `json:"device"`
+	Flags  uint32      `json:"flags"`
 }
 
 func (d DetailIsaPnpDevice) DetailType() DetailType {
@@ -83,7 +83,7 @@ func NewDetailIsaPnpDevice(pnp C.hd_detail_isapnp_t) (*DetailIsaPnpDevice, error
 	return &DetailIsaPnpDevice{
 		Type:   DetailTypeIsaPnp,
 		Card:   card,
-		Device: int(data.dev),
-		Flags:  uint(data.flags),
+		Device: uint32(data.dev),
+		Flags:  uint32(data.flags),
 	}, nil
 }

pkg/hwinfo/detail_monitor.go

@@ -7,30 +7,30 @@ package hwinfo
 import "C"
 
 type SyncRange struct {
-	Min uint `json:"min"`
-	Max uint `json:"max"`
+	Min uint16 `json:"min"`
+	Max uint16 `json:"max"`
 }
 
 type SyncTimings struct {
-	Disp      uint `json:"disp"` // todo what's the proper name for this?
-	SyncStart uint `json:"sync_start"`
-	SyncEnd   uint `json:"sync_end"`
-	Total     uint `json:"total"` // todo what's a better name for this?
+	Disp      uint16 `json:"disp"` // todo what's the proper name for this?
+	SyncStart uint16 `json:"sync_start"`
+	SyncEnd   uint16 `json:"sync_end"`
+	Total     uint32 `json:"total"` // todo what's a better name for this?
 }
 
 type DetailMonitor struct {
 	Type                  DetailType  `json:"-"`
-	ManufactureYear       uint        `json:"manufacture_year"`
-	ManufactureWeek       uint        `json:"manufacture_week"`
+	ManufactureYear       uint16      `json:"manufacture_year"`
+	ManufactureWeek       uint8       `json:"manufacture_week"`
 	VerticalSync          SyncRange   `json:"vertical_sync"`
 	HorizontalSync        SyncRange   `json:"horizontal_sync"`
 	HorizontalSyncTimings SyncTimings `json:"horizontal_sync_timings"`
 	VerticalSyncTimings   SyncTimings `json:"vertical_sync_timings"`
-	Clock                 uint        `json:"clock"`
-	Width                 uint        `json:"width"`
-	Height                uint        `json:"height"`
-	WidthMillimetres      uint        `json:"width_millimetres"`
-	HeightMillimetres     uint        `json:"height_millimetres"`
+	Clock                 uint32      `json:"clock"`
+	Width                 uint32      `json:"width"`
+	Height                uint32      `json:"height"`
+	WidthMillimetres      uint32      `json:"width_millimetres"`
+	HeightMillimetres     uint32      `json:"height_millimetres"`
 	HorizontalFlag        byte        `json:"horizontal_flag"`
 	VerticalFlag          byte        `json:"vertical_flag"`
 	Vendor                string      `json:"vendor"`
@@ -48,32 +48,32 @@ func NewDetailMonitor(mon C.hd_detail_monitor_t) (*DetailMonitor, error) {
 
 	return &DetailMonitor{
 		Type:            DetailTypeMonitor,
-		ManufactureYear: uint(data.manu_year),
-		ManufactureWeek: uint(data.manu_week),
+		ManufactureYear: uint16(data.manu_year),
+		ManufactureWeek: uint8(data.manu_week),
 		VerticalSync: SyncRange{
-			Min: uint(data.min_vsync),
-			Max: uint(data.max_vsync),
+			Min: uint16(data.min_vsync),
+			Max: uint16(data.max_vsync),
 		},
 		HorizontalSync: SyncRange{
-			Min: uint(data.min_hsync),
-			Max: uint(data.max_hsync),
+			Min: uint16(data.min_hsync),
+			Max: uint16(data.max_hsync),
 		},
-		Clock:             uint(data.clock),
-		Width:             uint(data.width),
-		Height:            uint(data.height),
-		WidthMillimetres:  uint(data.width_mm),
-		HeightMillimetres: uint(data.height_mm),
+		Clock:             uint32(data.clock),
+		Width:             uint32(data.width),
+		Height:            uint32(data.height),
+		WidthMillimetres:  uint32(data.width_mm),
+		HeightMillimetres: uint32(data.height_mm),
 		HorizontalSyncTimings: SyncTimings{
-			Disp:      uint(data.hdisp),
-			SyncStart: uint(data.hsyncstart),
-			SyncEnd:   uint(data.hsyncend),
-			Total:     uint(data.htotal),
+			Disp:      uint16(data.hdisp),
+			SyncStart: uint16(data.hsyncstart),
+			SyncEnd:   uint16(data.hsyncend),
+			Total:     uint32(data.htotal),
 		},
 		VerticalSyncTimings: SyncTimings{
-			Disp:      uint(data.vdisp),
-			SyncStart: uint(data.vsyncstart),
-			SyncEnd:   uint(data.vsyncend),
-			Total:     uint(data.vtotal),
+			Disp:      uint16(data.vdisp),
+			SyncStart: uint16(data.vsyncstart),
+			SyncEnd:   uint16(data.vsyncend),
+			Total:     uint32(data.vtotal),
 		},
 		HorizontalFlag: byte(data.hflag),
 		VerticalFlag:   byte(data.vflag),

pkg/hwinfo/detail_pci.go

@@ -39,17 +39,17 @@ type DetailPci struct {
 	Type DetailType `json:"-"`
 
 	Flags    []PciFlag `json:"flags,omitempty"` //
-	Function uint      `json:"function"`
+	Function uint32    `json:"function"`
 
 	// todo map pci constants from pci.h?
-	Command      uint `json:"command"`       // PCI_COMMAND
-	HeaderType   uint `json:"header_type"`   // PCI_HEADER_TYPE
-	SecondaryBus uint `json:"secondary_bus"` // > 0 for PCI & CB bridges
+	Command      uint32 `json:"command"`       // PCI_COMMAND
+	HeaderType   uint32 `json:"header_type"`   // PCI_HEADER_TYPE
+	SecondaryBus uint32 `json:"secondary_bus"` // > 0 for PCI & CB bridges
 
-	Irq uint `json:"irq"` // used irq if any
+	Irq uint16 `json:"irq"` // used irq if any
 	// Programming Interface Byte: a read-only register that specifies a register-level programming interface for the
 	// device.
-	ProgIf uint `json:"prog_if"`
+	ProgIf uint16 `json:"prog_if"`
 
 	// already included in the parent model, so we omit from JSON output
 	Bus  uint `json:"-"`
@@ -97,21 +97,21 @@ func NewDetailPci(pci C.hd_detail_pci_t) (*DetailPci, error) {
 		DataExtLength:  uint(data.data_ext_len),
 		Log:            C.GoString(data.log),
 		Flags:          ParsePciFlags(uint(data.flags)),
-		Command:        uint(data.cmd),
-		HeaderType:     uint(data.hdr_type),
-		SecondaryBus:   uint(data.secondary_bus),
+		Command:        uint32(data.cmd),
+		HeaderType:     uint32(data.hdr_type),
+		SecondaryBus:   uint32(data.secondary_bus),
 		Bus:            uint(data.bus),
 		Slot:           uint(data.slot),
-		Function:       uint(data._func),
+		Function:       uint32(data._func),
 		BaseClass:      uint(data.base_class),
 		SubClass:       uint(data.sub_class),
-		ProgIf:         uint(data.prog_if),
+		ProgIf:         uint16(data.prog_if),
 		Device:         uint(data.dev),
 		Vendor:         uint(data.vend),
 		SubDevice:      uint(data.sub_dev),
 		SubVendor:      uint(data.sub_vend),
 		Revision:       uint(data.rev),
-		Irq:            uint(data.irq),
+		Irq:            uint16(data.irq),
 		BaseAddress:    [7]uint64(ReadUint64Array(unsafe.Pointer(&data.base_addr), 7)),
 		BaseLength:     [7]uint64(ReadUint64Array(unsafe.Pointer(&data.base_len), 7)),
 		AddressFlags:   [7]uint(ReadUintArray(unsafe.Pointer(&data.addr_flags), 7)),