b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

mullvad: 2022.1 -> 2022.2

Browse source 
https://github.com/mullvad/mullvadvpn-app/releases/tag/2022.2

address_cache was removed with the upstream release, so we remove those
parts as well.
This commit is contained in:
kilianar 2022-07-05 01:04:45 +02:00
parent 57ca6c3933
commit 295656a45a
1 changed files with 5 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
pkgs/applications/networking/mullvad/mullvad.nix
View file

@ -13,29 +13,18 @@
, openvpn-mullvad , openvpn-mullvad
, shadowsocks-rust , shadowsocks-rust
}: }:
let
# result of running address_cache as of 02 Mar 2022
bootstrap-address-cache = writeText "api-ip-address.txt" ''
193.138.218.78:443
193.138.218.71:444
185.65.134.66:444
185.65.135.117:444
217.138.254.130:444
91.90.44.10:444
'';
in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "mullvad"; pname = "mullvad";
version = "2022.1"; version = "2022.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mullvad"; owner = "mullvad";
repo = "mullvadvpn-app"; repo = "mullvadvpn-app";
rev = version; rev = version;
hash = "sha256-bLwuM3Qy2iStbXIvDEWp31vuiihSQThOej297XKo5Xc="; hash = "sha256-ZtQKzbFrkacrfPIkMz/UOfIwQBXQUoVVlFla//jmMwY=";
}; };
cargoHash = "sha256-CBbm8cJHTjyvvzCFQfKmsE5d9N7azEm8nI6KeWLVaa8="; cargoHash = "sha256-J6h3KY1RDCnAc/tQHNGEyOlVQoQNhRqjWbmimPitydQ=";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
@ -59,26 +48,14 @@ rustPlatform.buildRustPackage rec {
postFixup = postFixup =
# Place all binaries in the 'mullvad-' namespace, even though these # Place all binaries in the 'mullvad-' namespace, even though these
# specific binaries aren't used in the lifetime of the program. # specific binaries aren't used in the lifetime of the program.
# `address_cache` is used to generate the `api-ip-address.txt` file, which
# contains list of Mullvad API servers -- though we provide a "backup" of
# the output of this command, it could change at any time, so we want
# users to be able to regenerate the list at any time. (The daemon will
# refuse to start without this file.)
'' ''
for bin in address_cache relay_list translations-converter; do for bin in relay_list translations-converter; do
mv "$out/bin/$bin" "$out/bin/mullvad-$bin" mv "$out/bin/$bin" "$out/bin/mullvad-$bin"
done done
'' + '' +
# Put distributed assets in-place -- specifically, the
# bootstrap-address-cache is necessary; otherwise, the user will have to run
# the `address_cache` binary and move the contents into place at
# `/var/cache/mullvad-vpn/api-ip-address.txt` manually.
''
mkdir -p $out/share/mullvad
ln -s ${bootstrap-address-cache} $out/share/mullvad/api-ip-address.txt
'' +
# Files necessary for OpenVPN tunnels to work. # Files necessary for OpenVPN tunnels to work.
'' ''
mkdir -p $out/share/mullvad
cp dist-assets/ca.crt $out/share/mullvad cp dist-assets/ca.crt $out/share/mullvad
ln -s ${openvpn-mullvad}/bin/openvpn $out/share/mullvad ln -s ${openvpn-mullvad}/bin/openvpn $out/share/mullvad
ln -s ${shadowsocks-rust}/bin/sslocal $out/share/mullvad ln -s ${shadowsocks-rust}/bin/sslocal $out/share/mullvad