From 3e28bdc6786cb4192f2a04248cf65c49bc43bcd0 Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 6 Apr 2024 02:29:45 +0900 Subject: [PATCH 01/30] buildGoModule: inherit env from main package to goModule derivation --- doc/languages-frameworks/go.section.md | 1 + pkgs/applications/misc/pop/default.nix | 2 +- pkgs/applications/networking/cluster/talosctl/default.nix | 2 +- pkgs/build-support/go/module.nix | 1 + pkgs/by-name/mc/mcap-cli/package.nix | 2 +- pkgs/development/tools/opcr-policy/default.nix | 2 +- pkgs/tools/networking/oneshot/default.nix | 2 +- 7 files changed, 7 insertions(+), 5 deletions(-) diff --git a/doc/languages-frameworks/go.section.md b/doc/languages-frameworks/go.section.md index 6db0e73505d2..2f4cb0326a8a 100644 --- a/doc/languages-frameworks/go.section.md +++ b/doc/languages-frameworks/go.section.md @@ -142,6 +142,7 @@ Many attributes [controlling the build phase](#variables-controlling-the-build-p - [`patchFlags`](#var-stdenv-patchFlags) - [`postPatch`](#var-stdenv-postPatch) - [`preBuild`](#var-stdenv-preBuild) +- `env`: useful for passing down variables such as `GOWORK`. To control test execution of the build derivation, the following attributes are of interest: diff --git a/pkgs/applications/misc/pop/default.nix b/pkgs/applications/misc/pop/default.nix index 3fbf063e7315..f20ab86c85c9 100644 --- a/pkgs/applications/misc/pop/default.nix +++ b/pkgs/applications/misc/pop/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorHash = "sha256-8YcJXvR0cdL9PlP74Qh6uN2XZoN16sz/yeeZlBsk5N8="; - GOWORK = "off"; + env.GOWORK = "off"; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index afc3b7bdf5aa..3651d4652fc7 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; - GOWORK = "off"; + env.GOWORK = "off"; subPackages = [ "cmd/talosctl" ]; diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix index ab8491da34cd..6f568c0eb4f9 100644 --- a/pkgs/build-support/go/module.nix +++ b/pkgs/build-support/go/module.nix @@ -84,6 +84,7 @@ let preBuild = args.preBuild or ""; postBuild = args.modPostBuild or ""; sourceRoot = args.sourceRoot or ""; + env = args.env or { }; impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ "GIT_PROXY_COMMAND" diff --git a/pkgs/by-name/mc/mcap-cli/package.nix b/pkgs/by-name/mc/mcap-cli/package.nix index 81853d252efa..80ddcd574b02 100644 --- a/pkgs/by-name/mc/mcap-cli/package.nix +++ b/pkgs/by-name/mc/mcap-cli/package.nix @@ -20,7 +20,7 @@ buildGoModule { modRoot = "go/cli/mcap"; - GOWORK="off"; + env.GOWORK="off"; # copy the local versions of the workspace modules postConfigure = '' diff --git a/pkgs/development/tools/opcr-policy/default.nix b/pkgs/development/tools/opcr-policy/default.nix index e1900a1f84f3..e8d4e9a599ab 100644 --- a/pkgs/development/tools/opcr-policy/default.nix +++ b/pkgs/development/tools/opcr-policy/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { subPackages = [ "cmd/policy" ]; # disable go workspaces - GOWORK = "off"; + env.GOWORK = "off"; doCheck = false; diff --git a/pkgs/tools/networking/oneshot/default.nix b/pkgs/tools/networking/oneshot/default.nix index 3ecca675e18c..fe3948041d1a 100644 --- a/pkgs/tools/networking/oneshot/default.nix +++ b/pkgs/tools/networking/oneshot/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { subPackages = [ "cmd" ]; - GOWORK = "off"; + env.GOWORK = "off"; modRoot = "v2"; From 049b684d52e1f9abfc5f748c621adaec30548a47 Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 6 Apr 2024 05:58:43 +0900 Subject: [PATCH 02/30] deckmaster: fix vendorHash for go1.22 --- pkgs/applications/misc/deckmaster/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/deckmaster/default.nix b/pkgs/applications/misc/deckmaster/default.nix index f977fd1980bb..03e5e05852ad 100644 --- a/pkgs/applications/misc/deckmaster/default.nix +++ b/pkgs/applications/misc/deckmaster/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { hash = "sha256-1hZ7yAKTvkk20ho+QOqFEtspBvFztAtfmITs2uxhdmQ="; }; - vendorHash = "sha256-d38s5sSvENIou+rlphXIrrOcGOdsvkNaMJlhiXVWN6c="; + vendorHash = "sha256-DFssAic2YtXNH1Jm6zCDv1yPNz3YUXaFLs7j7rNHhlE="; proxyVendor = true; From ef79e0578ea7f0f32d8ed48dd6309343276f261e Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 6 Apr 2024 05:59:01 +0900 Subject: [PATCH 03/30] ratt: fix vendorHash for go1.22 --- pkgs/applications/misc/ratt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/ratt/default.nix b/pkgs/applications/misc/ratt/default.nix index afdc3c231418..fd882b3b572c 100644 --- a/pkgs/applications/misc/ratt/default.nix +++ b/pkgs/applications/misc/ratt/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { }; proxyVendor = true; - vendorHash = "sha256-6cpHDwnxdc/9YPj77JVuT5ZDFjKkF6nBX4RgZr/9fFY="; + vendorHash = "sha256-L8mDs9teQJW6P3dhKSLfzbpA7kzhJk61oR2q0ME+u0M="; # tests try to access the internet to scrape websites doCheck = false; From c39b2e886d123f3e460a65d55c75eb04b8482b5a Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 6 Apr 2024 05:59:10 +0900 Subject: [PATCH 04/30] skate: fix vendorHash for go1.22 --- pkgs/applications/misc/skate/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/skate/default.nix b/pkgs/applications/misc/skate/default.nix index 16849996441f..b344a0e0639e 100644 --- a/pkgs/applications/misc/skate/default.nix +++ b/pkgs/applications/misc/skate/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { }; proxyVendor = true; - vendorHash = "sha256-xNM4qmpv+wcoiGrQ585N3VoKW6tio0cdHmUHRl2Pvio="; + vendorHash = "sha256-/qZB/GGEkoqRoNhEmZw9Q2lsUPZRg5/xVxWgdBZTMLk="; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; From 8e649d36d3a902022ae192d33ec26fb0e3c3e1ed Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 6 Apr 2024 05:59:30 +0900 Subject: [PATCH 05/30] wtf: fix vendorHash for go1.22 --- pkgs/applications/misc/wtf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index f604f50eb7fc..a32527de7dab 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { sha256 = "sha256-DFrA4bx+wSOxmt1CVA1oNiYVmcWeW6wpfR5F1tnhyDY="; }; - vendorHash = "sha256-9uuLidieBMoKz/FLcBnp9wenyveOIzB0IvRBRasulZk="; + vendorHash = "sha256-mQdKw3DeBEkCOtV2/B5lUIHv5EBp+8QSxpA13nFxESw="; proxyVendor = true; doCheck = false; From 5e682bb1bc2f09038be2b101ee502d584e6f78e3 Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 6 Apr 2024 05:59:50 +0900 Subject: [PATCH 06/30] argocd-autopilot: fix vendorHash for go1.22 --- .../networking/cluster/argocd-autopilot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix index 55028845e2cb..63466a3efdbf 100644 --- a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix +++ b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-txbs1SzAaV1nCl104m0Ht5DwzCmK+sBDn4rZ1newdLc="; }; - vendorHash = "sha256-1nolJLWkArzSKf11fzlvvgiCnvMYSu5MHRNAn1lryms="; + vendorHash = "sha256-QbjiQVclT8paEKYQmMwj5MLq40mAVh5Ji5VJJTOmEZI="; proxyVendor = true; From 92e5b8d6d90aa0301a2dd607ba93fc66bbdc5e17 Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 6 Apr 2024 06:00:12 +0900 Subject: [PATCH 07/30] aerc: fix vendorHash for go1.22 --- pkgs/applications/networking/mailreaders/aerc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix index 2c776a05d053..003b07d2d5f6 100644 --- a/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { }; proxyVendor = true; - vendorHash = "sha256-rycAGqZhO48bPTFO2y2J1d16oon24sEEUns4EayWDvg="; + vendorHash = "sha256-AHEhIWa6PP8f+hhIdY+0brLF2HYhvTal7qXfCwG9iyo="; nativeBuildInputs = [ scdoc From e1afd4de729127acbcfb57eeb83d45d0e7edf632 Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 6 Apr 2024 06:00:25 +0900 Subject: [PATCH 08/30] bepass: fix vendorHash for go1.22 --- pkgs/by-name/be/bepass/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/be/bepass/package.nix b/pkgs/by-name/be/bepass/package.nix index 9e74015f8d4c..b18dce4c0108 100644 --- a/pkgs/by-name/be/bepass/package.nix +++ b/pkgs/by-name/be/bepass/package.nix @@ -23,7 +23,7 @@ buildGoModule rec{ hash = "sha256-ruOhPWNs1WWM3r6X+6ch0HoDCu/a+IkBQiCr0Wh6yS8="; }; - vendorHash = "sha256-SiggDy6vc19yIw15g45yjl8gscE91zUoR6woECbAtR0="; + vendorHash = "sha256-Juie/Hq3i6rvAK19x6ah3SCQJL0uCrmV9gvzHih3crY="; subPackages = [ "cmd/cli" From 5615fd0057a62e236e2ac2a6480e8ed34db9e3c2 Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 6 Apr 2024 06:00:33 +0900 Subject: [PATCH 09/30] butler: fix vendorHash for go1.22 --- pkgs/by-name/bu/butler/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/bu/butler/package.nix b/pkgs/by-name/bu/butler/package.nix index 29407276aba6..62d215dc5af0 100644 --- a/pkgs/by-name/bu/butler/package.nix +++ b/pkgs/by-name/bu/butler/package.nix @@ -31,7 +31,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-CtBwc5mcgLvl2Bvg5gI+ULJMQEEibx1aN3IpmRNUtwE="; + vendorHash = "sha256-GvUUCQ2BPW0HlXZljBWJ2Wyys9OEIM55dEWAa6J19Zg="; doCheck = false; From 8b05ded0c502a74b580a673f91afad2c90bc0566 Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 6 Apr 2024 06:02:41 +0900 Subject: [PATCH 10/30] zitadel: fix vendorHash for go1.22 --- pkgs/by-name/zi/zitadel/console.nix | 2 +- pkgs/by-name/zi/zitadel/package.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/zi/zitadel/console.nix b/pkgs/by-name/zi/zitadel/console.nix index 163ed7aded29..ffef4ca1d4e5 100644 --- a/pkgs/by-name/zi/zitadel/console.nix +++ b/pkgs/by-name/zi/zitadel/console.nix @@ -23,7 +23,7 @@ let workDir = "console"; bufArgs = "../proto --include-imports --include-wkt"; outputPath = "src/app/proto"; - hash = "sha256-h/5K6PvEFyjzS5p7SfuDIk91TkN1iPc+iXor8T/QSeE="; + hash = "sha256-BBXFt4f2SQphr106sQ0eEL4Z2ooAI8fxXhu2rKqhjb4="; }; in mkYarnPackage rec { diff --git a/pkgs/by-name/zi/zitadel/package.nix b/pkgs/by-name/zi/zitadel/package.nix index cb5888bab476..14c9ff1a3ad8 100644 --- a/pkgs/by-name/zi/zitadel/package.nix +++ b/pkgs/by-name/zi/zitadel/package.nix @@ -22,7 +22,7 @@ let rev = "v${version}"; hash = "sha256-Uv0iEIFkTdBAi0WDBQHf0ATs4L2FOU4NmiE9p1MHSa0="; }; - goModulesHash = "sha256-PQch046YjYhAmVlNNdgDLWIqFvEpXRgXAYFMwSZmk4w="; + goModulesHash = "sha256-thd1bhbPVedYd+Yq1IYYUJFr66AWRTzA3DceCXFTEQo="; buildZitadelProtocGen = name: buildGoModule { @@ -92,7 +92,7 @@ let protoc-gen-zitadel ]; outputPath = ".artifacts"; - hash = "sha256-3qDVY2CvtY8lZDr+p5i0vV6zZ5KyTtxBLyV7Os9KuIw="; + hash = "sha256-ntIKudNFBs7kHjK7cfzbOfDCA6J8uvJRUbCTa6afK/I="; }; in buildGoModule rec { From 34b358fb2469849b28ab490bd082b30334abef17 Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 6 Apr 2024 06:03:02 +0900 Subject: [PATCH 11/30] benthos: fix vendorHash for go1.22 --- pkgs/development/tools/benthos/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/benthos/default.nix b/pkgs/development/tools/benthos/default.nix index 59e475fba209..850adc445bad 100644 --- a/pkgs/development/tools/benthos/default.nix +++ b/pkgs/development/tools/benthos/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-bnQn6gdHhbUJUPWU3CKrw1sq5CL0Tkss4DINPwlsiPU="; + vendorHash = "sha256-Ce2vXPKbyj517N3uJEGc00hCVZhcRrPvXUSuK+jjK3U="; doCheck = false; From 10a41b7dd6805a09e114f2e0b699dc60429ce9e1 Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 6 Apr 2024 06:03:12 +0900 Subject: [PATCH 12/30] dapr-cli: fix vendorHash for go1.22 --- pkgs/development/tools/dapr/cli/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/dapr/cli/default.nix b/pkgs/development/tools/dapr/cli/default.nix index c1d06b45982d..a672b9637e33 100644 --- a/pkgs/development/tools/dapr/cli/default.nix +++ b/pkgs/development/tools/dapr/cli/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-nR9+6glX0oUJZq32XxyV4aVjfjVlNycZvMNaVHy+Q1s="; }; - vendorHash = "sha256-iqoxlqSdHDfLlb1bcHLPAO2/wiwRpqFBIuoVi7lecKs="; + vendorHash = "sha256-kFmoNd40YxUXVXk0F1Bf77KS5AM0jjOTwTjM5pYKkv4="; proxyVendor = true; From 44ed815d0ddaa304eab80659443c2b72cbb652ab Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 6 Apr 2024 06:03:29 +0900 Subject: [PATCH 13/30] sqlcmd: fix vendorHash for go1.22 --- pkgs/development/tools/database/sqlcmd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/database/sqlcmd/default.nix b/pkgs/development/tools/database/sqlcmd/default.nix index c11475a3caa4..7e23d5e624bd 100644 --- a/pkgs/development/tools/database/sqlcmd/default.nix +++ b/pkgs/development/tools/database/sqlcmd/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { sha256 = "sha256-LLRNaY6ArUNoKSWSauCh2RKEGO5+G1OnoCAqMaAfOkY="; }; - vendorHash = "sha256-G6Patjrafg9VXXbisBDs/JVvy0SA6moTquKj66z9lzw="; + vendorHash = "sha256-NVmgAlNQvRj/7poIEWjMyKw2qWMd/HwbdSFHpumnRlo="; proxyVendor = true; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; From 61b8561d6d5a519f634ddc0fc7cd3e2e373faf18 Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 6 Apr 2024 06:03:39 +0900 Subject: [PATCH 14/30] go-migrate: fix vendorHash for go1.22 --- pkgs/development/tools/go-migrate/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/go-migrate/default.nix b/pkgs/development/tools/go-migrate/default.nix index da20ec45c20b..7044262373de 100644 --- a/pkgs/development/tools/go-migrate/default.nix +++ b/pkgs/development/tools/go-migrate/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-3otiRbswhENs/YvKKr+ZeodLWtK7fhCjEtlMDlkLOlY="; + vendorHash = "sha256-q8wShIcVHZtpnhvZfsxiI5FLq0xneA8IBMDWd/vpz/0="; subPackages = [ "cmd/migrate" ]; From 66bad658c93be94d84cee2fb31eada82b1e2ddda Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 6 Apr 2024 06:03:55 +0900 Subject: [PATCH 15/30] kustomize: fix vendorHash for go1.22 --- pkgs/development/tools/kustomize/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index 153b211d95ab..ad1ea3f61ab4 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { # avoid finding test and development commands modRoot = "kustomize"; proxyVendor = true; - vendorHash = "sha256-6+8cwRH37lkQvnHBUlSqyNrZMfDpKbeUNJS4YMflBq0="; + vendorHash = "sha256-inCBDIVdvkEdDJEwX7vdoWANk+f01VxhBGPKxrjR6Ao="; nativeBuildInputs = [ installShellFiles ]; From c8aa4946802d3ebfd4ff59f73437fd2f759d354f Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 6 Apr 2024 06:04:07 +0900 Subject: [PATCH 16/30] wails: fix vendorHash for go1.22 --- pkgs/development/tools/wails/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/wails/default.nix b/pkgs/development/tools/wails/default.nix index 660944b5bde2..174f165fea81 100644 --- a/pkgs/development/tools/wails/default.nix +++ b/pkgs/development/tools/wails/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { hash = "sha256-MHwIRanmgpjTKM+ILSQheCd9+XUwVTCVrREqntxpv7Q="; } + "/v2"; - vendorHash = "sha256-0cGmJEi7OfMZS7ObPBLHOVqKfvnlpHBiGRjSdV6wxE4="; + vendorHash = "sha256-6QFnLuRnSzIqkQkK1qg7VBYxwjK8fSQWz5RxpuyutoY="; proxyVendor = true; From 7e7a22fa3a3487ac9437ac3189ef633ce43e9391 Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 6 Apr 2024 06:04:16 +0900 Subject: [PATCH 17/30] alps: fix vendorHash for go1.22 --- pkgs/servers/alps/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/alps/default.nix b/pkgs/servers/alps/default.nix index 70659f0c3c5e..03bd62e4618b 100644 --- a/pkgs/servers/alps/default.nix +++ b/pkgs/servers/alps/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { hash = "sha256-RSug3YSiqYLGs05Bee4NoaoCyPvUZ7IqlKWI1hmxbiA="; }; - vendorHash = "sha256-XDm6LU9D/rVQHiko7EFpocv+IktGe6tQhJYRrOJxeSs="; + vendorHash = "sha256-QsGfINktk+rBj4b5h+NBVS6XV1SVz+9fDL1vtUqcKEU="; ldflags = [ "-s" From 6f05e55422644f49a95e4b702507da22401dc79b Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 6 Apr 2024 06:04:43 +0900 Subject: [PATCH 18/30] boringssl: fix vendorHash for go1.22 --- pkgs/development/libraries/boringssl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix index fadf478e037f..9bb0967bd5c6 100644 --- a/pkgs/development/libraries/boringssl/default.nix +++ b/pkgs/development/libraries/boringssl/default.nix @@ -20,7 +20,7 @@ buildGoModule { nativeBuildInputs = [ cmake ninja perl ]; - vendorHash = "sha256-McSmG+fMO8/T/bJR6YAJDYw9pxsWJoj1hcSTPv/wMsI="; + vendorHash = "sha256-074bgtoBRS3SOxLrwZbBdK1jFpdCvF6tRtU1CkrhoDY="; proxyVendor = true; # hack to get both go and cmake configure phase From 6933748e0944a2825657070f05e5ab629ebe86c4 Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 6 Apr 2024 06:05:03 +0900 Subject: [PATCH 19/30] hydron: fix vendorHash for go1.22 --- pkgs/servers/hydron/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix index 9a3381843b55..912d0971f01a 100644 --- a/pkgs/servers/hydron/default.nix +++ b/pkgs/servers/hydron/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { hash = "sha256-Q1pZf5FPQw+pHItcZyOGx0N+iHmz9rW0+ANFsketh6E="; }; - vendorHash = "sha256-fyGC6k9/xER5GwVelBhy5C5tiq6NMhwSmYjSpvenrfA="; + vendorHash = "sha256-hKF2RCGnk/5hNS65vGoDdF1OUPSLe4PDegYlKTeqJDM="; proxyVendor = true; nativeBuildInputs = [ pkg-config ]; From 6c076c910684b55c642ee463ccee1ba8d0ff379a Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 6 Apr 2024 06:05:15 +0900 Subject: [PATCH 20/30] icebreaker: fix vendorHash for go1.22 --- pkgs/servers/icebreaker/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/icebreaker/default.nix b/pkgs/servers/icebreaker/default.nix index ac01d659f175..0624a97be5e0 100644 --- a/pkgs/servers/icebreaker/default.nix +++ b/pkgs/servers/icebreaker/default.nix @@ -16,7 +16,7 @@ buildGoModule { }; proxyVendor = true; - vendorHash = "sha256-i648w+BOUX5IfEEZ11gJAjX1ZUdoYRzDPz6GDe7i2S8="; + vendorHash = "sha256-A0jNy8cUKpfAqocgjdYU7LB4EgIr9tiOCyEaXGQl8TM="; nativeBuildInputs = [ makeBinaryWrapper From 06b903ed276641acacb98ea4c37dff6be3795ceb Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 6 Apr 2024 06:05:23 +0900 Subject: [PATCH 21/30] phlare: fix vendorHash for go1.22 --- pkgs/servers/monitoring/phlare/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/phlare/default.nix b/pkgs/servers/monitoring/phlare/default.nix index bc2c7cee63e5..294a85ab06fa 100644 --- a/pkgs/servers/monitoring/phlare/default.nix +++ b/pkgs/servers/monitoring/phlare/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { }; proxyVendor = true; - vendorHash = "sha256-y8IWS5OQkDYRTt5xOzzbjb1ya6AiFtvAc0YNH99KZBA="; + vendorHash = "sha256-l7+iDT9GAP9BX+xKvnx57iVF8wCM1YyHwq6dD9PbTDI="; ldflags = let prefix = "github.com/grafana/phlare/pkg/util/build"; From 69ccea0338c8bd4dd921cfadd6ead4c38d0ee994 Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 6 Apr 2024 06:05:41 +0900 Subject: [PATCH 22/30] pufferpanel: fix vendorHash for go1.22 --- pkgs/servers/pufferpanel/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/pufferpanel/default.nix b/pkgs/servers/pufferpanel/default.nix index eb5558bf1d47..122e594f25ba 100644 --- a/pkgs/servers/pufferpanel/default.nix +++ b/pkgs/servers/pufferpanel/default.nix @@ -58,7 +58,7 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper go-swag ]; - vendorHash = "sha256-itiWROoIhnMbG9evH6X7kjClC4VdpX983d/SCwr4HbY="; + vendorHash = "sha256-1U7l7YW1fu5M0/pPHTLamLsTQdEltesRODUn21SuP8w="; proxyVendor = true; # Generate code for Swagger documentation endpoints (see web/swagger/docs.go). From 4719f71b5c32488c8e01517467ee6ed844ae6012 Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 6 Apr 2024 06:05:51 +0900 Subject: [PATCH 23/30] teleport_12: fix vendorHash for go1.22 --- pkgs/servers/teleport/12/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/teleport/12/default.nix b/pkgs/servers/teleport/12/default.nix index ce91acb763f4..7d1e28afb4c7 100644 --- a/pkgs/servers/teleport/12/default.nix +++ b/pkgs/servers/teleport/12/default.nix @@ -2,7 +2,7 @@ callPackage ../generic.nix ({ version = "12.4.32"; hash = "sha256-dYriqQwrc3tfLv+/G/W8n+4cLbPUq7lq1/kGH/GIsHs="; - vendorHash = "sha256-1z1Aocxi34/6Kuwj30LWjEq+LrZThG6ZzrMb0Qtok8w="; + vendorHash = "sha256-R7gWdUIrc7VLe+9/En47FI3G9x2V1VGUVTrT/kmA9c4="; yarnHash = "sha256-Sr9T2TmrysMQs6A00rHU1IZjslu8jyYkVnYE6AmBmLA="; cargoLock = { lockFile = ./Cargo.lock; From 2aa9c8dc5f9ec0a191c64b000e4ef09befc83d28 Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 6 Apr 2024 06:05:59 +0900 Subject: [PATCH 24/30] teleport_13: fix vendorHash for go1.22 --- pkgs/servers/teleport/13/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/teleport/13/default.nix b/pkgs/servers/teleport/13/default.nix index 02957376d9f2..06905183b5ab 100644 --- a/pkgs/servers/teleport/13/default.nix +++ b/pkgs/servers/teleport/13/default.nix @@ -2,7 +2,7 @@ callPackage ../generic.nix ({ version = "13.4.14"; hash = "sha256-g11D5lekI3pUpKf5CLUuNjejs0gN/bEemHkCj3akha0="; - vendorHash = "sha256-wQywm41qnv/ryZwwyIg+La1Z7qAw2I/fUI3kLgHlq9Q="; + vendorHash = "sha256-kiDhlR/P81u/yNq72JuskES/UzMrTFzJT0H3xldGk8I="; yarnHash = "sha256-E9T+7aXVoERdUnVEL4va2fcMnv1jsL9Js/R2LZo4hu4="; cargoLock = { lockFile = ./Cargo.lock; From d92373278332cbe65cd756a46f862bcc9fc8430b Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 6 Apr 2024 06:06:08 +0900 Subject: [PATCH 25/30] teleport_14: fix vendorHash for go1.22 --- pkgs/servers/teleport/14/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/teleport/14/default.nix b/pkgs/servers/teleport/14/default.nix index df97732bed58..6044975e62f2 100644 --- a/pkgs/servers/teleport/14/default.nix +++ b/pkgs/servers/teleport/14/default.nix @@ -2,7 +2,7 @@ callPackage ../generic.nix ({ version = "14.3.0"; hash = "sha256-yTbJeHCmPlelq7BrZQRY3XyNQiovV7NQ1tNh2NfYGbk="; - vendorHash = "sha256-ySe5YkBMt+1tF/8PWctfAkK/e03cqp5P1aJ2ANz7pLo="; + vendorHash = "sha256-lHsgSbY1nqQminU67QgV6FbHXNlv5tCMv2oVq48S33M="; yarnHash = "sha256-m934P+KygGiCzr5fDsNTlmZ1T9JxA6P8zTimocQyVi0="; cargoLock = { lockFile = ./Cargo.lock; From 9ae2ccf3a4f10100c00a90f3f2aa5d007ce0b5cc Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 6 Apr 2024 06:06:35 +0900 Subject: [PATCH 26/30] dae: fix vendorHash for go1.22 --- pkgs/tools/networking/dae/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/dae/default.nix b/pkgs/tools/networking/dae/default.nix index 18856ca5f0e3..0c95db7e3af1 100644 --- a/pkgs/tools/networking/dae/default.nix +++ b/pkgs/tools/networking/dae/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { fetchSubmodules = true; }; - vendorHash = "sha256-qK+x6ciAebwIWHRjRpNXCAqsfnmEx37evS4+7kwcFIs="; + vendorHash = "sha256-4U6zIxK8K+MGxRboTtsKntDMp8/cQWPqXQ3l03AEtBs="; proxyVendor = true; From b9f6824b024cbf4fbc9c38fe8bd557a4e73305f0 Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 6 Apr 2024 06:06:44 +0900 Subject: [PATCH 27/30] juicity: fix vendorHash for go1.22 --- pkgs/tools/networking/juicity/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/juicity/default.nix b/pkgs/tools/networking/juicity/default.nix index 8b655e7eb3de..4581b4f4a7b7 100644 --- a/pkgs/tools/networking/juicity/default.nix +++ b/pkgs/tools/networking/juicity/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { hash = "sha256-SUZ5E2GRLyUI/Z5ekJPNypVJXfJFzIz3qr9kCeXN7Gk="; }; - vendorHash = "sha256-Gj4uM9EL6QjlrCFGq3u1+TkIxzIU2mthFRK00pOAaJg="; + vendorHash = "sha256-13U3B9VKspSlpD1hYPtyCuPAZvAYc/d/UKcjXMURxyo="; proxyVendor = true; From a17f40f2d4a632e26a7b954a1e1212d5c5d29cb5 Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 6 Apr 2024 06:07:03 +0900 Subject: [PATCH 28/30] age-plugin-tpm: fix vendorHash for go1.22 --- pkgs/tools/security/age-plugin-tpm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/age-plugin-tpm/default.nix b/pkgs/tools/security/age-plugin-tpm/default.nix index 3eef366f8ea8..f95f761c580b 100644 --- a/pkgs/tools/security/age-plugin-tpm/default.nix +++ b/pkgs/tools/security/age-plugin-tpm/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-BSb+8p5+RJMfcYc2+BuT4YbhCWCbcYOt9upesD11Ytw="; + vendorHash = "sha256-veduD0K3Onkqvyg9E5v854a6/8UIRQZEH098lUepRNU="; nativeCheckInputs = [ swtpm From b6f237dd7a322eff33057dc63b8971886c79d542 Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 6 Apr 2024 06:07:19 +0900 Subject: [PATCH 29/30] threatest: fix vendorHash for go1.22 --- pkgs/tools/security/threatest/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/threatest/default.nix b/pkgs/tools/security/threatest/default.nix index a53804f1d1fc..88427627938b 100644 --- a/pkgs/tools/security/threatest/default.nix +++ b/pkgs/tools/security/threatest/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { }; proxyVendor = true; - vendorHash = "sha256-zwHcGy7wjy2yx7nMi88R+z+Is+YcqGRMK0czeBNlcdA="; + vendorHash = "sha256-EvVazz51sW8z+8XfZB0Xo42KuUT6Q9n2Y/0HvlF1bV4="; nativeBuildInputs = [ installShellFiles From f190aa8442bc65d8fa9e3b77dafcdd24b785717d Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 6 Apr 2024 06:07:34 +0900 Subject: [PATCH 30/30] terraform-providers: fix vendorHash for go1.22 --- .../networking/cluster/terraform-providers/providers.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 2f605b8837e4..2428750c6961 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -242,7 +242,7 @@ "repo": "terraform-provider-cloudfoundry", "rev": "v0.52.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-g1T6kH8Rv9bpvb6Q3YHCseEi1ayydJIxlplH3k12s8c=" + "vendorHash": "sha256-6MKWpiDq4yI3mfIJyzEsWLa7gi0+DScI5jKcOcM6Qs0=" }, "cloudinit": { "hash": "sha256-etZeCGtYhO0szRGxnj1c3/WOelxScWiHEA9w1Jb7bEE=", @@ -316,7 +316,7 @@ "repo": "terraform-provider-dhall", "rev": "v0.0.7", "spdx": "BSD-3-Clause", - "vendorHash": "sha256-e/+czUeOACwRC7xY90pZp2EWDzDpLU6Ud9RPzuNKaOY=" + "vendorHash": "sha256-quoFrJbB1vjz+MdV+jnr7FPACHuUe5Gx9POLubD2IaM=" }, "digitalocean": { "hash": "sha256-wwb62tZZxpr7NXbiqcS40aF9E2msagj2Mqy4kogDsEA=", @@ -434,7 +434,7 @@ "repo": "terraform-provider-fortios", "rev": "1.19.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-DwRfbD4AqB+4KLuYtqY5fUdzRrEpTIvL4VAM7nieJJA=" + "vendorHash": "sha256-mE25KfP2+7K7nHpkQOn1pfilm+fz5kGDDW8U+P2zglY=" }, "gandi": { "hash": "sha256-fsCtmwyxkXfOtiZG27VEb010jglK35yr4EynnUWlFog=", @@ -552,7 +552,7 @@ "repo": "terraform-provider-htpasswd", "rev": "v1.0.4", "spdx": "MIT", - "vendorHash": "sha256-+D8HxLRUSh7bCN6j+NSkPZTabvqknY7uJ9F5JxefomA=" + "vendorHash": "sha256-6jaAgyHS5H63YKnm4xcYmjKVhPbWm6KK6qHzxg/78yU=" }, "http": { "hash": "sha256-druSExXZeZMNWFIJQoQ/Xh0gCQQx0AnKbIAJQlRi8Po=",