Skip to content

Commit 49b9166

Browse files
headscale: 0.23.0 -> 0.24.0, cleanup maintainers (NixOS#374636)
2 parents 6082943 + cc2f4fb commit 49b9166

File tree

3 files changed

+23
-214
lines changed

3 files changed

+23
-214
lines changed

nixos/tests/headscale.nix

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ import ./make-test-python.nix (
1313
in
1414
{
1515
name = "headscale";
16-
meta.maintainers = with lib.maintainers; [ misterio77 ];
16+
meta.maintainers = with lib.maintainers; [
17+
kradalby
18+
misterio77
19+
];
1720

1821
nodes =
1922
let

pkgs/servers/headscale/default.nix

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,33 @@
44
fetchFromGitHub,
55
installShellFiles,
66
nixosTests,
7+
postgresql,
78
}:
89
buildGoModule rec {
910
pname = "headscale";
10-
version = "0.23.0";
11+
version = "0.24.0";
1112

1213
src = fetchFromGitHub {
1314
owner = "juanfont";
1415
repo = "headscale";
1516
rev = "v${version}";
16-
hash = "sha256-5tlnVNpn+hJayxHjTpbOO3kRInOYOFz0pe9pwjXZlBE=";
17+
hash = "sha256-s9zzhN8NTC6YxOO6fyO+A0jleeY8bhN1wcbf4pvGkpI=";
1718
};
1819

19-
# Merged post-v0.23.0, so should be removed with next release.
20-
patches = [ ./patches/config-loosen-up-BaseDomain-and-ServerURL-checks.patch ];
20+
vendorHash = "sha256-SBfeixT8DQOrK2SWmHHSOBtzRdSZs+pwomHpw6Jd+qc=";
2121

22-
vendorHash = "sha256-+8dOxPG/Q+wuHgRwwWqdphHOuop0W9dVyClyQuh7aRc=";
22+
subPackages = [ "cmd/headscale" ];
2323

24-
ldflags = ["-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}"];
24+
ldflags = [
25+
"-s"
26+
"-w"
27+
"-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}"
28+
];
29+
30+
nativeBuildInputs = [ installShellFiles ];
31+
32+
nativeCheckInputs = [ postgresql ];
2533

26-
nativeBuildInputs = [installShellFiles];
2734
checkFlags = ["-short"];
2835

2936
postInstall = ''
@@ -33,7 +40,7 @@ buildGoModule rec {
3340
--zsh <($out/bin/headscale completion zsh)
3441
'';
3542

36-
passthru.tests = {inherit (nixosTests) headscale;};
43+
passthru.tests = { inherit (nixosTests) headscale; };
3744

3845
meta = with lib; {
3946
homepage = "https://github.com/juanfont/headscale";
@@ -56,6 +63,9 @@ buildGoModule rec {
5663
'';
5764
license = licenses.bsd3;
5865
mainProgram = "headscale";
59-
maintainers = with maintainers; [nkje jk kradalby misterio77 ghuntley];
66+
maintainers = with maintainers; [
67+
kradalby
68+
misterio77
69+
];
6070
};
6171
}

pkgs/servers/headscale/patches/config-loosen-up-BaseDomain-and-ServerURL-checks.patch

Lines changed: 0 additions & 204 deletions
This file was deleted.

0 commit comments

Comments
 (0)