movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-09 19:13:26 +03:00
Code Issues Projects Releases Packages Wiki Activity

headscale: 0.25.1 -> 0.26.0, update nixos module and test accordingly

Browse source 
Co-authored-by: Sandro <7258858+SuperSandro2000@users.noreply.github.com>
Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
This commit is contained in:
Kristoffer Dalby 2025-05-16 16:39:07 +02:00 • committed by Sandro Jäckel
parent 3d576164da
commit 0dd5cdaa3b
No known key found for this signature in database
GPG key ID: 3AF5A43A3EECC2E5
4 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

13
nixos/modules/services/networking/headscale.nix
View file

@ -406,14 +406,6 @@ in
''; '';
example = [ "alice@example.com" ]; example = [ "alice@example.com" ];
}; };
strip_email_domain = lib.mkOption {
type = lib.types.bool;
default = true;
description = ''
Whether the domain part of the email address should be removed when generating namespaces.
'';
};
}; };
tls_letsencrypt_hostname = lib.mkOption { tls_letsencrypt_hostname = lib.mkOption {
@ -585,6 +577,11 @@ in
"dns_config" "dns_config"
"nameservers" "nameservers"
] "Use `dns.nameservers.global` instead.") ] "Use `dns.nameservers.global` instead.")
(assertRemovedOption [
"settings"
"oidc"
"strip_email_domain"
] "The strip_email_domain option got removed upstream")
]; ];
services.headscale.settings = lib.mkMerge [ services.headscale.settings = lib.mkMerge [

7
nixos/tests/headscale.nix
View file

@ -43,7 +43,10 @@ in
region_id = 999; region_id = 999;
stun_listen_addr = "0.0.0.0:${toString stunPort}"; stun_listen_addr = "0.0.0.0:${toString stunPort}";
}; };
dns.base_domain = "tailnet"; dns = {
base_domain = "tailnet";
override_local_dns = false;
};
}; };
}; };
nginx = { nginx = {
@ -77,7 +80,7 @@ in
# Create headscale user and preauth-key # Create headscale user and preauth-key
headscale.succeed("headscale users create test") headscale.succeed("headscale users create test")
authkey = headscale.succeed("headscale preauthkeys -u test create --reusable") authkey = headscale.succeed("headscale preauthkeys -u 1 create --reusable")
# Connect peers # Connect peers
up_cmd = f"tailscale up --login-server 'https://headscale' --auth-key {authkey}" up_cmd = f"tailscale up --login-server 'https://headscale' --auth-key {authkey}"

6
pkgs/servers/headscale/default.nix
View file

@ -11,16 +11,16 @@
}: }:
buildGoModule rec { buildGoModule rec {
pname = "headscale"; pname = "headscale";
version = "0.25.1"; version = "0.26.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "juanfont"; owner = "juanfont";
repo = "headscale"; repo = "headscale";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-CrdMxRAgrDE1lJ3v9AhCN+cKOVqmIVwjE0x+msSVT+c="; hash = "sha256-BzCcOUousbw+PrYM7SGDtJuTGvhpsTNOF2kQZEl6z84=";
}; };
vendorHash = "sha256-ZQj2A0GdLhHc7JLW7qgpGBveXXNWg9ueSG47OZQQXEw="; vendorHash = "sha256-dR8xmUIDMIy08lhm7r95GNNMAbXv4qSH3v9HR40HlNk=";
subPackages = [ "cmd/headscale" ]; subPackages = [ "cmd/headscale" ];

4
pkgs/top-level/all-packages.nix
View file

@ -3294,9 +3294,7 @@ with pkgs;
heimdall-gui = heimdall.override { enableGUI = true; }; heimdall-gui = heimdall.override { enableGUI = true; };
headscale = callPackage ../servers/headscale { headscale = callPackage ../servers/headscale { };
buildGoModule = buildGo123Module;
};
highlight = callPackage ../tools/text/highlight { highlight = callPackage ../tools/text/highlight {
lua = lua5; lua = lua5;