Merge pull request #198 from nix-community/updates

update our flakes.

Author: Mic92

flake.lock

@@ -9,7 +9,7 @@
       inputs.systems.follows = "systems";
     };
     systems.url = "github:nix-systems/default";
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs.url = "git+https://github.com/NixOS/nixpkgs?shallow=1&ref=nixpkgs-unstable";
     flake-utils.url = "github:numtide/flake-utils";
     flake-utils.inputs.systems.follows = "systems";
     treefmt-nix = {

flake.nix

@@ -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/build/build.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/facter/facter.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.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_bios.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_cpu.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
 }