Merge pull request #188 from nix-community/feat/remove-gomod2nix

feat/remove gomod2nix

Author: Mic92

flake.lock

@@ -8,11 +8,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.systems.follows = "systems";
     };
-    gomod2nix = {
-      url = "github:nix-community/gomod2nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-utils.follows = "flake-utils";
-    };
     systems.url = "github:nix-systems/default";
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     flake-utils.url = "github:numtide/flake-utils";
@@ -35,7 +30,6 @@
     godoc.inputs.blueprint.follows = "blueprint";
     godoc.inputs.treefmt-nix.follows = "treefmt-nix";
     godoc.inputs.flake-utils.follows = "flake-utils";
-    godoc.inputs.gomod2nix.follows = "gomod2nix";
   };
 
   # Keep the magic invocations to minimum.

flake.nix

@@ -1,17 +1,13 @@
 module github.com/numtide/nixos-facter
 
-go 1.22.3
+go 1.24.1
 
-require (
-	github.com/klauspost/cpuid/v2 v2.2.9
-	github.com/stretchr/testify v1.10.0
-)
+require github.com/stretchr/testify v1.10.0
 
 require (
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	golang.org/x/sys v0.22.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.mod

@@ -1,11 +1,6 @@
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/klauspost/cpuid/v2 v2.2.9-0.20240805145549-92d5326f011e h1:XLeT7xVis8xyC0F4CqQ2fAcuBar61PMI7GhrUEBBKas=
-github.com/klauspost/cpuid/v2 v2.2.9-0.20240805145549-92d5326f011e/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8=
-github.com/klauspost/cpuid/v2 v2.2.9-0.20241026200132-ee7cba987ff4 h1:veWv2fzhVgC4iQ4ZRlXLwq68XWBJfDdk6FuklLmgVUI=
-github.com/klauspost/cpuid/v2 v2.2.9-0.20241026200132-ee7cba987ff4/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8=
-github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -15,12 +10,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
-golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

go.sum

@@ -4,11 +4,10 @@
   ...
 }:
 perSystem.self.nixos-facter.overrideAttrs (old: {
-  GOROOT = "${old.go}/share/go";
+  GOROOT = "${old.passthru.go}/share/go";
   nativeBuildInputs =
     old.nativeBuildInputs
     ++ [
-      perSystem.gomod2nix.default
       pkgs.enumer
       pkgs.delve
       pkgs.pprof

nix/devshells/default.nix

@@ -1,76 +1,26 @@
-{
-  flake,
+args @ {
   # We need the following pragma to ensure deadnix doesn't remove inputs.
   # This package is being called with newScope/callPackage, which means it is only being passed args it defines.
   # We do not use inputs directly in this file, but need it for passing to the tests.
+  flake,
   # deadnix: skip
   inputs,
-  perSystem,
+  # deadnix: skip
   system,
+  perSystem,
   pkgs,
-  pname,
   ...
-} @ args: let
-  inherit (pkgs) go lib;
-  fs = lib.fileset;
+}: let
+  inherit (pkgs) lib;
 in
-  perSystem.gomod2nix.buildGoApplication rec {
-    inherit pname;
+  pkgs.callPackage ./package.nix {
+    hwinfo = perSystem.hwinfo.default;
+
     # there's no good way of tying in the version to a git tag or branch
     # so for simplicity's sake we set the version as the commit revision hash
     # we remove the `-dirty` suffix to avoid a lot of unnecessary rebuilds in local dev
     version = lib.removeSuffix "-dirty" (flake.shortRev or flake.dirtyShortRev);
-
-    # ensure we are using the same version of go to build with
-    inherit go;
-
-    src = fs.toSource {
-      root = ../../..;
-      fileset = fs.unions [
-        ../../../cmd
-        ../../../go.mod
-        ../../../go.sum
-        ../../../main.go
-        ../../../pkg
-      ];
-    };
-
-    modules = ./gomod2nix.toml;
-
-    buildInputs = [
-      pkgs.systemdMinimal.dev
-      perSystem.hwinfo.default
-    ];
-
-    nativeBuildInputs = with pkgs; [
-      gcc
-      makeWrapper
-      pkg-config
-    ];
-
-    ldflags = [
-      "-s"
-      "-w"
-      "-X github.com/numtide/nixos-facter/pkg/build.Name=${pname}"
-      "-X github.com/numtide/nixos-facter/pkg/build.Version=v${version}"
-      "-X github.com/numtide/nixos-facter/pkg/build.System=${pkgs.stdenv.hostPlatform.system}"
-    ];
-
-    postInstall = let
-      binPath = lib.makeBinPath (with pkgs; [
-        systemdMinimal
-      ]);
-    in ''
-      wrapProgram "$out/bin/nixos-facter" \
-          --prefix PATH : "${binPath}"
-    '';
-
-    passthru.tests = (import ./tests) args;
-
-    meta = with lib; {
-      description = "nixos-facter: declarative nixos-generate-config";
-      homepage = "https://github.com/numtide/nixos-facter";
-      license = licenses.mit;
-      mainProgram = "nixos-facter";
-    };
+  }
+  // {
+    passthru.tests = import ./tests args;
   }

nix/packages/nixos-facter/default.nix

@@ -0,0 +1,65 @@
+{
+  lib,
+  version ? "0.3.1",
+  systemdMinimal,
+  hwinfo,
+  gcc,
+  makeWrapper,
+  pkg-config,
+  stdenv,
+  buildGo124Module,
+}: let
+  fs = lib.fileset;
+in
+  buildGo124Module (final: {
+    pname = "nixos-facter";
+    inherit version;
+
+    src = fs.toSource {
+      root = ../../..;
+      fileset = fs.unions [
+        ../../../cmd
+        ../../../go.mod
+        ../../../go.sum
+        ../../../main.go
+        ../../../pkg
+      ];
+    };
+
+    vendorHash = "sha256-A7ZuY8Gc/a0Y8O6UG2WHWxptHstJOxi4n9F8TY6zqiw=";
+
+    buildInputs = [
+      systemdMinimal.dev
+      hwinfo
+    ];
+
+    nativeBuildInputs = [
+      gcc
+      makeWrapper
+      pkg-config
+    ];
+
+    ldflags = [
+      "-s"
+      "-w"
+      "-X github.com/numtide/nixos-facter/pkg/build.Name=${final.pname}"
+      "-X github.com/numtide/nixos-facter/pkg/build.Version=v${final.version}"
+      "-X github.com/numtide/nixos-facter/pkg/build.System=${stdenv.hostPlatform.system}"
+    ];
+
+    postInstall = let
+      binPath = lib.makeBinPath [
+        systemdMinimal
+      ];
+    in ''
+      wrapProgram "$out/bin/nixos-facter" \
+          --prefix PATH : "${binPath}"
+    '';
+
+    meta = with lib; {
+      description = "nixos-facter: declarative nixos-generate-config";
+      homepage = "https://github.com/numtide/nixos-facter";
+      license = licenses.mit;
+      mainProgram = "nixos-facter";
+    };
+  })