From 71dcd83cedf29535f0befc82fcaaad72685eeede Mon Sep 17 00:00:00 2001 From: mchar7 <34781916+mchar7@users.noreply.github.com> Date: Thu, 6 Nov 2025 15:58:50 -0500 Subject: [PATCH] mullvad-vpn: 2025.7 -> 2025.13 Also fixes update.sh to reference package.nix instead of default.nix and use nix-prefetch-scripts for proper hash generation. --- pkgs/by-name/mu/mullvad-vpn/package.nix | 7 ++++--- pkgs/by-name/mu/mullvad-vpn/update.sh | 13 ++++--------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/mu/mullvad-vpn/package.nix b/pkgs/by-name/mu/mullvad-vpn/package.nix index 94000803e2f7..473c02637252 100644 --- a/pkgs/by-name/mu/mullvad-vpn/package.nix +++ b/pkgs/by-name/mu/mullvad-vpn/package.nix @@ -67,7 +67,7 @@ let systemd ]; - version = "2025.7"; + version = "2025.13"; selectSystem = attrs: @@ -79,8 +79,8 @@ let }; hash = selectSystem { - x86_64-linux = "sha256-wKmwCLF+H/ByZFYGQMEJT6gmAt2Aa0vZalqaMptPjhU="; - aarch64-linux = "sha256-lsHpbxVxThxi+eKY+9c7VcXlDdxBTds6NQKrS0rxt34="; + x86_64-linux = "sha256-zgU6pBujCXBhDO9XAqpUSDNuQt5daQ1gVwopXwc0nGo="; + aarch64-linux = "sha256-BDrH99li0GWJ+/9QUrHfKxC1JExG3jvd0ujXPKhGM1c="; }; in @@ -158,6 +158,7 @@ stdenv.mkDerivation { changelog = "https://github.com/mullvad/mullvadvpn-app/blob/${version}/CHANGELOG.md"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.gpl3Only; + mainProgram = "mullvad-vpn"; platforms = lib.platforms.unix; badPlatforms = [ lib.systems.inspect.patterns.isDarwin ]; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/mu/mullvad-vpn/update.sh b/pkgs/by-name/mu/mullvad-vpn/update.sh index 97a6e2a44845..9a38d8465b63 100755 --- a/pkgs/by-name/mu/mullvad-vpn/update.sh +++ b/pkgs/by-name/mu/mullvad-vpn/update.sh @@ -1,24 +1,19 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused gawk jq nix-prefetch +#!nix-shell -i bash -p curl gnused gawk jq nix-prefetch-scripts set -euo pipefail ROOT="$(dirname "$(readlink -f "$0")")" -NIX_DRV="$ROOT/default.nix" +NIX_DRV="$ROOT/package.nix" if [ ! -f "$NIX_DRV" ]; then - echo "ERROR: cannot find default.nix in $ROOT" + echo "ERROR: cannot find package.nix in $ROOT" exit 1 fi fetch_arch() { VER="$1"; ARCH="$2" URL="https://github.com/mullvad/mullvadvpn-app/releases/download/${VER}/MullvadVPN-${VER}_${ARCH}.deb" - nix-prefetch "{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - pname = \"mullvad-vpn\"; version = \"${VER}\"; - src = fetchurl { url = \"$URL\"; }; -} -" + nix-prefetch-url --type sha256 "$URL" | xargs nix-hash --type sha256 --to-sri } replace_sha() {