Fix nix reproducible build

.gitignore

@@ -6,6 +6,9 @@ bin/
 # Direnv
 /.direnv/
 
+# Nix
+result
+
 # Completion debug files
 completion.txt
 

.goreleaser.yaml

@@ -1,11 +1,13 @@
-project_name: omloxctl
+version: 2
+
+project_name: omlox-cli
 
 git:
   tag_sort: "-version:creatordate"
   prerelease_suffix: "-"
 
 builds:
-  - main: ./cmd/omlox
+  - main: ./cmd/omlox-cli
     env:
       - CGO_ENABLED=0
     goos:
@@ -20,7 +22,7 @@ builds:
       - -trimpath
     ldflags: 
       - "-s -w"
-      - "-X main.version={{.Version}} -X main.commitHash={{.Commit}} -X main.buildDate={{.Date}}"
+      - "-X main.version={{.Version}} -X main.commitHash={{.Commit}}"
 
 archives:
   - format: tar.gz

Makefile

@@ -1,11 +1,8 @@
 VERSION ?= $(shell git describe --tags --exact-match 2>/dev/null || git symbolic-ref -q --short HEAD)
 COMMIT_HASH ?= $(shell git rev-parse --short HEAD 2>/dev/null)
 
-DATE_FMT = +%FT%TZ # ISO 8601
-BUILD_DATE ?= $(shell date "$(DATE_FMT)") # "-u" for UTC time (zero offset)
-
 BUILD_DIR ?= bin
-LDFLAGS += "-X main.version=$(VERSION) -X main.commitHash=$(COMMIT_HASH) -X main.buildDate=$(BUILD_DATE)"
+LDFLAGS += "-X main.version=$(VERSION) -X main.commitHash=$(COMMIT_HASH)
 
 .DEFAULT_GOAL: help
 default: help

cmd/omlox-cli/omlox.go

@@ -12,7 +12,6 @@ import (
 var (
 	version    string
 	commitHash string
-	buildDate  string
 )
 
 const (

cmd/omlox-cli/version.go

@@ -26,5 +26,5 @@ func newVersionCmd(out io.Writer) *cobra.Command {
 
 // getVersion returns a string version information.
 func getVersion() string {
-	return fmt.Sprintf("%s version %s (%s) built on %s\n", appName, version, commitHash, buildDate)
+	return fmt.Sprintf("%s version %s (%s)\n", appName, version, commitHash)
 }

flake.nix

@@ -3,43 +3,61 @@
 
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-unstable";
-    flake-utils.url = "github:numtide/flake-utils";
   };
 
   outputs =
     {
       self,
       nixpkgs,
-      flake-utils,
       ...
     }:
-    flake-utils.lib.eachDefaultSystem (
-      system:
-      let
-        overlay = import ./nix/pkgs;
+    let
+      supportedSystems = [
+        "aarch64-linux"
+        "aarch64-darwin"
+        "x86_64-darwin"
+        "x86_64-linux"
+      ];
 
-        pkgs = import nixpkgs {
+      forAllSystems = f: nixpkgs.lib.genAttrs supportedSystems (system: f system);
+      nixpkgsFor = forAllSystems (
+        system:
+        import nixpkgs {
           inherit system;
-          overlays = [ overlay ];
+          overlays = [ self.overlays.default ];
+        }
+      );
+
+      version = self.shortRev or self.dirtyShortRev;
+      commitHash = self.rev or self.dirtyRev;
+    in
+    {
+      overlays.default = final: _: {
+        omlox-cli = final.callPackage ./package.nix {
+          inherit version commitHash;
         };
+      };
+
+      formatter = forAllSystems (system: (nixpkgsFor.${system}).nixfmt-tree);
 
-        buildDeps = with pkgs; [
-          git
-          go_1_21
-          gnumake
-        ];
+      packages = forAllSystems (system: {
+        default = (nixpkgsFor.${system}).omlox-cli;
+        omlox-cli = (nixpkgsFor.${system}).omlox-cli;
+      });
 
-        devDeps =
-          with pkgs;
-          buildDeps
-          ++ [
-            easyjson
-            goreleaser
-            copywrite
-          ];
-      in
-      {
-        devShell = pkgs.mkShell { buildInputs = devDeps; };
-      }
-    );
+      devShells = forAllSystems (
+        system: with nixpkgsFor.${system}; {
+          default = mkShell {
+            inputsFrom = [ omlox-cli ];
+            packages = [
+              git
+              gnumake
+              easyjson
+              goreleaser
+              copywrite
+            ];
+          };
+        }
+      );
+    };
 }

package.nix

@@ -0,0 +1,22 @@
+{
+  lib,
+  buildGoModule,
+  version ? 0.0.0,
+  commitHash ? "unknown",
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "omlox-cli";
+  inherit version;
+
+  src = ./.;
+
+  vendorHash = "sha256-Gwkse7dl/EYxHSibgc6PMGwtDhKiMJYFajwAICpluzw=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.version=${version}"
+    "-X main.commitHash=${commitHash}"
+  ];
+})