diff --git a/pkgs/by-name/te/temporal-cli/package.nix b/pkgs/by-name/te/temporal-cli/package.nix index d83ada41b6ae..8b45d33de589 100644 --- a/pkgs/by-name/te/temporal-cli/package.nix +++ b/pkgs/by-name/te/temporal-cli/package.nix @@ -3,18 +3,22 @@ fetchFromGitHub, buildGoModule, installShellFiles, - symlinkJoin, stdenv, }: -let - metaCommon = { - description = "Command-line interface for running Temporal Server and interacting with Workflows, Activities, Namespaces, and other parts of Temporal"; - homepage = "https://docs.temporal.io/cli"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ aaronjheng ]; +buildGoModule rec { + pname = "temporal-cli"; + version = "1.1.2"; + + src = fetchFromGitHub { + owner = "temporalio"; + repo = "cli"; + rev = "v${version}"; + hash = "sha256-7wURMdi357w5S4s909PTUZanRzFyWM588DMY7iYWP88="; }; + vendorHash = "sha256-umGwew8RwewlYJQD1psYSd9bu67cPEiHBJkQRJGjyGY="; + overrideModAttrs = old: { # https://gitlab.com/cznic/libc/-/merge_requests/10 postBuild = '' @@ -22,110 +26,40 @@ let ''; }; - tctl-next = buildGoModule rec { - pname = "tctl-next"; - version = "1.1.2"; + nativeBuildInputs = [ installShellFiles ]; - src = fetchFromGitHub { - owner = "temporalio"; - repo = "cli"; - rev = "v${version}"; - hash = "sha256-7wURMdi357w5S4s909PTUZanRzFyWM588DMY7iYWP88="; - }; - - vendorHash = "sha256-umGwew8RwewlYJQD1psYSd9bu67cPEiHBJkQRJGjyGY="; - - inherit overrideModAttrs; - - nativeBuildInputs = [ installShellFiles ]; - - excludedPackages = [ - "./cmd/docgen" - "./tests" - ]; - - ldflags = [ - "-s" - "-w" - "-X github.com/temporalio/cli/temporalcli.Version=${version}" - ]; - - # Tests fail with x86 on macOS Rosetta 2 - doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64); - - preCheck = '' - export HOME="$(mktemp -d)" - ''; - - postInstall = '' - installShellCompletion --cmd temporal \ - --bash <($out/bin/temporal completion bash) \ - --fish <($out/bin/temporal completion fish) \ - --zsh <($out/bin/temporal completion zsh) - ''; - - __darwinAllowLocalNetworking = true; - - meta = metaCommon // { - mainProgram = "temporal"; - }; - }; - - tctl = buildGoModule rec { - pname = "tctl"; - version = "1.18.1"; - - src = fetchFromGitHub { - owner = "temporalio"; - repo = "tctl"; - rev = "v${version}"; - hash = "sha256-LX4hyPme+mkNmPvrTHIT5Ow3QM8BTAB7MXSY1fa8tSk="; - }; - - vendorHash = "sha256-294lnUKnXNrN6fJ+98ub7LwsJ9aT+FzWCB3nryfAlCI="; - - inherit overrideModAttrs; - - nativeBuildInputs = [ installShellFiles ]; - - excludedPackages = [ "./cmd/copyright" ]; - - ldflags = [ - "-s" - "-w" - ]; - - preCheck = '' - export HOME="$(mktemp -d)" - ''; - - postInstall = '' - installShellCompletion --cmd tctl \ - --bash <($out/bin/tctl completion bash) \ - --zsh <($out/bin/tctl completion zsh) - ''; - - __darwinAllowLocalNetworking = true; - - meta = metaCommon // { - mainProgram = "tctl"; - }; - }; -in -symlinkJoin rec { - pname = "temporal-cli"; - inherit (tctl-next) version; - name = "${pname}-${version}"; - - paths = [ - tctl-next - tctl + excludedPackages = [ + "./cmd/docgen" + "./tests" ]; - passthru = { inherit tctl tctl-next; }; + ldflags = [ + "-s" + "-w" + "-X github.com/temporalio/cli/temporalcli.Version=${version}" + ]; - meta = metaCommon // { + # Tests fail with x86 on macOS Rosetta 2 + doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64); + + preCheck = '' + export HOME="$(mktemp -d)" + ''; + + postInstall = '' + installShellCompletion --cmd temporal \ + --bash <($out/bin/temporal completion bash) \ + --fish <($out/bin/temporal completion fish) \ + --zsh <($out/bin/temporal completion zsh) + ''; + + __darwinAllowLocalNetworking = true; + + meta = { + description = "Command-line interface for running Temporal Server and interacting with Workflows, Activities, Namespaces, and other parts of Temporal"; + homepage = "https://docs.temporal.io/cli"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ aaronjheng ]; mainProgram = "temporal"; - platforms = lib.unique (lib.concatMap (drv: drv.meta.platforms) paths); }; }