Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Backport release-23.11] netbird: 0.26.0 -> 0.27.2 #303184

Merged
merged 7 commits into from
Apr 11, 2024
Merged

[Backport release-23.11] netbird: 0.26.0 -> 0.27.2 #303184

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
863053e
netbird: 0.26.0 -> 0.26.1
misuzu Feb 28, 2024
e0db410
netbird-ui: fix build failure
misuzu Feb 28, 2024
cb18c51
netbird-ui: 0.26.1 -> 0.26.2
r-ryantm Mar 2, 2024
f569097
netbird-ui: 0.26.2 -> 0.26.3
r-ryantm Mar 13, 2024
e060094
netbird: 0.26.3 -> 0.26.6
r-ryantm Mar 29, 2024
fa88ef7
netbird: 0.26.6 -> 0.27.1
r-ryantm Apr 6, 2024
2a014d6
netbird-ui: 0.27.1 -> 0.27.2
r-ryantm Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions pkgs/tools/networking/netbird/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,16 @@ let
in
buildGoModule rec {
pname = "netbird";
version = "0.26.0";
version = "0.27.2";

src = fetchFromGitHub {
owner = "netbirdio";
repo = pname;
rev = "v${version}";
hash = "sha256-hZnxemBoMAol0m9XZPMEh/Lf0woxoLNH97bRyg8xtv4=";
hash = "sha256-W31eKA6v7pAJZ9El/CxEDMONTcpRfzn/Ldh1yIql+NQ=";
};

vendorHash = "sha256-csa83P74Y9fHsPg5VgPfR9WMg4VKOXcIR0pOMzh0QoA=";
vendorHash = "sha256-HJEZ1VrKS1MXKtpDjVorMiecb94+f1mBWPkWng4YqZk=";

nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config;

Expand Down Expand Up @@ -73,9 +73,9 @@ buildGoModule rec {
postPatch = ''
# make it compatible with systemd's RuntimeDirectory
substituteInPlace client/cmd/root.go \
--replace 'unix:///var/run/netbird.sock' 'unix:///var/run/netbird/sock'
--replace-fail 'unix:///var/run/netbird.sock' 'unix:///var/run/netbird/sock'
substituteInPlace client/ui/client_ui.go \
--replace 'unix:///var/run/netbird.sock' 'unix:///var/run/netbird/sock'
--replace-fail 'unix:///var/run/netbird.sock' 'unix:///var/run/netbird/sock'
'';

postInstall = lib.concatStringsSep "\n"
Expand All @@ -90,13 +90,13 @@ buildGoModule rec {
'')
modules) + lib.optionalString (stdenv.isLinux && ui) ''
mkdir -p $out/share/pixmaps
cp $src/client/ui/netbird-systemtray-default.png $out/share/pixmaps/netbird.png
cp $src/client/ui/netbird-systemtray-connected.png $out/share/pixmaps/netbird.png

mkdir -p $out/share/applications
cp $src/client/ui/netbird.desktop $out/share/applications/netbird.desktop

substituteInPlace $out/share/applications/netbird.desktop \
--replace "Exec=/usr/bin/netbird-ui" "Exec=$out/bin/netbird-ui"
--replace-fail "Exec=/usr/bin/netbird-ui" "Exec=$out/bin/netbird-ui"
'';

passthru = {
Expand Down
Loading