mullvad-vpn: format; move to by-name (#360494)

Author: GaetanLepage

…tions/networking/mullvad-vpn/default.nix pkgs/by-name/mu/mullvad-vpn/package.nixpkgs/applications/networking/mullvad-vpn/default.nix renamed to pkgs/by-name/mu/mullvad-vpn/package.nix pkgs/applications/networking/mullvad-vpn/default.nix renamed to pkgs/by-name/mu/mullvad-vpn/package.nix

@@ -1,32 +1,35 @@
-{ stdenv
-, lib
-, fetchurl
-, dpkg
-, alsa-lib
-, atk
-, cairo
-, cups
-, dbus
-, expat
-, fontconfig
-, freetype
-, gdk-pixbuf
-, glib
-, pango
-, nspr
-, nss
-, gtk3
-, mesa
-, libGL
-, wayland
-, xorg
-, autoPatchelfHook
-, systemd
-, libnotify
-, libappindicator
-, makeWrapper
-, coreutils
-, gnugrep
+{
+  stdenv,
+  lib,
+  fetchurl,
+  dpkg,
+  alsa-lib,
+  atk,
+  cairo,
+  cups,
+  dbus,
+  expat,
+  fontconfig,
+  freetype,
+  gdk-pixbuf,
+  glib,
+  pango,
+  nspr,
+  nss,
+  gtk3,
+  mesa,
+  libGL,
+  wayland,
+  xorg,
+  autoPatchelfHook,
+  systemd,
+  libnotify,
+  libappindicator,
+  makeWrapper,
+  coreutils,
+  gnugrep,
+
+  versionCheckHook,
 }:
 
 let
@@ -66,7 +69,9 @@ let
 
   version = "2024.7";
 
-  selectSystem = attrs: attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+  selectSystem =
+    attrs:
+    attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
 
   platform = selectSystem {
     x86_64-linux = "amd64";
@@ -99,7 +104,13 @@ stdenv.mkDerivation {
   dontBuild = true;
   dontConfigure = true;
 
-  runtimeDependencies = [ (lib.getLib systemd) libGL libnotify libappindicator wayland ];
+  runtimeDependencies = [
+    (lib.getLib systemd)
+    libGL
+    libnotify
+    libappindicator
+    wayland
+  ];
 
   installPhase = ''
     runHook preInstall
@@ -115,7 +126,12 @@ stdenv.mkDerivation {
 
     wrapProgram $out/bin/mullvad-vpn \
       --set MULLVAD_DISABLE_UPDATE_NOTIFICATION 1 \
-      --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]}
+      --prefix PATH : ${
+        lib.makeBinPath [
+          coreutils
+          gnugrep
+        ]
+      }
 
     wrapProgram $out/bin/mullvad-daemon \
         --set-default MULLVAD_RESOURCE_DIR "$out/share/mullvad/resources"
@@ -128,17 +144,26 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = [ "--version" ];
+  doInstallCheck = true;
+
   passthru.updateScript = ./update.sh;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/mullvad/mullvadvpn-app";
     description = "Client for Mullvad VPN";
     changelog = "https://github.com/mullvad/mullvadvpn-app/blob/${version}/CHANGELOG.md";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.gpl3Only;
-    platforms = platforms.unix ;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.unix;
     badPlatforms = [ lib.systems.inspect.patterns.isDarwin ];
-    maintainers = with maintainers; [ Br1ght0ne ymarkus ataraxiasjel ];
+    maintainers = with lib.maintainers; [
+      Br1ght0ne
+      ymarkus
+      ataraxiasjel
+    ];
   };
-
 }

…cations/networking/mullvad-vpn/update.sh pkgs/by-name/mu/mullvad-vpn/update.shpkgs/applications/networking/mullvad-vpn/update.sh renamed to pkgs/by-name/mu/mullvad-vpn/update.sh pkgs/applications/networking/mullvad-vpn/update.sh renamed to pkgs/by-name/mu/mullvad-vpn/update.sh

@@ -11800,8 +11800,6 @@ with pkgs;
   inherit (callPackage ../applications/networking/mullvad { })
     mullvad;
 
-  mullvad-vpn = callPackage ../applications/networking/mullvad-vpn { };
-
   mullvad-closest = with python3Packages; toPythonApplication mullvad-closest;
 
   napalm = with python3Packages; toPythonApplication (