Unverified Commit 79bb815a authored by Oleksii Filonenko's avatar Oleksii Filonenko Committed by GitHub
Browse files

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

mullvad{,-vpn}: 2022.4 -> 2022.5
parents 37905683 49dcf51e

maintainers/maintainer-list.nix

+9 −0
Original line number Diff line number Diff line
@@ -1285,6 +1285,15 @@ 
      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 = {

    name = "Atemu";

    email = "atemu.main+nixpkgs@gmail.com";

pkgs/applications/networking/mullvad-vpn/default.nix

+3 −4
Original line number Diff line number Diff line
@@ -43,11 +43,11 @@ in 


stdenv.mkDerivation rec {

  pname = "mullvad-vpn";

  version = "2022.4";

  version = "2022.5";



  src = fetchurl {

    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 = [
@@ -75,7 +75,6 @@ stdenv.mkDerivation rec { 
    mv opt/Mullvad\ VPN/* $out/share/mullvad



    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



    wrapProgram $out/bin/mullvad-vpn --set MULLVAD_DISABLE_UPDATE_NOTIFICATION 1
@@ -92,7 +91,7 @@ stdenv.mkDerivation rec { 
    sourceProvenance = with sourceTypes; [ binaryNativeCode ];

    license = licenses.gpl3Only;

    platforms = [ "x86_64-linux" ];

    maintainers = with maintainers; [ Br1ght0ne ymarkus ];

    maintainers = with maintainers; [ Br1ght0ne ymarkus ataraxiasjel ];

  };



}

pkgs/applications/networking/mullvad/libwg.nix

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ buildGoModule { 


  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

  # This is necessary because passing `-o ...` to `ldflags` does not work

pkgs/applications/networking/mullvad/mullvad.nix

+3 −3
Original line number Diff line number Diff line
@@ -15,16 +15,16 @@ 
}:

rustPlatform.buildRustPackage rec {

  pname = "mullvad";

  version = "2022.4";

  version = "2022.5";



  src = fetchFromGitHub {

    owner = "mullvad";

    repo = "mullvadvpn-app";

    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 = [

    pkg-config