From 3481adf69567cd9f72eb1cc38fd7e43e818a1908 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Tue, 24 Sep 2024 23:58:53 -0700 Subject: mozillavpn: switch to standard callPackage Signed-off-by: Anders Kaseorg --- pkgs/tools/networking/mozillavpn/default.nix | 31 +++++++++++----------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 13 insertions(+), 20 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/mozillavpn/default.nix b/pkgs/tools/networking/mozillavpn/default.nix index aa8585349da20..6615d5025d4d1 100644 --- a/pkgs/tools/networking/mozillavpn/default.nix +++ b/pkgs/tools/networking/mozillavpn/default.nix @@ -12,18 +12,11 @@ libsecret, pkg-config, python3, - qt5compat, - qtbase, - qtnetworkauth, - qtsvg, - qttools, - qtwayland, - qtwebsockets, + qt6, rustPlatform, rustc, stdenv, wireguard-tools, - wrapQtAppsHook, }: stdenv.mkDerivation (finalAttrs: { @@ -66,12 +59,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 @@ -82,10 +75,10 @@ stdenv.mkDerivation (finalAttrs: { python3.pkgs.glean-parser python3.pkgs.pyyaml python3.pkgs.setuptools - qttools + qt6.qttools + qt6.wrapQtAppsHook rustPlatform.cargoSetupHook rustc - wrapQtAppsHook ]; postPatch = '' @@ -101,9 +94,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 587c69d8ed058..83d67a302cac3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7215,7 +7215,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; -- cgit 1.4.1 From 3969be13bf993566643d707d9825d83ecfb52bea Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Wed, 25 Sep 2024 00:00:36 -0700 Subject: mozillavpn: migrate to by-name Signed-off-by: Anders Kaseorg --- pkgs/by-name/mo/mozillavpn/package.nix | 118 +++++++++++++++++++++++++++ pkgs/tools/networking/mozillavpn/default.nix | 118 --------------------------- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 118 insertions(+), 120 deletions(-) create mode 100644 pkgs/by-name/mo/mozillavpn/package.nix delete mode 100644 pkgs/tools/networking/mozillavpn/default.nix (limited to 'pkgs') diff --git a/pkgs/by-name/mo/mozillavpn/package.nix b/pkgs/by-name/mo/mozillavpn/package.nix new file mode 100644 index 0000000000000..6615d5025d4d1 --- /dev/null +++ b/pkgs/by-name/mo/mozillavpn/package.nix @@ -0,0 +1,118 @@ +{ + buildGoModule, + cargo, + cmake, + fetchFromGitHub, + fetchpatch, + go, + lib, + libcap, + libgcrypt, + libgpg-error, + libsecret, + pkg-config, + python3, + qt6, + rustPlatform, + rustc, + stdenv, + wireguard-tools, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mozillavpn"; + version = "2.23.1"; + src = fetchFromGitHub { + owner = "mozilla-mobile"; + repo = "mozilla-vpn-client"; + rev = "v${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-NQM1ZII9owD9ek/Leo6WRfvNybZ5pUjDgvQGXQBrD+0="; + }; + patches = [ + # Update cargo deps for "time" + (fetchpatch { + url = "https://github.com/mozilla-mobile/mozilla-vpn-client/commit/31d5799a30fc02067ad31d86b6ef63294bb3c3b8.patch"; + hash = "sha256-ECrIcfhhSuvbqQ/ExPdFkQ6b9Q767lhUKmwPdDz7yxI="; + }) + ]; + + netfilterGoModules = + (buildGoModule { + inherit (finalAttrs) + pname + version + src + patches + ; + modRoot = "linux/netfilter"; + vendorHash = "sha256-Cmo0wnl0z5r1paaEf1MhCPbInWeoMhGjnxCxGh0cyO8="; + }).goModules; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit (finalAttrs) src patches; + hash = "sha256-JIe6FQL0xm6FYYGoIwwnOxq21sC1y8xPsr8tYPF0Mzo="; + }; + + buildInputs = [ + libcap + libgcrypt + libgpg-error + libsecret + qt6.qt5compat + qt6.qtbase + qt6.qtnetworkauth + qt6.qtsvg + qt6.qtwayland + qt6.qtwebsockets + ]; + nativeBuildInputs = [ + cargo + cmake + go + pkg-config + python3 + python3.pkgs.glean-parser + python3.pkgs.pyyaml + python3.pkgs.setuptools + qt6.qttools + qt6.wrapQtAppsHook + rustPlatform.cargoSetupHook + rustc + ]; + + postPatch = '' + substituteInPlace src/cmake/linux.cmake \ + --replace '/etc/xdg/autostart' "$out/etc/xdg/autostart" \ + --replace '/usr/share/dbus-1' "$out/share/dbus-1" \ + --replace '${"$"}{SYSTEMD_UNIT_DIR}' "$out/lib/systemd/system" + + substituteInPlace extension/CMakeLists.txt \ + --replace '/etc' "$out/etc" + + ln -s '${finalAttrs.netfilterGoModules}' linux/netfilter/vendor + ''; + + cmakeFlags = [ + "-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; + + qtWrapperArgs = [ + "--prefix" + "PATH" + ":" + (lib.makeBinPath [ wireguard-tools ]) + ]; + + meta = { + description = "Client for the Mozilla VPN service"; + mainProgram = "mozillavpn"; + homepage = "https://vpn.mozilla.org/"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ andersk ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/tools/networking/mozillavpn/default.nix b/pkgs/tools/networking/mozillavpn/default.nix deleted file mode 100644 index 6615d5025d4d1..0000000000000 --- a/pkgs/tools/networking/mozillavpn/default.nix +++ /dev/null @@ -1,118 +0,0 @@ -{ - buildGoModule, - cargo, - cmake, - fetchFromGitHub, - fetchpatch, - go, - lib, - libcap, - libgcrypt, - libgpg-error, - libsecret, - pkg-config, - python3, - qt6, - rustPlatform, - rustc, - stdenv, - wireguard-tools, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "mozillavpn"; - version = "2.23.1"; - src = fetchFromGitHub { - owner = "mozilla-mobile"; - repo = "mozilla-vpn-client"; - rev = "v${finalAttrs.version}"; - fetchSubmodules = true; - hash = "sha256-NQM1ZII9owD9ek/Leo6WRfvNybZ5pUjDgvQGXQBrD+0="; - }; - patches = [ - # Update cargo deps for "time" - (fetchpatch { - url = "https://github.com/mozilla-mobile/mozilla-vpn-client/commit/31d5799a30fc02067ad31d86b6ef63294bb3c3b8.patch"; - hash = "sha256-ECrIcfhhSuvbqQ/ExPdFkQ6b9Q767lhUKmwPdDz7yxI="; - }) - ]; - - netfilterGoModules = - (buildGoModule { - inherit (finalAttrs) - pname - version - src - patches - ; - modRoot = "linux/netfilter"; - vendorHash = "sha256-Cmo0wnl0z5r1paaEf1MhCPbInWeoMhGjnxCxGh0cyO8="; - }).goModules; - - cargoDeps = rustPlatform.fetchCargoTarball { - inherit (finalAttrs) src patches; - hash = "sha256-JIe6FQL0xm6FYYGoIwwnOxq21sC1y8xPsr8tYPF0Mzo="; - }; - - buildInputs = [ - libcap - libgcrypt - libgpg-error - libsecret - qt6.qt5compat - qt6.qtbase - qt6.qtnetworkauth - qt6.qtsvg - qt6.qtwayland - qt6.qtwebsockets - ]; - nativeBuildInputs = [ - cargo - cmake - go - pkg-config - python3 - python3.pkgs.glean-parser - python3.pkgs.pyyaml - python3.pkgs.setuptools - qt6.qttools - qt6.wrapQtAppsHook - rustPlatform.cargoSetupHook - rustc - ]; - - postPatch = '' - substituteInPlace src/cmake/linux.cmake \ - --replace '/etc/xdg/autostart' "$out/etc/xdg/autostart" \ - --replace '/usr/share/dbus-1' "$out/share/dbus-1" \ - --replace '${"$"}{SYSTEMD_UNIT_DIR}' "$out/lib/systemd/system" - - substituteInPlace extension/CMakeLists.txt \ - --replace '/etc' "$out/etc" - - ln -s '${finalAttrs.netfilterGoModules}' linux/netfilter/vendor - ''; - - cmakeFlags = [ - "-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; - - qtWrapperArgs = [ - "--prefix" - "PATH" - ":" - (lib.makeBinPath [ wireguard-tools ]) - ]; - - meta = { - description = "Client for the Mozilla VPN service"; - mainProgram = "mozillavpn"; - 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 83d67a302cac3..ab879a9076093 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7215,8 +7215,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; }; -- cgit 1.4.1 From b992338da036ab9a5f860dcabc1f5421e0b3354f Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Tue, 24 Sep 2024 23:51:05 -0700 Subject: mozillavpn: 2.23.1 → 2.24.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Anders Kaseorg --- pkgs/by-name/mo/mozillavpn/package.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'pkgs') diff --git a/pkgs/by-name/mo/mozillavpn/package.nix b/pkgs/by-name/mo/mozillavpn/package.nix index 6615d5025d4d1..0d480d4eefa4f 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, @@ -21,21 +20,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 { @@ -51,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) src patches; - hash = "sha256-JIe6FQL0xm6FYYGoIwwnOxq21sC1y8xPsr8tYPF0Mzo="; + hash = "sha256-ryJFvnJIiDKf2EqlzHj79hSPYrD+3UtZ5lT/QeFv6V0="; }; buildInputs = [ -- cgit 1.4.1