diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix
index afe97d12ea6ab..591e9b4b613fe 100644
--- a/pkgs/build-support/go/module.nix
+++ b/pkgs/build-support/go/module.nix
@@ -70,7 +70,7 @@ let
     nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ go git cacert ];
 
     inherit (args) src;
-    inherit (go) GOOS GOARCH;
+    inherit (go) GOOS GOARCH GOARM;
     inherit GO111MODULE GOTOOLCHAIN;
 
     # The following inheritence behavior is not trivial to expect, and some may
@@ -161,7 +161,7 @@ let
   package = stdenv.mkDerivation (args // {
     nativeBuildInputs = [ go ] ++ nativeBuildInputs;
 
-    inherit (go) GOOS GOARCH;
+    inherit (go) GOOS GOARCH GOARM;
 
     GOFLAGS = GOFLAGS
       ++ lib.warnIf (lib.any (lib.hasPrefix "-mod=") GOFLAGS) "use `proxyVendor` to control Go module/vendor behavior instead of setting `-mod=` in GOFLAGS"
diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix
index 8bb5a1eef31b5..9878061d575f6 100644
--- a/pkgs/servers/headscale/default.nix
+++ b/pkgs/servers/headscale/default.nix
@@ -7,7 +7,7 @@
 }:
 buildGoModule rec {
   pname = "headscale";
-  version = "0.22.3";
+  version = "0.23.0-rc.1";
 
   src = fetchFromGitHub {
     owner = "juanfont";
@@ -30,13 +30,6 @@ buildGoModule rec {
 
   tags = ["ts2019"];
 
-  postInstall = ''
-    installShellCompletion --cmd headscale \
-      --bash <($out/bin/headscale completion bash) \
-      --fish <($out/bin/headscale completion fish) \
-      --zsh <($out/bin/headscale completion zsh)
-  '';
-
   passthru.tests = { inherit (nixosTests) headscale; };
 
   meta = with lib; {