chore: refresh CI actions, add dev shell and formatter, update lockfile

.github/workflows/build.yaml

@@ -13,45 +13,45 @@ jobs:
         os: [ubuntu-latest, macos-latest]
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v7
 
       - name: Install Nix
         uses: cachix/install-nix-action@v31
         with:
           github_access_token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Enable binary cache with Cachix
-        uses: cachix/cachix-action@v16
+        uses: cachix/cachix-action@v17
         with:
           name: nix-relic
           # If you chose API tokens for write access OR if you have a private cache
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
 
       - name: Run Nix checks
         run: nix flake check
-  
+
   build:
     needs: [checks]
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
         pkg: [infrastructure-agent, ocb, nr-otel-collector]
-    
+
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v7
 
       - name: Install Nix
         uses: cachix/install-nix-action@v31
         with:
           github_access_token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Enable binary cache with Cachix
-        uses: cachix/cachix-action@v16
+        uses: cachix/cachix-action@v17
         with:
           name: nix-relic
           # If you chose API tokens for write access OR if you have a private cache
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
 
       - name: Build ${{ matrix.pkg }} with Nix
-        run: nix build --print-out-paths ".#${{ matrix.pkg }}"
+        run: nix build --print-out-paths ".#${{ matrix.pkg }}"

.github/workflows/flakehub-publish-rolling.yml

@@ -10,7 +10,7 @@ jobs:
       id-token: "write"
       contents: "read"
     steps:
-      - uses: "actions/checkout@v5"
+      - uses: "actions/checkout@v7"
       - uses: "DeterminateSystems/nix-installer-action@main"
       - uses: "DeterminateSystems/flakehub-push@main"
         with:

.gitignore

@@ -0,0 +1 @@
+result

flake.nix

@@ -7,12 +7,12 @@
     { nixpkgs, ... }@inputs:
     let
       # Supported systems for flake packages, shell, etc.
+      # x86_64-darwin was dropped from nixpkgs in 26.11
       systems = [
         "aarch64-linux"
         "i686-linux"
         "x86_64-linux"
         "aarch64-darwin"
-        "x86_64-darwin"
       ];
       # This is a function that generates an attribute by calling a function you
       # pass to it, with each system as an argument
@@ -26,5 +26,26 @@
       darwinModules = import ./modules/darwin;
 
       overlays = import ./overlays { inherit inputs; };
+
+      formatter = forAllSystems (
+        system:
+        nixpkgs.legacyPackages.${system}.nixfmt
+      );
+
+      devShells = forAllSystems (
+        system:
+        let
+          pkgs = nixpkgs.legacyPackages.${system};
+        in
+        {
+          default = pkgs.mkShell {
+            packages = with pkgs; [
+              nixfmt
+              statix
+              deadnix
+            ];
+          };
+        }
+      );
     };
-}
+}

overlays/default.nix

@@ -1,7 +1,7 @@
 # This file defines overlays
-{inputs, ...}: {
+{ inputs, ... }: {
   # This one brings our custom packages from the 'pkgs' directory
-  additions = final: _prev: import ../pkgs {pkgs = final;};
+  additions = final: _prev: import ../pkgs { pkgs = final; };
 
   # This one contains whatever you want to overlay
   # You can change versions, add patches, set compilation flags, anything really.

pkgs/infrastructure-agent.nix

@@ -1,6 +1,5 @@
 {
   lib,
-  stdenv,
   buildGoModule,
   fetchFromGitHub,
 }:
@@ -24,7 +23,7 @@ buildGoModule rec {
     "-X main.gitCommit=${src.rev}"
   ];
 
-  env.CGO_ENABLED = if stdenv.hostPlatform.isDarwin then "1" else "0";
+  # CGO is enabled by default on Darwin and disabled elsewhere by buildGoModule
 
   subPackages = [
     "cmd/newrelic-infra"

pkgs/nr-otel-collector/default.nix

@@ -25,8 +25,6 @@ buildGoModule {
   # The TestGenerateAndCompile tests download new dependencies for a modified go.mod. Nix doesn't allow network access so skipping.
   checkFlags = [ "-skip TestValidateConfigs" ];
 
-  env.CGO_ENABLED = "0";
-
   meta = with lib; {
     description = "The New Relic distribution of the OpenTelemetry Collector";
     homepage = "https://github.com/newrelic/opentelemetry-collector-releases.git";

pkgs/ocb.nix

@@ -17,8 +17,6 @@ buildGoModule rec {
   sourceRoot = "${src.name}/cmd/builder";
   vendorHash = "sha256-MTwD9xkrq3EudppLSoONgcPCBWlbSmaODLH9NtYgVOk=";
 
-  GOFLAGS = [ "-trimpath" ];
-  env.CGO_ENABLED = 0;
   ldflags = [
     "-s"
     "-w"