Skip to content

Commit

Permalink
headscale: 0.23.0 -> 0.24.0, cleanup maintainers (#374636)
Browse files Browse the repository at this point in the history
  • Loading branch information
SuperSandro2000 authored Jan 19, 2025
2 parents 6082943 + cc2f4fb commit 49b9166
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 214 deletions.
5 changes: 4 additions & 1 deletion nixos/tests/headscale.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ import ./make-test-python.nix (
in
{
name = "headscale";
meta.maintainers = with lib.maintainers; [ misterio77 ];
meta.maintainers = with lib.maintainers; [
kradalby
misterio77
];

nodes =
let
Expand Down
28 changes: 19 additions & 9 deletions pkgs/servers/headscale/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,33 @@
fetchFromGitHub,
installShellFiles,
nixosTests,
postgresql,
}:
buildGoModule rec {
pname = "headscale";
version = "0.23.0";
version = "0.24.0";

src = fetchFromGitHub {
owner = "juanfont";
repo = "headscale";
rev = "v${version}";
hash = "sha256-5tlnVNpn+hJayxHjTpbOO3kRInOYOFz0pe9pwjXZlBE=";
hash = "sha256-s9zzhN8NTC6YxOO6fyO+A0jleeY8bhN1wcbf4pvGkpI=";
};

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

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

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 ];

nativeCheckInputs = [ postgresql ];

nativeBuildInputs = [installShellFiles];
checkFlags = ["-short"];

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

passthru.tests = {inherit (nixosTests) headscale;};
passthru.tests = { inherit (nixosTests) headscale; };

meta = with lib; {
homepage = "https://github.com/juanfont/headscale";
Expand All @@ -56,6 +63,9 @@ buildGoModule rec {
'';
license = licenses.bsd3;
mainProgram = "headscale";
maintainers = with maintainers; [nkje jk kradalby misterio77 ghuntley];
maintainers = with maintainers; [
kradalby
misterio77
];
};
}

This file was deleted.

0 comments on commit 49b9166

Please sign in to comment.