ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-22 21:18:28 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #227243 from misuzu/netbird-update

Browse Source 
netbird: 0.14.6 -> 0.16.0
This commit is contained in:
Nick Cao 2023-04-21 13:55:29 +08:00 committed by GitHub
commit 515da5b664
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 56 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/services/networking/netbird.nix
View File

@ -41,9 +41,10 @@ in {
documentation = [ "https://netbird.io/docs/" ]; documentation = [ "https://netbird.io/docs/" ];
after = [ "network.target" ]; after = [ "network.target" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
path = with pkgs; [
openresolv
];
serviceConfig = { serviceConfig = {
AmbientCapabilities = [ "CAP_NET_ADMIN" ];
DynamicUser = true;
Environment = [ Environment = [
"NB_CONFIG=/var/lib/netbird/config.json" "NB_CONFIG=/var/lib/netbird/config.json"
"NB_LOG_FILE=console" "NB_LOG_FILE=console"

86
pkgs/tools/networking/netbird/default.nix
View File

@ -1,29 +1,45 @@
{ stdenv, lib, nixosTests, buildGoModule, fetchFromGitHub, installShellFiles { stdenv
, lib
, nixosTests
, nix-update-script
, buildGoModule
, fetchFromGitHub
, installShellFiles
, pkg-config , pkg-config
, gtk3, libayatana-appindicator, libX11, libXcursor, libXxf86vm , gtk3
, Cocoa, IOKit, Kernel, UserNotifications, WebKit , libayatana-appindicator
, ui ? false }: , libX11
, libXcursor
, libXxf86vm
, Cocoa
, IOKit
, Kernel
, UserNotifications
, WebKit
, ui ? false
}:
let let
modules = if ui then { modules =
"client/ui" = "netbird-ui"; if ui then {
} else { "client/ui" = "netbird-ui";
client = "netbird"; } else {
management = "netbird-mgmt"; client = "netbird";
signal = "netbird-signal"; management = "netbird-mgmt";
}; signal = "netbird-signal";
};
in in
buildGoModule rec { buildGoModule rec {
pname = "netbird"; pname = "netbird";
version = "0.14.6"; version = "0.16.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "netbirdio"; owner = "netbirdio";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-S11PshEVwOYPb8RGs5joC3Cr8CNKAenK6JRd/oV4LNQ="; sha256 = "sha256-HtkMwy+8Af69vOz9VYMozOzW/W7CFSXlWR0vLlmYCeY=";
}; };
vendorHash = "sha256-RyTfEZPwr2CNb9M8vGmo4gtbqQDh2KWApyz2Yx6qPmk="; vendorHash = "sha256-lag/usfAvpZhWeVe1wB3SJJsTCLcBeh04RvkE803OqQ=";
nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config;
@ -46,7 +62,7 @@ buildGoModule rec {
ldflags = [ ldflags = [
"-s" "-s"
"-w" "-w"
"-X github.com/netbirdio/netbird/client/system.version=${version}" "-X github.com/netbirdio/netbird/version.version=${version}"
"-X main.builtBy=nix" "-X main.builtBy=nix"
]; ];
@ -61,27 +77,31 @@ buildGoModule rec {
--replace 'unix:///var/run/netbird.sock' 'unix:///var/run/netbird/sock' --replace 'unix:///var/run/netbird.sock' 'unix:///var/run/netbird/sock'
''; '';
postInstall = lib.concatStringsSep "\n" (lib.mapAttrsToList postInstall = lib.concatStringsSep "\n"
(module: binary: '' (lib.mapAttrsToList
mv $out/bin/${lib.last (lib.splitString "/" module)} $out/bin/${binary} (module: binary: ''
'' + lib.optionalString (!ui) '' mv $out/bin/${lib.last (lib.splitString "/" module)} $out/bin/${binary}
installShellCompletion --cmd ${binary} \ '' + lib.optionalString (!ui) ''
--bash <($out/bin/${binary} completion bash) \ installShellCompletion --cmd ${binary} \
--fish <($out/bin/${binary} completion fish) \ --bash <($out/bin/${binary} completion bash) \
--zsh <($out/bin/${binary} completion zsh) --fish <($out/bin/${binary} completion fish) \
'') --zsh <($out/bin/${binary} completion zsh)
modules) + lib.optionalString (stdenv.isLinux && ui) '' '')
mkdir -p $out/share/pixmaps modules) + lib.optionalString (stdenv.isLinux && ui) ''
cp $src/client/ui/disconnected.png $out/share/pixmaps/netbird.png mkdir -p $out/share/pixmaps
cp $src/client/ui/disconnected.png $out/share/pixmaps/netbird.png
mkdir -p $out/share/applications mkdir -p $out/share/applications
cp $src/client/ui/netbird.desktop $out/share/applications/netbird.desktop cp $src/client/ui/netbird.desktop $out/share/applications/netbird.desktop
substituteInPlace $out/share/applications/netbird.desktop \ substituteInPlace $out/share/applications/netbird.desktop \
--replace "Exec=/usr/bin/netbird-ui" "Exec=$out/bin/netbird-ui" --replace "Exec=/usr/bin/netbird-ui" "Exec=$out/bin/netbird-ui"
''; '';
passthru.tests.netbird = nixosTests.netbird; passthru = {
tests.netbird = nixosTests.netbird;
updateScript = nix-update-script { };
};
meta = with lib; { meta = with lib; {
homepage = "https://netbird.io"; homepage = "https://netbird.io";