dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #202127 from AtaraxiaSjel/update/mullvad-2022.5

Browse Source 
mullvad{,-vpn}: 2022.4 -> 2022.5
This commit is contained in:
Oleksii Filonenko 2022-11-21 13:15:19 +02:00 committed by GitHub
commit 79bb815a1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
maintainers/maintainer-list.nix
View File

@ -1285,6 +1285,15 @@
fingerprint = "DD52 6BC7 767D BA28 16C0 95E5 6840 89CE 67EB B691"; fingerprint = "DD52 6BC7 767D BA28 16C0 95E5 6840 89CE 67EB B691";
}]; }];
}; };
ataraxiasjel = {
email = "nix@ataraxiadev.com";
github = "AtaraxiaSjel";
githubId = 5314145;
name = "Dmitriy";
keys = [{
fingerprint = "922D A6E7 58A0 FE4C FAB4 E4B2 FD26 6B81 0DF4 8DF2";
}];
};
atemu = { atemu = {
name = "Atemu"; name = "Atemu";
email = "atemu.main+nixpkgs@gmail.com"; email = "atemu.main+nixpkgs@gmail.com";

7
pkgs/applications/networking/mullvad-vpn/default.nix
View File

@ -43,11 +43,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mullvad-vpn"; pname = "mullvad-vpn";
version = "2022.4"; version = "2022.5";
src = fetchurl { src = fetchurl {
url = "https://github.com/mullvad/mullvadvpn-app/releases/download/${version}/MullvadVPN-${version}_amd64.deb"; url = "https://github.com/mullvad/mullvadvpn-app/releases/download/${version}/MullvadVPN-${version}_amd64.deb";
sha256 = "sha256-OwTtWzlZjHNFSN5/UjFJbcrPCv9+ucWYEL2idYjeozU="; sha256 = "sha256-G3B4kb+ugukYtCVH3HHI43u3n9G0dX6WyYUA3X/sZ+o=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -75,7 +75,6 @@ stdenv.mkDerivation rec {
mv opt/Mullvad\ VPN/* $out/share/mullvad mv opt/Mullvad\ VPN/* $out/share/mullvad
ln -s $out/share/mullvad/mullvad-{gui,vpn} $out/bin/ ln -s $out/share/mullvad/mullvad-{gui,vpn} $out/bin/
ln -s $out/share/mullvad/resources/mullvad-daemon $out/bin/mullvad-daemon
ln -sf $out/share/mullvad/resources/mullvad-problem-report $out/bin/mullvad-problem-report ln -sf $out/share/mullvad/resources/mullvad-problem-report $out/bin/mullvad-problem-report
wrapProgram $out/bin/mullvad-vpn --set MULLVAD_DISABLE_UPDATE_NOTIFICATION 1 wrapProgram $out/bin/mullvad-vpn --set MULLVAD_DISABLE_UPDATE_NOTIFICATION 1
@ -92,7 +91,7 @@ stdenv.mkDerivation rec {
sourceProvenance = with sourceTypes; [ binaryNativeCode ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.gpl3Only; license = licenses.gpl3Only;
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ Br1ght0ne ymarkus ]; maintainers = with maintainers; [ Br1ght0ne ymarkus ataraxiasjel ];
}; };
} }

2
pkgs/applications/networking/mullvad/libwg.nix
View File

@ -13,7 +13,7 @@ buildGoModule {
sourceRoot = "source/wireguard/libwg"; sourceRoot = "source/wireguard/libwg";
vendorSha256 = "qvymWCdJ+GY90W/Fpdp+r1+mTq6O4LyN2Yw/PjKdFm0="; vendorSha256 = "QNde5BqkSuqp3VJQOhn7aG6XknRDZQ62PE3WGhEJ5LU=";
# XXX: hack to make the ar archive go to the correct place # XXX: hack to make the ar archive go to the correct place
# This is necessary because passing `-o ...` to `ldflags` does not work # This is necessary because passing `-o ...` to `ldflags` does not work

6
pkgs/applications/networking/mullvad/mullvad.nix
View File

@ -15,16 +15,16 @@
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "mullvad"; pname = "mullvad";
version = "2022.4"; version = "2022.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mullvad"; owner = "mullvad";
repo = "mullvadvpn-app"; repo = "mullvadvpn-app";
rev = version; rev = version;
hash = "sha256-s0Cmeh10lQUB5BK4i1qxkDy/ylx/3c6V66dxH+kcnLs="; hash = "sha256-LiaELeEBIn/GZibKf25W3DHe+IkpaTY8UC7ca/7lp8k=";
}; };
cargoHash = "sha256-HPURL+CFUVLWRq8nzLiZxDhckgH76b6JBUObLGtoEEw="; cargoHash = "sha256-KpBhdZce8Ug3ws7f1qg+5LtOMQw2Mf/uJsBg/TZSYyk=";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config