Merge pull request #325973 from kirillrdy/unpin-go

[treewide] unpin buildGoModule

pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix

@@ -1,6 +1,6 @@
-{ buildGo122Module, fetchFromGitHub, lib }:
+{ buildGoModule, fetchFromGitHub, lib }:
 
-buildGo122Module rec {
+buildGoModule rec {
   pname = "helm-diff";
   version = "3.9.8";
 

pkgs/applications/networking/cluster/helmfile/default.nix

@@ -1,12 +1,12 @@
 { lib
-, buildGo122Module
+, buildGoModule
 , fetchFromGitHub
 , installShellFiles
 , makeWrapper
 , pluginsDir ? null
 }:
 
-buildGo122Module rec {
+buildGoModule rec {
   pname = "helmfile";
   version = "0.165.0";
 

pkgs/applications/networking/cluster/timoni/default.nix

@@ -1,10 +1,10 @@
 { lib
-, buildGo122Module
+, buildGoModule
 , fetchFromGitHub
 , installShellFiles
 }:
 
-buildGo122Module rec {
+buildGoModule rec {
   pname = "timoni";
   version = "0.22.0";
 

pkgs/applications/terminal-emulators/kitty/default.nix

@@ -23,8 +23,8 @@
 , zsh
 , fish
 , nixosTests
-, go_1_22
+, go
-, buildGo122Module
+, buildGoModule
 , nix-update-script
 }:
 
@@ -41,7 +41,7 @@ buildPythonApplication rec {
     hash = "sha256-5ZkQfGlW7MWYCJZSwK/u8x9jKrZEqupsNvW30DLipDM=";
   };
 
-  goModules = (buildGo122Module {
+  goModules = (buildGoModule {
     pname = "kitty-go-modules";
     inherit src version;
     vendorHash = "sha256-NzDA9b3RAfMx+Jj7cSF8pEsKUkoBECBUXl2QFSmkmwM=";
@@ -80,7 +80,7 @@ buildPythonApplication rec {
     sphinx-copybutton
     sphinxext-opengraph
     sphinx-inline-tabs
-    go_1_22
+    go
   ] ++ lib.optionals stdenv.isDarwin [
     imagemagick
     libicns  # For the png2icns tool.

pkgs/by-name/gp/gptscript/package.nix

@@ -1,11 +1,11 @@
 {
   lib,
-  buildGo122Module,
+  buildGoModule,
   fetchFromGitHub,
   darwin,
   stdenv,
 }:
-buildGo122Module rec {
+buildGoModule rec {
   pname = "gptscript";
   version = "0.8.2";
 

pkgs/by-name/in/invidious-router/package.nix

@@ -1,11 +1,11 @@
 {
   lib,
-  buildGo122Module,
+  buildGoModule,
   fetchFromGitLab,
 }: let
   version = "1.1";
 in
-  buildGo122Module {
+  buildGoModule {
     pname = "invidious-router";
     inherit version;
 

pkgs/by-name/lx/lxd-unwrapped-lts/package.nix

@@ -3,7 +3,7 @@
   hwdata,
   pkg-config,
   lxc,
-  buildGo122Module,
+  buildGoModule,
   fetchFromGitHub,
   acl,
   libcap,
@@ -16,7 +16,7 @@
   nix-update-script,
 }:
 
-buildGo122Module rec {
+buildGoModule rec {
   pname = "lxd-unwrapped-lts";
   # major/minor are used in updateScript to pin to LTS
   version = "5.21.1";

pkgs/by-name/ol/ollama/package.nix

@@ -1,5 +1,5 @@
 { lib
-, buildGo122Module
+, buildGoModule
 , fetchFromGitHub
 , fetchpatch
 , buildEnv
@@ -134,9 +134,9 @@ let
 
   goBuild =
     if enableCuda then
-      buildGo122Module.override { stdenv = overrideCC stdenv gcc12; }
+      buildGoModule.override { stdenv = overrideCC stdenv gcc12; }
     else
-      buildGo122Module;
+      buildGoModule;
   inherit (lib) licenses platforms maintainers;
 in
 goBuild ((lib.optionalAttrs enableRocm {

pkgs/by-name/or/orbiton/package.nix

@@ -1,8 +1,8 @@
-{ lib, stdenv, buildGo122Module, fetchFromGitHub, installShellFiles, makeWrapper, pkg-config
+{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles, makeWrapper, pkg-config
 , withGui ? true, vte
 }:
 
-buildGo122Module rec {
+buildGoModule rec {
   pname = "orbiton";
   version = "2.65.12";
 

pkgs/by-name/pa/pan-bindings/package.nix

@@ -1,7 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, buildGo122Module
+, buildGoModule
 , cmake
 , ncurses
 , asio
@@ -15,7 +15,7 @@ let
     rev = "4361d30f1c5145a70651c259f2d56369725b0d15";
     hash = "sha256-0WxrgXTCM+BwGcjjWBBKiZawje2yxB5RRac6Sk5t3qc=";
   };
-  goDeps = (buildGo122Module {
+  goDeps = (buildGoModule {
     name = "pan-bindings-goDeps";
     inherit src version;
     modRoot = "go";

pkgs/by-name/se/seabird/package.nix

@@ -1,5 +1,5 @@
 { lib
-, buildGo122Module
+, buildGoModule
 , copyDesktopItems
 , fetchFromGitHub
 , pkg-config
@@ -12,7 +12,7 @@
 , vte-gtk4
 }:
 
-buildGo122Module rec {
+buildGoModule rec {
   pname = "seabird";
   version = "0.3.2";
 

pkgs/by-name/ss/ssh-tpm-agent/package.nix

@@ -1,10 +1,10 @@
 { lib
-, buildGo122Module
+, buildGoModule
 , fetchFromGitHub
 , openssl
 }:
 
-buildGo122Module rec {
+buildGoModule rec {
   pname = "ssh-tpm-agent";
   version = "0.3.1";
 

pkgs/by-name/wa/wakatime-cli/package.nix

@@ -1,12 +1,12 @@
 {
   lib,
-  buildGo122Module,
+  buildGoModule,
   fetchFromGitHub,
   testers,
   wakatime-cli,
 }:
 
-buildGo122Module rec {
+buildGoModule rec {
   pname = "wakatime-cli";
   version = "1.93.0";
 

pkgs/top-level/all-packages.nix

@@ -850,9 +850,7 @@ with pkgs;
 
   docker-slim = callPackage ../applications/virtualization/docker-slim { };
 
-  doc2go = callPackage ../development/tools/doc2go {
+  doc2go = callPackage ../development/tools/doc2go { };
-    buildGoModule = buildGo122Module;
-  };
 
   docker-sync = callPackage ../tools/misc/docker-sync { };
 
@@ -2182,9 +2180,7 @@ with pkgs;
 
   commitlint = nodePackages."@commitlint/cli";
 
-  conform = callPackage ../applications/version-management/conform {
+  conform = callPackage ../applications/version-management/conform { };
-    buildGoModule = buildGo122Module;
-  };
 
   datalad = callPackage ../applications/version-management/datalad { };
 
@@ -6559,9 +6555,7 @@ with pkgs;
 
   cicero-tui = callPackage ../tools/misc/cicero-tui { };
 
-  cilium-cli = callPackage ../applications/networking/cluster/cilium {
+  cilium-cli = callPackage ../applications/networking/cluster/cilium { };
-    buildGoModule = buildGo122Module;
-  };
 
   cjdns = callPackage ../tools/networking/cjdns { };
   cjdns-tools = callPackage ../tools/admin/cjdns-tools { };
@@ -18602,9 +18596,7 @@ with pkgs;
 
   gtranslator = callPackage ../tools/text/gtranslator { };
 
-  gtree = callPackage ../tools/text/gtree {
+  gtree = callPackage ../tools/text/gtree { };
-    buildGoModule = buildGo122Module;
-  };
 
   guff = callPackage ../tools/graphics/guff { };
 
@@ -19464,9 +19456,7 @@ with pkgs;
   terracognita = callPackage ../development/tools/misc/terracognita { };
 
   terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { };
-  terraform-ls = callPackage ../development/tools/misc/terraform-ls {
+  terraform-ls = callPackage ../development/tools/misc/terraform-ls { };
-    buildGoModule = buildGo122Module;
-  };
 
   terraformer = callPackage ../development/tools/misc/terraformer { };
 
@@ -25444,9 +25434,7 @@ with pkgs;
   grafana = callPackage ../servers/monitoring/grafana { };
   grafanaPlugins = callPackages ../servers/monitoring/grafana/plugins { };
 
-  grafana-agent = callPackage ../servers/monitoring/grafana-agent {
+  grafana-agent = callPackage ../servers/monitoring/grafana-agent { };
-    buildGoModule = buildGo122Module;
-  };
 
   grafana-loki = callPackage ../servers/monitoring/loki { };
   promtail = callPackage ../servers/monitoring/loki/promtail.nix { };
@@ -25953,9 +25941,7 @@ with pkgs;
 
   azuredatastudio = callPackage ../applications/misc/azuredatastudio { };
 
-  miniflux = callPackage ../servers/miniflux {
+  miniflux = callPackage ../servers/miniflux { };
-    buildGoModule = buildGo122Module;
-  };
 
   inherit (callPackage ../servers/mir { })
     mir
@@ -26347,9 +26333,7 @@ with pkgs;
 
   systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { };
 
-  tailscale = callPackage ../servers/tailscale {
+  tailscale = callPackage ../servers/tailscale { };
-    buildGoModule = buildGo122Module;
-  };
 
   tailscale-systray = callPackage ../applications/misc/tailscale-systray { };
 
@@ -27337,9 +27321,7 @@ with pkgs;
 
   goverview = callPackage ../tools/security/goverview { };
 
-  go-tools = callPackage ../development/tools/go-tools {
+  go-tools = callPackage ../development/tools/go-tools { };
-    buildGoModule = buildGo122Module;
-  };
 
   gotest = callPackage ../development/tools/gotest { };
 
@@ -28057,9 +28039,7 @@ with pkgs;
 
   clearlooks-phenix = callPackage ../data/themes/clearlooks-phenix { };
 
-  cnspec = callPackage ../tools/security/cnspec {
+  cnspec = callPackage ../tools/security/cnspec { };
-    buildGoModule = buildGo122Module;
-  };
 
   cnstrokeorder = callPackage ../data/fonts/cnstrokeorder { };
 
@@ -31746,10 +31726,7 @@ with pkgs;
     buildGoModule = buildGo121Module;
     go = go_1_21;
   }) k3s_1_28 k3s_1_29;
-  inherit (callPackage ../applications/networking/cluster/k3s {
+  inherit (callPackage ../applications/networking/cluster/k3s { }) k3s_1_30;
-    buildGoModule = buildGo122Module;
-    go = go_1_22;
-  }) k3s_1_30;
   k3s = k3s_1_30;
 
   k3sup = callPackage ../applications/networking/cluster/k3sup { };
@@ -33759,10 +33736,7 @@ with pkgs;
     buildGoModule = buildGo121Module;
     go = go_1_21;
   }) rke2_stable;
-  inherit (callPackage ../applications/networking/cluster/rke2 {
+  inherit (callPackage ../applications/networking/cluster/rke2 { }) rke2_latest rke2_testing;
-    buildGoModule = buildGo122Module;
-    go = go_1_22;
-  }) rke2_latest rke2_testing;
   rke2 = rke2_stable;
 
   rocketchat-desktop = callPackage ../applications/networking/instant-messengers/rocketchat-desktop { };
@@ -33908,9 +33882,7 @@ with pkgs;
 
   siproxd = callPackage ../applications/networking/siproxd { };
 
-  sish = callPackage ../tools/networking/sish {
+  sish = callPackage ../tools/networking/sish { };
-    buildGoModule = buildGo122Module;
-  };
 
   sky = libsForQt5.callPackage ../applications/networking/instant-messengers/sky {
     libjpeg_turbo = libjpeg8;
@@ -39757,9 +39729,7 @@ with pkgs;
 
   ib-controller = callPackage ../applications/office/ib/controller { jdk=oraclejdk8; };
 
-  vcluster = callPackage ../applications/networking/cluster/vcluster {
+  vcluster = callPackage ../applications/networking/cluster/vcluster { };
-    buildGoModule = buildGo122Module;
-  };
 
   sshportal = callPackage ../servers/sshportal { };