From a3f956e48b9caf5a085675762d5fd27994d35eb8 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Tue, 24 Sep 2024 23:58:53 -0700 Subject: [PATCH 1/3] mozillavpn: switch to standard callPackage Signed-off-by: Anders Kaseorg (cherry picked from commit 3481adf69567cd9f72eb1cc38fd7e43e818a1908) --- pkgs/tools/networking/mozillavpn/default.nix | 31 ++++++++------------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/pkgs/tools/networking/mozillavpn/default.nix b/pkgs/tools/networking/mozillavpn/default.nix index 0e3d43d191e6..ed83d7cf4a81 100644 --- a/pkgs/tools/networking/mozillavpn/default.nix +++ b/pkgs/tools/networking/mozillavpn/default.nix @@ -13,18 +13,11 @@ pkg-config, polkit, python3, - qt5compat, - qtbase, - qtnetworkauth, - qtsvg, - qttools, - qtwayland, - qtwebsockets, + qt6, rustPlatform, rustc, stdenv, wireguard-tools, - wrapQtAppsHook, }: stdenv.mkDerivation (finalAttrs: { @@ -67,12 +60,12 @@ stdenv.mkDerivation (finalAttrs: { libgcrypt libgpg-error libsecret - qt5compat - qtbase - qtnetworkauth - qtsvg - qtwayland - qtwebsockets + qt6.qt5compat + qt6.qtbase + qt6.qtnetworkauth + qt6.qtsvg + qt6.qtwayland + qt6.qtwebsockets ]; nativeBuildInputs = [ cargo @@ -83,10 +76,10 @@ stdenv.mkDerivation (finalAttrs: { python3.pkgs.glean-parser python3.pkgs.pyyaml python3.pkgs.setuptools - qttools + qt6.qttools + qt6.wrapQtAppsHook rustPlatform.cargoSetupHook rustc - wrapQtAppsHook ]; postPatch = '' @@ -102,9 +95,9 @@ stdenv.mkDerivation (finalAttrs: { ''; cmakeFlags = [ - "-DQT_LCONVERT_EXECUTABLE=${qttools.dev}/bin/lconvert" - "-DQT_LUPDATE_EXECUTABLE=${qttools.dev}/bin/lupdate" - "-DQT_LRELEASE_EXECUTABLE=${qttools.dev}/bin/lrelease" + "-DQT_LCONVERT_EXECUTABLE=${qt6.qttools.dev}/bin/lconvert" + "-DQT_LUPDATE_EXECUTABLE=${qt6.qttools.dev}/bin/lupdate" + "-DQT_LRELEASE_EXECUTABLE=${qt6.qttools.dev}/bin/lrelease" ]; dontFixCmake = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6568285fd62b..bafa2809f583 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7526,7 +7526,7 @@ with pkgs; mcrcon = callPackage ../tools/networking/mcrcon { }; - mozillavpn = qt6Packages.callPackage ../tools/networking/mozillavpn { }; + mozillavpn = callPackage ../tools/networking/mozillavpn { }; mozwire = callPackage ../tools/networking/mozwire { inherit (darwin.apple_sdk.frameworks) CoreServices Security; From 3b41010afa7d48971b0eda2aa3b61679156c0162 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Wed, 25 Sep 2024 00:00:36 -0700 Subject: [PATCH 2/3] mozillavpn: migrate to by-name Signed-off-by: Anders Kaseorg (cherry picked from commit 3969be13bf993566643d707d9825d83ecfb52bea) --- .../default.nix => by-name/mo/mozillavpn/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/networking/mozillavpn/default.nix => by-name/mo/mozillavpn/package.nix} (100%) diff --git a/pkgs/tools/networking/mozillavpn/default.nix b/pkgs/by-name/mo/mozillavpn/package.nix similarity index 100% rename from pkgs/tools/networking/mozillavpn/default.nix rename to pkgs/by-name/mo/mozillavpn/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bafa2809f583..910d81529773 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7526,8 +7526,6 @@ with pkgs; mcrcon = callPackage ../tools/networking/mcrcon { }; - mozillavpn = callPackage ../tools/networking/mozillavpn { }; - mozwire = callPackage ../tools/networking/mozwire { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; From e5b695965c81f91cdb2d784d23f83686e1c40a0a Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Tue, 24 Sep 2024 23:51:05 -0700 Subject: [PATCH 3/3] =?UTF-8?q?mozillavpn:=202.23.1=20=E2=86=92=202.24.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Anders Kaseorg (cherry picked from commit b992338da036ab9a5f860dcabc1f5421e0b3354f) --- pkgs/by-name/mo/mozillavpn/package.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/mo/mozillavpn/package.nix b/pkgs/by-name/mo/mozillavpn/package.nix index ed83d7cf4a81..1394123696f3 100644 --- a/pkgs/by-name/mo/mozillavpn/package.nix +++ b/pkgs/by-name/mo/mozillavpn/package.nix @@ -3,7 +3,6 @@ cargo, cmake, fetchFromGitHub, - fetchpatch, go, lib, libcap, @@ -22,21 +21,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "mozillavpn"; - version = "2.23.1"; + version = "2.24.0"; src = fetchFromGitHub { owner = "mozilla-mobile"; repo = "mozilla-vpn-client"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-NQM1ZII9owD9ek/Leo6WRfvNybZ5pUjDgvQGXQBrD+0="; + hash = "sha256-iTnwx+KPZ5b8qT0fEMUCGQx1UyGVM4VCzooZqslGWtw="; }; - patches = [ - # Update cargo deps for "time" - (fetchpatch { - url = "https://github.com/mozilla-mobile/mozilla-vpn-client/commit/31d5799a30fc02067ad31d86b6ef63294bb3c3b8.patch"; - hash = "sha256-ECrIcfhhSuvbqQ/ExPdFkQ6b9Q767lhUKmwPdDz7yxI="; - }) - ]; + patches = [ ]; netfilterGoModules = (buildGoModule { @@ -52,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) src patches; - hash = "sha256-JIe6FQL0xm6FYYGoIwwnOxq21sC1y8xPsr8tYPF0Mzo="; + hash = "sha256-ryJFvnJIiDKf2EqlzHj79hSPYrD+3UtZ5lT/QeFv6V0="; }; buildInputs = [