From 5a3cb336d60950580979582ba790eb8f7cf60baf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Wed, 22 Nov 2023 11:46:13 +0100 Subject: [PATCH 1/5] tor-browser: 13.0.1 -> 13.0.5 https://blog.torproject.org/new-release-tor-browser-1304/ https://blog.torproject.org/new-release-tor-browser-1305/ (cherry picked from commit ef557f03443850cbbb44a2ef327afd78bfef7cf4) --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 3c7a8ae5b77f..bc3392e3d49c 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -105,7 +105,7 @@ lib.warnIf (useHardenedMalloc != null) ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "13.0.1"; + version = "13.0.5"; sources = { x86_64-linux = fetchurl { @@ -115,7 +115,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-ORa973US2VY9Can4Nr35YSpZrYGqBP4I/S/ulsbRJLc="; + hash = "sha256-WZq8ig62Mu3q6OrVSaPbe6MLQ6pvFNo3yQMXC7PCGJY="; }; i686-linux = fetchurl { @@ -125,7 +125,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" ]; - hash = "sha256-OBUleXLTNFG+aFuftnphgBtQCfyoIWDcoVFs5elJ0tA="; + hash = "sha256-/enIdKLMRmJIjwXEo0i3hgHZKEtWaBgFzE1rtZMsqeY="; }; }; From 764f8e7553787024b771b78507216fc336cac304 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Thu, 23 Nov 2023 20:25:36 +0100 Subject: [PATCH 2/5] mullvad-browser: 13.0.1 -> 13.0.4 https://github.com/mullvad/mullvad-browser/releases/tag/13.0.4 (cherry picked from commit 06580dcbaae344f4ac8bea9f483accaa24184be5) --- .../networking/browsers/mullvad-browser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/mullvad-browser/default.nix b/pkgs/applications/networking/browsers/mullvad-browser/default.nix index cd31590c9c2a..ad5c5bde5cb9 100644 --- a/pkgs/applications/networking/browsers/mullvad-browser/default.nix +++ b/pkgs/applications/networking/browsers/mullvad-browser/default.nix @@ -89,7 +89,7 @@ let ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "13.0.1"; + version = "13.0.4"; sources = { x86_64-linux = fetchurl { @@ -101,7 +101,7 @@ let "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-VYkRHWyTAAt5P7jnNuf4s2bOv36LuqcTMMKOLRGE9FQ="; + hash = "sha256-qK67rf9zkMA53WFIcMCsPUH4m6YkMVqAUsHiGsy/xN4="; }; }; From 047d3be8dd5bd45e8d976b517b1f04c626d0fc3a Mon Sep 17 00:00:00 2001 From: zzzsyyy Date: Thu, 23 Nov 2023 18:09:53 +0800 Subject: [PATCH 3/5] linux_xanmod: 6.1.62 -> 6.1.63 (cherry picked from commit 0a825f0bdffd5f7e67cfc320c86801d39fbbe12d) --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index b5c7901f1380..ca6c1427f139 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -3,8 +3,8 @@ let # These names are how they are designated in https://xanmod.org. ltsVariant = { - version = "6.1.62"; - hash = "sha256-fo5OQ/MZ+QVdCmLzX0OgFUBedfqrkqp+Ev081RVdtWw="; + version = "6.1.63"; + hash = "sha256-WBMKJCLYexWJuTpli8vjvdms2ZYPXIS0yUxTgAL00io="; variant = "lts"; }; From 02ed52b7377b1c61f700719b1112a37eec1e6546 Mon Sep 17 00:00:00 2001 From: zzzsyyy Date: Thu, 23 Nov 2023 18:14:47 +0800 Subject: [PATCH 4/5] linux_xanmod_latest: 6.5.11 -> 6.5.12 (cherry picked from commit f9e8890509f37935cc2a910bdc18ba7b18fa5d41) --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index ca6c1427f139..7afaf753dcb5 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -9,8 +9,8 @@ let }; mainVariant = { - version = "6.5.11"; - hash = "sha256-1bb5LG6JvqX5eNSe2Xyu86HxaqkUVkKUf1H3T7bFkGE="; + version = "6.5.12"; + hash = "sha256-zG9+d+hKg0S0qCX2hOc02CowC6s9u82MB45+X1bGYpE="; variant = "main"; }; From 41f22990ca6d64873ce6827cd595d42471303d28 Mon Sep 17 00:00:00 2001 From: the-furry-hubofeverything Date: Sun, 26 Nov 2023 01:48:37 -0800 Subject: [PATCH 5/5] netbird-ui: fix broken systray icon path Resolves build failure (cherry picked from commit 19b442691f9ad2f6b173a33dfce56f1d21cc2a93) --- pkgs/tools/networking/netbird/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index 0cd954cca380..c74d08029986 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -89,7 +89,7 @@ buildGoModule rec { '') modules) + lib.optionalString (stdenv.isLinux && ui) '' mkdir -p $out/share/pixmaps - cp $src/client/ui/disconnected.png $out/share/pixmaps/netbird.png + cp $src/client/ui/netbird-systemtray-default.png $out/share/pixmaps/netbird.png mkdir -p $out/share/applications cp $src/client/ui/netbird.desktop $out/share/applications/netbird.desktop