DGNum/infrastructure
9
6
Fork 3
Code Issues 27 Pull requests 30 Projects 1 Releases Packages Wiki Activity Actions

feat(netbird): Update
All checks were successful
Check meta / check_meta (push) Successful in 16s
Details
Check meta / check_dns (push) Successful in 16s
Details
build configuration / build_and_cache_compute01 (push) Successful in 2m54s
Details
build configuration / build_and_cache_storage01 (push) Successful in 4m19s
Details
build configuration / build_and_cache_rescue01 (push) Successful in 1m10s
Details
build configuration / build_and_cache_geo01 (push) Successful in 1m3s
Details
build configuration / build_and_cache_geo02 (push) Successful in 1m1s
Details
build configuration / build_and_cache_vault01 (push) Successful in 1m16s
Details
build configuration / build_and_cache_web01 (push) Successful in 1m42s
Details
build configuration / build_and_cache_web02 (push) Successful in 1m7s
Details
build configuration / build_and_cache_web03 (push) Successful in 1m12s
Details
build configuration / build_and_cache_bridge01 (push) Successful in 1m3s
Details
lint / check (push) Successful in 23s
Details

Browse source
This commit is contained in:
Tom Hubrecht 2024-10-20 23:01:14 +02:00
parent 5f0c7d4e22
commit 51133e6e5f
Signed by: thubrecht
SSH key fingerprint: SHA256:r+nK/SIcWlJ0zFZJGHtlAoRwq1Rm+WcKAm5ADYMoQPc
14 changed files with 180 additions and 733 deletions
Download patch file Download diff file Expand all files Collapse all files

21
patches/05-netbird-relay.patch Normal file
View file

@ -0,0 +1,21 @@
diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix
index 07a1e906dad3..d5799446628b 100644
--- a/pkgs/tools/networking/netbird/default.nix
+++ b/pkgs/tools/networking/netbird/default.nix
@@ -26,6 +26,7 @@ let
} else {
client = "netbird";
management = "netbird-mgmt";
+ relay = "netbird-relay";
signal = "netbird-signal";
};
in
@@ -82,7 +83,7 @@ buildGoModule rec {
(lib.mapAttrsToList
(module: binary: ''
mv $out/bin/${lib.last (lib.splitString "/" module)} $out/bin/${binary}
- '' + lib.optionalString (!ui) ''
+ '' + lib.optionalString (!ui && module != "relay") ''
installShellCompletion --cmd ${binary} \
--bash <($out/bin/${binary} completion bash) \
--fish <($out/bin/${binary} completion fish) \

6
patches/default.nix
View file

@ -64,5 +64,11 @@ in
sha = "ae4bf4c110378ebacb3989c9533726859cfebbfa";
hash = "sha256-SgHhW9HCkDQsxT3eG4P9q68c43e3sbDHRY9qs7oSt8o=";
}
# Build netbird-relay
{
_type = "static";
path = ./05-netbird-relay.patch;
}
];
}