From f53389628215da2945a413a79ce08bcfbce4420e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 29 Jun 2022 23:13:54 +0200 Subject: [PATCH] go,goBuildModules: bump default go version to 1.18 --- pkgs/servers/mattermost/default.nix | 4 +- pkgs/tools/admin/lxd/default.nix | 4 +- pkgs/tools/misc/mutagen-compose/default.nix | 4 +- pkgs/tools/misc/mutagen/default.nix | 4 +- pkgs/tools/misc/steampipe/default.nix | 4 +- pkgs/tools/misc/upterm/default.nix | 4 +- pkgs/tools/security/spire/default.nix | 4 +- pkgs/top-level/all-packages.nix | 240 ++++++-------------- 8 files changed, 80 insertions(+), 188 deletions(-) diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index b16391b274a3..1c748f9a6be3 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -1,11 +1,11 @@ { lib -, buildGo118Module +, buildGoModule , fetchFromGitHub , fetchurl , nixosTests }: -buildGo118Module rec { +buildGoModule rec { pname = "mattermost"; version = "7.1.0"; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index d664cdd50860..1484f97b9346 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -1,4 +1,4 @@ -{ lib, hwdata, pkg-config, lxc, buildGo118Package, fetchurl +{ lib, hwdata, pkg-config, lxc, buildGoPackage, fetchurl , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq, attr , squashfsTools, iproute2, iptables, libcap , dqlite, raft-canonical, sqlite-replication, udev @@ -9,7 +9,7 @@ , nixosTests }: -buildGo118Package rec { +buildGoPackage rec { pname = "lxd"; version = "5.3"; diff --git a/pkgs/tools/misc/mutagen-compose/default.nix b/pkgs/tools/misc/mutagen-compose/default.nix index a28cc1d6b901..f5e31ed2d37b 100644 --- a/pkgs/tools/misc/mutagen-compose/default.nix +++ b/pkgs/tools/misc/mutagen-compose/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, buildGo118Module, fetchFromGitHub, fetchzip }: +{ stdenv, lib, buildGoModule, fetchFromGitHub, fetchzip }: -buildGo118Module rec { +buildGoModule rec { pname = "mutagen-compose"; version = "0.14.0"; diff --git a/pkgs/tools/misc/mutagen/default.nix b/pkgs/tools/misc/mutagen/default.nix index 9ec6dbf3147c..83fdef4b95e1 100644 --- a/pkgs/tools/misc/mutagen/default.nix +++ b/pkgs/tools/misc/mutagen/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, buildGo118Module, fetchFromGitHub, fetchzip }: +{ stdenv, lib, buildGoModule, fetchFromGitHub, fetchzip }: -buildGo118Module rec { +buildGoModule rec { pname = "mutagen"; version = "0.14.0"; diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix index 6ff87a680313..43a184a99426 100644 --- a/pkgs/tools/misc/steampipe/default.nix +++ b/pkgs/tools/misc/steampipe/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, buildGo118Module, fetchFromGitHub, installShellFiles }: +{ stdenv, lib, buildGoModule, fetchFromGitHub, installShellFiles }: -buildGo118Module rec { +buildGoModule rec { pname = "steampipe"; version = "0.15.0"; diff --git a/pkgs/tools/misc/upterm/default.nix b/pkgs/tools/misc/upterm/default.nix index fe4ac3599a76..b3da0f7d734f 100644 --- a/pkgs/tools/misc/upterm/default.nix +++ b/pkgs/tools/misc/upterm/default.nix @@ -1,11 +1,11 @@ { lib -, buildGo118Module +, buildGoModule , fetchFromGitHub , installShellFiles , nixosTests }: -buildGo118Module rec { +buildGoModule rec { pname = "upterm"; version = "0.8.2"; diff --git a/pkgs/tools/security/spire/default.nix b/pkgs/tools/security/spire/default.nix index 4664e058367e..42ea0fc8763d 100644 --- a/pkgs/tools/security/spire/default.nix +++ b/pkgs/tools/security/spire/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGo118Module, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGo118Module rec { +buildGoModule rec { pname = "spire"; version = "1.3.1"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ea50d2fc5ba..f17c981daba0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -171,9 +171,7 @@ with pkgs; autoconf = autoconf269; }; - autorestic = callPackage ../tools/backup/autorestic { - buildGoModule = buildGo118Module; - }; + autorestic = callPackage ../tools/backup/autorestic { }; autoPatchelfHook = makeSetupHook { name = "auto-patchelf-hook"; @@ -288,9 +286,7 @@ with pkgs; breakpad = callPackage ../development/misc/breakpad { }; - buf = callPackage ../development/tools/buf { - buildGoModule = buildGo118Module; - }; + buf = callPackage ../development/tools/buf { }; cfn-nag = callPackage ../development/tools/cfn-nag { }; @@ -404,7 +400,7 @@ with pkgs; deadnix = callPackage ../development/tools/deadnix { }; - dsq = callPackage ../tools/misc/dsq { buildGoModule = buildGo118Module; }; + dsq = callPackage ../tools/misc/dsq { }; each = callPackage ../tools/text/each { }; @@ -474,9 +470,7 @@ with pkgs; protoc-gen-grpc-web = callPackage ../development/tools/protoc-gen-grpc-web { }; - protoc-gen-connect-go = callPackage ../development/tools/protoc-gen-connect-go { - buildGoModule = buildGo118Module; - }; + protoc-gen-connect-go = callPackage ../development/tools/protoc-gen-connect-go { }; protoc-gen-twirp = callPackage ../development/tools/protoc-gen-twirp { }; @@ -817,9 +811,7 @@ with pkgs; installShellFiles = callPackage ../build-support/install-shell-files {}; - lazydocker = callPackage ../tools/misc/lazydocker { - buildGoModule = buildGo118Module; - }; + lazydocker = callPackage ../tools/misc/lazydocker { }; ld-is-cc-hook = makeSetupHook { name = "ld-is-cc-hook"; } ../build-support/setup-hooks/ld-is-cc-hook.sh; @@ -1025,9 +1017,7 @@ with pkgs; acpica-tools = callPackage ../tools/system/acpica-tools { }; - act = callPackage ../development/tools/misc/act { - buildGoModule = buildGo118Module; - }; + act = callPackage ../development/tools/misc/act { }; actdiag = with python3.pkgs; toPythonApplication actdiag; @@ -1037,9 +1027,7 @@ with pkgs; addic7ed-cli = callPackage ../tools/misc/addic7ed-cli { }; - addlicense = callPackage ../tools/misc/addlicense { - buildGoModule = buildGo118Module; - }; + addlicense = callPackage ../tools/misc/addlicense { }; adenum = callPackage ../tools/security/adenum { }; @@ -1456,9 +1444,7 @@ with pkgs; python = python3; }; - packwiz = callPackage ../tools/games/minecraft/packwiz { - buildGoModule = buildGo118Module; - }; + packwiz = callPackage ../tools/games/minecraft/packwiz { }; pcem = callPackage ../applications/emulators/pcem { }; @@ -2182,9 +2168,7 @@ with pkgs; botamusique = callPackage ../tools/audio/botamusique { }; - boulder = callPackage ../tools/admin/boulder { - buildGoModule = buildGo118Module; - }; + boulder = callPackage ../tools/admin/boulder { }; btrfs-heatmap = callPackage ../tools/filesystems/btrfs-heatmap { }; @@ -2590,25 +2574,15 @@ with pkgs; go-audit = callPackage ../tools/system/go-audit { }; - gopass = callPackage ../tools/security/gopass { - buildGoModule = buildGo118Module; - }; + gopass = callPackage ../tools/security/gopass { }; - gopass-hibp = callPackage ../tools/security/gopass/hibp.nix { - buildGoModule = buildGo118Module; - }; + gopass-hibp = callPackage ../tools/security/gopass/hibp.nix { }; - gopass-jsonapi = callPackage ../tools/security/gopass/jsonapi.nix { - buildGoModule = buildGo118Module; - }; + gopass-jsonapi = callPackage ../tools/security/gopass/jsonapi.nix { }; - git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { - buildGoModule = buildGo118Module; - }; + git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { }; - gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix { - buildGoModule = buildGo118Module; - }; + gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix { }; gosh = callPackage ../tools/security/gosh { }; @@ -3154,9 +3128,7 @@ with pkgs; map-cmd = callPackage ../tools/misc/map {}; - clash = callPackage ../tools/networking/clash { - buildGoModule = buildGo118Module; - }; + clash = callPackage ../tools/networking/clash { }; clasp = callPackage ../tools/misc/clasp { }; @@ -3646,9 +3618,7 @@ with pkgs; er-patcher = callPackage ../tools/games/er-patcher { }; - errcheck = callPackage ../development/tools/errcheck { - buildGoModule = buildGo118Module; - }; + errcheck = callPackage ../development/tools/errcheck { }; eschalot = callPackage ../tools/security/eschalot { }; @@ -4832,9 +4802,7 @@ with pkgs; cgreen = callPackage ../development/libraries/cgreen { }; - chain-bench = callPackage ../tools/security/chain-bench { - buildGoModule = buildGo118Module; - }; + chain-bench = callPackage ../tools/security/chain-bench { }; checkinstall = callPackage ../tools/package-management/checkinstall { }; @@ -5398,9 +5366,7 @@ with pkgs; dnscrypt-wrapper = callPackage ../tools/networking/dnscrypt-wrapper { }; - dnscontrol = callPackage ../applications/networking/dnscontrol { - buildGoModule = buildGo118Module; - }; + dnscontrol = callPackage ../applications/networking/dnscontrol { }; dnsenum = callPackage ../tools/security/dnsenum { }; @@ -5740,9 +5706,7 @@ with pkgs; tridactyl-native = callPackage ../tools/networking/tridactyl-native { }; - trivy = callPackage ../tools/admin/trivy { - buildGoModule = buildGo118Module; - }; + trivy = callPackage ../tools/admin/trivy { }; trompeloeil = callPackage ../development/libraries/trompeloeil { }; @@ -6664,9 +6628,7 @@ with pkgs; gitleaks = callPackage ../tools/security/gitleaks { }; - gitsign = callPackage ../tools/security/gitsign { - buildGoModule = buildGo118Module; - }; + gitsign = callPackage ../tools/security/gitsign { }; gitaly = callPackage ../applications/version-management/gitlab/gitaly { }; @@ -6845,7 +6807,7 @@ with pkgs; gopro = callPackage ../tools/video/gopro { }; - goreleaser = callPackage ../tools/misc/goreleaser { buildGoModule = buildGo118Module; }; + goreleaser = callPackage ../tools/misc/goreleaser { }; goreplay = callPackage ../tools/networking/goreplay { }; @@ -7010,9 +6972,7 @@ with pkgs; gssdp-tools = callPackage ../development/libraries/gssdp/tools.nix { }; - grype = callPackage ../tools/security/grype { - buildGoModule = buildGo118Module; - }; + grype = callPackage ../tools/security/grype { }; gt5 = callPackage ../tools/system/gt5 { }; @@ -7189,9 +7149,7 @@ with pkgs; heimdall-gui = heimdall.override { enableGUI = true; }; - headscale = callPackage ../servers/headscale { - buildGoModule = buildGo118Module; - }; + headscale = callPackage ../servers/headscale { }; healthchecks = callPackage ../servers/web-apps/healthchecks { }; @@ -7458,9 +7416,7 @@ with pkgs; ipfs-migrator-unwrapped = callPackage ../applications/networking/ipfs-migrator/unwrapped.nix { }; ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; - ipget = callPackage ../applications/networking/ipget { - buildGoModule = buildGo118Module; - }; + ipget = callPackage ../applications/networking/ipget { }; i-pi = with python3Packages; toPythonApplication i-pi; @@ -7697,9 +7653,7 @@ with pkgs; kdbplus = pkgsi686Linux.callPackage ../applications/misc/kdbplus { }; - kdigger = callPackage ../tools/security/kdigger { - buildGoModule = buildGo118Module; - }; + kdigger = callPackage ../tools/security/kdigger { }; keepalived = callPackage ../tools/networking/keepalived { }; @@ -8786,9 +8740,7 @@ with pkgs; nearcore = callPackage ../applications/blockchains/nearcore { }; - nebula = callPackage ../tools/networking/nebula { - buildGoModule = buildGo118Module; - }; + nebula = callPackage ../tools/networking/nebula { }; nemiver = callPackage ../development/tools/nemiver { }; @@ -9070,9 +9022,7 @@ with pkgs; ntfy = callPackage ../tools/misc/ntfy {}; - ntfy-sh = callPackage ../tools/misc/ntfy-sh { - buildGoModule = buildGo118Module; - }; + ntfy-sh = callPackage ../tools/misc/ntfy-sh { }; ntirpc = callPackage ../development/libraries/ntirpc { }; @@ -9586,9 +9536,7 @@ with pkgs; pgcenter = callPackage ../tools/misc/pgcenter { }; - pgmetrics = callPackage ../tools/misc/pgmetrics { - buildGoModule = buildGo118Module; - }; + pgmetrics = callPackage ../tools/misc/pgmetrics { }; pgsync = callPackage ../development/tools/database/pgsync { }; @@ -10443,9 +10391,7 @@ with pkgs; skim = callPackage ../tools/misc/skim { }; - seaweedfs = callPackage ../applications/networking/seaweedfs { - buildGoModule = buildGo118Module; - }; + seaweedfs = callPackage ../applications/networking/seaweedfs { }; sec = callPackage ../tools/admin/sec { }; @@ -10976,9 +10922,7 @@ with pkgs; systrayhelper = callPackage ../tools/misc/systrayhelper {}; - syft = callPackage ../tools/admin/syft { - buildGoModule = buildGo118Module; - }; + syft = callPackage ../tools/admin/syft { }; Sylk = callPackage ../applications/networking/Sylk {}; @@ -11356,9 +11300,7 @@ with pkgs; trytond = with python3Packages; toPythonApplication trytond; - tun2socks = callPackage ../tools/networking/tun2socks { - buildGoModule = buildGo118Module; - }; + tun2socks = callPackage ../tools/networking/tun2socks { }; tuntox = callPackage ../tools/networking/tuntox { }; @@ -12041,9 +11983,7 @@ with pkgs; wipe = callPackage ../tools/security/wipe { }; - wireguard-go = callPackage ../tools/networking/wireguard-go { - buildGoModule = buildGo118Module; - }; + wireguard-go = callPackage ../tools/networking/wireguard-go { }; wkhtmltopdf = libsForQt514.callPackage ../tools/graphics/wkhtmltopdf { }; @@ -13461,7 +13401,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security Foundation; }; - go = go_1_17; + go = go_1_18; go-junit-report = callPackage ../development/tools/go-junit-report { }; @@ -15082,9 +15022,7 @@ with pkgs; inav-blackbox-tools = callPackage ../tools/misc/inav-blackbox-tools { }; - infracost = callPackage ../tools/misc/infracost { - buildGoModule = buildGo118Module; - }; + infracost = callPackage ../tools/misc/infracost { }; msp430GccSupport = callPackage ../development/misc/msp430/gcc-support.nix { }; @@ -15427,9 +15365,7 @@ with pkgs; bpkg = callPackage ../development/tools/build-managers/build2/bpkg.nix { }; - buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { - buildGoModule = buildGo118Module; - }; + buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { }; buildkite-agent-metrics = callPackage ../servers/monitoring/buildkite-agent-metrics { }; @@ -15693,9 +15629,7 @@ with pkgs; cli11 = callPackage ../development/tools/misc/cli11 { }; - datree = callPackage ../development/tools/datree { - buildGoModule = buildGo118Module; - }; + datree = callPackage ../development/tools/datree { }; dcadec = callPackage ../development/tools/dcadec { }; @@ -15757,9 +15691,7 @@ with pkgs; doit = with python3Packages; toPythonApplication doit; - dolt = callPackage ../servers/sql/dolt { - buildGoModule = buildGo118Module; - }; + dolt = callPackage ../servers/sql/dolt { }; dot2tex = with python3.pkgs; toPythonApplication dot2tex; @@ -16105,7 +16037,7 @@ with pkgs; kcov = callPackage ../development/tools/analysis/kcov { }; - kind = callPackage ../development/tools/kind { buildGoModule = buildGo118Module; }; + kind = callPackage ../development/tools/kind { }; khronos-ocl-icd-loader = callPackage ../development/libraries/khronos-ocl-icd-loader { }; @@ -16135,9 +16067,7 @@ with pkgs; kubeprompt = callPackage ../development/tools/kubeprompt { }; - kubescape = callPackage ../tools/security/kubescape { - buildGoModule = buildGo118Module; - }; + kubescape = callPackage ../tools/security/kubescape { }; kubesec = callPackage ../tools/security/kubesec { }; @@ -16484,9 +16414,7 @@ with pkgs; reviewdog = callPackage ../development/tools/misc/reviewdog { }; - revive = callPackage ../development/tools/revive { - buildGoModule = buildGo118Module; - }; + revive = callPackage ../development/tools/revive { }; rman = callPackage ../development/tools/misc/rman { }; @@ -16732,9 +16660,7 @@ with pkgs; tflint = callPackage ../development/tools/analysis/tflint { }; - tfsec = callPackage ../development/tools/analysis/tfsec { - buildGoModule = buildGo118Module; - }; + tfsec = callPackage ../development/tools/analysis/tfsec { }; todoist = callPackage ../applications/misc/todoist { }; @@ -21819,7 +21745,7 @@ with pkgs; go = buildPackages.go_1_18; }; - buildGoPackage = buildGo117Package; + buildGoPackage = buildGo118Package; buildGo117Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_17; @@ -21828,7 +21754,7 @@ with pkgs; go = buildPackages.go_1_18; }; - buildGoModule = buildGo117Module; + buildGoModule = buildGo118Module; go2nix = callPackage ../development/tools/go2nix { }; @@ -22134,9 +22060,7 @@ with pkgs; gn = gn1924; }; - ergochat = callPackage ../servers/irc/ergochat { - buildGoModule = buildGo118Module; - }; + ergochat = callPackage ../servers/irc/ergochat { }; etcd = etcd_3_3; etcd_3_3 = callPackage ../servers/etcd/3.3.nix { }; @@ -22424,9 +22348,7 @@ with pkgs; mullvad-vpn = callPackage ../applications/networking/mullvad-vpn { }; - mycorrhiza = callPackage ../servers/mycorrhiza { - buildGoModule = buildGo118Module; - }; + mycorrhiza = callPackage ../servers/mycorrhiza { }; napalm = with python3Packages; toPythonApplication ( napalm.overridePythonAttrs (attrs: { @@ -22825,7 +22747,7 @@ with pkgs; liquibase_redshift_extension = callPackage ../development/java-modules/liquibase_redshift_extension { }; prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { }; - prometheus = callPackage ../servers/monitoring/prometheus { buildGoModule = buildGo118Module; }; + prometheus = callPackage ../servers/monitoring/prometheus { }; prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { }; prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { }; prometheus-artifactory-exporter = callPackage ../servers/monitoring/prometheus/artifactory-exporter.nix { }; @@ -23049,9 +22971,7 @@ with pkgs; systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { }; - tailscale = callPackage ../servers/tailscale { - buildGoModule = buildGo118Module; - }; + tailscale = callPackage ../servers/tailscale { }; thanos = callPackage ../servers/monitoring/thanos { }; @@ -23129,9 +23049,7 @@ with pkgs; webmetro = callPackage ../servers/webmetro { }; - wishlist = callPackage ../servers/wishlist { - buildGoModule = buildGo118Module; - }; + wishlist = callPackage ../servers/wishlist { }; wsdd = callPackage ../servers/wsdd { }; @@ -23354,9 +23272,7 @@ with pkgs; coredns = callPackage ../servers/dns/coredns { }; - corerad = callPackage ../tools/networking/corerad { - buildGoModule = buildGo118Module; - }; + corerad = callPackage ../tools/networking/corerad { }; cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { }; @@ -23959,9 +23875,7 @@ with pkgs; golint = callPackage ../development/tools/golint { }; - golangci-lint = callPackage ../development/tools/golangci-lint { - buildGoModule = buildGo118Module; - }; + golangci-lint = callPackage ../development/tools/golangci-lint { }; golangci-lint-langserver = callPackage ../development/tools/golangci-lint-langserver { }; @@ -23981,9 +23895,7 @@ with pkgs; gotest = callPackage ../development/tools/gotest { }; - gotools = callPackage ../development/tools/gotools { - buildGoModule = buildGo118Module; - }; + gotools = callPackage ../development/tools/gotools { }; gotop = callPackage ../tools/system/gotop { }; @@ -23995,9 +23907,7 @@ with pkgs; gomodifytags = callPackage ../development/tools/gomodifytags { }; - gopls = callPackage ../development/tools/gopls { - buildGoModule = buildGo118Module; - }; + gopls = callPackage ../development/tools/gopls { }; gops = callPackage ../development/tools/gops { }; @@ -27379,9 +27289,7 @@ with pkgs; google-chrome-dev = google-chrome.override { chromium = chromiumDev; channel = "dev"; }; - go-graft = callPackage ../applications/networking/go-graft { - buildGoModule = buildGo118Module; - }; + go-graft = callPackage ../applications/networking/go-graft { }; gosmore = callPackage ../applications/misc/gosmore { stdenv = gcc10StdenvCompat; }; @@ -27536,7 +27444,7 @@ with pkgs; haunt = callPackage ../applications/misc/haunt { }; - hugo = callPackage ../applications/misc/hugo { buildGoModule = buildGo118Module; }; + hugo = callPackage ../applications/misc/hugo { }; gatekeeper = callPackage ../applications/networking/cluster/gatekeeper { }; @@ -28779,9 +28687,7 @@ with pkgs; nload = callPackage ../applications/networking/nload { }; - nali = callPackage ../applications/networking/nali { - buildGoModule = buildGo118Module; - }; + nali = callPackage ../applications/networking/nali { }; normalize = callPackage ../applications/audio/normalize { }; @@ -30170,9 +30076,7 @@ with pkgs; robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { }; - routedns = callPackage ../tools/networking/routedns { - buildGoModule = buildGo118Module; - }; + routedns = callPackage ../tools/networking/routedns { }; skrooge = libsForQt5.callPackage ../applications/office/skrooge {}; @@ -30373,9 +30277,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - talosctl = callPackage ../applications/networking/cluster/talosctl { - buildGoModule = buildGo118Module; - }; + talosctl = callPackage ../applications/networking/cluster/talosctl { }; talentedhack = callPackage ../applications/audio/talentedhack { }; @@ -30438,13 +30340,9 @@ with pkgs; tempo = callPackage ../servers/tracing/tempo {}; - temporal = callPackage ../applications/networking/cluster/temporal { - buildGoModule = buildGo118Module; - }; + temporal = callPackage ../applications/networking/cluster/temporal { }; - temporal-cli = callPackage ../applications/networking/cluster/temporal-cli { - buildGoModule = buildGo118Module; - }; + temporal-cli = callPackage ../applications/networking/cluster/temporal-cli { }; tenacity = callPackage ../applications/audio/tenacity { wxGTK = wxGTK31-gtk3; }; @@ -31699,7 +31597,7 @@ with pkgs; ergo = callPackage ../applications/blockchains/ergo { }; - erigon = callPackage ../applications/blockchains/erigon.nix { buildGoModule = buildGo118Module; }; + erigon = callPackage ../applications/blockchains/erigon.nix { }; exodus = callPackage ../applications/blockchains/exodus { }; @@ -31850,7 +31748,7 @@ with pkgs; bench = haskell.lib.compose.justStaticExecutables haskellPackages.bench; cri-o = callPackage ../applications/virtualization/cri-o/wrapper.nix { }; - cri-o-unwrapped = callPackage ../applications/virtualization/cri-o { buildGoModule = buildGo118Module; }; + cri-o-unwrapped = callPackage ../applications/virtualization/cri-o { }; confd = callPackage ../tools/system/confd { }; @@ -34627,7 +34525,7 @@ with pkgs; idsk = callPackage ../tools/filesystems/idsk { stdenv = gcc10StdenvCompat; }; - colima = callPackage ../applications/virtualization/colima { buildGoModule = buildGo118Module; }; + colima = callPackage ../applications/virtualization/colima { }; lima = callPackage ../applications/virtualization/lima { }; @@ -35097,7 +34995,7 @@ with pkgs; runit = callPackage ../tools/system/runit { }; - runitor = callPackage ../tools/system/runitor { buildGoModule = buildGo118Module; }; + runitor = callPackage ../tools/system/runitor { }; refind = callPackage ../tools/bootloaders/refind { }; @@ -35261,9 +35159,7 @@ with pkgs; terraform-full = terraform.full; terraform-providers = recurseIntoAttrs ( - callPackage ../applications/networking/cluster/terraform-providers { - buildGoModule = buildGo118Module; - } + callPackage ../applications/networking/cluster/terraform-providers { } ); terraforming = callPackage ../applications/networking/cluster/terraforming { }; @@ -35284,9 +35180,7 @@ with pkgs; tgswitch = callPackage ../applications/networking/cluster/tgswitch {}; - tilt = callPackage ../applications/networking/cluster/tilt { - buildGoModule = buildGo118Module; - }; + tilt = callPackage ../applications/networking/cluster/tilt { }; timeular = callPackage ../applications/office/timeular {}; @@ -35879,9 +35773,7 @@ with pkgs; webwormhole = callPackage ../tools/networking/webwormhole { }; - werf = callPackage ../applications/networking/cluster/werf { - buildGoModule = buildGo118Module; - }; + werf = callPackage ../applications/networking/cluster/werf { }; wifi-password = callPackage ../os-specific/darwin/wifi-password {};