chore: update Nix tooling for HAProxy (#1467)

Author: arikgrahl

haproxy-mixin/build-image.nix

@@ -1,6 +1,9 @@
-{ pkgs ? import <nixpkgs> }:
+{
+  pkgs ? import <nixpkgs>,
+}:
 
-let common = import ./common.nix { inherit pkgs; };
+let
+  common = import ./common.nix { inherit pkgs; };
 in
 with pkgs;
 dockerTools.buildImage {

haproxy-mixin/common.nix

@@ -1,9 +1,14 @@
-{ pkgs ? import <nixpkgs> }:
+{
+  pkgs ? import <nixpkgs>,
+}:
 
 with pkgs;
 {
   # devTools are packages specifically for development environments.
-  devTools = [ docker docker-compose ];
+  devTools = [
+    docker
+    docker-compose
+  ];
   # buildTools are packages needed for dev and CI builds.
   buildTools = [
     bash

haproxy-mixin/flake.lock

@@ -4,25 +4,34 @@
   inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
   inputs.flake-utils.url = "github:numtide/flake-utils";
 
-  outputs = { self, nixpkgs, flake-utils }:
+  outputs =
     {
-      overlay =
-        (final: prev: {
-          jsonnet-bundler = prev.callPackage ./nix/jsonnet-bundler.nix { pkgs = prev; };
+      self,
+      nixpkgs,
+      flake-utils,
+    }:
+    {
+      overlay = (
+        final: prev: {
           mixtool = prev.callPackage ./nix/mixtool.nix { pkgs = prev; };
-        });
-    } //
-    (flake-utils.lib.eachDefaultSystem
-      (system:
-        let pkgs = import nixpkgs { inherit system; overlays = [ self.overlay ]; };
-        in
-        {
-          devShell = import ./shell.nix {
-            inherit pkgs;
-          };
-          packages = {
-            haproxy-mixin-build-image = import ./build-image.nix { inherit pkgs; };
-          };
         }
-      ));
+      );
+    }
+    // (flake-utils.lib.eachDefaultSystem (
+      system:
+      let
+        pkgs = import nixpkgs {
+          inherit system;
+          overlays = [ self.overlay ];
+        };
+      in
+      {
+        devShell = import ./shell.nix {
+          inherit pkgs;
+        };
+        packages = {
+          haproxy-mixin-build-image = import ./build-image.nix { inherit pkgs; };
+        };
+      }
+    ));
 }

haproxy-mixin/flake.nix

@@ -1,22 +1,30 @@
-{ pkgs ? import <nixpkgs> }:
+{
+  pkgs ? import <nixpkgs>,
+}:
 
-with pkgs;
-buildGoModule rec {
+pkgs.buildGoModule (finalAttrs: {
   pname = "mixtool";
-  version = "bd0efc3";
+  version = "0-unstable-2025-07-07";
 
-  src = fetchFromGitHub {
+  src = pkgs.fetchFromGitHub {
     owner = "monitoring-mixins";
-    repo = pname;
-    rev = "${version}";
-    sha256 = "1kh2axna553q7lrmgak8l7jlnmbdfkfci240bqa3040pd82j3q1c";
+    repo = "mixtool";
+    rev = "1abe34c3187d53b795d0474535b476bc9b7500c3";
+    hash = "sha256-RRoz5Kp/IGkUD6XVK70+k4L05rYqhkqh6LpopihyEd8=";
   };
 
-  subPackages = [ "cmd/mixtool" ];
-  vendorSha256 = "10wvckrwrc7xs3dng9m6lznsaways2wycxnl9h8jynp4h2cw22ml";
+  vendorHash = "sha256-o9HNcq7XHXH/s6UthYADsktGh9NjgC1rVPbGP11Cfc0=";
 
-  meta = with lib; {
-    description = "Helper for easily working with Jsonnet mixins";
-    license = licenses.asl20;
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  meta = {
+    description = "Helper for easily working with jsonnet mixins";
+    homepage = "https://github.com/monitoring-mixins/mixtool";
+    license = pkgs.lib.licenses.asl20;
+    maintainers = with pkgs.lib.maintainers; [ arikgrahl ];
+    mainProgram = "mixtool";
   };
-}
+})

haproxy-mixin/nix/jsonnet-bundler.nix

@@ -1,7 +1,10 @@
-{ pkgs ? import <nixpkgs> }:
+{
+  pkgs ? import <nixpkgs>,
+}:
 
 with pkgs;
-let common = import ./common.nix { inherit pkgs; };
+let
+  common = import ./common.nix { inherit pkgs; };
 in
 mkShell {
   buildInputs = common.buildTools ++ common.devTools;