From abfcc2e0ffa1546d73f8df4373838f3c1275b392 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Mon, 14 Feb 2022 14:53:18 -0800 Subject: [PATCH] mozillavpn: init at 2.7.1 Signed-off-by: Anders Kaseorg --- .../from_md/release-notes/rl-2205.section.xml | 9 ++ .../manual/release-notes/rl-2205.section.md | 2 + nixos/modules/module-list.nix | 1 + .../services/networking/mozillavpn.nix | 19 +++ pkgs/tools/networking/mozillavpn/default.nix | 111 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 6 files changed, 144 insertions(+) create mode 100644 nixos/modules/services/networking/mozillavpn.nix create mode 100644 pkgs/tools/networking/mozillavpn/default.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index a6bd453b35d..204992e70bd 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -161,6 +161,15 @@ to be able to access the device. + + + mozillavpn, + the client for the + Mozilla VPN + service. Available as + services.mozillavpn. + + mtr-exporter, diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 8f5b4789a42..4335c418f39 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -49,6 +49,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [K40-Whisperer](https://www.scorchworks.com/K40whisperer/k40whisperer.html), a program to control cheap Chinese laser cutters. Available as [programs.k40-whisperer.enable](options.html#opt-programs.k4-whisperer.enable). Users must add themselves to the `k40` group to be able to access the device. +- [mozillavpn](https://github.com/mozilla-mobile/mozilla-vpn-client), the client for the [Mozilla VPN](https://vpn.mozilla.org/) service. Available as [services.mozillavpn](options.html#opt-services.mozillavpn). + - [mtr-exporter](https://github.com/mgumz/mtr-exporter), a Prometheus exporter for mtr metrics. Available as [services.mtr-exporter](options.html#opt-services.mtr-exporter.enable). - [tetrd](https://tetrd.app), share your internet connection from your device to your PC and vice versa through a USB cable. Available at [services.tetrd](#opt-services.tetrd.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c6f4ec5f08c..cbc849cf3e8 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -805,6 +805,7 @@ ./services/networking/mosquitto.nix ./services/networking/monero.nix ./services/networking/morty.nix + ./services/networking/mozillavpn.nix ./services/networking/miredo.nix ./services/networking/mstpd.nix ./services/networking/mtprotoproxy.nix diff --git a/nixos/modules/services/networking/mozillavpn.nix b/nixos/modules/services/networking/mozillavpn.nix new file mode 100644 index 00000000000..e35ba65314e --- /dev/null +++ b/nixos/modules/services/networking/mozillavpn.nix @@ -0,0 +1,19 @@ +{ config, lib, pkgs, ... }: + +{ + options.services.mozillavpn.enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Enable the Mozilla VPN daemon. + ''; + }; + + config = lib.mkIf config.services.mozillavpn.enable { + environment.systemPackages = [ pkgs.mozillavpn ]; + services.dbus.packages = [ pkgs.mozillavpn ]; + systemd.packages = [ pkgs.mozillavpn ]; + }; + + meta.maintainers = with lib.maintainers; [ andersk ]; +} diff --git a/pkgs/tools/networking/mozillavpn/default.nix b/pkgs/tools/networking/mozillavpn/default.nix new file mode 100644 index 00000000000..9e4e7cc29d4 --- /dev/null +++ b/pkgs/tools/networking/mozillavpn/default.nix @@ -0,0 +1,111 @@ +{ buildGoModule +, fetchFromGitHub +, go +, lib +, pkg-config +, polkit +, python3 +, qmake +, qtbase +, qtcharts +, qtgraphicaleffects +, qtnetworkauth +, qtquickcontrols2 +, qttools +, qtwebsockets +, stdenv +, which +, wireguard-tools +, wrapQtAppsHook +}: + +let + glean_parser_4_1_1 = python3.pkgs.buildPythonPackage rec { + pname = "glean_parser"; + version = "4.1.1"; + src = python3.pkgs.fetchPypi { + inherit pname version; + hash = "sha256-4noazRqjjJNI2kTO714kSp70jZpWmqHWR2vnkgAftLE="; + }; + nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; + propagatedBuildInputs = with python3.pkgs; [ + appdirs + click + diskcache + jinja2 + jsonschema + pyyaml + setuptools + yamllint + ]; + postPatch = '' + substituteInPlace setup.py --replace '"pytest-runner", ' "" + ''; + doCheck = false; + }; + + pname = "mozillavpn"; + version = "2.7.1"; + src = fetchFromGitHub { + owner = "mozilla-mobile"; + repo = "mozilla-vpn-client"; + rev = "v${version}"; + fetchSubmodules = true; + hash = "sha256-i551UkCOwWnioe1YgCNZAlYiQJ4YDDBMoDZhfbkLTbs="; + }; + + netfilter-go-modules = (buildGoModule { + inherit pname version src; + vendorSha256 = "sha256-KFYMim5U8WlJHValvIBQgEN+17SDv0JVbH03IiyfDc0="; + modRoot = "linux/netfilter"; + }).go-modules; + +in +stdenv.mkDerivation { + inherit pname version src; + + buildInputs = [ + polkit + qtbase + qtcharts + qtgraphicaleffects + qtnetworkauth + qtquickcontrols2 + qtwebsockets + ]; + nativeBuildInputs = [ + glean_parser_4_1_1 + go + pkg-config + python3 + python3.pkgs.pyyaml + qmake + qttools + which + wrapQtAppsHook + ]; + + postPatch = '' + for file in linux/*.service linux/extra/*.desktop src/platforms/linux/daemon/*.service; do + substituteInPlace "$file" --replace /usr/bin/mozillavpn "$out/bin/mozillavpn" + done + ''; + + preBuild = '' + ln -s '${netfilter-go-modules}' linux/netfilter/vendor + python3 scripts/generate_glean.py + python3 scripts/importLanguages.py + ''; + + qmakeFlags = [ "USRPATH=$(out)" "ETCPATH=$(out)/etc" ]; + qtWrapperArgs = + [ "--prefix" "PATH" ":" (lib.makeBinPath [ wireguard-tools ]) ]; + + meta = { + description = "Client for the Mozilla VPN service"; + homepage = "https://vpn.mozilla.org/"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ andersk ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18895d8cd4a..69257b466d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4985,6 +4985,8 @@ with pkgs; mcrcon = callPackage ../tools/networking/mcrcon {}; + mozillavpn = libsForQt5.callPackage ../tools/networking/mozillavpn { }; + mozwire = callPackage ../tools/networking/mozwire { inherit (darwin.apple_sdk.frameworks) Security; };