summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnders Kaseorg <andersk@mit.edu>2024-09-24 23:51:05 -0700
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2024-09-28 13:50:11 +0000
commite5b695965c81f91cdb2d784d23f83686e1c40a0a (patch)
tree6bd3a6c55708380d13a02f7c6ffc2f3e33b0c730
parentmozillavpn: migrate to by-name (diff)
downloadnixpkgs-origin/backport-344368-to-release-24.05.tar.gz
mozillavpn: 2.23.1 → 2.24.0origin/backport-344368-to-release-24.05
Signed-off-by: Anders Kaseorg <andersk@mit.edu> (cherry picked from commit b992338da036ab9a5f860dcabc1f5421e0b3354f)
-rw-r--r--pkgs/by-name/mo/mozillavpn/package.nix15
1 files 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 = [