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

[Backport release-24.05] mozillavpn: 2.23.1 → 2.24.0 #345105

Merged
merged 3 commits into from
Oct 4, 2024
Merged

[Backport release-24.05] mozillavpn: 2.23.1 → 2.24.0 #345105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a3f956e
mozillavpn: switch to standard callPackage
andersk Sep 25, 2024
3b41010
mozillavpn: migrate to by-name
andersk Sep 25, 2024
e5b6959
mozillavpn: 2.23.1 → 2.24.0
andersk Sep 25, 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
46 changes: 16 additions & 30 deletions pkgs/tools/networking/mozillavpn/default.nix → pkgs/by-name/mo/mozillavpn/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
cargo,
cmake,
fetchFromGitHub,
fetchpatch,
go,
lib,
libcap,
Expand All @@ -13,37 +12,24 @@
pkg-config,
polkit,
python3,
qt5compat,
qtbase,
qtnetworkauth,
qtsvg,
qttools,
qtwayland,
qtwebsockets,
qt6,
rustPlatform,
rustc,
stdenv,
wireguard-tools,
wrapQtAppsHook,
}:

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 {
Expand All @@ -59,20 +45,20 @@ stdenv.mkDerivation (finalAttrs: {

cargoDeps = rustPlatform.fetchCargoTarball {
inherit (finalAttrs) src patches;
hash = "sha256-JIe6FQL0xm6FYYGoIwwnOxq21sC1y8xPsr8tYPF0Mzo=";
hash = "sha256-ryJFvnJIiDKf2EqlzHj79hSPYrD+3UtZ5lT/QeFv6V0=";
};

buildInputs = [
libcap
libgcrypt
libgpg-error
libsecret
qt5compat
qtbase
qtnetworkauth
qtsvg
qtwayland
qtwebsockets
qt6.qt5compat
qt6.qtbase
qt6.qtnetworkauth
qt6.qtsvg
qt6.qtwayland
qt6.qtwebsockets
];
nativeBuildInputs = [
cargo
Expand All @@ -83,10 +69,10 @@ stdenv.mkDerivation (finalAttrs: {
python3.pkgs.glean-parser
python3.pkgs.pyyaml
python3.pkgs.setuptools
qttools
qt6.qttools
qt6.wrapQtAppsHook
rustPlatform.cargoSetupHook
rustc
wrapQtAppsHook
];

postPatch = ''
Expand All @@ -102,9 +88,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;

Expand Down
2 changes: 0 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7526,8 +7526,6 @@ with pkgs;

mcrcon = callPackage ../tools/networking/mcrcon { };

mozillavpn = qt6Packages.callPackage ../tools/networking/mozillavpn { };

mozwire = callPackage ../tools/networking/mozwire {
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
};
Expand Down