diff --git a/pkgs/by-name/pr/proxyman/darwin.nix b/pkgs/by-name/pr/proxyman/darwin.nix
new file mode 100644
index 000000000000..e56e0f85f383
--- /dev/null
+++ b/pkgs/by-name/pr/proxyman/darwin.nix
@@ -0,0 +1,48 @@
+{
+  stdenvNoCC,
+  fetchurl,
+  _7zz,
+  makeWrapper,
+  pname,
+  updateScript,
+  meta,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  inherit pname;
+  version = "6.14.0";
+
+  src = fetchurl {
+    url = "https://github.com/ProxymanApp/Proxyman/releases/download/${finalAttrs.version}/Proxyman_${finalAttrs.version}.dmg";
+    hash = "sha256-bdIitfbr5Pr0glJcVDMfE/1ehpbRy5/pwXmUz0ivuvo=";
+  };
+
+  sourceRoot = ".";
+
+  nativeBuildInputs = [
+    _7zz
+    makeWrapper
+  ];
+
+  unpackCmd = "7zz x -snld -xr'!*:com.apple.*' $curSrc";
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/Applications
+    cp -R Proxyman.app $out/Applications
+    makeWrapper $out/Applications/Proxyman.app/Contents/MacOS/Proxyman $out/bin/proxyman
+
+    runHook postInstall
+  '';
+
+  dontFixup = true;
+
+  passthru = {
+    inherit updateScript;
+  };
+
+  meta = meta // {
+    changelog = "https://proxyman.com/changelog";
+    platforms = [ "aarch64-darwin" ];
+  };
+})
diff --git a/pkgs/by-name/pr/proxyman/linux.nix b/pkgs/by-name/pr/proxyman/linux.nix
new file mode 100644
index 000000000000..efdefd4ba196
--- /dev/null
+++ b/pkgs/by-name/pr/proxyman/linux.nix
@@ -0,0 +1,57 @@
+{
+  appimageTools,
+  fetchurl,
+  asar,
+  pname,
+  updateScript,
+  meta,
+}:
+let
+  version = "3.16.1";
+
+  src = fetchurl {
+    url = "https://github.com/ProxymanApp/proxyman-windows-linux/releases/download/${version}/Proxyman-${version}.AppImage";
+    hash = "sha256-rykOZVrh3MATFDzwLS7gEj5sMD9udsWAi+68Quqzk0c=";
+  };
+
+  appimageContents = appimageTools.extract {
+    inherit pname version src;
+    postExtract = ''
+      ${asar}/bin/asar extract $out/resources/app.asar app
+
+      # This will fix the issue with Proxyman not detecting NixOS as a valid Linux environment
+      substituteInPlace app/dist/main/main.js \
+        --replace-fail 'systemTrustFilename:"/etc/ca-certificates/trust-source/anchors/%s.crt",trustCommands:["update-ca-trust extract"]' 'systemTrustFilename:"/etc/ssl/certs/%s.crt",trustCommands:[]' \
+        --replace-fail '{path:"/etc/ca-certificates/trust-source/anchors/",distroFamily:"arch"}' '{path:"/etc/ssl/certs/",distroFamily:"arch"}'
+
+      # This will permanently mark the certificate as installed, as this should be done through Nix config rather than
+      # placing / editing a file in /etc like Proxyman would expect.
+      # Configure the certificate located in "~/.config/Proxyman/certificate/certs/ca.pem" using security.pki.certificates in your nix config
+      substituteInPlace app/dist/main/main.js --replace-fail "return this.isFile(this.getNewCertPath(e))" "return true"
+
+      ${asar}/bin/asar pack app $out/resources/app.asar
+    '';
+  };
+
+in
+appimageTools.wrapAppImage {
+  inherit pname version;
+  src = appimageContents;
+
+  extraInstallCommands = ''
+    install -Dm444 ${appimageContents}/proxyman.desktop -t $out/share/applications
+    install -Dm444 ${appimageContents}/proxyman.png -t $out/share/icons/hicolor/256x256/apps
+    substituteInPlace $out/share/applications/proxyman.desktop \
+      --replace-fail "Exec=AppRun" "Exec=proxyman --"
+  '';
+
+  passthru = {
+    inherit updateScript;
+    inherit src;
+  };
+
+  meta = meta // {
+    changelog = "https://proxyman.com/changelog-windows";
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/by-name/pr/proxyman/package.nix b/pkgs/by-name/pr/proxyman/package.nix
index 41dc9b3b4f36..5e68fd64ca25 100644
--- a/pkgs/by-name/pr/proxyman/package.nix
+++ b/pkgs/by-name/pr/proxyman/package.nix
@@ -1,63 +1,68 @@
 {
   lib,
-  appimageTools,
-  fetchurl,
-  asar,
-  nix-update-script,
+  stdenv,
+  callPackage,
+  writeShellScript,
+  curl,
+  jq,
+  common-updater-scripts,
 }:
 let
   pname = "proxyman";
-  version = "3.16.1";
 
-  src = fetchurl {
-    url = "https://github.com/ProxymanApp/proxyman-windows-linux/releases/download/${version}/Proxyman-${version}.AppImage";
-    hash = "sha256-rykOZVrh3MATFDzwLS7gEj5sMD9udsWAi+68Quqzk0c=";
-  };
+  updateScript = {
+    command = writeShellScript "proxyman-update-script" ''
+      set -euo pipefail
 
-  appimageContents = appimageTools.extract {
-    inherit pname version src;
-    postExtract = ''
-      ${asar}/bin/asar extract $out/resources/app.asar app
+      updateArtifact() {
+        local repo=$1 url=$2 file=$3 system=$4 label=$5
+        local version hash
+        version=$(${lib.getExe curl} --fail -s ''${GITHUB_TOKEN:+-H "Authorization: bearer $GITHUB_TOKEN"} \
+          "https://api.github.com/repos/$repo/releases/latest" | ${lib.getExe jq} -r .tag_name)
+        if [[ -z "$version" || "$version" == "null" ]]; then
+          echo "could not determine latest release of $repo" >&2
+          return 1
+        fi
+        if grep -q "version = \"$version\";" "$file"; then
+          echo '[]'
+          return
+        fi
+        url=''${url//@version@/$version}
+        hash=$(nix store prefetch-file --json "$url" | ${lib.getExe jq} -r .hash)
+        ${lib.getExe' common-updater-scripts "update-source-version"} proxyman "$version" "$hash" \
+          --file="$file" --system="$system" --print-changes \
+          | ${lib.getExe jq} --arg label "$label" \
+              'map(.commitMessage = "proxyman: (\($label)) \(.oldVersion) -> \(.newVersion)")'
+      }
 
-      # This will fix the issue with Proxyman not detecting NixOS as a valid Linux environment
-      substituteInPlace app/dist/main/main.js \
-        --replace-fail 'systemTrustFilename:"/etc/ca-certificates/trust-source/anchors/%s.crt",trustCommands:["update-ca-trust extract"]' 'systemTrustFilename:"/etc/ssl/certs/%s.crt",trustCommands:[]' \
-        --replace-fail '{path:"/etc/ca-certificates/trust-source/anchors/",distroFamily:"arch"}' '{path:"/etc/ssl/certs/",distroFamily:"arch"}'
+      # Electron app for Linux
+      linuxChanges=$(updateArtifact ProxymanApp/proxyman-windows-linux \
+        "https://github.com/ProxymanApp/proxyman-windows-linux/releases/download/@version@/Proxyman-@version@.AppImage" \
+        pkgs/by-name/pr/proxyman/linux.nix x86_64-linux linux)
 
-      # This will permanently mark the certificate as installed, as this should be done through Nix config rather than
-      # placing / editing a file in /etc like Proxyman would expect.
-      # Configure the certificate located in "~/.config/Proxyman/certificate/certs/ca.pem" using security.pki.certificates in your nix config
-      substituteInPlace app/dist/main/main.js --replace-fail "return this.isFile(this.getNewCertPath(e))" "return true"
+      # Native macOS app (independent versioning)
+      darwinChanges=$(updateArtifact ProxymanApp/Proxyman \
+        "https://github.com/ProxymanApp/Proxyman/releases/download/@version@/Proxyman_@version@.dmg" \
+        pkgs/by-name/pr/proxyman/darwin.nix aarch64-darwin darwin)
 
-      ${asar}/bin/asar pack app $out/resources/app.asar
+      ${lib.getExe jq} -n "$linuxChanges + $darwinChanges"
     '';
-  };
-
-in
-appimageTools.wrapAppImage {
-  inherit pname version;
-  src = appimageContents;
-
-  extraInstallCommands = ''
-    install -Dm444 ${appimageContents}/proxyman.desktop -t $out/share/applications
-    install -Dm444 ${appimageContents}/proxyman.png -t $out/share/icons/hicolor/256x256/apps
-    substituteInPlace $out/share/applications/proxyman.desktop \
-      --replace-fail "Exec=AppRun" "Exec=proxyman --"
-  '';
-
-  passthru = {
-    updateScript = nix-update-script { };
-    inherit src; # needed for nix-update to find the GitHub URL
+    supportedFeatures = [ "commit" ];
   };
 
   meta = {
     description = "Capture, inspect, and manipulate HTTP(s) requests/responses with ease";
     homepage = "https://proxyman.com";
-    changelog = "https://proxyman.com/changelog-windows";
     license = lib.licenses.unfree;
     mainProgram = "proxyman";
-    maintainers = with lib.maintainers; [ nilathedragon ];
-    platforms = [ "x86_64-linux" ];
+    maintainers = with lib.maintainers; [
+      nilathedragon
+      matteopacini
+    ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
-}
+in
+if stdenv.hostPlatform.isDarwin then
+  callPackage ./darwin.nix { inherit pname updateScript meta; }
+else
+  callPackage ./linux.nix { inherit pname updateScript meta; }