From b343f7a126f0c197d4c18b7d51ad7c935273348e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 26 Feb 2025 19:22:07 +0100 Subject: [PATCH] headscale: 0.25.0 -> 0.25.1, fix tests on darwin Diff: https://github.com/juanfont/headscale/compare/v0.25.0...v0.25.1 --- pkgs/servers/headscale/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix index 07c7c2b74099..a2efb35bc03e 100644 --- a/pkgs/servers/headscale/default.nix +++ b/pkgs/servers/headscale/default.nix @@ -3,18 +3,21 @@ buildGoModule, fetchFromGitHub, installShellFiles, + iana-etc, + libredirect, nixosTests, postgresql, + stdenv, }: buildGoModule rec { pname = "headscale"; - version = "0.25.0"; + version = "0.25.1"; src = fetchFromGitHub { owner = "juanfont"; repo = "headscale"; - rev = "v${version}"; - hash = "sha256-5CwaPaGh0yvHwmSpbsvc4ajkW9RbYVMilNTIJxeYcIs="; + tag = "v${version}"; + hash = "sha256-CrdMxRAgrDE1lJ3v9AhCN+cKOVqmIVwjE0x+msSVT+c="; }; vendorHash = "sha256-ZQj2A0GdLhHc7JLW7qgpGBveXXNWg9ueSG47OZQQXEw="; @@ -29,10 +32,14 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - nativeCheckInputs = [ postgresql ]; + nativeCheckInputs = [ libredirect.hook postgresql ]; checkFlags = ["-short"]; + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' + export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/services=${iana-etc}/etc/services + ''; + postInstall = '' installShellCompletion --cmd headscale \ --bash <($out/bin/headscale completion bash) \