fix: unblock Nix updates

This commit works around issues introduced by
https://github.com/NixOS/nixpkgs/pull/470709 that broke the way that
environment variables attributes are extended in `buildGoModule` and
thus prevented bumping the nixpkgs flake input beyond December.

Signed-off-by: squat <lserven@gmail.com>

flake.lock

@@ -79,11 +79,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1765472234,
-        "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
+        "lastModified": 1771848320,
+        "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
+        "rev": "2fc6539b481e1d2569f25f8799236694180c0993",
         "type": "github"
       },
       "original": {

flake.nix

@@ -33,20 +33,20 @@
             let
               _version = builtins.getEnv "VERSION";
               homepage = "https://github.com/squat/kilo";
-              base = pkgs.buildGoModule rec {
+              base = pkgs.buildGoModule (finallAttrs: {
                 pname = "kilo";
                 version = if _version != "" then _version else toString (self.rev or self.dirtyRev or "unknown");
                 src = ./.;
                 vendorHash = null;
                 env.CGO_ENABLED = 0;
                 ldflags = [
-                  "-X github.com/squat/kilo/pkg/version.Version=${version}"
+                  "-X github.com/squat/kilo/pkg/version.Version=${finallAttrs.version}"
                 ];
                 nativeBuildInputs = [ pkgs.installShellFiles ];
                 meta = {
                   inherit homepage;
                 };
-              };
+              });
               kg = base.overrideAttrs {
                 pname = "kg";
                 subPackages = [
@@ -99,13 +99,17 @@
               map
                 (target: {
                   name = "kg-cross-${target.os}-${target.arch}";
-                  value = kg.overrideAttrs {
-                    env.GOOS = target.os;
-                    env.GOARCH = target.arch;
-                    env.CGO_ENABLED = 0;
-                    checkPhase = false;
-                    postInstall = "";
-                  };
+                  value = kg.overrideAttrs (
+                    _: oldAttrs: {
+                      env = oldAttrs.env // {
+                        GOOS = target.os;
+                        GOARCH = target.arch;
+                        CGO_ENABLED = 0;
+                      };
+                      checkPhase = false;
+                      postInstall = "";
+                    }
+                  );
                 })
                 [
                   {
@@ -126,13 +130,17 @@
               map
                 (target: {
                   name = "kgctl-cross-${target.os}-${target.arch}";
-                  value = kgctl.overrideAttrs {
-                    env.GOOS = target.os;
-                    env.GOARCH = target.arch;
-                    env.CGO_ENABLED = 0;
-                    checkPhase = false;
-                    postInstall = "";
-                  };
+                  value = kgctl.overrideAttrs (
+                    _: oldAttrs: {
+                      env = oldAttrs.env // {
+                        GOOS = target.os;
+                        GOARCH = target.arch;
+                        CGO_ENABLED = 0;
+                      };
+                      checkPhase = false;
+                      postInstall = "";
+                    }
+                  );
                 })
                 [
                   {
@@ -274,13 +282,13 @@
                 with pkgs;
                 [
                   bash_unit
-                  (config.packages.kgctl.overrideAttrs rec {
+                  (config.packages.kgctl.overrideAttrs (finallAttrs: {
                     version = "dev";
                     __intentionallyOverridingVersion = true;
                     ldflags = [
-                      "-X github.com/squat/kilo/pkg/version.Version=${version}"
+                      "-X github.com/squat/kilo/pkg/version.Version=${finallAttrs.version}"
                     ];
-                  })
+                  }))
                   gettext # provides envsubst
                   go
                   kind