diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 408f1bd3ed8a..b6f9028d52ab 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -1,19 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { - pname = "helm"; - version = "3.8.1"; - gitCommit = "5cb9af4b1b271d11d7a97a71df3ac337dd94ad37"; + pname = "kubernetes-helm"; + version = "3.8.2"; + gitCommit = "6e3701edea09e5d55a8ca2aae03a68917630e91b"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-AjNrn46l9gVC7MtGF59QWv+l6qYn+jzopsZtM/2faXY="; + sha256 = "sha256-lFAzp7ZxyMZAEO1cNFkEPLgTLEGa6azv36xiTIz4FZY="; }; - vendorSha256 = "sha256-ffbp7J8XDxo/s79pjoiDVbft0pr/lJpuJuKiMpQwkT0="; - - doCheck = false; + vendorSha256 = "sha256-FLEydmR+UEZ80VYLxBU1ZdwpdLgTjUpqiMItnt9UuLY="; subPackages = [ "cmd/helm" ]; ldflags = [ @@ -23,6 +21,19 @@ buildGoModule rec { "-X helm.sh/helm/v3/internal/version.gitCommit=${gitCommit}" ]; + preCheck = '' + # skipping version tests because they require dot git directory + substituteInPlace cmd/helm/version_test.go \ + --replace "TestVersion" "SkipVersion" + '' + lib.optionalString stdenv.isLinux '' + # skipping plugin tests on linux + substituteInPlace cmd/helm/plugin_test.go \ + --replace "TestPluginDynamicCompletion" "SkipPluginDynamicCompletion" \ + --replace "TestLoadPlugins" "SkipLoadPlugins" + substituteInPlace cmd/helm/helm_test.go \ + --replace "TestPluginExitCode" "SkipPluginExitCode" + ''; + nativeBuildInputs = [ installShellFiles ]; postInstall = '' $out/bin/helm completion bash > helm.bash @@ -33,7 +44,8 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/kubernetes/helm"; description = "A package manager for kubernetes"; + mainProgram = "helm"; license = licenses.asl20; - maintainers = with maintainers; [ rlupton20 edude03 saschagrunert Frostman Chili-Man ]; + maintainers = with maintainers; [ rlupton20 edude03 saschagrunert Frostman Chili-Man techknowlogick ]; }; }