From 863053e9a6f8719f149da92c6599cfe8ff8083ed Mon Sep 17 00:00:00 2001 From: misuzu Date: Wed, 28 Feb 2024 10:10:30 +0200 Subject: [PATCH 1/7] netbird: 0.26.0 -> 0.26.1 Diff: https://github.com/netbirdio/netbird/compare/v0.26.0...v0.26.1 Changelog: https://github.com/netbirdio/netbird/releases/tag/v0.26.1 (cherry picked from commit 072090b624e9000dbb4e662243fbcd639dde34f7) --- pkgs/tools/networking/netbird/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index 1ac58d963c0c3..aefad9c335373 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -31,16 +31,16 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.26.0"; + version = "0.26.1"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - hash = "sha256-hZnxemBoMAol0m9XZPMEh/Lf0woxoLNH97bRyg8xtv4="; + hash = "sha256-FZ6bPn4birCjvWm43clu3lAES38IooLP7PhUfRMO5+0="; }; - vendorHash = "sha256-csa83P74Y9fHsPg5VgPfR9WMg4VKOXcIR0pOMzh0QoA="; + vendorHash = "sha256-Zp8LAaADpSa/wfnLAQVJ8cG3bMkC7ZU1BT+Dz214c34="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; From e0db4109f01cae89d7cc6901ee8d14c476251b1f Mon Sep 17 00:00:00 2001 From: misuzu Date: Wed, 28 Feb 2024 10:13:42 +0200 Subject: [PATCH 2/7] netbird-ui: fix build failure (cherry picked from commit 32f9f4626ca38383545e58d4ff58e2ba709e11bc) --- pkgs/tools/networking/netbird/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index aefad9c335373..8f92c4336a735 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -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" @@ -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 = { From cb18c518ade9c8e37b7c7f805cdb694cc7e31606 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 2 Mar 2024 16:12:20 +0000 Subject: [PATCH 3/7] netbird-ui: 0.26.1 -> 0.26.2 (cherry picked from commit 885d57f6d2d4028d4a41f194d9757bf5c48f8906) --- pkgs/tools/networking/netbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index 8f92c4336a735..b45a75944d4b9 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -31,13 +31,13 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.26.1"; + version = "0.26.2"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - hash = "sha256-FZ6bPn4birCjvWm43clu3lAES38IooLP7PhUfRMO5+0="; + hash = "sha256-fnKrv8bMONZbZGZtCQUAeGo3OIvOIqLX3nvVfGhYoK8="; }; vendorHash = "sha256-Zp8LAaADpSa/wfnLAQVJ8cG3bMkC7ZU1BT+Dz214c34="; From f569097d94662e046611b4448844d668256e623d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Mar 2024 01:19:09 +0000 Subject: [PATCH 4/7] netbird-ui: 0.26.2 -> 0.26.3 (cherry picked from commit 2e4791c8560049cc552f9fbdf05195c117687f93) --- pkgs/tools/networking/netbird/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index b45a75944d4b9..c49b606b04795 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -31,16 +31,16 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.26.2"; + version = "0.26.3"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - hash = "sha256-fnKrv8bMONZbZGZtCQUAeGo3OIvOIqLX3nvVfGhYoK8="; + hash = "sha256-StZDhCBuwmJk8VimbsVO9Sfxlv5NcpV689YPUZRgOLk="; }; - vendorHash = "sha256-Zp8LAaADpSa/wfnLAQVJ8cG3bMkC7ZU1BT+Dz214c34="; + vendorHash = "sha256-n5n9bIQ026WlvwatMmEIBaLGfquTgek1eiQDb0xDAdI="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; From e06009412ac5956569c37d9d0f71900bfb039828 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Mar 2024 19:11:52 +0000 Subject: [PATCH 5/7] netbird: 0.26.3 -> 0.26.6 (cherry picked from commit 6e39d3bdbcb4eb17b68b68602e7f6c2760277a1a) --- pkgs/tools/networking/netbird/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index c49b606b04795..376426f8ea3e5 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -31,16 +31,16 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.26.3"; + version = "0.26.6"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - hash = "sha256-StZDhCBuwmJk8VimbsVO9Sfxlv5NcpV689YPUZRgOLk="; + hash = "sha256-LsgkUQ6uYdd1qPaINeza4MDDG0ynGhJ7jiZoAy8pjEE="; }; - vendorHash = "sha256-n5n9bIQ026WlvwatMmEIBaLGfquTgek1eiQDb0xDAdI="; + vendorHash = "sha256-SSTpXila4eze3XA3vrTczBwt5XEjtLDvaCiQ5oi4FXg="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; From fa88ef70311b082a485dda2a45cbdaa45f3a8a86 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Apr 2024 03:17:12 +0000 Subject: [PATCH 6/7] netbird: 0.26.6 -> 0.27.1 (cherry picked from commit 6e7791eec9ce0c7c02881b4b1cf6eed927efd4ee) --- pkgs/tools/networking/netbird/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index 376426f8ea3e5..bf194eb2d9b6a 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -31,16 +31,16 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.26.6"; + version = "0.27.1"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - hash = "sha256-LsgkUQ6uYdd1qPaINeza4MDDG0ynGhJ7jiZoAy8pjEE="; + hash = "sha256-Cgu4OvmCZb7/X09fWct73Ztbb7uiB7KqnxgYoL3uR4k="; }; - vendorHash = "sha256-SSTpXila4eze3XA3vrTczBwt5XEjtLDvaCiQ5oi4FXg="; + vendorHash = "sha256-HJEZ1VrKS1MXKtpDjVorMiecb94+f1mBWPkWng4YqZk="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; From 2a014d6b0afb411acd58b271d95e32d00af1ac79 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Apr 2024 06:14:20 +0000 Subject: [PATCH 7/7] netbird-ui: 0.27.1 -> 0.27.2 (cherry picked from commit 0257f6a003af61c0a8f4677dc6971b889515fd36) --- pkgs/tools/networking/netbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index bf194eb2d9b6a..94b353f2014d1 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -31,13 +31,13 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.27.1"; + version = "0.27.2"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - hash = "sha256-Cgu4OvmCZb7/X09fWct73Ztbb7uiB7KqnxgYoL3uR4k="; + hash = "sha256-W31eKA6v7pAJZ9El/CxEDMONTcpRfzn/Ldh1yIql+NQ="; }; vendorHash = "sha256-HJEZ1VrKS1MXKtpDjVorMiecb94+f1mBWPkWng4YqZk=";