From f9a8d4d915e26eac41e30d44abb6c2ca33d54b10 Mon Sep 17 00:00:00 2001
From: Xiangyan Sun <wishstudio@gmail.com>
Date: Sun, 3 May 2026 09:57:24 -0700
Subject: [PATCH 1/2] pacparser: 1.4.6 -> 1.5.1

---
 .../pa/pacparser/fix-invalid-pointer-type.patch       | 11 -----------
 pkgs/by-name/pa/pacparser/package.nix                 | 11 ++---------
 2 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/by-name/pa/pacparser/fix-invalid-pointer-type.patch

diff --git a/pkgs/by-name/pa/pacparser/fix-invalid-pointer-type.patch b/pkgs/by-name/pa/pacparser/fix-invalid-pointer-type.patch
deleted file mode 100644
index 936de11a2aba..000000000000
--- a/pkgs/by-name/pa/pacparser/fix-invalid-pointer-type.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/spidermonkey/js/src/jsapi.c
-+++ b/src/spidermonkey/js/src/jsapi.c
-@@ -93,7 +93,7 @@
- #ifdef HAVE_VA_LIST_AS_ARRAY
- #define JS_ADDRESSOF_VA_LIST(ap) ((va_list *)(ap))
- #else
--#define JS_ADDRESSOF_VA_LIST(ap) (&(ap))
-+#define JS_ADDRESSOF_VA_LIST(ap) ((va_list *)(&(ap)))
- #endif
- 
- #if defined(JS_PARANOID_REQUEST) && defined(JS_THREADSAFE)
\ No newline at end of file
diff --git a/pkgs/by-name/pa/pacparser/package.nix b/pkgs/by-name/pa/pacparser/package.nix
index 52e050bebaf0..0f06292a97a5 100644
--- a/pkgs/by-name/pa/pacparser/package.nix
+++ b/pkgs/by-name/pa/pacparser/package.nix
@@ -6,22 +6,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pacparser";
-  version = "1.4.6";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "manugarg";
     repo = "pacparser";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-rHRW/zzQS2vV+rQeZBQNSp2id0Gir1yFPwN2OPMOvVo=";
+    hash = "sha256-CkaRgm5xZHKiewPDSp0bzVkgAOeTbuGrY3FM4HaN97I=";
   };
 
-  patches = [
-    # jsapi.c:96:35: error: passing argument 5 of 'TryArgumentFormatter' from incompatible pointer type []
-    #   96 | #define JS_ADDRESSOF_VA_LIST(ap) (&(ap))
-    # suggested by https://github.com/manugarg/pacparser/issues/194#issuecomment-2262030966
-    ./fix-invalid-pointer-type.patch
-  ];
-
   makeFlags = [
     "NO_INTERNET=1"
     "PREFIX=${placeholder "out"}"

From c637a7d61a450b360c5613f772652d3014016873 Mon Sep 17 00:00:00 2001
From: Xiangyan Sun <wishstudio@gmail.com>
Date: Sun, 3 May 2026 09:57:40 -0700
Subject: [PATCH 2/2] pacparser: add version

---
 pkgs/by-name/pa/pacparser/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/pa/pacparser/package.nix b/pkgs/by-name/pa/pacparser/package.nix
index 0f06292a97a5..314a0c6b7839 100644
--- a/pkgs/by-name/pa/pacparser/package.nix
+++ b/pkgs/by-name/pa/pacparser/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  versionCheckHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -18,6 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   makeFlags = [
     "NO_INTERNET=1"
     "PREFIX=${placeholder "out"}"
+    "VERSION=v${finalAttrs.version}"
   ];
 
   enableParallelBuilding = true;
@@ -29,6 +31,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   hardeningDisable = [ "format" ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "-v";
+  doInstallCheck = true;
+
   meta = {
     description = "Library to parse proxy auto-config (PAC) files";
     homepage = "https://pacparser.manugarg.com/";