From c0773369108ce451dd9c5de601b96bf93a81cb9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 25 Jul 2022 07:38:00 +0200 Subject: [PATCH 1/2] upterm: 0.8.2 -> 0.9.0 --- pkgs/tools/misc/upterm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/upterm/default.nix b/pkgs/tools/misc/upterm/default.nix index b3da0f7d734f..0dc0886b57dc 100644 --- a/pkgs/tools/misc/upterm/default.nix +++ b/pkgs/tools/misc/upterm/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "upterm"; - version = "0.8.2"; + version = "0.9.0"; src = fetchFromGitHub { owner = "owenthereal"; repo = "upterm"; rev = "v${version}"; - hash = "sha256-JcUFsj7+Hu++izyxozttyxTGW51vBfgNSvAa/AIrsvs="; + hash = "sha256-ywwqX4aw9vc2kptYZisArTpdz7Cf49Z0jMdP90KXejs="; }; vendorSha256 = null; From 939efa952437e002441f6e626af8ef8a2e3ba805 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 25 Jul 2022 07:41:14 +0200 Subject: [PATCH 2/2] upterm: fix cross compiling --- pkgs/tools/misc/upterm/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/upterm/default.nix b/pkgs/tools/misc/upterm/default.nix index 0dc0886b57dc..cfe1c570c765 100644 --- a/pkgs/tools/misc/upterm/default.nix +++ b/pkgs/tools/misc/upterm/default.nix @@ -18,11 +18,13 @@ buildGoModule rec { vendorSha256 = null; + subPackages = [ "cmd/upterm" "cmd/uptermd" ]; + nativeBuildInputs = [ installShellFiles ]; postInstall = '' - $out/bin/gendoc - rm $out/bin/gendoc + # force go to build for build arch rather than host arch during cross-compiling + CGO_ENABLED=0 GOOS= GOARCH= go run cmd/gendoc/main.go installManPage etc/man/man*/* installShellCompletion --bash --name upterm.bash etc/completion/upterm.bash_completion.sh installShellCompletion --zsh --name _upterm etc/completion/upterm.zsh_completion