headscale: 0.22.3 -> 0.23.0
Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
This commit is contained in:
parent
5dd728a081
commit
aec399ee4b
@ -7,33 +7,22 @@
|
|||||||
}:
|
}:
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "headscale";
|
pname = "headscale";
|
||||||
version = "0.22.3";
|
version = "0.23.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "juanfont";
|
owner = "juanfont";
|
||||||
repo = "headscale";
|
repo = "headscale";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-nqmTqe3F3Oh8rnJH0clwACD/0RpqmfOMXNubr3C8rEc=";
|
hash = "sha256-5tlnVNpn+hJayxHjTpbOO3kRInOYOFz0pe9pwjXZlBE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-IOkbbFtE6+tNKnglE/8ZuNxhPSnloqM2sLgTvagMmnc=";
|
vendorHash = "sha256-+8dOxPG/Q+wuHgRwwWqdphHOuop0W9dVyClyQuh7aRc=";
|
||||||
|
|
||||||
patches = [
|
|
||||||
# backport of https://github.com/juanfont/headscale/pull/1697
|
|
||||||
./trim-oidc-secret-path.patch
|
|
||||||
|
|
||||||
# fix for headscale not reacting to SIGTERM
|
|
||||||
# see https://github.com/juanfont/headscale/pull/1480 and https://github.com/juanfont/headscale/issues/1461
|
|
||||||
./sigterm-fix.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
ldflags = ["-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}"];
|
ldflags = ["-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}"];
|
||||||
|
|
||||||
nativeBuildInputs = [installShellFiles];
|
nativeBuildInputs = [installShellFiles];
|
||||||
checkFlags = ["-short"];
|
checkFlags = ["-short"];
|
||||||
|
|
||||||
tags = ["ts2019"];
|
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
installShellCompletion --cmd headscale \
|
installShellCompletion --cmd headscale \
|
||||||
--bash <($out/bin/headscale completion bash) \
|
--bash <($out/bin/headscale completion bash) \
|
||||||
@ -41,7 +30,7 @@ buildGoModule rec {
|
|||||||
--zsh <($out/bin/headscale completion zsh)
|
--zsh <($out/bin/headscale completion zsh)
|
||||||
'';
|
'';
|
||||||
|
|
||||||
passthru.tests = { inherit (nixosTests) headscale; };
|
passthru.tests = {inherit (nixosTests) headscale;};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://github.com/juanfont/headscale";
|
homepage = "https://github.com/juanfont/headscale";
|
||||||
@ -63,6 +52,7 @@ buildGoModule rec {
|
|||||||
Headscale implements this coordination server.
|
Headscale implements this coordination server.
|
||||||
'';
|
'';
|
||||||
license = licenses.bsd3;
|
license = licenses.bsd3;
|
||||||
|
mainProgram = "headscale";
|
||||||
maintainers = with maintainers; [nkje jk kradalby misterio77 ghuntley];
|
maintainers = with maintainers; [nkje jk kradalby misterio77 ghuntley];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,12 +0,0 @@
|
|||||||
diff --git a/hscontrol/app.go b/hscontrol/app.go
|
|
||||||
index b8dceba..4bcf019 100644
|
|
||||||
--- a/hscontrol/app.go
|
|
||||||
+++ b/hscontrol/app.go
|
|
||||||
@@ -821,6 +821,7 @@ func (h *Headscale) Serve() error {
|
|
||||||
|
|
||||||
// And we're done:
|
|
||||||
cancel()
|
|
||||||
+ return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,13 +0,0 @@
|
|||||||
diff --git a/hscontrol/config.go b/hscontrol/config.go
|
|
||||||
index 0e83a1c..71fbfb0 100644
|
|
||||||
--- a/hscontrol/config.go
|
|
||||||
+++ b/hscontrol/config.go
|
|
||||||
@@ -573,7 +573,7 @@ func GetHeadscaleConfig() (*Config, error) {
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
- oidcClientSecret = string(secretBytes)
|
|
||||||
+ oidcClientSecret = strings.TrimSpace(string(secretBytes))
|
|
||||||
}
|
|
||||||
|
|
||||||
return &Config{
|
|
@ -8498,7 +8498,9 @@ with pkgs;
|
|||||||
|
|
||||||
heimdall-gui = heimdall.override { enableGUI = true; };
|
heimdall-gui = heimdall.override { enableGUI = true; };
|
||||||
|
|
||||||
headscale = callPackage ../servers/headscale { };
|
headscale = callPackage ../servers/headscale {
|
||||||
|
buildGoModule = buildGo123Module;
|
||||||
|
};
|
||||||
|
|
||||||
health = callPackage ../applications/misc/health { };
|
health = callPackage ../applications/misc/health { };
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user