Skip to content

headscale fixes #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tesnos6921 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

headscale fixes #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b763f57
remove postInstall
tesnos6921 Jul 30, 2024
991a52b
inherit GOARM
tesnos6921 Jul 31, 2024
38cabd1
Update default.nix
tesnos6921 Sep 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/build-support/go/module.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
9 changes: 1 addition & 8 deletions pkgs/servers/headscale/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
}:
buildGoModule rec {
pname = "headscale";
version = "0.22.3";
version = "0.23.0-rc.1";

src = fetchFromGitHub {
owner = "juanfont";
Expand All @@ -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; {
Expand Down