diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix index 0b97512e59c1..b405f9423fef 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix +++ b/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"; diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index a541f60a18ed..bc0b3786f4e2 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/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"; diff --git a/pkgs/applications/networking/cluster/timoni/default.nix b/pkgs/applications/networking/cluster/timoni/default.nix index 58fac193dd2d..965a5a5c9a75 100644 --- a/pkgs/applications/networking/cluster/timoni/default.nix +++ b/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"; diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index a52a1362ddc9..1bb165101e41 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -23,8 +23,8 @@ , zsh , fish , nixosTests -, go_1_22 -, buildGo122Module +, go +, 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. diff --git a/pkgs/by-name/gp/gptscript/package.nix b/pkgs/by-name/gp/gptscript/package.nix index 135b33e7c56f..71a2446556c2 100644 --- a/pkgs/by-name/gp/gptscript/package.nix +++ b/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"; diff --git a/pkgs/by-name/in/invidious-router/package.nix b/pkgs/by-name/in/invidious-router/package.nix index 68c642af3dce..d61e0076f957 100644 --- a/pkgs/by-name/in/invidious-router/package.nix +++ b/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; diff --git a/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix b/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix index 0a95e10e9076..8838a5041619 100644 --- a/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix +++ b/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"; diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index c8f7f7beccc4..e726239a2386 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/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 { diff --git a/pkgs/by-name/or/orbiton/package.nix b/pkgs/by-name/or/orbiton/package.nix index eedbfac9e8a6..f8fbc3484e12 100644 --- a/pkgs/by-name/or/orbiton/package.nix +++ b/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"; diff --git a/pkgs/by-name/pa/pan-bindings/package.nix b/pkgs/by-name/pa/pan-bindings/package.nix index 66fea9b58740..04c240ccc9bc 100644 --- a/pkgs/by-name/pa/pan-bindings/package.nix +++ b/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"; diff --git a/pkgs/by-name/se/seabird/package.nix b/pkgs/by-name/se/seabird/package.nix index bd40f2726caa..8a212cdb2212 100644 --- a/pkgs/by-name/se/seabird/package.nix +++ b/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"; diff --git a/pkgs/by-name/ss/ssh-tpm-agent/package.nix b/pkgs/by-name/ss/ssh-tpm-agent/package.nix index fc655fce32ad..3880940beeb2 100644 --- a/pkgs/by-name/ss/ssh-tpm-agent/package.nix +++ b/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"; diff --git a/pkgs/by-name/wa/wakatime-cli/package.nix b/pkgs/by-name/wa/wakatime-cli/package.nix index 89a3d4b8f7cb..f465d2e301a8 100644 --- a/pkgs/by-name/wa/wakatime-cli/package.nix +++ b/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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 815663d7fea5..24f03593ee5a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -850,9 +850,7 @@ with pkgs; docker-slim = callPackage ../applications/virtualization/docker-slim { }; - doc2go = callPackage ../development/tools/doc2go { - buildGoModule = buildGo122Module; - }; + doc2go = callPackage ../development/tools/doc2go { }; docker-sync = callPackage ../tools/misc/docker-sync { }; @@ -2182,9 +2180,7 @@ with pkgs; commitlint = nodePackages."@commitlint/cli"; - conform = callPackage ../applications/version-management/conform { - buildGoModule = buildGo122Module; - }; + conform = callPackage ../applications/version-management/conform { }; 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 { - buildGoModule = buildGo122Module; - }; + cilium-cli = callPackage ../applications/networking/cluster/cilium { }; 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 { - buildGoModule = buildGo122Module; - }; + gtree = callPackage ../tools/text/gtree { }; 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 { - buildGoModule = buildGo122Module; - }; + terraform-ls = callPackage ../development/tools/misc/terraform-ls { }; 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 { - buildGoModule = buildGo122Module; - }; + grafana-agent = callPackage ../servers/monitoring/grafana-agent { }; 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 { - buildGoModule = buildGo122Module; - }; + miniflux = callPackage ../servers/miniflux { }; inherit (callPackage ../servers/mir { }) mir @@ -26347,9 +26333,7 @@ with pkgs; systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { }; - tailscale = callPackage ../servers/tailscale { - buildGoModule = buildGo122Module; - }; + tailscale = callPackage ../servers/tailscale { }; 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 { - buildGoModule = buildGo122Module; - }; + go-tools = callPackage ../development/tools/go-tools { }; gotest = callPackage ../development/tools/gotest { }; @@ -28057,9 +28039,7 @@ with pkgs; clearlooks-phenix = callPackage ../data/themes/clearlooks-phenix { }; - cnspec = callPackage ../tools/security/cnspec { - buildGoModule = buildGo122Module; - }; + cnspec = callPackage ../tools/security/cnspec { }; 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 { - buildGoModule = buildGo122Module; - go = go_1_22; - }) k3s_1_30; + inherit (callPackage ../applications/networking/cluster/k3s { }) 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 { - buildGoModule = buildGo122Module; - go = go_1_22; - }) rke2_latest rke2_testing; + inherit (callPackage ../applications/networking/cluster/rke2 { }) 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 { - buildGoModule = buildGo122Module; - }; + sish = callPackage ../tools/networking/sish { }; 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 { - buildGoModule = buildGo122Module; - }; + vcluster = callPackage ../applications/networking/cluster/vcluster { }; sshportal = callPackage ../servers/sshportal { };