From a971bf2267ed17a015e31b5bf161bbba7ca5f635 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 20 Oct 2022 13:01:07 +1000 Subject: [PATCH] treewide: drop unnecessary go 1.19 overrides not needed now 1.19 is the default --- .../cluster/terraform-providers/default.nix | 4 +- pkgs/top-level/all-packages.nix | 67 +++++-------------- 2 files changed, 19 insertions(+), 52 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index fe4e052fd511..5ef3a336e295 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, buildGo119Module +, buildGoModule , fetchFromGitHub , callPackage , config @@ -21,7 +21,7 @@ let , vendorHash ? throw "use vendorHash instead of vendorSha256" # added 2202/09 , deleteVendor ? false , proxyVendor ? false - , mkProviderGoModule ? buildGo119Module + , mkProviderGoModule ? buildGoModule # Looks like "registry.terraform.io/vancluever/acme" , provider-source-address , ... diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 464f199ed59a..44e530954f94 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -739,9 +739,7 @@ with pkgs; graph-easy = callPackage ../tools/graphics/graph-easy { }; - mangal = callPackage ../applications/misc/mangal { - buildGoModule = buildGo119Module; - }; + mangal = callPackage ../applications/misc/mangal { }; graphw00f = callPackage ../tools/security/graphw00f { }; @@ -4053,9 +4051,7 @@ with pkgs; fx_cast_bridge = callPackage ../tools/misc/fx_cast { }; - fzf = callPackage ../tools/misc/fzf { - buildGoModule = buildGo119Module; - }; + fzf = callPackage ../tools/misc/fzf { }; fzf-obc = callPackage ../shells/bash/fzf-obc { }; @@ -4250,9 +4246,7 @@ with pkgs; hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { }; - hysteria = callPackage ../tools/networking/hysteria { - buildGoModule = buildGo119Module; - }; + hysteria = callPackage ../tools/networking/hysteria { }; hyx = callPackage ../tools/text/hyx { }; @@ -4810,9 +4804,7 @@ with pkgs; statserial = callPackage ../tools/misc/statserial { }; - steampipe = callPackage ../tools/misc/steampipe { - buildGoModule = buildGo119Module; - }; + steampipe = callPackage ../tools/misc/steampipe { }; step-ca = callPackage ../tools/security/step-ca { inherit (darwin.apple_sdk.frameworks) PCSC; @@ -6165,9 +6157,7 @@ with pkgs; tridactyl-native = callPackage ../tools/networking/tridactyl-native { }; - trivy = callPackage ../tools/admin/trivy { - buildGoModule = buildGo119Module; - }; + trivy = callPackage ../tools/admin/trivy { }; trompeloeil = callPackage ../development/libraries/trompeloeil { }; @@ -7974,9 +7964,7 @@ with pkgs; ipfetch = callPackage ../tools/networking/ipfetch { }; - ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { - buildGoModule = buildGo119Module; - }; + ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { }; ipfs-upload-client = callPackage ../applications/networking/ipfs-upload-client { }; @@ -9955,9 +9943,7 @@ with pkgs; opae = callPackage ../development/libraries/opae { }; opentelemetry-collector = callPackage ../tools/misc/opentelemetry-collector { }; - opentelemetry-collector-contrib = callPackage ../tools/misc/opentelemetry-collector/contrib.nix { - buildGoModule = buildGo119Module; - }; + opentelemetry-collector-contrib = callPackage ../tools/misc/opentelemetry-collector/contrib.nix { }; opentracing-cpp = callPackage ../development/libraries/opentracing-cpp { }; @@ -11827,9 +11813,7 @@ with pkgs; teip = callPackage ../tools/text/teip { }; - telegraf = callPackage ../servers/monitoring/telegraf { - buildGoModule = buildGo119Module; - }; + telegraf = callPackage ../servers/monitoring/telegraf { }; teleport = callPackage ../servers/teleport { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit; @@ -17802,9 +17786,7 @@ with pkgs; vtable-dumper = callPackage ../development/tools/misc/vtable-dumper { }; - wails = callPackage ../development/tools/wails { - buildGoModule = buildGo119Module; - }; + wails = callPackage ../development/tools/wails { }; whatsapp-for-linux = callPackage ../applications/networking/instant-messengers/whatsapp-for-linux { }; @@ -24340,9 +24322,7 @@ with pkgs; systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { }; - tailscale = callPackage ../servers/tailscale { - buildGoModule = buildGo119Module; - }; + tailscale = callPackage ../servers/tailscale { }; thanos = callPackage ../servers/monitoring/thanos { }; @@ -25322,7 +25302,6 @@ with pkgs; gotop = callPackage ../tools/system/gotop { inherit (darwin.apple_sdk.frameworks) IOKit; - buildGoModule = buildGo119Module; }; go-migrate = callPackage ../development/tools/go-migrate { }; @@ -27112,9 +27091,7 @@ with pkgs; argocd = callPackage ../applications/networking/cluster/argocd { }; - argocd-autopilot = callPackage ../applications/networking/cluster/argocd-autopilot { - buildGoModule = buildGo119Module; - }; + argocd-autopilot = callPackage ../applications/networking/cluster/argocd-autopilot { }; argo-rollouts = callPackage ../applications/networking/cluster/argo-rollouts { }; @@ -29027,9 +29004,7 @@ with pkgs; huggle = libsForQt5.callPackage ../applications/misc/huggle {}; - hugo = callPackage ../applications/misc/hugo { - buildGoModule = buildGo119Module; - }; + hugo = callPackage ../applications/misc/hugo { }; gatekeeper = callPackage ../applications/networking/cluster/gatekeeper { }; @@ -29634,7 +29609,7 @@ with pkgs; kubeval-schema = callPackage ../applications/networking/cluster/kubeval/schema.nix { }; - kubernetes = callPackage ../applications/networking/cluster/kubernetes { buildGoModule = buildGo119Module; }; + kubernetes = callPackage ../applications/networking/cluster/kubernetes { }; kubectl = callPackage ../applications/networking/cluster/kubernetes/kubectl.nix { }; kubectl-convert = kubectl.convert; @@ -29677,9 +29652,7 @@ with pkgs; pinniped = callPackage ../applications/networking/cluster/pinniped { }; - kthxbye = callPackage ../servers/monitoring/prometheus/kthxbye.nix { - buildGoModule = buildGo119Module; - }; + kthxbye = callPackage ../servers/monitoring/prometheus/kthxbye.nix { }; pgo-client = callPackage ../applications/networking/cluster/pgo-client { }; @@ -33344,9 +33317,7 @@ with pkgs; ergo = callPackage ../applications/blockchains/ergo { }; - erigon = callPackage ../applications/blockchains/erigon.nix { - buildGoModule = buildGo119Module; - }; + erigon = callPackage ../applications/blockchains/erigon.nix { }; exodus = callPackage ../applications/blockchains/exodus { }; @@ -36345,9 +36316,7 @@ with pkgs; gotestwaf = callPackage ../tools/security/gotestwaf { }; - gowitness = callPackage ../tools/security/gowitness { - buildGoModule = buildGo119Module; - }; + gowitness = callPackage ../tools/security/gowitness { }; guetzli = callPackage ../applications/graphics/guetzli { }; @@ -37718,9 +37687,7 @@ with pkgs; webwormhole = callPackage ../tools/networking/webwormhole { }; - werf = callPackage ../applications/networking/cluster/werf { - buildGoModule = buildGo119Module; - }; + werf = callPackage ../applications/networking/cluster/werf { }; wifi-password = callPackage ../os-specific/darwin/wifi-password {};