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 01/61] 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 {}; From 00c238249eee0373309a68d999687c9b5f1221d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 30 Jun 2022 00:23:33 +0200 Subject: [PATCH 02/61] cod: mark broken --- pkgs/tools/misc/cod/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/cod/default.nix b/pkgs/tools/misc/cod/default.nix index 582d0fe5ce07..4fdb8ce7ab45 100644 --- a/pkgs/tools/misc/cod/default.nix +++ b/pkgs/tools/misc/cod/default.nix @@ -29,10 +29,10 @@ buildGoModule rec { ''; meta = with lib; { - broken = stdenv.isDarwin; description = "Tool for generating Bash/Fish/Zsh autocompletions based on `--help` output"; homepage = "https://github.com/dim-an/cod/"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; + broken = true; }; } From 921803317554546d8f8f8290b19c90c6949d01c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 30 Jun 2022 00:34:48 +0200 Subject: [PATCH 03/61] cosign: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f17c981daba0..e46778a1f095 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2244,6 +2244,7 @@ with pkgs; cosign = callPackage ../tools/security/cosign { inherit (darwin.apple_sdk.frameworks) PCSC; + buildGoModule = buildGo117Module; }; cozy = callPackage ../applications/audio/cozy { }; From a6819f0047f47f02a0b8f0de8d3b25516bc7ee5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 30 Jun 2022 00:35:09 +0200 Subject: [PATCH 04/61] mole: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e46778a1f095..8ed10751bc2e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8628,7 +8628,9 @@ with pkgs; docbook-xsl = docbook_xsl; }; - mole = callPackage ../tools/networking/mole { }; + mole = callPackage ../tools/networking/mole { + buildGoModule = buildGo117Module; + }; morgen = callPackage ../applications/office/morgen { electron = electron_15; From 2bc1fb7cc2cffa3941b34eeae083eaac2f3aba66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 30 Jun 2022 00:35:15 +0200 Subject: [PATCH 05/61] garble: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ed10751bc2e..6ff50033a1ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17607,7 +17607,9 @@ with pkgs; ganv = callPackage ../development/libraries/ganv { }; - garble = callPackage ../build-support/go/garble.nix { }; + garble = callPackage ../build-support/go/garble.nix { + buildGoModule = buildGo117Module; + }; gcab = callPackage ../development/libraries/gcab { }; From 131de2bb9f7780d394b137a071fa5569198193eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 30 Jun 2022 00:35:22 +0200 Subject: [PATCH 06/61] dendrite: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ff50033a1ae..7306ca93918b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22018,7 +22018,9 @@ with pkgs; dcnnt = python3Packages.callPackage ../servers/dcnnt { }; - dendrite = callPackage ../servers/dendrite { }; + dendrite = callPackage ../servers/dendrite { + buildGoModule = buildGo117Module; + }; dex-oidc = callPackage ../servers/dex { }; From 160ca82f3fb3475f01e02b4fa13fbb4c8cd92d96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 30 Jun 2022 00:35:30 +0200 Subject: [PATCH 07/61] hyprspace: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7306ca93918b..8c902e1c148c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22197,7 +22197,10 @@ with pkgs; hydron = callPackage ../servers/hydron { }; - hyprspace = callPackage ../applications/networking/hyprspace { inherit (darwin) iproute2mac; }; + hyprspace = callPackage ../applications/networking/hyprspace { + inherit (darwin) iproute2mac; + buildGoModule = buildGo117Module; + }; ic-keysmith = callPackage ../tools/security/ic-keysmith { }; From e79ebaa1752aa523e8deddbe4872faa2399a966d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 30 Jun 2022 00:35:39 +0200 Subject: [PATCH 08/61] gomplate: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c902e1c148c..76d60d736b34 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23417,7 +23417,9 @@ with pkgs; gomp = callPackage ../applications/version-management/gomp { }; - gomplate = callPackage ../development/tools/gomplate {}; + gomplate = callPackage ../development/tools/gomplate { + buildGoModule = buildGo117Module; + }; gpm = callPackage ../servers/gpm { ncurses = null; # Keep curses disabled for lack of value From 6404ddae042acfe2ec47458bc9ade94c7cbee83e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 30 Jun 2022 00:35:46 +0200 Subject: [PATCH 09/61] gophernotes: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76d60d736b34..56574c60d5ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26811,7 +26811,9 @@ with pkgs; gopher = callPackage ../applications/networking/gopher/gopher { }; - gophernotes = callPackage ../applications/editors/gophernotes { }; + gophernotes = callPackage ../applications/editors/gophernotes { + buildGoModule = buildGo117Module; + }; goxel = callPackage ../applications/graphics/goxel { }; From 1dc954e93a1485a514b83d25af9c4e405e1a5f23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 30 Jun 2022 00:35:53 +0200 Subject: [PATCH 10/61] livedl: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 56574c60d5ff..f44e40c7f3b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31648,7 +31648,9 @@ with pkgs; }; litecoind = litecoin.override { withGui = false; }; - livedl = callPackage ../tools/misc/livedl { }; + livedl = callPackage ../tools/misc/livedl { + buildGoModule = buildGo117Module; + }; lnd = callPackage ../applications/blockchains/lnd { }; From 71bafa9b9de61c2352cef27bc4c7c0e2a421591a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 30 Jun 2022 00:44:51 +0200 Subject: [PATCH 11/61] go-chromecast: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f44e40c7f3b6..986d81a26fb7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3753,7 +3753,9 @@ with pkgs; gdu = callPackage ../tools/system/gdu { }; - go-chromecast = callPackage ../applications/video/go-chromecast { }; + go-chromecast = callPackage ../applications/video/go-chromecast { + buildGoModule = buildGo117Module; + }; go-containerregistry = callPackage ../development/tools/go-containerregistry { }; inherit (go-containerregistry) crane gcrane; From 68ab5cfa9cb448a8d4d8c3c023ab1db7a99b6a5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 30 Jun 2022 00:45:15 +0200 Subject: [PATCH 12/61] go-mockery: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 986d81a26fb7..ad7af20897cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23915,7 +23915,9 @@ with pkgs; go-migrate = callPackage ../development/tools/go-migrate { }; - go-mockery = callPackage ../development/tools/go-mockery { }; + go-mockery = callPackage ../development/tools/go-mockery { + buildGoModule = buildGo117Module; + }; gomacro = callPackage ../development/tools/gomacro { }; From 274005afc1ca49b05667556f3a7014420f0c8db5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 30 Jun 2022 00:47:50 +0200 Subject: [PATCH 13/61] grafana-agent: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad7af20897cd..c9fe7871c0e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22141,7 +22141,9 @@ 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 = buildGo117Module; + }; grafana-loki = callPackage ../servers/monitoring/loki { }; From c62bf3d276c039267745edc5ac2cf6243d7af064 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 30 Jun 2022 00:48:09 +0200 Subject: [PATCH 14/61] vegeta: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9fe7871c0e0..fea4fd4b85a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25420,7 +25420,9 @@ with pkgs; vegur = callPackage ../data/fonts/vegur { }; - vegeta = callPackage ../tools/networking/vegeta { }; + vegeta = callPackage ../tools/networking/vegeta { + buildGoModule = buildGo117Module; + }; venta = callPackage ../data/themes/venta { }; From 93ae75f7f38d7a0e14340cf2294a42dd185da91d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 30 Jun 2022 00:48:17 +0200 Subject: [PATCH 15/61] gowitness: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fea4fd4b85a2..a0548dd7f18e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34497,7 +34497,9 @@ with pkgs; gotestwaf = callPackage ../tools/security/gotestwaf { }; - gowitness = callPackage ../tools/security/gowitness { }; + gowitness = callPackage ../tools/security/gowitness { + buildGoModule = buildGo117Module; + }; guetzli = callPackage ../applications/graphics/guetzli { }; From a7ae450b0de4406921b47fe38f29368549cfef81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 30 Jun 2022 01:09:31 +0200 Subject: [PATCH 16/61] kconf: pint to go 1.17 --- pkgs/top-level/all-packages.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a0548dd7f18e..36c8b653b83f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27922,7 +27922,9 @@ with pkgs; k3sup = callPackage ../applications/networking/cluster/k3sup {}; - kconf = callPackage ../applications/networking/cluster/kconf { }; + kconf = callPackage ../applications/networking/cluster/kconf { + buildGoModule = buildGo117Module; + }; kail = callPackage ../tools/networking/kail { }; @@ -28061,7 +28063,9 @@ with pkgs; kubebuilder = callPackage ../applications/networking/cluster/kubebuilder { }; - kuttl = callPackage ../applications/networking/cluster/kuttl { }; + kuttl = callPackage ../applications/networking/cluster/kuttl { + buildGoModule = buildGo117Module; + }; kubectl-doctor = callPackage ../applications/networking/cluster/kubectl-doctor { }; From dd94522119daeb3948fcb5ca6253bac6a2906a7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 30 Jun 2022 01:17:25 +0200 Subject: [PATCH 17/61] marathonctl: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 36c8b653b83f..412fd8844502 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28402,7 +28402,9 @@ with pkgs; mapmap = libsForQt5.callPackage ../applications/video/mapmap { }; - marathonctl = callPackage ../tools/virtualization/marathonctl { } ; + marathonctl = callPackage ../tools/virtualization/marathonctl { + buildGoModule = buildGo117Module; + }; markdown-pp = callPackage ../tools/text/markdown-pp { }; From 41509c54f2ad87babed3c2757f1675e488c70cbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 30 Jun 2022 01:22:35 +0200 Subject: [PATCH 18/61] prometheus-nats-exporter: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 412fd8844502..38e84fc1c1b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22793,7 +22793,9 @@ with pkgs; prometheus-minio-exporter = callPackage ../servers/monitoring/prometheus/minio-exporter { }; prometheus-modemmanager-exporter = callPackage ../servers/monitoring/prometheus/modemmanager-exporter.nix { }; prometheus-mysqld-exporter = callPackage ../servers/monitoring/prometheus/mysqld-exporter.nix { }; - prometheus-nats-exporter = callPackage ../servers/monitoring/prometheus/nats-exporter.nix { }; + prometheus-nats-exporter = callPackage ../servers/monitoring/prometheus/nats-exporter.nix { + buildGoModule = buildGo117Module; + }; prometheus-nextcloud-exporter = callPackage ../servers/monitoring/prometheus/nextcloud-exporter.nix { }; prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { }; prometheus-nginxlog-exporter = callPackage ../servers/monitoring/prometheus/nginxlog-exporter.nix { }; From f723bca59e9f223b8618d1b9e73ec83b6bd5098f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 30 Jun 2022 15:42:23 +0200 Subject: [PATCH 19/61] unconvert: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38e84fc1c1b9..5a0140cd71c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21288,7 +21288,9 @@ with pkgs; umockdev = callPackage ../development/libraries/umockdev { }; - unconvert = callPackage ../development/tools/unconvert { }; + unconvert = callPackage ../development/tools/unconvert { + buildGoModule = buildGo117Module; + }; unibilium = callPackage ../development/libraries/unibilium { }; From 915092fb98b620a78a989b7b389628a71accec3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 30 Jun 2022 15:42:30 +0200 Subject: [PATCH 20/61] toxiproxy: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a0140cd71c2..cc706abc30f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30540,7 +30540,9 @@ with pkgs; toxic = callPackage ../applications/networking/instant-messengers/toxic { }; - toxiproxy = callPackage ../development/tools/toxiproxy { }; + toxiproxy = callPackage ../development/tools/toxiproxy { + buildGoModule = buildGo117Module; + }; tqsl = callPackage ../applications/radio/tqsl { }; trustedqsl = tqsl; # Alias added 2019-02-10 From 18952893c932301692c29bca5201cde930da8db1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 4 Jul 2022 14:57:04 +0200 Subject: [PATCH 21/61] photon: fix hash --- pkgs/applications/networking/feedreaders/photon/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/feedreaders/photon/default.nix b/pkgs/applications/networking/feedreaders/photon/default.nix index 0a02c1db1818..08df4af2db4f 100644 --- a/pkgs/applications/networking/feedreaders/photon/default.nix +++ b/pkgs/applications/networking/feedreaders/photon/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { proxyVendor = true; - vendorSha256 = "sha256-1vlgnY4kZJfoAtbv+r8onxL03Ak32zKLJgtrBYZX09g="; + vendorSha256 = "sha256-n9XNqXIoqn+f0xKCenJWXUYXtQhtbNBar68onWH/WV4="; meta = with lib; { description = "RSS/Atom reader with the focus on speed, usability and a bit of unix philosophy"; From 49cdf782dc208a2792349a8de540a622bb458c40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 4 Jul 2022 14:57:14 +0200 Subject: [PATCH 22/61] proto-contrib: fix hash, remove redundand platforms --- pkgs/development/tools/proto-contrib/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/tools/proto-contrib/default.nix b/pkgs/development/tools/proto-contrib/default.nix index f60bfb4b724d..7fb4e8aca448 100644 --- a/pkgs/development/tools/proto-contrib/default.nix +++ b/pkgs/development/tools/proto-contrib/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0ksxic7cypv9gg8q5lkl5bla1n9i65z7b03cx9lwq6252glmf2jk"; }; - vendorSha256 = "093blawprs2yf478zp9p1zc7mmimgpiwrw6nh8nqml89y5b5zldc"; + vendorSha256 = "sha256-XAFB+DDWN7CLfNxIBqYJy88gUNrUJYExzy2/BFnBe8c="; doCheck = false; @@ -20,6 +20,5 @@ buildGoModule rec { homepage = "https://github.com/emicklei/proto-contrib"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; - platforms = platforms.linux ++ platforms.darwin; }; } From c38f91777cc51c4258a5377eadb6a4d533cead12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 4 Jul 2022 16:22:51 +0200 Subject: [PATCH 23/61] sqlc: fix vendor hash, fix meta.platforms --- pkgs/development/tools/database/sqlc/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/database/sqlc/default.nix b/pkgs/development/tools/database/sqlc/default.nix index d63a220dff15..4866eb03ebd7 100644 --- a/pkgs/development/tools/database/sqlc/default.nix +++ b/pkgs/development/tools/database/sqlc/default.nix @@ -15,17 +15,14 @@ buildGoModule { }; proxyVendor = true; - vendorSha256 = "sha256-zZ0IrtfQvczoB7th9ZCUlYOtyZr3Y3yF0pKzRCqmCjo="; + vendorSha256 = "sha256-miyNIF6RNOuvNEA9Hf+hOyRJG+5IcXU4Vo4Fzn+nIb4="; subPackages = [ "cmd/sqlc" ]; - meta = let - inherit (lib) licenses platforms maintainers; - in { - description = " Generate type-safe code from SQL"; + meta = with lib; { + description = "Generate type-safe code from SQL"; homepage = "https://sqlc.dev/"; license = licenses.mit; - platforms = platforms.all; maintainers = [ maintainers.adisbladis ]; }; } From 1ed70b8b1beee4819b9e76e1ea224eaccc607f1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 4 Jul 2022 16:27:00 +0200 Subject: [PATCH 24/61] pigeon: fix vendor hash --- pkgs/development/tools/pigeon/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/pigeon/default.nix b/pkgs/development/tools/pigeon/default.nix index b94a9f4bfc36..31d668eb853b 100644 --- a/pkgs/development/tools/pigeon/default.nix +++ b/pkgs/development/tools/pigeon/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-0Cp/OnFvVZj9UZgl3F5MCzemBaHI4smGWU46VQnhLOg="; }; - vendorSha256 = "sha256-07zoQL4mLPSERBkZ3sz35Av7zdZsjTyGR8zbA86EEjU="; + vendorSha256 = "sha256-JbBXRkxnB7LeeWdBLIQvyjvWo0zZ1EOuEUPXxHWiq+E="; proxyVendor = true; From ad6fd85316cce5c15fc9b72474b0cf824787f919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 4 Jul 2022 16:35:47 +0200 Subject: [PATCH 25/61] vgo2nix: remove myself from maintainers --- pkgs/development/tools/vgo2nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/vgo2nix/default.nix b/pkgs/development/tools/vgo2nix/default.nix index 365bb920e4ac..ef8f536a06b6 100644 --- a/pkgs/development/tools/vgo2nix/default.nix +++ b/pkgs/development/tools/vgo2nix/default.nix @@ -34,7 +34,7 @@ buildGoModule { description = "Convert go.mod files to nixpkgs buildGoPackage compatible deps.nix files"; homepage = "https://github.com/nix-community/vgo2nix"; license = licenses.mit; - maintainers = with maintainers; [ adisbladis SuperSandro2000 ]; + maintainers = with maintainers; [ adisbladis ]; mainProgram = "vgo2nix"; }; } From 4c7e30aca038263d78db0419467b898f5ead6bf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 4 Jul 2022 16:35:57 +0200 Subject: [PATCH 26/61] vgo2nix: mark broken --- pkgs/development/tools/vgo2nix/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/vgo2nix/default.nix b/pkgs/development/tools/vgo2nix/default.nix index ef8f536a06b6..6841b069b1d4 100644 --- a/pkgs/development/tools/vgo2nix/default.nix +++ b/pkgs/development/tools/vgo2nix/default.nix @@ -36,5 +36,8 @@ buildGoModule { license = licenses.mit; maintainers = with maintainers; [ adisbladis ]; mainProgram = "vgo2nix"; + # vendoring fails with cryptic error: + # reading file:///nix/store/..../github.com/orivej/e/@v/v0.0.0-20180728214217-ac3492690fda.zip: no such file or directory + broken = true; }; } From a2965dced38d01ec9ab700d5fb798a3779368f82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 4 Jul 2022 16:49:28 +0200 Subject: [PATCH 27/61] protoc-gen-twirp_typescript: fix vendor hash --- pkgs/development/tools/protoc-gen-twirp_typescript/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix b/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix index ead72184b7cd..2aabe3bcce6e 100644 --- a/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix +++ b/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix @@ -11,7 +11,7 @@ buildGoModule { sha256 = "sha256-LfF/n96LwRX8aoPHzCRI/QbDmZR9yMhE5yGhFAqa8nA="; }; - vendorSha256 = "sha256-xZlP4rg1FMx6ddkKYlSdF6NrtY8xBZ3aEZSATgSf13M="; + vendorSha256 = "sha256-WISWuq1neVX4xQkoamc6FznZahOQHwgkYmERJF40OFQ="; subPackages = [ "." ]; From 5a1504bb306fa88aacf1b7bda5fb3aff2ae20a1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jul 2022 17:31:50 +0200 Subject: [PATCH 28/61] protolock: fix vendor hash --- pkgs/development/libraries/protolock/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/protolock/default.nix b/pkgs/development/libraries/protolock/default.nix index a9b45ddf6132..324c21df9288 100644 --- a/pkgs/development/libraries/protolock/default.nix +++ b/pkgs/development/libraries/protolock/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-vWwRZVArmlTIGwD4zV3dEHN2kkoeCZuNIvjCBVAviPo="; }; - vendorSha256 = "sha256-kgSJUSjY8kgrGCNDPgw1WA8KwAqI5koJQ0IcE+tC5nk="; + vendorSha256 = "sha256-pYtP+Tkh2TcGsbk7zQNaoYLEQrqGOL0gkMG5dUkfpt4="; postInstall = '' rm $out/bin/plugin* From 16e37e8dcc0a878a09a4d5a523583fe3dd613c1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jul 2022 17:32:14 +0200 Subject: [PATCH 29/61] endlessh-go: fix vendor hash --- pkgs/servers/endlessh-go/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/endlessh-go/default.nix b/pkgs/servers/endlessh-go/default.nix index eae3cd6a8d51..a1eb7b970eab 100644 --- a/pkgs/servers/endlessh-go/default.nix +++ b/pkgs/servers/endlessh-go/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { hash = "sha256-U+h/WmTVwwUIBEOiNa/EKS6HvkeoGNmP3NpeP1fcqYw="; }; - vendorSha256 = "sha256-h/DpbXO+LUsB9NOAXUfNx3VOfEsiolfBEMBrAqVlU3A="; + vendorSha256 = "sha256-5a/V2OQGVRIJVl/YG+lvtbLeHCy/1eiZu69zKIFqRKM="; proxyVendor = true; From cb4cf5156d88e41e75e8d75c8288c5a8e297c13e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jul 2022 17:32:24 +0200 Subject: [PATCH 30/61] telegraf: fix vendor hash --- pkgs/servers/monitoring/telegraf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 2285693df678..8428885d9980 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { sha256 = "sha256-Cftxm+Lb3ekK8YZrklD/C+p0EpyEVU/xxVI5oiNgBxk="; }; - vendorSha256 = "sha256-E1p9hnxNFse7Zg8FGcZrbVqThrGTVSP04nH/ZP8WBlk="; + vendorSha256 = "sha256-VyNPIYRMAC51zp38BKoM5/bLbfwULtFEtRC3LQjVJK4="; proxyVendor = true; ldflags = [ From 03a48db031e14b48594e5a10687f39ceaa910f6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jul 2022 17:32:31 +0200 Subject: [PATCH 31/61] zsh-history: fix vendor hash, formatting --- pkgs/shells/zsh/zsh-history/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/shells/zsh/zsh-history/default.nix b/pkgs/shells/zsh/zsh-history/default.nix index 9f88d972e7d2..604d593a0bd4 100644 --- a/pkgs/shells/zsh/zsh-history/default.nix +++ b/pkgs/shells/zsh/zsh-history/default.nix @@ -11,9 +11,9 @@ buildGoModule rec { sha256 = "13n643ik1zjvpk8h9458yd9ffahhbdnigmbrbmpn7b7g23wqqsi3"; }; - nativeBuildInputs = [ installShellFiles ]; + vendorSha256 = "sha256-n5QFN1B2GjbzylFuW9Y4r0+ioIJlfKwcGK8X3ZwKLI8="; - vendorSha256 = "1863ad97y82fx0an1ysalkxnqjz3zfz228wag9a92wdssl1vwzws"; + nativeBuildInputs = [ installShellFiles ]; doCheck = false; @@ -23,16 +23,15 @@ buildGoModule rec { installShellCompletion --zsh --name _history $out/share/zsh/completions/_history ''; + passthru.tests = { + zsh-history-shell-integration = nixosTests.zsh-history; + }; + meta = with lib; { description = "A CLI to provide enhanced history for your ZSH shell"; homepage = "https://github.com/b4b4r07/history"; license = licenses.mit; maintainers = with maintainers; [ ]; mainProgram = "history"; - platforms = platforms.unix; - }; - - passthru.tests = { - zsh-history-shell-integration = nixosTests.zsh-history; }; } From 491ce92971aa91712c96bd2ae26ac809a7ca65fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jul 2022 17:32:39 +0200 Subject: [PATCH 32/61] opentelemetry-collector: fix vendor hash --- pkgs/tools/misc/opentelemetry-collector/contrib.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/pkgs/tools/misc/opentelemetry-collector/contrib.nix index 720486100215..88a1e71d900e 100644 --- a/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ b/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -16,7 +16,7 @@ buildGoModule rec { }; # proxy vendor to avoid hash missmatches between linux and macOS proxyVendor = true; - vendorSha256 = "sha256-CzFcSvJCMfS83Semk92XUd9iSX6OjOrDzRUNNLVtpi4="; + vendorSha256 = "sha256-G3sIWkYKYnqDmmwspQNw+8yU/SWBBr8KX7Osae9mXe4="; subPackages = [ "cmd/otelcontribcol" ]; From 00336e25bd4dc552208bda65da776b72b4b10fd0 Mon Sep 17 00:00:00 2001 From: toonn Date: Fri, 8 Jul 2022 13:07:11 +0200 Subject: [PATCH 33/61] go_1_18: Use apple_sdk_11_0.callPackage Go 1.18 requires a newer SDK than the one we build from sources. As a workaround we're making use of the SDK we're using for aarch64-darwin. This means Go 1.18 will not work on any Darwin systems that don't have forwards-compatible SDK versions with the particular package in question. We might need to mark Go packages broken based on the macOS version rather than just the platform and architecture. Until we find a better solution, Go packages will need to make sure to get all their (Darwin) system dependencies from the `apple_sdk_11_0`, this includes dependencies of build tools like `xcbuild`. For convenience `darwin.apple_sdk_11_0` has a `callPackage` attribute which provides the correct `stdenv` and `xcbuild` attributes as arguments. This function can be expanded to substitute other necessary arguments when they come up. --- pkgs/top-level/all-packages.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc706abc30f3..a82ed87bf764 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13402,8 +13402,9 @@ with pkgs; buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; }); - go_1_18 = callPackage ../development/compilers/go/1.18.nix { - inherit (darwin.apple_sdk.frameworks) Security Foundation; + # go 1.18 requires a newer Apple SDK to be build. See commit message for more details. + go_1_18 = darwin.apple_sdk_11_0.callPackage ../development/compilers/go/1.18.nix { + inherit (darwin.apple_sdk_11_0.frameworks) Security Foundation; }; go = go_1_18; @@ -21750,7 +21751,9 @@ with pkgs; buildGo117Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_17; }; - buildGo118Package = callPackage ../development/go-packages/generic { + + # go 1.18 requires a newer Apple SDK to be build. See commit message for more details. + buildGo118Package = darwin.apple_sdk_11_0.callPackage ../development/go-packages/generic { go = buildPackages.go_1_18; }; @@ -21759,7 +21762,9 @@ with pkgs; buildGo117Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_17; }; - buildGo118Module = callPackage ../development/go-modules/generic { + + # go 1.18 requires a newer Apple SDK to be build. See commit message for more details. + buildGo118Module = darwin.apple_sdk_11_0.callPackage ../development/go-modules/generic { go = buildPackages.go_1_18; }; From d84ab451b0d862d928fe8b1f9df2bd21344ee124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 13 Jul 2022 14:02:57 +0200 Subject: [PATCH 34/61] shadowfox: pin to go 1.17, update vendor hash, complete ldflags, shorten description --- pkgs/tools/networking/shadowfox/default.nix | 9 ++++----- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/tools/networking/shadowfox/default.nix index 56406583637f..3577939c8da4 100644 --- a/pkgs/tools/networking/shadowfox/default.nix +++ b/pkgs/tools/networking/shadowfox/default.nix @@ -11,19 +11,18 @@ buildGoModule rec { sha256 = "125mw70jidbp436arhv77201jdp6mpgqa2dzmrpmk55f9bf29sg6"; }; - vendorSha256 = "17m0ssfw9n3g2lkv63qajz3adrk5yp0c9hx66x7dl79snwqd49yg"; + vendorSha256 = "sha256-llseW3k8ygTXwkSpnRfQEnX3OVj2zdL8JDpIoRcC9kE="; doCheck = false; ldflags = [ + "-s" + "-w" "-X main.tag=v${version}" ]; meta = with lib; { - description = '' - This project aims at creating a universal dark theme for Firefox while - adhering to the modern design principles set by Mozilla. - ''; + description = "Universal dark theme for Firefox while adhering to the modern design principles set by Mozilla"; homepage = "https://overdodactyl.github.io/ShadowFox/"; license = licenses.mit; maintainers = with maintainers; [ infinisil ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a82ed87bf764..1e0727b11461 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29934,7 +29934,9 @@ with pkgs; sfxr-qt = libsForQt5.callPackage ../applications/audio/sfxr-qt { }; - shadowfox = callPackage ../tools/networking/shadowfox { }; + shadowfox = callPackage ../tools/networking/shadowfox { + buildGoModule = buildGo117Module; + }; shfmt = callPackage ../tools/text/shfmt { }; From e54893ae6191869c62663dc86b6a70c771f0e539 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 13 Jul 2022 14:04:22 +0200 Subject: [PATCH 35/61] waitron: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e0727b11461..05a2d812fe30 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4352,7 +4352,9 @@ with pkgs; pixiecore = callPackage ../tools/networking/pixiecore {}; - waitron = callPackage ../tools/networking/waitron {}; + waitron = callPackage ../tools/networking/waitron { + buildGoModule = buildGo117Module; + }; pyCA = python3Packages.callPackage ../applications/video/pyca {}; From 4482425152628dc1de9ff2ad2c696279e45eba4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 13 Jul 2022 14:04:34 +0200 Subject: [PATCH 36/61] git-hound: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05a2d812fe30..01edd24ac316 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6518,7 +6518,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - git-hound = callPackage ../tools/security/git-hound { }; + git-hound = callPackage ../tools/security/git-hound { + buildGoModule = buildGo117Module; + }; git-hub = callPackage ../applications/version-management/git-and-tools/git-hub { }; From 2c9658bc6149ed6276e9b4558af45961bd2f0631 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 13 Jul 2022 14:04:42 +0200 Subject: [PATCH 37/61] httpdump: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01edd24ac316..0887b870256b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7223,7 +7223,9 @@ with pkgs; httpdirfs = callPackage ../tools/filesystems/httpdirfs { }; - httpdump = callPackage ../tools/security/httpdump { }; + httpdump = callPackage ../tools/security/httpdump { + buildGoModule = buildGo117Module; + }; httpie = with python3Packages; toPythonApplication httpie; From d231799bd6b917117ccc2e517328807a9dd0f325 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 13 Jul 2022 14:04:51 +0200 Subject: [PATCH 38/61] kfctl: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0887b870256b..c330bbcc4dff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7697,7 +7697,9 @@ with pkgs; jdk = jdk11; }; - kfctl = callPackage ../applications/networking/cluster/kfctl { }; + kfctl = callPackage ../applications/networking/cluster/kfctl { + buildGoModule = buildGo117Module; + }; kibana7 = callPackage ../development/tools/misc/kibana/7.x.nix { }; kibana = kibana7; From 6551082aaeb5e05ec5a0536321bac29ea0ba3bef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 13 Jul 2022 14:04:59 +0200 Subject: [PATCH 39/61] opensnitch: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c330bbcc4dff..7374f072c005 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9114,7 +9114,9 @@ with pkgs; openfortivpn = callPackage ../tools/networking/openfortivpn { }; - opensnitch = callPackage ../tools/networking/opensnitch/daemon.nix { }; + opensnitch = callPackage ../tools/networking/opensnitch/daemon.nix { + buildGoModule = buildGo117Module; + }; opensnitch-ui = libsForQt5.callPackage ../tools/networking/opensnitch/ui.nix { }; From 4ac04d0187b7d70a281076a88f28adfe925efe94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 13 Jul 2022 14:05:09 +0200 Subject: [PATCH 40/61] safe: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7374f072c005..6b104308db7c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10318,7 +10318,9 @@ with pkgs; sacd = callPackage ../tools/cd-dvd/sacd { }; - safe = callPackage ../tools/security/safe { }; + safe = callPackage ../tools/security/safe { + buildGoModule = buildGo117Module; + }; safety-cli = with python3.pkgs; toPythonApplication safety; From 433e3fd6274322d53b292f5c949813a08b2780c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 13 Jul 2022 14:05:15 +0200 Subject: [PATCH 41/61] ssb: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b104308db7c..7d7dfcf357c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10825,7 +10825,9 @@ with pkgs; svgcleaner = callPackage ../tools/graphics/svgcleaner { }; - ssb = callPackage ../tools/security/ssb { }; + ssb = callPackage ../tools/security/ssb { + buildGoModule = buildGo117Module; + }; ssb-patchwork = callPackage ../applications/networking/ssb-patchwork { }; From 3276319bf968abb3ed8ff7d475858ffcb96503d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 13 Jul 2022 14:05:22 +0200 Subject: [PATCH 42/61] wrap: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d7dfcf357c5..bff6f682c3a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12018,7 +12018,9 @@ with pkgs; wpgtk = callPackage ../tools/X11/wpgtk { }; - wrap = callPackage ../tools/text/wrap { }; + wrap = callPackage ../tools/text/wrap { + buildGoModule = buildGo117Module; + }; wring = nodePackages.wring; From 72f672e1ada12b924f44c3a33932e19ce17f446d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 13 Jul 2022 14:05:29 +0200 Subject: [PATCH 43/61] wuzz: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bff6f682c3a5..e402dfdd5410 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12028,7 +12028,9 @@ with pkgs; wrk2 = callPackage ../tools/networking/wrk2 { }; - wuzz = callPackage ../tools/networking/wuzz { }; + wuzz = callPackage ../tools/networking/wuzz { + buildGoModule = buildGo117Module; + }; wv = callPackage ../tools/misc/wv { }; From a2ed9eb8416559e2e9aafcedcffcba244b963a5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 13 Jul 2022 14:05:36 +0200 Subject: [PATCH 44/61] zfsbackup: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e402dfdd5410..b715f9720e6f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12219,7 +12219,9 @@ with pkgs; zfs-autobackup = callPackage ../tools/backup/zfs-autobackup { }; - zfsbackup = callPackage ../tools/backup/zfsbackup { }; + zfsbackup = callPackage ../tools/backup/zfsbackup { + buildGoModule = buildGo117Module; + }; zfstools = callPackage ../tools/filesystems/zfstools { }; From c15d664a37c7ca4aef28081041d243cdd901730e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 13 Jul 2022 14:05:46 +0200 Subject: [PATCH 45/61] filtron: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b715f9720e6f..c793ac043cc2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17527,7 +17527,9 @@ with pkgs; filter-audio = callPackage ../development/libraries/filter-audio {}; - filtron = callPackage ../servers/filtron {}; + filtron = callPackage ../servers/filtron { + buildGoModule = buildGo117Module; + }; flann = callPackage ../development/libraries/flann { }; From 1f283b0532b0f5b09a9ec51d0bd515308c1a0d13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 13 Jul 2022 14:05:54 +0200 Subject: [PATCH 46/61] sshgit: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c793ac043cc2..d390a6ed05c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20893,7 +20893,9 @@ with pkgs; sfsexp = callPackage ../development/libraries/sfsexp {}; - shhgit = callPackage ../tools/security/shhgit { }; + shhgit = callPackage ../tools/security/shhgit { + buildGoModule = buildGo117Module; + }; shhmsg = callPackage ../development/libraries/shhmsg { }; From 081f6e28a0339d7776e68af7bd5117bb17a4629c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 13 Jul 2022 14:06:02 +0200 Subject: [PATCH 47/61] gobetween: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d390a6ed05c8..6bce293fa625 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22192,7 +22192,9 @@ with pkgs; gerbera = callPackage ../servers/gerbera {}; - gobetween = callPackage ../servers/gobetween { }; + gobetween = callPackage ../servers/gobetween { + buildGoModule = buildGo117Module; + }; gobgpd = callPackage ../servers/misc/gobgpd { }; From c5f8c9bd8cc130e24431cde441cb4742d815211f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 13 Jul 2022 14:06:20 +0200 Subject: [PATCH 48/61] prometheus-nginxlog-exporter: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6bce293fa625..2b03d58f9723 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22831,7 +22831,9 @@ with pkgs; }; prometheus-nextcloud-exporter = callPackage ../servers/monitoring/prometheus/nextcloud-exporter.nix { }; prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { }; - prometheus-nginxlog-exporter = callPackage ../servers/monitoring/prometheus/nginxlog-exporter.nix { }; + prometheus-nginxlog-exporter = callPackage ../servers/monitoring/prometheus/nginxlog-exporter.nix { + buildGoModule = buildGo117Module; + }; prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node-exporter.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit; }; From 7a93c88e805869fef5b7f27c41c486d07b6ef98f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 13 Jul 2022 14:06:42 +0200 Subject: [PATCH 49/61] pg_featureserv: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b03d58f9723..1841236d015b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23181,7 +23181,9 @@ with pkgs; mbtileserver = callPackage ../servers/geospatial/mbtileserver { }; - pg_featureserv = callPackage ../servers/geospatial/pg_featureserv { }; + pg_featureserv = callPackage ../servers/geospatial/pg_featureserv { + buildGoModule = buildGo117Module; + }; pg_tileserv = callPackage ../servers/geospatial/pg_tileserv { }; From 507d13c488d5cee1be6f93f106ee145e48c76244 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 13 Jul 2022 14:06:50 +0200 Subject: [PATCH 50/61] alertmanager-bot: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1841236d015b..cc4b40898730 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23213,7 +23213,9 @@ with pkgs; alfred = callPackage ../os-specific/linux/batman-adv/alfred.nix { }; - alertmanager-bot = callPackage ../servers/monitoring/alertmanager-bot { }; + alertmanager-bot = callPackage ../servers/monitoring/alertmanager-bot { + buildGoModule = buildGo117Module; + }; alertmanager-irc-relay = callPackage ../servers/monitoring/alertmanager-irc-relay { }; From 6ab206a6ae62e6e0f4e93f58921aeabe591a0b25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 13 Jul 2022 14:06:59 +0200 Subject: [PATCH 51/61] pam_ussh: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc4b40898730..7753f5195cac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24034,7 +24034,9 @@ with pkgs; pam_usb = callPackage ../os-specific/linux/pam_usb { }; - pam_ussh = callPackage ../os-specific/linux/pam_ussh { }; + pam_ussh = callPackage ../os-specific/linux/pam_ussh { + buildGoModule = buildGo117Module; + }; paxctl = callPackage ../os-specific/linux/paxctl { }; From 7fdbf855f23f1172bf8765de3935ff1a4b47853f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 13 Jul 2022 14:07:08 +0200 Subject: [PATCH 52/61] exercism: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7753f5195cac..bc97c4d98cc6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26536,7 +26536,9 @@ with pkgs; exaile = callPackage ../applications/audio/exaile { }; - exercism = callPackage ../applications/misc/exercism { }; + exercism = callPackage ../applications/misc/exercism { + buildGoModule = buildGo117Module; + }; expenses = callPackage ../applications/misc/expenses { }; From d3fbab042a10a19a2a22a4e385b4d8c425ba8e65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 13 Jul 2022 14:07:17 +0200 Subject: [PATCH 53/61] kubectl-evict-pod: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bc97c4d98cc6..185531256c78 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28084,7 +28084,9 @@ with pkgs; kube-score = callPackage ../applications/networking/cluster/kube-score { }; - kubectl-evict-pod = callPackage ../applications/networking/cluster/kubectl-evict-pod { }; + kubectl-evict-pod = callPackage ../applications/networking/cluster/kubectl-evict-pod { + buildGoModule = buildGo117Module; + }; kubeval = callPackage ../applications/networking/cluster/kubeval { }; From e630e8bf514c056d3a8f8a2b6f47cc20c154bf32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 13 Jul 2022 14:07:29 +0200 Subject: [PATCH 54/61] kubemqctl: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 185531256c78..91e966957c16 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28096,7 +28096,9 @@ with pkgs; kubectl = callPackage ../applications/networking/cluster/kubernetes/kubectl.nix { }; kubectl-convert = kubectl.convert; - kubemqctl = callPackage ../applications/networking/cluster/kubemqctl { }; + kubemqctl = callPackage ../applications/networking/cluster/kubemqctl { + buildGoModule = buildGo117Module; + }; kubent = callPackage ../applications/networking/cluster/kubent { }; From 429b10640639c1c8dec083ac35851e8bd0c9ba1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 13 Jul 2022 14:07:37 +0200 Subject: [PATCH 55/61] kubectl-doctor: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91e966957c16..057fda167dd9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28116,7 +28116,9 @@ with pkgs; buildGoModule = buildGo117Module; }; - kubectl-doctor = callPackage ../applications/networking/cluster/kubectl-doctor { }; + kubectl-doctor = callPackage ../applications/networking/cluster/kubectl-doctor { + buildGoModule = buildGo117Module; + }; kubectl-example = callPackage ../applications/networking/cluster/kubectl-example { }; From 4982ae785af539455ae1e5e4e805531e7af67dc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 13 Jul 2022 14:07:47 +0200 Subject: [PATCH 56/61] magnetico: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 057fda167dd9..32b7ab77f0c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28467,7 +28467,9 @@ with pkgs; electron = electron_9; }; - magnetico = callPackage ../applications/networking/p2p/magnetico { }; + magnetico = callPackage ../applications/networking/p2p/magnetico { + buildGoModule = buildGo117Module; + }; mastodon-bot = nodePackages.mastodon-bot; From 3ea65022ae657d74145b8f39fe14a7e33bf2e293 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 13 Jul 2022 14:07:57 +0200 Subject: [PATCH 57/61] deepsea: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32b7ab77f0c9..d7475057bfc3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33301,7 +33301,9 @@ with pkgs; deepdiff = with python3Packages; toPythonApplication deepdiff; - deepsea = callPackage ../tools/security/deepsea { }; + deepsea = callPackage ../tools/security/deepsea { + buildGoModule = buildGo117Module; + }; deeptools = callPackage ../applications/science/biology/deeptools { python = python3; }; From 3bed988feffaaa20d54ebf9c16bb506e05f5eb2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 13 Jul 2022 14:08:04 +0200 Subject: [PATCH 58/61] zrepl: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7475057bfc3..7c3fe2e1190b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35846,7 +35846,9 @@ with pkgs; zfs-replicate = python3Packages.callPackage ../tools/backup/zfs-replicate { }; - zrepl = callPackage ../tools/backup/zrepl { }; + zrepl = callPackage ../tools/backup/zrepl { + buildGoModule = buildGo117Module; + }; uhubctl = callPackage ../tools/misc/uhubctl {}; From e371e8b9ea03217ec4159b4222e009de39db4863 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 13 Jul 2022 14:08:23 +0200 Subject: [PATCH 59/61] kcli: pin to go 1.17 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c3fe2e1190b..6c0ea816beef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35886,7 +35886,9 @@ with pkgs; kaf = callPackage ../development/tools/kaf { }; - kcli = callPackage ../development/tools/kcli { }; + kcli = callPackage ../development/tools/kcli { + buildGoModule = buildGo117Module; + }; pxlib = callPackage ../development/libraries/pxlib {}; From 4ddd633b5abce21f381245f8f78c8f350df1bc17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 13 Jul 2022 14:06:10 +0200 Subject: [PATCH 60/61] ncdns: mark broken --- pkgs/servers/dns/ncdns/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/dns/ncdns/default.nix b/pkgs/servers/dns/ncdns/default.nix index 7729305da5b2..8feae334be46 100644 --- a/pkgs/servers/dns/ncdns/default.nix +++ b/pkgs/servers/dns/ncdns/default.nix @@ -100,13 +100,14 @@ buildGoModule { cp -r _tpl "$out/share/tpl" ''; + passthru.tests.ncdns = nixosTests.ncdns; + meta = with lib; { description = "Namecoin to DNS bridge daemon"; homepage = "https://github.com/namecoin/ncdns"; license = licenses.gpl3Plus; maintainers = with maintainers; [ rnhmjoj ]; + # module github.com/btcsuite/btcd@latest found (v0.23.1), but does not contain package github.com/btcsuite/btcd/btcec + broken = true; }; - - passthru.tests.ncdns = nixosTests.ncdns; - } From bd2d654f81f2defb78751c0fbeae6a561795a832 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 15 Jul 2022 23:52:52 +0200 Subject: [PATCH 61/61] treewide: add a comment explaining to buildGo117Module override --- pkgs/top-level/all-packages.nix | 47 +++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c0ea816beef..c0620c893828 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2244,6 +2244,7 @@ with pkgs; cosign = callPackage ../tools/security/cosign { inherit (darwin.apple_sdk.frameworks) PCSC; + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -3754,6 +3755,7 @@ with pkgs; gdu = callPackage ../tools/system/gdu { }; go-chromecast = callPackage ../applications/video/go-chromecast { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -4353,6 +4355,7 @@ with pkgs; pixiecore = callPackage ../tools/networking/pixiecore {}; waitron = callPackage ../tools/networking/waitron { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -6519,6 +6522,7 @@ with pkgs; }; git-hound = callPackage ../tools/security/git-hound { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -7224,6 +7228,7 @@ with pkgs; httpdirfs = callPackage ../tools/filesystems/httpdirfs { }; httpdump = callPackage ../tools/security/httpdump { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -7698,6 +7703,7 @@ with pkgs; }; kfctl = callPackage ../applications/networking/cluster/kfctl { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -8639,6 +8645,7 @@ with pkgs; }; mole = callPackage ../tools/networking/mole { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -8892,9 +8899,11 @@ with pkgs; # Upstream partially documents used Go versions here # https://github.com/hashicorp/nomad/blob/master/contributing/golang.md nomad_1_2 = callPackage ../applications/networking/cluster/nomad/1.2.nix { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; nomad_1_3 = callPackage ../applications/networking/cluster/nomad/1.3.nix { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -9115,6 +9124,7 @@ with pkgs; openfortivpn = callPackage ../tools/networking/openfortivpn { }; opensnitch = callPackage ../tools/networking/opensnitch/daemon.nix { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -10319,6 +10329,7 @@ with pkgs; sacd = callPackage ../tools/cd-dvd/sacd { }; safe = callPackage ../tools/security/safe { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -10826,6 +10837,7 @@ with pkgs; svgcleaner = callPackage ../tools/graphics/svgcleaner { }; ssb = callPackage ../tools/security/ssb { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -12019,6 +12031,7 @@ with pkgs; wpgtk = callPackage ../tools/X11/wpgtk { }; wrap = callPackage ../tools/text/wrap { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -12029,6 +12042,7 @@ with pkgs; wrk2 = callPackage ../tools/networking/wrk2 { }; wuzz = callPackage ../tools/networking/wuzz { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -12220,6 +12234,7 @@ with pkgs; zfs-autobackup = callPackage ../tools/backup/zfs-autobackup { }; zfsbackup = callPackage ../tools/backup/zfsbackup { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -17528,6 +17543,7 @@ with pkgs; filter-audio = callPackage ../development/libraries/filter-audio {}; filtron = callPackage ../servers/filtron { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -17633,6 +17649,7 @@ with pkgs; ganv = callPackage ../development/libraries/ganv { }; garble = callPackage ../build-support/go/garble.nix { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -20894,6 +20911,7 @@ with pkgs; sfsexp = callPackage ../development/libraries/sfsexp {}; shhgit = callPackage ../tools/security/shhgit { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -21314,6 +21332,7 @@ with pkgs; umockdev = callPackage ../development/libraries/umockdev { }; unconvert = callPackage ../development/tools/unconvert { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -22052,6 +22071,7 @@ with pkgs; dcnnt = python3Packages.callPackage ../servers/dcnnt { }; dendrite = callPackage ../servers/dendrite { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -22173,6 +22193,7 @@ with pkgs; grafanaPlugins = callPackages ../servers/monitoring/grafana/plugins { }; grafana-agent = callPackage ../servers/monitoring/grafana-agent { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -22193,6 +22214,7 @@ with pkgs; gerbera = callPackage ../servers/gerbera {}; gobetween = callPackage ../servers/gobetween { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -22236,6 +22258,7 @@ with pkgs; hyprspace = callPackage ../applications/networking/hyprspace { inherit (darwin) iproute2mac; + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -22827,11 +22850,13 @@ with pkgs; prometheus-modemmanager-exporter = callPackage ../servers/monitoring/prometheus/modemmanager-exporter.nix { }; prometheus-mysqld-exporter = callPackage ../servers/monitoring/prometheus/mysqld-exporter.nix { }; prometheus-nats-exporter = callPackage ../servers/monitoring/prometheus/nats-exporter.nix { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; prometheus-nextcloud-exporter = callPackage ../servers/monitoring/prometheus/nextcloud-exporter.nix { }; prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { }; prometheus-nginxlog-exporter = callPackage ../servers/monitoring/prometheus/nginxlog-exporter.nix { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node-exporter.nix { @@ -23182,6 +23207,7 @@ with pkgs; mbtileserver = callPackage ../servers/geospatial/mbtileserver { }; pg_featureserv = callPackage ../servers/geospatial/pg_featureserv { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -23214,6 +23240,7 @@ with pkgs; alfred = callPackage ../os-specific/linux/batman-adv/alfred.nix { }; alertmanager-bot = callPackage ../servers/monitoring/alertmanager-bot { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -23463,6 +23490,7 @@ with pkgs; gomp = callPackage ../applications/version-management/gomp { }; gomplate = callPackage ../development/tools/gomplate { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -23959,6 +23987,7 @@ with pkgs; go-migrate = callPackage ../development/tools/go-migrate { }; go-mockery = callPackage ../development/tools/go-mockery { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -24035,6 +24064,7 @@ with pkgs; pam_usb = callPackage ../os-specific/linux/pam_usb { }; pam_ussh = callPackage ../os-specific/linux/pam_ussh { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -25464,6 +25494,7 @@ with pkgs; vegur = callPackage ../data/fonts/vegur { }; vegeta = callPackage ../tools/networking/vegeta { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -26537,6 +26568,7 @@ with pkgs; exaile = callPackage ../applications/audio/exaile { }; exercism = callPackage ../applications/misc/exercism { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -26865,6 +26897,7 @@ with pkgs; gopher = callPackage ../applications/networking/gopher/gopher { }; gophernotes = callPackage ../applications/editors/gophernotes { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -27968,6 +28001,7 @@ with pkgs; k3sup = callPackage ../applications/networking/cluster/k3sup {}; kconf = callPackage ../applications/networking/cluster/kconf { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -28085,6 +28119,7 @@ with pkgs; kube-score = callPackage ../applications/networking/cluster/kube-score { }; kubectl-evict-pod = callPackage ../applications/networking/cluster/kubectl-evict-pod { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -28097,6 +28132,7 @@ with pkgs; kubectl-convert = kubectl.convert; kubemqctl = callPackage ../applications/networking/cluster/kubemqctl { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -28113,10 +28149,12 @@ with pkgs; kubebuilder = callPackage ../applications/networking/cluster/kubebuilder { }; kuttl = callPackage ../applications/networking/cluster/kuttl { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; kubectl-doctor = callPackage ../applications/networking/cluster/kubectl-doctor { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -28454,6 +28492,7 @@ with pkgs; mapmap = libsForQt5.callPackage ../applications/video/mapmap { }; marathonctl = callPackage ../tools/virtualization/marathonctl { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -28468,6 +28507,7 @@ with pkgs; }; magnetico = callPackage ../applications/networking/p2p/magnetico { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -29979,6 +30019,7 @@ with pkgs; sfxr-qt = libsForQt5.callPackage ../applications/audio/sfxr-qt { }; shadowfox = callPackage ../tools/networking/shadowfox { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -30592,6 +30633,7 @@ with pkgs; toxic = callPackage ../applications/networking/instant-messengers/toxic { }; toxiproxy = callPackage ../development/tools/toxiproxy { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -31720,6 +31762,7 @@ with pkgs; litecoind = litecoin.override { withGui = false; }; livedl = callPackage ../tools/misc/livedl { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -33302,6 +33345,7 @@ with pkgs; deepdiff = with python3Packages; toPythonApplication deepdiff; deepsea = callPackage ../tools/security/deepsea { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -34563,6 +34607,7 @@ with pkgs; gotestwaf = callPackage ../tools/security/gotestwaf { }; gowitness = callPackage ../tools/security/gowitness { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -35847,6 +35892,7 @@ with pkgs; zfs-replicate = python3Packages.callPackage ../tools/backup/zfs-replicate { }; zrepl = callPackage ../tools/backup/zrepl { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; @@ -35887,6 +35933,7 @@ with pkgs; kaf = callPackage ../development/tools/kaf { }; kcli = callPackage ../development/tools/kcli { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; };