Merge pull request #144656 from flokli/telepresence2-bump

authored by

Sandro and committed by
GitHub
6ad1b094 bae0cf07

+14 -4
+14 -4
pkgs/tools/networking/telepresence2/default.nix
··· 1 - { lib, buildGoModule, fetchFromGitHub }: 1 + { lib, buildGoModule, fetchFromGitHub, kubernetes-helm }: 2 2 3 3 buildGoModule rec { 4 4 pname = "telepresence2"; 5 - version = "2.4.0"; 5 + version = "2.4.6"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "telepresenceio"; 9 9 repo = "telepresence"; 10 10 rev = "v${version}"; 11 - sha256 = "1v2jkhdlyq37akqyhb8mwsh7rjdv2fjw8kyzys3dv04k3dy5sl0f"; 11 + sha256 = "09w7yk7jk5m6clq3drbgdr61w60b21jmfd635brfahms8pykmmzl"; 12 12 }; 13 13 14 - vendorSha256 = "1snmp461h8driy1w1xggk669yxl0sjl1m9pbqm7dwk44yb94zi1q"; 14 + # The Helm chart is go:embed'ed as a tarball in the binary. 15 + # That tarball is generated by running ./build-aux/package_embedded_chart/main.go, 16 + # which tries to invoke helm from tools/bin/helm. 17 + # Oh well… 18 + preBuild = '' 19 + mkdir -p tools/bin 20 + ln -sfn ${kubernetes-helm}/bin/helm tools/bin/helm 21 + go run ./build-aux/package_embedded_chart/main.go ${src.rev} 22 + ''; 23 + 24 + vendorSha256 = "0przkcqaf56a0sgan2xxqfpbs9nbmq4brwdv1qnag7i9myzvixxb"; 15 25 16 26 ldflags = [ 17 27 "-s" "-w" "-X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev}"