flake: Update vendorHash and optimize flake

Make go-building only happen when version not in nixpkgs

Author: x10an14-nav

flake.nix

@@ -1,63 +1,68 @@
 {
   description = "NAIS CLI";
 
-  inputs.nixpkgs.url = "nixpkgs/nixos-unstable";
+  inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+  inputs.flake-utils.url = "github:numtide/flake-utils";
 
-  outputs = { self, nixpkgs, }:
-    let
-      version = builtins.substring 0 8
-        (self.lastModifiedDate or self.lastModified or "19700101");
-      withSystem = nixpkgs.lib.genAttrs [
-        "x86_64-linux"
-        "x86_64-darwin"
-        "aarch64-linux"
-        "aarch64-darwin"
-      ];
-      withPkgs = callback:
-        withSystem (system:
-          callback (import nixpkgs {
-            inherit system;
+  outputs =
+    { self, ... }@inputs:
+    inputs.flake-utils.lib.eachSystem
+      [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]
+      (
+        system:
+        let
+          version = builtins.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101");
+          pkgs = import inputs.nixpkgs {
+            localSystem = { inherit system; };
             overlays = [
-              (final: prev: {
-                go = (prev.go.overrideAttrs {
+              (
+                final: prev:
+                let
                   version = "1.23.6";
-                  src = prev.fetchurl {
-                    url = "https://go.dev/dl/go1.23.6.src.tar.gz";
-                    hash =
-                      "sha256-A5xbBOZSedrO7opvcecL0Fz1uAF4K293xuGeLtBREiI=";
-                  };
-                });
-              })
+                  newerGoVersion = prev.go.overrideAttrs (old: {
+                    inherit version;
+                    src = prev.fetchurl {
+                      url = "https://go.dev/dl/go${version}.src.tar.gz";
+                      hash = "sha256-A5xbBOZSedrO7opvcecL0Fz1uAF4K293xuGeLtBREiI=";
+                    };
+                  });
+                  nixpkgsVersion = prev.go.version;
+                  newVersionNotInNixpkgs = -1 == builtins.compareVersions nixpkgsVersion version;
+                in
+                {
+                  go = if newVersionNotInNixpkgs then newerGoVersion else prev.go;
+                  buildGoModule = prev.buildGoModule.override { go = final.go; };
+                }
+              )
             ];
-          }));
-    in {
-      packages = withPkgs (pkgs: rec {
-        nais = pkgs.buildGoModule.override { go = pkgs.go; } {
-          pname = "nais-cli";
-          inherit version;
-          src = ./.;
-          vendorHash = "sha256-kr9VARylPRphfrBEf8KgY1mCV+a1lwQpT/lpur1T3tQ=";
+          };
+        in
+        {
+          packages = rec {
+            nais = pkgs.buildGoModule {
+              pname = "nais-cli";
+              inherit version;
+              src = ./.;
+              vendorHash = "sha256-PqaPtcH2Mc8YS4aV3ctM7o0+7yAk7IZ4wB3GBmhtIsQ=";
+              postInstall = ''
+                mv $out/bin/cli $out/bin/nais
+              '';
+            };
+            default = nais;
+          };
 
-          postInstall = ''
-            mv $out/bin/cli $out/bin/nais
-          '';
-        };
-        default = nais;
-      });
-
-      devShells = withPkgs (pkgs: {
-        default = pkgs.mkShell {
-          buildInputs = with pkgs; [
-            go
-            gopls
-            gotools
-            go-tools
-            nodejs_20
-            nodePackages.prettier
-          ];
-        };
-      });
+          devShells.default = pkgs.mkShell {
+            packages = with pkgs; [
+              go
+              gopls
+              gotools
+              go-tools
+              nodejs_20
+              nodePackages.prettier
+            ];
+          };
 
-      formatter = withPkgs (pkgs: pkgs.nixfmt-rfc-style);
-    };
+          formatter = pkgs.nixfmt-rfc-style;
+        }
+      );
 }